Merge branch 'feature/zl' into 'test'

auto commit

See merge request com.pica.cloud.education.frontend/pica.cloud.web-education-admin!487

gitPush.sh

@@ -5,10 +5,12 @@ if [ ! $hasGit ];then
   echo 'Please download git first!';
   exit 1;
 else
+  git fetch --all
   result=`git symbolic-ref --short -q HEAD` # 获取分支名
-  curBranch=${result} # 去除多余的*
-  echo `你的当前分支是:$curBranch`
+  current_id=`git log -n 1 test --pretty=format:"%H"`
+  git reset --soft $current_id
   git add .
   git commit -m "$msg"
-  git push origin $curBranch # 提交代码到github(修改了远程项目名)
+  echo "curBranch $result"
+  git push origin  -f $result # 提交代码到github(修改了远程项目名)
 fi

src/views/shop/create-shop.vue

@@ -1181,7 +1181,7 @@
                 <div class="detectionAddress-wrap">
                   <div class="detectionAddress-title">
                     <span class="bold">平台默认</span>
-                    <el-button type="primary" size="small" @click="createDetectionAdress(0)">+新增地址</el-button>
+                    <el-button v-if="!formData.tradeStoreDetectionAddress.receiverMobile" type="primary" size="small" @click="createDetectionAdress(0)">+新增地址</el-button>
                   </div>
                   <div class="detectionAddress" v-if="formData.tradeStoreDetectionAddress && formData.tradeStoreDetectionAddress.receiverMobile">
                     <div class="warehouseAdress-item">
@@ -1198,7 +1198,7 @@
                   </div>
                   <div class="detectionAddress-title dt-border-top">
                     <span class="bold">指定区域</span>
-                    <el-button type="primary" size="small" @click="createAreaAddress(0)">+新增地址</el-button>
+                    <el-button v-if="formData.detectionAreaAddressList.length <= 10" type="primary" size="small" @click="createAreaAddress(0)">+新增地址</el-button>
                   </div>
                   <div class="warehouseAdress-list border-none" v-if="formData.detectionAreaAddressList.length > 0" v-model="checkList">
                     <div class="warehouseAdress-item" v-for="(addressItem, index) of formData.detectionAreaAddressList" :key="index">
@@ -3267,11 +3267,21 @@ export default {
       }
     },
     areaContentPop(array) {
-      let s =  '';
-      array.forEach( i => {
-        s = s + '  ' + i.cityName;
+      let res = {}
+      array.map(item => {
+        res[item.provinceId] = res[item.provinceId] || [];
+        res[item.provinceId].push(item);
       })
-      return s;
+      let str = '';
+      Object.keys(res).forEach( i => {
+        let pri = res[i][0].provinceName + ':';
+        res[i].forEach( k => {
+          pri = pri + " " + k.cityName;
+        })
+        str = pri + ' / ' + str;
+      });
+      str = str.substr(0, str.length - 2)
+      return str;
     },
     addrChange() {
       this.warehouseAdressForm.address = this.warehouseAdressForm.addr;
@@ -3622,5 +3632,7 @@ export default {
   font-weight: 600;
   color: #FFFFFF;
   min-width: auto;
+  max-width: 1000px;
+  word-break: break-all;
 }
 </style>