diff --git a/common/api/request.js b/common/api/request.js
index d057677..1627c6b 100644
--- a/common/api/request.js
+++ b/common/api/request.js
@@ -45,22 +45,23 @@ export default (params) => {
if (res.code == 200) {
uni.hideLoading();
uni.hideToast();
- resolve(res.data ?res.data: true);
+ resolve(res.data ? res.data : true);
} else {
switch (res.code) {
case '501':
uni.cache.remove('shopId')
- uni.showToast({
- title: '',
- icon: "none",
- success: () => {
- setTimeout(() => {
- uni.reLaunch({
- url: "/pages/index/index",
- })
- }, 1000);
- }
- })
+ // uni.showToast({
+ // title: '',
+ // icon: "none",
+ // success: () => {
+
+ // }
+ // })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: "/pages/index/index",
+ })
+ }, 1000);
break;
case 404:
uni.showToast({
diff --git a/common/api/subscribeto.js b/common/api/subscribeto.js
index 6441ae2..c6a9e2d 100644
--- a/common/api/subscribeto.js
+++ b/common/api/subscribeto.js
@@ -40,12 +40,19 @@ export const APIqueuedetail = (data) => {
})
}
-
// 消息订阅
export const APIcallTablesubMsg = (data) => {
return request({
url: urlAccount + '/user/callTable/subMsg',
- method: 'get',
+ method: 'post',
data: data
})
+}
+
+// 取消排队
+export const APIqueuecancel = (data) => {
+ return request({
+ url: urlAccount + '/user/callTable/cancel?queueId=' + data.queueId + '&shopId=' + data.shopId,
+ method: 'DELETE'
+ })
}
\ No newline at end of file
diff --git a/framework/0-conf.js b/framework/0-conf.js
index 4b632aa..2c4a371 100644
--- a/framework/0-conf.js
+++ b/framework/0-conf.js
@@ -1,5 +1,5 @@
// const debug = process.env.NODE_ENV == 'development' ? true : false;
-const debug = true
+const debug = false
// #ifdef H5
const proxyApi = "/api"
// #endif
@@ -7,10 +7,9 @@ const proxyApi = "/api"
// #ifdef MP-WEIXIN || APP || MP-ALIPAY
const proxyApi = 'http://192.168.1.31' // 调试地址
const proxyApiwws = 'ws://192.168.1.31:2348' // 调试地址
-
-// // 本地
-// const proxyApi = 'http://192.168.1.31' // 固定的测试
-// const proxyApiwws = 'ws://192.168.1.43:2348' //宏哥本地
+// 测试
+// const proxyApi = "https://fv901fw8033.vicp.fun"
+// const proxyApiwws = 'wss://sockets.sxczgkj.com/wss'
// #endif
// #ifdef H5
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 984af64..577028f 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -60,13 +60,13 @@
{{paymentmethod.paymentBtnText}}
-
+
-
+
@@ -553,7 +553,9 @@
orderVIP.value = uni.cache.get('orderVIP')
ordershopUserInfo.value = orderVIP.value.shopInfo
paymentMethodref.value.orderVIPfun(uni.cache.get('orderVIP'))
- orderorderInfo()
+ if (orderId.value) {
+ orderorderInfo()
+ }
}
} catch (error) {
//TODO handle the exception
diff --git a/pages/product/components/confirmorder.vue b/pages/product/components/confirmorder.vue
index 6c8c80c..16ce7b0 100644
--- a/pages/product/components/confirmorder.vue
+++ b/pages/product/components/confirmorder.vue
@@ -37,7 +37,7 @@
{{item.productName}}
{{item.productSkuName}}
+ v-if="item.skuName">{{item.skuName}}
@@ -69,7 +69,7 @@
{{item.cartListinfo.sku_id == i.id ? i.name :""}}
-
+
@@ -135,7 +135,8 @@
const props = defineProps({
cartList: {
- type: Array
+ type: Array,
+ default: []
},
cartLists_count: {
type: Number,
@@ -263,71 +264,36 @@
// 提交订单
const orderdetail = async () => {
- let res = await storeMemberpay.actionscreateOrder({
- dineMode: 'dine-in', //堂食 dine-in 外带 take-out 外卖 take-away
- seatNum: uni.cache.get('dinersNum') ? uni.cache.get('dinersNum') : '', //用餐人数
- // packFee: packFee.value, //打包费
- packFee: 0, //打包费
- originAmount: totalPrices.value, //订单原金额（包含打包费） 不含折扣价格 不含餐位费
- remark: remark.value, //备注
- placeNum: props.orderinfo.placeNum + 1, //当前订单下单次数
- waitCall: '', //是否等叫 0 否 1 等叫
- orderId: props.orderinfo.id,
- userId: uni.cache.get('userInfo').id || '' //
- })
- // 清空购物车
- emits('customevent', {
- type: 'shopping',
- table_code: uni.cache.get('tableCode'),
- shop_id: uni.cache.get('shopId'),
- operate_type: 'cleanup',
- })
- // uni.pro.redirectTo('order/detail', {
- // orderId: res.id,
- // shopId: uni.cache.get('shopId')
- // })
- uni.reLaunch({
- url: '/pages/order/detail?orderId=' + res.id + '&shopId=' + uni.cache.get('shopId')
- })
- // uni.pro.navigateTo('order/detail', {
- // orderId: res.id,
- // shopId: uni.cache.get('shopId')
- // })
- // uni.showLoading({
- // title: '正在生成订单',
- // mask: true
- // })
- // if (res) {
- // let checkOrderPay = {
- // orderId: res.id,
- // vipPrice: shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1 ? 1 : 0, //是否使用会员价0否1是
- // allPack: is_type.value == 0 ? 0 : 1, //是否整单打包
- // seatNum: uni.cache.get('dinersNum') ? uni.cache.get('dinersNum') : '', //用餐人数
- // orderAmount: totalCost.value, //订单原金额（包含打包费+餐位费） 不含折扣价格
- // discountRatio: 1, //折扣比例(计算时 向上取整保留 两位小数) 写死1
- // discountAmount: 0, //手动优惠金额 写死0
- // productCouponDiscountAmount: '', //商品优惠券抵扣金额
- // fullCouponDiscountAmount: '', //满减优惠券抵扣金额
- // couponList: '', //用户使用的卡券
- // orderAmount: totalCost.value, // 最中订单金额
- // roundAmount: 0, //抹零金额 减免多少钱
- // pointsDiscountAmount: 0, //积分抵扣金额(tb_points_basic_setting表)
- // pointsNum: 0, //(扣除各类折扣 enable_deduction后使用)
- // remark: '', //用户备注
- // }
- // let successdata = await storeMemberpay.actionsltPayOrder({
- // checkOrderPay,
- // payType: paymentmethod.payType,
- // buyerRemark: '',
- // returnUrl: ''
- // })
- // if (successdata) {
- // console.log(res.id, '支付成功res.id')
- // uni.redirectTo({
- // url: '/order/detail?orderId=' + res.id
- // });
- // }
- // }
+ if (props.cartList.length > 0) {
+ let res = await storeMemberpay.actionscreateOrder({
+ dineMode: 'dine-in', //堂食 dine-in 外带 take-out 外卖 take-away
+ seatNum: uni.cache.get('dinersNum') ? uni.cache.get('dinersNum') : '', //用餐人数
+ // packFee: packFee.value, //打包费
+ packFee: 0, //打包费
+ originAmount: totalPrices.value, //订单原金额（包含打包费） 不含折扣价格 不含餐位费
+ remark: remark.value, //备注
+ placeNum: props.orderinfo.placeNum + 1, //当前订单下单次数
+ waitCall: '', //是否等叫 0 否 1 等叫
+ orderId: props.orderinfo.id,
+ userId: uni.cache.get('userInfo').id || '' //
+ })
+ // 清空购物车
+ emits('customevent', {
+ type: 'shopping',
+ table_code: uni.cache.get('tableCode'),
+ shop_id: uni.cache.get('shopId'),
+ operate_type: 'cleanup',
+ })
+ uni.reLaunch({
+ url: '/pages/order/detail?orderId=' + res.id + '&shopId=' + uni.cache.get('shopId')
+ })
+ } else {
+ uni.reLaunch({
+ url: '/pages/order/detail?orderId=' + props.orderinfo.id + '&shopId=' + uni.cache.get(
+ 'shopId')
+ })
+ }
+
}
const dataprocessing = computed(() => {
diff --git a/pages/product/components/shoppingCartes.vue b/pages/product/components/shoppingCartes.vue
index d1c6bd4..18aabdf 100644
--- a/pages/product/components/shoppingCartes.vue
+++ b/pages/product/components/shoppingCartes.vue
@@ -3,70 +3,80 @@
-
-
{
+ if (i == '-' && shopCartNumber.value >= 0) {
+ shopCartNumber.value = 0
+ return false;
+ }
let res = await shoppingcart()
if (i == '-') {
if (!res && shopCartNumber.value == specifications.item.suitNum) {
uni.showToast({
- title: `起点${specifications.item.suitNum}`,
+ title: `起点${specifications.item.suitNum}个`,
icon: 'none'
})
return false;
@@ -859,7 +860,6 @@
// 直接返回布尔值
return result;
} else if (specifications.item.type == 'sku') {
- // console.log(product,data, 'product,data')
// 多规格
return product.cartListinfo.sku_id == data.id && product.cartListinfo.product_id == data
.productId
@@ -897,41 +897,50 @@
// 提交选择并执行下一步操作的方法
const submitSelection = async () => {
+ // 数量不能少于0
if (shopCartNumber.value <= 0) {
return;
}
- let res = await shoppingcart()
- console.log(res)
+ if ((specifications.item.type == 'package' && allConditionsSatisfied.value) || (specifications.item.type ==
+ 'sku' && canSubmit.value)) {
+ let res = await shoppingcart()
- // 是否是套餐 有就传
- if (specifications.item.type != "package") {
+ // 是否是套餐 有就传
+ if (specifications.item.type != "package") {
+ selectedGroupSnap.value = []
+ }
+
+ websocketsendMessage({
+ id: res ? res.cartListId : '',
+ type: 'shopping',
+ table_code: uni.cache.get('tableCode'),
+ shop_id: uni.cache.get('shopId'),
+ operate_type: res ? 'edit' : 'add',
+ product_id: specifications.product_id,
+ sku_id: specifications.sku_id,
+ number: res ? await calculateValue(res.cartNumber, '+', shopCartNumber.value) :
+ shopCartNumber
+ .value,
+ pro_group_info: selectedGroupSnap.value,
+ goods_type: specifications.item.type == "package" ? 'package' : '',
+ is_print: 1,
+ product_type: specifications.item.type
+ })
+ // 清空套餐选中
selectedGroupSnap.value = []
+ showShopsku.value = false
+ } else {
+ return;
}
- websocketsendMessage({
- id: res ? res.cartListId : '',
- type: 'shopping',
- table_code: uni.cache.get('tableCode'),
- shop_id: uni.cache.get('shopId'),
- operate_type: res ? 'edit' : 'add',
- product_id: specifications.product_id,
- sku_id: specifications.sku_id,
- number: res ? await calculateValue(res.cartNumber, '+', shopCartNumber.value) : shopCartNumber
- .value,
- pro_group_info: selectedGroupSnap.value,
- goods_type: specifications.item.type == "package" ? 'package' : '',
- is_print: 1,
- product_type: specifications.item.type
- })
- // 清空套餐选中
- selectedGroupSnap.value = []
- showShopsku.value = false
+
}
//获取多规格数据
const clickspecifications = async (item, index, indexs, type) => {
- if (item.isSoldStock == 1 || item.isSaleTime == 0) {
+ // 商品类型 single-单规格商品 sku-多规格商品 package-套餐商品 weight-称重商品 coupon-团购券
+ if (item.isSoldStock == 1 || item.isSaleTime == 0 || item.type == 'single' || item.type == 'weight' || (item.type == 'package' && item.groupType == '0')) {
return false;
}
// 数量清零
@@ -1033,7 +1042,6 @@
initNetworkListener
} = useWebSocket(options);
-
//购物车显示
const showCart = ref(false)
@@ -1116,6 +1124,9 @@
// 清空购物车
if (Message.operate_type == 'cleanup') {
cartList.value = []
+ setTimeout(() => {
+ Historicalorders()
+ }, 400)
showCart.value = false
}
@@ -1138,6 +1149,11 @@
});
}
+ // 历史订单
+ if (Message.operate_type == 'clearOrder') {
+ Historicalorders()
+ }
+
// 购物车数据更新从新请求
if (Message.type == 'product' && Message.data_type == 'product_update' && Message
.operate_type == 'product_update') {
@@ -1207,26 +1223,95 @@
})
- // 计算购物车商品总数量
- const cartLists_count = computed(() => {
- if (matchedProducts.value.length > 0) {
- return matchedProducts.value.reduce((sum, item) => {
- // 将 cartNumberToAdd 转换为数字
- // const num = typeof item.cartNumberToAdd === 'string' ? parseFloat(item.cartNumberToAdd) : item.cartNumberToAdd;
- const num = typeof item.cartNumber === 'string' ? parseFloat(item.cartNumber) : item
- .cartNumber;
- return sum + num;
- }, 0);
+ //删除某一个待支付订单
+ const clickcancelOrder = async (data) => {
+ if (data.i == 'all') {
+ await APIcancelOrder({
+ shopId: uni.cache.get('shopId'),
+ orderId: orderinfo.value.id,
+ })
} else {
- return 0;
+ await APIrmPlaceOrder({
+ shopId: uni.cache.get('shopId'),
+ orderId: orderinfo.value.id,
+ placeNum: data.key
+ })
}
- });
+ Historicalorders()
+ }
- // 计算购物车商品总价格
+ // 储存是否存在多次下单
+ const orderinfo = ref({})
+ const confirmorderref = ref(null)
+
+ // 结账
+ const orderdetail = async () => {
+ try {
+ await Historicalorders()
+ } catch (error) {}
+ confirmordershow.value = true
+ showCart.value = false
+ }
+
+ // 历史订单
+ const Historicalorders = async (W) => {
+ let res = await APIhistoryOrder({
+ tableCode: uni.cache.get('tableCode'),
+ })
+ orderinfo.value = {
+ id: res.id,
+ detailMap: res.detailMap,
+ placeNum: res.placeNum
+ }
+ if (W) {
+ showCart.value = !showCart.value
+ }
+ }
+
+ // 提取合并 orderinfo.detailMap 数组的逻辑
+ function combineOrderInfoDetailMap(orderinfo) {
+ if (!orderinfo) return [];
+ let combinedArray = [];
+ for (const key in orderinfo.detailMap) {
+ if (orderinfo.detailMap.hasOwnProperty(key)) {
+ let subArray = orderinfo.detailMap[key];
+ combinedArray = [...combinedArray, ...subArray];
+ }
+ }
+ return combinedArray;
+ }
+
+ // 计算购物车商品费用
const totalPrices = computed(() => {
+ // 待支付订单
+ let cartone = 0
+ if (orderinfo.value) {
+ let combinedArray = [];
+ for (const key in orderinfo.value.detailMap) {
+ if (orderinfo.value.detailMap.hasOwnProperty(key)) {
+ let subArray = orderinfo.value.detailMap[key];
+ combinedArray = [...combinedArray, ...subArray]
+ }
+ }
+ // 购物车总数价格
+ cartone = combinedArray.reduce((total, item) => {
+ // 是否启用会员价 0否1是
+ if (shopInfo.isVip == 1 && shopInfo.isMemberPrice == 1) {
+ // memberPrice会员价
+ return total + (parseFloat(item.memberPrice || item.price) * parseFloat(item.num - item
+ .returnNum));
+ } else {
+ // salePrice销售价
+ return total + (parseFloat(item.price || 0) * parseFloat(item.num - item.returnNum));
+ }
+ }, 0);
+ }
+ console.log(cartone, 'orderinfo.value')
+ // 购物车总数价格
+ let cart = 0
if (matchedProducts.value.length > 0) {
// 购物车总数价格
- let cart = matchedProducts.value.reduce((total, item) => {
+ cart = matchedProducts.value.reduce((total, item) => {
if (item.type == 'sku') {
item.skuList.forEach((i, t) => {
if (item.cartListinfo.sku_id == i.id) {
@@ -1245,56 +1330,29 @@
return total + parseFloat(item.salePrice || 0) * parseFloat(item.cartNumber);
}
}, 0);
- return parseFloat(cart.toFixed(2));
- } else {
- return 0
}
-
+ cart = parseFloat(cartone) + parseFloat(cart)
+ console.log(cart, 'orderinfo.value')
+ // 向上取整并保留两位小数
+ return parseFloat(cart.toFixed(2));
});
- //删除某一个待支付订单
- const clickcancelOrder = async (i, key) => {
- if (i == 'all') {
- await APIcancelOrder({
- shopId: uni.cache.get('shopId'),
- orderId: orderinfo.id,
- })
- } else {
- await APIrmPlaceOrder({
- shopId: uni.cache.get('shopId'),
- orderId: orderinfo.id,
- placeNum: key
- })
- }
- Historicalorders()
- }
+ // 计算购物车商品总数量
+ const cartLists_count = computed(() => {
+ const combinedOrderInfo = combineOrderInfoDetailMap(orderinfo.value);
+ const orderInfoCount = combinedOrderInfo.reduce((sum, item) => {
+ return sum + parseFloat(item.num);
+ }, 0);
- // 储存是否存在多次下单
- const orderinfo = ref({})
- const confirmorderref = ref(null)
+ const matchedProductsCount = matchedProducts.value.reduce((sum, item) => {
+ const num = typeof item.cartNumber === 'string' ? parseFloat(item.cartNumber) : item
+ .cartNumber;
+ return sum + num;
+ }, 0);
- // 结账
- const orderdetail = async () => {
- try {
- await Historicalorders()
- } catch (error) {}
- confirmordershow.value = true
- }
-
- // 历史订单
- const Historicalorders = async (W) => {
- let res = await APIhistoryOrder({
- tableCode: uni.cache.get('tableCode'),
- })
- orderinfo.value = {
- id: res.id,
- detailMap: res.detailMap,
- placeNum: res.placeNum
- }
- if (W) {
- showCart.value = !showCart.value
- }
- }
+ const totalCount = orderInfoCount + matchedProductsCount;
+ return parseFloat(totalCount.toFixed(2));
+ });
// 定义 ifcartNumber 计算属性方法 展示数量
const ifcartNumber = computed(() => {
@@ -1407,7 +1465,8 @@
// userStore.actionsAPIuser()
// 数据可以更新
isDataLoaded.value = true;
-
+ // 历史订单
+ Historicalorders()
} else {
uni.showToast({
title: '暂无列表数据,请重新扫码',
diff --git a/pages/subscribeto/index.vue b/pages/subscribeto/index.vue
index dff778e..3210be6 100644
--- a/pages/subscribeto/index.vue
+++ b/pages/subscribeto/index.vue
@@ -1,44 +1,6 @@
-
-
-
-
-
-
-
- {{shopInfo.shopName}}
- {{dataform.shopInfo.status == 1 ? '营业中' : '休息中'}}
-
-
-
-
- 餐桌类型
- 等待桌数
- 预计等待
-
-
-
- {{item.name||''}}
- {{item.note||''}}
-
-
- {{item.waitingCount}}
- 桌
-
- 约{{item.waitTime}}分钟
-
-
-
-
-
- 立即排队
-
-
-
-
+
@@ -60,7 +22,7 @@
+
+
+
+
+
+
+
+
+
+ {{dataform.shopInfo.shopName}}
+ {{dataform.shopInfo.status == 1 ? '营业中' : '休息中'}}
+
+
+
+
+ 餐桌类型
+ 等待桌数
+ 预计等待
+
+
+
+ {{item.name||''}}
+ {{item.note||''}}
+
+
+ {{item.nearNum}}
+ 桌
+
+ 约{{item.waitTime}}分钟
+
-
+
+
+
+ 立即排队
@@ -120,7 +117,8 @@
ref,
onMounted,
getCurrentInstance,
- nextTick
+ nextTick,
+ onShow
} from 'vue';
//接口引入
@@ -129,7 +127,8 @@
APIusercallTable,
APIqueuecallTable,
APIqueuedetail,
- APIcallTablesubMsg
+ APIcallTablesubMsg,
+ APIqueuecancel
} from "@/common/api/subscribeto.js";
// 获取全局属性
@@ -146,11 +145,10 @@
phone: "",
callTableId: "",
shopInfo: {
- logo: '',
shopName: ''
},
queueInfo: null,
- shopId: "",
+ shopId: 29,
queueId: "",
})
@@ -164,31 +162,15 @@
return null;
}
- // 获取排号状态
- const getQueueUpState = async () => {
- let params = {
- shopId: dataform.shopId,
- }
- if (dataform.queueId) {
- params.queueId = dataform.queueId;
- }
- let res = await APIusercallTable(params)
- if (res) {
- dataform.shopInfo = res.data.shopInfo;
- dataform.queueInfo = res.data.queueInfo;
- dataform.queueId = dataform.queueInfo.id;
- }
- }
- // 获取排号数据
- const getQueueUpList = async () => {
- let res = await APIqueuecallTable({
+ // 获取排号列表
+ const userorderList = async () => {
+ let res = await APIusercallTable({
shopId: dataform.shopId,
+ queueId: dataform.queueId
})
- if (res) {
- queueUpList.value = res.data;
- }
+ tableList.value = res.records
}
// 叫号队列详情
@@ -198,11 +180,11 @@
openId: uni.cache.get('userInfo').wechatOpenId,
})
if (res.queueInfo) {
- tableList.value = res.data;
-
+ dataform.queueInfo = res.queueInfo;
} else {
- getQueueUpState()
+ userorderList()
}
+ dataform.shopInfo = res.shopInfo;
}
// 订阅通知
@@ -210,7 +192,7 @@
let res = await APIcallTablesubMsg({
openId: uni.cache.get('userInfo').wechatOpenId,
shopId: dataform.shopId,
- queueId: dataform.queueId,
+ queueId: dataform.queueInfo.id,
})
if (res) {
uni.showToast({
@@ -238,17 +220,17 @@
});
return;
}
- let res = await this.api.getTakeNumber({
- openId: uni.cache.get('miniAppOpenId'),
+ let res = await APIcallTabletakeNumber({
+ openId: uni.cache.get('userInfo').wechatOpenId,
shopId: dataform.shopId,
phone: dataform.phone,
callTableId: dataform.callTableId,
})
- if (res.code == 0) {
+ if (res) {
dataform.phone = "";
- dataform.queueId = res.data.id;
- getQueueUpState();
+ dataform.queueId = res.id;
dataform.show = false;
+ getQueueUpTablList()
uni.requestSubscribeMessage({
tmplIds: ["qUhvEfvCtIcBA3DOn3QMqsGOolrEpyr0YBh99i-AUqw",
"yxOjWK-KjMEZ_BaHWqDJJpHiUPXN6JWqr7u9y65RIWM",
@@ -264,14 +246,11 @@
// 取消排队
const cancelTakeNumber = async () => {
- let res = await this.api.cancelTakeNumber({
+ let res = await APIqueuecancel({
queueId: dataform.queueInfo.id,
shopId: dataform.shopId,
})
- if (res) {
- getQueueUpTablList();
- getQueueUpState();
- }
+ getQueueUpTablList();
}
// 切换桌型
@@ -281,7 +260,7 @@
// 弹窗关闭监听
const close = async () => {
- this.phone = "";
+ dataform.phone = "";
if (tableList.value.length > 0) {
dataform.callTableId = tableList.value[0].id;
}
@@ -291,28 +270,28 @@
onMounted(async () => {
await proxy.$onLaunched;
// 获取当前页面栈
- const pages = getCurrentPages();
- // 获取当前页面实例
- const currentPage = pages[pages.length - 1];
- // 获取页面参数
- const options = currentPage.options;
+ // const pages = getCurrentPages();
+ // // 获取当前页面实例
+ // const currentPage = pages[pages.length - 1];
+ // // 获取页面参数
+ // const options = currentPage.options;
- // #ifdef MP-WEIXIN
- if (options.q) {
- dataform.shopId = getQueryString(decodeURIComponent(options.q), 'shopId')
- dataform.queueId = getQueryString(decodeURIComponent(options.q), 'queueId')
- }
- // #endif
- console.log(dataform.shopId, 11)
- // #ifdef MP-ALIPAY
- if (getApp().globalData.shopId) {
- dataform.shopId = getApp().globalData.shopId
- }
- if (getApp().globalData.queueId) {
- dataform.queueId = getApp().globalData.queueId
- }
- // #endif
+ // // #ifdef MP-WEIXIN
+ // if (options.q) {
+ // dataform.shopId = getQueryString(decodeURIComponent(options.q), 'shopId')
+ // dataform.queueId = getQueryString(decodeURIComponent(options.q), 'queueId')
+ // }
+ // // #endif
+ // // #ifdef MP-ALIPAY
+ // if (getApp().globalData.shopId) {
+ // dataform.shopId = getApp().globalData.shopId
+ // }
+ // if (getApp().globalData.queueId) {
+ // dataform.queueId = getApp().globalData.queueId
+ // }
+ //// #endif
await nextTick()
+ uni.cache.set('shopId', 29, 30)
getQueueUpTablList();
})