查看物流进度

src/api/mall/merchantMallgoods.js

@@ -39,73 +39,74 @@ export function getGoodsInfo(query) {
     params: query
   })
 }
-
-//
-// export function addObj(obj) {
-//   return request({
-//     url: '/general/mallGoods',
-//     method: 'post',
-//     params: obj
-//   })
-// }
-//
-// export function getObj(id) {
-//   return request({
-//     url: '/general/mallGoods/' + id,
-//     method: 'get'
-//   })
-// }
-//
-//
-// export function putObj(obj) {
-//   return request({
-//     url: '/general/mallGoods',
-//     method: 'put',
-//     params: obj
-//   })
-// }
 // export function getGoodsInfo(params) {
 //   return request({
-//     url: '/general/mallGoods/getGoodsDetails',
+//     url: '/admin/merchantMallGoods/getGoodsDetails',
 //     method: 'get',
 //     params:params
 //   })
 // }
-//
-//
-//
-// export function isNotHot(parameter) {
-//   return request({
-//     url: '/general/mallGoods/batchSetIsNotHot',
-//     method: 'put',
-//     params:parameter
-//   })
-// }
-//
-// export function isHot(parameter) {
-//   return request({
-//     url: '/general/mallGoods/batchSetIsHot',
-//     method: 'put',
-//     params:parameter
-//   })
-// }
-//
-//
 
-//
-// export function delObj(parameter) {
-//   return request({
-//     url: '/general/merchant/mallGoods/',
-//     method: 'delete',
-//     params:parameter
-//   })
-// }
-//
-// export function querySpecNameById(parameter) {
-//   return request({
-//     url: '/general/mallGoodsSpec/querySpecNameById',
-//     method: 'get',
-//     params:parameter
-//   })
-// }
-//
+
+export function addObj(obj) {
+  return request({
+    url: '/general/merchantMallGoods',
+    method: 'post',
+    params: obj
+  })
+}
+
+export function getObj(id) {
+  return request({
+    url: '/general/merchantMallGoods/' + id,
+    method: 'get'
+  })
+}
+
+
+export function putObj(obj) {
+  return request({
+    url: '/admin/merchantMallGoods',
+    method: 'put',
+    params: obj
+  })
+}
+
+
+
+
+export function isNotHot(parameter) {
+  return request({
+    url: '/admin/merchantMallGoods/batchSetIsNotHot',
+    method: 'put',
+    params:parameter
+  })
+}
+
+export function isHot(parameter) {
+  return request({
+    url: '/admin/merchantMallGoods/batchSetIsHot',
+    method: 'put',
+    params:parameter
+  })
+}
+
+
+
+
+export function delObj(parameter) {
+  return request({
+    url: '/admin/merchantMallGoods/mallGoods/',
+    method: 'delete',
+    params:parameter
+  })
+}
+
+export function querySpecNameById(parameter) {
+  return request({
+    url: '/admin/mallGoodsSpec/querySpecNameById',
+    method: 'get',
+    params:parameter
+  })
+}
+

src/api/mall/merchantMallorder.js

@@ -60,7 +60,6 @@ export function viewLogisticsApi(query) {
   return request({
     url: '/admin/merchantMallOrder/viewLogistics',
     method: 'get',
-    headers:{'Authorization':'APPCODEd 348918fca3c4f73acf99e4162b6fa03'},
     params: query
   })
 }

src/const/crud/mall/merchantMallorder.js

@@ -31,7 +31,6 @@ export const tableOption = {
       "type": "input",
       "label": "订单ID",
       "prop": "id",
-      // showColumn: false,
     },
     {
       "type": "select",
@@ -80,5 +79,17 @@ export const tableOption = {
         return row.takeName+"--"+row.phone+"--"+row.address
       }
     },
+    {
+      "type": "input",
+      "label": "快递单号",
+      "prop": "waybillNo",
+      showColumn: false,
+    },
+    {
+      "type": "input",
+      "label": "快递公司",
+      "prop": "expressCompany",
+      showColumn: false,
+    },
   ]
 }

src/views/businessGoods/goodsEdit/goods_api.js

@@ -35,6 +35,6 @@ export function addOrEditGoods(data) {
   return request({
     url: '/admin/merchantMallGoods/addOrEditGoods',
     method: 'get',
-    data
+    params: data
   })
 }

src/views/businessGoods/goodsEdit/goods_edit.vue

@@ -229,8 +229,8 @@
         //表单数据
         form: {
           merchantId:'',
-          goodsName: "",
-          goodsClassId: "",
+          goodsName: "1",
+          goodsClassId: "1",
           skus: [],
           listImage: "",
           detailImage: "",
@@ -691,7 +691,9 @@
             {account: account}
           ).then(response => {
             this.form.merchantId=response.data.data.id
-            addOrEditGoods(this.form).then(data => {
+            alert(JSON.stringify(this.form))
+
+            addOrEditGoods(JSON.stringify(this.form)).then(data => {
               this.$message.success('添加成功')
               done()
             }).catch(() => {

src/views/businessOrder/index.vue

@@ -249,21 +249,20 @@
           viewLogistics(row){
             // 1.打开对话框
             this.dialogVisible = true
-            this.form.waybillNo=row.waybillNo
+            alert(row.waybillNo+row.expressCompany)
 
-            //
             viewLogisticsApi(
-             {waybillNo:'773170491924104',expressCompany:'sto'}
+             {waybillNo:row.waybillNo,expressCompany:row.expressCompany}
               ).then(r=>{
-              let d = JSON.stringify(r.data.data.result.list)
-              console.log(d)
-              for (let dKey in d) {
-                console.log(dKey)
+              for (let i = 0; i <r.data.data.result.list.length ; i++) {
+                if(i === 0){
+                  this.activities.push({"content":r.data.data.result.list[i].status,
+                    "timestamp":r.data.data.result.list[i].time,color: '#0bbd87'})
+                }else {
+                  this.activities.push({"content":r.data.data.result.list[i].status,
+                    "timestamp":r.data.data.result.list[i].time})
+                }
               }
-              // this.activities=d
-              //   this.activities=[{content: '快递送至【成都市】物流运转中心', timestamp: '2018-04-11'}
-              //     ,{color: '#0bbd87',content: '快递送至【成都市】物流运转中心', timestamp: '2018-04-11'}
-              //     ,{content: '快递送至【成都市】物流运转中心', timestamp: '2018-04-11'}]
 
             })