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

operatingCompany/pages.json

@@ -1,6 +1,20 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-
+		
+		// {
+		// 	"path": "pages/shop/shopIndex/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "运营陪伴",
+		// 		"navigationStyle": "custom"
+		// 		/* "navigationBarBackgroundColor": "#FFFFFF",
+		// 		"enablePullDownRefresh": true, */
+		// 		/* "app-plus":{
+		// 			"titleNView":{
+		// 				"autoBackButton":false
+		// 			}
+		// 		} */
+		// 	}
+		// },
 		{
 			"path": "pages/index/index",
 			"style": {

operatingCompany/pages/entryReport/historyReport.vue

@@ -169,7 +169,10 @@
 			
 			bindPickerChange3(e) {
 				this.thirdIndex = e.target.value
-				this.managerId = this.thirdArr[this.thirdIndex].ID
+				this.managerId = this.thirdArr[this.thirdIndex].ID
+				if(e.target.value == 0){
+					this.thirdIndex = null
+				}
 				this.page = 1
 				this.getShopData()
 			},

operatingCompany/pages/reportManage/reportManage.vue

@@ -210,7 +210,10 @@
 			},
 			bindPickerChange3(e) {
 				this.thirdIndex = e.target.value
-				this.managerId = this.thirdArr[this.thirdIndex].ID
+				this.managerId = this.thirdArr[this.thirdIndex].ID
+				if(e.target.value == 0){
+					this.thirdIndex = null
+				}
 				this.page = 1
 				this.getShopData()
 			},

operatingCompany/pages/teamStore/teamStore.vue

@@ -161,7 +161,10 @@
 			},
 			bindPickerChange3(e) {
 				this.thirdIndex = e.target.value
-				this.managerId = this.thirdArr[this.thirdIndex].ID
+				this.managerId = this.thirdArr[this.thirdIndex].ID
+				if(e.target.value == 0){
+					this.thirdIndex = null
+				}
 				this.page = 1
 				this.getShopData()
 			},