Merge branch 'feature/zl' into 'release'

Feature/zl

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

src/views/shop/create-shop.vue

@@ -1201,11 +1201,12 @@
                     <el-button v-if="formData.detectionAreaAddressList.length < 50" 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">
+                    <div class="warehouseAdress-item warehouseAdress-item-first" v-for="(addressItem, index) of formData.detectionAreaAddressList" :key="index">
                       <el-popover
                         placement="top-start"
                         title=""
                         trigger="hover"
+                        :offset="20"
                         :visible-arrow="false"
                         :content="areaContentPop(addressItem.areaList)">
                                              <p slot="reference" class="warehouseAdress-main">
@@ -3508,6 +3509,8 @@ export default {
         &:last-of-type {
           margin-bottom: 0;
         }
+      }
+      .warehouseAdress-item-first{
         &>span:first-child{
           flex: 1;
         }