Commit 2ea511fb authored by 和慭琛's avatar 和慭琛

新UI改动

parent 11d12389
...@@ -50,6 +50,12 @@ ...@@ -50,6 +50,12 @@
icon_i:'https://qn-static.banshouhui.com/i.png', icon_i:'https://qn-static.banshouhui.com/i.png',
//客服 图片 //客服 图片
icon_customer_service:'https://qn-static.banshouhui.com/customer-service.png', icon_customer_service:'https://qn-static.banshouhui.com/customer-service.png',
//三角形向上 图标
icon_trangle_up:'https://qn-static.banshouhui.com/trangle_up.png',
//勾选 图标
icon_selected:'https://qn-static.banshouhui.com/selected.png',
//关闭新 图标
icon_close_new:'https://qn-static.banshouhui.com/close_new.png',
//登录注册页-- //登录注册页--
//通过code获取用户信息(登录) //通过code获取用户信息(登录)
......
...@@ -6,8 +6,6 @@ ...@@ -6,8 +6,6 @@
*/ */
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
...@@ -16,6 +14,16 @@ ...@@ -16,6 +14,16 @@
}, },
{
"path": "pages/take/index",
"style": {
"navigationBarTitleText": "接单",
"enablePullDownRefresh": true
}
},
{ {
"path": "pages/expand/download", "path": "pages/expand/download",
"style": { "style": {
...@@ -31,13 +39,7 @@ ...@@ -31,13 +39,7 @@
} }
}, },
{
"path": "pages/take/index",
"style": {
"navigationBarTitleText": "接单",
"enablePullDownRefresh": true
}
},
{ {
"path": "pages/index/protocol", "path": "pages/index/protocol",
......
...@@ -97,11 +97,11 @@ ...@@ -97,11 +97,11 @@
<image class="coverIcon" :src="icon_trangle_down" mode=""></image> <image class="coverIcon" :src="icon_trangle_down" mode=""></image>
<view class="coverListView"> <view class="coverListView">
<view class="coverItemView u-m-t-8" @click="goTakeClick()"> <view class="coverItemView u-m-t-8" @click="goTakeClick()">
<text class="coverItemText">切换到接单</text> <text class="coverItemText">逛逛抢单广场</text>
</view> </view>
<view class="coverDivideLine u-m-l-20"></view> <view class="coverDivideLine u-m-l-20"></view>
<view class="coverItemView" @click="recordClick()"> <view class="coverItemView" @click="recordClick()">
<text class="coverItemText">查看历史订单</text> <text class="coverItemText">下单记录</text>
</view> </view>
</view> </view>
</view> </view>
......
...@@ -510,6 +510,9 @@ ...@@ -510,6 +510,9 @@
//接单请求 //接单请求
acceptPost: function() { acceptPost: function() {
let that = this
uni.showLoading({ uni.showLoading({
title:'请稍候' title:'请稍候'
}) })
...@@ -538,7 +541,7 @@ ...@@ -538,7 +541,7 @@
}) })
setTimeout(function() { setTimeout(function() {
this.getOrderDetail() that.getOrderDetail()
}, 1000); }, 1000);
}else{ }else{
......
...@@ -1087,7 +1087,7 @@ ...@@ -1087,7 +1087,7 @@
confirmClick: function () { confirmClick: function () {
uni.pageScrollTo({scrollTop: 99999, duration: 0});
clearTimeout(this.TimeID); clearTimeout(this.TimeID);
this.TimeID = setTimeout(() => { this.TimeID = setTimeout(() => {
......
...@@ -81,7 +81,7 @@ ...@@ -81,7 +81,7 @@
<text class="noDataText">{{noDataTitle}}</text> <text class="noDataText">{{noDataTitle}}</text>
</view> </view>
</view> </view>
<w-picker <!--w-picker
:visible.sync="isOrderTypeShow" :visible.sync="isOrderTypeShow"
mode="selector" mode="selector"
value="" value=""
...@@ -91,20 +91,21 @@ ...@@ -91,20 +91,21 @@
@confirm="orderTypeOnConfirm($event,'selector')" @confirm="orderTypeOnConfirm($event,'selector')"
@cancel="orderTypeOnCancel" @cancel="orderTypeOnCancel"
ref="selector" ref="selector"
></w-picker> ></w-picker-->
<!--view class=""> <view class="" v-if="isOrderTypeShow">
<image class="coverIcon" src="" mode=""></image> <image class="coverIcon" :src="icon_trangle_up" mode=""></image>
<view class="coverListView"> <view class="coverListView">
<view class="" v-for="(item,ikey) in orderTypeList":key="ikey"> <view class="" v-for="(item,ikey) in orderTypeList":key="ikey">
<view :class=" ikey == 0 ? 'coverItemView u-m-t-8' : 'coverItemView' "> <view :class=" ikey == 0 ? 'coverItemView u-m-t-8' : 'coverItemView' " @click="typeItemClick(item)">
<text class="coverItemText">{{item.title}}</text>
<image class="coverItemIcon" v-if="currentOrderType == item.type" :src="icon_selected" mode=""></image>
</view> </view>
<view class="coverDivideLine" v-if="ikey<4"></view> <view class="coverDivideLine" v-if="ikey<4"></view>
</view> </view>
</view> </view>
</view--> </view>
</view> </view>
...@@ -153,7 +154,10 @@ ...@@ -153,7 +154,10 @@
currentOrderTypeTitle:'全部', currentOrderTypeTitle:'全部',
TimeID:-1, TimeID:-1,
pageNumber:0, pageNumber:0,
pageSize:20 pageSize:20,
icon_trangle_up:'',
isCoverShow:true,
icon_selected:''
} }
}, },
...@@ -161,6 +165,8 @@ ...@@ -161,6 +165,8 @@
onLoad() { onLoad() {
this.icon_noData = getApp().globalData.icon_noData this.icon_noData = getApp().globalData.icon_noData
this.icon_trangle_up = getApp().globalData.icon_trangle_up
this.icon_selected = getApp().globalData.icon_selected
//this.getToken() //this.getToken()
this.datetime = this.getTime() this.datetime = this.getTime()
...@@ -249,11 +255,27 @@ ...@@ -249,11 +255,27 @@
this.getData() this.getData()
}else if(active == 1){ }else if(active == 1){
this.isOrderTypeShow = true this.isOrderTypeShow = !this.isOrderTypeShow
} }
}, },
//工单类型 选择
typeItemClick: function(item){
this.isOrderTypeShow = false
console.log('工单类型 选择')
console.log(item.title)
console.log(item.type)
this.currentOrderTypeTitle = item.title
this.currentOrderType = item.type
this.pageNumber = 0
this.unfinishList.length = 0
this.getData()
},
//工单类型切换 确认选择 //工单类型切换 确认选择
orderTypeOnConfirm(res,type){ orderTypeOnConfirm(res,type){
...@@ -952,7 +974,6 @@ ...@@ -952,7 +974,6 @@
} }
.coverIcon{ .coverIcon{
background-color: #007AFF;
width: 20rpx; width: 20rpx;
height: 14rpx; height: 14rpx;
position: fixed; position: fixed;
...@@ -979,6 +1000,7 @@ ...@@ -979,6 +1000,7 @@
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: center;
} }
.coverItemText{ .coverItemText{
...@@ -987,7 +1009,7 @@ ...@@ -987,7 +1009,7 @@
} }
.coverItemIcon{ .coverItemIcon{
background-color: #007AFF; margin-left: 10rpx;
width: 28rpx; width: 28rpx;
height: 24rpx; height: 24rpx;
} }
......
...@@ -37,12 +37,14 @@ ...@@ -37,12 +37,14 @@
<view class="shadowBackView" v-if="isPopShow"> <view class="shadowBackView" v-if="isPopShow">
<view class="centerView"> <view class="centerView">
<view class="closeView"> <view class="closeView">
<image class="closeIcon" @click="popCloseClick()" :src="icon_close" mode=""></image> <image class="closeIcon" @click="popCloseClick()" :src="icon_close_new" mode=""></image>
</view> </view>
<text class="popTitle">{{popTitle}}</text> <text class="popTitle">无法抢单</text>
<view class="popBtn" @click="popBtnClick()"> <text class="popContent u-m-t-16">{{popTitle}}</text>
<view class="popBtn" v-if="userType != 3" @click="popBtnClick()">
<text class="popBtnTitle">{{popBtnTitle}}</text> <text class="popBtnTitle">{{popBtnTitle}}</text>
</view> </view>
<text class="popPhoneText" v-if="userType == 3" @click="popBtnClick()">{{popBtnTitle}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -70,7 +72,8 @@ ...@@ -70,7 +72,8 @@
statusText:'', statusText:'',
serviceContent:'', serviceContent:'',
createDatetime:'', createDatetime:'',
TimeID:-1 TimeID:-1,
icon_close_new:''
} }
}, },
...@@ -84,6 +87,7 @@ ...@@ -84,6 +87,7 @@
//this.orderId ='10704469' //this.orderId ='10704469'
this.icon_rob = getApp().globalData.icon_rob this.icon_rob = getApp().globalData.icon_rob
this.icon_close = getApp().globalData.icon_close this.icon_close = getApp().globalData.icon_close
this.icon_close_new = getApp().globalData.icon_close_new
}, },
onShow() { onShow() {
...@@ -294,19 +298,19 @@ ...@@ -294,19 +298,19 @@
//1不是师傅 //1不是师傅
if(data==1){ if(data==1){
content = '无法抢单!请先入驻平台' content = '请先入驻平台'
confirmText = '立即入驻' confirmText = '立即入驻'
} }
//2没有认证通过 //2没有认证通过
if(data==2){ if(data==2){
content = '无法抢单!你的认证没有通过' content = '你的技能和区域信息等认证信息未完善'
confirmText = '立即完善' confirmText = '立即完善'
} }
//3技能不匹配 //3技能不匹配
if(data==3){ if(data==3){
content = '无法抢单!您的区域或技能不符合工单要求' content = '您的区域或技能不符合工单要求!'
confirmText = '联系客服400-8834-123' confirmText = '联系客服400-8834-123'
} }
...@@ -398,6 +402,9 @@ ...@@ -398,6 +402,9 @@
//抢单请求 //抢单请求
////%@/worker/%@/order/%@/accept ////%@/worker/%@/order/%@/accept
robPost: function () { robPost: function () {
let that = this
uni.showLoading({ uni.showLoading({
title:'请稍候' title:'请稍候'
}) })
...@@ -429,7 +436,7 @@ ...@@ -429,7 +436,7 @@
setTimeout(function() { setTimeout(function() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/take/detail' url: '/pages/take/detail'
+'?orderId='+this.orderId, +'?orderId='+that.orderId,
}) })
}, 1000); }, 1000);
...@@ -567,9 +574,9 @@ ...@@ -567,9 +574,9 @@
.centerView{ .centerView{
background-color: #FFFFFF; background-color: #FFFFFF;
margin-top: 272rpx; margin-top: 400rpx;
width: 520rpx; width: 566rpx;
height: 372rpx; height: 400rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
...@@ -578,7 +585,7 @@ ...@@ -578,7 +585,7 @@
.closeView{ .closeView{
background-color: #FFFFFF; background-color: #FFFFFF;
width: 100%; width: 100%;
height: 100rpx; height: 80rpx;
display: flex; display: flex;
flex-direction: row-reverse; flex-direction: row-reverse;
align-items: center; align-items: center;
...@@ -586,23 +593,31 @@ ...@@ -586,23 +593,31 @@
.closeIcon{ .closeIcon{
background-color: #FFFFFF; background-color: #FFFFFF;
margin-right: 40rpx; margin-right: 14rpx;
width: 24rpx; width: 30rpx;
height: 28rpx; height: 30rpx;
} }
.popTitle{ .popTitle{
font-size: 32rpx; font-size: 36rpx;
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
} }
.popContent{
width: 446rpx;
font-size: 28rpx;
text-align: center;
}
.popBtn{ .popBtn{
background-color: #2272FF; background-color: #2272FF;
margin-top: 106rpx; margin-top: 266rpx;
width: 410rpx; width: 410rpx;
height: 84rpx; height: 84rpx;
display: flex; display: flex;
position: absolute;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
...@@ -612,4 +627,12 @@ ...@@ -612,4 +627,12 @@
font-size: 32rpx; font-size: 32rpx;
} }
.popPhoneText{
margin-top: 290rpx;
position: absolute;
color: #2272FF;
font-size: 28rpx;
text-decoration:underline;
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment