优化地址

src/views/shop/create-shop.vue

@@ -653,7 +653,8 @@
               </el-option>
             </el-select>
           </el-form-item>
-          <el-form-item prop="townId" label="乡/镇" label-width="70px">
+          <!-- <el-form-item prop="townId" label="乡/镇" label-width="70px"> -->
+          <el-form-item label="乡/镇" label-width="70px">
             <el-select
               v-model="warehouseAdressForm.townId"
               class="warehouseAdress-input"
@@ -792,7 +793,7 @@ export default {
         key: ''
       },
       warehouseAdressFormVisible: false,
-      warehouseAdressFormTitle: '创建地址',
+      warehouseAdressFormTitle: '添加地址',
       provincesList: [],
       cityList: [],
       countyList: [],
@@ -1082,9 +1083,16 @@ export default {
     },
     // 返回
     back() {
-      this.$router.push({
-        path: "/shop-list",
-      });
+      this.$confirm('确认要返回吗?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'error'
+        }).then(() => {
+          this.$router.push({
+            path: "/shop-list",
+          });
+        }).catch(() => {      
+        });
     },
     checkPhone(val) {
       if (!/^1[3456789]\d{9}$/.test(val)) {
@@ -1521,7 +1529,7 @@ export default {
     // 编辑第几条数据  index
     createAdress(type,index) {
       this.warehouseAdressType = type;
-      this.warehouseAdressFormTitle = type ? '编辑地址' : '创建地址';
+      this.warehouseAdressFormTitle = type ? '编辑地址' : '添加地址';
       this.warehouseAdressIndex = type ? index : '';
       if (type) {
         Object.assign(this.warehouseAdressForm,this.formData.repotList[index]);
@@ -1685,7 +1693,8 @@ export default {
     },
     // 格式化地址
     setAddress(arg) {
-      return arg.provinceName + arg.cityName + arg.countyName + arg.townName + arg.addr;
+      let townName = arg.townName || '';
+      return arg.provinceName + arg.cityName + arg.countyName + townName + arg.addr;
     },
     // 获取退货物流
     getCompanyList() {
@@ -1901,7 +1910,12 @@ export default {
           margin-bottom: 0;
         }
       }
+      .el-radio__label {
+        display: flex;
+        flex: 1;
+      }
       .warehouseAdress-main {
+        flex: 1;
         padding-right: 60px;
       }
       .warehouseAdress-msg {
@@ -1914,6 +1928,7 @@ export default {
         color: #449284;
         background: #fff;
         padding: 0 10px 0 10px;
+        width: 100px;
       }
     }
   }