修复：支付合并后 会员卡微信支付报错导致不能使用微信支付

pages/annex/vip_center/index.vue

@@ -354,6 +354,19 @@
 			},
 			// 立即购买
 			createMemberCard(type) {
+
+        if (type == 'weixin') {
+          // #ifdef H5
+          type = _this.$wechat.isWeixin() ? 'weixin' : 'h5'
+          // #endif
+          // #ifdef MP
+          type = 'routine'
+          // #endif
+          // #ifdef APP-PLUS
+          type = 'weixin'
+          // #endif
+        }
+
 				uni.showLoading({
 					title: '正在加载…'
 				});
@@ -419,7 +432,7 @@
             jsConfig = res.data.result.config,
             goPages = '/pages/users/user_coupon/index';
 
-        // console.log('支付成功', status)
+        console.log('支付成功', status)
 				switch (status) {
 					case 'ORDER_EXIST':
 					case 'EXTEND_ORDER':
@@ -436,10 +449,7 @@
 						that.payClose();
             that.getMemberCard();
 
-						return that.$util.Tips({
+            that.$util.tips({ content: res.message});
-							title: res.message,
-							icon: 'success'
-						});
 						break;
 					case 'alipay':
 					case "alipayQr":

pages/order_pay_status/index.vue

@@ -9,7 +9,7 @@
 			<!-- <view v-else class='status'>{{order_pay_info.paid ==  1 ? '支付成功' : order_pay_info.paid==0 && order_pay_info.pay_type != 'offline' && msg != 'success' ? '支付失败' : '未支付'}}</view> -->
 			<view class="status">{{payResult}}</view>
 			<view class='wrapper'>
-				<view v-if="order_type== 20" class='item acea-row row-between-wrapper'>
+				<view v-if="order_type == 20" class='item acea-row row-between-wrapper'>
 					<view>订单编号</view>
 					<view class='itemCom'>{{order_pay_info.group_order_sn}}</view>
 				</view>