Commit f8d0481d authored by 和慭琛's avatar 和慭琛

登录模块 下单模块 UI高保真还原 接口对接 100%

parent 5742e1ef
......@@ -24,6 +24,10 @@
icon_agree_yes:'https://qn-static.banshouhui.com/agree_yes.png',
//勾选取消 图标
icon_agrss_no:'https://qn-static.banshouhui.com/agree_no.png',
//无数据 图标
icon_noData:'https://qn-static.banshouhui.com/empty.png',
//登录注册页--
//通过code获取用户信息(登录)
getUsersByCode:'/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode',
......@@ -69,6 +73,9 @@
console.log(res.data);
that.globalData.token = res.data
that.initAPIneedToken()
console.log('当前token',that.token)
}
})
......@@ -76,8 +83,7 @@
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
//this.globalData.token = 'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0'
this.initAPIneedToken()
console.log('当前token',this.token)
......
......@@ -7,36 +7,45 @@
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/index/success",
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "下单"
}
},
{
"path": "pages/index/index",
"path": "pages/take/index",
"style": {
"navigationBarTitleText": "下单"
"navigationBarTitleText": "接单"
}
},
{
"path": "pages/login/wxlogin",
"path": "pages/index/record",
"style": {
"navigationBarTitleText": "授权登录"
"navigationBarTitleText": "下的单"
}
},
{
"path": "pages/take/index",
"path": "pages/index/success",
"style": {
"navigationBarTitleText": "接单"
"navigationBarTitleText": "下单"
}
},
{
"path": "pages/login/wxlogin",
"style": {
"navigationBarTitleText": "授权登录"
}
},
{
"path": "pages/take/finish",
"style": {
......@@ -67,19 +76,7 @@
"style": {
"navigationBarTitleText": "接单详情"
}
},
{
"path": "pages/index/record",
"style": {
"navigationBarTitleText": "下的单"
}
}
],
"globalStyle": {
......
......@@ -249,6 +249,7 @@
*/
},
//客户报单接口
createAppletsOrder: async function() {
console.log('联系人:'+this.name)
......@@ -260,9 +261,14 @@
uni.showLoading({
title:'请稍候'
})
//getApp().globalData.createAppletsOrder
//'/wxh-worker-rest/rest/order/revision/applets/'
//+this.globalData.token+'/order/createAppletsOrder'
uni.request({
url: getApp().globalData.domain_Name
+getApp().globalData.createAppletsOrder,
+'/wxh-worker-rest/rest/order/revision/applets/'
+getApp().globalData.token+'/order/createAppletsOrder',
method: 'POST',
header: {
'Content-Type': 'application/x-www-form-urlencoded',
......@@ -282,6 +288,14 @@
console.log('客户报单接口 成功')
console.log(res)
uni.hideLoading()
if(res.statusCode==401){
uni.navigateTo({
url:'/pages/login/wxlogin'
})
return
}
if(res.data.code==200){
uni.showToast({
title:'下单成功'
......@@ -332,7 +346,7 @@
//获取消息订阅信息
getSubSubscribeMessage: function (){
let that = this
uni.requestSubscribeMessage({
tmplIds: ['3doUrjIT3-FIfmzsLdBy5MQ5i_q5braPzIbVZRBoEjU'],
success (res) {
......
<template>
<view class="">
<view class="backView">
<view class="topView">
<view :class="activeTop == 0 ? 'topItemView activeColor' : 'topItemView' " @click="topClick(0)">
<text class="topItemText">未完成</text>
<view class="topItemView u-m-l-80" @click="topClick(0)">
<text :class="activeTop == 0 ? 'activeItemText' : 'topItemText' ">未完成</text>
<view class="activeItemBottom" v-if="activeTop == 0"></view>
</view>
<view :class="activeTop == 1 ? 'topItemView activeColor' : 'topItemView' " @click="topClick(1)">
<text class="topItemText">已完成</text>
<view class="topItemView u-m-r-80" @click="topClick(1)">
<text :class="activeTop == 1 ? 'activeItemText' : 'topItemText' ">已完成</text>
<view class="activeItemBottom" v-if="activeTop == 1"></view>
</view>
</view>
<view class="listView">
<view class="itemView" v-for="(item,ikey) in unfinishList":key="ikey" v-if="activeTop == 0">
<view class="itemView" v-if="activeTop == 0" v-for="(item,ikey) in unfinishList":key="ikey">
<view class="nameView">
<text class="u-font-24 u-m-l-24">{{item.name}} {{item.phone}}</text>
<text class="u-font-24 u-m-r-24">{{item.type}}</text>
<view class="nameLeftView">
<text class="nameText" v-if="item.contactName">{{item.contactName}}</text>
<text class="phoneText" v-if="item.contactMobilephone">{{item.contactMobilephone}}</text>
</view>
<text class="productText" v-if="item.brandName && item.categoryName && item.orderServiceType">{{item.brandName}}-{{item.categoryName}}-{{item.orderServiceType}}</text>
</view>
<text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text>
<view class="nameView">
<text class="u-font-24 u-m-l-24 underLine" @click="callClick(item.worker_phone)">{{item.worker_name}} {{item.worker_phone}}</text>
<text class="u-font-24 u-m-r-24">{{item.status}}</text>
<text class="addressText" v-if="item.contactAddress">{{item.contactAddress}}</text>
<view class="itemBottomView" v-if="item.maintainWorkerName || item.statusText">
<view class="workerView">
<text class="workerNameText" v-if="item.maintainWorkerName">师傅:{{item.maintainWorkerName}}</text>
<text class="workerPhoneText" v-if="item.maintainWorkerPhone" @click="callClick(item.maintainWorkerPhone)">{{item.maintainWorkerPhone}}</text>
</view>
<view class="statusView" v-if="item.statusText">
<text class="statusText" v-if="item.statusText">{{item.statusText}}</text>
</view>
</view>
<view class="divideLine u-m-t-30"></view>
</view>
<view class="noDataView" v-if="activeTop == 0 && unfinishList.length==0">
<image class="noDataIcon" :src="icon_noData" mode=""></image>
<text class="noDataText">暂无数据</text>
</view>
<view class="itemView" v-for="(item,ikey) in finishList":key="ikey" v-if="activeTop == 1">
<view class="itemView" v-if="activeTop == 1" v-for="(item,ikey) in finishList":key="ikey">
<view class="nameView">
<text class="u-font-24 u-m-l-24">{{item.name}} {{item.phone}}</text>
<text class="u-font-24 u-m-r-24">{{item.type}}</text>
<view class="nameLeftView">
<text class="nameText" v-if="item.contactName">{{item.contactName}}</text>
<text class="phoneText" v-if="item.contactMobilephone">{{item.contactMobilephone}}</text>
</view>
<text class="productText" v-if="item.brandName && item.categoryName && item.orderServiceType">{{item.brandName}}-{{item.categoryName}}-{{item.orderServiceType}}</text>
</view>
<text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text>
<view class="nameView">
<text class="u-font-24 u-m-l-24 underLine" @click="callClick(item.worker_phone)">{{item.worker_name}} {{item.worker_phone}}</text>
<text class="u-font-24 u-m-r-24">{{item.status}}</text>
<text class="addressText" v-if="item.contactAddress">{{item.contactAddress}}</text>
<view class="itemBottomView" v-if="item.maintainWorkerName || item.statusText">
<view class="workerView" v-if="item.maintainWorkerName">
<text class="workerNameText" v-if="item.maintainWorkerName">师傅:{{item.maintainWorkerName}}</text>
<text class="workerPhoneText" v-if="item.maintainWorkerPhone" @click="callClick(item.maintainWorkerPhone)">{{item.maintainWorkerPhone}}</text>
</view>
<view class="statusView" v-if="item.statusText">
<text class="statusText" v-if="item.statusText">{{item.statusText}}</text>
</view>
</view>
<view class="divideLine u-m-t-30"></view>
</view>
<view class="noDataView" v-if="activeTop == 1 && finishList.length==0">
<image class="noDataIcon" :src="icon_noData" mode=""></image>
<text class="noDataText">暂无数据</text>
</view>
</view>
</view>
......@@ -40,41 +68,15 @@
data() {
return {
activeTop:0,
unfinishList:[
{
name:'未完工',
phone:'15811112222',
type:'米家-新风机-安装',
address:'广东省深圳市宝安区新安街道庭威产业园10C',
status:'待抢单',
worker_name:'范师傅',
worker_phone:'15933334444'
},
{
name:'许三多',
phone:'15811112222',
type:'TCL-空调-清洗',
address:'广西壮族自治区北海市海城区高德街道北海大道东延线5号和苑12幢203号',
status:'待完工',
worker_name:'范师傅',
worker_phone:'15933334444'
},
],
finishList:[
{
name:'已完工',
phone:'15811112222',
type:'米家-新风机-安装',
address:'广东省深圳市宝安区新安街道庭威产业园10C',
status:'待抢单',
worker_name:'范师傅',
worker_phone:'15933334444'
}
]
unfinishList:[],
finishList:[],
icon_noData:''
}
},
onLoad() {
this.icon_noData = getApp().globalData.icon_noData
},
onShow(){
......@@ -91,13 +93,14 @@
//获取下单列表
createOrderList: function () {
let that = this
uni.request({
url: getApp().globalData.domain_Name
+getApp().globalData.createOrderList,
method: 'GET',
data: {
type:this.activeTop,
pageNumber:1,
pageNumber:0,
pageSize:20,
},
success: (res) => {
......@@ -105,6 +108,17 @@
console.log(res)
if(res.data.code==200){
console.log('code=200')
//未完工
if(that.activeTop == 0){
console.log('未完工')
that.unfinishList=res.data.data
}
//已完工
if(that.activeTop == 1){
console.log('已完工')
that.finishList=res.data.data
}
}else{
uni.showToast({
......@@ -144,26 +158,53 @@
</script>
<style>
.backView{
background-color: #FAFAFA;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
}
.topView{
display: flex;
flex-direction: row;
}
.topItemView{
background-color: #FFFFFF;
background-color: #FAFAFA;
width: 50%;
height: 80rpx;
height: 94rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
border: 2rpx solid #999999;
}
.topItemText{
font-size: 28rpx;
margin-top: 22rpx;
font-size: 32rpx;
color: #999999;
}
.activeItemText{
margin-top: 22rpx;
font-size: 32rpx;
color: #333333;
}
.activeItemBottom{
margin-top: 10rpx;
background-color: #2272FF;
width: 70rpx;
height: 6rpx;
}
.activeColor{
background-color: #999999;
}
......@@ -174,14 +215,65 @@
}
.itemView{
background-color: #FFFFFF;
width: 100%;
height: 200rpx;
display: flex;
flex-direction: column;
border-bottom: 2rpx solid #999999;
}
.divideLine{
background-color: #FAFAFA;
width: 100%;
height: 16rpx;
}
.nameView{
width: 100%;
height: 90rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
}
.nameLeftView{
background-color: #FFFFFF;
width: 40%;
height: 100%;
display: flex;
flex-direction: row;
align-items: center;
}
.nameText{
margin-left: 28rpx;
color: #333333;
font-size: 28rpx;
font-weight: bold;
}
.phoneText{
margin-left: 20rpx;
color: #999999;
font-size: 24rpx;
}
.productText{
margin-right: 30rpx;
font-size: 28rpx;
color: #333333;
}
.addressText{
margin-left: 24rpx;
margin-right: 30rpx;
font-size: 28rpx;
line-height: 40rpx;
color: #333333;
}
.itemBottomView{
background-color: #FFFFFF;
width: 100%;
height: 80rpx;
display: flex;
......@@ -190,8 +282,69 @@
justify-content: space-between;
}
.workerView{
background-color: #FFFFFF;
width: 70%;
height: 100%;
display: flex;
flex-direction: row;
align-items: flex-end;
}
.workerNameText{
margin-left: 28rpx;
color: #333333;
font-size: 28rpx;
font-weight: bold;
}
.workerPhoneText{
margin-left: 16rpx;
color: #2272FF;
font-size: 28rpx;
text-decoration:underline;
}
.statusView{
background-color: #FFFFFF;
width: 30%;
height: 80rpx;
display: flex;
flex-direction: row-reverse;
align-items: flex-end;
}
.statusText{
color: #2272FF;
font-size: 28rpx;
margin-right: 30rpx;
}
.underLine{
text-decoration:underline;
}
.noDataView{
background-color: #FFFFFF;
width: 100%;
height: 1112rpx;
display: flex;
flex-direction: column;
align-items: center;
}
.noDataIcon{
background-color: #FFFFFF;
margin-top: 280rpx;
width: 200rpx;
height: 160rpx;
}
.noDataText{
color:#999999;
margin-top: 32rpx;
font-size: 28rpx;
}
</style>
<template>
<view class="">
<view class="backView">
<view class="topView">
<view class="topItemView u-m-l-80" @click="topClick(0)">
<text :class="activeTop == 0 ? 'activeItemText' : 'topItemText' ">未完成</text>
<view class="activeItemBottom" v-if="activeTop == 0"></view>
</view>
<view class="topItemView u-m-r-80" @click="topClick(1)">
<text :class="activeTop == 1 ? 'activeItemText' : 'topItemText' ">已完成</text>
<view class="activeItemBottom" v-if="activeTop == 1"></view>
</view>
</view>
<!--view class="topView">
<view :class="activeTop == 0 ? 'topItemView activeColor' : 'topItemView' " @click="topClick(0)">
<text class="topItemText">抢单广场</text>
</view>
......@@ -11,7 +20,7 @@
<view :class="activeTop == 2 ? 'topItemView activeColor' : 'topItemView' " @click="topClick(2)">
<text class="topItemText">已完工单</text>
</view>
</view>
</view-->
<view class="listView">
<view class="itemView" v-if="activeTop == 0" @click="itemClick(item)" v-for="(item,ikey) in grabList":key="ikey">
<view class="nameView">
......@@ -394,23 +403,48 @@
</script>
<style>
.backView{
background-color: #FAFAFA;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: flex;
flex-direction: column;
}
.topView{
display: flex;
flex-direction: row;
}
.topItemView{
background-color: #FFFFFF;
background-color: #FAFAFA;
width: 33%;
height: 80rpx;
height: 94rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
border: 2rpx solid #999999;
}
.topItemText{
font-size: 28rpx;
margin-top: 22rpx;
font-size: 32rpx;
color: #999999;
}
.activeItemText{
margin-top: 22rpx;
font-size: 32rpx;
color: #333333;
}
.activeItemBottom{
margin-top: 10rpx;
background-color: #2272FF;
width: 70rpx;
height: 6rpx;
}
.activeColor{
......
{
"pages": [
"pages/index/success",
"pages/index/index",
"pages/login/wxlogin",
"pages/take/index",
"pages/index/record",
"pages/index/success",
"pages/login/wxlogin",
"pages/take/finish",
"pages/take/measure",
"pages/take/rob",
"pages/take/detail",
"pages/index/record"
"pages/take/detail"
],
"subPackages": [],
"window": {
......
......@@ -127,6 +127,10 @@ var _default =
icon_agree_yes: 'https://qn-static.banshouhui.com/agree_yes.png',
//勾选取消 图标
icon_agrss_no: 'https://qn-static.banshouhui.com/agree_no.png',
//无数据 图标
icon_noData: 'https://qn-static.banshouhui.com/empty.png',
//登录注册页--
//通过code获取用户信息(登录)
getUsersByCode: '/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode',
......@@ -172,6 +176,9 @@ var _default =
console.log(res.data);
that.globalData.token = res.data;
that.initAPIneedToken();
console.log('当前token', that.token);
} });
......@@ -179,8 +186,7 @@ var _default =
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
//this.globalData.token = 'RTOKEN52e603131ae93ac83ac0b3628064822690ee4de0'
this.initAPIneedToken();
console.log('当前token', this.token);
......
......@@ -381,6 +381,7 @@ var _default = {
*/
},
//客户报单接口
createAppletsOrder: function () {var _createAppletsOrder = _asyncToGenerator( /*#__PURE__*/_regenerator.default.mark(function _callee() {var _this = this;return _regenerator.default.wrap(function _callee$(_context) {while (1) {switch (_context.prev = _context.next) {case 0:
console.log('联系人:' + this.name);
......@@ -392,9 +393,14 @@ var _default = {
uni.showLoading({
title: '请稍候' });
//getApp().globalData.createAppletsOrder
//'/wxh-worker-rest/rest/order/revision/applets/'
//+this.globalData.token+'/order/createAppletsOrder'
uni.request({
url: getApp().globalData.domain_Name +
getApp().globalData.createAppletsOrder,
'/wxh-worker-rest/rest/order/revision/applets/' +
getApp().globalData.token + '/order/createAppletsOrder',
method: 'POST',
header: {
'Content-Type': 'application/x-www-form-urlencoded',
......@@ -414,6 +420,14 @@ var _default = {
console.log('客户报单接口 成功');
console.log(res);
uni.hideLoading();
if (res.statusCode == 401) {
uni.navigateTo({
url: '/pages/login/wxlogin' });
return;
}
if (res.data.code == 200) {
uni.showToast({
title: '下单成功' });
......@@ -464,7 +478,7 @@ var _default = {
//获取消息订阅信息
getSubSubscribeMessage: function getSubSubscribeMessage() {
var that = this;
uni.requestSubscribeMessage({
tmplIds: ['3doUrjIT3-FIfmzsLdBy5MQ5i_q5braPzIbVZRBoEjU'],
success: function success(res) {
......
......@@ -110,46 +110,48 @@ __webpack_require__.r(__webpack_exports__);
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
//
var _default =
{
data: function data() {
return {
activeTop: 0,
unfinishList: [
{
name: '未完工',
phone: '15811112222',
type: '米家-新风机-安装',
address: '广东省深圳市宝安区新安街道庭威产业园10C',
status: '待抢单',
worker_name: '范师傅',
worker_phone: '15933334444' },
{
name: '许三多',
phone: '15811112222',
type: 'TCL-空调-清洗',
address: '广西壮族自治区北海市海城区高德街道北海大道东延线5号和苑12幢203号',
status: '待完工',
worker_name: '范师傅',
worker_phone: '15933334444' }],
finishList: [
{
name: '已完工',
phone: '15811112222',
type: '米家-新风机-安装',
address: '广东省深圳市宝安区新安街道庭威产业园10C',
status: '待抢单',
worker_name: '范师傅',
worker_phone: '15933334444' }] };
unfinishList: [],
finishList: [],
icon_noData: '' };
},
onLoad: function onLoad() {
this.icon_noData = getApp().globalData.icon_noData;
},
onShow: function onShow() {
......@@ -166,13 +168,14 @@ var _default =
//获取下单列表
createOrderList: function createOrderList() {
var that = this;
uni.request({
url: getApp().globalData.domain_Name +
getApp().globalData.createOrderList,
method: 'GET',
data: {
type: this.activeTop,
pageNumber: 1,
pageNumber: 0,
pageSize: 20 },
success: function success(res) {
......@@ -180,6 +183,17 @@ var _default =
console.log(res);
if (res.data.code == 200) {
console.log('code=200');
//未完工
if (that.activeTop == 0) {
console.log('未完工');
that.unfinishList = res.data.data;
}
//已完工
if (that.activeTop == 1) {
console.log('已完工');
that.finishList = res.data.data;
}
} else {
uni.showToast({
......
<view><view class="topView"><view data-event-opts="{{[['tap',[['topClick',[0]]]]]}}" class="{{[activeTop==0?'topItemView activeColor':'topItemView']}}" bindtap="__e"><text class="topItemText">未完成</text></view><view data-event-opts="{{[['tap',[['topClick',[1]]]]]}}" class="{{[activeTop==1?'topItemView activeColor':'topItemView']}}" bindtap="__e"><text class="topItemText">已完成</text></view></view><view class="listView"><block wx:for="{{unfinishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==0}}"><view class="itemView"><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text><view class="nameView"><text data-event-opts="{{[['tap',[['callClick',['$0'],[[['unfinishList','',ikey,'worker_phone']]]]]]]}}" class="u-font-24 u-m-l-24 underLine" bindtap="__e">{{item.worker_name+" "+item.worker_phone}}</text><text class="u-font-24 u-m-r-24">{{item.status}}</text></view></view></block></block><block wx:for="{{finishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==1}}"><view class="itemView"><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text><view class="nameView"><text data-event-opts="{{[['tap',[['callClick',['$0'],[[['finishList','',ikey,'worker_phone']]]]]]]}}" class="u-font-24 u-m-l-24 underLine" bindtap="__e">{{item.worker_name+" "+item.worker_phone}}</text><text class="u-font-24 u-m-r-24">{{item.status}}</text></view></view></block></block></view></view>
\ No newline at end of file
<view class="backView"><view class="topView"><view data-event-opts="{{[['tap',[['topClick',[0]]]]]}}" class="topItemView u-m-l-80" bindtap="__e"><text class="{{[activeTop==0?'activeItemText':'topItemText']}}">未完成</text><block wx:if="{{activeTop==0}}"><view class="activeItemBottom"></view></block></view><view data-event-opts="{{[['tap',[['topClick',[1]]]]]}}" class="topItemView u-m-r-80" bindtap="__e"><text class="{{[activeTop==1?'activeItemText':'topItemText']}}">已完成</text><block wx:if="{{activeTop==1}}"><view class="activeItemBottom"></view></block></view></view><view class="listView"><block wx:for="{{unfinishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==0}}"><view class="itemView"><view class="nameView"><view class="nameLeftView"><block wx:if="{{item.contactName}}"><text class="nameText">{{item.contactName}}</text></block><block wx:if="{{item.contactMobilephone}}"><text class="phoneText">{{item.contactMobilephone}}</text></block></view><block wx:if="{{item.brandName&&item.categoryName&&item.orderServiceType}}"><text class="productText">{{item.brandName+"-"+item.categoryName+"-"+item.orderServiceType}}</text></block></view><block wx:if="{{item.contactAddress}}"><text class="addressText">{{item.contactAddress}}</text></block><block wx:if="{{item.maintainWorkerName||item.statusText}}"><view class="itemBottomView"><view class="workerView"><block wx:if="{{item.maintainWorkerName}}"><text class="workerNameText">{{"师傅:"+item.maintainWorkerName}}</text></block><block wx:if="{{item.maintainWorkerPhone}}"><text data-event-opts="{{[['tap',[['callClick',['$0'],[[['unfinishList','',ikey,'maintainWorkerPhone']]]]]]]}}" class="workerPhoneText" bindtap="__e">{{item.maintainWorkerPhone}}</text></block></view><block wx:if="{{item.statusText}}"><view class="statusView"><block wx:if="{{item.statusText}}"><text class="statusText">{{item.statusText}}</text></block></view></block></view></block><view class="divideLine u-m-t-30"></view></view></block></block><block wx:if="{{activeTop==0&&unfinishList.length==0}}"><view class="noDataView"><image class="noDataIcon" src="{{icon_noData}}" mode></image><text class="noDataText">暂无数据</text></view></block><block wx:for="{{finishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==1}}"><view class="itemView"><view class="nameView"><view class="nameLeftView"><block wx:if="{{item.contactName}}"><text class="nameText">{{item.contactName}}</text></block><block wx:if="{{item.contactMobilephone}}"><text class="phoneText">{{item.contactMobilephone}}</text></block></view><block wx:if="{{item.brandName&&item.categoryName&&item.orderServiceType}}"><text class="productText">{{item.brandName+"-"+item.categoryName+"-"+item.orderServiceType}}</text></block></view><block wx:if="{{item.contactAddress}}"><text class="addressText">{{item.contactAddress}}</text></block><block wx:if="{{item.maintainWorkerName||item.statusText}}"><view class="itemBottomView"><block wx:if="{{item.maintainWorkerName}}"><view class="workerView"><block wx:if="{{item.maintainWorkerName}}"><text class="workerNameText">{{"师傅:"+item.maintainWorkerName}}</text></block><block wx:if="{{item.maintainWorkerPhone}}"><text data-event-opts="{{[['tap',[['callClick',['$0'],[[['finishList','',ikey,'maintainWorkerPhone']]]]]]]}}" class="workerPhoneText" bindtap="__e">{{item.maintainWorkerPhone}}</text></block></view></block><block wx:if="{{item.statusText}}"><view class="statusView"><block wx:if="{{item.statusText}}"><text class="statusText">{{item.statusText}}</text></block></view></block></view></block><view class="divideLine u-m-t-30"></view></view></block></block><block wx:if="{{activeTop==1&&finishList.length==0}}"><view class="noDataView"><image class="noDataIcon" src="{{icon_noData}}" mode></image><text class="noDataText">暂无数据</text></view></block></view></view>
\ No newline at end of file
.backView{
background-color: #FAFAFA;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
}
.topView{
display: -webkit-box;
display: -webkit-flex;
......@@ -9,24 +24,38 @@
flex-direction: row;
}
.topItemView{
background-color: #FFFFFF;
background-color: #FAFAFA;
width: 50%;
height: 80rpx;
height: 94rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
border: 2rpx solid #999999;
}
.topItemText{
font-size: 28rpx;
margin-top: 22rpx;
font-size: 32rpx;
color: #999999;
}
.activeItemText{
margin-top: 22rpx;
font-size: 32rpx;
color: #333333;
}
.activeItemBottom{
margin-top: 10rpx;
background-color: #2272FF;
width: 70rpx;
height: 6rpx;
}
.activeColor{
background-color: #999999;
}
.listView{
......@@ -40,8 +69,8 @@
flex-direction: column;
}
.itemView{
background-color: #FFFFFF;
width: 100%;
height: 200rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
......@@ -49,9 +78,69 @@
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
border-bottom: 2rpx solid #999999;
}
.divideLine{
background-color: #FAFAFA;
width: 100%;
height: 16rpx;
}
.nameView{
width: 100%;
height: 90rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
flex-direction: row;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
}
.nameLeftView{
background-color: #FFFFFF;
width: 40%;
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
flex-direction: row;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
}
.nameText{
margin-left: 28rpx;
color: #333333;
font-size: 28rpx;
font-weight: bold;
}
.phoneText{
margin-left: 20rpx;
color: #999999;
font-size: 24rpx;
}
.productText{
margin-right: 30rpx;
font-size: 28rpx;
color: #333333;
}
.addressText{
margin-left: 24rpx;
margin-right: 30rpx;
font-size: 28rpx;
line-height: 40rpx;
color: #333333;
}
.itemBottomView{
background-color: #FFFFFF;
width: 100%;
height: 80rpx;
display: -webkit-box;
......@@ -68,8 +157,82 @@
-webkit-justify-content: space-between;
justify-content: space-between;
}
.workerView{
background-color: #FFFFFF;
width: 70%;
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
flex-direction: row;
-webkit-box-align: end;
-webkit-align-items: flex-end;
align-items: flex-end;
}
.workerNameText{
margin-left: 28rpx;
color: #333333;
font-size: 28rpx;
font-weight: bold;
}
.workerPhoneText{
margin-left: 16rpx;
color: #2272FF;
font-size: 28rpx;
text-decoration:underline;
}
.statusView{
background-color: #FFFFFF;
width: 30%;
height: 80rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: reverse;
-webkit-flex-direction: row-reverse;
flex-direction: row-reverse;
-webkit-box-align: end;
-webkit-align-items: flex-end;
align-items: flex-end;
}
.statusText{
color: #2272FF;
font-size: 28rpx;
margin-right: 30rpx;
}
.underLine{
text-decoration:underline;
}
.noDataView{
background-color: #FFFFFF;
width: 100%;
height: 1112rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
}
.noDataIcon{
background-color: #FFFFFF;
margin-top: 280rpx;
width: 200rpx;
height: 160rpx;
}
.noDataText{
color:#999999;
margin-top: 32rpx;
font-size: 28rpx;
}
......@@ -206,6 +206,15 @@ __webpack_require__.r(__webpack_exports__);
......
<view><view class="topView"><view data-event-opts="{{[['tap',[['topClick',[0]]]]]}}" class="{{[activeTop==0?'topItemView activeColor':'topItemView']}}" bindtap="__e"><text class="topItemText">抢单广场</text></view><view data-event-opts="{{[['tap',[['topClick',[1]]]]]}}" class="{{[activeTop==1?'topItemView activeColor':'topItemView']}}" bindtap="__e"><text class="topItemText">全部未完工</text></view><view data-event-opts="{{[['tap',[['topClick',[2]]]]]}}" class="{{[activeTop==2?'topItemView activeColor':'topItemView']}}" bindtap="__e"><text class="topItemText">已完工单</text></view></view><view class="listView"><block wx:for="{{grabList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==0}}"><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['grabList','',ikey]]]]]]]}}" class="itemView" bindtap="__e"><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.product}}</text><text class="u-font-24 u-m-r-24">{{item.status}}</text></view></view></block></block><block wx:for="{{unfinishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==1}}"><view class="itemView"><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['unfinishList','',ikey]]]]]]]}}" class="nameView" bindtap="__e"><text class="u-font-24 u-m-l-24">{{item.orderType}}</text><text class="u-font-24 u-m-r-24">{{item.date}}</text></view><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['unfinishList','',ikey]]]]]]]}}" class="nameView" bindtap="__e"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text data-event-opts="{{[['tap',[['itemClick',['$0'],[[['unfinishList','',ikey]]]]]]]}}" class="u-font-24 u-m-l-24 u-m-r-24" bindtap="__e">{{item.address}}</text><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.product}}</text><block wx:if="{{item.bookDate.length==0}}"><text data-event-opts="{{[['tap',[['onShowDatePicker',['datetime','$0'],[[['unfinishList','',ikey]]]]]]]}}" class="u-font-24 underLine" bindtap="__e">(未预约)</text></block><block wx:if="{{item.bookDate.length>0}}"><text class="u-font-24">{{"(预约:"+item.bookDate+")"}}</text></block><text class="u-font-24 u-m-r-24">{{item.status}}</text></view><mx-date-picker vue-id="{{'6cf9683a-1-'+ikey}}" show="{{showPicker}}" type="{{type}}" value="{{value}}" show-tips="{{true}}" begin-text="入住" end-text="离店" show-seconds="{{true}}" data-event-opts="{{[['^confirm',[['onSelected']]],['^cancel',[['onSelected']]]]}}" bind:confirm="__e" bind:cancel="__e" bind:__l="__l"></mx-date-picker></view></block></block><block wx:for="{{finishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==2}}"><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['finishList','',ikey]]]]]]]}}" class="itemView" bindtap="__e"><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.orderType}}</text><text class="u-font-24 u-m-r-24">{{item.date}}</text></view><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.product}}</text><text class="u-font-24 u-m-r-24">{{item.status}}</text></view></view></block></block></view></view>
\ No newline at end of file
<view class="backView"><view class="topView"><view data-event-opts="{{[['tap',[['topClick',[0]]]]]}}" class="topItemView u-m-l-80" bindtap="__e"><text class="{{[activeTop==0?'activeItemText':'topItemText']}}">未完成</text><block wx:if="{{activeTop==0}}"><view class="activeItemBottom"></view></block></view><view data-event-opts="{{[['tap',[['topClick',[1]]]]]}}" class="topItemView u-m-r-80" bindtap="__e"><text class="{{[activeTop==1?'activeItemText':'topItemText']}}">已完成</text><block wx:if="{{activeTop==1}}"><view class="activeItemBottom"></view></block></view></view><view class="listView"><block wx:for="{{grabList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==0}}"><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['grabList','',ikey]]]]]]]}}" class="itemView" bindtap="__e"><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.product}}</text><text class="u-font-24 u-m-r-24">{{item.status}}</text></view></view></block></block><block wx:for="{{unfinishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==1}}"><view class="itemView"><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['unfinishList','',ikey]]]]]]]}}" class="nameView" bindtap="__e"><text class="u-font-24 u-m-l-24">{{item.orderType}}</text><text class="u-font-24 u-m-r-24">{{item.date}}</text></view><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['unfinishList','',ikey]]]]]]]}}" class="nameView" bindtap="__e"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text data-event-opts="{{[['tap',[['itemClick',['$0'],[[['unfinishList','',ikey]]]]]]]}}" class="u-font-24 u-m-l-24 u-m-r-24" bindtap="__e">{{item.address}}</text><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.product}}</text><block wx:if="{{item.bookDate.length==0}}"><text data-event-opts="{{[['tap',[['onShowDatePicker',['datetime','$0'],[[['unfinishList','',ikey]]]]]]]}}" class="u-font-24 underLine" bindtap="__e">(未预约)</text></block><block wx:if="{{item.bookDate.length>0}}"><text class="u-font-24">{{"(预约:"+item.bookDate+")"}}</text></block><text class="u-font-24 u-m-r-24">{{item.status}}</text></view><mx-date-picker vue-id="{{'6cf9683a-1-'+ikey}}" show="{{showPicker}}" type="{{type}}" value="{{value}}" show-tips="{{true}}" begin-text="入住" end-text="离店" show-seconds="{{true}}" data-event-opts="{{[['^confirm',[['onSelected']]],['^cancel',[['onSelected']]]]}}" bind:confirm="__e" bind:cancel="__e" bind:__l="__l"></mx-date-picker></view></block></block><block wx:for="{{finishList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><block wx:if="{{activeTop==2}}"><view data-event-opts="{{[['tap',[['itemClick',['$0'],[[['finishList','',ikey]]]]]]]}}" class="itemView" bindtap="__e"><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.orderType}}</text><text class="u-font-24 u-m-r-24">{{item.date}}</text></view><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.name+" "+item.phone}}</text><text class="u-font-24 u-m-r-24">{{item.type}}</text></view><text class="u-font-24 u-m-l-24 u-m-r-24">{{item.address}}</text><view class="nameView"><text class="u-font-24 u-m-l-24">{{item.product}}</text><text class="u-font-24 u-m-r-24">{{item.status}}</text></view></view></block></block></view></view>
\ No newline at end of file
.backView{
background-color: #FAFAFA;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
}
.topView{
display: -webkit-box;
display: -webkit-flex;
......@@ -9,22 +24,35 @@
flex-direction: row;
}
.topItemView{
background-color: #FFFFFF;
background-color: #FAFAFA;
width: 33%;
height: 80rpx;
height: 94rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
border: 2rpx solid #999999;
}
.topItemText{
font-size: 28rpx;
margin-top: 22rpx;
font-size: 32rpx;
color: #999999;
}
.activeItemText{
margin-top: 22rpx;
font-size: 32rpx;
color: #333333;
}
.activeItemBottom{
margin-top: 10rpx;
background-color: #2272FF;
width: 70rpx;
height: 6rpx;
}
.activeColor{
background-color: #999999;
......
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