fix：已失效订单可删除，茶宝明细类型判断

src/pages/accountDetails/integral.vue

@@ -23,7 +23,7 @@
         </view>
         <view class="list_con flex_r flex_ac flex_jb">
           <view class="list_balance">{{ item.create_time }}</view>
-          <view class="list_time">余额{{ item.after }}</view>
+          <view class="list_time">积分余额{{ item.after }}</view>
           
         </view>
       </view>

src/pages/accountDetails/teaBaby.vue

@@ -15,22 +15,12 @@
     <view class="con">
       <view class="list" v-for="(item, index) in list" :key="index">
         <view class="list_head flex_r flex_ac flex_jb">
-          <view class="head_name" v-if="item.type == 0">购物送茶宝</view>
-          <view class="head_name" v-else-if="item.type == 1">签到送茶宝</view>
-          <view class="head_name" v-else-if="item.type == 2">批发使用茶宝</view>
-          <view class="head_name" v-else-if="item.type == 3">退款加茶宝</view>
-          <view class="head_name" v-else-if="item.type == 4">提现转茶宝</view>
-          <view class="head_name" v-else-if="item.type == 5">支出赠送茶宝</view>
-          <view class="head_name" v-else-if="item.type == 6">兑换产品使用茶宝</view>
-          <view class="head_name" v-else-if="item.type == 7">手动调整茶宝</view>
-          <view class="head_name" v-else-if="item.type == 8">核销后送茶宝</view>
-          <view class="head_name" v-else-if="item.type == 9">余额转化茶宝</view>
-          <view class="head_name" v-else-if="item.type == 10">收到赠送茶宝</view>
+          <view class="head_name">{{ type(item.type) }}</view>
           <view :class="['head_price',item.act == '+' ? 'g_color' : '']">{{item.act}}{{ item.num }}</view>
         </view>
         <view class="list_con flex_r flex_ac flex_jb">
-          <!-- <view class="list_time">{{ item.integerType }}333</view> -->
-          <view class="list_balance">{{ item.create_time }}</view>
+          <view class="list_time">{{ item.create_time }}</view>
+          <view class="list_balance">茶宝余额{{ item.after }}</view>
         </view>
       </view>
       <not-goods v-if="haveGoods" textStr="暂无积分信息"></not-goods>
@@ -108,6 +98,27 @@ export default {
       this.loadData();
     }
   },
+  computed: {
+    type() {
+      return (va) => {
+        switch (va) {
+          case 0: return "购物送茶宝";
+          case 1: return "签到送茶宝";
+          case 2: return "批发使用茶宝";
+          case 3: return "退款加茶宝";
+          case 4: return "提现转茶宝";
+          case 5: return "支出赠送茶宝";
+          case 6: return "兑换产品使用茶宝";
+          case 7: return "手动调整茶宝";
+          case 8: return "核销后送茶宝";
+          case 9: return "余额转化茶宝";
+          case 10: return "收到赠送茶宝";
+          case 11: return "实名送茶宝";
+          default: return "";
+        }
+      }
+    }
+  },
   /**
    * 页面上拉触底事件的处理函数
    */

src/pages/my/index.vue

@@ -327,7 +327,7 @@
             hover-class="none"
           >
             <image class="fun_img" src="/static/my/refund.png" mode=""></image>
-            <view class="fun_text">已收货</view>
+            <view class="fun_text">已完成</view>
           </navigator>
         </view>
       </view>

src/pages/szw-order-details/index.vue

@@ -74,14 +74,11 @@
                     <template v-if="orderInfo.order_status != 5">
                         <view class="btn cancel-btn" @tap="toCancel" v-if="[0,1].includes(orderInfo.order_status)">取消订单</view>
                         <view class="btn topay-btn" @tap="toPay" v-if="[0,2].includes(orderInfo.pay_status)">立即支付</view>
-                        <view class="btn topay-btn" @tap="toTake" v-if="[0, 1,7].includes(orderInfo.order_status)&&[1].includes(orderInfo.pay_status)">确认收货</view>
-                                        <view
-                class="btn topay-btn"
-                @tap="toCode(orderInfo)"
-                v-if="
-                  [8].includes(orderInfo.order_status)
-                "
-                >待自提</view>
+                        <view class="btn topay-btn" @tap="toTake" v-if="[0,1,7].includes(orderInfo.order_status)&&[1].includes(orderInfo.pay_status)">确认收货</view>
+                        <view class="btn topay-btn" @tap="toCode(orderInfo)" v-if="[8].includes(orderInfo.order_status)">待自提</view>
+                    </template>
+                    <template v-else>
+                        <view class="btn cancel-btn" @tap="removeItem">删除</view>
                     </template>
                     <view class="btn cancel-btn" @tap="goBack">返回</view>
                 </view>
@@ -266,6 +263,27 @@ export default {
             //         this.orderInfo.orderDetail.orderDetaillId,
             // });
         },
+
+        removeItem(){
+            let that = this;
+            uni.showModal({
+                content: "亲，确认删除本订单吗？",
+                confirmText: "确认删除",
+                confirmColor: "#fa2f2e",
+                cancelText: "取消",
+                cancelColor: "#bbb",
+                success(res) {
+                    post("my/orderDel", {
+                        order_id: that.order_id,
+                    }).then(res => {
+                        if (res.code === 0) {
+                            appEv.errTips(res.msg);
+                            that.goBack();
+                        }
+                    });
+                },
+            });
+        }
     },
     computed: {
         tidyStatus() {

src/pages/szw-order-list/index.vue

@@ -30,10 +30,13 @@
           <view class="price-box flex_r flex_ac">
             <template v-if="li.order_status != 5">
               <view class="btn cancel-btn" v-if="[0].includes(li.order_status)" @tap="toCancel(li)">取消订单</view>
-              <view class="btn topay-btn" v-if="[0, 2].includes(li.pay_status)" @tap="toPay(li)">立即支付</view>
-              <view class="btn topay-btn" @tap="toTake(li)" v-if="[0, 1, 7].includes(li.order_status) && [1].includes(li.pay_status)">确认收货</view>
+              <view class="btn topay-btn" v-if="[0,2].includes(li.pay_status)" @tap="toPay(li)">立即支付</view>
+              <view class="btn topay-btn" @tap="toTake(li)" v-if="[0,1,7].includes(li.order_status) && [1].includes(li.pay_status)">确认收货</view>
               <view class="btn topay-btn" @tap="toCode(li)" v-if="[8].includes(li.order_status)">待自提</view>
             </template>
+            <template v-else>
+              <view class="btn cancel-btn" @tap="removeItem(li.order_id)">删除</view>
+            </template>
             <view class="btn cancel-btn" @click="toDetails(li)">查看订单</view>
           </view>
         </view>
@@ -63,7 +66,7 @@ export default {
         ["5", "待自提"],
         ["2", "待发货"],
         ["3", "待收货"],
-        ["4", "已收货"],
+        ["4", "已完成"],
       ],
       orderList: [],
       currentType: "0",
@@ -212,6 +215,28 @@ export default {
       this.currentType = curType;
       this.clearData(false, this.loadData);
     },
+
+    //删除订单
+    removeItem(order_id){
+      let that = this;
+      uni.showModal({
+        content: "亲，确认删除本订单吗？",
+        confirmText: "确认删除",
+        confirmColor: "#fa2f2e",
+        cancelText: "取消",
+        cancelColor: "#bbb",
+        success(res) {
+          post("my/orderDel", {
+            order_id
+          }).then(res => {
+              if (res.code === 0) {
+                appEv.errTips(res.msg);
+                that.loadData();
+              }
+          });
+        },
+      });
+    }
   },
   computed: {
     // 0  支付状态   1 订单状态