no message
Showing
2 changed files
with
8 additions
and
11 deletions
| ... | @@ -13,12 +13,9 @@ | ... | @@ -13,12 +13,9 @@ |
| 13 | </div> | 13 | </div> |
| 14 | 14 | ||
| 15 | <div class="status-po"> | 15 | <div class="status-po"> |
| 16 | <span v-if="b.status == '0'&&b.surplus!='0,0'&&b.surplus!='0'" class="bg-warning"> | 16 | <span v-if="b.status == '0'" class="bg-warning"> |
| 17 | {{ language == 0 ? '待支付' : 'Unpaid' }} | 17 | {{ language == 0 ? '待支付' : 'Unpaid' }} |
| 18 | </span> | 18 | </span> |
| 19 | <span v-if="b.status == '0'&&(b.surplus=='0,0'||b.surplus=='0')" class="bg-warning">{{ | ||
| 20 | language == 0 ? '已取消' : 'Canceled' | ||
| 21 | }}</span> | ||
| 22 | <span v-if="b.status == '1'" class="bg-blue">{{ language == 0 ? '支付成功' : 'successful' }}</span> | 19 | <span v-if="b.status == '1'" class="bg-blue">{{ language == 0 ? '支付成功' : 'successful' }}</span> |
| 23 | <span v-if="b.status == '2'" class="bg-warning">{{ language == 0 ? '已取消' : 'Canceled' }}</span> | 20 | <span v-if="b.status == '2'" class="bg-warning">{{ language == 0 ? '已取消' : 'Canceled' }}</span> |
| 24 | <span v-if="b.status == '3'||b.status == '4'" class="bg-danger">{{ | 21 | <span v-if="b.status == '3'||b.status == '4'" class="bg-danger">{{ |
| ... | @@ -103,11 +100,10 @@ | ... | @@ -103,11 +100,10 @@ |
| 103 | </span> | 100 | </span> |
| 104 | </el-col> | 101 | </el-col> |
| 105 | <el-col :lg="6" :md="16" :sm="16" :xs="16"> | 102 | <el-col :lg="6" :md="16" :sm="16" :xs="16"> |
| 106 | <div class="text-right mb20 text-danger" v-if="b.paymentType!='4'&&b.paymentType!='5'"> | 103 | <div class="text-right mb20 text-danger" v-if="b.status == '0' && b.countdown>0"> |
| 107 | <el-countdown | 104 | <el-countdown |
| 108 | v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0')" | ||
| 109 | :value="b.countdown" | 105 | :value="b.countdown" |
| 110 | format="mm:ss" | 106 | format="D天 HH:mm:ss" |
| 111 | value-style="color:#E60012;font-size:16px;" | 107 | value-style="color:#E60012;font-size:16px;" |
| 112 | @finish="finish(b)"/> | 108 | @finish="finish(b)"/> |
| 113 | </div> | 109 | </div> |
| ... | @@ -121,9 +117,10 @@ | ... | @@ -121,9 +117,10 @@ |
| 121 | <el-button class="mb10" plain round size="small" type="primary" @click="goDetail(b)"> | 117 | <el-button class="mb10" plain round size="small" type="primary" @click="goDetail(b)"> |
| 122 | {{ language == 0 ? '详情' : 'Detail' }} | 118 | {{ language == 0 ? '详情' : 'Detail' }} |
| 123 | </el-button> | 119 | </el-button> |
| 124 | <el-button v-if="b.status == '0'&&(b.surplus!='0,0'&&b.surplus!='0') &&!min" class="mb10" | 120 | <el-button v-if="b.status == '0' &&!min" class="mb10" |
| 125 | plain round size="small" type="primary" @click="goDetail(b)"> | 121 | plain round size="small" type="primary" @click="goDetail(b)"> |
| 126 | <span v-if="b.paymentType=='4'||b.paymentType=='5'">{{language == 0 ? '上传凭证' : 'Upload Receipt'}}</span> | 122 | <span |
| 123 | v-if="b.paymentType=='4'||b.paymentType=='5'">{{ language == 0 ? '上传凭证' : 'Upload Receipt' }}</span> | ||
| 127 | <span v-else>{{ language == 0 ? '支付' : 'Pay' }}</span> | 124 | <span v-else>{{ language == 0 ? '支付' : 'Pay' }}</span> |
| 128 | </el-button> | 125 | </el-button> |
| 129 | <el-button v-if="b.viewStatus==0 &&!min" class="mb10" plain round size="small" type="warning" | 126 | <el-button v-if="b.viewStatus==0 &&!min" class="mb10" plain round size="small" type="warning" | ... | ... |
| ... | @@ -48,8 +48,8 @@ function getList() { | ... | @@ -48,8 +48,8 @@ function getList() { |
| 48 | console.log(e) | 48 | console.log(e) |
| 49 | } | 49 | } |
| 50 | } | 50 | } |
| 51 | if (b.surplus && b.status == '0' && (b.surplus != '0,0' && b.surplus != '0')) { | 51 | if ( b.status == '0') { |
| 52 | b.countdown = Date.now() + Number((b.surplus.split(',')[0] * 60 + b.surplus.split(',')[1]) * 10) | 52 | b.countdown = Number(b.surplus) |
| 53 | } | 53 | } |
| 54 | } | 54 | } |
| 55 | }) | 55 | }) | ... | ... |
-
Please register or sign in to post a comment