diff --git a/components/b-xbk-sku-popup/b-xbk-sku-popup.vue b/components/b-xbk-sku-popup/b-xbk-sku-popup.vue
index 2a0411c..49d830e 100644
--- a/components/b-xbk-sku-popup/b-xbk-sku-popup.vue
+++ b/components/b-xbk-sku-popup/b-xbk-sku-popup.vue
@@ -17,9 +17,9 @@
{{skuinfor['sku']}}
- ￥
- {{RetainDecimalPoint(skuinfor['adj_pay'] * skuinfor['num'])}}
-
+ ￥
+
+ {{skuinfor['adj_pay'] * skuinfor['num']}}
@@ -152,7 +152,8 @@
let newarr = r.filter(item => {
if (item['checked']) {
if (item?.price) {
- add_price = item['price'] * 100;
+ // add_price = item['price'] * 100;
+ add_price = item['price']; // jin
// 商品的原价与配料价格相加
pay += add_price
};
@@ -170,7 +171,8 @@
this['skuinfor']['sku'] = newarr.join('/');
// 设置规格code
this['skuinfor']['sku_code'] = str.join(',');
- this['skuinfor']['add_price'] = add_price;
+ this['skuinfor']['add_price'] = add_price;
+ console.log(add_price, 'xxxxxxxxxxxxx')
// this['skuinfor']['adj_pay'] = (+this['skuinfor']['pay_price']) + (+add_price);
this['skuinfor']['adj_pay'] = (+this['skuinfor']['product_price']) + (+add_price); //Jin
console.log(this['skuinfor'],'星巴克筛选');
diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue
index 1bd3a40..8c1a487 100644
--- a/pages/restaurant/order/orders-settlement/orders-settlement.vue
+++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue
@@ -172,7 +172,8 @@
import {
conWalletInfoAPI,
createOrderNewAPI,
- getPhoneAPI
+ getPhoneAPI,
+ createFoodOrder
} from '@/request/restaurant/index.js';
// 商品组件
import bRxCommodityItem from '@/components/b-rx-commodity-item/b-rx-commodity-item.vue'
diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue
index 4574979..eb85d47 100644
--- a/pages/restaurant/order/orders-settlement/settlement.vue
+++ b/pages/restaurant/order/orders-settlement/settlement.vue
@@ -145,7 +145,8 @@
createOrderNewAPI,
conWalletInfoAPI,
getPhoneAPI,
- computedOfflineOrder
+ computedOfflineOrder,
+ createFoodOrder
} from '@/request/restaurant/index.js';
let self;
export default {
@@ -315,25 +316,37 @@
});
console.log(FormInfor, 'FormInfor');
// return
- createOrderNewAPI(FormInfor).then(res => {
- uni.hideLoading();
- this.$Payment.H5_Payment({
- pay_price: res['data']['pay_price'],
- order_sn: res['data']['order_sn'],
- type: res['data']['type'],
- openid: res['data']['openid'],
- return_url: `/pages/restaurant/order/order-status/order-status?order_sn=${res['data']['order_sn']}`
- });
- // 支付
- // this.payment({
- // order_sn:res['data']['order_sn'],
- // type:res['data']['type'],
- // // 仅微信环境下存在参数
- // money:res['data']['money'],
- // redirect_url:`/pages/restaurant/order/order-status/order-status`
- // });
+ // createOrderNewAPI(FormInfor).then(res => {
+ // uni.hideLoading();
+ // this.$Payment.H5_Payment({
+ // pay_price: res['data']['pay_price'],
+ // order_sn: res['data']['order_sn'],
+ // type: res['data']['type'],
+ // openid: res['data']['openid'],
+ // return_url: `/pages/restaurant/order/order-status/order-status?order_sn=${res['data']['order_sn']}`
+ // });
+ // // 支付
+ // // this.payment({
+ // // order_sn:res['data']['order_sn'],
+ // // type:res['data']['type'],
+ // // // 仅微信环境下存在参数
+ // // money:res['data']['money'],
+ // // redirect_url:`/pages/restaurant/order/order-status/order-status`
+ // // });
+ // })
+
+ FormInfor.phone = FormInfor.phone_number;
+
+ createFoodOrder(FormInfor).then(res => {
+ uni.hideLoading();
+ this.$Payment.H5_Payment({
+ pay_price: res['data']['pay_price'],
+ order_sn: res['data']['order_sn'],
+ type: res['data']['type'],
+ openid: res['data']['openid'],
+ return_url: `/pages/restaurant/order/order-status/order-status?order_sn=${res['data']['order_sn']}`
+ });
})
-
},
/**
diff --git a/request/restaurant/index.js b/request/restaurant/index.js
index 592850d..a7fefc4 100644
--- a/request/restaurant/index.js
+++ b/request/restaurant/index.js
@@ -98,3 +98,9 @@ export const getPhoneAPI = parameters => request.Request({ url: "/api/merchant_o
* @计算点餐金额
*/
export const computedOfflineOrder = parameters => request.Request({ url: "/api/client/orders/computedOfflineOrder", parameters, method:'POST'});
+
+
+/**
+ * @下单
+ */
+export const createFoodOrder = parameters => request.Request({ url: "/api/client/orders/createFoodOrder", parameters, method:'POST'});
diff --git a/static/js/mixin/PayMixin.js b/static/js/mixin/PayMixin.js
index 6c10f80..9f59fd4 100644
--- a/static/js/mixin/PayMixin.js
+++ b/static/js/mixin/PayMixin.js
@@ -46,9 +46,13 @@ class Payment {
OrderData['WechatRetreat'] = true;
// 先跳转至微信支付页面
try{
- wx.miniProgram.navigateTo({
- url: `/pages/wxpay/h5pay/h5pay?data=${encodeURIComponent(JSON.stringify(OrderData))}`
- });
+ // wx.miniProgram.navigateTo({
+ // url: `/pages/wxpay/h5pay/h5pay?data=${encodeURIComponent(JSON.stringify(OrderData))}`
+ // });
+ wx.miniProgram.navigateTo({
+ url: `/pages/extension/shop/wxPay/wxPay?data=${encodeURIComponent(JSON.stringify(OrderData))}`
+ }); // Jin
+
// 延迟两秒后H5内部跳转
setTimeout(()=>{
uni.hideLoading();
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index f2360ae..54bfe54 100644
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@@ -1,2 +1,2 @@
消费补贴卡
\ No newline at end of file
+ document.write('')