shish 3 лет назад
Родитель
Сommit
b2a04a4e83
3 измененных файлов с 13 добавлено и 26 удалено
  1. 8 14
      ghsApp/src/mixins/globalMixins.js
  2. 0 2
      hdApp/src/admin/home/order.vue
  3. 5 10
      hdApp/src/mixins/globalMixins.js

+ 8 - 14
ghsApp/src/mixins/globalMixins.js

@@ -83,9 +83,9 @@ export default {
           store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
           store.commit('setLoginInfo', { ...subRes.data.admin, ...subRes.data })
           this.skCustomId = subRes.data.skCustomId
           this.skCustomId = subRes.data.skCustomId
           this.setUserShopAll()
           this.setUserShopAll()
-          if (this.init) {
-            this.init()
-          }
+          
+          this.init()
+          
         })
         })
       }
       }
       // #endif
       // #endif
@@ -111,21 +111,15 @@ export default {
           this.listenPDAkd()
           this.listenPDAkd()
 
 
           this.setUserShopAll()
           this.setUserShopAll()
-          if (this.init) {
-            this.init()
-          }
+          
+          this.init()
+          
         })
         })
       }
       }
       // #endif 
       // #endif 
 
 
-		}
-
-	},
-	onShow(){
-		if (isLogin()&&!this.$util.isEmpty(this.getLoginInfo)) {
-			if (this.init) {
-				this.init()
-			}
+		}else{
+      this.init()
     }
     }
 	},
 	},
 	methods: {
 	methods: {

+ 0 - 2
hdApp/src/admin/home/order.vue

@@ -119,8 +119,6 @@ export default {
     getCategory()
     getCategory()
     getUsage()
     getUsage()
   },
   },
-  onLoad: function () {
-  },
   onShow () {
   onShow () {
     let tabIndex = uni.getStorageSync("switchTabQuery") || null;
     let tabIndex = uni.getStorageSync("switchTabQuery") || null;
     if (tabIndex) {
     if (tabIndex) {

+ 5 - 10
hdApp/src/mixins/globalMixins.js

@@ -53,9 +53,9 @@ export default {
 							getShopInfo(true)
 							getShopInfo(true)
 							this.setUserShopAll()
 							this.setUserShopAll()
 						}
 						}
-						if (this.init) {
-							this.init()
-						}
+						
+						this.init()
+						
 					})
 					})
 				}
 				}
 			}else{
 			}else{
@@ -76,9 +76,7 @@ export default {
 					})
 					})
 					that.setUserShopAll()
 					that.setUserShopAll()
 
 
-					if (that.init) {
-						that.init()
-					}
+					that.init()
 
 
 				  }
 				  }
 				})
 				})
@@ -106,10 +104,7 @@ export default {
 				})
 				})
 			}
 			}
 			// #endif
 			// #endif
-		}
-	},
-	onShow(){
-		if (this.init) {
+		}else{
 			this.init()
 			this.init()
 		}
 		}
 	},
 	},