1.报告管理

operatingCompany/pages/reportManage/reportManage.vue

@@ -25,6 +25,14 @@
 
 			<!-- 条件筛选 -->
 			<view class="siftBg">
+				<!-- 日期选择 -->
+				<picker @change="bindChange" mode="date">
+					<view class="uni-input">{{data.value == null ? '日期筛选' : data.value}}
+						<image class="downArrow" src="../../static/img/icon_downArrow.png"></image>
+					</view>
+				</picker>
+
+				<!-- 省市区 选择 -->
 				<picker @change="bindChange" mode="region">
 					<view class="uni-input">{{data.address == null ? '区域筛选' : data.address}}
 						<image class="downArrow" src="../../static/img/icon_downArrow.png"></image>
@@ -40,6 +48,47 @@
 			</view>
 		</view>
 
+		<!-- 列表 -->
+		<view class="shopList">
+			<view v-for="(item,index) in shopData" :key="index">
+
+				<!-- shopBox -->
+				<view class="shopBox">
+					<view class="shopTop">
+
+						<view class="shopName">{{item.ShopName}}</view>
+
+						<!-- 订单状态 1 待提交 草稿 2 已提交 待作业 3 已作业 待点评 4 已评价 待回复,5 已回复 已完成 -->
+						<view class="type" v-if="item.State == 1" @click="goAppraise(item)">待提交</view>
+						<view class="type" v-if="item.State == 2" @click="goAppraise(item)">已提交</view>
+						<view class="type" v-if="item.State == 3" @click="goAppraise(item)">已作业</view>
+						<view class="type" v-if="item.State == 4" @click="goAppraise(item)">已评价</view>
+						<view class="type" v-if="item.State == 5" @click="goAppraise(item)">已回复</view>
+
+					</view>
+
+
+
+					<!-- 第2行 -->
+					<view class="bottomView">
+						<!-- 运营经理 -->
+						<view class="manager">{{item.ManagerName}} · {{item.CheckTime}}</view>
+						<!-- 评分 -->
+						<view class="score">{{item.ShopScore}}分</view>
+					</view>
+
+
+				</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>
@@ -49,13 +98,135 @@
 	export default {
 		data() {
 			return {
-				tabIndex: 0,
-				state:'',
+				tabIndex: 0,
+				status: '', //订单状态 1 待提交 草稿 2 已提交 待作业 3 已作业 待点评 4 已评价 待回复,5 已回复 已完成
+				searchValue: '',
+				data: {
+					provinceCode: '',
+					province: '',
+					cityCode: '',
+					city: '',
+					areaCode: '',
+					area: '',
+					address: null,
+				},
+				thirdIndex: null,
+				thirdArr: [],
+				managerId: '',
+				shopData: [],
+				page: 1,
+				noMoreShow: false,
+
 			}
 		},
+		onShow() {
+			this.getManager()
+			this.page = 1
+			this.getShopData()
+		},
 		methods: {
+			tabClick(num) {
+				this.tabIndex = num;
+				this.shopData = [];
+				this.noMoreShow = false
+				this.page = 1;
+				if (num == 0) {
+					this.status = ''
+				} else {
+					this.status = num;
+				}
+				this.getShopData()
+			},
+			searchDone(e) {
+				this.searchValue = e.target.value
+				this.page = 1
+				this.getShopData()
+			},
+			bindChange: function(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.page = 1
+				this.getShopData()
+			},
+			bindPickerChange3(e) {
+				this.thirdIndex = e.target.value
+				this.managerId = this.thirdArr[this.thirdIndex].ID
+				this.page = 1
+				this.getShopData()
+			},
+
+			getManager() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'accompany/SuperAccounts/queryManagerListByDept',
+					params = {
+						name: '',
+					}
+				this.$http(url, params, 'GET').then(res => {
+					this.thirdArr = res.data
+				})
+			},
+			getShopData() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				let url = 'accompany/SuperAccounts/listShopInfoByDeptCheckPage',
+					params = {
+						page: this.page,
+						limit: 20,
+						provinceCode: this.data.provinceCode,
+						cityCode: this.data.cityCode,
+						areaCode: this.data.areaCode,
+						manager: this.managerId,
+						shopName: this.searchValue,
+						starTime: '',
+						endTime: '',
+						state: this.status,
+
+					}
+				this.$http(url, params, 'GET').then(res => {
+					var list = res.data.Items
+
+					// 处理 undefined和null转为空白字符串
+					list.forEach((item, index) => {
+						for (const key in item) {
+							item[key] = this.$praseStrEmpty(item[key])
+						}
+					})
+
+					if (list.length < 20) {
+						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>
 
@@ -137,4 +308,76 @@
 		color: #FF4F00;
 		border-bottom: 4rpx solid #FF4F00;
 	}
+
+	.shopList {
+		background-color: #F4F5F7;
+		padding: 0rpx 24rpx;
+		padding-top: 290rpx;
+	}
+
+	.shopBox {
+		background-color: #FFFFFF;
+		border-radius: 10rpx;
+		margin: 20rpx 0rpx;
+
+	}
+
+	.shopTop {
+		display: flex;
+		padding: 30rpx 20rpx 10rpx 20rpx;
+		justify-content: space-between;
+
+	}
+
+	.shopName {
+		font-size: 28rpx;
+		color: #3C3C3C;
+		font-weight: bold;
+		width: 500rpx;
+	}
+
+	.type {
+		font-size: 28rpx;
+		color: #FF4F00;
+		margin-left: 10rpx;
+	}
+
+	.bottomView {
+		padding: 28rpx 20rpx;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.manager {
+		font-size: 24rpx;
+		color: #666666;
+	}
+
+	.score {
+		font-size: 28rpx;
+		color: #B98B5D;
+	}
+
+	/* 空白页css */
+	.nodataBox {
+		text-align: center;
+	}
+
+	.nodataImg {
+		width: 400rpx;
+		padding-top: 290rpx;
+	}
+
+	.noTxt {
+		font-size: 30rpx;
+		color: #999999;
+		padding-top: 50rpx;
+	}
+
+	.noMore {
+		text-align: center;
+		line-height: 50rpx;
+		color: #999999;
+		font-size: 28rpx;
+	}
 </style>

operatingCompany/pages/teamStore/teamStore.vue

@@ -75,7 +75,9 @@
 		<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>
+		
+		
 	</view>
 </template>
 

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

@@ -9,7 +9,9 @@
     "pages/upcoming/upcoming",
     "pages/logIn/logIn",
     "pages/entryReport/entryReport",
-    "pages/reportManage/reportManage"
+    "pages/reportManage/reportManage",
+    "pages/shop/shopIndex/index",
+    "pages/entryReport/entered"
   ],
   "subPackages": [],
   "window": {

operatingCompany/unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -8211,7 +8211,7 @@ var http = function http()
 
         uni.clearStorageSync();
         uni.navigateTo({
-          url: '../login/login' });
+          url: '../logIn/logIn' });
 
       } else if (res.data.code == 0) {
         // 正常

operatingCompany/unpackage/dist/dev/mp-weixin/pages/entryReport/entered.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "录入报告",
+  "navigationBarBackgroundColor": "#FFFFFF",
+  "usingComponents": {}
+}

operatingCompany/unpackage/dist/dev/mp-weixin/pages/entryReport/entered.wxml

@@ -0,0 +1 @@
+<view class="content data-v-5e330ac5"></view>

operatingCompany/unpackage/dist/dev/mp-weixin/pages/entryReport/entered.wxss

@@ -0,0 +1,14 @@
+
+.content.data-v-5e330ac5{
+	 background: #F4F5F7;
+	 min-height: 100vh;
+}
+
+
+
+
+
+
+
+
+

operatingCompany/unpackage/dist/dev/mp-weixin/pages/entryReport/entryReport.js

@@ -226,8 +226,9 @@ var _default =
       firstName: '',
       firstArr: ['不限', '1-15天', '15-30天', '30天以上'],
       isHave: false,
-      shopData: [1, 2, 3, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2] };
-
+      shopData: [1, 2, 3, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2],
+      page: 1,
+      noMoreShow: false };
 
   },
   onShow: function onShow() {
@@ -239,23 +240,32 @@ var _default =
         that.lng = res.longitude;
         that.lat = res.latitude;
 
-        // that.getShopData()
+        that.page = 1;
+        //that.getShopData()
       } });
 
   },
   methods: {
+    goEntered: function goEntered() {
+      uni.navigateTo({
+        url: 'entered' });
+
+    },
     searchDone: function searchDone() {
       this.searchValue = e.target.value;
+      this.page = 1;
       // this.getShopData()
     },
     bindPickerChange: function bindPickerChange(e) {
       this.firstIndex = Number(e.target.value);
       this.firstName = this.firstArr[this.firstIndex];
+      this.page = 1;
       // this.getShopData()
     },
 
     changeHave: function changeHave() {
       this.isHave = !this.isHave;
+      this.page = 1;
       // this.getShopData()
     },
 
@@ -266,22 +276,46 @@ var _default =
 
       var url = 'accompany/SuperAccounts/queryShopListByManagerID',
       params = {
+        page: this.page,
+        limit: 20,
         managerID: this.managerID,
         shopName: this.searchValue,
         lng: this.lng,
         lat: this.lat };
 
       this.$http(url, params, 'GET').then(function (res) {
-        _this.shopData = res.data;
+        var list = res.data.Items;
+
+        // 处理 undefined和null转为空白字符串
+        list.forEach(function (item, index) {
+          for (var key in item) {
+            item[key] = _this.$praseStrEmpty(item[key]);
+          }
+        });
+
+        if (list.length < 20) {
+          _this.noMoreShow = true;
+        }
+        if (_this.page == 1) {
+          _this.shopData = list;
+        } else {
+          _this.shopData = _this.shopData.concat(list);
+        }
 
       });
     } },
 
+  // 下拉刷新 上拉加载更多
+
   onPullDownRefresh: function onPullDownRefresh() {
     this.getShopData();
     setTimeout(function () {
       uni.stopPullDownRefresh();
     }, 1000);
+  },
+  onReachBottom: function onReachBottom() {
+    this.page++;
+    this.getShopData();
   } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

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

@@ -227,7 +227,7 @@ var _default =
       });
 
     },
-    logIn: function logIn() {
+    logIn: function logIn() {var _this2 = this;
 
       uni.showLoading({
         title: '登录中' });
@@ -252,9 +252,15 @@ var _default =
 
           } });
 
+        if (_this2.roleType == 1) {
+          uni.navigateTo({
+            url: '../index/index' });
 
-        uni.navigateTo({
-          url: '../index/index' });
+        } else {
+          uni.navigateTo({
+            url: '../shop/shopIndex/index' });
+
+        }
 
       });
     },

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

@@ -68,4 +68,71 @@
 	color: #FF4F00;
 	border-bottom: 4rpx solid #FF4F00;
 }
+.shopList {
+	background-color: #F4F5F7;
+	padding: 0rpx 24rpx;
+	padding-top: 290rpx;
+}
+.shopBox {
+	background-color: #FFFFFF;
+	border-radius: 10rpx;
+	margin: 20rpx 0rpx;
+}
+.shopTop {
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	padding: 30rpx 20rpx 10rpx 20rpx;
+	-webkit-box-pack: justify;
+	-webkit-justify-content: space-between;
+	        justify-content: space-between;
+}
+.shopName {
+	font-size: 28rpx;
+	color: #3C3C3C;
+	font-weight: bold;
+	width: 500rpx;
+}
+.type {
+	font-size: 28rpx;
+	color: #FF4F00;
+	margin-left: 10rpx;
+}
+.bottomView {
+	padding: 28rpx 20rpx;
+	display: -webkit-box;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-box-pack: justify;
+	-webkit-justify-content: space-between;
+	        justify-content: space-between;
+}
+.manager {
+	font-size: 24rpx;
+	color: #666666;
+}
+.score {
+	font-size: 28rpx;
+	color: #B98B5D;
+}
+
+/* 空白页css */
+.nodataBox {
+	text-align: center;
+}
+.nodataImg {
+	width: 400rpx;
+	padding-top: 290rpx;
+}
+.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/shop/shopIndex/index.json

@@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "运营陪伴",
+  "navigationStyle": "custom",
+  "usingComponents": {}
+}

operatingCompany/unpackage/dist/dev/mp-weixin/pages/shop/shopIndex/index.wxml

@@ -0,0 +1 @@
+<view class="content data-v-5353145f"><view class="data-v-5353145f"><view class="status_bar data-v-5353145f" style="{{'height:'+(iStatusBarHeight+'px')+';'}}"></view><view class="nav data-v-5353145f">运营陪伴</view></view><view class="data-v-5353145f">店主运营陪伴主页</view></view>

operatingCompany/unpackage/dist/dev/mp-weixin/pages/shop/shopIndex/index.wxss

@@ -0,0 +1,17 @@
+
+.content.data-v-5353145f{
+	 background: #F4F5F7;
+	 min-height: 100vh;
+}
+.status_bar.data-v-5353145f{
+	background: #FFFFFF;
+}
+.nav.data-v-5353145f{
+	width: 100vw;
+	height: 44px;
+	background: #FFFFFF;
+	text-align: center;
+	line-height: 44px;
+	font-size: 34rpx;
+}
+

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

@@ -211,6 +211,8 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
 var _default =
 {
   data: function data() {
@@ -339,6 +341,7 @@ var _default =
         } else {
           _this2.shopData = _this2.shopData.concat(list);
         }
+
       });
     } },
 

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

@@ -172,14 +172,19 @@ __webpack_require__.r(__webpack_exports__);
 //
 //
 //
+//
+//
 var _default =
 {
   data: function data() {
     return {
-      data: [] };
+      shopData: [],
+      page: 1,
+      noMoreShow: false };
 
   },
   onShow: function onShow() {
+    this.page = 1;
     this.getData();
   },
   methods: {
@@ -192,19 +197,44 @@ var _default =
 
       var url = 'accompany/SuperAccounts/listMyTodoPage',
       params = {
+        page: this.page,
+        limit: 20,
         name: this.searchValue };
 
       this.$http(url, params, 'GET').then(function (res) {
-        uni.hideLoading();
-        _this.data = res.data.Items;
+
+        var list = res.data.Items;
+
+        // 处理 undefined和null转为空白字符串
+        list.forEach(function (item, index) {
+          for (var key in item) {
+            item[key] = _this.$praseStrEmpty(item[key]);
+          }
+        });
+
+        if (list.length < 20) {
+          _this.noMoreShow = true;
+        }
+        if (_this.page == 1) {
+          _this.shopData = list;
+        } else {
+          _this.shopData = _this.shopData.concat(list);
+        }
+
       });
     } },
 
+  // 下拉刷新 上拉加载更多
+
   onPullDownRefresh: function onPullDownRefresh() {
     this.getData();
     setTimeout(function () {
       uni.stopPullDownRefresh();
     }, 1000);
+  },
+  onReachBottom: function onReachBottom() {
+    this.page++;
+    this.getData();
   } };exports.default = _default;
 /* WEBPACK VAR INJECTION */}.call(this, __webpack_require__(/*! ./node_modules/@dcloudio/uni-mp-weixin/dist/index.js */ 1)["default"]))
 

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

@@ -61,4 +61,10 @@
 	color: #999999;
 	padding-top: 50rpx;
 }
+.noMore {
+	text-align: center;
+	line-height: 50rpx;
+	color: #999999;
+	font-size: 28rpx;
+}