Commit b7ebc05d authored by 黄奎's avatar 黄奎

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

parents 6e05743d 7dbfe420
...@@ -244,7 +244,7 @@ ...@@ -244,7 +244,7 @@
<view class="notOption" v-if="submitOrder"></view> <view class="notOption" v-if="submitOrder"></view>
<good-list :list="goodData" v-if="showGoodList" @close="closeGoodListHandler"></good-list> <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-toast ref="uToast" />
<u-popup v-model="payExit" mode="center" :mask-close-able="false"> <u-popup v-model="payExit" mode="center" :mask-close-able="false">
<view style="background:#fff;width:500rpx"> <view style="background:#fff;width:500rpx">
...@@ -315,7 +315,7 @@ ...@@ -315,7 +315,7 @@
</template> </template>
<script> <script>
import payCom from '@/components/pay/pay'; import payCom from '@/components/pay/submit2Pay';
import peisong from '@/components/peisong/index'; import peisong from '@/components/peisong/index';
import coupon from '@/components/coupon/index'; import coupon from '@/components/coupon/index';
import cashCard from '@/components/coupon/cashCard'; //储蓄卡 import cashCard from '@/components/coupon/cashCard'; //储蓄卡
...@@ -330,6 +330,7 @@ ...@@ -330,6 +330,7 @@
}, },
data() { data() {
return { return {
isAlipay: 2,
JJSWStuId:"", JJSWStuId:"",
u:{}, u:{},
Thename: '姓名', Thename: '姓名',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment