Bladeren bron

信息显示调整

xialei 1 jaar geleden
bovenliggende
commit
768ea15693
2 gewijzigde bestanden met toevoegingen van 8 en 6 verwijderingen
  1. 2 2
      src/views/order/list/index.vue
  2. 6 4
      src/views/order/list/orderDetail.vue

+ 2 - 2
src/views/order/list/index.vue

@@ -193,12 +193,12 @@
193 193
           </template>
194 194
         </el-table-column>
195 195
         <el-table-column prop="pay_price" label="订单金额" min-width="100" />
196
-        <el-table-column label="支付类型" min-width="80">
196
+        <!-- <el-table-column label="支付类型" min-width="80">
197 197
           <template slot-scope="scope">
198 198
              <span v-if="scope.row.paid == 1">{{scope.row.pay_type == 0 ? "虚拟支付" :scope.row.pay_type == 1 ? "微信支付" : scope.row.pay_type == 2 ? '小程序支付' :scope.row.pay_type == 4 ? '支付宝支付' :scope.row.pay_type == 5 ? '积分' : '' }}</span>
199 199
             <span v-else>--</span>
200 200
           </template>
201
-        </el-table-column>
201
+        </el-table-column> -->
202 202
         <el-table-column label="支付方式" min-width="80">
203 203
           <template slot-scope="scope">
204 204
              <span v-if="scope.row.paid == 1">

+ 6 - 4
src/views/order/list/orderDetail.vue

@@ -27,26 +27,28 @@
27 27
             <div class="description-term">实际支付:{{ orderDatalist.pay_price }}</div>
28 28
             <div class="description-term">创建时间:{{ orderDatalist.create_time }}</div>
29 29
 
30
-            <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==0">支付类型:虚拟支付</div>
30
+            <!-- <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==0">支付类型:虚拟支付</div>
31 31
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==1">支付类型:微信</div>
32 32
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==2">支付类型:小程序</div>
33 33
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==3">支付类型:银行卡</div>
34 34
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==4">支付类型:支付宝</div>
35
-            <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==5">支付类型:积分</div>
35
+            <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==5">支付类型:积分</div> -->
36 36
 
37
+            <div class="description-term" v-if="orderDatalist.paid==1">支付类型:{{orderDatalist.fzone_paytype.note}} ({{orderDatalist.fzone_paytype.price}}  <span v-if="orderDatalist.fzone_paytype.other">+{{orderDatalist.fzone_paytype.other}}</span>)</div>
38
+            
37 39
 
38 40
 
39 41
             <div class="description-term">商家备注:{{ orderDatalist.remark }}</div>
40 42
 
41 43
 
42 44
 
43
-
45
+<!-- 
44 46
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==0">支付方式:虚拟支付</div>
45 47
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==1">支付方式:微信</div>
46 48
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==2">支付方式:小程序</div>
47 49
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==3">支付方式:银行卡</div>
48 50
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==4">支付方式:支付宝</div>
49
-            <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==5">支付方式:积分</div>
51
+            <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==5">支付方式:积分</div> -->
50 52
 
51 53
 
52 54