From b9195c137e1d4fd9ad54a9b9636f221cf0c2719b Mon Sep 17 00:00:00 2001
From: liushiwei <499672082@qq.com>
Date: Wed, 9 Aug 2023 00:55:57 +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/utils/index.js           |  4 +-
 src/view/CopyProduct.vue     |  1 -
 src/view/ExportSaleData.vue  | 15 ++----
 src/view/NormalSendGoods.vue | 90 ++++++++++++++++++++----------------
 src/view/Welcome.vue         |  1 -
 5 files changed, 55 insertions(+), 56 deletions(-)

diff --git a/src/utils/index.js b/src/utils/index.js
index 0eaf6f2..393e267 100644
--- a/src/utils/index.js
+++ b/src/utils/index.js
@@ -90,7 +90,7 @@ const dateUtil = {
   }
 }
 
-const userCheck = () => {
+const userCheck = (mallId) => {
   return new Promise((resolve, reject) => {
     store.dispatch('getUserInfo').then(res => {
       if (res.flag != 1) {
@@ -99,7 +99,7 @@ const userCheck = () => {
         reject('您的账号未激活或已失效，请激活后使用')
         return false
       }
-      if (res.type != 4 && store.state.mallId != store.state.userInfo.mallId) {
+      if (res.type != 4 && mallId != store.state.userInfo.mallId) {
         Message.error('您当前登录的TEMU账号与会员绑定账号不一致')
         reject('您当前登录的TEMU账号与会员绑定账号不一致')
         return false
diff --git a/src/view/CopyProduct.vue b/src/view/CopyProduct.vue
index 472e54c..105f6c5 100644
--- a/src/view/CopyProduct.vue
+++ b/src/view/CopyProduct.vue
@@ -248,7 +248,6 @@ import { Message } from 'element-ui'
           if (res.errorCode == 1000000) {
             this.productPage.total = res.result.total
             this.productTableData = res.result.pageItems.map((item) => {
-              console.log(item.createdAt)
               return {
                 productSpu: item.productId,
                 productSkc: item.productSkcId,
diff --git a/src/view/ExportSaleData.vue b/src/view/ExportSaleData.vue
index a081a59..0a36e74 100644
--- a/src/view/ExportSaleData.vue
+++ b/src/view/ExportSaleData.vue
@@ -153,17 +153,10 @@ import { Message } from 'element-ui'
           Message.error("请先选择店铺")
           return
         }
-        this.$http.post('/api/malluser/info').then(res => {
-          if (res.code == 0) {
-            this.$store.commit('setUserInfo', res.data)
-            if (res.data.flag != 1) {
-              Message.error('您的账号未激活或已失效，请激活后使用')
-              this.$store.commit('setActiveDlgShow', true)
-              return;
-            } else {
-              this.getList()
-            }
-          }
+        this.$userCheck(this.mallId).then(() => {
+          this.getList()
+        }).catch((err) => {
+          console.log(err)
         })
       },
       getList () {
diff --git a/src/view/NormalSendGoods.vue b/src/view/NormalSendGoods.vue
index c966514..670e65a 100644
--- a/src/view/NormalSendGoods.vue
+++ b/src/view/NormalSendGoods.vue
@@ -179,7 +179,9 @@
         timer: null,
         choosedList: [],
         arr: [],
-        robTotal: 0
+        robTotal: 0,
+        pageSize: 100,
+        currentPage: 1,
       }
     },
 
@@ -188,9 +190,6 @@
     },
 
     created () {
-      this.mallId = this.mallList[0].mallId
-      this.mallName = this.mallList[0].mallName
-      this.getList()
     },
 
     methods: {
@@ -198,11 +197,19 @@
         this.arr = e
       },
       mallChange() {
-        let mallInfo = this.mallList.filter(item => {
-          return item.mallId == this.mallId
+        this.$userCheck(this.mallId).then(() => {
+          let mallInfo = this.mallList.filter(item => {
+            return item.mallId == this.mallId
+          })
+          this.mallName = mallInfo.mallName
+
+          // 下载数据
+          this.tableData = []
+          this.currentPage = 1
+          this.getList()
+        }).catch((err) => {
+          console.log(err)
         })
-        this.mallName = mallInfo.mallName
-        this.getList()
       },
       onConfirm () {
         if (this.arr.length == 0) {
@@ -221,14 +228,13 @@
       },
 
       getList () {
-        this.tableData = []
         sendChromeAPIMessage({
           url: 'oms/bg/venom/api/supplier/purchase/manager/querySubOrderList',
           needMallId: true,
           mallId: this.mallId,
           data: {
-            "pageNo": 1,
-            "pageSize": 100,
+            "pageNo": this.currentPage,
+            "pageSize": this.pageSize,
             "urgencyType": 0,
             "isCustomGoods": false,
             "statusList": [
@@ -239,8 +245,8 @@
               res.result.subOrderForSupplierList = res.result.subOrderForSupplierList.filter((item) => {
                 return item.isCanJoinDeliverPlatform;
               })
-              this.tableData = res.result.subOrderForSupplierList.map((item) => {
-                return {
+              res.result.subOrderForSupplierList.map((item) => {
+                this.tableData.push({
                   robTotal: 0,
                   subPurchaseOrderSn: item.subPurchaseOrderSn,
                   originalPurchaseOrderSn: item.originalPurchaseOrderSn,
@@ -253,10 +259,15 @@
                   category: item.category,
                   mallId: this.mallId,
                   mallName: this.mallName
-                };
+                })
               })
+
+              if (this.pageSize == res.result.subOrderForSupplierList.length) {
+                this.currentPage ++
+                this.getList()
+              }
             } else {
-              Message.error("【拼多多】" + res.error_msg)
+              Message.error("【拼多多】" + res.errorMsg)
             }
         })
       },
@@ -280,33 +291,30 @@
           return;
         }
 
-        this.$userCheck().then(() => {
-          if (this.choosedList.length <= 0) {
-            Message.error('请选择备货单');
-            return;
+        if (this.choosedList.length <= 0) {
+          Message.error('请选择备货单');
+          return;
+        }
+
+        this.robTotal = this.choosedList.length
+        this.isBegin = true;
+        this.timer = [];
+
+        for (let i = 0;i < this.choosedList.length; i++) {
+          setTimeout(() => {
+            let t = setInterval(this.robFunc(this.choosedList[i].subPurchaseOrderSn, this.choosedList[i].mallId), 1000);
+            this.timer.push({id: this.choosedList[i].subPurchaseOrderSn, timer: t})
+          }, 100 * i)
+        }
+
+        let _this = this;
+        let tt = setInterval(function() {
+          if (_this.choosedList.length == 0) {
+            _this.isBegin = false;
+            clearInterval(tt);
           }
-
-          this.robTotal = this.choosedList.length
-          this.isBegin = true;
-          this.timer = [];
-
-          for (let i = 0;i < this.choosedList.length; i++) {
-            setTimeout(() => {
-              let t = setInterval(this.robFunc(this.choosedList[i].subPurchaseOrderSn, this.choosedList[i].mallId), 1000);
-              this.timer.push({id: this.choosedList[i].subPurchaseOrderSn, timer: t})
-            }, 100 * i)
-          }
-
-          let _this = this;
-          let tt = setInterval(function() {
-            if (_this.choosedList.length == 0) {
-              _this.isBegin = false;
-              clearInterval(tt);
-            }
-          }, 1000)
-        }).catch((err) => {
-          console.log(err)
-        })
+        }, 1000)
+        
         // this.$http.post('/api/malluser/info').then(res => {
         //   if (res.code == 0) {
         //     this.$store.commit('setUserInfo', res.data)
diff --git a/src/view/Welcome.vue b/src/view/Welcome.vue
index 882935f..406e6f4 100644
--- a/src/view/Welcome.vue
+++ b/src/view/Welcome.vue
@@ -4,7 +4,6 @@
       <div class="content">
         <p>TEMU助手是为致力于“拼多多跨境卖家中心”通过自动化的方式，提高TEMU运营管理效率。</p>
         <p>在使用卖家中心过程中，有觉得不方便之处，或者重复劳动力的地方可与我们沟通，我们竭尽全力为大家打造实用的智能化工具。</p>
-        <p>欢迎大家扫描下方二维码与我们沟通交流，获取最新智能化研发进展，一起经营跨境电商，让中国货走向全世界</p>
       </div>
     </ai-card>
     <div class="middle">