Merge branch 'master' of http://192.168.18.147:9000/root/digital_park_static

digital-park-web/digital-park/src/views/investment-service/InvestmentServiceList/InvestmentServiceList.vue

@@ -181,7 +181,7 @@ export default {
             this.queryParams.capacityRangeId = "";
             this.queryParams.areaRangeId = "";
             this.queryParams.page = 1;
-            this.queryParams.pageSize = 10;
+            this.queryParams.pageSize = 12;
             this.getListData();
         },
         // 分页切换

digital-park-web/digital-park/src/views/investment-service/InvestmentServiceList/components/ParkServiceProduct.vue

@@ -10,7 +10,7 @@
                 v-if="item.productDescription"
                 :title="item.productDescription"
             >{{ item.productDescription }}</div>
-            <div class="item-price">¥{{ item.showPrice }}</div>
+            <div class="item-price"><span v-if="item.showPrice !== '面议'">¥</span>{{ item.showPrice }}</div>
         </div>
         <br clear="all" />
     </div>

digital-park-web/digital-park/src/views/investment-service/InvestmentServiceList/components/PropertyManage.vue

@@ -30,8 +30,8 @@
                     <span class="main-price">面议</span>
                 </div>
                 <div class="main-showPrice" v-else>
-                    <span class="main-price">{{ item.housingInformationList[0].price }}</span>
-                    <span>{{ item.housingInformationList[0].unit }}</span>
+                    <span class="main-price">{{ getShowPrice(item).price }}</span>
+                    <span>{{ getShowPrice(item).unit }}</span>
                 </div>
                 <div class="main-showTotalPrice">
                     总价：{{ item.housingInformationList[0].showTotalPrice }}
@@ -66,6 +66,18 @@ export default {
                 },
             });
         },
+        getShowPrice(item){
+            let showPrice = item.housingInformationList[0].showPrice;
+            if(showPrice && showPrice !== '面议'){
+                let price = showPrice.split('/')[0];
+                let unit = showPrice.replace(price,'')
+                return {
+                    price,
+                    unit
+                }
+            }
+            return "面议"
+        },
         // 获取详情
         getDesc(item){
             let str = `最短起租：${ item.shortestRent }  |  总面积：${ item.totalArea }m²  |  支付方式：${ item.payment }  |  ${ item.type }`

digital-park-web/digital-park/src/views/investment-service/product-detail/ProductDetail.vue

@@ -12,7 +12,7 @@
                     >{{ productDetail.productName }}</div>
                     <div class="main-price">
                         <span class="price-label">价格：</span>
-                        <span class="price-value">¥{{ productDetail.showPrice }}</span>
+                        <span class="price-value"><span v-if="productDetail.showPrice !== '面议'">¥</span>{{ productDetail.showPrice }}</span>
                     </div>
                     <div class="mian-detail" :title="productDetail.productDescription">
                         <span class="mian-detail-span">详情：</span>

digital-park-web/digital-park/src/views/login/LoginFrom/LoginFrom.scss

@@ -107,11 +107,6 @@
                 border-radius: 6px;
                 text-align: center;
                 padding: 0;
-                &.is-disabled {
-                    color: #c0c4cc;
-                    cursor: not-allowed;
-                    background-image: none;
-                }
             }
         }
     }