1.团队门店

operatingCompany/pages.json

@@ -27,12 +27,12 @@
 	        
 	    },
         {
-            "path" : "pages/myStore/myStore",
+            "path" : "pages/teamStore/teamStore",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "我的门店",
+                "navigationBarTitleText": "团队门店",
 				"navigationBarBackgroundColor":"#FFFFFF",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": true
             }
             
         }

operatingCompany/pages/index/index.vue

@@ -32,7 +32,7 @@
 					<image src="../../static/img/home_icon_4.png" mode="" class="modularImg"></image>
 					<view class="modularName">我的团队</view>
 				</view>
-				<view class="modularLine" @click="goRouter('../myStore/myStore')">
+				<view class="modularLine" @click="goRouter('../teamStore/teamStore')">
 					<image src="../../static/img/home_icon_5.png" mode="" class="modularImg"></image>
 					<view class="modularName">团队门店</view>
 				</view>

operatingCompany/pages/team/myTeam.vue

@@ -35,6 +35,7 @@
 
 		</view>
 
+		<!-- 无数据空白页 -->
 		<view class="nodataBox" v-if="data.length == 0">
 			<image src="../../static/img/pic_empty_def.png" mode="widthFix" class="nodataImg"></image>
 			<view class="noTxt">暂无数据</view>
@@ -57,7 +58,6 @@
 		methods: {
 			searchDone(e) {
 				this.searchValue = e.target.value;
-				console.log(this.searchValue);
 				this.getData()
 			},
 			goRouter(url) {
@@ -75,14 +75,12 @@
 					}
 				this.$http(url, params, 'GET').then(res => {
 					uni.hideLoading()
-					console.log(res);
 					this.count = Number(res.data.count)
 					this.data = res.data.list
 				})
 			}
 		},
-		onPullDownRefresh() {
-			console.log('safjslfj');
+		onPullDownRefresh() {
 			this.getData()
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
@@ -206,7 +204,8 @@
 		color: #666666;
 		font-size: 24rpx;
 	}
-
+
+/* 空白页css */
 	.nodataBox {
 		text-align: center;
 	}

operatingCompany/pages/myStore/myStore.vue

@@ -4,7 +4,7 @@
 		<view class="topView">
 			<!-- 搜索 -->
 			<view class="searchBox">
-				<image src="../../static/img/icon_search.png" mode="" class="searchImg"></image>
+				<image src="../../static/img/icon_search.png" class="searchImg"></image>
 				<input type="text" class="searchInput" placeholder="请输入门店名称、联系人、手机号" v-model="searchValue"
 					@confirm="searchDone" />
 			</view>
@@ -17,8 +17,8 @@
 					</view>
 				</picker>
 
-				<picker value="thirdIndex" :range="thirdArr" @change="bindPickerChange3">
-					<view class="uni-input">{{thirdIndex == null ? '运营经理' : thirdArr[thirdIndex]}}
+				<picker value="thirdIndex" mode="selector" range-key='name' :range="thirdArr" @change="bindPickerChange3">
+					<view class="uni-input">{{thirdIndex == null ? '运营经理' : thirdArr[thirdIndex].name}}
 						<image class="downArrow" src="../../static/img/icon_downArrow.png"></image>
 					</view>
 				</picker>
@@ -36,17 +36,16 @@
 						<view class="shopName">门店名称</view>
 
 						<!-- 地址 和电话 图标 -->
-						<image class="tubiao" src="../../static/img/icon_daohang_def.png" mode=""
+						<image class="tubiao" src="../../static/img/icon_daohang_def.png"
 							@click="goAddress(item.address)">
 						</image>
-						<image class="tubiao" src="../../static/img/icon_phone_def.png" mode=""
-							@click="call(item.phone)">
+						<image class="tubiao" src="../../static/img/icon_phone_def.png" @click="call(item.phone)">
 						</image>
 
 					</view>
 
 					<!-- 门店类型-开业时间-联系人 -->
-					<view class="shopType"><text style='color: #B98B5D;'>门店类型</text> · 开业时间 · 联系人：{{lianxiren}}
+					<view class="shopType"><text style='color: #B98B5D;'>门店类型</text> · 开业时间 · 联系人：}
 					</view>
 
 					<!-- 详细地址 -->
@@ -67,6 +66,12 @@
 				</view>
 			</view>
 		</view>
+
+		<!-- 无数据空白页 -->
+		<view class="nodataBox" v-if="shopData.length == 0">
+			<image src="../../static/img/pic_empty_def.png" mode="widthFix" class="nodataImg"></image>
+			<view class="noTxt">暂无数据</view>
+		</view>
 	</view>
 </template>
 
@@ -85,16 +90,17 @@
 					address: null,
 				},
 				thirdIndex: null,
-				thirdName: '',
-				thirdArr: ['王老师', '李老师'],
-				shopData: [1, 2, 3, 4, 5, 5, 5, 5, 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4],
-				lianxiren: '小李老师'
+				thirdArr: [],
+				managerId:'',
+				shopData: [],
+
 			}
 		},
-		onShow() {
-			this.secondIndex = null
-			this.thirdIndex = null
+		onLoad() {
+			
+			this.getManager()
 		},
+
 		methods: {
 			searchDone(e) {
 				this.searchValue = e.target.value;
@@ -109,9 +115,15 @@
 				this.data.area = e.detail.value[2]
 				this.data.address = this.data.province + this.data.city + this.data.area
 			},
-			bindPickerChange3(e) {
-				this.thirdIndex = e.target.value;
-				this.thirdName = this.thirdArr[this.thirdIndex];
+			bindPickerChange3(e) {
+				if(e.target.value == NaN) {
+					this.thirdIndex = 0;
+				}
+				else {
+					this.thirdIndex = e.target.value;
+				}
+				
+				this.managerId = this.thirdArr[this.thirdIndex].ID;
 			},
 			goAddress(e) {
 				console.log('地图导航');
@@ -121,8 +133,29 @@
 			},
 			history() {
 				console.log('历史记录');
+			},
+
+			getManager() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'accompany/SuperAccounts/queryManagerListByDept',
+					params = {
+						name: '',
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading()
+					this.thirdArr = res.data
+				})
 			}
-		}
+		},
+
+		// onPullDownRefresh() {
+		// 	this.getData()
+		// 	setTimeout(function() {
+		// 		uni.stopPullDownRefresh();
+		// 	}, 1000);
+		// }
 	}
 </script>
 
@@ -264,4 +297,20 @@
 		line-height: 56rpx;
 
 	}
+
+	/* 空白页css */
+	.nodataBox {
+		text-align: center;
+	}
+
+	.nodataImg {
+		width: 400rpx;
+		padding-top: 300rpx;
+	}
+
+	.noTxt {
+		font-size: 30rpx;
+		color: #999999;
+		padding-top: 50rpx;
+	}
 </style>

operatingCompany/unpackage/dist/dev/mp-weixin/app.json

@@ -5,7 +5,8 @@
     "pages/manageStore/manageStore",
     "pages/myStore/myStore",
     "pages/accountSet/accountSet",
-    "pages/changePassWord/changePassWord"
+    "pages/changePassWord/changePassWord",
+    "pages/logIn/logIn"
   ],
   "subPackages": [],
   "window": {

operatingCompany/unpackage/dist/dev/mp-weixin/pages/logIn/logIn.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "登录",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}

operatingCompany/unpackage/dist/dev/mp-weixin/pages/logIn/logIn.wxss

@@ -0,0 +1,49 @@
+
+.content {
+	background-color: #F4F5F7;
+	min-height: 100vh;
+	padding: 20rpx 24rpx;
+}
+.messageBg,
+.sureBtn {
+	background-color: #FFFFFF;
+	border-radius: 10rpx;
+	margin: 20rpx 0rpx;
+}
+.message {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: start;
+	-webkit-justify-content: flex-start;
+	        justify-content: flex-start;
+	line-height: 98rpx;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	        align-items: center;
+}
+.line {
+	border-bottom: 1rpx solid #EEEEEE;
+}
+.leftTitle {
+	font-size: 28rpx;
+	color: #3C3C3C;
+	margin-left: 20rpx;
+	width: 140rpx;
+}
+.passWord {
+	-webkit-box-flex: 1;
+	-webkit-flex-grow: 1;
+	        flex-grow: 1;
+	font-size: 28rpx;
+	color: #999999;
+	margin-left: 52rpx;
+	margin-right: 20rpx;
+}
+.sureBtn {
+	line-height: 98rpx;
+	text-align: center;
+	color: #FFFFFF;
+	background-color: #FF8700;
+}
+

operatingCompany/unpackage/dist/dev/mp-weixin/pages/manageStore/manageStore.json

@@ -1,6 +1,6 @@
 {
   "navigationBarTitleText": "管理门店",
   "navigationBarBackgroundColor": "#FFFFFF",
-  "enablePullDownRefresh": false,
+  "enablePullDownRefresh": true,
   "usingComponents": {}
 }

operatingCompany/unpackage/dist/dev/mp-weixin/pages/team/myTeam.json

@@ -1,6 +1,6 @@
 {
   "navigationBarTitleText": "我的团队",
   "navigationBarBackgroundColor": "#FFFFFF",
-  "enablePullDownRefresh": false,
+  "enablePullDownRefresh": true,
   "usingComponents": {}
 }

operatingCompany/unpackage/dist/dev/mp-weixin/pages/team/myTeam.wxss

@@ -100,4 +100,16 @@
 	color: #666666;
 	font-size: 24rpx;
 }
+.nodataBox.data-v-68f7969c {
+	text-align: center;
+}
+.nodataImg.data-v-68f7969c {
+	width: 400rpx;
+	padding-top: 300rpx;
+}
+.noTxt.data-v-68f7969c {
+	font-size: 30rpx;
+	color: #999999;
+	padding-top: 50rpx;
+}