2024-15

components/payment/index.vue

@@ -115,28 +115,29 @@
 				uni.showLoading({
 					title: '支付中'
 				});
-
+				let upData={
-				orderPay({
+						uni: that.order_id,
-					uni: that.order_id,
+						paytype: paytype,
-					paytype: paytype,
+						// #ifdef MP 
-					// #ifdef MP 
+						'from': 'routine',
-					'from': 'routine',
+						// #endif
-					// #endif
+						// #ifdef H5
-					// #ifdef H5
+						'from': this.$wechat.isWeixin() ? 'weixin' : 'weixinh5',
-					'from': this.$wechat.isWeixin() ? 'weixin' : 'weixinh5',
+						// #endif
-					// #endif
+						// #ifdef H5
-					// #ifdef H5
+						quitUrl: location.port ? location.protocol + '//' + location.hostname + ':' + location
-					quitUrl: location.port ? location.protocol + '//' + location.hostname + ':' + location
+							.port +
-						.port +
+							'/pages/goods/order_details/index?order_id=' + this.order_id : location.protocol +
-						'/pages/goods/order_details/index?order_id=' + this.order_id : location.protocol +
+							'//' + location.hostname +
-						'//' + location.hostname +
+							'/pages/goods/order_details/index?order_id=' + this.order_id
-						'/pages/goods/order_details/index?order_id=' + this.order_id
+						// #endif
-					// #endif
+						// #ifdef APP-PLUS
-					// #ifdef APP-PLUS
+						quitUrl: '/pages/goods/order_details/index?order_id=' + this.order_id
-					quitUrl: '/pages/goods/order_details/index?order_id=' + this.order_id
+						// #endif
-					// #endif
+				}
-				}).then(res => {
+				orderPay(upData).then(res => {
 					let jsConfig = res.data.result.jsConfig;
+					// console.log(res,upData,'神英优选')
 					switch (paytype) {
 						case 'weixin':
 							if (res.data.result === undefined) return that.$util.Tips({

manifest.json

@@ -2,8 +2,8 @@
     "name" : "神英优选",
     "appid" : "__UNI__3F43051",
     "description" : "神英优选商城",
-    "versionName" : "2.9.6",
+    "versionName" : "2.9.8",
-    "versionCode" : 296,
+    "versionCode" : 298,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -96,12 +96,17 @@
                 "payment" : {
                     "alipay" : {
                         "__platform__" : [ "ios", "android" ]
+                    },
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wxea55f49e0c163c37",
+                        "UniversalLinks" : "https://www.senyinkj.cn/appopen/"
                     }
                 },
                 "share" : {
                     "weixin" : {
-                        "appid" : "wx69a5bfe28c8b39e6",
+                        "appid" : "wxea55f49e0c163c37",
-                        "UniversalLinks" : "https://pro.crmeb.net/uni-universallinks/__UNI__7E0054B/"
+                        "UniversalLinks" : "https://www.senyinkj.cn/appopen/"
                     }
                 },
                 "push" : {},
@@ -114,9 +119,9 @@
                 },
                 "oauth" : {
                     "weixin" : {
-                        "appid" : "wx69a5bfe28c8b39e6",
+                        "appid" : "wxea55f49e0c163c37",
                         "appsecret" : "ee83a6c94edbc5dd7a5b4614316d85a7",
-                        "UniversalLinks" : "https://pro.crmeb.net/uni-universallinks/__UNI__7E0054B/"
+                        "UniversalLinks" : "https://www.senyinkj.cn/appopen/"
                     },
                     "apple" : {}
                 },

pages.json

@@ -88,6 +88,13 @@
 			"style": {
 				"navigationBarTitleText": ""
 			}
+		},
+		{
+			"path" : "pages/goods/order_confirm/111/111",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
 		}
 		//#endif
 	],

pages/goods/order_confirm/index.vue

@@ -1104,6 +1104,8 @@
           addressId = ''
           storeid = that.storeId
         }
+		
+		
         orderConfirm(that.cartId, that.news, addressId, shippingType, storeid, that.couponId).then(res => {
           if (res.data.upgrade_addr == 1) {
             that.id = res.data.addressInfo.id
@@ -1352,7 +1354,9 @@
       },
       payment: function(data) {
         let that = this;
+		console.log(data,'data')
         orderCreate(that.orderKey, data).then(res => {
+			console.log(res,'resres')
           let status = res.data.status,
             orderId = res.data.result.orderId,
             jsConfig = res.data.result.jsConfig,
@@ -1486,6 +1490,7 @@
                   }, 2000)
                 },
                 fail: (e) => {
+					console.log(e,'ee')
                   let url = '/pages/goods/order_pay_status/index?order_id=' + orderId +
                     '&msg=支付失败';
                   uni.showModal({

unpackage/debug/.roid.ins

@@ -0,0 +1 @@
+forceInstall