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

src/api/url/index.js

@@ -12,6 +12,8 @@ export default {
   industrialDetail: '/postcard/api/parkInfo/v1.0/detail',
   // 载体详情
   carrierDetail: '/postcard/api/carrier/v1.0/detail',
+  // 土地详情
+  landDetail: '/postcard/api/land/v1.0/detail',
   // 招商引资-招商亮点
   investmentLights: '/postcard/api/developmentInfo/v1.0/detail',
   // 提交咨询信息

src/pages/detail/landDetail.vue

@@ -56,7 +56,7 @@ export default {
   },
   data() {
     return {
-      queryUrl: api.carrierDetail,
+      queryUrl: api.landDetail,
     };
   },
   methods: {

src/pages/investment/index.vue

@@ -41,7 +41,7 @@
                 border="none"
                 suffixIcon="arrow-right"
                 :suffixIconStyle="{ fontSize: '30rpx' }"
-                placeholder="请输入类别"
+                placeholder="请选择类别"
                 @tap="changeShowPicker(true)"
               ></u--input>
             </u-form-item>
@@ -413,13 +413,14 @@ export default {
   .contact-cell {
     .contact-item {
       background-color: white;
-      padding: 0 60rpx;
+      padding: 0 30rpx;
       display: flex;
       align-items: center;
       justify-content: space-between;
       height: 156rpx;
+      font-size: 28rpx;
       & ~ .contact-item {
-        margin-top: 40rpx;
+        margin-top: 20rpx;
       }
       .item-title {
         font-size: 32rpx;

src/pages/inviteInvestment/index.vue

@@ -73,7 +73,7 @@ export default {
   components: { sectionTitle, ElementCost },
   data() {
     return {
-      tabBarList: ["招商亮点", "重点企业", "招商政策", "要素成本"],
+      tabBarList: ["招商亮点", "重点产业", "招商政策", "要素成本"],
       activeBar: 0,
       lights: [],
       detail: null,

src/pages/inviteInvestment/industryDetail.vue

@@ -4,7 +4,7 @@
       <section-title title="产业概况"></section-title>
       <p class="many-content" style="color: #606266;padding-left: 6rpx;">{{primaryIndustryList[pageId].titleIntroduce}}</p>
     </div>
-    <div>
+    <div v-if="primaryIndustryList[pageId].carrirList.length > 0">
       <section-title title="相关载体">
       </section-title>
       <div v-for="carrier in primaryIndustryList[pageId].carrirList" :key="carrier.id" style="margin-bottom: 20rpx;" @click="toDetail(carrier)">