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

pages/order-submit/order-submit2.vue

@@ -244,7 +244,7 @@
 
 		<view class="notOption" v-if="submitOrder"></view>
 		<good-list :list="goodData" v-if="showGoodList" @close="closeGoodListHandler"></good-list>
-		<payCom v-if="payBtn" :payInfo="payInfo" @closePay="closePay"></payCom>
+		<payCom v-if="payBtn" :payInfo="payInfo" :isAlipay="isAlipay" @closePay="closePay"></payCom>
 		<u-toast ref="uToast" />
 		<u-popup v-model="payExit" mode="center" :mask-close-able="false">
 			<view style="background:#fff;width:500rpx">
@@ -315,7 +315,7 @@
 </template>
 
 <script>
-	import payCom from '@/components/pay/pay';
+	import payCom from '@/components/pay/submit2Pay';
 	import peisong from '@/components/peisong/index';
 	import coupon from '@/components/coupon/index';
 	import cashCard from '@/components/coupon/cashCard'; //储蓄卡
@@ -330,6 +330,7 @@
 		},
 		data() {
 			return {
+				isAlipay: 2,
 				JJSWStuId:"",
 				u:{},
 				Thename: '姓名',