From 5a0d6284d939532fa6166e9eb191cafef6eccd54 Mon Sep 17 00:00:00 2001 From: "LAPTOP-V1CF3RCA\\31532" <315328220@qq.com> Date: Fri, 15 Aug 2025 08:54:55 +0800 Subject: [PATCH 1/3] no message --- pages/other_package/productInfo/productInfo.vue | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pages/other_package/productInfo/productInfo.vue b/pages/other_package/productInfo/productInfo.vue index 87edff7..817cd8a 100644 --- a/pages/other_package/productInfo/productInfo.vue +++ b/pages/other_package/productInfo/productInfo.vue @@ -44,7 +44,7 @@ - + 规格 @@ -385,6 +385,10 @@ export default { }, async checkSpecification(val, type) { const source = this.source; + if(type == 'n' && this.ji == 1){ + type = 'buy'; + } + console.log('afsdfsd',source,type) if (source && source === "supply_chain") { this.openShow = true; return; @@ -521,9 +525,9 @@ export default { duration: 2000 // 持续时长，单位ms }); // } - setTimeout(() => { - this.checkSpecification(false, null); - }, 2000) + // setTimeout(() => { + // this.checkSpecification(false, null); + // }, 2000) } }, // 跳转到分享页面 From a8f5a803ae4c861823ba5cb92dd1efec28a72933 Mon Sep 17 00:00:00 2001 From: "LAPTOP-V1CF3RCA\\31532" <315328220@qq.com> Date: Fri, 15 Aug 2025 08:59:03 +0800 Subject: [PATCH 2/3] no message --- pages/other_package/productInfo/productInfo.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pages/other_package/productInfo/productInfo.vue b/pages/other_package/productInfo/productInfo.vue index 817cd8a..ee8b0ee 100644 --- a/pages/other_package/productInfo/productInfo.vue +++ b/pages/other_package/productInfo/productInfo.vue @@ -505,7 +505,7 @@ export default { goodsNum: this.orderInfo.quantity,// 商品数量 } console.log('selectTempl',selectTempl) - if(isBy){ + if(this.ji == 1){ params['specsId'] = selectTempl; uni.navigateTo({ url: `/pages/order_package/order_submit/order_submit?sed=${JSON.stringify(params)}`, @@ -514,17 +514,17 @@ export default { } const resp = await addGoods(params); if (resp && resp.bizcode === 100) { - // if (isBy) { - // uni.navigateTo({ - // url: `/pages/order_package/order_submit/order_submit?ids=${resp.data}&ji=${this.ji}`, - // }) - // } else { + if (isBy) { + uni.navigateTo({ + url: `/pages/order_package/order_submit/order_submit?ids=${resp.data}`, + }) + } else { uni.showToast({ title: '成功加入购物车', icon: 'success', // 可选 success/loading/none duration: 2000 // 持续时长，单位ms }); - // } + } // setTimeout(() => { // this.checkSpecification(false, null); // }, 2000) From 0890cc1d6b0933a2ec1d0854e7cd894af5fa1b36 Mon Sep 17 00:00:00 2001 From: "LAPTOP-V1CF3RCA\\31532" <315328220@qq.com> Date: Fri, 15 Aug 2025 14:55:34 +0800 Subject: [PATCH 3/3] no message --- pages/mine/mine.vue | 12 ++++---- pages/mine_package/mine_purse/mine_purse.vue | 5 +++- .../order_submit/order_submit.vue | 29 +++++++++++++++++-- utils/config.js | 4 +-- 4 files changed, 38 insertions(+), 12 deletions(-) diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue index da63a4a..e20da63 100644 --- a/pages/mine/mine.vue +++ b/pages/mine/mine.vue @@ -232,11 +232,11 @@ export default { url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_js.png', path: "/pages/user/jia" }, - { - id: 3, - title: "交易", - url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/apply_hm.png' - }, + // { + // id: 3, + // title: "交易", + // url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/apply_hm.png' + // }, // { // id:4, // title:"贡献值", @@ -306,7 +306,7 @@ export default { path: "/pages/finance/finance", }, { id: 11, - title: "RWA交易", + title: "股东行权", url: 'https://cex-pub.s3.ap-southeast-1.amazonaws.com/static/tool_hxjy.png', path: "/pages/rwa_package/rwa/rwa", }, diff --git a/pages/mine_package/mine_purse/mine_purse.vue b/pages/mine_package/mine_purse/mine_purse.vue index 9aecad5..cf4e8af 100644 --- a/pages/mine_package/mine_purse/mine_purse.vue +++ b/pages/mine_package/mine_purse/mine_purse.vue @@ -100,8 +100,11 @@ export default { url: "/pages/mine_package/mine_purse_recharge/mine_purse_recharge?amount=" + row.curAmount + "&category=" + row.categoty, }) } else if (type === "exchange") {// 兑换 + // uni.navigateTo({ + // url: "/pages/mine_package/mine_purse_exchange/mine_purse_exchange?amount=" + row.curAmount + "&category=" + row.categoty, + // }) uni.navigateTo({ - url: "/pages/mine_package/mine_purse_exchange/mine_purse_exchange?amount=" + row.curAmount + "&category=" + row.categoty, + url: "/pages/other_package/pointsRedemption/pointsRedemption" }) } else if (type === "transfer") { console.log("transfer转出...") diff --git a/pages/order_package/order_submit/order_submit.vue b/pages/order_package/order_submit/order_submit.vue index ee918e6..3dd4f4f 100644 --- a/pages/order_package/order_submit/order_submit.vue +++ b/pages/order_package/order_submit/order_submit.vue @@ -217,7 +217,8 @@ export default { wayOption: [], isShowBalance: false, ji:0, - sed:null + sed:null, + curPay:null }; }, onLoad(option) { @@ -271,7 +272,6 @@ export default { const result = await getSupportPay(parmas); if (result && result.bizcode === 100) { const data = result.data || []; - console.log('getWayOption',data) const amount = this.orderInfo.amount; let flag = data.some(item => ['wechat', 'alipay'].includes(item.type)); // 没有支付宝和微信支付 @@ -282,6 +282,7 @@ export default { this.isShowBalance = balanceFlag; } this.wayOption = data; + console.log('getWayOption',this.wayOption) } }, async getOrder() { @@ -449,6 +450,8 @@ export default { * 去支付 */ async goPay() { + + console.log('getWayOption',this.wayOption,this.orderInfo) const orderInfo = this.orderInfo; if (!orderInfo.address || Object.keys(orderInfo.address).length === 0) { @@ -467,7 +470,25 @@ export default { }); return; } - + let arr = this.wayOption.filter(i=>i.type == orderInfo.paymentMethod); + if(arr.length){ + if(arr[0].type == 'balance' || arr[0].type == 'redpacket'){ + if(arr[0].balance < orderInfo.amount){ + this.$refs.uToastRef.show({ + type: 'error', + message: "余额不足", + }); + return; + } + } + }else{ + this.$refs.uToastRef.show({ + type: 'error', + message: "请先选择支付方式", + }); + return; + } + const params = { addrId: orderInfo.address.id,// 收货地址ID //结算的购物车ID，多个以逗号分割，ALL表示全选 @@ -485,6 +506,8 @@ export default { resp = await settle(params); } + console.log('getWayOption',this.wayOption,orderInfo) + // 提交订单成功，就唤起支付 if (resp && resp.bizcode === 100) { diff --git a/utils/config.js b/utils/config.js index c38bc17..f50ddb9 100644 --- a/utils/config.js +++ b/utils/config.js @@ -18,5 +18,5 @@ export const USER_CN = "https://www.finecc.net/?wenti/3422.html";//用户协议 // 信任桥 正式环境 export const Authorization = "bxboAtH04huysyO1DO2E4FNomvQaFItp0gzHRv0aM+Hx4Rb9pijiAlWdRPUtB4HUJrwa1yVGoKFyCmXGZYja9v+GPz+SFVnDJJk/yit2LLMxX85SpnzRzVySJSsDTBLSTrh5BhGPST2iymdcGvQAdNIW9gAQoeDGIr8o3ctgLF08cdJiEQc255Ql7LxdqiHgP/SgY2JUrlGxGzE5iXDETCmXCvBxqbxEzhe4JbgdEMlKjjA0jcFDam0ArHPD2CoHI7WemdJZDw2+OAokFnoSF8dMyt1G9+nHqD40iMcK5bG6BFUNJwVMFgIZvQz5OqotqaNKnq/80UNDyOyeaaj9Lw=="; -export const CUSTOMER_SERVICE_PHONE_NUMBER = "138 8888 8888";// 客服联系方式 -export const CLOUD_SERVICE_PHONE_NUMBER = "186 5566 5566";// 云仓客服联系方式 \ No newline at end of file +export const CUSTOMER_SERVICE_PHONE_NUMBER = "177 1552 7590";// 客服联系方式 +export const CLOUD_SERVICE_PHONE_NUMBER = "177 1552 7590";// 云仓客服联系方式 \ No newline at end of file