1

components/tab-bar/delivery.vue

@@ -54,7 +54,7 @@
 				接单规则
 			</view>
 			<view class="">
-				<view @tap="changeOnline(0)" class="shangxia-btn shangxian-btn" v-if="isOnLine==0">
+				<view @tap="changeOnline(0)" class="shangxia-btn shangxian-btn" v-if="isOnLine==1">
 					<text>已上线</text>
 				</view>
 				<view @tap="changeOnline(1)" class="shangxia-btn lixian-btn" v-else>
@@ -529,6 +529,7 @@
 						uni.showToast({
 							title: '设置成功'
 						});
+						that.$refs.carPopup.close()
 					} else {
 						uni.showToast({
 							title: res.message,
@@ -551,7 +552,7 @@
 				}
 			},
 			openPopup() {
-				if(this.isOnLine != 0){
+				if(this.isOnLine != 1){
 					this.tui.toast('请先上线后配置');
 					return;
 				}
@@ -578,7 +579,7 @@
 							that.$forceUpdate();
 						}
 						this.zhipaiCheck = uni.getStorageSync('worker').getPushOrder==1?true:false
-						if(uni.getStorageSync('waimaiData')){
+						/* if(uni.getStorageSync('waimaiData')){
 							let waimaiData = uni.getStorageSync('waimaiData')
 							for(let i=0;i<waimaiData.length;i++){
 								for(let m=0;m<that.waimaRuleList.length;m++){
@@ -587,8 +588,18 @@
 									}
 								}
 							}
+						} */
+						for(let m=0;m<that.waimaRuleList.length;m++){
+							if(that.waimaRuleList[m].getPushOrder == 1){
+								that.waimaRuleList[m].isChecked = true
+							}
+						}
+						for(let m=0;m<that.paotuiRuleList.length;m++){
+							if(that.paotuiRuleList[m].getPushOrder == 1){
+								that.paotuiRuleList[m].isChecked = true
 							}
-						if(uni.getStorageSync('kuaidiData')){
+						} 
+						/* if(uni.getStorageSync('kuaidiData')){
 							let kuaidiData = uni.getStorageSync('kuaidiData')
 							for(let i=0;i<kuaidiData.length;i++){
 								for(let m=0;m<that.paotuiRuleList.length;m++){
@@ -597,7 +608,7 @@
 									}
 								}
 							}
-						}
+						} */
 						this.$refs.carPopup.open()
 					} else {
 						that.tui.toast(res.message)
@@ -658,9 +669,9 @@
 					}
 				}else{
 					if (value == 0) {
-						url = '/worker/onLine'
-					} else {
 						url = '/worker/offLine'
+					} else {
+						url = '/worker/onLine'
 					}
 				}