fix: bug-more

src/pages/Activity/ActivityDetail/index.vue

@@ -88,7 +88,7 @@
               fit="fit"
             ></el-image>
             <div class="itemIntroduce">
-              <p>{{ goodsItem.desc }}</p>
+              <p>{{ goodsItem.goods_name }}</p>
               <p class="price">
                 <span class="nowPrice">{{ `¥${goodsItem.price}` }}</span>
                 <span class="originPrice">{{

src/pages/Groupmeal/newOrderManagement/index.vue

@@ -157,8 +157,8 @@
                   @click="refund(scope.row)"
                   v-show="
                     scope.row.order_status == '2' ||
-                    scope.row.order_status == '6' ||
-                    scope.row.order_status == '8'
+                      scope.row.order_status == '6' ||
+                      scope.row.order_status == '8'
                   "
                   >退款</el-button
                 >
@@ -244,8 +244,8 @@
                   @click="refund(scope.row)"
                   v-show="
                     scope.row.order_status == '2' ||
-                    scope.row.order_status == '6' ||
-                    scope.row.order_status == '8'
+                      scope.row.order_status == '6' ||
+                      scope.row.order_status == '8'
                   "
                   >退款</el-button
                 >
@@ -348,7 +348,7 @@ import {
   newOrderItemList,
   newOrderRefundReject,
   newRefundOrder,
-  newGetOrderExportURL,
+  newGetOrderExportURL
 } from "@/service/Groupmeal/groupmeal";
 import page from "../components/Pagination/index.vue";
 
@@ -356,7 +356,7 @@ export default {
   name: "orderManagement",
   components: {
     Layout,
-    page,
+    page
   },
   data() {
     return {
@@ -369,7 +369,7 @@ export default {
         goods_id: "", // 商品名称
         cust_user: "", // 收货人
         order_id: "", // 订单编号
-        sub_shop_id: "", // 自提点
+        sub_shop_id: "" // 自提点
       },
       // 下拉框数据
       // 活动名称
@@ -378,36 +378,36 @@ export default {
       orderStatusArr: [
         {
           value: "0",
-          label: "全部",
+          label: "全部"
         },
         {
           value: "1",
-          label: "未支付",
+          label: "未支付"
         },
         {
           value: "2",
-          label: "已支付",
+          label: "已支付"
         },
         {
           value: "3",
-          label: "待退款",
+          label: "待退款"
         },
         {
           value: "4",
-          label: "已退款",
+          label: "已退款"
         },
         {
           value: "5",
-          label: "退款中",
+          label: "退款中"
         },
         {
           value: "6",
-          label: "已拒绝",
+          label: "已拒绝"
         },
         {
           value: "7",
-          label: "售后",
-        },
+          label: "售后"
+        }
       ],
       // 商品名称
       tradeNameArr: [],
@@ -426,7 +426,7 @@ export default {
       totalNum: null, //总条数
 
       // 退款
-      refundShow:false, // 退款状态
+      refundShow: false, // 退款状态
       checkAll: false, // 全选
       isIndeterminate: false,
       refundGoods: [
@@ -434,9 +434,9 @@ export default {
           refundedGoodsSel: false,
           payment: "",
           restoreInventory: false,
-          goods_name: "",
-        },
-      ],
+          goods_name: ""
+        }
+      ]
     };
   },
 
@@ -449,7 +449,7 @@ export default {
     },
     exportURL3() {
       return newGetOrderExportURL(this.orderQueryObj.marketing_id, "3");
-    },
+    }
   },
 
   methods: {
@@ -473,7 +473,7 @@ export default {
       this.orderQueryObj.goods_id = "";
       this.orderQueryObj.sub_shop_id = "";
       const params = {
-        marketing_id: val,
+        marketing_id: val
       };
       const res = await newGetGoodsList(params); // 商品名称
       this.getSubShopListMet(val); //自提点
@@ -501,7 +501,7 @@ export default {
     resetOrder(formName) {
       if (this.$route.query.marketing_type == "4") {
         this.$router.push({
-          path: "/op/groupmeal/newOrderManagement",
+          path: "/op/groupmeal/newOrderManagement"
         });
         this.$route.query.marketing_type = "";
       }
@@ -516,7 +516,7 @@ export default {
     searchOrder() {
       if (this.$route.query.marketing_type == "4") {
         this.$router.push({
-          path: "/op/groupmeal/newOrderManagement",
+          path: "/op/groupmeal/newOrderManagement"
         });
         this.$route.query.marketing_type = "";
       }
@@ -552,7 +552,7 @@ export default {
     async printOrderMet(forcePrint) {
       const params = {
         marketing_id: this.orderQueryObj.marketing_id,
-        force_print: forcePrint ? "1" : "",
+        force_print: forcePrint ? "1" : ""
       };
       const res = await newOrderPrint(params);
       return res;
@@ -569,7 +569,7 @@ export default {
       if (res.code === 0) {
         this.$message({
           type: "success",
-          message: "打印成功",
+          message: "打印成功"
         });
         return;
       }
@@ -587,7 +587,7 @@ export default {
         try {
           await this.$confirm(res.reason, "打印", {
             cancelButtonText: "取消",
-            confirmButtonText: "确定",
+            confirmButtonText: "确定"
           });
         } catch (e) {
           // 取消
@@ -603,8 +603,9 @@ export default {
     // 获取订单列表
     async getOrderListMet() {
       try {
+        let res = null;
         if (this.$route.query.marketing_type == "4") {
-          var res = await newGetOrderList({
+          res = await newGetOrderList({
             page: 1,
             page_size: 10,
             marketing_id: this.$route.query.marketing_id,
@@ -612,10 +613,10 @@ export default {
             goods_id: "",
             cust_user: "",
             order_id: "",
-            sub_shop_id: "",
+            sub_shop_id: ""
           });
         } else {
-          var res = await newGetOrderList(this.orderQueryObj);
+          res = await newGetOrderList(this.orderQueryObj);
         }
         this.goodsNum = res.goods_num; // 商品共计
         this.totalNum = res.count; // 商品总数
@@ -637,21 +638,21 @@ export default {
       try {
         await this.$confirm("确定要拒绝退款么?", "拒绝", {
           cancelButtonText: "取消",
-          confirmButtonText: "确定",
+          confirmButtonText: "确定"
         });
       } catch (e) {
         // 取消
         return;
       }
       const params = {
-        order_id: val.order_id,
+        order_id: val.order_id
       };
       const res = await newOrderRefundReject(params);
 
       if (res.code === 0) {
         this.$message({
           type: "success",
-          message: "订单已驳回",
+          message: "订单已驳回"
         });
       } else {
         this.$message.error(res.reason);
@@ -677,7 +678,7 @@ export default {
       this.checkAll = false;
       this.refundGoods = [];
       const params = {
-        order_id: val.order_id,
+        order_id: val.order_id
       };
       const res = await newOrderItemList(params);
       this.refundGoods = res.result;
@@ -706,16 +707,16 @@ export default {
         }
       }
 
-      const convertToNumber = (str) => {
+      const convertToNumber = str => {
         return !Number.isNaN(parseFloat(str)) ? parseFloat(str) : 0;
       };
 
-      const processRefundItem = (item) => {
+      const processRefundItem = item => {
         return {
           order_item_id: item.order_item_id,
           refund_num: item.refundableQuantity || 0,
           refund_amount: convertToNumber(item.amountToRefund),
-          refund_type: item.refund_type,
+          refund_type: item.refund_type
         };
       };
 
@@ -737,13 +738,13 @@ export default {
         return;
       }
       this.$message.error(res.reason);
-    },
+    }
   },
   created() {
     this.getMarketingListMet(); // 活动名称
     this.getSubShopListMet(); // 自提点
     this.getOrderListMet(); // table列表
-  },
+  }
 };
 </script>