1.待办事项

operatingCompany/pages.json

@@ -17,7 +17,7 @@
 			}
 		},
 	    {
-	        "path" : "pages/manageStore/manageStore",
+	        "path" : "pages/team/manageStore",
 	        "style" :                                                                                    
 	        {
 	            "navigationBarTitleText": "管理门店",
@@ -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>

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,8 +154,8 @@
 	}
 
 	.shopContent {
-		
-		padding: 0rpx 24rpx;
+
+		padding: 0rpx 24rpx;
 		padding-top: 120rpx;
 		background-color: #F4F5F7;
 
@@ -131,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>
 
@@ -60,9 +59,9 @@
 				this.searchValue = e.target.value;
 				this.getData()
 			},
-			goRouter(url) {
+			goRouter(v) {
 				uni.navigateTo({
-					url: url
+					url: 'manageStore?managerID=' + v.ID
 				})
 			},
 			getData() {

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,11 +2,12 @@
   "pages": [
     "pages/index/index",
     "pages/team/myTeam",
-    "pages/manageStore/manageStore",
+    "pages/team/manageStore",
     "pages/teamStore/teamStore",
     "pages/accountSet/accountSet",
     "pages/changePassWord/changePassWord",
-    "pages/logIn/logIn"
+    "pages/logIn/logIn",
+    "pages/upcoming/upcoming"
   ],
   "subPackages": [],
   "window": {
@@ -15,5 +16,6 @@
     "navigationBarBackgroundColor": "#F8F8F8",
     "backgroundColor": "#F8F8F8"
   },
-  "usingComponents": {}
+  "usingComponents": {},
+  "sitemapLocation": "sitemap.json"
 }

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

@@ -33,7 +33,7 @@
 	width: 85%;
 }
 .shopContent {
-	
+
 	padding: 0rpx 24rpx;
 	padding-top: 120rpx;
 	background-color: #F4F5F7;

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

@@ -174,7 +174,6 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
-//
 var _default =
 {
   data: function data() {
@@ -192,9 +191,9 @@ var _default =
       this.searchValue = e.target.value;
       this.getData();
     },
-    goRouter: function goRouter(url) {
+    goRouter: function goRouter(v) {
       uni.navigateTo({
-        url: url });
+        url: 'manageStore?managerID=' + v.ID });
 
     },
     getData: function getData() {var _this = this;

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;
+}
+