no message

components/pay/submit2Pay.vue

@@ -119,7 +119,6 @@ export default {
 				"paySign": payData.paySign, //微信签名
 				'success':function(res){
 					uni.hideLoading()
-					that.closePay()
 					uni.navigateTo({
 						url: '/pages/order-submit/pay-success?payInfo='+JSON.stringify(that.payInfo)
 					});
@@ -129,7 +128,9 @@ export default {
 				},
 				'fail':function(res){
 					uni.hideLoading()
-					that.closePay()
+					uni.navigateTo({
+						url: '/pages/order/index/index?status=1'
+					});
 				},
 				'complete':function(res){
 					// uni.showToast({

pages/order-submit/order-submit2.vue

@@ -331,7 +331,7 @@
 		},
 		data() {
 			return {
-				isAlipay: 2,
+				isAlipay: 2,//1微信 2微信支付宝
 				JJSWStuId: "",
 				Thename2: '',
 				u: {},

pages/order/index/index.vue

@@ -95,7 +95,8 @@
 		 :border-radius="20"></u-modal>
 		<good-list :list="goodData" v-if="showGoodList" @close="closeGoodListHandler"></good-list>
 		<auth v-if="showAuth" @changeuserinfo="reloadUserinfo" @gbAuth='goback'></auth>
-		<payCom v-if="payBtn" :payInfo="payInfo" @closePay="closePay"></payCom>
+		<payCom v-if="payBtn&&u.TenantId!=27" :payInfo="payInfo" @closePay="closePay"></payCom>
+		<submit2PayCom v-if="payBtn&&u.TenantId==27" :payInfo="payInfo" :isAlipay="isAlipay" @closePay="closePay"></submit2PayCom>
 		<u-popup v-model="payExit" mode="center" :mask-close-able="false">
 			<view style="background:#fff;width:500rpx">
 				<view style="padding:10px 0 0 10px">提交失败</view>
@@ -110,16 +111,19 @@
 
 <script>
 	import payCom from '@/components/pay/pay';
+	import submit2PayCom from '@/components/pay/submit2Pay';
 	import goodList from "@/components/goods/order-good-list2";
 	import auth from "../../../components/auth/index.vue";
 	export default {
 		components: {
 			goodList,
 			auth,
-			payCom
+			payCom,
+			submit2PayCom
 		},
 		data() {
 			return {
+				isAlipay:2,//1微信 2微信支付宝
 				pageTitle: "我的订单",
 				current: 0,
 				list: [],

pages/order/order-detail.vue

@@ -241,7 +241,8 @@
 		<u-modal v-model="showReviceModal" content="是否确认收货？" :show-cancel-button="true" :show-title="false"
 			@confirm="submitReviceGoodHandler" :border-radius="20"></u-modal>
 		<u-toast ref="uToast" />
-		<payCom v-if="payBtn" :payInfo="payInfo" @closePay="closePay"></payCom>
+		<payCom v-if="payBtn&&u.TenantId!=27" :payInfo="payInfo" @closePay="closePay"></payCom>
+		<submit2PayCom v-if="payBtn&&u.TenantId==27" :payInfo="payInfo" :isAlipay="isAlipay" @closePay="closePay"></submit2PayCom>
 		<u-popup v-model="payExit" mode="center" :mask-close-able="false">
 			<view style="background:#fff;width:500rpx">
 				<view style="padding:10px 0 0 10px">提交失败</view>
@@ -257,16 +258,19 @@
 
 <script>
 	import payCom from '@/components/pay/pay';
+	import submit2PayCom from '@/components/pay/submit2Pay';
 	import afterSale from "@/components/userorder/after-sale";
 	import goodlist from "@/components/goods/list";
 	export default {
 		components: {
 			afterSale,
 			goodlist,
-			payCom
+			payCom,
+			submit2PayCom
 		},
 		data() {
 			return {
+				isAlipay:2,//1微信 2微信支付宝
 				u:{},
 				mc: "",
 				secondary: "",