登录优化

mallApp/src/pages/home/category.vue

@@ -47,7 +47,7 @@
       </scroll-view>
     </block>
 
-    <wangCg :loginStyle.sync="globalLoginStyle" @goToLogin="loginTo()"></wangCg>
+    <wangCg :loginStyle.sync="globalLoginStyle" @loginSuccess="loginSuccess()"></wangCg>
 
   </view>
 </template>
@@ -120,8 +120,8 @@ export default {
 		buyProduct(){
 			this.$util.pageTo({url: "/pages/item/item?account="+this.option.account+'&hdId='+this.hdId,type:2})
 		},
-		loginTo() {
-			this.$util.pageTo({url:"/pages/login/index?needBack=1"})
+		loginSuccess() {
+			this.init()
 		},
     init(){
       this.hdId = this.option.hdId ? this.option.hdId : 0
@@ -163,8 +163,10 @@ export default {
     getMyClass () {
       return getClass().then(res => {
         if(res.code && res.code == 1){
-          this.form.categoryId = res.data[0].id
-          this.tabbar = res.data
+          if (!this.$util.isEmpty(res.data)) {
+            this.form.categoryId = res.data[0].id
+            this.tabbar = res.data
+          }
         }
       })
     },

mallApp/src/pages/item/item.vue

@@ -122,7 +122,7 @@
 			</view>
 		</view>
 
-		<wangCg :loginStyle.sync="globalLoginStyle" @goToLogin="loginTo()"></wangCg>
+		<wangCg :loginStyle.sync="globalLoginStyle" @loginSuccess="loginSuccess()"></wangCg>
 
 	</view>
 </template>
@@ -297,8 +297,8 @@ export default {
 		hideCartItem(){
 			this.cartItemShow = false
 		},
-		loginTo() {
-			this.$util.pageTo({url:"/pages/login/index?needBack=1"})
+		loginSuccess() {
+			this.initData()
 		},
 		//去特殊品种页，如小菊等
 		goToSpecialVariety(info){
@@ -349,17 +349,9 @@ export default {
 			})
 		},
 		scroll_detail(options){
-			// if(options.detail.scrollTop > 20) {
-			// 	this.myClass = 'fadeOut'
-			// }
 			if(!uni.getStorageSync("resolve")){
-				this.get_node_details(options);
-			};
-		},
-		rightScroll(e) {
-			// if(e.detail.scrollTop > 20) {
-			// 	this.myClass = 'fadeOut'
-			// }
+				this.get_node_details(options)
+			}
 		},
 		addCurrent(info){
 			if(info.$orig){