From 8408c7b13d1e450ed7449881d8d998a5f80e552b Mon Sep 17 00:00:00 2001
From: liushiwei <499672082@qq.com>
Date: Tue, 12 Sep 2023 16:04:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.production.json          |  2 +-
 src/view/ExportSaleData.vue           | 37 +++++++++++++++++++++++++++
 src/view/shipping/NormalSendGoods.vue |  1 -
 src/view/shipping/ShippingDesk.vue    |  2 +-
 4 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/src/manifest.production.json b/src/manifest.production.json
index aa1070e..7b0b9b7 100644
--- a/src/manifest.production.json
+++ b/src/manifest.production.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "TEMU助手",
   "description": "TEMU助手 - 自动化提高生产效率",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "background": {
     "service_worker": "/background.js"
   },
diff --git a/src/view/ExportSaleData.vue b/src/view/ExportSaleData.vue
index be5f7c2..7643736 100644
--- a/src/view/ExportSaleData.vue
+++ b/src/view/ExportSaleData.vue
@@ -139,6 +139,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 import {sendChromeAPIMessage} from '@/api/chromeApi'
 import JsonExcel from 'vue-json-excel'
 import {formatDate} from '@/utils/date'
@@ -153,6 +154,7 @@ import { Message } from 'element-ui'
         last30DaySkcList: [],
         last30DaySkuList: [],
         mallId: '',
+        mallName: '',
         type: '0',
         isLoading: false,
         pageSize: 10,
@@ -168,6 +170,7 @@ import { Message } from 'element-ui'
         endDate: '',
         jsonFields: {
           "商品名称": "productName",
+          "店铺名称": "mallName",
           "SPU": "productId",
           "SKC": "productSkcId",
           "SKU ID": "productSkuId",
@@ -218,6 +221,7 @@ import { Message } from 'element-ui'
     },
 
     computed: {
+      ...mapState(['mallList']),
       colConfigs () {
         return [
           {
@@ -227,6 +231,13 @@ import { Message } from 'element-ui'
             width: '280px',
             align: 'left'
           },
+          {
+            prop: 'mallName',
+            label: '店铺名称',
+            "show-overflow-tooltip": true, 
+            width: '120px',
+            align: 'left'
+          },
           {
             prop: 'productId',
             label: 'SPU',
@@ -320,6 +331,14 @@ import { Message } from 'element-ui'
             align: 'left',
             fixed: 'left'
           },
+          {
+            prop: 'mallName',
+            label: '店铺名称',
+            "show-overflow-tooltip": true, 
+            width: '120px',
+            align: 'left',
+            fixed: 'left'
+          },
           {
             prop: 'productId',
             label: 'SPU',
@@ -370,6 +389,7 @@ import { Message } from 'element-ui'
       last30DaysSkcJsonFields () {
         let jsonFields = {
           "商品名称": "productName",
+          "店铺名称": "mallName",
           "SPU": "productId",
           "SKC": "productSkcId",
           "SKC货号": "skcExtCode",
@@ -396,6 +416,14 @@ import { Message } from 'element-ui'
             align: 'left',
             fixed: 'left'
           },
+          {
+            prop: 'mallName',
+            label: '店铺名称',
+            "show-overflow-tooltip": true, 
+            width: '120px',
+            align: 'left',
+            fixed: 'left'
+          },
           {
             prop: 'productId',
             label: 'SPU',
@@ -460,6 +488,7 @@ import { Message } from 'element-ui'
       last30DaysSkuJsonFields () {
         let jsonFields = {
           "商品名称": "productName",
+          "店铺名称": "mallName",
           "SPU": "productId",
           "SKC": "productSkcId",
           "SKC货号": "skcExtCode",
@@ -511,6 +540,11 @@ import { Message } from 'element-ui'
           Message.error("请先选择店铺")
           return
         }
+        let mallInfo = this.mallList.filter(item => {
+          return item.mallId == this.mallId
+        })
+        this.mallName = mallInfo[0].mallName
+
         this.isLoading = true
         this.$userCheck(this.mallId).then(() => {
           this.last30DaySkcList = []
@@ -559,9 +593,11 @@ import { Message } from 'element-ui'
               data.skcExtCode = item.skcExtCode;
               data.purchaseConfig = item.purchaseConfig;
               data.productSkcPicture = item.productSkcPicture;
+              data.mallName = this.mallName;
 
               this.last30DaySkcList.push({
                 productName: item.productName,
+                mallName: this.mallName,
                 productId: item.productId,
                 productSkcId: item.productSkcId,
                 skcExtCode: item.skcExtCode,
@@ -622,6 +658,7 @@ import { Message } from 'element-ui'
               this.last30DaySkuList = this.list.map(item => {
                 let temp = {
                   productName: item.productName,
+                  mallName: this.mallName,
                   productId: item.productId,
                   productSkcId: item.productSkcId,
                   productSkuId: item.productSkuId,
diff --git a/src/view/shipping/NormalSendGoods.vue b/src/view/shipping/NormalSendGoods.vue
index 65b8364..ab31941 100644
--- a/src/view/shipping/NormalSendGoods.vue
+++ b/src/view/shipping/NormalSendGoods.vue
@@ -563,7 +563,6 @@
             if (!res.errorCode && res.error_code && (res.error_code == 40002)) {
               this.isShowWarning = true
               this.warningText = '账号异常，请更换“卖家中心”账号'
-              this.isBegin = false
             }
             if (this.isBegin) {
               // 继续抢
diff --git a/src/view/shipping/ShippingDesk.vue b/src/view/shipping/ShippingDesk.vue
index 5830722..766f9e5 100644
--- a/src/view/shipping/ShippingDesk.vue
+++ b/src/view/shipping/ShippingDesk.vue
@@ -346,7 +346,7 @@
       },
       remove(sn) {
         for (let i = 0; i < this.choosedList.length; i++) {
-          if (this.choosedList[i].subPurchaseOrderSn == sn) {
+          if (this.choosedList[i].subPurchaseOrderBasicVO.subPurchaseOrderSn == sn) {
             this.choosedList.splice(i, 1)
             break
           }