From 59dac8d2a07f47d1dc542b947e8583a489955ee2 Mon Sep 17 00:00:00 2001
From: whitechiina <1293616053@qq.com>
Date: Tue, 1 Apr 2025 20:31:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=82=AF=E5=BE=B7=E5=9F=BA=E4=B8=8B?=
=?UTF-8?q?=E5=8D=95=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 1 +
.../orders-settlement/orders-settlement.vue | 22 ++++++------
.../order/orders-settlement/settlement.vue | 36 +++++++++----------
request/request.js | 5 +++
store/index.js | 10 ++++--
unpackage/dist/build/web/index.html | 2 +-
.../build/web/static/js/index.71fe66c1.js | 1 +
.../build/web/static/js/index.f9aee9e3.js | 1 -
...s-settlement-orders-settlement.758f5648.js | 1 -
...s-settlement-orders-settlement.9ee8dade.js | 1 +
...r-orders-settlement-settlement.e896b25b.js | 1 -
...r-orders-settlement-settlement.e9ade080.js | 1 +
12 files changed, 46 insertions(+), 36 deletions(-)
create mode 100644 unpackage/dist/build/web/static/js/index.71fe66c1.js
delete mode 100644 unpackage/dist/build/web/static/js/index.f9aee9e3.js
delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.758f5648.js
create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-orders-settlement.9ee8dade.js
delete mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-settlement.e896b25b.js
create mode 100644 unpackage/dist/build/web/static/js/pages-restaurant-order-orders-settlement-settlement.e9ade080.js
diff --git a/App.vue b/App.vue
index 404de3f..57bdd46 100644
--- a/App.vue
+++ b/App.vue
@@ -143,6 +143,7 @@
// 全局初始化参数中存在isWechat属性则代表就是从小程序跳入
if (this['globalData']['parameters']?.isWechat) {
store.commit('SetcityInfor', this['globalData']['parameters']['cityInfor']);
+ store.commit('SetToken', this['globalData']['parameters']['token']);
} else {
// 反之则代表从APP进入H5
diff --git a/pages/restaurant/order/orders-settlement/orders-settlement.vue b/pages/restaurant/order/orders-settlement/orders-settlement.vue
index 849ef10..c10d16d 100644
--- a/pages/restaurant/order/orders-settlement/orders-settlement.vue
+++ b/pages/restaurant/order/orders-settlement/orders-settlement.vue
@@ -12,13 +12,12 @@
用于接收订单进度,请正确填写
-
+
- 就餐方式瑞幸瑞幸瑞幸瑞幸
+ 就餐方式
-
@@ -77,7 +75,7 @@
-
+
抵用券
@@ -86,7 +84,7 @@
-
+
余额
@@ -191,7 +189,7 @@
-
+
取消
@@ -247,7 +245,9 @@
// 抵扣金额
deduction_amount_total: 0,
// 产品集合
- products: [],
+ products: [],
+ use_coin: 0,
+ use_broker: 0,
// products>product_id
// products>amount
// products>is_deduction
@@ -294,8 +294,6 @@
type:4
}).then(res=>{
this.SETPHONE(res['data'].phone)
- console.log('获取手机号', res.data.phone)
-
this.getCart();
})
},
@@ -986,8 +984,8 @@
align-items: center;
.replace {
- border: 1rpx solid #00AF66;
- color: #00AF66;
+ border: 1rpx solid #000;
+ color: #000;
}
.confirm {
diff --git a/pages/restaurant/order/orders-settlement/settlement.vue b/pages/restaurant/order/orders-settlement/settlement.vue
index a363e84..5796de2 100644
--- a/pages/restaurant/order/orders-settlement/settlement.vue
+++ b/pages/restaurant/order/orders-settlement/settlement.vue
@@ -42,7 +42,7 @@
- 余额:¥{{ _amount(amount)}}
+
共{{shoptotalnum}}件
@@ -90,22 +90,22 @@
-
+
抵用券
( 余额:¥{{ computedTotal.broker_balance }} )
-
+
-
+
余额
( 余额:¥{{ computedTotal.coin_balance }} )
-
+
@@ -215,8 +215,8 @@
getPhoneAPI({
brand_id: this['BrandInfor']['brand_id'],
type: 4
- }).then(res => {
- this.SETPHONE(res['data'])
+ }).then(res => {
+ this.SETPHONE(res['data'].phone)
this.getCart();
})
},
@@ -337,7 +337,7 @@
createFoodOrder(FormInfor).then(res => {
uni.hideLoading();
- this.$Payment.H5_Payment({
+ this.$Payment.H5TOWX_Payment({
pay_price: res['data']['pay_price'],
order_sn: res['data']['order_sn'],
type: res['data']['type'],
@@ -351,18 +351,18 @@
* @商品是否优惠
* */
ischoiceDiscount(index) {
- let current = this['FormInfor']['products'][index];
- // 当前余额为0并且用户准备勾选补贴选项则直接打断
- if (this['amount'] == 0 && !current['is_deduction']) {
- uni.showToast({
- title: '余额不足',
- icon: 'none'
- });
- return
- }
+ let current = this['FormInfor']['products'][index];
+ // 当前余额为0并且用户准备勾选补贴选项则直接打断
+ // JIN
+ // if (this['amount'] == 0 && !current['is_deduction']) {
+ // uni.showToast({
+ // title: '余额不足',
+ // icon: 'none'
+ // });
+ // return
+ // }
// 状态取反
current['is_deduction'] = current['is_deduction'] ? 0 : 1;
-
},
}
}
diff --git a/request/request.js b/request/request.js
index ed5f813..d886777 100644
--- a/request/request.js
+++ b/request/request.js
@@ -173,6 +173,11 @@ class Request {
Requestintercept(config) {
// 请求时需要携带用定位
let cityInfor = state['getters']['GetcityInfor'];
+ let token = state['getters']['GetcityInfor'];
+
+ // 固定写入
+ config['header']['authori-zation'] = state['getters']['GetToken'];
+
console.log(cityInfor, '定位信息头')
if (cityInfor?.city) {
// config['header']['city'] = encodeURIComponent(cityInfor['city']);
diff --git a/store/index.js b/store/index.js
index 8e765a4..898ac3e 100644
--- a/store/index.js
+++ b/store/index.js
@@ -60,7 +60,8 @@ const store = new Vuex.Store({
cityId: "", // 市ID
regionName: "", // 区名
regionId: "" // 区ID
- }
+ },
+ token: ''
},
getters: {
// 获取操作端
@@ -72,7 +73,9 @@ const store = new Vuex.Store({
// 获取用户选择的城市code
GetCityCode: state => state['AraeCityCode'],
// 获取电影城市数据
- GetFilmData: state => state['FilmCityDate']
+ GetFilmData: state => state['FilmCityDate'],
+
+ GetToken: state => state['token']
},
mutations: {
// 用户自主选择位置之后
@@ -107,6 +110,9 @@ const store = new Vuex.Store({
*/
GetState(state) {
// uni.setStorageSync('VUEXSTATE', JSON.stringify(store));
+ },
+ SetToken(state, data) {
+ state['token'] = data;
}
},
modules: {
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index 87aff15..6afedc7 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('')