Merge branch 'master' of https://gitee.com/three-make-money/temu-plugin

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"
   },

src/view/ExportSaleData.vue

@@ -140,6 +140,7 @@
 </template>
 
 <script>
+import { mapState } from 'vuex'
 import {sendChromeAPIMessage} from '@/api/chromeApi'
 import JsonExcel from 'vue-json-excel'
 import {formatDate} from '@/utils/date'
@@ -154,6 +155,7 @@ import { Message } from 'element-ui'
         last30DaySkcList: [],
         last30DaySkuList: [],
         mallId: '',
+        mallName: '',
         type: '0',
         isLoading: false,
         pageSize: 10,
@@ -169,6 +171,7 @@ import { Message } from 'element-ui'
         endDate: '',
         jsonFields: {
           "商品名称": "productName",
+          "店铺名称": "mallName",
           "SPU": "productId",
           "SKC": "productSkcId",
           "SKU ID": "productSkuId",
@@ -219,6 +222,7 @@ import { Message } from 'element-ui'
     },
 
     computed: {
+      ...mapState(['mallList']),
       colConfigs () {
         return [
           {
@@ -228,6 +232,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',
@@ -321,6 +332,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',
@@ -371,6 +390,7 @@ import { Message } from 'element-ui'
       last30DaysSkcJsonFields () {
         let jsonFields = {
           "商品名称": "productName",
+          "店铺名称": "mallName",
           "SPU": "productId",
           "SKC": "productSkcId",
           "SKC货号": "skcExtCode",
@@ -397,6 +417,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',
@@ -461,6 +489,7 @@ import { Message } from 'element-ui'
       last30DaysSkuJsonFields () {
         let jsonFields = {
           "商品名称": "productName",
+          "店铺名称": "mallName",
           "SPU": "productId",
           "SKC": "productSkcId",
           "SKC货号": "skcExtCode",
@@ -512,6 +541,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 = []
@@ -560,9 +594,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,
@@ -623,6 +659,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,

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) {
               // 继续抢

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
           }