Merge branch 'master' of http://101.201.78.203/cfld-front/shuchengminipro

src/App.vue

@@ -283,4 +283,10 @@ button::after {
     font-size: 26rpx;
   }
 }
+
+.many-content {
+  font-size: 28rpx;
+  text-align: justify;
+  line-height: 1.5;
+}
 </style>

src/components/element-cost/element-cost.vue

@@ -114,7 +114,7 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
-        font-size: 22rpx;
+        font-size: 28rpx;
         font-family: PingFang-SC, PingFang-SC;
         font-weight: 500;
         padding: 0 22rpx;
@@ -132,7 +132,7 @@ export default {
       margin: 40rpx 0;
       border-radius: 4rpx;
       font-family: PingFang-SC, PingFang-SC;
-      font-size: 22rpx;
+      font-size: 28rpx;
       font-weight: 500;
       color: #606266;
       .info-item {
@@ -162,7 +162,7 @@ export default {
         }
         .double {
           justify-content: unset;
-          padding-left: 50rpx;
+          padding-left: 40rpx;
         }
       }
     }

src/components/media/carrier-card.vue

@@ -9,7 +9,7 @@
       <view>
         <div class="flex right-media f18">
           <div style="width: 180rpx" class="ell">
-            <span class="c80">面积：</span>{{ areaInfo.area || "--" }}㎡
+            <span class="c80">建筑面积：</span>{{ areaInfo.area || "--" }}㎡
           </div>
         </div>
         <div class="f18 flex right-footer">

src/pages/detail/carrierDetail.vue

@@ -16,7 +16,7 @@
                 <div class="detail-cell__info flex1">
                   <div class="detail-cell__info-name">建筑面积：</div>
                   <div class="detail-cell__info-value">
-                    {{ handleValue(detail.area, "亩") }}
+                    {{ handleValue(detail.area, "㎡") }}
                   </div>
                 </div>
               </div>
@@ -54,7 +54,7 @@
                 <div class="detail-cell__info text-26">
                   <div class="detail-cell__info-name">层高：</div>
                   <div class="detail-cell__info-value">
-                    {{ handleValue(detail.floorHigh, "㎡") }}
+                    {{ handleValue(detail.floorHigh, "m") }}
                   </div>
                 </div>
               </div>
@@ -115,22 +115,23 @@
             <div class="detail-cell__body">
               <div class="detail-cell__list-item">
                 <ListItem
+                  no-address
                   :item="detail.carrierParkVo"
                   @to-detail="toIndustrialDetail"
                 >
                   <template>
-                    <div class="flex">
-                      <div class="flex align-center flex1">
-                        <div>级别：</div>
+                    <div>
+                      <div class="flex align-center flex1" style="margin-bottom: 20rpx;">
+                        <div>产业园级别：</div>
                         <div>
                           {{ handleValue(detail.carrierParkVo.levelName) }}
                         </div>
                       </div>
                       <div class="flex align-center flex1">
-                        <div>面积：</div>
+                        <div>占地面积：</div>
                         <div>
                           {{
-                            handleValue(detail.carrierParkVo.coverArea, "m²")
+                            handleValue(detail.carrierParkVo.coverArea, "亩")
                           }}
                         </div>
                       </div>

src/pages/detail/components/ListItem.vue

@@ -6,7 +6,7 @@
     <div class="list-item__right-cell flex1">
       <div class="ell list-item__title">{{ item.name }}</div>
       <div class="list-item__content">
-        <div class="flex align-center mb-20">
+        <div v-if="!noAddress" class="flex align-center mb-20">
           <div>地区：</div>
           <div>{{ handleValue(address) }}</div>
         </div>
@@ -26,6 +26,10 @@ export default {
       type: Object,
       default: () => ({}),
     },
+    noAddress: {
+      type: Boolean,
+      default: false,
+    }
   },
   computed: {
     address() {

src/pages/detail/industrialDetail.vue

@@ -91,22 +91,22 @@
           </div>
           <!-- 园内载体 -->
           <div v-if="detail.parkCarrier.length > 0" class="detail-cell">
-            <div class="detail-cell__title">园区内配套</div>
+            <div class="detail-cell__title">园区关联的载体</div>
             <div class="detail-cell__body">
               <div
                 v-for="item of detail.parkCarrier"
                 :key="item.id"
                 class="detail-cell__list-item"
               >
-                <ListItem :item="item" @to-detail="toCarrier(item)">
+                <ListItem :item="item" @to-detail="toCarrier(item)" no-address>
                   <template>
-                    <div class="flex">
-                      <div class="flex align-center flex1">
-                        <div>类型：</div>
+                    <div>
+                      <div class="flex align-center flex1" style="margin-bottom: 20rpx;">
+                        <div>载体类型：</div>
                         <div>{{ handleValue(item.type) }}</div>
                       </div>
                       <div class="flex align-center flex1">
-                        <div>面积：</div>
+                        <div>建筑面积：</div>
                         <div>{{ handleValue(item.area, "m²") }}</div>
                       </div>
                     </div>

src/pages/inviteInvestment/index.vue

@@ -19,7 +19,7 @@
       <div v-if="activeBar === 0">
         <div v-for="light in lights" :key="light.title">
           <section-title :title="light.title"></section-title>
-          <p style="font-size: 22rpx;color: #606266;padding-left: 6rpx;">{{light.titleIntroduce}}</p>
+          <p class="many-content" style="color: #606266;padding-left: 6rpx;">{{light.titleIntroduce}}</p>
         </div>
       </div>
       <!-- 重点产业 -->

src/pages/inviteInvestment/industryDetail.vue

@@ -2,7 +2,7 @@
   <div style="padding: 40rpx 23rpx;">
     <div>
       <section-title title="产业概况"></section-title>
-      <p style="font-size: 22rpx;color: #606266;padding-left: 6rpx;">{{primaryIndustryList[pageId].titleIntroduce}}</p>
+      <p class="many-content" style="color: #606266;padding-left: 6rpx;">{{primaryIndustryList[pageId].titleIntroduce}}</p>
     </div>
     <div>
       <section-title title="相关载体">

src/pages/inviteInvestment/policyDetail.vue

@@ -2,7 +2,7 @@
   <div style="padding: 40rpx 23rpx;">
     <div v-for="policy in policyList[pageId].info" :key='policy.name'>
       <section-title :title="policy.name"></section-title>
-      <p style="font-size: 22rpx;color: #606266;padding-left: 6rpx;">{{policy.content}}</p>
+      <p class="many-content" style="color: #606266;padding-left: 6rpx;">{{policy.content}}</p>
     </div>
   </div>
 </template>