1.店主首页

operatingCompany/components/timeChose/timeChose.vue

@@ -342,8 +342,8 @@
 			},
 			reset(){
 				var obj = {
-					startTime: 0,
-					endTime: 0,
+					startTime: '',
+					endTime: '',
 					isclose: false
 				};
 				this.$emit('returnDate', obj);

operatingCompany/pages.json

@@ -1,20 +1,7 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
-		
-		// {
-		// 	"path": "pages/shop/shopIndex/index",
-		// 	"style": {
-		// 		"navigationBarTitleText": "运营陪伴",
-		// 		"navigationStyle": "custom"
-		// 		/* "navigationBarBackgroundColor": "#FFFFFF",
-		// 		"enablePullDownRefresh": true, */
-		// 		/* "app-plus":{
-		// 			"titleNView":{
-		// 				"autoBackButton":false
-		// 			}
-		// 		} */
-		// 	}
-		// },
+
+
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -104,9 +91,9 @@
 			"path": "pages/shop/shopIndex/index",
 			"style": {
 				"navigationBarTitleText": "运营陪伴",
-				"navigationStyle": "custom"
-				/* "navigationBarBackgroundColor": "#FFFFFF",
-				"enablePullDownRefresh": true, */
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
+				/* "navigationBarBackgroundColor": "#FFFFFF",*/
 				/* "app-plus":{
 					"titleNView":{
 						"autoBackButton":false
@@ -120,7 +107,7 @@
 				/* "navigationBarTitleText": "录入报告",
 				"navigationBarBackgroundColor": "#FFFFFF" */
 				/* "enablePullDownRefresh": true */
-				 "navigationStyle": "custom"
+				"navigationStyle": "custom"
 			}
 		},
 		{
@@ -149,7 +136,7 @@
 		{
 			"path": "pages/reportManage/reportDetail",
 			"style": {
-				 "navigationStyle": "custom"
+				"navigationStyle": "custom"
 			}
 		}
 

operatingCompany/pages/entryReport/historyReport.vue

@@ -84,7 +84,8 @@
 			<view class="noTxt">暂无数据</view>
 		</view>
 
-		<timeChose ref="timepop" @returnDate="returnDate" :isShow="timeShow"></timeChose>
+		<timeChose ref="timepop" @returnDate="returnDate" :isShow="timeShow"></timeChose>
+		
 	</view>
 </template>
 
@@ -202,7 +203,7 @@
 						starTime: this.starTime,
 						endTime: this.endTime,
 						state: this.status,
-						shopId:this.shopId,
+						shopID:this.shopId,
 
 					}
 				this.$http(url, params, 'GET').then(res => {