czg_team/xo_user_client
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

对接支付宝小程序

Browse Source
This commit is contained in:
gyq
2025-05-21 16:52:47 +08:00
parent 5e08d13c0d
commit 681328f9e1
5 changed files with 325 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
components/payment/payment.vue
View File

@@ -324,12 +324,6 @@
// 没有指定支付方式则不匹配支付标识 // 没有指定支付方式则不匹配支付标识
var payment = null; var payment = null;
if ((payment_id || 0) != 0) { 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) { for (var i in this.payment_list) {
if (this.payment_list[i]['id'] == (payment_id || this.payment_id)) { if (this.payment_list[i]['id'] == (payment_id || this.payment_id)) {
@@ -350,6 +344,9 @@
uni.redirectTo({ uni.redirectTo({
url: `/pages/buy/wu_you_status?payment_id=${payment.id}&order_id=${order_id}`, 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 { } else {
// 请求数据 // 请求数据
var post_data = { var post_data = {
@@ -374,16 +371,18 @@
title: this.$t('payment.payment.e1f54e'), title: this.$t('payment.payment.e1f54e'),
mask: true, mask: true,
}); });
console.log('this.propPayUrl===', this.propPayUrl);
if (this.propPayUrl) { if (this.propPayUrl) {
console.log('post_data===', post_data);
uni.request({ uni.request({
url: this.propPayUrl, url: this.propPayUrl,
method: 'POST', method: 'POST',
data: { data: post_data,
...post_data,
wechat_open_id: localStorage.getItem('web_openid') || '',
},
dataType: 'json', dataType: 'json',
success: (res) => { success: (res) => {
console.log('this.propPayUrl.res===', res);
uni.hideLoading(); uni.hideLoading();
var data = res.data.data; var data = res.data.data;
this.setData({ this.setData({
@@ -467,11 +466,13 @@
} }
}, },
fail: (res) => { fail: (res) => {
console.log('fail', res);
uni.hideLoading(); uni.hideLoading();
app.globalData.showToast(this.$t('common.internet_error_tips')); app.globalData.showToast(this.$t('common.internet_error_tips'));
}, },
}); });
} else { } else {
console.log('为什么不进支付');
app.globalData.showToast(this.$t('payment.payment.597s8b')); app.globalData.showToast(this.$t('payment.payment.597s8b'));
} }
} }
@@ -636,6 +637,8 @@
service: 5, service: 5,
// #endif // #endif
success: (res) => { success: (res) => {
console.log('支付成功1111===', res);
// #ifdef MP-ALIPAY // #ifdef MP-ALIPAY
if (res.resultCode != 9000) { if (res.resultCode != 9000) {
self.order_item_pay_fail_handle(data, order_id, res.memo || self.$t('paytips.paytips.6y488i')); 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); self.order_item_pay_success_handle(data, order_id);
}, },
fail: (res) => { fail: (res) => {
console.log('支付失败2222===', res);
self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i')); self.order_item_pay_fail_handle(data, order_id, self.$t('paytips.paytips.6y488i'));
}, },
}); });
@@ -756,6 +760,13 @@
return; 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) { if ((data.data.qrcode_url || null) != null && (data.data.name || null) != null && (data.data.order_no || null) != null) {
status = true; status = true;

543
manifest.json
View File

@@ -1,278 +1,279 @@
{ {
"name": "ShopXO", "name" : "ShopXO",
"appid": "__UNI__F095115", "appid" : "__UNI__F095115",
"description": "ShopXO开源商城、MIT协议、可商用、可二次开发、满足99%电商运营需求", "description" : "ShopXO开源商城、MIT协议、可商用、可二次开发、满足99%电商运营需求",
"versionName": "1.0.0", "versionName" : "1.0.0",
"versionCode": 100, "versionCode" : 100,
"transformPx": false, "transformPx" : false,
"app-plus": { "app-plus" : {
"usingComponents": true, "usingComponents" : true,
"nvueCompiler": "uni-app", "nvueCompiler" : "uni-app",
"compilerVersion": 3, "compilerVersion" : 3,
"splashscreen": { "splashscreen" : {
"alwaysShowBeforeRender": true, "alwaysShowBeforeRender" : true,
"waiting": true, "waiting" : true,
"autoclose": true, "autoclose" : true,
"delay": 0 "delay" : 0
}, },
"modules": { "modules" : {
"Payment": {}, "Payment" : {},
"Barcode": {}, "Barcode" : {},
"OAuth": {}, "OAuth" : {},
"Maps": {}, "Maps" : {},
"Geolocation": {}, "Geolocation" : {},
"Share": {}, "Share" : {},
"VideoPlayer": {}, "VideoPlayer" : {},
"Camera": {} "Camera" : {}
}, },
"distribute": { "distribute" : {
"android": { "android" : {
"permissions": [ "permissions" : [
"<uses-feature android:name=\"android.hardware.camera\"/>", "<uses-feature android:name=\"android.hardware.camera\"/>",
"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>", "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>", "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>", "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
"<uses-permission android:name=\"android.permission.CAMERA\"/>", "<uses-permission android:name=\"android.permission.CAMERA\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>", "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>", "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>", "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
"<uses-permission android:name=\"android.permission.INTERNET\"/>", "<uses-permission android:name=\"android.permission.INTERNET\"/>",
"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>", "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>", "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>", "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.READ_LOGS\"/>", "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>", "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>", "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>", "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>", "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
"<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>", "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>", "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>" "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
], ],
"targetSdkVersion": 30, "targetSdkVersion" : 30,
"minSdkVersion": 23 "minSdkVersion" : 23
}, },
"ios": { "ios" : {
"dSYMs": false, "dSYMs" : false,
"privacyDescription": { "privacyDescription" : {
"NSPhotoLibraryUsageDescription": "获取用户手机相册用于提供相册图片素材", "NSPhotoLibraryUsageDescription" : "获取用户手机相册用于提供相册图片素材",
"NSPhotoLibraryAddUsageDescription": "将图片保存至手机相册", "NSPhotoLibraryAddUsageDescription" : "将图片保存至手机相册",
"NSCameraUsageDescription": "获取用户手机相册用于快捷拍照功能", "NSCameraUsageDescription" : "获取用户手机相册用于快捷拍照功能",
"NSLocationWhenInUseUsageDescription": "该应用需要您的地理位置，以便为你提供当前位置信息", "NSLocationWhenInUseUsageDescription" : "该应用需要您的地理位置，以便为你提供当前位置信息",
"NSLocationAlwaysUsageDescription": "该应用需要您的地理位置，以便为你提供当前位置信息", "NSLocationAlwaysUsageDescription" : "该应用需要您的地理位置，以便为你提供当前位置信息",
"NSLocationAlwaysAndWhenInUseUsageDescription": "该应用需要持续获取用户地理位置，以便为您提供实时的位置信息" "NSLocationAlwaysAndWhenInUseUsageDescription" : "该应用需要持续获取用户地理位置，以便为您提供实时的位置信息"
} }
}, },
"sdkConfigs": { "sdkConfigs" : {
"payment": { "payment" : {
"alipay": { "alipay" : {
"__platform__": ["ios", "android"] "__platform__" : [ "ios", "android" ]
}, },
"weixin": { "weixin" : {
"__platform__": ["ios", "android"], "__platform__" : [ "ios", "android" ],
"appid": "wx3bac19ff90c0a976", "appid" : "wx3bac19ff90c0a976",
"UniversalLinks": "https://d1.shopxo.vip/.well-known/" "UniversalLinks" : "https://d1.shopxo.vip/.well-known/"
}, },
"paypal": { "paypal" : {
"__platform__": ["ios", "android"], "__platform__" : [ "ios", "android" ],
"returnURL_ios": "com.shopxo.mm://paypal", "returnURL_ios" : "com.shopxo.mm://paypal",
"returnURL_android": "com.shopxo.mm://paypal" "returnURL_android" : "com.shopxo.mm://paypal"
} }
}, },
"ad": {}, "ad" : {},
"oauth": { "oauth" : {
"univerify": {}, "univerify" : {},
"apple": {}, "apple" : {},
"weixin": { "weixin" : {
"appid": "wx3bac19ff90c0a976", "appid" : "wx3bac19ff90c0a976",
"appsecret": "91f132b39c5c575fe61b04993c57c734", "appsecret" : "91f132b39c5c575fe61b04993c57c734",
"UniversalLinks": "https://d1.shopxo.vip/.well-known/" "UniversalLinks" : "https://d1.shopxo.vip/.well-known/"
}, },
"qq": { "qq" : {
"appid": "102076195", "appid" : "102076195",
"UniversalLinks": "https://d1.shopxo.vip/.well-known/" "UniversalLinks" : "https://d1.shopxo.vip/.well-known/"
}, },
"google": { "google" : {
"clientid": "510187709509-fq3t5grcfh81t4ub491tiadrtfjbaes1.apps.googleusercontent.com" "clientid" : "510187709509-fq3t5grcfh81t4ub491tiadrtfjbaes1.apps.googleusercontent.com"
} }
}, },
"maps": { "maps" : {
"amap": { "amap" : {
"name": "amapu9VF72Gg", "name" : "amapu9VF72Gg",
"appkey_ios": "f55e9099897821681f5c74051e4527bd", "appkey_ios" : "f55e9099897821681f5c74051e4527bd",
"appkey_android": "ebe9f1d84f8ceb8b3c4ba6ead2bfa78b" "appkey_android" : "ebe9f1d84f8ceb8b3c4ba6ead2bfa78b"
} }
}, },
"geolocation": { "geolocation" : {
"system": { "system" : {
"__platform__": ["ios", "android"] "__platform__" : [ "ios", "android" ]
} }
}, },
"share": { "share" : {
"weixin": { "weixin" : {
"appid": "wx3bac19ff90c0a976", "appid" : "wx3bac19ff90c0a976",
"UniversalLinks": "https://d1.shopxo.vip/.well-known/" "UniversalLinks" : "https://d1.shopxo.vip/.well-known/"
}, },
"qq": { "qq" : {
"appid": "102076195", "appid" : "102076195",
"UniversalLinks": "https://d1.shopxo.vip/.well-known/" "UniversalLinks" : "https://d1.shopxo.vip/.well-known/"
} }
}, },
"push": {} "push" : {}
}, },
"icons": { "icons" : {
"android": { "android" : {
"hdpi": "unpackage/res/icons/72x72.png", "hdpi" : "unpackage/res/icons/72x72.png",
"xhdpi": "unpackage/res/icons/96x96.png", "xhdpi" : "unpackage/res/icons/96x96.png",
"xxhdpi": "unpackage/res/icons/144x144.png", "xxhdpi" : "unpackage/res/icons/144x144.png",
"xxxhdpi": "unpackage/res/icons/192x192.png" "xxxhdpi" : "unpackage/res/icons/192x192.png"
}, },
"ios": { "ios" : {
"appstore": "unpackage/res/icons/1024x1024.png", "appstore" : "unpackage/res/icons/1024x1024.png",
"ipad": { "ipad" : {
"app": "unpackage/res/icons/76x76.png", "app" : "unpackage/res/icons/76x76.png",
"app@2x": "unpackage/res/icons/152x152.png", "app@2x" : "unpackage/res/icons/152x152.png",
"notification": "unpackage/res/icons/20x20.png", "notification" : "unpackage/res/icons/20x20.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"proapp@2x": "unpackage/res/icons/167x167.png", "proapp@2x" : "unpackage/res/icons/167x167.png",
"settings": "unpackage/res/icons/29x29.png", "settings" : "unpackage/res/icons/29x29.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"spotlight": "unpackage/res/icons/40x40.png", "spotlight" : "unpackage/res/icons/40x40.png",
"spotlight@2x": "unpackage/res/icons/80x80.png" "spotlight@2x" : "unpackage/res/icons/80x80.png"
}, },
"iphone": { "iphone" : {
"app@2x": "unpackage/res/icons/120x120.png", "app@2x" : "unpackage/res/icons/120x120.png",
"app@3x": "unpackage/res/icons/180x180.png", "app@3x" : "unpackage/res/icons/180x180.png",
"notification@2x": "unpackage/res/icons/40x40.png", "notification@2x" : "unpackage/res/icons/40x40.png",
"notification@3x": "unpackage/res/icons/60x60.png", "notification@3x" : "unpackage/res/icons/60x60.png",
"settings@2x": "unpackage/res/icons/58x58.png", "settings@2x" : "unpackage/res/icons/58x58.png",
"settings@3x": "unpackage/res/icons/87x87.png", "settings@3x" : "unpackage/res/icons/87x87.png",
"spotlight@2x": "unpackage/res/icons/80x80.png", "spotlight@2x" : "unpackage/res/icons/80x80.png",
"spotlight@3x": "unpackage/res/icons/120x120.png" "spotlight@3x" : "unpackage/res/icons/120x120.png"
} }
} }
}, },
"splashscreen": { "splashscreen" : {
"useOriginalMsgbox": true "useOriginalMsgbox" : true
} }
} }
}, },
"quickapp": {}, "quickapp" : {},
"mp-weixin": { "mp-weixin" : {
"requiredPrivateInfos": [ "requiredPrivateInfos" : [
"chooseLocation", "chooseLocation",
"getLocation", "getLocation",
"chooseAddress", "chooseAddress",
"onLocationChange", "onLocationChange",
"startLocationUpdate", "startLocationUpdate",
"startLocationUpdateBackground" "startLocationUpdateBackground"
], ],
"appid": "wxda7779770f53e901", "appid" : "wxda7779770f53e901",
"setting": { "setting" : {
"urlCheck": false, "urlCheck" : false,
"es6": true, "es6" : true,
"minified": true, "minified" : true,
"ignoreDevUnusedFiles": false, "ignoreDevUnusedFiles" : false,
"ignoreUploadUnusedFiles": false "ignoreUploadUnusedFiles" : false
}, },
"usingComponents": true, "usingComponents" : true,
"permission": { "permission" : {
"scope.userLocation": { "scope.userLocation" : {
"desc": "你的位置将用于小程序中相应业务位置服务使用" "desc" : "你的位置将用于小程序中相应业务位置服务使用"
} }
}, },
"__usePrivacyCheck__": true, "__usePrivacyCheck__" : true,
"plugins": {} "plugins" : {}
}, },
// 腾讯地图路线规划插件（需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件，教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a） // 腾讯地图路线规划插件（需要到小程序后台设置->第三方设置->插件管理里面添加【腾讯位置服务路线规划】插件，教程 https://mp.weixin.qq.com/wxopen/plugindevdoc?appid=wx50b5593e81dd937a）
// "routePlan" : { // "routePlan" : {
// "version" : "1.0.19", // "version" : "1.0.19",
// "provider" : "wx50b5593e81dd937a" // "provider" : "wx50b5593e81dd937a"
// }, // },
// 直播（需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件，教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370） // 直播（需要到小程序后台设置->第三方设置->插件管理里面添加【小程序直播组件】插件，教程 https://mp.weixin.qq.com/wxopen/pluginbasicprofile?action=intro&appid=wx2b03c6e691cd7370）
// "live-player-plugin" : { // "live-player-plugin" : {
// "version" : "1.3.5", // "version" : "1.3.5",
// "provider" : "wx2b03c6e691cd7370" // "provider" : "wx2b03c6e691cd7370"
// } // }
"mp-alipay": { "mp-alipay" : {
"usingComponents": true, "usingComponents" : true,
"appid": "2021001173639600" "appid" : "2021005148649941"
}, },
"mp-baidu": { "mp-baidu" : {
"usingComponents": true, "usingComponents" : true,
"appid": "", "appid" : "",
"setting": { "setting" : {
"urlCheck": false "urlCheck" : false
} }
}, },
"mp-toutiao": { "mp-toutiao" : {
"usingComponents": true, "usingComponents" : true,
"appid": "ttfb628ddf6458b04f", "appid" : "ttfb628ddf6458b04f",
"setting": { "setting" : {
"urlCheck": false "urlCheck" : false
} }
}, },
"networkTimeout": { "networkTimeout" : {
"request": 10000, "request" : 10000,
"downloadFile": 10000 "downloadFile" : 10000
}, },
"mp-qq": { "mp-qq" : {
"appid": "1110736292", "appid" : "1110736292",
"setting": { "setting" : {
"urlCheck": false "urlCheck" : false
}, },
"permission": { "permission" : {
"scope.userLocation": { "scope.userLocation" : {
"desc": "你的位置将用于小程序中相应业务位置服务使用" "desc" : "你的位置将用于小程序中相应业务位置服务使用"
} }
} }
}, },
"mp-kuaishou": { "mp-kuaishou" : {
"appid": "ks669910446353970565" "appid" : "ks669910446353970565"
}, },
"h5": { "h5" : {
"sdkConfigs": { "sdkConfigs" : {
"maps": { "maps" : {
"qqmap": { "qqmap" : {
"key": "56SBZ-PCC3G-US2QM-IXYFE-4DE5H-GRBDK" "key" : "56SBZ-PCC3G-US2QM-IXYFE-4DE5H-GRBDK"
} }
} }
}, },
"devServer": { "devServer" : {
"https": false, "https" : false,
"port": 8082 "port" : 8082
}, },
// "proxy": { // "proxy": {
// "/api": { // "/api": {
// "target": "http://192.168.1.43:7777/", // "target": "http://192.168.1.43:7777/",
// // "target": "https://store.sxczgkj.com/", // // "target": "https://store.sxczgkj.com/",
// "changeOrigin": "true", // "changeOrigin": "true",
// "pathRewrite": { // "pathRewrite": {
// "^/api": "" // "^/api": ""
// } // }
// } // }
// }, // },
"router": { "router" : {
"mode": "history", "mode" : "history",
"base": "/h5/" "base" : "/h5/"
}, },
"title": "czg_shop", "title" : "czg_shop",
"template": "template.h5.html" "template" : "template.h5.html"
}, },
"app": { "app" : {
"router": { "router" : {
"mode": "history" "mode" : "history"
} }
}, },
"vueVersion": "2", "vueVersion" : "2",
"locale": "auto" "locale" : "auto"
} }
// 匹配以 /api 开头的请求 // 匹配以 /api 开头的请求
// target: 'https://test.invoice.sxczgkj.cn/', // 替换为你的后端 API 域名 // target: 'https://test.invoice.sxczgkj.cn/', // 替换为你的后端 API 域名
//192.168.1.43:7777/', // 替换为你的后端 API 域名 //192.168.1.43:7777/', // 替换为你的后端 API 域名
// 允许跨域 // 允许跨域
// 重写路径，去掉 /api 前缀 // 重写路径，去掉 /api 前缀

14
pages/buy/buy.vue
View File

@@ -507,7 +507,7 @@
params: params, params: params,
is_realstore_model: (params.realstore_id || null) != null, 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, 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'), // pay_url: app.globalData.get_request_url('getpayment', 'xo'),
qrcode_url: app.globalData.get_request_url('paycheck', 'order'), qrcode_url: app.globalData.get_request_url('paycheck', 'order'),
}); });
@@ -664,15 +664,19 @@
console.log('直接走支付流程'); console.log('直接走支付流程');
this.$refs.payment.pay_handle(order_id, payment_id, payment_list); this.$refs.payment.pay_handle(order_id, payment_id, payment_list);
} }
} } else if (payment == 'WalletPay') {
// 支付宝支付 改装钱包余额支付
if (payment == 'IEPayPoli') { console.log('支付宝支付===', order_id);
} else if (payment == 'IEPayPoli') {
console.log('开始无忧支付===', order_id); console.log('开始无忧支付===', order_id);
this.pay_url = app.globalData.get_request_url('wuYouPay', 'xo'); this.pay_url = app.globalData.get_request_url('wuYouPay', 'xo');
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.payment.pay_handle(order_id, payment_id, payment_list); 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);
} }
}, },
// 初始化配置 // 初始化配置

15
pages/index/index.vue
View File

@@ -1,8 +1,10 @@
<template> <template>
<view> <view>
<view class="container" :class="[themeConfigData.layout]"> <view class="container" :class="[themeConfigData.layout]">
<status-bar-height></status-bar-height>
<view class="page-bg2" v-if="themeConfigData.layout == 'layout3'"> <view class="page-bg2" v-if="themeConfigData.layout == 'layout3'">
<view class="status" style="background-color: #fb1723">
<status-bar-height></status-bar-height>
</view>
<image class="img" :src="themeConfigData.layoutData.search.backgroundImage" mode="widthFix"></image> <image class="img" :src="themeConfigData.layoutData.search.backgroundImage" mode="widthFix"></image>
<view class="page-tab"> <view class="page-tab">
<view class="item active"> <view class="item active">
@@ -548,6 +550,7 @@
url: app.globalData.get_request_url('pageConfigCurrent', 'common'), url: app.globalData.get_request_url('pageConfigCurrent', 'common'),
method: 'GET', method: 'GET',
success: (res) => { success: (res) => {
console.log('getThemeConfig.res===', res);
console.log('getThemeConfig===', JSON.parse(res.data.data.json_data)); console.log('getThemeConfig===', JSON.parse(res.data.data.json_data));
if (res.data.code == 0) { if (res.data.code == 0) {
this.themeConfigData = JSON.parse(res.data.data.json_data); this.themeConfigData = JSON.parse(res.data.data.json_data);
@@ -983,6 +986,9 @@
.container { .container {
&.layout3 { &.layout3 {
padding-top: 174upx; padding-top: 174upx;
/* #ifdef MP-ALIPAY */
padding-top: 254upx;
/* #endif */
} }
} }
.layout3-category { .layout3-category {
@@ -1118,9 +1124,14 @@
.page-tab { .page-tab {
width: 100%; width: 100%;
position: absolute; position: absolute;
left: 0;
top: 0; top: 0;
/* #ifdef MP-ALIPAY */
top: calc(var(--status-bar-height) + 40upx);
left: 50upx;
/* #endif */
display: flex; display: flex;
padding: 0 29upx; padding: 0 30upx;
.item { .item {
display: flex; display: flex;
align-items: center; align-items: center;

11
pages/user-order/user-order.vue
View File

@@ -182,7 +182,7 @@
this.init_config(); this.init_config();
// 数据加载 // 数据加载
// this.init(); this.init();
}, },
onShow() { onShow() {
@@ -232,10 +232,15 @@
// 获取数据 // 获取数据
init() { init() {
var user = app.globalData.get_user_info(this, 'init'); var user = app.globalData.get_user_info(this, 'init');
console.log('user===', user);
if (user != false) { if (user != false) {
this.setData({ this.setData({
// pay_url: app.globalData.get_request_url('pay', 'order'), // #ifdef MP-ALIPAY
pay_url: app.globalData.get_request_url('pay', 'order'),
// #endif
// #ifdef MP-WEIXIN
pay_url: app.globalData.get_request_url('getpayment', 'xo'), pay_url: app.globalData.get_request_url('getpayment', 'xo'),
// #endif
qrcode_url: app.globalData.get_request_url('paycheck', 'order'), qrcode_url: app.globalData.get_request_url('paycheck', 'order'),
}); });
@@ -258,6 +263,8 @@
// 获取数据 // 获取数据
get_data_list(is_mandatory) { get_data_list(is_mandatory) {
console.log('is_mandatory===', is_mandatory);
// 分页是否还有数据 // 分页是否还有数据
if ((is_mandatory || 0) == 0) { if ((is_mandatory || 0) == 0) {
if (this.data_bottom_line_status == true) { if (this.data_bottom_line_status == true) {