From 29726997410488dd5429adcfbe5fb43d2326f7b9 Mon Sep 17 00:00:00 2001 From: 15820893422 <1978476055@qq.com> Date: Mon, 24 Jun 2024 11:38:28 +0800 Subject: [PATCH] 1 --- components/payment/index.vue | 98 +++++++++++++++++++++-------- config/app.js | 4 +- manifest.json | 4 +- pages.json | 6 +- pages/order_details/index.vue | 14 +++++ pages/order_details/stay.vue | 14 +++++ pages/users/order_confirm/index.vue | 27 ++++++-- pages/users/order_list/index.vue | 14 +++++ pages/users/refund/detail.vue | 20 +++++- pages/users/user_bill/index.vue | 2 +- pages/users/user_money/index.vue | 32 +++------- 11 files changed, 174 insertions(+), 61 deletions(-) diff --git a/components/payment/index.vue b/components/payment/index.vue index fa902f1..7671723 100644 --- a/components/payment/index.vue +++ b/components/payment/index.vue @@ -118,32 +118,74 @@ let that = this; let type = ''; that.show_integral=false; - if (paytype == 'wechat') { - // #ifdef H5 - type = this.$wechat.isWeixin() ? 'weixin' : 'h5'; - // #endif - // #ifdef APP-PLUS - type = 'weixin'; - // #endif - // #ifdef MP - type = 'routine'; - // #endif - } else if (paytype == 'balance') { - type = 'balance'; - }else if (paytype == 'integral') { - type = 'integral'; - that.show_integral=true; - }else if(paytype == 'alipay'){ - // #ifndef MP - type = 'alipay'; - // #endif - // #ifdef MP - type = 'alipayQr'; - // #endif - }else if(paytype == 'sand'){ - type = 'sand' - }else if(paytype == 'sandCard'){ - type = 'sandCard' + // if (paytype == 'wechat') { + // // #ifdef H5 + // type = this.$wechat.isWeixin() ? 'weixin' : 'h5'; + // // #endif + // // #ifdef APP-PLUS + // type = 'weixin'; + // // #endif + // // #ifdef MP + // type = 'routine'; + // // #endif + // } else if (paytype == 'balance') { + // type = 'balance'; + // }else if (paytype == 'integral') { + // type = 'integral'; + // that.show_integral=true; + // }else if(paytype == 'alipay'){ + // // #ifndef MP + // type = 'alipay'; + // // #endif + // // #ifdef MP + // type = 'alipayQr'; + // // #endif + // }else if(paytype == 'sand'){ + // type = 'sand' + // }else if(paytype == 'sandCard'){ + // type = 'sandCard' + // }else if(paytype == 'hf'){ + // type = 'hf' + // } + switch (paytype){ + case 'balance': + type = 'balance' + break; + case 'wechat': + // #ifdef H5 + type = this.$wechat.isWeixin() ? 'weixin' : 'h5'; + // #endif + // #ifdef APP-PLUS + type = 'weixin'; + // #endif + // #ifdef MP + type = 'routine'; + // #endif + break; + case 'integral': + type = 'integral' + that.show_integral=true; + break; + case 'alipay': + // #ifndef MP + type = 'alipay'; + // #endif + // #ifdef MP + type = 'alipayQr'; + // #endif + break; + case 'sand': + type = 'sand' + break; + case 'sandCard': + type = 'sandCard' + break; + case 'hf': + type = 'hf' + break; + case 'sandQr': + type = 'sandQr' + break; } if (!that.order_id) return that.$util.Tips({ title: '请选择要支付的订单' @@ -381,6 +423,8 @@ break; case 'sand': case 'sandCard': + case 'hf': + case 'sandQr': setTimeout(() => { location.href = jsConfig; }, 100); @@ -390,6 +434,8 @@ // #ifdef APP-PLUS case 'sand': case 'sandCard': + case 'hf': + case 'sandQr': console.log(jsConfig); if (plus.os.name === 'iOS') { plus.runtime.openURL(jsConfig); diff --git a/config/app.js b/config/app.js index 9622ad1..14a191c 100644 --- a/config/app.js +++ b/config/app.js @@ -6,11 +6,11 @@ let VUE_APP_WS_URL = `ws://${location.hostname}?type=user` let openPlantGrass = '-openPlantGrass-' // 网络接口修改此字符 小程序域名要求https -// let httpApi = 'http://192.168.1.50:8080' //测试 +// let httpApi = 'http://192.168.1.3:8080' //测试 let httpApi = 'https://api.tropjoin.com' //生产 // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer. .net -// let wsApi = 'ws://192.168.1.50:8080' +// let wsApi = 'ws://192.168.1.3:8080' let wsApi = 'wss://ws.tropjoin.com' module.exports = { diff --git a/manifest.json b/manifest.json index 88e0d8f..7d16d1c 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "铸源优品", "appid" : "__UNI__496DF55", "description" : "", - "versionName" : "1.0.6", - "versionCode" : 133, + "versionName" : "1.1.0", + "versionCode" : 137, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index c95425d..ab90a1b 100644 --- a/pages.json +++ b/pages.json @@ -15,7 +15,7 @@ "path": "pages/index/index", "style": { "navigationBarTitleText": "首页", - // "navigationStyle": "custom", + "navigationStyle": "custom", // #ifdef APP-PLUS "enablePullDownRefresh": false, // #endif @@ -245,13 +245,13 @@ { "path": "user_money/index", "style": { - "navigationBarTitleText": "我的账户" + "navigationBarTitleText": "我的抵扣券" } }, { "path": "user_bill/index", "style": { - "navigationBarTitleText": "账单明细" + "navigationBarTitleText": "抵扣明细" } }, { diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 910a7e7..5ddf429 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -387,6 +387,20 @@ title: '绑卡快捷支付', payStatus: this.$store.getters.globalData.sand2_open }, + { + "name": "支付宝支付", + "icon": "icon-zhifubao", + value: 'hf', + title: '支付宝支付', + payStatus: this.$store.getters.globalData.hf_alipay_open, + }, + { + "name": "银联扫码", + "icon": "icon-icon-test", + value: 'sandQr', + title: '银联扫码', + payStatus: this.$store.getters.globalData.sand_qr_open, + } ], pay_close: false, pay_order_id: '', diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue index 5adc4e6..5fe20cd 100644 --- a/pages/order_details/stay.vue +++ b/pages/order_details/stay.vue @@ -249,6 +249,20 @@ value: 'sandCard', title: '绑卡快捷支付', payStatus: this.$store.getters.globalData.sand2_open + }, + { + "name": "支付宝支付", + "icon": "icon-zhifubao", + value: 'hf', + title: '支付宝支付', + payStatus: this.$store.getters.globalData.hf_alipay_open, + }, + { + "name": "银联扫码", + "icon": "icon-icon-test", + value: 'sandQr', + title: '银联扫码', + payStatus: this.$store.getters.globalData.sand_qr_open, } ], pay_close: false, diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index f31c8cd..f53d63f 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -413,7 +413,7 @@ - + 抵扣券抵扣： 当前抵扣券{{userInfo.now_money}} @@ -589,6 +589,20 @@ title: '绑卡快捷支付', payStatus: this.$store.getters.globalData.sand2_open, }, + { + "name": "支付宝支付", + "icon": "icon-icon34", + value: 'hf', + title: '支付宝支付', + payStatus: this.$store.getters.globalData.hf_alipay_open, + }, + { + "name": "银联扫码", + "icon": "icon-icon-test", + value: 'sandQr', + title: '银联扫码', + payStatus: this.$store.getters.globalData.sand_qr_open, + }, { "name": "铸源星支付", "icon": "haiyuefont haiyue-jifenduihuan", @@ -667,7 +681,7 @@ animated: false, totalPrice: 0, use_integral: false, - now_integral: false, + now_integral: true, pagesUrl: "", orderKey: "", offlinePostage: "", @@ -691,6 +705,7 @@ orderPay: false, take: [], open_integral: 0, + open_money: false, coupon_number: 0, store_coupon_number: 0, coupon_amount: 0, @@ -726,7 +741,7 @@ }; }, computed: { - ...mapGetters(['isLogin','viewColor']), + ...mapGetters(['isLogin','viewColor','globalData']), ...configMap(['hide_mer_status', 'alipay_open', 'yue_pay_status']), }, watch: { @@ -1143,6 +1158,7 @@ that.$set(that, 'integral_price', res.data.order_total_integral_price); that.$set(that, 'use_amount', res.data.order_total_amount_price); that.$set(that, 'open_integral', res.data.openIntegral); + that.$set(that, 'open_money', res.data.openMoney); that.$set(that, 'use_integral', res.data.useIntegral); that.$set(that, 'order_extend', (that.order_extend && that.order_extend.length>0) ? that.order_extend : res.data.order_extend); if(res.data.mer_form_id && !that.order_form.length && res.data.mer_form_info && res.data.mer_form_info.value){ @@ -1510,6 +1526,8 @@ break; case 'sandCard': case 'sand': + case 'hf': + case 'sandQr': setTimeout(() => { location.href = jsConfig; }, 100); @@ -1523,13 +1541,14 @@ // #ifdef APP-PLUS case 'sand': case 'sandCard': + case 'hf': + case 'sandQr': if (plus.os.name === 'iOS') { plus.runtime.openURL(jsConfig); } else if (plus.os.name === 'Android') { plus.runtime.openURL(jsConfig); } break; - // if (plus.os.name === 'iOS') { // plus.runtime.openURL(jsConfig); // } else if (plus.os.name === 'Android') { diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index bc62aac..99aa924 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -336,6 +336,20 @@ title: '绑卡快捷支付', payStatus: this.$store.getters.globalData.sand2_open, }, + { + "name": "支付宝支付", + "icon": "icon-zhifubao", + value: 'hf', + title: '支付宝支付', + payStatus: this.$store.getters.globalData.hf_alipay_open, + }, + { + "name": "银联扫码", + "icon": "icon-icon-test", + value: 'sandQr', + title: '银联扫码', + payStatus: this.$store.getters.globalData.sand_qr_open, + } ], pay_close: false, pay_order_id: '', diff --git a/pages/users/refund/detail.vue b/pages/users/refund/detail.vue index 0ae255d..1f8e6b3 100644 --- a/pages/users/refund/detail.vue +++ b/pages/users/refund/detail.vue @@ -84,7 +84,25 @@ - 退款金额： + 退货金额： + + ¥ {{detail.refund_price-detail.refund_postage}} + + + + 退抵扣券： + + ¥ {{detail.amount}} + + + + 退运费金额： + + ¥ {{detail.refund_postage}} + + + + 退款总金额： ¥ {{detail.refund_price}} diff --git a/pages/users/user_bill/index.vue b/pages/users/user_bill/index.vue index 880ae34..8c1be27 100644 --- a/pages/users/user_bill/index.vue +++ b/pages/users/user_bill/index.vue @@ -4,7 +4,7 @@ 全部 消费 - 充值 + diff --git a/pages/users/user_money/index.vue b/pages/users/user_money/index.vue index 574bf78..06e03cb 100644 --- a/pages/users/user_money/index.vue +++ b/pages/users/user_money/index.vue @@ -4,50 +4,38 @@ - - + - 累计消费(元) - {{userInfo.total_consume || 0}} + 累计使用抵扣(券) + {{Math.abs(userInfo.now_money) || 0}} - + - 消费记录 + 抵扣记录 - + @@ -149,7 +137,7 @@ } .my-account .wrapper .header { width: 690rpx; - height: 330rpx; + height: 220rpx; background-image: linear-gradient(to right, var(--view-bntColor21) 0%, var(--view-bntColor22) 100%); border-radius: 16rpx; margin: 0 auto;