Skip to content

L
linshenxs-shop
Commit 175d23a9 by cpa
Options

商家查看物流BUG修改

parent 604aef2e
Showing with 134 additions and 172 deletions
src/api/mall/merchantMallorder.js
import request from '@/router/axios' import request from '@/router/axios'
export function cancelOrderApi(query) {
export function cancelOrderApi(parameter) {
return request({ return request({
url: '/admin/merchantMallOrder/cancelOrder', url: '/admin/merchantMallOrder/merchantCancelOrder',
method: 'get', method: 'get',
params:parameter params: query
}) })
} }
export function delObj(parameter) { export function delObj(parameter) {
return request({ return request({
url: '/admin/merchantMallOrder', url: '/admin/merchantMallOrder',
...@@ -49,138 +49,18 @@ export function getOrderInfo(params) { ...@@ -49,138 +49,18 @@ export function getOrderInfo(params) {
}) })
} }
export function cancelOrderMethod(query) {
export function viewLogisticsApi(query) {
return request({ return request({
url: '/admin/merchantMallOrder/cancelOrder', url: '/admin/merchantMallOrder/merchantViewLogistics',
method: 'get', method: 'get',
params: query params: query
}) })
} }
export function viewLogisticsApi(query) { export function getMerchantByAccount(parameter) {
return request({ return request({
url: '/admin/merchantMallOrder/viewLogistics', url: '/admin/merchantMallGoods/getMerchantByAccount',
method: 'get', method: 'get',
params: query params:parameter
}) })
} }
//
// export function getShopDetails(params) {
// return request({
// url: '/general/mallOrder/getShopDetails',
// method: 'get',
// params
// })
// }
// export function isVirtualGoods(query) {
// return request({
// url: '/admin/merchantMallOrder/isVirtualGoods',
// method: 'get',
// params: query
// })
// }
// export function getObj(id) {
// return request({
// url: '/general/mallOrder/' + id,
// method: 'get'
// })
// }
//
// export function addObj(obj) {
// return request({
// url: '/general/mallOrder',
// method: 'post',
// data: obj
// })
// }
//
//
// export function confirmPayObj(obj) {
// return request({
// url: '/general/mallOrder/confirmPayment',
// method: 'put',
// params: obj
// })
// }
//
//
//
// export function shopClass(params) {
// return request({
// url: '/general/mallOrder/getShopClassOptions',
// method: 'get',
// params
// })
// }
//
// export function searchShopClass(params) {
// return request({
// url: '/general/mallOrder/searchShopClassOptions',
// method: 'get',
// params
// })
// }
//
// export function authApply(data) {
// return request({
// url: '/general/mallOrder/verifyMerchantApply',
// method: 'post',
// data
// })
// }
//
// export function fetchShopList(data) {
// return request({
// url: '/general/mallOrder/searchList',
// method: 'post',
// data
// })
// }
//
//
// export function editShopInfo(data) {
// return request({
// url: '/general/mallOrder/editShopInfo',
// method: 'post',
// data
// })
// }
//
// export function editDeposit(params) {
// return request({
// url: '/general/mallOrder/editDeposit',
// method: 'get',
// params
// })
// }
//
// export function resetPassword(params) {
// return request({
// url: '/general/mallOrder/resetPassword',
// method: 'get',
// params
// })
// }
//
// export function block(params) {
// return request({
// url: '/general/mallOrder/blocked',
// method: 'get',
// params
// })
// }
//
// export function unBlock(params) {
// return request({
// url: '/general/mallOrder/unBlock',
// method: 'get',
// params
// })
// }
src/const/crud/mall/merchantMallgoods.js
...@@ -80,7 +80,8 @@ export const tableOption = { ...@@ -80,7 +80,8 @@ export const tableOption = {
"prop": "state", "prop": "state",
"search": true, "search": true,
"showColumn":false, "showColumn":false,
dicUrl: "/admin/merchantMallGoods/getStateOptions", dicUrl: "/admin/merchantMallGoods/getMerchantStateOptions",
}, },
{ {
"type": "input", "type": "input",
...@@ -93,8 +94,8 @@ export const tableOption = { ...@@ -93,8 +94,8 @@ export const tableOption = {
"prop": "auditState", "prop": "auditState",
"search": true, "search": true,
"showColumn":false, "showColumn":false,
dicUrl: "/admin/merchantMallGoods/getAuditStateOptions", dicUrl: "/admin/merchantMallGoods/getMerchantAuditStateOptions",
}, },
{ {
"type": "input", "type": "input",
"label": "审核状态", "label": "审核状态",
......
src/const/crud/mall/merchantMallorder.js
...@@ -38,7 +38,7 @@ export const tableOption = { ...@@ -38,7 +38,7 @@ export const tableOption = {
"label": "状态", "label": "状态",
"prop": "state", "prop": "state",
"search": true, "search": true,
"dicUrl": "/admin/mallOrder/getOrderStateOptions", "dicUrl": "/admin/merchantMallOrder/getMerchantOrderStateOptions",
}, },
{ {
......
src/views/businessGoods/goodsEdit/goods_edit.vue
...@@ -178,7 +178,6 @@ ...@@ -178,7 +178,6 @@
</template> </template>
<script> <script>
let DBG = false let DBG = false
import { import {
ZmMixin ZmMixin
...@@ -191,11 +190,8 @@ ...@@ -191,11 +190,8 @@
import { import {
getClassifyDropDown, getClassifyDropDown,
getGoodsDetails, getGoodsDetails,
addOrEditGoods,
getMerchantByAccount, getMerchantByAccount,
addOrEdit
} from './goods_api.js' } from './goods_api.js'
export default { export default {
mixins: [ZmMixin], mixins: [ZmMixin],
components: { components: {
...@@ -205,8 +201,6 @@ ...@@ -205,8 +201,6 @@
}, },
data() { data() {
return { return {
//如果是编辑则需要id
id: undefined,
//如果是编辑则需要加载数据 //如果是编辑则需要加载数据
loading: false, loading: false,
//是否显示商品规格选择 //是否显示商品规格选择
...@@ -362,10 +356,6 @@ ...@@ -362,10 +356,6 @@
} }
}, },
computed: { computed: {
//点前页面标题
editTitle() {
return this.id ? "编辑商品基础信息" : "添加商品基础信息"
},
//能否选择规格 //能否选择规格
canSelectType() { canSelectType() {
return this.form.goodsClassId != undefined && this.form.goodsClassId != '' return this.form.goodsClassId != undefined && this.form.goodsClassId != ''
......
src/views/businessGoods/index.vue
...@@ -22,10 +22,11 @@ ...@@ -22,10 +22,11 @@
<el-button type="button" size="small" <el-button type="button" size="small"
@click="lookDetail(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">详情</el-button> @click="lookDetail(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">详情</el-button>
<el-button type="button" size="small" <el-button type="button" size="small"
v-if="scope.row.state!=0" v-if="scope.row.auditState!=1"
@click="handleUpdate(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">编辑</el-button> @click="handleUpdate(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">编辑</el-button>
<el-button type="button" size="small" <el-button type="button" size="small"
@click="handleDel(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">删除</el-button> @click="handleDel(scope.row)" style="color: #409EFF;margin: 5px;padding: 0px;border: 0px">删除</el-button>
</template> </template>
<!-- 2.表外按钮 --> <!-- 2.表外按钮 -->
<template slot-scope="scope" slot="menuLeft"> <template slot-scope="scope" slot="menuLeft">
...@@ -58,9 +59,12 @@ ...@@ -58,9 +59,12 @@
import {fetchList,addObj,delObj,isUpon, isNotUpon,getMerchantByAccount} from '@/api/mall/merchantMallgoods' import {fetchList,addObj,delObj,isUpon, isNotUpon,getMerchantByAccount} from '@/api/mall/merchantMallgoods'
import {tableOption} from '@/const/crud/mall/merchantMallgoods' import {tableOption} from '@/const/crud/mall/merchantMallgoods'
import {mapGetters} from 'vuex' import {mapGetters} from 'vuex'
import {ZmMixin} from '@/mixins/ZmMixin.js'
export default { export default {
name: 'businessGoods', name: 'businessGoods',
data() { mixins: [ZmMixin],
data() {
return { return {
merchantId:'', merchantId:'',
goodsEditVue:false, goodsEditVue:false,
...@@ -92,13 +96,20 @@ ...@@ -92,13 +96,20 @@
methods: { methods: {
// 更新 // 更新
handleUpdate: function (row, index, done,loading) { handleUpdate: function (row, index, done,loading) {
if(this.$refs.crud.tableSelect.length >1){
if (this.$refs.crud.tableSelect.length === 0) {
this.$message.error('请选择需要编辑的信息')
return false
}else if(this.$refs.crud.tableSelect.length >1){
this.$message.error('请选择其中一条进行编辑') this.$message.error('请选择其中一条进行编辑')
return false return false
}else { }else {
this.id=row.id for (const row of this.$refs.crud.tableSelect) {
this.goodsEditVue=true this.id=row.id
}
this.goodsEditVue=true
} }
}, },
// 添加 // 添加
add() { add() {
...@@ -264,6 +275,41 @@ ...@@ -264,6 +275,41 @@
this.getList(this.page) this.getList(this.page)
}, },
// queryParams(page, params) {
// let p = {
// current: page.currentPage,
// size: page.pageSize
// }
// if(params) {
// let range = this.parseRange(params)
// p = {
// ...p,
// startTime: range[0],
// endTime: range[1],
// goodsId: params.goodsId,
// shopName: params.shopName,
// classifyName: params.classifyId,
// goodsName: params.goodsName,
// state: params.state
//
// }
// }
// return p
// },
// getList(page, params) {
// this.tableLoading = true
// let p = this.queryParams(page, params)
// fetchList(p).then(response => {
// this.tableData = response.data.data.records
// this.page.total = response.data.data.total
// this.tableLoading = false
// }).catch(() => {
// this.tableLoading=false
// })
// },
} }
} }
</script> </script>
src/views/businessOrder/index.vue
...@@ -103,13 +103,15 @@ ...@@ -103,13 +103,15 @@
</template> </template>
<script> <script>
import {fetchList, shipsImmediatelyApi, delObj, cancelOrderApi, viewLogisticsApi} from '@/api/mall/merchantMallorder' import {getMerchantByAccount,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 {ZmMixin} from '@/mixins/ZmMixin.js'
export default { export default {
name: 'businessorder', name: 'businessorder',
data() { mixins: [ZmMixin],
data() {
return { return {
paymentVoucher: '', paymentVoucher: '',
activities: [],// 查看物流当前状态 activities: [],// 查看物流当前状态
...@@ -254,21 +256,30 @@ ...@@ -254,21 +256,30 @@
viewLogistics(row){ viewLogistics(row){
// 1.打开对话框 // 1.打开对话框
this.dialogVisible = true this.dialogVisible = true
viewLogisticsApi( this.form.waybillNo=row.waybillNo
{waybillNo:row.waybillNo,expressCompany:row.expressCompany} if(row.waybillNo==undefined){
this.$message.error('订单数据异常,没有物流相关信息。')
this.dialogVisible = false
}else {
viewLogisticsApi(
{waybillNo:row.waybillNo,expressCompany:row.expressCompany}
).then(r=>{ ).then(r=>{
for (let i = 0; i <r.data.data.result.list.length ; i++) { if(r.data.data.result==undefined){
if(i === 0){ this.activities.push({"content":'用户已签收',
this.activities.push({"content":r.data.data.result.list[i].status, "timestamp":undefined,color: '#0bbd87'})
"timestamp":r.data.data.result.list[i].time,color: '#0bbd87'}) }else {
}else { for (let i = 0; i <r.data.data.result.list.length ; i++) {
this.activities.push({"content":r.data.data.result.list[i].status, if(i === 0){
"timestamp":r.data.data.result.list[i].time}) 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})
}
}
} }
} })
}
})
}, },
// 查看详情 // 查看详情
checkTheDetails(row){ checkTheDetails(row){
...@@ -372,6 +383,40 @@ ...@@ -372,6 +383,40 @@
refreshChange() { refreshChange() {
this.getList(this.page) this.getList(this.page)
}, },
// queryParams(page, params) {
// let p = {
// current: page.currentPage,
// size: page.pageSize
// }
// if(params) {
// let range = this.parseRange(params)
// p = {
// ...p,
// startTime: range[0],
// endTime: range[1],
// goodsId: params.goodsId,
// shopName: params.shopName,
// classifyName: params.classifyId,
// goodsName: params.goodsName,
// state: params.state
//
// }
// }
// return p
// },
// getList(page, params) {
// this.tableLoading = true
// let p = this.queryParams(page, params)
// fetchList(p).then(response => {
// this.tableData = response.data.data.records
// this.page.total = response.data.data.total
// this.tableLoading = false
// }).catch(() => {
// this.tableLoading=false
// })
// },
} }
} }
</script> </script>
vue.config.js
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
* 配置参考: * 配置参考:
* https://cli.vuejs.org/zh/config/ * https://cli.vuejs.org/zh/config/
*/ */
//const url = 'http://linshenxs-gateway:9999' const url = 'http://linshenxs-gateway:9999'
const url = 'http://47.108.51.175:9999' // const url = 'http://47.108.51.175:9999'
const CompressionWebpackPlugin = require('compression-webpack-plugin') const CompressionWebpackPlugin = require('compression-webpack-plugin')
const productionGzipExtensions = ['js', 'css'] const productionGzipExtensions = ['js', 'css']
module.exports = { module.exports = {
......
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