新增 下载APP 页面

take-order/App.vue

@@ -44,6 +44,12 @@
 			icon_top:'https://qn-static.banshouhui.com/topIcon.png',
 			//我的 图标
 			icon_mine:'https://qn-static.banshouhui.com/mine.png',
+			//三角形向下 图标
+			icon_trangle_down:'https://qn-static.banshouhui.com/trangle_down.png',
+			//i 图标
+			icon_i:'https://qn-static.banshouhui.com/i.png',
+			//客服 图片
+			icon_customer_service:'https://qn-static.banshouhui.com/customer-service.png',
 			
 			//登录注册页--
 			//通过code获取用户信息（登录）

take-order/pages.json

@@ -6,6 +6,8 @@
 	*/
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		
+		
+		
 		{
 			"path": "pages/index/index",
 			"style": {
@@ -14,6 +16,14 @@
 			
 		},
 		
+		{
+			"path": "pages/expand/download",
+			"style": {
+				"navigationBarTitleText": "下载APP"
+			}
+			
+		},
+		
 		{
 			"path": "pages/take/finish",
 			"style": {

take-order/pages/expand/download.vue

+<template>
+	<view class="main txt-c">
+	  <view>给客服MM打一个数字“1”，客服会发送下载【扳手APP】链接给你哟！</view>
+		<image class='main-img' mode='widthFix' :src='icon_customer_service'></image>
+	  <button class="btn-contact" open-type="contact">前往下载：回复1</button>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				icon_customer_service:''
+			}
+		},
+		onLoad(e) {
+			
+			//https://system.banshouhui.com/weixiuapp/site/index.html#/?pioneerId=40
+			// this.webUrl = getApp().globalData.domain_Name 
+			// + '/weixiuapp/site/index.html#/?pioneerId=40'
+			// console.log(this.webUrl)
+			this.icon_customer_service = getApp().globalData.icon_customer_service
+			
+		},
+		methods: {
+			
+			
+			
+			//下单记录 点击
+			recordClick: function () {
+				
+				uni.navigateTo({
+					url: '/pages/index/record'
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style>
+	
+	.main {
+	  padding: 96rpx 90rpx;
+	  color: #666;
+	  font-size: 34rpx;
+	}
+	
+	.main-img {
+	  margin: 38rpx 0 120rpx;
+	  width: 100%;
+	}
+	
+	.btn-contact {
+	  width: 100%;
+	  height: 88rpx;
+	  background: #4983F6;
+	  border-radius: 10rpx;
+	  color: #FFF;
+	  font-size: 34rpx;
+	}
+</style>

take-order/pages/index/index.vue

@@ -85,13 +85,25 @@
 			<text class="agreeProtocol" @click="protocolClick()">《服务协议》</text>
 		</view>
 		<view class="bottomView">
-			<view class="bottomLeftView" @click="recordClick()">
+			<view class="bottomLeftView" @click="mineClick()">
 				<image class="mineIcon" :src="icon_mine" mode=""></image>
 				<text class="mineText">我的</text>
 			</view>
 			<view class="bottomRightView" @click='confirmClick()'>
 				<text class="u-font-32 whiteColor">立即下单</text>
 			</view>
+		</view>
+		<view class="" @touchmove.stop.prevent = "doNothing" v-if="isMineShow">
+			<image class="coverIcon" :src="icon_trangle_down" mode=""></image>
+			<view class="coverListView">
+				<view class="coverItemView u-m-t-8" @click="goTakeClick()">
+					<text class="coverItemText">切换到接单</text>
+				</view>
+				<view class="coverDivideLine u-m-l-20"></view>
+				<view class="coverItemView" @click="recordClick()">
+					<text class="coverItemText">查看历史订单</text>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -126,7 +138,9 @@
 				icon_agree_no:'',
 				icon_top:'',
 				icon_mine:'',
-				TimeID:-1
+				icon_trangle_down:'',
+				TimeID:-1,
+				isMineShow:false
 				
 			}
 		},
@@ -138,6 +152,7 @@
 			this.icon_agree_no = getApp().globalData.icon_agree_no
 			this.icon_top = getApp().globalData.icon_top
 			this.icon_mine = getApp().globalData.icon_mine
+			this.icon_trangle_down = getApp().globalData.icon_trangle_down
 			
 			// getworkertype('parameter').then(data => {
 			//    console.log(data);
@@ -154,6 +169,8 @@
 		},
 		methods: {
 			
+			doNothing:function(){},
+			
 			nameInput(e){
 				this.name = e.detail.value
 				// console.log('联系人 监听：')
@@ -283,12 +300,41 @@
 				
 			},
 			
+			//我的
+			mineClick: function () {
+				uni.pageScrollTo({scrollTop: 99999, duration: 0});
+				this.isMineShow = !this.isMineShow
+			},
+			
+			//去接单列表页
+			goTakeClick: function () {
+				
+				clearTimeout(this.TimeID);
+				this.TimeID = setTimeout(() => {
+				    this.isMineShow = false
+					if(!getApp().globalData.token){
+						uni.navigateTo({
+							url: '/pages/login/wxlogin'
+						})
+						
+						return
+					}
+					
+					uni.navigateTo({
+						url: '/pages/take/index'
+					})
+					
+				    
+				    }, 
+				1000);
+			},
+			
 			//查看历史订单
 			recordClick: function () {
 				
 				clearTimeout(this.TimeID);
 				this.TimeID = setTimeout(() => {
-				    
+				    this.isMineShow = false
 					if(!getApp().globalData.token){
 						uni.navigateTo({
 							url: '/pages/login/wxlogin'
@@ -875,31 +921,32 @@
 	}
 	
 	.agreeView{
-		background-color: #FFFFFF;
+		background-color: #FAFAFA;
 		width: 100%;
-		height: 60rpx;
+		height: 400rpx;
 		margin-top: 0rpx;
 		display: flex;
 		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		position: fixed;
-		bottom: 104rpx;
+		padding-bottom: 104rpx;
 	}
 	
 	.agreeIcon{
 		background-color: #F3F3F3;
+		margin-left: 30rpx;
+		margin-top: 35rpx;
 		width: 32rpx;
 		height: 32rpx;
 		border-radius: 16rpx;
 	}
 	
 	.agreeTitle{
+		margin-top: 30rpx;
 		margin-left: 10rpx;
 		font-size: 28rpx;
 	}
 	
 	.agreeProtocol{
+		margin-top: 30rpx;
 		color: #007AFF;
 		font-size: 28rpx;
 	}
@@ -917,7 +964,7 @@
 	
 	.bottomLeftView{
 		background-color: #FFFFFF;
-		width: 40%;
+		width: 45%;
 		height: 100%;
 		display: flex;
 		align-items: center;
@@ -927,7 +974,7 @@
 	
 	.bottomRightView{
 		background-color: #2272FF;
-		width: 60%;
+		width: 55%;
 		height: 100%;
 		display: flex;
 		align-items: center;
@@ -954,6 +1001,7 @@
 		background-color: #FAFAFA;
 		width: 16rpx;
 		height: 14rpx;
+		
 	}
 	
 	.mineText{
@@ -962,10 +1010,44 @@
 		margin-left: 12rpx;
 	}
 	
+	.coverIcon{
+		width: 20rpx;
+		height: 14rpx;
+		position: fixed;
+		left: 160rpx;
+		bottom: 104rpx;
+	}
+	
 	.coverListView{
-		background-color: #007AFF;
+		background-color: #F3F3F3;
 		width: 244rpx;
 		height: 168rpx;
+		position: fixed;
+		left: 50rpx;
+		bottom: 118rpx;
+		border-radius: 8rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	
+	.coverItemView{
+		background-color: #F3F3F3;
+		width: 100%;
+		height: 76rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	
+	.coverItemText{
+		color: #666666;
+		font-size: 28rpx;
+	}
+	
+	.coverDivideLine{
+		background-color: #E8E8E8;
+		width: 200rpx;
+		height: 2rpx;
 	}
 	
 	.uButton{

take-order/pages/index/record.vue

 <template>
 	<view class="backView">
+		<view class="topNoticeView">
+			<image class="topNoticeIcon u-m-l-30" :src="icon_i" mode=""></image>
+			<text class="topNoticeText u-m-l-10">已完成下单的信息需经系统后台确认后才会显示出来！</text>
+		</view>
 		<view class="topView">
 			<view class="topItemView u-m-l-80" @click="topClick(0)">
 				<text :class="activeTop == 0 ? 'activeItemText' : 'topItemText' ">未完成</text>
@@ -60,9 +64,9 @@
 				<text class="noDataText">暂无数据</text>
 			</view>
 		</view>
-		<view class="bottomView" @click="bottomClick()">
+		<!--view class="bottomView" @click="bottomClick()">
 			<text class="u-font-28 whiteColor">查看接单列表</text>
-		</view>
+		</view-->
 	</view>
 </template>
 
@@ -75,13 +79,14 @@
 				finishList:[],
 				icon_noData:'',
 				TimeID:-1,
-				pageNumber:0
+				pageNumber:0,
+				icon_i:''
 			}
 		},
 		onLoad() {
 			
 			this.icon_noData = getApp().globalData.icon_noData
-			
+			this.icon_i = getApp().globalData.icon_i
 		},
 		
 		onShow(){
@@ -198,7 +203,7 @@
 				if(this.activeTop == 0){
 					console.log('未完工')
 					
-					if(this.unfinishList.length==0){
+					if(this.unfinishList && this.unfinishList.length==0){
 						this.unfinishList = res.data.data.list
 					}else{
 						
@@ -221,7 +226,7 @@
 					console.log('已完工')
 					
 					
-					if(this.finishList.length==0){
+					if(this.finishList && this.finishList.length==0){
 						this.finishList = res.data.data.list
 					}else{
 						
@@ -248,6 +253,15 @@
 				if(this.activeTop!=active){
 					this.activeTop = active
 					this.createOrderList()
+					
+					if (active == 0){
+						this.finishList.length = 0
+					}
+					
+					if (active == 1){
+						this.unfinishList.length = 0
+					}
+					
 				}
 			},
 			
@@ -501,5 +515,24 @@
 		color: #FFFFFF;
 	}
 	
+	.topNoticeView{
+		background-color: #FFF5D2;
+		width: 100%;
+		height: 74rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	
+	.topNoticeIcon{
+		width: 32rpx;
+		height: 32rpx;
+	}
+	
+	.topNoticeText{
+		color: #D7851A;
+		font-size: 24rpx;
+	}
+	
 	
 </style>

take-order/pages/take/detail.vue

@@ -536,11 +536,15 @@
 								icon:'none',
 								title:'接单成功'
 							})
-							this.getOrderDetail()
+							
+							setTimeout(function() {
+								this.getOrderDetail()
+							}, 1000);		
+		
 						}else{
 							uni.showToast({
 								icon:'none',
-								title:res.data.message
+								title:res.data
 							})
 							
 							
@@ -554,7 +558,7 @@
 						console.log(e)
 						uni.showToast({
 							icon:'none',
-							title:'接单请求 失败'
+							title:'接单请求失败'
 						})
 					}
 				})

take-order/pages/take/finish.vue

@@ -327,7 +327,7 @@
 						}else{
 							uni.showToast({
 								icon:'none',
-								title:'获取完工页详情失败'
+								title:res.data
 							})
 							
 							

take-order/pages/take/index.vue

@@ -50,8 +50,8 @@
 				<text class="addressText" @click="itemClick(item)" v-if="item.contactAddress">{{item.contactAddress}}</text>
 				<view class="bookBottomView" v-if="item.maintainWorkerName || item.statusText">
 					<text class="typeText">({{item.inGuaranteePeriodText}})-{{item.orderServiceType}}</text>
-					<text class="bookText underLine" @click.stop="onShowDatePicker('datetime',item)" v-if="item.appointmentDatetime">{{formatDate(item.appointmentDatetime)}}</text>
-					<text class="bookText underLine" @click.stop="onShowDatePicker('datetime',item)" v-if="!item.appointmentDatetime">未预约</text>
+					<text class="bookText underLine" @click.stop="onShowDatePicker('datetime',item)" v-if="item.appointmentDatetime && item.statusText !='待接单' ">{{formatDate(item.appointmentDatetime)}}</text>
+					<text class="bookText underLine" @click.stop="onShowDatePicker('datetime',item)" v-if="!item.appointmentDatetime && item.statusText !='待接单' ">未预约</text>
 					<text :class="item.statusText == '待完工' ? 'statusText redColor' : 'statusText'" v-if="item.statusText">{{item.statusText}}</text> 
 				</view>
 				<view class="divideLine u-m-t-30"></view>
@@ -92,6 +92,20 @@
 			@cancel="orderTypeOnCancel"
 			ref="selector" 
 		></w-picker>
+		<!--view class="">
+			<image class="coverIcon" src="" mode=""></image>
+			
+			<view class="coverListView">
+				<view class=""  v-for="(item,ikey) in orderTypeList":key="ikey">
+					<view :class=" ikey == 0 ? 'coverItemView u-m-t-8' : 'coverItemView'  ">
+						
+					</view>
+					<view class="coverDivideLine" v-if="ikey<4"></view>
+				</view>
+				
+			</view>
+		</view-->
+		
 			
 	</view>
 	
@@ -160,6 +174,9 @@
 		
 		onShow() {
 			
+			this.grabList.length = 0
+			this.unfinishList.length = 0
+			this.finishList.length = 0
 			this.getToken()
 			
 		},
@@ -308,6 +325,7 @@
 						uni.hideLoading()
 						console.log('获取抢单广场列表 成功')
 						console.log(res.statusCode)
+						console.log(res)
 						
 						if(res.statusCode==401){
 							uni.navigateTo({
@@ -341,7 +359,7 @@
 			
 			//数组赋值
 			handleRobList: function (res) {
-				if(this.grabList.length==0){
+				if(this.grabList && this.grabList.length==0){
 					this.grabList = res.data.data.list
 				}else{
 					
@@ -421,7 +439,7 @@
 				if(type == 5){
 					console.log('已完工')
 					
-					if(this.finishList.length==0){
+					if(this.finishList && this.finishList.length==0){
 						this.finishList = res.data.data.list
 					}else{
 						
@@ -442,7 +460,7 @@
 					console.log('中间')
 					
 					
-					if(this.unfinishList.length==0){
+					if(this.unfinishList && this.unfinishList.length==0){
 						this.unfinishList = res.data.data.list
 					}else{
 						
@@ -926,4 +944,58 @@
 		color: #D73400;
 	}
 	
+	.coverShadowView{
+		background-color: rgba(0,0,0,0.5);
+		position: fixed;
+		width: 100%;
+		height: 100%;
+	}
+	
+	.coverIcon{
+		background-color: #007AFF;
+		width: 20rpx;
+		height: 14rpx;
+		position: fixed;
+		top: 94rpx;
+		left: 376rpx;
+	}
+	
+	.coverListView{
+		background-color: #F3F3F3;
+		width: 244rpx;
+		height: 396rpx;
+		position: fixed;
+		top: 108rpx;
+		left: 264rpx;
+		border-radius: 8rpx;
+		display: flex;
+		flex-direction: column;
+	}
+	
+	.coverItemView{
+		background-color: #F3F3F3;
+		width: 100%;
+		height: 76rpx;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+	
+	.coverItemText{
+		color: #666666;
+		font-size: 28rpx;
+	}
+	
+	.coverItemIcon{
+		background-color: #007AFF;
+		width: 28rpx;
+		height: 24rpx;
+	}
+	
+	.coverDivideLine{
+		background-color: #E8E8E8;
+		width: 200rpx;
+		height: 2rpx;
+	}
+	
 </style>