Browse Source

Merge branch 'master' of http://47.98.226.240:3000/twt/epc

* 'master' of http://47.98.226.240:3000/twt/epc:
  bug修改
guo 2 years ago
parent
commit
b7fca600cc
1 changed files with 10 additions and 5 deletions
  1. 10 5
      pages/mobile/modelTwo.vue

+ 10 - 5
pages/mobile/modelTwo.vue

@@ -235,15 +235,20 @@
 						this.caption = res.data.result.caption;
 						this.brand_name = res.data.result.brand_name;
 						this.access_time = res.data.result.access_time;
-						if (res.data.result.level_identify == 'group_restrain' || res.data.result.level_identify ==
-							'subgroup') { //约束
+						if (res.data.result.level_identify == 'group_restrain' ) { //约束
 							console.log("约束1")
 							this.restrainShow1 = true;
 							this.restrainList1 = res.data.result.list;
 						} else {
-							this.lastShow = true;
-							this.childrenList = res.data.result.list;
-							this.oldList = this.childrenList
+							if(res.data.result.list[0].next_restrain==1){
+								this.restrainShow1 = true;
+								this.restrainList1 = res.data.result.list;
+							}else{
+								this.lastShow = true;
+								this.childrenList = res.data.result.list;
+								this.oldList = this.childrenList
+							}
+							
 						}
 					} else {
 						uni.showToast({