upadate

src/api/sameCityTransport/sameCityTransport.js

@@ -30,3 +30,11 @@ export function saveSameCityTransport(params){
     data:params,
   })
 }
+
+export function getSFTypeList(params){
+  return request({
+    url: URL.shop.store.sameCityTransport.getSFTypeList,
+    method: 'get',
+    params,
+  })
+}

src/config/net.config.js

@@ -1033,7 +1033,8 @@ let url = {
       sameCityTransport:{
         getSameCityTransport: api_url + '/admin/shop/store/same-city-transport/detail',
         saveSameCityTransport: api_url + '/admin/shop/store/same-city-transport/save',
-        delectArea:api_url + '/admin/shop/store/same-city-transport/delete/area'
+        delectArea:api_url + '/admin/shop/store/same-city-transport/delete/area',
+        getSFTypeList:api_url + '/admin/shop/shop-store-base/business/list'
       }
     },
     user: {

src/views/store/base/distributionSetup/localDelivery.vue

@@ -3,7 +3,12 @@
     <div class="item-block">
       <div class="title">同城配送</div>
       <div class="block">
-        <el-form ref="form" :model="form" label-width="160px" :rules="rules">
+        <el-form
+          ref="formDistribution"
+          :model="form"
+          label-width="160px"
+          :rules="rules"
+        >
           <el-form-item label="配送方式" prop="distributionType">
             <el-checkbox-group v-model="form.distributionType">
               <el-checkbox
@@ -129,14 +134,17 @@
               prop="sfData.developerAccount"
               v-if="active == 2"
             >
-              <el-input v-model="form.sfData.developerAccount"></el-input>
+              <el-input
+                disabled
+                v-model="form.sfData.developerAccount"
+              ></el-input>
             </el-form-item>
             <el-form-item
               label="开发者秘钥（dev_key）"
               prop="sfData.devKey"
               v-if="active == 2"
             >
-              <el-input v-model="form.sfData.devKey"></el-input>
+              <el-input disabled v-model="form.sfData.devKey"></el-input>
             </el-form-item>
             <el-form-item
               label="店铺id"
@@ -157,8 +165,8 @@
                 <el-option
                   v-for="(item, index) of goodsTypeList"
                   :key="index + item.value"
-                  :label="item.label"
+                  :label="item.value"
-                  :value="item.value"
+                  :value="item.key"
                 ></el-option>
               </el-select>
             </el-form-item>
@@ -1129,6 +1137,7 @@ import {
   getSameCityTransport,
   saveSameCityTransport,
   delectArea,
+  getSFTypeList,
 } from '@/api/sameCityTransport/sameCityTransport'
 import { ChineseDistricts } from '@/components/VabArea/city-picker.data'
 import {
@@ -1146,7 +1155,7 @@ export default {
   data() {
     return {
       ChineseDistricts: {},
-      active: 0,
+      active: 2,
       weekListConfig: weekListConfig,
       distributionOpction: distributionOpction,
       checkList: checkList,
@@ -1203,20 +1212,20 @@ export default {
           ],
         },
         sfData: {
-          developerAccount: [
+          // developerAccount: [
-            {
+          //   {
-              required: true,
+          //     required: true,
-              message: '请输入开发者账号（dev_id）',
+          //     message: '请输入开发者账号（dev_id）',
-              trigger: 'blur',
+          //     trigger: 'blur',
-            },
+          //   },
-          ],
+          // ],
-          devKey: [
+          // devKey: [
-            {
+          //   {
-              required: true,
+          //     required: true,
-              message: '请输入开发者秘钥（dev_key）',
+          //     message: '请输入开发者秘钥（dev_key）',
-              trigger: 'blur',
+          //     trigger: 'blur',
-            },
+          //   },
-          ],
+          // ],
           storeId: [
             { required: true, message: '请输入店铺id', trigger: 'blur' },
           ],
@@ -1264,8 +1273,8 @@ export default {
         radiusNum: [{ required: true, message: '', trigger: 'blur' }],
       },
       form: {
-        distributionType: [1],
+        distributionType: [0, 2],
-        no3DistributionType: [],
+        no3DistributionType: [3],
         dadaData: {
           appKey: 'dada8e0c052d94e8a09',
           appSecret: 'a5350665c9200871e5671440437b7f1b',
@@ -1280,8 +1289,8 @@ export default {
           payType: 0,
         },
         sfData: {
-          developerAccount: '',
+          developerAccount: '************',
-          devKey: '',
+          devKey: '************',
           appSecret: '',
           storeId: '',
           goodsType: null,
@@ -1398,13 +1407,22 @@ export default {
     this.ChineseDistricts = ChineseDistricts
     this.getSameCityTransport()
     this.getCompanyInfo()
-    this.goodsTypeList = Object.keys(this.goodsTypeData).map((key) => ({
+
-      label: this.goodsTypeData[key],
+    this.getSFTypeList()
-      value: Number(key),
-    }))
   },
   beforeDestroy() {},
   methods: {
+    async getSFTypeList() {
+      let res = await getSFTypeList()
+      if (res && res.status == 200) {
+        this.goodsTypeList = res.data
+      } else {
+        this.goodsTypeList = Object.keys(this.goodsTypeData).map((key) => ({
+          value: this.goodsTypeData[key],
+          key: Number(key),
+        }))
+      }
+    },
     async getSameCityTransport() {
       let res = await getSameCityTransport()
       if (res && res.status == 200) {
@@ -1424,6 +1442,11 @@ export default {
         this.form.weightAdd.weightAddNum = transportBase.weight_increase_kg
         this.form.weightAdd.FreightAddNum = transportBase.weight_increase_fee
 
+        if (this.active == 2) {
+          this.form.sfData.storeId = transportBase.shop_id
+          this.form.sfData.goodsType = transportBase.business_type
+        }
+
         let arr = transportList.map((item, index) => {
           let obj = {
             areaNum: index + 1,
@@ -2086,6 +2109,18 @@ export default {
         },
         transportList: list,
       }
+      let isValid = true
+      if (this.active == 2) {
+        this.$refs['formDistribution'].validate((valid) => {
+          isValid = valid
+          if (valid) {
+            params.transportBase.shop_id = this.form.sfData.storeId
+            params.transportBase.business_type = this.form.sfData.goodsType
+          }
+        })
+      }
+
+      if (!isValid) return
 
       let res = await saveSameCityTransport(params)
       if (res && res.status == 200) {