优化设置退款地址

src/utils/base/baseApi.js

@@ -32,3 +32,12 @@ export const getCounties = (params) => {
     params: params,
   });
 };
+
+// /*获取乡镇*/
+export const getTowns = (params) => {
+  return fetch({
+    url: getBaseUrl(`/basic-data/position/towns`),
+    method: "get",
+    params: params,
+  });
+};

src/views/goods/create-good.vue

@@ -93,12 +93,12 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-             <el-form-item label="是否支持退货退款" prop="expressLimitFlag" v-if="storeType < 3">
+             <el-form-item label="是否支持售后" prop="expressLimitFlag" v-if="storeType < 3">
               <el-radio-group v-model="formData.expressLimitFlag" :disabled="!hasRepoFlag">
                 <el-radio :label="1">是</el-radio>
                 <el-radio :label="0">否</el-radio>
               </el-radio-group>
-              <p class="backTip" v-if="!hasRepoFlag" @click="goShopDeatil">若需设置商品支持退货退款，需先至店铺页<span class="ad-back">设置退款地址</span></p>
+              <p class="backTip" v-if="!hasRepoFlag" @click="goShopDeatil">若需设置商品支持售后，需先至店铺页<span class="ad-back">设置退款地址</span></p>
             </el-form-item>
            
 
@@ -1094,12 +1094,13 @@
             });
           };
 
-          const { goodsInfo, medicalService, buyLimitDtoList} = res.data;
+          const { goodsInfo, medicalService, buyLimitDtoList, hasRepoFlag} = res.data;
 
           this.formData = {...this.formData, ...goodsInfo};
           this.formData2 = medicalService;
           this.formData = { ...this.formData, ...this.formData2 };
           this.buyLimitDtoList = buyLimitDtoList;
+          this.hasRepoFlag = hasRepoFlag;
           this.$set(this.formData2, 'suitableArr', this.formData.suitable.split(','));
           this.$set(this.formData, 'suitableArr', this.formData.suitable.split(','));
           this.formData.optPrice = this.formData.costPrice/100;

src/views/shop/create-shop.vue

@@ -653,6 +653,24 @@
               </el-option>
             </el-select>
           </el-form-item>
+          <el-form-item prop="townId" label="乡/镇" label-width="70px">
+            <el-select
+              v-model="warehouseAdressForm.townId"
+              class="warehouseAdress-input"
+              filterable
+              clearable
+              placeholder="乡/镇"
+              @change="changeTown"
+            >
+              <el-option
+                v-for="item in townList"
+                :key="item.townId"
+                :label="item.townName"
+                :value="item.townId"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
           <el-form-item label="详细地址" label-width="70px" prop="addr">
             <el-input v-model="warehouseAdressForm.addr" autocomplete="off" clearable class="warehouseAdress-input"></el-input>
           </el-form-item>
@@ -671,7 +689,7 @@ import { openLoading, closeLoading } from "../../utils/utils";
 import { doUpload, getFilePath } from "../../utils/qiniu-util";
 import Cropper from "@/components/common/cropper.vue";
 import { saveStore, queryStore, getLgCompanyList, getStoreAdressRepot } from "@/utils/shop";
-import { getProvinces, getCities, getCounties } from '@/utils/base/baseApi';
+import { getProvinces, getCities, getCounties, getTowns } from '@/utils/base/baseApi';
 import { checkMobile } from "@/utils/patients/checkValid";
 export default {
   components: {
@@ -765,9 +783,11 @@ export default {
         provinceId: '',
         cityId: '',
         countyId: '',
+        townId: '',
         provinceName: '',
         cityName: '',
         countyName: '',
+        townName: '',
         addr: '',
         key: ''
       },
@@ -776,6 +796,7 @@ export default {
       provincesList: [],
       cityList: [],
       countyList: [],
+      townList: [],
       warehouseAdressRules: {
         receiver: [
           { required: true, message: "请输入店铺名称", trigger: "blur" },
@@ -792,6 +813,7 @@ export default {
         provinceId: { required: true, message: "请选择省", trigger: ["change", "blur"]  },
         cityId: { required: true, message: "请选择市", trigger: ["change", "blur"]  },
         countyId: { required: true, message: "请选择区/县", trigger: ["change", "blur"]  },
+        townId: { required: true, message: "请选择乡/镇", trigger: ["change", "blur"]  },
         addr:[
           { required: true, message: "请输入详细收货地址", trigger: "blur" }
         ],
@@ -1030,9 +1052,6 @@ export default {
     },
     complete() {
       let flag = this.submitForm();
-      console.log('====== this.formData==============================');
-      console.log( this.formData);
-      console.log(flag);
       if (flag) {
         // let para = {
         //   storeId: this.formData.storeId,
@@ -1508,6 +1527,7 @@ export default {
         Object.assign(this.warehouseAdressForm,this.formData.repotList[index]);
         this.getCitiesList();
         this.getCountiesList();
+        this.getTownsList();
       } else {
         this.warehouseAdressForm = {
           receiver: '',
@@ -1515,9 +1535,11 @@ export default {
           provinceId: '',
           cityId: '',
           countyId: '',
+          townId: '',
           provinceName: '',
           cityName: '',
           countyName: '',
+          townName: '',
           addr: '',
           key: ''
         }
@@ -1549,6 +1571,7 @@ export default {
     changeProvince() {
       this.warehouseAdressForm.cityId = "";
       this.warehouseAdressForm.countyId = "";
+      this.warehouseAdressForm.townId = "";
       this.countyList = [];
       this.getCitiesList();
       this.selectGet(this.warehouseAdressForm.provinceId, 'provinceId', 'provinceName',this.provincesList);
@@ -1556,13 +1579,20 @@ export default {
     // 选择市
     changeCity() {
       this.warehouseAdressForm.countyId = "";
+      this.warehouseAdressForm.townId = "";
       this.getCountiesList();
       this.selectGet(this.warehouseAdressForm.cityId, 'cityId', 'cityName',this.cityList);
     },
     // 选择区
     changeCounty() {
+      this.warehouseAdressForm.townId = "";
+      this.getTownsList();
       this.selectGet(this.warehouseAdressForm.countyId, 'countyId', 'countyName',this.countyList);
     },
+    // 选择乡镇
+    changeTown() {
+      this.selectGet(this.warehouseAdressForm.townId, 'townId', 'townName',this.townList);
+    },
     //获取省列表
     getProvincesList() {
       getProvinces()
@@ -1598,6 +1628,19 @@ export default {
           }
         })
         .catch({});
+    },
+     //获取镇列表
+    getTownsList() {
+      let params = {
+        countyId: this.warehouseAdressForm.countyId
+      };
+      getTowns(params)
+        .then((res) => {
+          if (res.code == "000000") {
+            this.townList = res.data.townList;
+          }
+        })
+        .catch({});
     },
     /* slelect时，获取省市区对应的名称
     * vId：省市区id
@@ -1642,7 +1685,7 @@ export default {
     },
     // 格式化地址
     setAddress(arg) {
-      return arg.provinceName + arg.cityName + arg.countyName + arg.addr;
+      return arg.provinceName + arg.cityName + arg.countyName + arg.townName + arg.addr;
     },
     // 获取退货物流
     getCompanyList() {