Merge branch 'feature_20250820_页面优化' into release

src/components/uploadVNormal.vue

@@ -530,7 +530,7 @@ export default {
 .questionNamep {
   font-size: 16px;
   color: #484848;
-  line-height: 40px;
+  // line-height: 40px;
   padding: 0 15px;
   box-sizing: border-box;
   position: relative;
@@ -586,7 +586,7 @@ export default {
   width: 10px;
   height: 10px;
   left: -1000px;
-  position: relative;
+  position: absolute;
 }
 </style>
 <style lang="scss">

src/views/deviceWithin/addStoreVisit.vue

@@ -2906,6 +2906,9 @@
             ref="uploadVNormal"></upload-img>
         </template>
       </van-cell>
+      <div v-if="continuousShoot == '1'" class="uploadImgNum" style="color: red; padding: 0px 16px">
+        注:拍照功能支持每次最多5张连拍,可多次连拍。
+      </div>
       <!-- <van-cell v-if="pictureSource == '1'">
         <template #title> <span class="van-f-red">*</span>相册选择</template>
         <template #right-icon>

src/views/storeManagement/JPattributeEditor.vue

@@ -51,8 +51,8 @@
           v-model="detail.totalSalesAmount"
           type="number"
           label="门店24年总进货额（含所有品牌品类）" />
-        <van-field v-model="detail.performanceRatio" type="number" label="立邦业绩占比(%)" />
-        <van-field v-model="detail.mainBrand" autosize type="textarea" label="主营T0P3品牌" />
+        <van-field v-model="detail.performanceRatio" type="number" label="门店立邦业绩占比(%)" />
+        <van-field v-model="detail.mainBrand" autosize type="textarea" label="门店主营TOP3品牌" />
         <van-field label="紧急联系人身份">
           <template #input>
             <van-radio-group v-model="detail.emergencyContactRelation" direction="horizontal">

src/views/storeManagement/storeDetail.vue

@@ -128,11 +128,13 @@
             v-if="list.ifJzStoreType == 1 && list.storeCategory != 'C917'"
             v-model="list.contactName"
             label="老板" />
-          <van-field
-            readonly
-            v-model="list.telephone"
-            label="联系电话"
-            v-if="list.storeCategory != 'C917'" />
+          <template v-if="list.storeCategory != 'C917'">
+            <van-field
+              readonly
+              v-model="list.telephone"
+              label="联系电话"
+              v-if="list.ifJpStoreType != '1'"
+          /></template>
           <template v-if="list.storeCategory != 'C917'">
             <!-- 分销店 -->
             <template
@@ -357,13 +359,13 @@
               <van-field
                 readonly
                 v-model="list.storeArchives.performanceRatio"
-                label="立邦业绩占比(%)" />
+                label="门店立邦业绩占比(%)" />
               <van-field
                 readonly
                 autosize
                 type="textarea"
                 v-model="list.storeArchives.mainBrand"
-                label="主营T0P3品牌" />
+                label="门店主营TOP3品牌" />
               <van-field
                 readonly
                 v-model="list.storeArchives.emergencyContactRelation"
@@ -1358,6 +1360,7 @@ export default {
       this.lon = '';
       getById({ storeId: this.$route.query.id })
         .then((res) => {
+          this.tabVal = res.data.ifJpStoreType == '1' ? 'outsidePlan' : 'insidePlan';
           localStorage.setItem('locationRemark', res.data.addressLine);
           localStorage.setItem('orgName', res.data.orgName);
           localStorage.setItem('chainName', res.data.storeName);