Ver Fonte

修正错误

theo há 3 anos atrás
pai
commit
bec1e31858
1 ficheiros alterados com 12 adições e 3 exclusões
  1. 12 3
      frontendEle/src/views/shop/order.vue

+ 12 - 3
frontendEle/src/views/shop/order.vue

@@ -50,7 +50,7 @@
                 <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" >
-                          Full address:{{item.ADDRESS}} {{item.CITY_NAME}} {{item.LGA_NAME}} {{item.PROVINCE_NAME}}  &nbsp;&nbsp;&nbsp;&nbsp;
+                          Full address:{{item.ADDRESS}}, {{item.CITY_NAME}}, {{item.LGA_NAME}}, {{item.PROVINCE_NAME}}  &nbsp;&nbsp;&nbsp;&nbsp;
                           <!-- 详细地址 -->  &nbsp;&nbsp;
                           <!-- 收件人姓名 -->  Recipient name:{{item.CONSIGNEE}}&nbsp;&nbsp;&nbsp;&nbsp;
                            <!-- 手机号码 --> Phone number:{{item.MOBILE}}
@@ -101,22 +101,27 @@
                             <div>{{ balance.exchange }}</div>
                         </div>
                     </div>
+
                     <div v-if="category_type === 4">
                         <div class="sum_box">
                             <div>Travel bonus</div><!-- 旅游积分 -->
                             <div>{{ balance.tourism_points }}</div>
                         </div>
                     </div>
+
+
+
                     <div v-if="category_type === 5">
                         <div class="sum_box">
                             <div>Car House bonus</div><!-- 名车积分 -->
                             <div>{{ balance.garage_points }}</div>
                         </div>
                     </div>
+                  </div>
                 </div>
 
                 <div>
-                    <el-button type="primary" @click="goToAccounts()" :loading="submitButtonStat">Settle accounts</el-button><!--去结算-->
+                    <el-button type="primary" @click="goToAccounts()" :loading="submitButtonStat">Pay</el-button><!--去结算-->
                 </div>
               </div>
           </div>
@@ -152,8 +157,9 @@
                 :close="processClose"
             >
                 <el-button type="primary" size="small">支 付</el-button>
-<!--                <el-button type="danger" size="small"  class="cancelButton" @click="handleClose">取 消</el-button>-->
+
             </paystack>
+            <el-button type="danger" size="small"  class="cancelButton" @click="handleClose">取 消</el-button>
         </el-dialog>
     </div>
 </template>
@@ -255,6 +261,9 @@
             }
         },
         methods:{
+            cancelOrder(){
+              history.go(-1)
+            },
             setFreight(){
               if(this.addressId=='100000000000000000'){//如果地址为自提,则运费为0
                 this.pointFreight = this.freight = 0;