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

operatingCompany/pages.json

@@ -17,7 +17,7 @@
 			}
 		},
 	    {
-	        "path" : "pages/manageStore/manageStore",
+	        "path" : "pages/team/manageStore",
 	        "style" :                                                                                    
 	        {
 	            "navigationBarTitleText": "管理门店",
@@ -27,12 +27,12 @@
 	        
 	    },
         {
-            "path" : "pages/myStore/myStore",
+            "path" : "pages/teamStore/teamStore",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "我的门店",
+                "navigationBarTitleText": "团队门店",
 				"navigationBarBackgroundColor":"#FFFFFF",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": true
             }
             
         }
@@ -67,6 +67,16 @@
 		    
 		}
         
+        ,{
+            "path" : "pages/upcoming/upcoming",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "待办事项",
+				"navigationBarBackgroundColor":"#FFFFFF",
+                "enablePullDownRefresh": true
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",

operatingCompany/pages/index/index.vue

@@ -4,7 +4,7 @@
 		<view class="modular">
 			<view class="modularTitle">我的待办</view>
 			<view class="modularCont">
-				<view class="modularLine">
+				<view class="modularLine" @click="goRouter('../upcoming/upcoming')">
 					<image src="../../static/img/home_icon_1.png" mode="" class="modularImg"></image>
 					<view class="modularName">待办事项</view>
 				</view>
@@ -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/manageStore/manageStore.vue

@@ -11,25 +11,28 @@
 
 		<!-- 门店列表 -->
 		<view class="shopContent">
-			<view v-for="(item,index) in data" :key="index">
+			<view v-for="(item,index) in shopData" :key="index">
 				<view class="shopBox">
 					<view class="shopTop">
-						<view class="shopName">门店名称</view>
+						<view class="shopName">{{item.ShopName}}</view>
 
 						<!-- 地址和电话 -->
-						<image class="tubiao" src="../../static/img/icon_daohang_def.png" mode="" @click="goAddress(item.address)">
+						<image class="tubiao" src="../../static/img/icon_daohang_def.png" mode=""
+							@click="goAddress(item.lng, item.lat)">
 						</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" mode=""
+							@click="call(item.ContactorPhone)">
 						</image>
 					</view>
 
 					<!-- 门店类型-开业时间-联系人 -->
-					<view class="shopType"><text style='color: #B98B5D;'>门店类型</text> · 开业时间 · 联系人：{{lianxiren}}</view>
-
+					<view class="shopType"><text style='color: #B98B5D;'>{{item.levelName}}</text> ·
+						<text v-if="item.OpeningTime != null">{{item.OpeningTime}}</text> 联系人：{{item.Contactor}}
+					</view>
 					<!-- 详细地址 -->
 					<view class="addressView">
-						<view class="address">山东省济南市历下区齐鲁软件园创业广场广广场广广场广广场广广场广</view>
-						<view class="distance">29.6km</view>
+						<view class="address">{{item.Address}}</view>
+						<view class="distance">{{item.distance}}km</view>
 					</view>
 
 
@@ -44,21 +47,64 @@
 	export default {
 		data() {
 			return {
-				searchValue: '',
-				data: [1, 2, 3, 4, 5, 6, 7],
-				lianxiren: '王老师',
+				searchValue: '',
+				managerID:'',
+				lng: '',
+				lat: '',
+				shopData: [],
 			}
 		},
+		onLoad: function(option) {
+			this.managerID = option.managerID
+			console.log(this.managerID);
+			var that = this
+			uni.getLocation({
+					success(res) {
+						that.lng = res.longitude
+						that.lat = res.latitude
+
+						that.getShopData()
+					}
+				})
+		},
 		methods: {
 			searchDone() {
-				this.searchValue = e.target.value;
+				this.searchValue = e.target.value;
+				this.getShopData()
+			},
+			getShopData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'accompany/SuperAccounts/queryShopListByManagerID',
+					params = {
+						managerID: this.managerID,
+						shopName: this.searchValue,
+						lng: this.lng,
+						lat: this.lat,
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading()
+					this.shopData = res.data
+
+				})
+			},
+			onPullDownRefresh() {
+				this.getShopData()
+				setTimeout(function() {
+					uni.stopPullDownRefresh();
+				}, 1000);
 			},
 			goAddress(e) {
 				console.log('地图导航');
 			},
-			call(e) {
-				console.log('打电话');
-			},
+			call(e) {
+				if(e.length != 0) {
+					uni.makePhoneCall({
+						phoneNumber:e
+					})
+				}
+			}
 		}
 	}
 </script>
@@ -108,10 +154,9 @@
 	}
 
 	.shopContent {
-		position: relative;
-		top: 120rpx;
-		left: 0rpx;
+
 		padding: 0rpx 24rpx;
+		padding-top: 120rpx;
 		background-color: #F4F5F7;
 
 	}
@@ -132,7 +177,7 @@
 	.shopName {
 		font-size: 30rpx;
 		color: #3C3C3C;
-		font-weight: bold;
+		font-weight: bold;
 		width: 500rpx;
 	}
 

operatingCompany/pages/team/myTeam.vue

@@ -18,13 +18,12 @@
 		<!-- 内容 -->
 		<view class="teamContent">
 			<view v-for="(item,index) in data" :key="index">
-				<view class="team" @click="goRouter('../manageStore/manageStore')">
+				<view class="team" @click="goRouter(item)">
 					<!-- 第一行 -->
 					<view class="customer">
 						<view class="name">{{item.name + item.AccountName}}</view>
 						<view class="shopCount" style="color: #FF4F00;">管理门店：{{item.shopCount}}
-							<image src="../../static/img/icon_arrow_go.png" mode=""
-								style="width: 12rpx; height: 22rpx; margin-left: 5rpx;"></image>
+							<image src="../../static/img/icon_arrow_go.png" style="width: 12rpx; height: 22rpx; margin-left: 5rpx;"></image>
 						</view>
 					</view>
 
@@ -35,6 +34,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,12 +57,11 @@
 		methods: {
 			searchDone(e) {
 				this.searchValue = e.target.value;
-				console.log(this.searchValue);
 				this.getData()
 			},
-			goRouter(url) {
+			goRouter(v) {
 				uni.navigateTo({
-					url: url
+					url: 'manageStore?managerID=' + v.ID
 				})
 			},
 			getData() {
@@ -75,14 +74,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();
@@ -170,11 +167,8 @@
 
 	.teamContent {
 		background-color: #F4F5F7;
-		position: relative;
-		top: 200rpx;
-		left: 0rpx;
-		right: 0rpx;
-		padding: 0rpx 24rpx;
+		padding: 0rpx 24rpx;
+		padding-top: 200rpx;
 		display: flex;
 		flex-direction: column;
 	}
@@ -206,7 +200,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,9 @@
 					</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>
@@ -33,30 +34,31 @@
 				<view class="shopBox">
 					<view class="shopTop">
 
-						<view class="shopName">门店名称</view>
+						<view class="shopName">{{item.ShopName}}</view>
 
 						<!-- 地址 和电话 图标 -->
-						<image class="tubiao" src="../../static/img/icon_daohang_def.png" mode=""
-							@click="goAddress(item.address)">
+						<image class="tubiao" src="../../static/img/icon_daohang_def.png"
+							@click="goAddress(item.lng, item.lat)">
 						</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.ContactorPhone)">
 						</image>
 
 					</view>
 
 					<!-- 门店类型-开业时间-联系人 -->
-					<view class="shopType"><text style='color: #B98B5D;'>门店类型</text> · 开业时间 · 联系人：{{lianxiren}}
+					<view class="shopType"><text style='color: #B98B5D;'>{{item.levelName}}</text> ·
+						<text v-if="item.OpeningTime != null">{{item.OpeningTime}}</text> 联系人：{{item.Contactor}}
 					</view>
 
 					<!-- 详细地址 -->
 					<view class="addressView">
-						<view class="address">山东省济南市历下区齐鲁软件园创业广场广广场广广场广广场广广场广</view>
-						<view class="distance">29.6km</view>
+						<view class="address">{{item.Address}}</view>
+						<view class="distance">{{item.distance}}km</view>
 					</view>
 
 					<!-- 运营经理 -->
-					<view class="manager">运营经理：安老师 17762277777</view>
+					<view class="manager">运营经理：{{item.name}} {{item.AccountName}}</view>
 
 					<!-- 历史记录 -->
 					<view class="bottomView">
@@ -67,6 +69,14 @@
 				</view>
 			</view>
 		</view>
+
+		<!-- 上拉 加载更多 -->
+		<!-- <view class="noMore" v-if="noMoreShow">没有更多数据</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,44 +95,122 @@
 					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: [],
+				page: 1,
+				noMoreShow: false,
+				lng: '',
+				lat: '',
 			}
 		},
-		onShow() {
-			this.secondIndex = null
-			this.thirdIndex = null
+		onLoad() {
+			var that = this
+			uni.getLocation({
+					success(res) {
+						that.lng = res.longitude
+						that.lat = res.latitude
+
+						that.page = 1
+						that.getShopData()
+					}
+				}),
+				this.getManager()
+
 		},
+
 		methods: {
 			searchDone(e) {
-				this.searchValue = e.target.value;
+				this.searchValue = e.target.value
+				this.page = 1
+				this.getShopData()
 			},
 			bindChange: function(e) {
-				console.log(e)
 				this.data.provinceCode = e.detail.code[0]
 				this.data.cityCode = e.detail.code[1]
 				this.data.areaCode = e.detail.code[2]
 				this.data.province = e.detail.value[0]
 				this.data.city = e.detail.value[1]
 				this.data.area = e.detail.value[2]
-				this.data.address = this.data.province + this.data.city + this.data.area
+				this.data.address = this.data.province + this.data.city + this.data.area
+				this.page = 1
+				this.getShopData()
 			},
 			bindPickerChange3(e) {
-				this.thirdIndex = e.target.value;
-				this.thirdName = this.thirdArr[this.thirdIndex];
+				this.thirdIndex = e.target.value
+				this.managerId = this.thirdArr[this.thirdIndex].ID
+				this.page = 1
+				this.getShopData()
 			},
 			goAddress(e) {
 				console.log('地图导航');
 			},
 			call(e) {
-				console.log('打电话');
+				if(e.length != 0) {
+					uni.makePhoneCall({
+						phoneNumber:e
+					})
+				}
 			},
 			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
+				})
+			},
+			getShopData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'accompany/SuperAccounts/listCheckPage',
+					params = {
+						page: this.page,
+						limit: 10,
+						provinceCode: this.data.provinceCode,
+						cityCode: this.data.cityCode,
+						areaCode: this.data.areaCode,
+						manager: this.managerId,
+						shopName: this.searchValue,
+						lng: this.lng,
+						lat: this.lat,
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading()
+					var list = res.data
+					if (list.length < 10) {
+						this.noMoreShow = true
+					}
+					if (this.page == 1) {
+						this.shopData = list
+					} else {
+						this.shopData = this.shopData.concat(list)
+					}
+				})
 			}
-		}
+		},
+
+		onPullDownRefresh() {
+			this.page = 1
+			this.getShopData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		// onReachBottom() {
+		// 	this.page++;
+		// 	this.getShopData()
+		// },
 	}
 </script>
 
@@ -187,9 +275,7 @@
 	.shopList {
 		background-color: #F4F5F7;
 		padding: 0rpx 24rpx;
-		position: relative;
-		left: 0rpx;
-		top: 200rpx;
+		padding-top: 200rpx;
 	}
 
 	.shopBox {
@@ -264,4 +350,27 @@
 		line-height: 56rpx;
 
 	}
+
+	/* 空白页css */
+	.nodataBox {
+		text-align: center;
+	}
+
+	.nodataImg {
+		width: 400rpx;
+		padding-top: 300rpx;
+	}
+
+	.noTxt {
+		font-size: 30rpx;
+		color: #999999;
+		padding-top: 50rpx;
+	}
+
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
+	}
 </style>

operatingCompany/pages/upcoming/upcoming.vue

@@ -0,0 +1,118 @@
+<template>
+	<view class="content">
+
+		<view v-for="(item,index) in data" :key="index">
+			<view class="box">
+
+				<!-- name -->
+				<view class="nameView">
+					<view class="name" v-if="item.State == 1">您有一份待提交的作业</view>
+					<view class="type" v-if="item.State == 1" @click="goAppraise(item)">去提交</view>
+
+					<view class="name" v-if="item.State == 2">您有一份待作业的作业</view>
+					<view class="type" v-if="item.State == 2" @click="goAppraise(item)">去作业</view>
+
+					<view class="name" v-if="item.State == 3">您有一份待点评的作业</view>
+					<view class="type" v-if="item.State == 3" @click="goAppraise(item)">去点评</view>
+
+					<view class="name" v-if="item.State == 4">您有一份待回复的作业</view>
+					<view class="type" v-if="item.State == 4" @click="goAppraise(item)">去回复</view>
+
+					<image src="../../static/img/icon_arrow_go.png"
+						style="width: 12rpx; height: 22rpx; margin-left: 5rpx;"></image>
+				</view>
+
+				<!-- 修理厂名称 -->
+				<view class="secondView">
+					<view class="shopName">{{item.ShopName}}</view>
+					<view class="time">{{item.CheckTime}}</view>
+				</view>
+
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				data: [],
+			}
+		},
+		onShow() {
+			this.getData()
+		},
+		methods: {
+			goAppraise(v) {
+				console.log('评价');
+			},
+			getData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'accompany/SuperAccounts/listMyTodoPage',
+					params = {
+						name: this.searchValue
+					}
+				this.$http(url, params, 'GET').then(res => {
+					uni.hideLoading()
+					this.data = res.data.Items
+				})
+			}
+		},
+		onPullDownRefresh() {
+			this.getData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		}
+	}
+</script>
+
+<style>
+	.content {
+		background-color: #F4F5F7;
+		min-height: 100vh;
+		padding: 20rpx 24rpx;
+	}
+
+	.box {
+		margin: 20rpx 0rpx;
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+	}
+
+	.nameView {
+		padding: 32rpx 20rpx 15rpx 20rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+
+	.name {
+		font-size: 28rpx;
+		font-weight: bold;
+		color: #3C3C3C;
+		flex-grow: 1;
+	}
+
+	.type {
+		font-size: 28rpx;
+		color: #FF4F00;
+	}
+
+	.secondView {
+		padding: 15rpx 20rpx 30rpx 20rpx;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.shopName,
+	.time {
+		font-size: 24rpx;
+		color: #666666;
+	}
+</style>

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

@@ -2,10 +2,12 @@
   "pages": [
     "pages/index/index",
     "pages/team/myTeam",
-    "pages/manageStore/manageStore",
-    "pages/myStore/myStore",
+    "pages/team/manageStore",
+    "pages/teamStore/teamStore",
     "pages/accountSet/accountSet",
-    "pages/changePassWord/changePassWord"
+    "pages/changePassWord/changePassWord",
+    "pages/logIn/logIn",
+    "pages/upcoming/upcoming"
   ],
   "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/myStore/myStore.json

@@ -1,6 +0,0 @@
-{
-  "navigationBarTitleText": "我的门店",
-  "navigationBarBackgroundColor": "#FFFFFF",
-  "enablePullDownRefresh": false,
-  "usingComponents": {}
-}

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/manageStore/manageStore.wxss

@@ -33,10 +33,9 @@
 	width: 85%;
 }
 .shopContent {
-	position: relative;
-	top: 120rpx;
-	left: 0rpx;
+
 	padding: 0rpx 24rpx;
+	padding-top: 120rpx;
 	background-color: #F4F5F7;
 }
 .shopBox {

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

@@ -1,103 +1,114 @@
 
 .content.data-v-68f7969c {
-	background: #F4F5F7;
-	min-height: 100vh;
+		background: #F4F5F7;
+		min-height: 100vh;
 }
 .searchBoxBg.data-v-68f7969c {
-	position: fixed;
-	left: 0;
-	top: 0;
-	width: 100%;
-	background-color: #FFFFFF;
-	z-index: 99;
+		position: fixed;
+		left: 0;
+		top: 0;
+		width: 100%;
+		background-color: #FFFFFF;
+		z-index: 99;
 }
 .searchBox.data-v-68f7969c {
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: flex;
-	height: 72rpx;
-	margin: 24rpx;
-	background-color: #F4F5F7;
-	border-radius: 36rpx;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		height: 72rpx;
+		margin: 24rpx;
+		background-color: #F4F5F7;
+		border-radius: 36rpx;
 }
 .searchImg.data-v-68f7969c {
-	margin-top: 20rpx;
-	margin-left: 20rpx;
-	width: 32rpx;
-	height: 32rpx;
+		margin-top: 20rpx;
+		margin-left: 20rpx;
+		width: 32rpx;
+		height: 32rpx;
 }
 .searchInput.data-v-68f7969c {
-	height: 72rpx;
-	font-size: 28rpx;
-	padding-left: 16rpx;
-	width: 80%;
+		height: 72rpx;
+		font-size: 28rpx;
+		padding-left: 16rpx;
+		width: 80%;
 }
 .teamTop.data-v-68f7969c {
-	background-color: #F4F5F7;
-	height: 80rpx;
-	position: fixed;
-	left: 0;
-	top: 120rpx;
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: flex;
-	-webkit-box-align: center;
-	-webkit-align-items: center;
-	        align-items: center;
-	padding-left: 24rpx;
-	z-index: 99;
-	width: 100%;
+		background-color: #F4F5F7;
+		height: 80rpx;
+		position: fixed;
+		left: 0;
+		top: 120rpx;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-align: center;
+		-webkit-align-items: center;
+		        align-items: center;
+		padding-left: 24rpx;
+		z-index: 99;
+		width: 100%;
 }
 .iconTeam.data-v-68f7969c {
-	width: 32rpx;
-	height: 32rpx;
+		width: 32rpx;
+		height: 32rpx;
 }
 .teamCount.data-v-68f7969c {
-	font-size: 30rpx;
-	font-weight: bold;
-	color: #3C3C3C;
-	line-height: 32rpx;
-	padding-left: 8rpx;
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #3C3C3C;
+		line-height: 32rpx;
+		padding-left: 8rpx;
 }
 .teamContent.data-v-68f7969c {
-	background-color: #F4F5F7;
-	position: relative;
-	top: 200rpx;
-	left: 0rpx;
-	right: 0rpx;
-	padding: 0rpx 24rpx;
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: flex;
-	-webkit-box-orient: vertical;
-	-webkit-box-direction: normal;
-	-webkit-flex-direction: column;
-	        flex-direction: column;
+		background-color: #F4F5F7;
+		padding: 0rpx 24rpx;
+		padding-top: 200rpx;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-orient: vertical;
+		-webkit-box-direction: normal;
+		-webkit-flex-direction: column;
+		        flex-direction: column;
 }
 .team.data-v-68f7969c {
-	background-color: #FFFFFF;
-	margin: 10rpx 0rpx;
-	border-radius: 10rpx;
+		background-color: #FFFFFF;
+		margin: 10rpx 0rpx;
+		border-radius: 10rpx;
 }
 .customer.data-v-68f7969c {
-	padding: 30rpx 20rpx 16rpx 20rpx;
-	display: -webkit-box;
-	display: -webkit-flex;
-	display: flex;
-	-webkit-box-pack: justify;
-	-webkit-justify-content: space-between;
-	        justify-content: space-between;
+		padding: 30rpx 20rpx 16rpx 20rpx;
+		display: -webkit-box;
+		display: -webkit-flex;
+		display: flex;
+		-webkit-box-pack: justify;
+		-webkit-justify-content: space-between;
+		        justify-content: space-between;
 }
 .name.data-v-68f7969c {
-	font-size: 28rpx;
-	margin-right: 10rpx;
+		font-size: 28rpx;
+		margin-right: 10rpx;
 }
 .shopCount.data-v-68f7969c {
-	font-size: 28rpx;
+		font-size: 28rpx;
 }
 .informCount.data-v-68f7969c {
-	padding: 0rpx 20rpx 30rpx 20rpx;
-	color: #666666;
-	font-size: 24rpx;
+		padding: 0rpx 20rpx 30rpx 20rpx;
+		color: #666666;
+		font-size: 24rpx;
+}
+
+	/* 空白页css */
+.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;
 }
 

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

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "团队门店",
+  "navigationBarBackgroundColor": "#FFFFFF",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

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

@@ -52,9 +52,7 @@
 .shopList {
 	background-color: #F4F5F7;
 	padding: 0rpx 24rpx;
-	position: relative;
-	left: 0rpx;
-	top: 200rpx;
+	padding-top: 200rpx;
 }
 .shopBox {
 	background-color: #FFFFFF;
@@ -128,3 +126,23 @@
 	line-height: 56rpx;
 }
 
+/* 空白页css */
+.nodataBox {
+	text-align: center;
+}
+.nodataImg {
+	width: 400rpx;
+	padding-top: 300rpx;
+}
+.noTxt {
+	font-size: 30rpx;
+	color: #999999;
+	padding-top: 50rpx;
+}
+.noMore {
+	text-align: center;
+	line-height: 50rpx;
+	color: #999999;
+	font-size: 28rpx;
+}
+

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

@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "待办事项",
+  "navigationBarBackgroundColor": "#FFFFFF",
+  "enablePullDownRefresh": true,
+  "usingComponents": {}
+}

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

@@ -0,0 +1,50 @@
+
+.content {
+	background-color: #F4F5F7;
+	min-height: 100vh;
+	padding: 20rpx 24rpx;
+}
+.box {
+	margin: 20rpx 0rpx;
+	background-color: #FFFFFF;
+	border-radius: 10rpx;
+}
+.nameView {
+	padding: 32rpx 20rpx 15rpx 20rpx;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: justify;
+	-webkit-justify-content: space-between;
+	        justify-content: space-between;
+	-webkit-box-align: center;
+	-webkit-align-items: center;
+	        align-items: center;
+}
+.name {
+	font-size: 28rpx;
+	font-weight: bold;
+	color: #3C3C3C;
+	-webkit-box-flex: 1;
+	-webkit-flex-grow: 1;
+	        flex-grow: 1;
+}
+.type {
+	font-size: 28rpx;
+	color: #FF4F00;
+}
+.secondView {
+	padding: 15rpx 20rpx 30rpx 20rpx;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: justify;
+	-webkit-justify-content: space-between;
+	        justify-content: space-between;
+}
+.shopName,
+.time {
+	font-size: 24rpx;
+	color: #666666;
+}
+