From 681328f9e1ccf3075852f2561f92413ffb8b4d34 Mon Sep 17 00:00:00 2001 From: gyq <875626088@qq.com> Date: Wed, 21 May 2025 16:52:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=94=AF=E4=BB=98=E5=AE=9D?= =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/payment/payment.vue | 31 +- manifest.json | 545 ++++++++++++++++---------------- pages/buy/buy.vue | 14 +- pages/index/index.vue | 15 +- pages/user-order/user-order.vue | 11 +- 5 files changed, 325 insertions(+), 291 deletions(-) diff --git a/components/payment/payment.vue b/components/payment/payment.vue index 1f9a4fe..7ba30ec 100644 --- a/components/payment/payment.vue +++ b/components/payment/payment.vue @@ -324,12 +324,6 @@ // 没有指定支付方式则不匹配支付标识 var payment = null; if ((payment_id || 0) != 0) { - // #ifdef H5 - // 微信环境判断是否已有web_openid、不存在则不继续执行跳转到插件进行授权 - // if (!app.globalData.is_user_weixin_web_openid(order_id, payment_id || this.payment_id, this.propToAppointPage)) { - // return false; - // } - // #endif // 支付方式 for (var i in this.payment_list) { if (this.payment_list[i]['id'] == (payment_id || this.payment_id)) { @@ -350,6 +344,9 @@ uni.redirectTo({ url: `/pages/buy/wu_you_status?payment_id=${payment.id}&order_id=${order_id}`, }); + } else if (payment.payment == 'WalletPay') { + console.log('支付宝支付order_id===', order_id); + // console.log('支付宝支付===', data); } else { // 请求数据 var post_data = { @@ -374,16 +371,18 @@ title: this.$t('payment.payment.e1f54e'), mask: true, }); + + console.log('this.propPayUrl===', this.propPayUrl); + if (this.propPayUrl) { + console.log('post_data===', post_data); uni.request({ url: this.propPayUrl, method: 'POST', - data: { - ...post_data, - wechat_open_id: localStorage.getItem('web_openid') || '', - }, + data: post_data, dataType: 'json', success: (res) => { + console.log('this.propPayUrl.res===', res); uni.hideLoading(); var data = res.data.data; this.setData({ @@ -467,11 +466,13 @@ } }, fail: (res) => { + console.log('fail', res); uni.hideLoading(); app.globalData.showToast(this.$t('common.internet_error_tips')); }, }); } else { + console.log('为什么不进支付'); app.globalData.showToast(this.$t('payment.payment.597s8b')); } } @@ -636,6 +637,8 @@ service: 5, // #endif success: (res) => { + console.log('支付成功1111===', res); + // #ifdef MP-ALIPAY if (res.resultCode != 9000) { self.order_item_pay_fail_handle(data, order_id, res.memo || self.$t('paytips.paytips.6y488i')); @@ -652,6 +655,7 @@ self.order_item_pay_success_handle(data, order_id); }, fail: (res) => { + console.log('支付失败2222===', res); self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i')); }, }); @@ -756,6 +760,13 @@ return; } + // 支付宝支付 + if (data.payment.payment == 'WalletPay') { + console.log('支付宝支付order_id===', order_id); + console.log('支付宝支付===', data); + return; + } + // 二维码展示 if ((data.data.qrcode_url || null) != null && (data.data.name || null) != null && (data.data.order_no || null) != null) { status = true; diff --git a/manifest.json b/manifest.json index a510737..3486cd4 100644 --- a/manifest.json +++ b/manifest.json @@ -1,278 +1,279 @@ { - "name": "ShopXO", - "appid": "__UNI__F095115", - "description": "ShopXO开源商城、MIT协议、可商用、可二次开发、满足99%电商运营需求", - "versionName": "1.0.0", - "versionCode": 100, - "transformPx": false, - "app-plus": { - "usingComponents": true, - "nvueCompiler": "uni-app", - "compilerVersion": 3, - "splashscreen": { - "alwaysShowBeforeRender": true, - "waiting": true, - "autoclose": true, - "delay": 0 - }, - "modules": { - "Payment": {}, - "Barcode": {}, - "OAuth": {}, - "Maps": {}, - "Geolocation": {}, - "Share": {}, - "VideoPlayer": {}, - "Camera": {} - }, - "distribute": { - "android": { - "permissions": [ - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "", - "" - ], - "targetSdkVersion": 30, - "minSdkVersion": 23 - }, - "ios": { - "dSYMs": false, - "privacyDescription": { - "NSPhotoLibraryUsageDescription": "获取用户手机相册用于提供相册图片素材", - "NSPhotoLibraryAddUsageDescription": "将图片保存至手机相册", - "NSCameraUsageDescription": "获取用户手机相册用于快捷拍照功能", - "NSLocationWhenInUseUsageDescription": "该应用需要您的地理位置，以便为你提供当前位置信息", - "NSLocationAlwaysUsageDescription": "该应用需要您的地理位置，以便为你提供当前位置信息", - "NSLocationAlwaysAndWhenInUseUsageDescription": "该应用需要持续获取用户地理位置，以便为您提供实时的位置信息" - } - }, - "sdkConfigs": { - "payment": { - "alipay": { - "__platform__": ["ios", "android"] - }, - "weixin": { - "__platform__": ["ios", "android"], - "appid": "wx3bac19ff90c0a976", - "UniversalLinks": "https://d1.shopxo.vip/.well-known/" - }, - "paypal": { - "__platform__": ["ios", "android"], - "returnURL_ios": "com.shopxo.mm://paypal", - "returnURL_android": "com.shopxo.mm://paypal" - } - }, - "ad": {}, - "oauth": { - "univerify": {}, - "apple": {}, - "weixin": { - "appid": "wx3bac19ff90c0a976", - "appsecret": "91f132b39c5c575fe61b04993c57c734", - "UniversalLinks": "https://d1.shopxo.vip/.well-known/" - }, - "qq": { - "appid": "102076195", - "UniversalLinks": "https://d1.shopxo.vip/.well-known/" - }, - "google": { - "clientid": "510187709509-fq3t5grcfh81t4ub491tiadrtfjbaes1.apps.googleusercontent.com" - } - }, - "maps": { - "amap": { - "name": "amapu9VF72Gg", - "appkey_ios": "f55e9099897821681f5c74051e4527bd", - "appkey_android": "ebe9f1d84f8ceb8b3c4ba6ead2bfa78b" - } - }, - "geolocation": { - "system": { - "__platform__": ["ios", "android"] - } - }, - "share": { - "weixin": { - "appid": "wx3bac19ff90c0a976", - "UniversalLinks": "https://d1.shopxo.vip/.well-known/" - }, - "qq": { - "appid": "102076195", - "UniversalLinks": "https://d1.shopxo.vip/.well-known/" - } - }, - "push": {} - }, - "icons": { - "android": { - "hdpi": "unpackage/res/icons/72x72.png", - "xhdpi": "unpackage/res/icons/96x96.png", - "xxhdpi": "unpackage/res/icons/144x144.png", - "xxxhdpi": "unpackage/res/icons/192x192.png" - }, - "ios": { - "appstore": "unpackage/res/icons/1024x1024.png", - "ipad": { - "app": "unpackage/res/icons/76x76.png", - "app@2x": "unpackage/res/icons/152x152.png", - "notification": "unpackage/res/icons/20x20.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "proapp@2x": "unpackage/res/icons/167x167.png", - "settings": "unpackage/res/icons/29x29.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "spotlight": "unpackage/res/icons/40x40.png", - "spotlight@2x": "unpackage/res/icons/80x80.png" - }, - "iphone": { - "app@2x": "unpackage/res/icons/120x120.png", - "app@3x": "unpackage/res/icons/180x180.png", - "notification@2x": "unpackage/res/icons/40x40.png", - "notification@3x": "unpackage/res/icons/60x60.png", - "settings@2x": "unpackage/res/icons/58x58.png", - "settings@3x": "unpackage/res/icons/87x87.png", - "spotlight@2x": "unpackage/res/icons/80x80.png", - "spotlight@3x": "unpackage/res/icons/120x120.png" - } - } - }, - "splashscreen": { - "useOriginalMsgbox": true - } - } - }, - "quickapp": {}, - "mp-weixin": { - "requiredPrivateInfos": [ - "chooseLocation", - "getLocation", - "chooseAddress", - "onLocationChange", - "startLocationUpdate", - "startLocationUpdateBackground" - ], - "appid": "wxda7779770f53e901", - "setting": { - "urlCheck": false, - "es6": true, - "minified": true, - "ignoreDevUnusedFiles": false, - "ignoreUploadUnusedFiles": false - }, - "usingComponents": true, - "permission": { - "scope.userLocation": { - "desc": "你的位置将用于小程序中相应业务位置服务使用" - } - }, - "__usePrivacyCheck__": true, - "plugins": {} - }, - // 腾讯地图路线规划插件（需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件，教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a） - // "routePlan" : { - // "version" : "1.0.19", - // "provider" : "wx50b5593e81dd937a" - // }, - // 直播（需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件，教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370） - // "live-player-plugin" : { - // "version" : "1.3.5", - // "provider" : "wx2b03c6e691cd7370" - // } - "mp-alipay": { - "usingComponents": true, - "appid": "2021001173639600" - }, - "mp-baidu": { - "usingComponents": true, - "appid": "", - "setting": { - "urlCheck": false - } - }, - "mp-toutiao": { - "usingComponents": true, - "appid": "ttfb628ddf6458b04f", - "setting": { - "urlCheck": false - } - }, - "networkTimeout": { - "request": 10000, - "downloadFile": 10000 - }, - "mp-qq": { - "appid": "1110736292", - "setting": { - "urlCheck": false - }, - "permission": { - "scope.userLocation": { - "desc": "你的位置将用于小程序中相应业务位置服务使用" - } - } - }, - "mp-kuaishou": { - "appid": "ks669910446353970565" - }, - "h5": { - "sdkConfigs": { - "maps": { - "qqmap": { - "key": "56SBZ-PCC3G-US2QM-IXYFE-4DE5H-GRBDK" - } - } - }, - "devServer": { - "https": false, - "port": 8082 - }, - // "proxy": { - // "/api": { - // "target": "http://192.168.1.43:7777/", - // // "target": "https://store.sxczgkj.com/", - // "changeOrigin": "true", - // "pathRewrite": { - // "^/api": "" - // } - // } - // }, - "router": { - "mode": "history", - "base": "/h5/" - }, - "title": "czg_shop", - "template": "template.h5.html" - }, - "app": { - "router": { - "mode": "history" - } - }, - "vueVersion": "2", - "locale": "auto" + "name" : "ShopXO", + "appid" : "__UNI__F095115", + "description" : "ShopXO开源商城、MIT协议、可商用、可二次开发、满足99%电商运营需求", + "versionName" : "1.0.0", + "versionCode" : 100, + "transformPx" : false, + "app-plus" : { + "usingComponents" : true, + "nvueCompiler" : "uni-app", + "compilerVersion" : 3, + "splashscreen" : { + "alwaysShowBeforeRender" : true, + "waiting" : true, + "autoclose" : true, + "delay" : 0 + }, + "modules" : { + "Payment" : {}, + "Barcode" : {}, + "OAuth" : {}, + "Maps" : {}, + "Geolocation" : {}, + "Share" : {}, + "VideoPlayer" : {}, + "Camera" : {} + }, + "distribute" : { + "android" : { + "permissions" : [ + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "" + ], + "targetSdkVersion" : 30, + "minSdkVersion" : 23 + }, + "ios" : { + "dSYMs" : false, + "privacyDescription" : { + "NSPhotoLibraryUsageDescription" : "获取用户手机相册用于提供相册图片素材", + "NSPhotoLibraryAddUsageDescription" : "将图片保存至手机相册", + "NSCameraUsageDescription" : "获取用户手机相册用于快捷拍照功能", + "NSLocationWhenInUseUsageDescription" : "该应用需要您的地理位置，以便为你提供当前位置信息", + "NSLocationAlwaysUsageDescription" : "该应用需要您的地理位置，以便为你提供当前位置信息", + "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要持续获取用户地理位置，以便为您提供实时的位置信息" + } + }, + "sdkConfigs" : { + "payment" : { + "alipay" : { + "__platform__" : [ "ios", "android" ] + }, + "weixin" : { + "__platform__" : [ "ios", "android" ], + "appid" : "wx3bac19ff90c0a976", + "UniversalLinks" : "https://d1.shopxo.vip/.well-known/" + }, + "paypal" : { + "__platform__" : [ "ios", "android" ], + "returnURL_ios" : "com.shopxo.mm://paypal", + "returnURL_android" : "com.shopxo.mm://paypal" + } + }, + "ad" : {}, + "oauth" : { + "univerify" : {}, + "apple" : {}, + "weixin" : { + "appid" : "wx3bac19ff90c0a976", + "appsecret" : "91f132b39c5c575fe61b04993c57c734", + "UniversalLinks" : "https://d1.shopxo.vip/.well-known/" + }, + "qq" : { + "appid" : "102076195", + "UniversalLinks" : "https://d1.shopxo.vip/.well-known/" + }, + "google" : { + "clientid" : "510187709509-fq3t5grcfh81t4ub491tiadrtfjbaes1.apps.googleusercontent.com" + } + }, + "maps" : { + "amap" : { + "name" : "amapu9VF72Gg", + "appkey_ios" : "f55e9099897821681f5c74051e4527bd", + "appkey_android" : "ebe9f1d84f8ceb8b3c4ba6ead2bfa78b" + } + }, + "geolocation" : { + "system" : { + "__platform__" : [ "ios", "android" ] + } + }, + "share" : { + "weixin" : { + "appid" : "wx3bac19ff90c0a976", + "UniversalLinks" : "https://d1.shopxo.vip/.well-known/" + }, + "qq" : { + "appid" : "102076195", + "UniversalLinks" : "https://d1.shopxo.vip/.well-known/" + } + }, + "push" : {} + }, + "icons" : { + "android" : { + "hdpi" : "unpackage/res/icons/72x72.png", + "xhdpi" : "unpackage/res/icons/96x96.png", + "xxhdpi" : "unpackage/res/icons/144x144.png", + "xxxhdpi" : "unpackage/res/icons/192x192.png" + }, + "ios" : { + "appstore" : "unpackage/res/icons/1024x1024.png", + "ipad" : { + "app" : "unpackage/res/icons/76x76.png", + "app@2x" : "unpackage/res/icons/152x152.png", + "notification" : "unpackage/res/icons/20x20.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "proapp@2x" : "unpackage/res/icons/167x167.png", + "settings" : "unpackage/res/icons/29x29.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "spotlight" : "unpackage/res/icons/40x40.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png" + }, + "iphone" : { + "app@2x" : "unpackage/res/icons/120x120.png", + "app@3x" : "unpackage/res/icons/180x180.png", + "notification@2x" : "unpackage/res/icons/40x40.png", + "notification@3x" : "unpackage/res/icons/60x60.png", + "settings@2x" : "unpackage/res/icons/58x58.png", + "settings@3x" : "unpackage/res/icons/87x87.png", + "spotlight@2x" : "unpackage/res/icons/80x80.png", + "spotlight@3x" : "unpackage/res/icons/120x120.png" + } + } + }, + "splashscreen" : { + "useOriginalMsgbox" : true + } + } + }, + "quickapp" : {}, + "mp-weixin" : { + "requiredPrivateInfos" : [ + "chooseLocation", + "getLocation", + "chooseAddress", + "onLocationChange", + "startLocationUpdate", + "startLocationUpdateBackground" + ], + "appid" : "wxda7779770f53e901", + "setting" : { + "urlCheck" : false, + "es6" : true, + "minified" : true, + "ignoreDevUnusedFiles" : false, + "ignoreUploadUnusedFiles" : false + }, + "usingComponents" : true, + "permission" : { + "scope.userLocation" : { + "desc" : "你的位置将用于小程序中相应业务位置服务使用" + } + }, + "__usePrivacyCheck__" : true, + "plugins" : {} + }, + // 腾讯地图路线规划插件（需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件，教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a） + // "routePlan" : { + // "version" : "1.0.19", + // "provider" : "wx50b5593e81dd937a" + // }, + // 直播（需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件，教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370） + // "live-player-plugin" : { + // "version" : "1.3.5", + // "provider" : "wx2b03c6e691cd7370" + // } + "mp-alipay" : { + "usingComponents" : true, + "appid" : "2021005148649941" + }, + "mp-baidu" : { + "usingComponents" : true, + "appid" : "", + "setting" : { + "urlCheck" : false + } + }, + "mp-toutiao" : { + "usingComponents" : true, + "appid" : "ttfb628ddf6458b04f", + "setting" : { + "urlCheck" : false + } + }, + "networkTimeout" : { + "request" : 10000, + "downloadFile" : 10000 + }, + "mp-qq" : { + "appid" : "1110736292", + "setting" : { + "urlCheck" : false + }, + "permission" : { + "scope.userLocation" : { + "desc" : "你的位置将用于小程序中相应业务位置服务使用" + } + } + }, + "mp-kuaishou" : { + "appid" : "ks669910446353970565" + }, + "h5" : { + "sdkConfigs" : { + "maps" : { + "qqmap" : { + "key" : "56SBZ-PCC3G-US2QM-IXYFE-4DE5H-GRBDK" + } + } + }, + "devServer" : { + "https" : false, + "port" : 8082 + }, + // "proxy": { + // "/api": { + // "target": "http://192.168.1.43:7777/", + // // "target": "https://store.sxczgkj.com/", + // "changeOrigin": "true", + // "pathRewrite": { + // "^/api": "" + // } + // } + // }, + "router" : { + "mode" : "history", + "base" : "/h5/" + }, + "title" : "czg_shop", + "template" : "template.h5.html" + }, + "app" : { + "router" : { + "mode" : "history" + } + }, + "vueVersion" : "2", + "locale" : "auto" } // 匹配以 /api 开头的请求 // target: 'https://test.invoice.sxczgkj.cn/', // 替换为你的后端 API 域名 //192.168.1.43:7777/', // 替换为你的后端 API 域名 // 允许跨域 -// 重写路径，去掉 /api 前缀 \ No newline at end of file +// 重写路径，去掉 /api 前缀 + diff --git a/pages/buy/buy.vue b/pages/buy/buy.vue index 055880f..cc5e73b 100644 --- a/pages/buy/buy.vue +++ b/pages/buy/buy.vue @@ -507,7 +507,7 @@ params: params, is_realstore_model: (params.realstore_id || null) != null, plugins_points_status: app.globalData.get_config('plugins_base.points.data.is_default_use_points', null) == 1, - // pay_url: app.globalData.get_request_url('pay', 'order'), + pay_url: app.globalData.get_request_url('pay', 'order'), // pay_url: app.globalData.get_request_url('getpayment', 'xo'), qrcode_url: app.globalData.get_request_url('paycheck', 'order'), }); @@ -664,15 +664,19 @@ console.log('直接走支付流程'); this.$refs.payment.pay_handle(order_id, payment_id, payment_list); } - } - - if (payment == 'IEPayPoli') { + } else if (payment == 'WalletPay') { + // 支付宝支付 改装钱包余额支付 + console.log('支付宝支付===', order_id); + } else if (payment == 'IEPayPoli') { console.log('开始无忧支付===', order_id); - this.pay_url = app.globalData.get_request_url('wuYouPay', 'xo'); this.$nextTick(() => { this.$refs.payment.pay_handle(order_id, payment_id, payment_list); }); + } else { + // 直接走支付流程 + console.log('直接走支付流程'); + this.$refs.payment.pay_handle(order_id, payment_id, payment_list); } }, // 初始化配置 diff --git a/pages/index/index.vue b/pages/index/index.vue index 959d60e..12aacc7 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,8 +1,10 @@