merge-requests/11/head
ch 3 years ago
parent 0f0b283387
commit 8e3b894d10

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-05-08 00:39:50 * @Date: 2022-05-08 00:39:50
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-05-09 21:17:10 * @LastEditTime: 2022-05-09 21:37:07
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -16,7 +16,7 @@
<img :src="imgUrl" v-if="imgUrl"/> <img :src="imgUrl" v-if="imgUrl"/>
<p v-if="!startSecondNum"></p> <p v-if="!startSecondNum"></p>
</div> </div>
<p class="pay--tips">如支付后没有自动跳转请点击 <span class="pay--finish">完成付</span></p> <p class="pay--tips">如支付后没有自动跳转请点击 <span class="pay--finish" @click="finish"></span></p>
</div> </div>
</el-dialog> </el-dialog>
</template> </template>
@ -87,6 +87,10 @@ export default {
}, },
close(){ close(){
this.$emit('cancel'); this.$emit('cancel');
},
finish(){
this.myVisible = false;
this.$emit('finish')
} }
} }
} }

@ -2,14 +2,14 @@
* @Author: ch * @Author: ch
* @Date: 2022-05-08 01:14:03 * @Date: 2022-05-08 01:14:03
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-05-09 20:50:56 * @LastEditTime: 2022-05-09 21:39:31
* @Description: file content * @Description: file content
--> -->
<template> <template>
<div> <div>
<div class="box"> <div class="box">
<StatusInfo :orderInfo="orderInfo" @cancel="getOrderInfo" <StatusInfo :orderInfo="orderInfo" @cancel="getOrderInfo"
@receive="getOrderInfo"/> @receive="getOrderInfo" @payFinish="getOrderInfo"/>
<StatusStep :orderInfo="orderInfo" /> <StatusStep :orderInfo="orderInfo" />
</div> </div>
<LogisitcsInfo :orderInfo="orderInfo" /> <LogisitcsInfo :orderInfo="orderInfo" />

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-05-09 16:24:49 * @Date: 2022-05-09 16:24:49
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-05-09 21:26:52 * @LastEditTime: 2022-05-09 21:31:33
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -51,7 +51,6 @@
<p> <p>
<label>运费</label> <label>运费</label>
<UiMoney :money="orderInfo.shippingAmount" float/> <UiMoney :money="orderInfo.shippingAmount" float/>
</p> </p>
<p> <p>
<label> <label>

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-05-09 14:41:37 * @Date: 2022-05-09 14:41:37
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-05-09 21:12:47 * @LastEditTime: 2022-05-09 21:38:57
* @Description: file content * @Description: file content
--> -->
<template> <template>
@ -20,7 +20,7 @@
</template> </template>
</div> </div>
<Cancel :visible.sync="cancelVisible" :orderId="orderInfo.orderId" @cancel="cancel"/> <Cancel :visible.sync="cancelVisible" :orderId="orderInfo.orderId" @cancel="cancel"/>
<BsPay :visible.sync="payVisible" :orderId="orderInfo.orderId"/> <BsPay :visible.sync="payVisible" :orderId="orderInfo.orderId" @finish="payFinish"/>
</div> </div>
</template> </template>
<script> <script>
@ -125,6 +125,9 @@ export default {
}, },
cancel(){ cancel(){
this.$emit('cancel') this.$emit('cancel')
},
payFinish(){
this.$emit('payFinish')
} }
} }

@ -2,7 +2,7 @@
* @Author: ch * @Author: ch
* @Date: 2022-05-04 17:30:58 * @Date: 2022-05-04 17:30:58
* @LastEditors: ch * @LastEditors: ch
* @LastEditTime: 2022-05-09 14:33:52 * @LastEditTime: 2022-05-09 21:41:07
* @Description: file content * @Description: file content
--> -->
@ -20,7 +20,7 @@
<div class="pay"> <div class="pay">
<UiButton radius type="red_panel" @click="submit"></UiButton> <UiButton radius type="red_panel" @click="submit"></UiButton>
</div> </div>
<BsPay :visible.sync="payVisible" :orderId="orderId" @cancel="cancelPay"/> <BsPay :visible.sync="payVisible" :orderId="orderId" @cancel="finishPay" @finish="finishPay"/>
</div> </div>
</template> </template>
<script> <script>
@ -112,7 +112,7 @@ export default {
this.orderId = result.orderId; this.orderId = result.orderId;
}, },
cancelPay(){ finishPay(){
this.$router.replace(`/account/order/detail?id=${this.orderId}`) this.$router.replace(`/account/order/detail?id=${this.orderId}`)
} }
} }

Loading…
Cancel
Save