代课下单-修改取消挂单
This commit is contained in:
parent
daa8de48b3
commit
0ae2fbe11b
|
|
@ -5,7 +5,7 @@ ENV = 'development'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.2.42:8000'
|
# VUE_APP_BASE_API = 'http://192.168.2.42:8000'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.2.133:8000'
|
# VUE_APP_BASE_API = 'http://192.168.2.133:8000'
|
||||||
# 测试
|
# 测试
|
||||||
VUE_APP_BASE_API = 'http://t361017w45.qicp.vip/'
|
VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
|
||||||
# 生产
|
# 生产
|
||||||
# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
|
# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.2.96:8000'
|
# VUE_APP_BASE_API = 'http://192.168.2.96:8000'
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@ ENV = 'production'
|
||||||
# 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置
|
# 如果使用 Nginx 代理后端接口,那么此处需要改为 '/',文件查看 Docker 部署篇,Nginx 配置
|
||||||
# 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http
|
# 接口地址,注意协议,如果你没有配置 ssl,需要将 https 改为 http
|
||||||
# 测试
|
# 测试
|
||||||
VUE_APP_BASE_API = 'http://t361017w45.qicp.vip/'
|
VUE_APP_BASE_API = 'https://admintestpapi.sxczgkj.cn'
|
||||||
# 生产
|
# 生产
|
||||||
# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
|
# VUE_APP_BASE_API = 'https://cashieradmin.sxczgkj.cn'
|
||||||
# VUE_APP_BASE_API = 'http://192.168.2.98:8000'
|
# VUE_APP_BASE_API = 'http://192.168.2.98:8000'
|
||||||
|
|
|
||||||
|
|
@ -310,7 +310,7 @@ export function $setUser(data) {
|
||||||
export function $delOrder(data) {
|
export function $delOrder(data) {
|
||||||
return request({
|
return request({
|
||||||
url: `/api/place/order`,
|
url: `/api/place/order`,
|
||||||
method: "delte",
|
method: "delete",
|
||||||
data:{
|
data:{
|
||||||
shopId: localStorage.getItem("shopId"),
|
shopId: localStorage.getItem("shopId"),
|
||||||
...data
|
...data
|
||||||
|
|
|
||||||
|
|
@ -1040,7 +1040,8 @@ export default {
|
||||||
},
|
},
|
||||||
watch: {
|
watch: {
|
||||||
"vipUser.id":async function(val){
|
"vipUser.id":async function(val){
|
||||||
this.masterId= await this.getMasterId()
|
const {masterId}= await this.getMasterId()
|
||||||
|
this.masterId=masterId
|
||||||
$setUser({
|
$setUser({
|
||||||
tableId:this.table.tableId,
|
tableId:this.table.tableId,
|
||||||
masterId:this.masterId,
|
masterId:this.masterId,
|
||||||
|
|
@ -1376,12 +1377,14 @@ export default {
|
||||||
// masterId:order.carList[0].masterId
|
// masterId:order.carList[0].masterId
|
||||||
// })
|
// })
|
||||||
const {masterId,tableId,userId}= await $cacheOrder({orderId:this.prveOrder.list[this.prveOrder.sel].orderId,isPending:false})
|
const {masterId,tableId,userId}= await $cacheOrder({orderId:this.prveOrder.list[this.prveOrder.sel].orderId,isPending:false})
|
||||||
|
const {records}=await getCart({
|
||||||
getCart({
|
|
||||||
masterId,
|
masterId,
|
||||||
tableId,
|
tableId,
|
||||||
vipUserId:userId?userId:''
|
vipUserId:userId!='null'?userId:''
|
||||||
})
|
})
|
||||||
|
console.log(records)
|
||||||
|
this.order.list = records
|
||||||
|
this.prveOrder.show = false;
|
||||||
return
|
return
|
||||||
this.order.list = this.prveOrder.list[this.prveOrder.sel].carList;
|
this.order.list = this.prveOrder.list[this.prveOrder.sel].carList;
|
||||||
this.delPrveOrder();
|
this.delPrveOrder();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue