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

operatingCompany/pages/shop/shopIndex/index.vue

@@ -547,7 +547,8 @@
 
 	.tabCotn {
 		display: flex;
-		justify-content: space-around;
+		justify-content: space-around;
+		background-color: #FFFFFF;
 	}
 
 	.tabLine {
@@ -555,7 +556,8 @@
 		text-align: center;
 		color: #3C3C3C;
 		font-size: 30rpx;
-		line-height: 88rpx;
+		line-height: 88rpx;
+		background-color: #FFFFFF;
 	}
 
 	.tabactive {

operatingCompany/pages/team/myTeam.vue

@@ -65,10 +65,11 @@
 		},
 		onLoad() {
 			this.page = 1
-			this.getData()
+			this.getData()
+			
 		},
 		methods: {
-
+		
 			search(val) {
 				// console.log(val);
 				this.searchValue = val