Merge remote-tracking branch 'origin/master'

.env.dev.js

-const UNI_APP = {
-	ucenterUrl: {
-		apiUrl: 'http://rest-u.yunya.com', //php端域名请求头
-		xueUrl: 'http://xue.yunya.com', //学院 
-		// banshou: 'https://m.banshou.com', //扳手app
-	},
-	systemUrl: {
-		apiUrl: 'http://192.168.1.22', //java端域名请求头
-		// apiUrl: 'http://apidoc.banshouhui.com:3000/mock/31', // mock端域名请求头
-	},
+const UNI_APP = {
+	ucenterUrl: {
+		apiUrl: 'http://rest-u.yunya.com', //php端域名请求头
+		xueUrl: 'http://xue.yunya.com', //学院 
+		// banshou: 'https://m.banshou.com', //扳手app
+	},
+	systemUrl: {
+		apiUrl: 'http://192.168.1.22', //java端域名请求头
+		// apiUrl: 'http://apidoc.banshouhui.com:3000/mock/31', // mock端域名请求头
+	},
 	qn_base_url: 'https://qn-static.banshouhui.com/self-support/',
-	qn_asset_url: 'http://deudn.c.pp.cc/'
-}
-module.exports = UNI_APP;
+	qn_asset_url: 'http://deudn.c.pp.cc/',
+}
+module.exports = UNI_APP;

src/components/appoint/appoint-time.vue

@@ -302,6 +302,10 @@
 			/deep/ button[plain] {
 				border: none;
 			}
+			button[disabled]:not([type]) {
+			        background: #d1d4d4;
+			        color: #ffffff;
+			}
 		}
 	}
 </style>

src/components/order/index.vue

@@ -248,7 +248,6 @@
 				this.$emit('click')
 			},
 			handleChange(timestamp) {
-				console.log(timestamp)
 				if (this.timeout) this.$refs['order-count-down'].seconds += 2
 				if (timestamp == 0 && !this.timeout) {
 					setTimeout(()=> {

src/components/order/noOrder.vue

@@ -36,7 +36,7 @@
 		.no-order-image {
 			width: 374rpx;
 			height: 218rpx;
-			margin-top: 60rpx;
+			margin-top: 50rpx;
 			margin-bottom: 20rpx;
 		}
 	}

src/components/tabBarList/index.vue

@@ -32,11 +32,12 @@
 
 <style lang="scss" scoped>
 	.content {
-		height: 100vh;
+		// height: 100vh;
 		background-color: #f4f5f7;
 		padding: 0rpx 30rpx 0 30rpx;
-		overflow-y: auto;
+		// overflow-y: auto;
 		&.fixed {
+			height: 100vh;
 			display: flex;
 			flex-direction: column;
 		}

src/pages/index/index.vue

 <template>
-	<TabBarPage title="充电桩自营平台">
+	<scroll-view scroll-y style="margin-bottom: 20rpx;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">
+		<TabBarPage title="充电桩自营平台">
 		<image class="banner-image" :src="bannerImage"></image>
 
 		<view class="msg-view">
@@ -41,15 +45,15 @@
 						<NoOrder />
 					</view>
 					<view v-else class="order-item-view">
-						<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="reachBottom"
-							scroll-anchoring>
+						<!-- <scroll-view scroll-y style="margin-bottom: 20rpx;" @scrolltolower="reachBottom"
+							scroll-anchoring> -->
 							<view v-for="(item, index) in orderList" :key="index">
 								<OrderCell :orderData="item" type="waitAccept" :location="location"
 									@click="handleClick(item.orderId)" @action="handleAction(item.orderId)">
 								</OrderCell>
 							</view>
 							<u-loadmore :status="currentLoadStatus" bgColor="#F4F5F7"></u-loadmore>
-						</scroll-view>
+						<!-- </scroll-view> -->
 					</view>
 
 				</template>
@@ -62,7 +66,8 @@
 			<view class="bottom-text">我也是有底线哒</view>
 			<view class="bottom-line-view"></view>
 		</view>
-	</TabBarPage>
+	</TabBarPage>
+	</scroll-view>
 </template>
 
 <script>
@@ -95,7 +100,9 @@
 					token: "",
 					pageNumber: 0,
 					pageSize: 100,
-				},
+				},
+				triggered: false,
+				_freshing: false,
 			};
 		},
 		watch: {
@@ -131,7 +138,8 @@
 				return process.uniEnv.qn_base_url + 'weiruzhu.png'
 			},
 		},
-		onLoad() {
+		onLoad() {
+			this._freshing = false;
 			this.getOrderCount()
 		},
 		onShow() {
@@ -140,12 +148,20 @@
 				this.initSettleInfo();
 			}
 		},
-		onPullDownRefresh() {
-			console.log('------下拉刷新------')
-			// 下拉刷洗
-			this.initSettleInfo()
-		},
-
+		// onPullDownRefresh() {
+		// 	console.log('------下拉刷新------')
+		// 	// 下拉刷洗
+		// 	this.initSettleInfo()
+		// },
+		// onReachBottom() {
+		// 	console.log('----------底部-------------', this.currentLoadStatus)
+		// 	if (this.currentLoadStatus != 'loadmore') return
+		// 	this.currentLoadStatus == 'loading'
+		// 	this.loadOrderList()
+		// },
+		// onPageScroll(obj) {
+		// 	console.log('---------scroll---------', obj)
+		// },
 		methods: {
 			handleClick(orderId) { // 点击了cell
 				console.log('点击了cell')
@@ -173,11 +189,11 @@
 					}
 				};
 				await app.getBaseInfo(self, callBack);
-
-				this.orderList = []
-				this.search.pageNumber = 0
+
 				// 加载消息列表
 				self.loadMessageList();
+				self.search.pageNumber = 0
+				self.loadedOrder = false
 				self.loadOrderList();
 			},
 			loadMessageList() {
@@ -204,6 +220,8 @@
 				self.$u.api.listByRecommendOrder(self.search).then((res) => {
 					uni.stopPullDownRefresh() // 结束下拉刷新
 					self.loadedOrder = true
+					self.triggered = false;
+					self._freshing = false;
 					/*↓↓↓↓↓↓↓↓↓↓测试数据↓↓↓↓↓↓↓↓↓↓*/
 					// if (res.data.list) {
 					// 	if (res.data.list.length == 0 && res.data.total > 0) {
@@ -238,7 +256,10 @@
 					// }
 					/*↑↑↑↑↑↑↑↑↑↑测试数据↑↑↑↑↑↑↑↑↑↑↑↑↑*/
 					if (res.code == 200) {
-						if (res.data && res.data.list && res.data.list.length > 0) {
+						if (res.data && res.data.list && res.data.list.length > 0) {
+							if (self.search.pageNumber == 1) {
+								self.orderList = []
+							}
 							self.orderList.push(...res.data.list);
 							self.currentLoadStatus = res.data.total > self.orderList.length ? 'loadmore' : 'nomore'
 
@@ -251,10 +272,26 @@
 			onRestore() {
 				this.triggered = "restore";
 			},
-			reachBottom() {
+			reachBottom() {
+				console.log(this.currentLoadStatus)
 				if (this.currentLoadStatus != 'loadmore') return
 				this.currentLoadStatus == 'loading'
 				this.loadOrderList()
+			},
+			onPulling(e) {
+				console.log("onpulling", e);
+			},
+			onRefresh() {
+				if (this._freshing) return;
+				this._freshing = true;
+				this.initSettleInfo()
+			},
+			onRestore() {
+				this.triggered = 'restore'; // 需要重置
+				console.log("onRestore");
+			},
+			onAbort() {
+				console.log("onAbort");
 			},
 			// clickSwiper(index) {},
 			handleScroll() {
@@ -330,7 +367,7 @@
 	.banner-image {
 		width: 730rpx;
 		height: 280rpx;
-		margin-left: -14rpx;
+		margin-left: -16rpx;
 	}
 
 	.msg-view {
@@ -455,7 +492,7 @@
 
 			.order-item-view {
 				background-color: #F4F5F7;
-				border-radius: 12rpx;
+				border-radius: 12rpx;
 			}
 		}
 	}

src/pages/order/detail.vue

@@ -44,21 +44,23 @@
 					<view v-else class="order-item-more">
 						<view class="line-view"></view>
 						<view class="order-cell between-cell">
-							<text>品牌：</text>
+							<text class="cell-title">品牌：</text>
 							<text>{{ order.brandName }}</text>
 						</view>
 						<view class="order-cell between-cell">
-							<text>数量：</text>
+							<text class="cell-title">数量：</text>
 							<text>x{{ order.orderProductCount }}</text>
 						</view>
 						<view class="order-cell between-cell">
-							<text>信息：</text>
+							<text>充电桩信息：</text>
+							<text class="cell-title">充电桩信息：</text>
 							<text>{{ order.serviceContent }}</text>
 						</view>
-						<view class="order-cell between-cell">
+						<!-- <view class="order-cell between-cell">
+				<!-- 		<view class="order-cell between-cell">
 							<text>备注：</text>
 							<text>{{ order.serviceContent }}</text>
-						</view>
+						</view> -->
 						<view class="read-more-toggle">
 							<u-icon name="arrow-up"></u-icon>
 							<text class="read-more-text" @click="readMore = true">点击收起</text>
@@ -130,8 +132,6 @@
 						</u-count-down>
 					</view>
 				</view>
-				
-				
 			</view>
 			<!-- 异常预约 ，现场拍照 这里是调用拍照的两个组件-->
 			<view class="right">
@@ -212,7 +212,8 @@
 				isAllowDianhuaAndDaohang : false,
 				appointmentDatetimeRange:'',
 				appointmentDatetime:'',
-				signDistance:3000
+				signDistance:3000,
+				num:0
 			}
 		},
 		onLoad(option) {
@@ -220,9 +221,7 @@
 			console.log("option", option)
 			if (option && option.id) {
 				this.orderId = option.id
-			} else {
-				// 异常处理
-			}
+			} 
 			this.loadOrderDetail()
 			this.loadOrderRecord()
 			this.getLocation()
@@ -236,7 +235,6 @@
 				}else{
 					return process.uniEnv.qn_base_url + 'dianhua-0.png'
 				}
-				
 			},
 			navigationIcon() {
 				//self-support/icon/daohang-0@2x.png
@@ -245,7 +243,6 @@
 				}else{
 					return process.uniEnv.qn_base_url + 'daohang-0.png'
 				}
-				
 			},
 			centerButtonClass() {
 				let btnClass = "appoint-btn"
@@ -336,7 +333,6 @@
 				};
 				self.$u.api.orderDetail(data, self.orderId).then((res) => {
 					if (res.code == 200) {
-						console.log("===", res.data)
 						self.order = res.data
 						this.getCurrentBtn()
 						if(self.order.isFirstOrder){
@@ -362,7 +358,6 @@
 				};
 				self.$u.api.listOrderRecord(param).then((res) => {
 					if (res.code == 200) {
-						
 						self.orderRecords = res.data
 					} else {
 						console.log(res.message, "获取订单详情失败！");
@@ -371,39 +366,55 @@
 			},
 			weekChange(data){
 				// 点击下一周
-				console.log(data,'weekChange')
+				console.log(data,'week-data')
 				if (data && data.time) {
 					let num = data.num
 					let time = data.time
+					this.num = num
 					if (num == 0) {
-						this.dateList = [
-							{day: time, timeRange: []},
-							{day: time + (1*86400000), timeRange: []},
-							{day: time + (2*86400000), timeRange: []},
-							{day: time + (3*86400000), timeRange: []},
-							{day: time + (4*86400000), timeRange: []},
-							{day: time + (5*86400000), timeRange: []},
-							{day: time + (6*86400000), timeRange: []},
-						]
+						this.loadCalendar()
 					} else {
-						this.dateList = [
-							{day: time, timeRange: []},
-							{day: time + (1*86400000), timeRange: []},
-							{day: time + (2*86400000), timeRange: []},
-							{day: time + (3*86400000), timeRange: []},
-							{day: time + (4*86400000), timeRange: []},
-							{day: time + (5*86400000), timeRange: []},
-						]
+						this.loadCalendar()
 					}
-					
 				}
-				
+			},/* 加载日历数据 */
+			async loadCalendar() {
+				let self = this
+				let params = {
+					num: this.num
+				}
+				let res = await this.$u.api.workerCalendar(params)
+				if(res && res.code == 200) {
+					self.dateList = res.data
+					self.dateList[1].timeRange[0]='appointment_range_8'
+				}
+			},
+			
+			/* 加载预约时间段 */
+			async loadTimerange() {
+				let self = this
+				let res = await this.$u.api.openTimerange()
+				if(res && res.code == 200) {
+					let list = res.data
+					list.map((item, index) => {
+						item.disabled = false
+					})
+					self.timeList = list
+				}
 			},
 			dateChange(data){
 				// 点击日期选择
 				console.log(data,'dateChange')
+				this.loadCalendar()
 				let self = this
 				self.appointmentDatetime = data.item.day
+				self.timeList.map((item, index) => {
+					if(data.item.timeRange.indexOf(item.pkey) > -1) {
+						item.disabled = true
+					} else {
+						item.disabled = false
+					}
+				})
 			},
 			timeChange(data){
 				// 时间段选择变化
@@ -625,7 +636,7 @@
 	};
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 	.order-wrap {
 		width: 750rpx;
 		height: 100vh;
@@ -757,6 +768,7 @@
 			.order-item-more {
 				font-size: 26rpx;
 				color: #333333;
+				text-align: right;
 				.line-view {
 					background-color: #F4F5F7;
 					height: 2rpx;
@@ -946,7 +958,7 @@
 		color: #333333;
 		line-height: 48rpx;
 		margin-bottom: 10rpx;
-		text-align: left;
+		
 	}
 
 	.between-cell {
@@ -954,4 +966,8 @@
 		justify-content: space-between;
 		align-items: flex-start;
 	}
+	.cell-title {
+		text-align: left;
+		flex-shrink: 0;
+	}
 </style>

src/pages/order/index.vue

@@ -176,6 +176,7 @@
 			},
 
 			reachBottom(e) {
+				console.log('-------底部-------', this.loadStatus)
 				if (this.loadStatus != 'loadmore') return
 				this.loadStatus == 'loading'
 				this.getOrderList(this.currentIndex)
@@ -249,23 +250,23 @@
 
 			// 获取订单数量
 			getOrderCount() {
-				var self = this; // 加载订单列表
-				self.$u.api.listOrderCount().then((res) => {
+				// 加载订单列表
+				this.$u.api.listOrderCount().then((res) => {
 					if (res.code == 200) {
 						console.log("===", res.data)
 						if (res.data) {
 							var count = 0
-							self.list.forEach(item => {
+							this.list.forEach(item => {
 								if (item.name === '待预约') {
-									item.count = res.data.toAppointmentCount
+									item.total = res.data.toAppointmentCount
 								} else if (item.name === '待签到') {
-									item.count = res.data.toCheckinCount
+									item.total = res.data.toCheckinCount
 								} else if (item.name === '待完工') {
-									item.count = res.data.toFinishCount
-								} else if (item.name === '待审核') {
-									item.count = res.data.reviewingCount
+									item.total = res.data.toFinishCount
+								} else if (item.name === '审核中') {
+									item.total = res.data.reviewingCount
 								} else if (item.name === '异常单') {
-									item.count = res.data.exceptionCount
+									item.total = res.data.exceptionCount
 								}
 							})
 							var count = 0