1.团队门店，对接口

operatingCompany/pages/manageStore/manageStore.vue

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

operatingCompany/pages/team/myTeam.vue

@@ -168,11 +168,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;
 	}

operatingCompany/pages/teamStore/teamStore.vue

@@ -17,7 +17,8 @@
 					</view>
 				</picker>
 
-				<picker value="thirdIndex" mode="selector" range-key='name' :range="thirdArr" @change="bindPickerChange3">
+				<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>
@@ -33,29 +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"
-							@click="goAddress(item.address)">
+							@click="goAddress(item.lng, item.lat)">
 						</image>
-						<image class="tubiao" src="../../static/img/icon_phone_def.png" @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> · 开业时间 · 联系人：}
+					<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 +70,8 @@
 			</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>
@@ -90,46 +95,62 @@
 					address: null,
 				},
 				thirdIndex: null,
-				thirdArr: [],
-				managerId:'',
+				thirdArr: [],
+				managerId: '',
 				shopData: [],
-
+				page: 1,
+				noMoreShow: false,
+				lng: '',
+				lat: '',
 			}
 		},
 		onLoad() {
-			
-			this.getManager()
+			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) {
-				if(e.target.value == NaN) {
-					this.thirdIndex = 0;
-				}
-				else {
-					this.thirdIndex = e.target.value;
-				}
-				
-				this.managerId = this.thirdArr[this.thirdIndex].ID;
+			bindPickerChange3(e) {
+				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('历史记录');
@@ -147,15 +168,49 @@
 					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.getData()
-		// 	setTimeout(function() {
-		// 		uni.stopPullDownRefresh();
-		// 	}, 1000);
-		// }
+		onPullDownRefresh() {
+			this.page = 1
+			this.getShopData()
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 1000);
+		},
+		// onReachBottom() {
+		// 	this.page++;
+		// 	this.getShopData()
+		// },
 	}
 </script>
 
@@ -220,9 +275,7 @@
 	.shopList {
 		background-color: #F4F5F7;
 		padding: 0rpx 24rpx;
-		position: relative;
-		left: 0rpx;
-		top: 200rpx;
+		padding-top: 200rpx;
 	}
 
 	.shopBox {
@@ -313,4 +366,11 @@
 		color: #999999;
 		padding-top: 50rpx;
 	}
+
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
+	}
 </style>

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

@@ -3,7 +3,7 @@
     "pages/index/index",
     "pages/team/myTeam",
     "pages/manageStore/manageStore",
-    "pages/myStore/myStore",
+    "pages/teamStore/teamStore",
     "pages/accountSet/accountSet",
     "pages/changePassWord/changePassWord",
     "pages/logIn/logIn"
@@ -15,6 +15,5 @@
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
   },
-  "usingComponents": {},
-  "sitemapLocation": "sitemap.json"
+  "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/myStore/myStore.json

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

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

@@ -174,6 +174,7 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
 var _default =
 {
   data: function data() {
@@ -189,7 +190,6 @@ var _default =
   methods: {
     searchDone: function searchDone(e) {
       this.searchValue = e.target.value;
-      console.log(this.searchValue);
       this.getData();
     },
     goRouter: function goRouter(url) {
@@ -207,14 +207,12 @@ var _default =
 
       this.$http(url, params, 'GET').then(function (res) {
         uni.hideLoading();
-        console.log(res);
         _this.count = Number(res.data.count);
         _this.data = res.data.list;
       });
     } },
 
   onPullDownRefresh: function onPullDownRefresh() {
-    console.log('safjslfj');
     this.getData();
     setTimeout(function () {
       uni.stopPullDownRefresh();

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

@@ -1,115 +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;
+		text-align: center;
 }
 .nodataImg.data-v-68f7969c {
-	width: 400rpx;
-	padding-top: 300rpx;
+		width: 400rpx;
+		padding-top: 300rpx;
 }
 .noTxt.data-v-68f7969c {
-	font-size: 30rpx;
-	color: #999999;
-	padding-top: 50rpx;
+		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;
+}
+