Merge branch 'master' of http://101.37.147.115:3000/mz666/apply-assistant-v3

pages/home/index.vue

@@ -8,7 +8,7 @@
 			<!-- 列表区 -->
 			<!-- <div @click="showPop = true"> 1123 </div> -->
 			<!-- `calc(${navInfo.windowHeight}px - ${navInfo.navigationBarHeight + navInfo.statusBarHeight}px)` -->
-			<scroll-view class="m-list" id="listBox" :scroll-into-view="scrollTo" :style="{ height: `calc(100vh - ${tabbarHeight}px)` }" :scroll-y="true" @scrolltolower="reachBottom" @scroll="checkScroll">
+			<scroll-view class="m-list" id="listBox" :scroll-into-view="scrollTo" :style="{ height: `calc(100vh - ${tabbarHeight}px)` }" :scroll-y="true" refresher-background="#ededed" :refresher-enabled="true" :refresher-triggered="isTrigger" @refresherrefresh="refreshJobList" @scrolltolower="reachBottom" @scroll="checkScroll">
 				<div class="g_h_all" hover-class="none" hover-stop-propagation="false">
 					<div class="g_position_rela g_flex_row_between flex_center g_ml_10 g_mr_10">
 						<div class="the_city g_flex_column_center" style hover-class="thover" @click="goCity">
@@ -132,7 +132,7 @@
 				</div>
 			</u-popup>
 		</div>
-	<g-tabbar class="tabbar"></g-tabbar>
+		<g-tabbar class="tabbar"></g-tabbar>
 	</div>
 </template>
 
@@ -343,6 +343,7 @@ export default {
 				],
 				active: 2,
 			},
+			isTrigger: false,
 		};
 	},
 	watch: {
@@ -435,6 +436,12 @@ export default {
 				}
 			}
 		},
+		refreshJobList() {
+			let that = this;
+			this.query.page = 1;
+			this.isTrigger = true;
+			this.getList();
+		},
 		getList($type = "init") {
 			let that = this;
 			this.loading = true;
@@ -453,6 +460,7 @@ export default {
 					cityName: that.selectedCity == "全国" ? "" : that.selectedCity,
 				},
 				(res) => {
+					that.isTrigger = false;
 					that.computeCode = 1;
 					console.log("job_list __________________________", (new Date().getTime() - time) / 1000);
 					// res.recordCount  = 0;

pages/home/order.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="p-bind-inedx g_w_all g_h_all g_bg_f_5 g_kuaishou">
+	<view class="p-bind-inedx g_w_all g_bg_page g_kuaishou">
 		<!-- 搜索栏 -->
 		<view class="m-top">
 			<view class="m-search g_p_10 g_pb_0 g_position_rela g_p_12 g_bg_f_5">

pages/workBench/index.vue

@@ -12,7 +12,7 @@
 
 		<view class="">
 			<!-- #ifdef APP-PLUS || H5 || MP-KUAISHOU || MP-WEIXIN -->
-			<view class="" style="height: calc(58px + 40px)"></view>
+			<view class="" style="height: calc(58px + 48px)"></view>
 			<!-- #endif -->
 			<view class="">
 				<view class="m-box-fixed" :style="{ top: 0 }" v-if="isLogin">

root/detail/apply.vue

@@ -88,7 +88,7 @@
 							<view class="g_flex_column_center g_text_r">{{ orderDetail.tel ? orderDetail.tel : "-" }}</view>
 						</view>
 					</view>
-					<view class="g_flex_row_start">
+					<view class="g_flex_row_start g_pb_6">
 						<div v-if="orderDetail.idCardImageUrl" style="margin-right: 8px">
 							<g-panel-image :url="orderDetail.idCardImageUrl" radius="8" size="152" @clickItem="handleClickIDcard(orderDetail.idCardImageUrl)" />
 						</div>