订单类型判断

src/views/order/index.vue

@@ -147,13 +147,20 @@
           </template>
         </el-table-column>
         <!-- <el-table-column prop="pay_price" label="实际支付" min-width="100" /> -->
-        <el-table-column label="支付类型" min-width="80">
+        <el-table-column label="支付类型" min-width="120">
           <template slot-scope="scope">
-            <span v-if="scope.row.paid == 1">
+            <!-- <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>
-            <span v-else>--</span>
-
+            <span v-else>--</span> -->
+          
+              <div class="tabBox acea-row row-middle">
+                {{checkPayString(scope.row.fzone_paytype, scope.row.pay_type) || ''}}
+              </div>
+              <div class="tabBox acea-row row-middle">
+                {{scope.row.fzone_paytype && scope.row.fzone_paytype.price || ''}}  
+                <span v-if="scope.row.fzone_paytype && scope.row.fzone_paytype.other">+{{scope.row.fzone_paytype && scope.row.fzone_paytype.other || ''}}</span>
+              </div>
           </template>
         </el-table-column>
         <el-table-column label="支付状态" min-width="80">
@@ -422,6 +429,27 @@ export default {
     this.getHeaderList()
   },
   methods: {
+    checkPayString(fzone_paytype, pay_type) {
+      //支付方式 0余额 1微信 2小程序 4支付宝 5特殊商户积分
+      const pay_type_list = {
+        0: "余额",
+        1: "微信",
+        2: "小程序",
+        4: "支付宝",
+        5: "特殊商户积分",
+      };
+      const pay_type_name = pay_type_list[pay_type];
+      const characterToCheck = '现金'; // 你想检查的字符
+      if (fzone_paytype && fzone_paytype.note.includes(characterToCheck)) {
+        return pay_type_name + "  " + fzone_paytype.note;
+      }else{
+        if (fzone_paytype && fzone_paytype.note){
+           return fzone_paytype.note
+        }else{
+           return ''
+        }
+      }
+    },
     // 选择支付状态
     selectedPayStatus() {
       if (this.tableFrom.paid == 0) {
@@ -750,11 +778,11 @@ export default {
     },
     // 编辑
     edit(id) {
-      this.$modalForm(orderUpdateApi(id)).then(() => this.getList(''))
+      this.$modalForm(orderUpdateApi(id)).then(() => this.getList(1))
     },
     // 发货
     send(id) {
-      this.$modalForm(orderDeliveryApi(id)).then(() => this.getList(''))
+      this.$modalForm(orderDeliveryApi(id)).then(() => this.getList(1))
     },
     // 自提
     take(id) {
@@ -773,7 +801,7 @@ export default {
       takeProductApi(this.takeProductCode, { order_id: this.currentOrderId }).then(res => {
         this.$message.success('验证成功')
         this.showDialogTake = false
-        this.getList()
+        this.getList(1)
       }).catch(res => {
         this.$message.error(res.message)
       })
@@ -781,11 +809,13 @@ export default {
 
     // 列表
     getList(num) {
+      console.log();
       this.listLoading = true
-      this.tableFrom.page = num || this.tableFrom.page
+      // this.tableFrom.page = num || this.tableFrom.page
       orderListApi(this.tableFrom)
         .then((res) => {
           console.log(res, 'aaaaa')
+          this.tableData.data = [];
           this.tableData.data = res.data.list
           this.tableData.total = res.data.count
           this.cardLists = res.data.stat
@@ -799,11 +829,11 @@ export default {
     },
     pageChange(page) {
       this.tableFrom.page = page
-      this.getList('')
+      this.getList(1)
     },
     handleSizeChange(val) {
       this.tableFrom.limit = val
-      this.getList('')
+      this.getList(1)
     },
     headerList() {
       chartApi(this.tableFrom)

src/views/order/orderDetail.vue

@@ -10,7 +10,7 @@
         <div v-if="orderDatalist" class="description">
           <div class="title">收货信息</div>
           <div class="acea-row">
-            <div class="description-term">用户昵称：{{orderDatalist.user.nickname}}</div>
+            <div class="description-term">用户昵称：{{orderDatalist.user && orderDatalist.user.nickname || ''}}</div>
             <div class="description-term">收货人：{{ orderDatalist.real_name }}</div>
             <div class="description-term">联系电话：{{ orderDatalist.user_phone }}</div>
             <div class="description-term">收货地址：{{ orderDatalist.user_address }}</div>
@@ -36,7 +36,7 @@
             <div class="description-term">订单金额：{{ orderDatalist.pay_price }}</div>
             <div class="description-term">创建时间：{{ orderDatalist.create_time }}</div>
 
-            <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==0">支付类型：虚拟支付</div>
+            <!-- <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==0">支付类型：虚拟支付</div>
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==1">支付类型：微信</div>
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==2">支付类型：小程序</div>
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==3">支付类型：银行卡</div>
@@ -49,7 +49,7 @@
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==2">支付方式：小程序</div>
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==3">支付方式：银行卡</div>
             <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==4">支付方式：支付宝</div>
-            <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==5">支付方式：红积分</div>
+            <div class="description-term" v-if="orderDatalist.paid==1 && orderDatalist.pay_type==5">支付方式：红积分</div> -->
 
 
             <div class="description-term">开通账号：{{ orderDatalist.exchange_phone }}</div>