Commit 9aaa0466 by cpa

获取规格问题解决

parent a1037b82
...@@ -56,6 +56,14 @@ export function cancelOrderMethod(query) { ...@@ -56,6 +56,14 @@ export function cancelOrderMethod(query) {
params: query params: query
}) })
} }
export function viewLogisticsApi(query) {
return request({
url: '/admin/merchantMallOrder/viewLogistics',
method: 'get',
headers:{'Authorization':'APPCODEd 348918fca3c4f73acf99e4162b6fa03'},
params: query
})
}
// //
// export function getShopDetails(params) { // export function getShopDetails(params) {
......
...@@ -28,6 +28,12 @@ export const tableOption = { ...@@ -28,6 +28,12 @@ export const tableOption = {
"search": true, "search": true,
}, },
{ {
"type": "input",
"label": "订单ID",
"prop": "id",
// showColumn: false,
},
{
"type": "select", "type": "select",
"label": "状态", "label": "状态",
"prop": "state", "prop": "state",
......
...@@ -9,7 +9,7 @@ export function getClassifyDropDown() { ...@@ -9,7 +9,7 @@ export function getClassifyDropDown() {
export function searchSpecByName(query) { export function searchSpecByName(query) {
return request({ return request({
url: '/general/mallGoodsSpec/getSpecByName', url: '/admin/mallGoodsSpec/getSpecByName',
method: 'get', method: 'get',
params: query params: query
}) })
...@@ -34,7 +34,7 @@ export function getGoodsDetails(query) { ...@@ -34,7 +34,7 @@ export function getGoodsDetails(query) {
export function addOrEditGoods(data) { export function addOrEditGoods(data) {
return request({ return request({
url: '/admin/merchantMallGoods/addOrEditGoods', url: '/admin/merchantMallGoods/addOrEditGoods',
method: 'post', method: 'get',
data data
}) })
} }
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
title="取消订单" :visible.sync="cancelOrderDialog" width="40%" title="取消订单" :visible.sync="cancelOrderDialog" width="40%"
:before-close="handleClose"> :before-close="handleClose">
<el-form ref="form" :model="orderForm"> <el-form ref="form" :model="orderForm">
<el-input type="textarea" v-model="orderForm.orderNo" v-show="false">1111111111</el-input> <el-input type="textarea" v-model="orderForm.id" v-show="false">1111111111</el-input>
<el-input type="textarea" v-model="orderForm.mark"></el-input> <el-input type="textarea" v-model="orderForm.mark"></el-input>
<el-form-item> <el-form-item>
<el-button type="primary" :loading="loading" @click="cancelOrder_cancel" style="float: left;margin-left: 20%;margin-top: 30px">取 消</el-button> <el-button type="primary" :loading="loading" @click="cancelOrder_cancel" style="float: left;margin-left: 20%;margin-top: 30px">取 消</el-button>
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
</template> </template>
<script> <script>
import {fetchList,shipsImmediatelyApi,delObj,cancelOrderApi} from '@/api/mall/merchantMallorder' import {fetchList, shipsImmediatelyApi, delObj, cancelOrderApi, viewLogisticsApi} from '@/api/mall/merchantMallorder'
import {tableOption} from '@/const/crud/mall/merchantMallorder' import {tableOption} from '@/const/crud/mall/merchantMallorder'
import {mapGetters} from 'vuex' import {mapGetters} from 'vuex'
import {getMerchantByAccount} from "@/api/mall/merchantMallgoods"; import {getMerchantByAccount} from "@/api/mall/merchantMallgoods";
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
options:[],// 快递公司下拉 options:[],// 快递公司下拉
loading:false, loading:false,
orderForm:{ orderForm:{
orderNo:'', id:'',
mark:"请输入取消原因", mark:"请输入取消原因",
}, },
form:{ form:{
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
methods: { methods: {
// 取消订单 // 取消订单
cancelOrder(row){ cancelOrder(row){
this.orderForm.orderNo=row.orderNo this.orderForm.id=row.id
this.cancelOrderDialog=true this.cancelOrderDialog=true
}, },
// 取消订单-取消 // 取消订单-取消
...@@ -251,9 +251,22 @@ ...@@ -251,9 +251,22 @@
this.dialogVisible = true this.dialogVisible = true
this.form.waybillNo=row.waybillNo this.form.waybillNo=row.waybillNo
this.activities=[{content: '快递送至【成都市】物流运转中心', timestamp: '2018-04-11'} //
,{color: '#0bbd87',content: '快递送至【成都市】物流运转中心', timestamp: '2018-04-11'} viewLogisticsApi(
,{content: '快递送至【成都市】物流运转中心', timestamp: '2018-04-11'}] {waybillNo:'773170491924104',expressCompany:'sto'}
).then(r=>{
let d = JSON.stringify(r.data.data.result.list)
console.log(d)
for (let dKey in d) {
console.log(dKey)
}
// this.activities=d
// this.activities=[{content: '快递送至【成都市】物流运转中心', timestamp: '2018-04-11'}
// ,{color: '#0bbd87',content: '快递送至【成都市】物流运转中心', timestamp: '2018-04-11'}
// ,{content: '快递送至【成都市】物流运转中心', timestamp: '2018-04-11'}]
})
}, },
// 查看详情 // 查看详情
checkTheDetails(row){ checkTheDetails(row){
......
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