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

operatingCompany/main.js

@@ -34,3 +34,4 @@ Vue.prototype.$praseStrEmpty = function(str) {
     }
     return str;
 }
+

operatingCompany/pages.json

@@ -109,7 +109,8 @@
 			}
 		}
 		
-	],
+	    
+    ],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",

operatingCompany/pages/entryReport/entryReport.vue

@@ -133,7 +133,7 @@
 					url:'entered?shopId='+item.shopId+'&ShopName='+item.ShopName
 				})
 			},
-			searchDone() {
+			searchDone(e) {
 				this.searchValue = e.target.value;
 				this.page = 1
 				this.getShopData()
@@ -174,6 +174,9 @@
 				if(this.firstIndex == 0){
 					maxTime = ''
 				}
+				else {
+					maxTime = Number(this.firstIndex)
+				}
 				var checkCount = ''
 				if(this.isHave == true){
 					checkCount = 1

operatingCompany/pages/reportManage/reportManage.vue

@@ -26,7 +26,7 @@
 			<!-- 条件筛选 -->
 			<view class="siftBg">
 				<!-- 日期选择 -->
-				<picker @change="bindChange" mode="date">
+				<picker @change="timeChose" mode="date">
 					<view class="uni-input">{{data.value == null ? '日期筛选' : data.value}}
 						<image class="downArrow" src="../../static/img/icon_downArrow.png"></image>
 					</view>
@@ -74,7 +74,7 @@
 						<!-- 运营经理 -->
 						<view class="manager">{{item.ManagerName}} · {{item.CheckTime}}</view>
 						<!-- 评分 -->
-						<view class="score">{{item.ShopScore}}分</view>
+						<view class="score" v-if="item.ShopScore">{{item.ShopScore}}分</view>
 					</view>
 
 
@@ -140,6 +140,9 @@
 				this.searchValue = e.target.value
 				this.page = 1
 				this.getShopData()
+			},
+			timeChose(e){
+				
 			},
 			bindChange: function(e) {
 				this.data.provinceCode = e.detail.code[0]

operatingCompany/pages/team/manageStore.vue

@@ -78,7 +78,7 @@
 			})
 		},
 		methods: {
-			searchDone() {
+			searchDone(e) {
 				this.searchValue = e.target.value;
 				this.page = 1
 				this.getShopData()

operatingCompany/pages/teamStore/teamStore.vue

@@ -53,7 +53,7 @@
 					<!-- 详细地址 -->
 					<view class="addressView">
 						<view class="address">{{item.Address}}</view>
-						<view class="distance">{{item.distance}}km</view>
+						<view class="distance" v-if="item.distance != 0.00">{{item.distance}}km</view>
 					</view>
 
 					<!-- 运营经理 -->