Skip to content

L
linshenxs-shop
Commit edd09763 by cpa
Options

查看物流进度

parent 9aaa0466
Showing with 92 additions and 80 deletions
src/api/mall/merchantMallgoods.js
...@@ -39,73 +39,74 @@ export function getGoodsInfo(query) { ...@@ -39,73 +39,74 @@ export function getGoodsInfo(query) {
params: 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) { // export function getGoodsInfo(params) {
// return request({ // return request({
// url: '/general/mallGoods/getGoodsDetails', // url: '/admin/merchantMallGoods/getGoodsDetails',
// method: 'get', // method: 'get',
// params:params // 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) { export function addObj(obj) {
// return request({ return request({
// url: '/general/merchant/mallGoods/', url: '/general/merchantMallGoods',
// method: 'delete', method: 'post',
// params:parameter params: obj
// }) })
// } }
//
// export function querySpecNameById(parameter) { export function getObj(id) {
// return request({ return request({
// url: '/general/mallGoodsSpec/querySpecNameById', url: '/general/merchantMallGoods/' + id,
// method: 'get', method: 'get'
// params:parameter })
// }) }
// }
//
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) { ...@@ -60,7 +60,6 @@ export function viewLogisticsApi(query) {
return request({ return request({
url: '/admin/merchantMallOrder/viewLogistics', url: '/admin/merchantMallOrder/viewLogistics',
method: 'get', method: 'get',
headers:{'Authorization':'APPCODEd 348918fca3c4f73acf99e4162b6fa03'},
params: query params: query
}) })
} }
......
src/const/crud/mall/merchantMallorder.js
...@@ -31,7 +31,6 @@ export const tableOption = { ...@@ -31,7 +31,6 @@ export const tableOption = {
"type": "input", "type": "input",
"label": "订单ID", "label": "订单ID",
"prop": "id", "prop": "id",
// showColumn: false,
}, },
{ {
"type": "select", "type": "select",
...@@ -80,5 +79,17 @@ export const tableOption = { ...@@ -80,5 +79,17 @@ export const tableOption = {
return row.takeName+"--"+row.phone+"--"+row.address 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) { ...@@ -35,6 +35,6 @@ export function addOrEditGoods(data) {
return request({ return request({
url: '/admin/merchantMallGoods/addOrEditGoods', url: '/admin/merchantMallGoods/addOrEditGoods',
method: 'get', method: 'get',
data params: data
}) })
} }
src/views/businessGoods/goodsEdit/goods_edit.vue
...@@ -229,8 +229,8 @@ ...@@ -229,8 +229,8 @@
//表单数据 //表单数据
form: { form: {
merchantId:'', merchantId:'',
goodsName: "", goodsName: "1",
goodsClassId: "", goodsClassId: "1",
skus: [], skus: [],
listImage: "", listImage: "",
detailImage: "", detailImage: "",
...@@ -691,7 +691,9 @@ ...@@ -691,7 +691,9 @@
{account: account} {account: account}
).then(response => { ).then(response => {
this.form.merchantId=response.data.data.id 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('添加成功') this.$message.success('添加成功')
done() done()
}).catch(() => { }).catch(() => {
......
src/views/businessOrder/index.vue
...@@ -249,21 +249,20 @@ ...@@ -249,21 +249,20 @@
viewLogistics(row){ viewLogistics(row){
// 1.打开对话框 // 1.打开对话框
this.dialogVisible = true this.dialogVisible = true
this.form.waybillNo=row.waybillNo alert(row.waybillNo+row.expressCompany)
//
viewLogisticsApi( viewLogisticsApi(
{waybillNo:'773170491924104',expressCompany:'sto'} {waybillNo:row.waybillNo,expressCompany:row.expressCompany}
).then(r=>{ ).then(r=>{
let d = JSON.stringify(r.data.data.result.list) for (let i = 0; i <r.data.data.result.list.length ; i++) {
console.log(d) if(i === 0){
for (let dKey in d) { this.activities.push({"content":r.data.data.result.list[i].status,
console.log(dKey) "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'}]
}) })
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment