Merge branch 'master' of https://git.banshouhui.com/lijundan/self-support

src/pages/index/index.vue

 <template>
-	<scroll-view scroll-y style="margin-bottom: 20rpx;height: 100vh;" @scrolltolower="reachBottom"
+	<scroll-view scroll-y style="height: 100vh;" @scrolltolower="reachBottom"
 		scroll-anchoring scroll-y="true" refresher-enabled="true" :refresher-triggered="triggered" :refresher-threshold="100"
 				refresher-background="#F4F5F7" @refresherpulling="triggered = true" @refresherrefresh="onRefresh"
 				@refresherrestore="onRestore" @refresherabort="onAbort" enable-back-to-top>
@@ -143,7 +143,8 @@
 			this.getOrderCount()
 		},
 		onShow() {
-			// 每次进入页面都刷新入驻状态
+			// 每次进入页面都刷新入驻状态
+			this.pageNumber = 0
 			if (this.vuex_token) {
 				this.initSettleInfo();
 			}
@@ -533,6 +534,7 @@
 			.order-item-view {
 				background-color: #F4F5F7;
 				border-radius: 12rpx;
+				margin-bottom: 20rpx;
 			}
 		}
 	}

src/pages/index/learn.vue

@@ -9,11 +9,11 @@
                 :current="current" @change="tabsChange" :is-scroll="false" swiperWidth="750"></u-tabs-swiper>
         </view>
         <swiper :current="swiperCurrent" @transition="transition" @animationfinish="animationfinish"
-            style="height: 755rpx;padding-top: 30rpx;">
+            style="height: 100%;padding-top: 30rpx;">
             <swiper-item class="swiper-item">
                 <scroll-view scroll-y style="height:796rpx;width:100%;" @scrolltolower="onreachBottom">
                     <view class="jf-currency-class">
-                        <view class="class1" @click="goToPrint">
+                        <view class="class1" style="position: relative;" @click="goToPrint">
                             <image class="jf-img" :src="rule.pic" mode=""></image>
                             <view class="right u-padding-top-10 u-padding-bottom-14 jf-right">
                                 <view class="u-font-32 font-bold u-margin-left-30 u-margin-top-30">充电桩交付规范</view>
@@ -776,7 +776,7 @@
     .notice {
         /* border: #808080 solid 2rpx; */
         width: 100%;
-        height: 400rpx;
+        height: 370rpx;
         margin-top: 36rpx;
         overflow: hidden;
         background-color: #ffffff;
@@ -867,8 +867,8 @@
     .jf-img {
         width: 160rpx;
         height: 200rpx;
-        position: fixed;
-        top: 20rpx;
+        position: absolute;
+        top: -45rpx;
         left: 30rpx;
     }
 

src/pages/order/detail.vue

@@ -23,7 +23,7 @@
 						<text>客户信息：</text>
 						<text>{{ order.contactName }}</text>
 					</view>
-					<u-image width="48rpx" height="48rpx" :src="phoneIcon" @click="phoneToCustomer(order.contactPhone)" ></u-image>
+					<u-image width="84rpx" height="56rpx" :src="phoneIcon" @click="phoneToCustomer(order.contactPhone)" ></u-image>
 				</view>
 				<view class="order-cell">
 					<text>联系方式：</text>
@@ -34,7 +34,7 @@
 						<u-icon name="map" size="28"></u-icon>
 						<text class="address-txt">{{ formatAddress }}</text>
 					</view>
-					<u-image width="48rpx" height="48rpx" :src="navigationIcon" @click="openLocation(order.contactAddress)"></u-image>
+					<u-image width="84rpx" height="56rpx" :src="navigationIcon" @click="openLocation(order.contactAddress)"></u-image>
 				</view>
 				<!-- <u-read-more ref="uReadMore" :show-height="40" :shadowStyle="{paddingTop: '0rpx',marginTop: '0rpx'}" close-text="查看更多" open-text="点击收起" toggle color="#2272FF" font-size="26"> -->
 				<view v-if="readMore" @click="readMore = false" class="read-more-toggle">
@@ -83,6 +83,7 @@
 							<view class="line-view-left">
 							<text>{{$u.timeFormat(record.operationDatetime, 'yyyy.mm.dd hh:MM:ss')}} </text>
 							</view>
+							<text v-show="record.operationType==='报备'"> {{record.orderRecordRemark}}</text>
 							<view class="line-view-right">
 								<text style="color: red;">{{record.overTime?'（超时）':''}}{{record.exception?'（异常）':''}}</text>
 							<text>{{record.operationType}}</text>
@@ -242,17 +243,17 @@
 			phoneIcon() {
 				//self-support/icon/dianhua-0@2x.png
 				if(this.isAllowDianhuaAndDaohang){
-					return process.uniEnv.qn_base_url + 'dianhua-1.png'
+					return process.uniEnv.qn_base_url + 'dianhua.png'
 				}else{
-					return process.uniEnv.qn_base_url + 'dianhua-0.png'
+					return process.uniEnv.qn_base_url + 'dianhua-d.png'
 				}
 			},
 			navigationIcon() {
 				//self-support/icon/daohang-0@2x.png
 				if(this.isAllowDianhuaAndDaohang){
-					return process.uniEnv.qn_base_url + 'daohang-1.png'
+					return process.uniEnv.qn_base_url + 'daohang.png'
 				}else{
-					return process.uniEnv.qn_base_url + 'daohang-0.png'
+					return process.uniEnv.qn_base_url + 'daohang-d.png'
 				}
 			},
 			centerButtonClass() {

src/pages/order/feedback.vue

@@ -62,7 +62,7 @@
 			</view>
 		</view>
 		<view class="bottom-view">
-			<button class="btn, bottom-btn" @click="submitForm" :loading="submiting" :disabled="disabledSubmit"><text class="button-text">确定</text></button>
+			<button class="btn, bottom-btn" @click="$u.throttle(submitForm, 500)" :loading="submiting" :disabled="disabledSubmit"><text class="button-text">确定</text></button>
 		</view>
 	</view>
 </template>
@@ -342,6 +342,7 @@ export default {
 			self.submiting = false;
 			if(res && res.code == 200) {
 				self.$u.route({
+					type: 'redirect',
 					url: 'pages/order/detail',
 					params: {
 						id: self.orderId

src/pages/order/search.vue

@@ -5,7 +5,7 @@
 			<u-search 
 				v-model="search.keyword"
 				bg-color="#FFFFFF"
-				placeholder="搜订单"
+				placeholder="搜索：工单号·用户姓名·手机号·地址"
 				search-icon-color="#999999"
 				color="#333333"
 				placeholder-color="#999999"
@@ -18,6 +18,7 @@
 					'font-weight': 500,
 					'color': '#2272FF'
 				}"
+				:focus="true"
 				@search="searchOrder"
 				@custom="searchOrder"
 				></u-search>
@@ -77,8 +78,12 @@
 			},
 			// 页面数据
 			getOrderList() {
+				let self = this;
+				if(!self.search.keyword) {
+					return false
+				}
+				
 				// 状态处理
-				var self = this;
 				self.search.pageNumber += 1
 				self.$u.api.listOrder(self.search).then((res) => {
 					if (res.code == 200) {