Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

components/pay/submit2Pay.vue

@@ -27,7 +27,7 @@
 				</view>
 				
 				<view style="margin-top:30px">
-					<u-button @click="getDataInfo" type="error" shape="circle" :loading="loading">支付</u-button>
+					<u-button @click="Pay" type="error" shape="circle" :loading="loading">支付</u-button>
 				</view>
 			</view>
 		</u-popup>
@@ -65,7 +65,7 @@ export default {
 		closePay() {
 			this.$emit('closePay');
 		},
-		getDataInfo() {
+		Pay() {
 			let msg = {
 				'pay_channel':this.payType,//网页打开支付宝支付：alipay_wap 支付宝正扫：alipay_qr 支付宝app：alipay 微信小程序：wx_lite 微信公众号：wx_pub
 				'open_id':this.payType=='wx_lite'?this.payInfo.OpenId:'',
@@ -106,7 +106,6 @@ export default {
 		},
 		// 微信支付
 		wxPay(payData) {
-			console.log(payData,'----payData')
 			let that = this
 			uni.showLoading({
 				title:'支付中...'
@@ -119,19 +118,19 @@ export default {
 				"signType": payData.signType, //微信签名方式：
 				"paySign": payData.paySign, //微信签名
 				'success':function(res){
-					uni.showLoading({
-						title:JSON.stringify(res)
+					uni.hideLoading()
+					uni.showToast({
+						title:'支付成功'
 					})
-					uni.navigateTo({
-						url: '/pages/reserve/offline-success?payInfo='+JSON.stringify(that.payInfo)
-					});
 				},
 				'fail':function(res){
-					uni.showLoading({
-						title:JSON.stringify(res)
-					})
+					uni.hideLoading()
 				},
-				'complete':function(res){}
+				'complete':function(res){
+					uni.showToast({
+						title:res.errMsg
+					})
+				}
 			})
 		},
 	}

pages/order-submit/order-submit2.vue

@@ -393,7 +393,7 @@
 				IsFormShoppingCart: 2,
 				adressInfo: {},
 				payInfo: {
-					OpenId: 'ow_7I5XC1-RGwwk8QANBmWKYKmOc',
+					OpenId: '',//ow_7I5XC1-RGwwk8QANBmWKYKmOc
 					OrderId: '',
 					OrderPayType: 1,
 					GoodsName: ''
@@ -506,10 +506,10 @@
 			// 提交订单
 			submitOrderHandler() {
 				let that = this;
-				that.adressInfo.Consignee = '测试'
-				that.adressInfo.ShoppingAddress = '四川成都龙泉驿1'
-				that.JJSWStuId = '10724';
-				that.Thename="HK";
+				// that.adressInfo.Consignee = '测试'
+				// that.adressInfo.ShoppingAddress = '四川成都龙泉驿1'
+				// that.JJSWStuId = '10724';
+				// that.Thename="HK";
 				if (that.adressInfo.Consignee == '') {
 					this.$refs.uToast.show({
 						title: '请选择收货信息！',