diff --git a/pages/index/indexs.vue b/pages/index/indexs.vue index ff9b000..a72cc6b 100644 --- a/pages/index/indexs.vue +++ b/pages/index/indexs.vue @@ -72,6 +72,7 @@ code: uni.cache.get('tableCode'), }) console.log() + if ( !data.data.shopTableInfo.choseCount ) { uni.pro.navigateTo('/pagesOrder/orderAMeal/index', { tableCode: tableCode, @@ -94,6 +95,7 @@ shopId: uni.cache.get('shopId'), type: 'index', }) + }, getQueryString(url, name) { //解码 var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i') diff --git a/pages/order/order.vue b/pages/order/order.vue index 7117289..c2321f4 100644 --- a/pages/order/order.vue +++ b/pages/order/order.vue @@ -61,7 +61,8 @@ - + + {{ item1.productName }} @@ -366,24 +367,24 @@ // #ifdef MP-ALIPAY uni.requestPayment({ provider: 'alipay', //支付类型-固定值 - orderInfo: item.id, // 微信支付商户号 - + orderInfo: res.data.tradeNo, // 微信支付商户号 success: (res) => { let _this = this - uni.requestSubscribeMessage({ - tmplIds: ['z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ'], - complete() { - uni.showToast({ - title: "支付成功" - }) - // uni.cache.set('shopUser', '') //删除shopUser - _this.paymodfiyOrderInfo() - uni.redirectTo({ - url: '/pagesOrder/order_detail/index?orderId=' + _this - .listinfoid - }); - }, - }) + // uni.requestSubscribeMessage({ + // tmplIds: ['z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ'], + // complete() { + // uni.showToast({ + // title: "支付成功" + // }) + // // uni.cache.set('shopUser', '') //删除shopUser + + // }, + // }) + _this.paymodfiyOrderInfo() + uni.redirectTo({ + url: '/pagesOrder/order_detail/index?orderId=' + _this + .listinfoid + }); }, fail: () => { uni.hideLoading() diff --git a/pages/order_food/components/shoppingCart.vue b/pages/order_food/components/shoppingCart.vue index 2f7f263..50f9ffd 100644 --- a/pages/order_food/components/shoppingCart.vue +++ b/pages/order_food/components/shoppingCart.vue @@ -1,5 +1,5 @@ @@ -116,7 +116,7 @@ "userId": uni.cache.get('userInfo').id, "tableId": this.tableCode, } - this.addCart(params); + this.$emit("addCart",params) } catch (e) { //TODO handle the exception } @@ -137,20 +137,9 @@ "userId": uni.cache.get('userInfo').id, "tableId": this.tableCode, } - this.addCart(params); + this.$emit("addCart",params) }, - /** - * 添加到购物车 - */ - async addCart(data) { - let res = await this.api.cartAdd(data) - if (res.code == 0) { - this.showShopsku = false; - this.pagemetashow = false; - // this.$set(this, 'amountcartNumber', 0) - } - }, /** * 清空购物车 */ diff --git a/pages/order_food/components/shoppingCartBilling.vue b/pages/order_food/components/shoppingCartBilling.vue index 300ed43..54b9c1c 100644 --- a/pages/order_food/components/shoppingCartBilling.vue +++ b/pages/order_food/components/shoppingCartBilling.vue @@ -13,7 +13,7 @@ ￥ {{cartLists.amount||'0.00'}} - + 去结算 @@ -26,11 +26,11 @@ data() { return { - orderdetailFlag: true, } }, props:{ + cartListsdatashow: { type: Boolean }, @@ -72,10 +72,7 @@ * 结算直接生成订单 */ orderdetail() { - if (!this.orderdetailFlag) { - return; - } - this.orderdetailFlag = false; + if (this.cartLists.data.length == 0) { uni.showToast({ title: '请先添加商品', diff --git a/pages/order_food/order_food.vue b/pages/order_food/order_food.vue index 171e454..83a53e3 100644 --- a/pages/order_food/order_food.vue +++ b/pages/order_food/order_food.vue @@ -211,7 +211,7 @@ - + 已下单菜品 @@ -434,7 +434,7 @@ }, async onShow() { let _this = this; - + this.orderdetailFlag = true; uni.pageScrollTo({ scrollTop: 0, duration: 0 @@ -534,7 +534,7 @@ if (this.shopId) {params.shopId = this.shopId} let res = await this.api.productqueryShop(params) if (res.code == 0) { - if ( !res.data.shopTableInfo.choseCount && !this.dinersNum ) { + if ( !res.data.shopTableInfo.choseCount && this.tableCode && !this.dinersNum ) { uni.pro.navigateTo('/pagesOrder/orderAMeal/index', { tableCode: this.tableCode, shopId: res.data.storeInfo.id, @@ -586,7 +586,7 @@ searchStatus (e) { if ( e == "searchClick" ) { uni.navigateTo({ - url: `/pages/order_food/order_food_search?tableCode=${this.tableCode}&shopId=${this.shopId}` + url: `/pages/order_food/order_food_search?tableCode=${this.tableCode}&dinersNum=${this.dinersNum}&shopId=${this.shopId}` }); } }, diff --git a/pages/order_food/order_food_search.vue b/pages/order_food/order_food_search.vue index e92de25..f1829c9 100644 --- a/pages/order_food/order_food_search.vue +++ b/pages/order_food/order_food_search.vue @@ -94,8 +94,7 @@ - - + - + @@ -19,7 +19,8 @@ - + + {{items.productName}} @@ -87,7 +88,7 @@ {{ listinfo.orderInfo.seatCount}} - + diff --git a/pagesOrder/components/orderInfoBefore.vue b/pagesOrder/components/orderInfoBefore.vue index f5edcb0..62bd8a3 100644 --- a/pagesOrder/components/orderInfoBefore.vue +++ b/pagesOrder/components/orderInfoBefore.vue @@ -69,7 +69,8 @@ - + + {{item.productName}} diff --git a/pagesOrder/confirm_order/index.vue b/pagesOrder/confirm_order/index.vue index e51c71d..4ee157a 100644 --- a/pagesOrder/confirm_order/index.vue +++ b/pagesOrder/confirm_order/index.vue @@ -64,20 +64,18 @@ {{ listinfo.name }} - - - + + + + {{item.name || item.productName || "" }} {{ item.skuName || item.productSkuName || ""}} - X{{ item.totalNumber || item.num}} + X{{ item.totalNumber || item.num}} ￥{{ item.totalAmount || item.priceAmount || 0}} - - 餐位费 - X{{dinersNum}}￥{{dinersNum*storeInfo.tableFee}} - + @@ -22,9 +22,6 @@ - - - @@ -49,7 +46,13 @@ }, methods: { - + + + isOtherNum (e) { + this.$nextTick(() => { + this.otherNum = this.otherNum.replace(/\D/g, '') + }) + }, /** * 切换桌型 */ diff --git a/pagesOrder/order_detail/index.vue b/pagesOrder/order_detail/index.vue index d40f2d0..2fe8365 100644 --- a/pagesOrder/order_detail/index.vue +++ b/pagesOrder/order_detail/index.vue @@ -283,23 +283,24 @@ // #ifdef MP-ALIPAY uni.requestPayment({ provider: 'alipay', //支付类型-固定值 - orderInfo: res.data.appId, // 微信支付商户号 + orderInfo: res.data.tradeNo, // 微信支付商户号 success: (res) => { let _this = this - uni.requestSubscribeMessage({ - tmplIds: ['z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ'], - complete() { - uni.showToast({ - title: "支付成功" - }) - // uni.cache.set('shopUser', '') //删除shopUser - _this.paymodfiyOrderInfo() - uni.redirectTo({ - url: '/pagesOrder/order_detail/index?orderId=' + _this.listinfoid - }); - }, - }) + // uni.requestSubscribeMessage({ + // tmplIds: ['z0fUG7-jhSfYCrw6poOvSRzh4_hgnPkm_5C7E5s5bCQ'], + // complete() { + // uni.showToast({ + // title: "支付成功" + // }) + // // uni.cache.set('shopUser', '') //删除shopUser + + // }, + // }) + _this.paymodfiyOrderInfo() + uni.redirectTo({ + url: '/pagesOrder/order_detail/index?orderId=' + _this.listinfoid + }); }, fail: () => { uni.hideLoading()