|
|
@@ -50,8 +50,8 @@
|
|
|
<el-radio-group v-model="addressId" @change='choseAddress'>
|
|
|
<div v-for="(item , index) in all_address" :key='index' class="address">
|
|
|
<el-radio :label="item.ID" >
|
|
|
- {{item.PROVINCE_NAME}} {{item.CITY_NAME}} {{item.COUNTY_NAME}}
|
|
|
- <!-- 详细地址 --> Full address:{{item.ADDRESS}}
|
|
|
+ Full address:{{item.ADDRESS}} {{item.CITY_NAME}} {{item.LGA_NAME}} {{item.PROVINCE_NAME}}
|
|
|
+ <!-- 详细地址 -->
|
|
|
<!-- 收件人姓名 --> Recipient name:{{item.CONSIGNEE}}
|
|
|
<!-- 手机号码 --> Phone number:{{item.MOBILE}}
|
|
|
</el-radio>
|
|
|
@@ -120,50 +120,11 @@
|
|
|
<div class="sum_box">
|
|
|
<div>House bonus</div><!-- 豪宅积分 -->
|
|
|
<div>{{ balance.house_points }}</div>
|
|
|
-
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="box address_box">
|
|
|
- 账户余额:
|
|
|
- <div class="sum">
|
|
|
- <div v-if="category_type === 1">
|
|
|
- <!-- <div class="sum_box">-->
|
|
|
- <!-- <div>账户积分</div>-->
|
|
|
- <!-- <div>{{ balance.points }}</div>-->
|
|
|
- <!-- </div>-->
|
|
|
- <div class="sum_box">
|
|
|
- <div>账户余额</div>
|
|
|
- <div>¥{{ balance.cash }}元</div>
|
|
|
- </div>
|
|
|
- <div class="sum_box">
|
|
|
- <div>兑换点数</div>
|
|
|
- <div>{{ balance.exchange }}</div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
-
|
|
|
- <div v-if="category_type === 4">
|
|
|
- <div class="sum_box">
|
|
|
- <div>旅游积分</div>
|
|
|
- <div>{{ balance.travel_points }}</div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
-
|
|
|
- <div v-if="category_type === 5">
|
|
|
- <div class="sum_box">
|
|
|
- <div>名车积分</div>
|
|
|
- <div>{{ balance.car_points }}</div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
|
|
|
- <div v-if="category_type === 6">
|
|
|
- <div class="sum_box">
|
|
|
- <div>豪宅积分</div>
|
|
|
- <div>{{ balance.house_points }}</div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
<div>
|
|
|
<el-button type="primary" @click="goToAccounts()" :loading="submitButtonStat">Settle accounts</el-button><!--去结算-->
|
|
|
</div>
|
|
|
@@ -203,7 +164,6 @@
|
|
|
</paystack>
|
|
|
</el-dialog>
|
|
|
</div>
|
|
|
- </div>
|
|
|
</template>
|
|
|
|
|
|
<script>
|
|
|
@@ -347,6 +307,7 @@
|
|
|
})
|
|
|
tips = (payObj.length <= 0) ? '' : payObj.name
|
|
|
}
|
|
|
+
|
|
|
// 余额是否充足
|
|
|
if ((amountBalance > 0) && (this.payType !== 'pay_stack') && ((amountBalance - this.cashSum) < 0)) {
|
|
|
let tips = this.payList[this.payType] ? this.payList[this.payType].label : 'Balance'
|
|
|
@@ -452,7 +413,6 @@
|
|
|
|
|
|
// 支付方式
|
|
|
for (let item of response.sellType) {
|
|
|
-
|
|
|
if (item.id === this.category_type) {
|
|
|
this.payList = item.sell_type
|
|
|
break
|