Browse Source

feat 门店新增、门店更新

Funny 3 years ago
parent
commit
493d319f43
4 changed files with 39 additions and 19 deletions
  1. 18 2
      src/api/http.js
  2. 5 5
      src/api/order.js
  3. 4 4
      src/api/shop.js
  4. 12 8
      src/components/shopCompoents/shopAdd.vue

+ 18 - 2
src/api/http.js

@@ -17,9 +17,7 @@ service.interceptors.request.use(config => {
   let token = localStorage.getItem('token')
   let timeStamp = new Date().getTime()
   let str = `appId=${appId}&timeStamp=${timeStamp}&appSecret=${appSecret}`
-  // console.log('str:', str);
   let sign = md5(str).toUpperCase()
-  // console.log('sign:', sign);
   config.headers = {
     ...config.headers,
     // 设置全局请求头
@@ -91,6 +89,15 @@ export function get(url, params = {}) {
 
 //封装post请求
 export function post(url, data = {}) {
+  let timeStamp = new Date().getTime()
+  let str = `appId=${appId}&timeStamp=${timeStamp}&appSecret=${appSecret}`
+  let sign = md5(str).toUpperCase()
+  data = {
+    appId: appId,
+    timeStamp: timeStamp,
+    sign: sign,
+    ...data
+  }
   //默认配置
   let sendObject = {
     url: requestUrl + url,
@@ -106,6 +113,15 @@ export function post(url, data = {}) {
 
 //封装post请求
 export function postJson(url, data = {}) {
+  let timeStamp = new Date().getTime()
+  let str = `appId=${appId}&timeStamp=${timeStamp}&appSecret=${appSecret}`
+  let sign = md5(str).toUpperCase()
+  data = {
+    appId: appId,
+    timeStamp: timeStamp,
+    sign: sign,
+    ...data
+  }
   //默认配置
   let sendObject = {
     url: requestUrl + url,

+ 5 - 5
src/api/order.js

@@ -128,21 +128,21 @@ export const getOrderDetail = (params) => {
 // 标准化接口
 // 订单计费
 export const orderValuation = (params) => {
-  return post('api/order/valuation', params);
+  return postJson('api/order/valuation', params);
 }
 // 创建订单
 export const orderCreate = (params) => {
-  return post('api/order/create', params);
+  return postJson('api/order/create', params);
 }
 // 取消订单
 export const orderCancel = (params) => {
-  return post('api/order/cancel', params);
+  return postJson('api/order/cancel', params);
 }
 // 推送订单
 export const orderPush = (params) => {
-  return post('api/order/push', params);
+  return postJson('api/order/push', params);
 }
 // 获取骑手位置
 export const riderLocation = (params) => {
-  return post('api/order/rider/location', params);
+  return postJson('api/order/rider/location', params);
 }

+ 4 - 4
src/api/shop.js

@@ -203,17 +203,17 @@ export const bindChangeShop = (params) => {
 // 标准化接口
 // 门店创建
 export const shopCreate = (params) => {
-  return post('api/shop/create', params)
+  return postJson('api/shop/create', params)
 }
 // 门店更新
 export const shopUpdate = (params) => {
-  return post('api/shop/update', params)
+  return postJson('api/shop/update', params)
 }
 // 门店运力查询
 export const shopDelivery = (params) => {
-  return post('api/shop/delivery', params)
+  return postJson('api/shop/delivery', params)
 }
 // 门店运力禁用/开启
 export const shopDeliveryStatus = (params) => {
-  return post('api/shop/delivery/status', params)
+  return postJson('api/shop/delivery/status', params)
 }

+ 12 - 8
src/components/shopCompoents/shopAdd.vue

@@ -84,6 +84,7 @@ export default {
       form: {
         id: "",
         address: "",
+        provinceName: "",
         cityCode: "",
         cityName: "",
         contactName: "",
@@ -113,16 +114,19 @@ export default {
         getShopDetail({ shopId: e.id }).then((res) => {
           console.log("门店详情:", res);
           if (res.code === 200) {
-            this.form = res.data;
+            Object.keys(this.form).map((v) => {
+              this.form[v] = res.data[v];
+            });
             this.form.shopName = res.data.name;
             this.form.contactPhone = res.data.mobile;
             this.form.houseNumber = res.data.street;
             this.form.longitude = res.data.lng;
             this.form.latitude = res.data.lat;
-            this.deliveries = this.form.deliveries.filter((v) => {
+            this.form.shopCode = res.data.code
+            this.deliveries = res.data.deliveries.filter((v) => {
               return v.bindStatus === 1 && v.type !== 3;
             });
-            this.revieweds = this.form.deliveries.filter((v) => {
+            this.revieweds = res.data.deliveries.filter((v) => {
               return v.type === 3;
             });
           } else {
@@ -137,9 +141,9 @@ export default {
         this.form = {
           address: "",
           contactName: "",
-          mobile: "",
-          name: "",
-          street: "",
+          contactPhone: "",
+          shopName: "",
+          houseNumber: "",
           categoryId: "",
         };
       }
@@ -222,7 +226,7 @@ export default {
       this.loading = true;
       if (this.form.id) {
         shopUpdate(this.form).then((res) => {
-          if (res.code === 200) {
+          if (res.code === 200 || res.code === 0) {
             this.$message({
               type: "success",
               message: `保存成功!`,
@@ -239,7 +243,7 @@ export default {
         });
       } else {
         shopCreate(this.form).then((res) => {
-          if (res.code === 200) {
+          if (res.code === 200 || res.code === 0) {
             this.$message({
               type: "success",
               message: `新增成功!`,