调整

src/view/shipping/NormalSendGoods.vue

@@ -237,6 +237,19 @@
             <el-button type="primary" @click="beforeBegin">开 始</el-button>
           </span>
         </AiDialog>
+
+        <AiDialog
+          title="警告"
+          :visible.sync="isShowWarning"
+          :close-on-click-modal="false"
+          customFooter
+          height="400px"
+          width="400px">
+          <span style="color: red; height: 30px; font-size: large; display: block">{{ warningText }}</span>
+          <span slot="footer" class="dialog-footer">
+            <el-button @click="isShowWarning = false">我知道了</el-button>
+          </span>
+        </AiDialog>
       </template>
     </ai-list>
   </div>
@@ -305,6 +318,10 @@
         isLoading: false,
         isDlgLoading: false,
 
+        // 警告弹窗
+        isShowWarning: false,
+        warningText: '',
+
         robDlgShow: false,
       }
     },
@@ -364,10 +381,16 @@
       loadAll() {
         this.$userCheck().then(() => {
           this.choosedList = []
-          this.loadMallIndex = 0
-          this.loadMode = 1
+          this.currentPage = 1
           this.isLoading = true
-          this.getList(this.choosedList, this.mallList[this.loadMallIndex].mallId, this.mallList[this.loadMallIndex].mallName, 1)
+          if (this.$store.state.userInfo.type == 3) {
+            this.loadMode = 0
+            this.getList(this.choosedList, this.$store.state.mallId, this.$store.state.mallName, 1)
+          } else {
+            this.loadMallIndex = 0
+            this.loadMode = 1
+            this.getList(this.choosedList, this.mallList[this.loadMallIndex].mallId, this.mallList[this.loadMallIndex].mallName, 1)
+          }
         });
       },
 
@@ -434,7 +457,7 @@
                 currentPage ++
                 this.getList(data, mallId, mallName, currentPage)
               } else {
-                if (this.loadMode == '1') {
+                if (this.loadMode == 1) {
                   this.loadMallIndex ++
                   if (this.loadMallIndex < this.mallList.length) {
                     this.getList(data, this.mallList[this.loadMallIndex].mallId, this.mallList[this.loadMallIndex].mallName, 1)
@@ -531,12 +554,22 @@
               }
             }
             if (!res.errorCode && res.error_code && (res.error_code == 40001)) {
-              this.networkErrorCount ++
+              this.isShowWarning = true
+              this.warningText = '“卖家中心”已退出登录，抢单停止'
+              this.isBegin = false
             }
-            // 继续抢
-            setTimeout(() => {
-              this.rob()
-            }, parseInt(this.robForm.step) + Math.floor(Math.random() * parseInt(this.robForm.randomValue)))
+            if (!res.errorCode && res.error_code && (res.error_code == 40002)) {
+              this.isShowWarning = true
+              this.warningText = '账号异常，请更换“卖家中心”账号'
+              this.isBegin = false
+            }
+            if (this.isBegin) {
+              // 继续抢
+              setTimeout(() => {
+                this.rob()
+              }, parseInt(this.robForm.step) + Math.floor(Math.random() * parseInt(this.robForm.randomValue)))
+            }
+            
         })
       },
       createDeliveryBill(sn, mallId) {