clunt
/
dingdong-master
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

后台接口对接，调整页面显示，隐藏或提示开发中内容，

This commit is contained in:
donqi 2022-07-10 19:58:22 +08:00
parent 6b46bf6c81
commit 1c611fe3c3
12 changed files with 190 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/js/data.js
View File

@ -16,7 +16,7 @@ const moduleBarInfos = [{
cuIcon: 'message', cuIcon: 'message',
pageCode: 'msgPage', pageCode: 'msgPage',
name: '消息', name: '消息',
countTag: 100 countTag: 0
}, { }, {
id: 4, id: 4,
cuIcon: 'my', cuIcon: 'my',

2
common/js/globalData.js
View File

@ -2,7 +2,7 @@ export default {
deptId: 101, deptId: 101,
from: 'server', from: 'server',
initPageNum: 1, initPageNum: 1,
initPageSize: 1, initPageSize: 10,
timeRangeList: [ timeRangeList: [
'08:00-08:30', '08:00-08:30',
'08:30-09:00', '08:30-09:00',

35
components/default-toast/bg-toast.vue Normal file
View File

@ -0,0 +1,35 @@
<template>
<view>
<view class="padding-xl text-gray text-center">
<view class="big-icon padding-tb" :class="'cuIcon-' + icon"></view>
<view class="text-lg">功能开发中，暂无法使用</view>
</view>
</view>
</template>
<script>
export default {
name: 'bg-toast',
props: {
icon: {
type: String,
default: ''
},
msg: {
type: String,
default: ''
}
},
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>

27
pages/area-proxy/my-team.vue
View File

@ -1,7 +1,11 @@
<template> <template>
<view> <view>
<!-- 顶部操作条 --> <!-- 顶部操作条 -->
<cu-custom :bgColor="'bg-main-color'" :isBack="true"> <cu-custom :bgColor="'bg-main-color'" :isBack="false" :isBackHome="true" :homePageUrl="'/pages/index/index'" v-if="backIndex">
<block slot="backHomeText">首页</block>
<block slot="content">我的团队</block>
</cu-custom>
<cu-custom :bgColor="'bg-main-color'" :isBack="true" v-else>
<block slot="backText">返回</block> <block slot="backText">返回</block>
<block slot="content">我的团队</block> <block slot="content">我的团队</block>
</cu-custom> </cu-custom>
@ -58,7 +62,8 @@
<set-take-rate ref="setTakeRateModal" :leaderTeamRate="Number(curUserInfo.leaderTeamRate)*100" <set-take-rate ref="setTakeRateModal" :leaderTeamRate="Number(curUserInfo.leaderTeamRate)*100"
:leaderTeamMoney="curUserInfo.leaderTeamMoney" @confirm="applySetTakeRate"></set-take-rate> :leaderTeamMoney="curUserInfo.leaderTeamMoney" @confirm="applySetTakeRate"></set-take-rate>
<invite-master ref="inviteMasterModal" :inviteMasterObj="inviteMasterObj" @confirm="inviteMaster"></invite-master> <invite-master ref="inviteMasterModal" :inviteMasterObj="inviteMasterObj" @confirm="inviteMaster"></invite-master>
<confirm-modal ref="confirmModal" :content="'当前无法加入师傅团队，请先登录并完成师傅入驻申请。'" @confirm="goToIndex"></confirm-modal> <confirm-modal ref="loginTipModal" :content="'当前无法加入师傅团队，请先登录。'" @confirm="goToPage('/pages/index/index')"></confirm-modal>
<confirm-modal ref="certifyTipModal" :content="'当前无法加入师傅团队，请先完成师傅实名及银行账户绑定。'" @confirm="goToPage('/pages/index/index?menuCode=myPage')"></confirm-modal>
</view> </view>
</template> </template>
@ -75,6 +80,7 @@
}, },
data() { data() {
return { return {
backIndex: false,
members: [], members: [],
pageNum: 0, pageNum: 0,
pageSize: 0, pageSize: 0,
@ -86,6 +92,7 @@
if (options && options.inviteMasterObj) { if (options && options.inviteMasterObj) {
// 点击邀请链接进入的页面 // 点击邀请链接进入的页面
this.beInvited2Team(JSON.parse(decodeURIComponent(options.inviteMasterObj))); this.beInvited2Team(JSON.parse(decodeURIComponent(options.inviteMasterObj)));
this.backIndex = true;
} else { } else {
this.loadData(); this.loadData();
} }
@ -94,7 +101,7 @@
return { return {
title: '邀请你成为我的团队成员', title: '邀请你成为我的团队成员',
path: '/pages/area-proxy/my-team?inviteMasterObj=' + encodeURIComponent(JSON.stringify(this.curUserInfo)), path: '/pages/area-proxy/my-team?inviteMasterObj=' + encodeURIComponent(JSON.stringify(this.curUserInfo)),
// imageUrl: 'https://ossweb-img.qq.com/images/lol/web201310/skin/big5000.jpg' imageUrl: 'http://gqz.opsoul.com/sys/group-selfie.png'
} }
}, },
methods: { methods: {
@ -102,9 +109,12 @@
this.loadBasicData(); this.loadBasicData();
this.inviteMasterObj = inviteMasterObj; this.inviteMasterObj = inviteMasterObj;
let curUserInfo = await this.login(); let curUserInfo = await this.login();
if (curUserInfo == null || curUserInfo.status !== 0) { if (!curUserInfo) {
// 提示登录和入驻成为师傅，返回首页 // 提示登录，返回首页
this.showModalByRef('confirmModal'); this.showModalByRef('loginTipModal');
} else if (curUserInfo.status !== 0) {
// 提示绑卡和实名，返回首页
this.showModalByRef('certifyTipModal');
} else { } else {
this.showModalByRef('inviteMasterModal'); this.showModalByRef('inviteMasterModal');
} }
@ -115,9 +125,9 @@
// 返回缓存中的userInfo // 返回缓存中的userInfo
return this.$request.getCurUserInfo(); return this.$request.getCurUserInfo();
}, },
goToIndex() { goToPage(pageUrl) {
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/index' url: pageUrl
}) })
}, },
loadBasicData() { loadBasicData() {
@ -132,7 +142,6 @@
this.loadTeamPage(); this.loadTeamPage();
}, },
async reloadData() { async reloadData() {
this.loadBasicData();
this.members = []; this.members = [];
this.loadData(); this.loadData();
}, },

45
pages/index/index-home.vue
View File

@ -1,7 +1,7 @@
<template> <template>
<view> <view>
<view class="padding bg-gradual-color" <!-- <view class="padding bg-gradual-color" :style="'padding-top: ' + pageContentTop + 'px; padding-bottom: 100rpx;'"> -->
:style="'padding-top: ' + pageContentTop + 'px; padding-bottom: 100rpx;'"> <view class="padding bg-gradual-color" :style="'padding-top: ' + pageContentTop + 'px;'">
<!-- 个人信息栏 --> <!-- 个人信息栏 -->
<view class="flex justify-between padding-bottom align-center solid-bottom"> <view class="flex justify-between padding-bottom align-center solid-bottom">
<view class="flex justify-start align-center"> <view class="flex justify-start align-center">
@ -16,7 +16,7 @@
</view> --> </view> -->
</view> </view>
</view> </view>
<view class="right-tag padding-lr padding-tb-xs" @click="showMasterRule">师傅规则</view> <!-- <view class="right-tag padding-lr padding-tb-xs" @click="showMasterRule">师傅规则</view> -->
</view> </view>
<!-- 未预约，未派单，上门超时 --> <!-- 未预约，未派单，上门超时 -->
<view class="cu-list grid no-border col-3 margin-top-sm" style="background-color: inherit;"> <view class="cu-list grid no-border col-3 margin-top-sm" style="background-color: inherit;">
@ -34,26 +34,31 @@
</view> </view>
</view> </view>
</view> </view>
<view class="margin-lr-sm paper-drawer-bar margin-bottom-with-bar"> <view class="margin-lr-sm margin-bottom-with-bar">
<!-- 今日待上门 --> <!-- 今日待上门 -->
<view class="bg-white padding-lr shadow-warp"> <view class="bg-white padding-lr shadow-warp">
<view class="cu-bar margin-top-sm solid-bottom"> <view class="cu-bar margin-top-sm solid-bottom">
<view class="action bar-first-action"> <view class="action bar-first-action">
<view class="cuIcon-title text-main-color"></view> <view class="cuIcon-title text-main-color"></view>
<text>今日待上门({{myInfo.order.onsiteToday.length}})</text> <text>今日待上门({{waitServOrderToday.length}})</text>
</view> </view>
<view class="flex justify-end text-sm align-center"> <view class="flex justify-end text-sm align-center"
@click="clickServModule({
pageUrl: '/pages/order-manage/order-manage'
})">
<text>即将上门订单</text> <text>即将上门订单</text>
<text class="cuIcon-right"></text> <text class="cuIcon-right"></text>
</view> </view>
</view> </view>
<!-- 轮播 --> <!-- 轮播 -->
<swiper v-if="curUserInfo && curUserInfo.workerId" class="screen-swiper" :autoplay="true" :circular="true"> <swiper v-if="curUserInfo && curUserInfo.workerId" class="screen-swiper" :autoplay="true" :circular="true">
<swiper-item v-for="(item,index) in myInfo.order.onsiteToday" :key="index"> <swiper-item v-for="(item,index) in waitServOrderToday" :key="index">
<view class="padding-sm"> <view class="padding-sm">
<view class="flex justify-between align-center margin-bottom-xs"> <view class="flex justify-between align-center margin-bottom-xs">
<view class="text-lg">{{item.work}}</view> <view class="text-lg">{{item.goodsName}}</view>
<view class="text-red">{{item.datetime}}</view> </view>
<view>
时间：<text class="text-red">{{item.expectTimeStart + ' - ' + item.expectTimeEnd}}</text>
</view> </view>
<view>地址：{{item.address}}</view> <view>地址：{{item.address}}</view>
</view> </view>
@ -64,7 +69,7 @@
</view> </view>
</view> </view>
<!-- 每周公告 --> <!-- 每周公告 -->
<view class="padding bg-white shadow-warp margin-top-sm" v-if="curUserInfo && curUserInfo.workerId"> <!-- <view class="padding bg-white shadow-warp margin-top-sm" v-if="curUserInfo && curUserInfo.workerId">
<view class="flex justify-between align-center"> <view class="flex justify-between align-center">
<view class=""> <view class="">
<text class="text-main-color">[每周公告]</text> <text class="text-main-color">[每周公告]</text>
@ -75,7 +80,7 @@
<view class="cuIcon-right"></view> <view class="cuIcon-right"></view>
</view> </view>
</view> </view>
</view> </view> -->
<!-- 功能模块 --> <!-- 功能模块 -->
<view class="margin-lr-sm margin-top"> <view class="margin-lr-sm margin-top">
<view class="text-lg">服务中心</view> <view class="text-lg">服务中心</view>
@ -147,6 +152,7 @@
}], }],
curUserInfo: {}, curUserInfo: {},
myInfo: {}, myInfo: {},
waitServOrderToday: [],
isShowSteer: false, isShowSteer: false,
isAuthWxLoginModal: false, isAuthWxLoginModal: false,
isAuthWxPhoneModal: false, isAuthWxPhoneModal: false,
@ -200,6 +206,17 @@
.stringify(paramObj)); .stringify(paramObj));
} }
this.servModules = newServModules; this.servModules = newServModules;
// 获取今日待上门单
this.loadTodayWaitServOrder();
},
async loadTodayWaitServOrder() {
let date = new Date();
let waitServRes = await this.$request.qryDetailOrderPage({
orderStatus: 2,
expectTimeStart: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 00:00:00",
expectTimeEnd: date.getFullYear() + '-' + (date.getMonth() + 1) + '-' + date.getDate() + " 23:59:59"
});
this.waitServOrderToday = waitServRes.rows;
}, },
async chooseEntryType(typeCode) { async chooseEntryType(typeCode) {
let status = 1; let status = 1;
@ -238,6 +255,10 @@
url: pageObj.pageUrl url: pageObj.pageUrl
}) })
} }
} else {
uni.navigateTo({
url: pageObj.pageUrl
})
} }
} }
}, },
@ -263,7 +284,7 @@
} }
.screen-swiper { .screen-swiper {
height: 180rpx; height: 210rpx;
min-height: unset; min-height: unset;
} }

14
pages/index/msg-home.vue
View File

@ -4,8 +4,9 @@
<cu-custom :bgColor="'bg-main-color'"> <cu-custom :bgColor="'bg-main-color'">
<block slot="content">消息大厅</block> <block slot="content">消息大厅</block>
</cu-custom> </cu-custom>
<bg-toast :icon="'repair'" :msg="'开发中'"></bg-toast>
<!-- 消息分类 --> <!-- 消息分类 -->
<view class="solid-bottom"> <!-- <view class="solid-bottom">
<view class='bg-white grid grid-square col-4 padding-sm'> <view class='bg-white grid grid-square col-4 padding-sm'>
<view class="text-center shadow-warp" :class="curMsgType === 0 ? 'bg-main-color light' : 'bg-gray'" <view class="text-center shadow-warp" :class="curMsgType === 0 ? 'bg-main-color light' : 'bg-gray'"
@click="changeCurMsgType(0)"> @click="changeCurMsgType(0)">
@ -36,9 +37,9 @@
<view>系统通知</view> <view>系统通知</view>
</view> </view>
</view> </view>
</view> </view> -->
<!-- 消息列表 --> <!-- 消息列表 -->
<view class="cu-list menu-avatar"> <!-- <view class="cu-list menu-avatar">
<view class="cu-item bottom-border" v-for="(item,index) in msgList" @click="showMsgDetail(item)"> <view class="cu-item bottom-border" v-for="(item,index) in msgList" @click="showMsgDetail(item)">
<view class="cu-avatar radius lg" <view class="cu-avatar radius lg"
style="background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Morgana.png);"></view> style="background-image:url(https://ossweb-img.qq.com/images/lol/img/champion/Morgana.png);"></view>
@ -55,13 +56,18 @@
<view class="cu-tag round bg-red sm">{{item.amount}}</view> <view class="cu-tag round bg-red sm">{{item.amount}}</view>
</view> </view>
</view> </view>
</view> </view> -->
</view> </view>
</template> </template>
<script> <script>
import bgToast from '@/components/default-toast/bg-toast.vue';
export default { export default {
name: 'msg-home', name: 'msg-home',
components: {
bgToast
},
data() { data() {
return { return {
curMsgType: 0, curMsgType: 0,

24
pages/index/my-home.vue
View File

@ -8,11 +8,11 @@
<view class="text-xl margin-sm">{{curUserInfo.name}}</view> <view class="text-xl margin-sm">{{curUserInfo.name}}</view>
<view class="cu-list grid no-border col-2" style="background-color: inherit;"> <view class="cu-list grid no-border col-2" style="background-color: inherit;">
<view class="cu-item" @click="clickMenuItem({pageUrl: '/pages/my/my-money-bag'})"> <view class="cu-item" @click="clickMenuItem({pageUrl: '/pages/my/my-money-bag'})">
<view class="margin-bottom-xs text-xxl">{{myInfo.balance}}</view> <view class="margin-bottom-xs text-xxl">0</view>
<view>我的钱包</view> <view>我的钱包</view>
</view> </view>
<view class="cu-item solid-left"> <view class="cu-item solid-left">
<view class="margin-bottom-xs text-xxl">{{myInfo.rate}}</view> <view class="margin-bottom-xs text-xxl">5.0</view>
<view>服务评分</view> <view>服务评分</view>
</view> </view>
</view> </view>
@ -41,8 +41,10 @@
</view> </view>
</view> </view>
<view class="bg-white"> <view class="bg-white">
<view class="margin-top"> <view class="margin-top margin-lr-sm">
<view class="flex justify-between align-center solid-bottom padding padding-lr-lg text-lg" v-for="(item, index) in menuList" @click="clickMenuItem(item)"> <view class="flex justify-between align-center solid-bottom padding padding-lr-lg text-lg"
v-for="(item, index) in menuList" @click="clickMenuItem(item)"
v-if="item.show">
<view class="flex justify-start align-center"> <view class="flex justify-start align-center">
<view class="margin-right-sm text-main-color text-xl"><view :class="'cuIcon-' + item.icon"></view></view> <view class="margin-right-sm text-main-color text-xl"><view :class="'cuIcon-' + item.icon"></view></view>
<view>{{item.name}}</view> <view>{{item.name}}</view>
@ -65,24 +67,28 @@
curCertifyInfo: null, curCertifyInfo: null,
myInfo: {}, myInfo: {},
menuList: [{ menuList: [{
name: '提现', name: '提现账户',
icon: 'moneybag', icon: 'moneybag',
pageUrl: '/pages/my/withdraw' pageUrl: '/pages/my/withdraw',
show: true
}, { }, {
name: '交易明细', name: '交易明细',
icon: 'form', icon: 'form',
pageUrl: '/pages/my/my-money-bag' pageUrl: '/pages/my/my-money-bag',
show: true
}, { }, {
name: '服务明细', name: '服务明细',
icon: 'calendar' icon: 'calendar'
}, { }, {
name: '师傅入驻', name: '师傅入驻',
icon: 'profile', icon: 'profile',
pageUrl: '/pages/my/master-settled-info' pageUrl: '/pages/my/master-settled-info',
show: true
}, { }, {
name: '个人信息', name: '个人信息',
icon: 'lock', icon: 'lock',
pageUrl: '/pages/my/personal-info' pageUrl: '/pages/my/personal-info',
show: true
}, { }, {
name: '法律声明', name: '法律声明',
icon: 'read' icon: 'read'

6
pages/my/my-money-bag.vue
View File

@ -5,24 +5,22 @@
<block slot="backText">返回</block> <block slot="backText">返回</block>
<block slot="content">我的钱包</block> <block slot="content">我的钱包</block>
</cu-custom> </cu-custom>
<view class="margin-sm shadow-warp"> <!-- <view class="margin-sm shadow-warp">
<view class="padding-tb-lg padding-lr bg-gradual-color light"> <view class="padding-tb-lg padding-lr bg-gradual-color light">
<view>账户余额（元）</view> <view>账户余额（元）</view>
<view class="flex justify-between margin-top-sm"> <view class="flex justify-between margin-top-sm">
<!-- <view class="text-xxl">{{myMoneyBag.balance}}</view> -->
<view class="text-xxl">--</view> <view class="text-xxl">--</view>
<view class="cu-btn bg-white radius">充值</view> <view class="cu-btn bg-white radius">充值</view>
</view> </view>
</view> </view>
<view class="padding bg-white flex justify-between"> <view class="padding bg-white flex justify-between">
<!-- <view>可提现金额：<text class="text-price text-black">{{myMoneyBag.balanceToExtract}}</text></view> -->
<view>可提现金额：<text class="text-price text-black">--</text></view> <view>可提现金额：<text class="text-price text-black">--</text></view>
<view> <view>
<text>提现</text> <text>提现</text>
<text class="cuIcon-right"></text> <text class="cuIcon-right"></text>
</view> </view>
</view> </view>
</view> </view> -->
<uni-collapse v-model="openStatusArr[index]" ref="collapse" v-for="(billItem, index) in bill"> <uni-collapse v-model="openStatusArr[index]" ref="collapse" v-for="(billItem, index) in bill">
<uni-collapse-item> <uni-collapse-item>
<template v-slot:title> <template v-slot:title>

4
pages/my/personal-info.vue
View File

@ -31,9 +31,9 @@
</view> </view>
</view> </view>
<!-- 底部操作栏 --> <!-- 底部操作栏 -->
<view class="cu-bar tabbar border shop fixed-bottom-bar"> <!-- <view class="cu-bar tabbar border shop fixed-bottom-bar">
<button class="cu-btn bg-main-color long-btn margin-lr-sm shadow-blur" form-type="submit">保存</button> <button class="cu-btn bg-main-color long-btn margin-lr-sm shadow-blur" form-type="submit">保存</button>
</view> </view> -->
</form> </form>
</view> </view>
</template> </template>

28
pages/my/withdraw.vue
View File

@ -3,9 +3,9 @@
<!-- 顶部操作条 --> <!-- 顶部操作条 -->
<cu-custom :bgColor="'bg-main-color'" :isBack="true"> <cu-custom :bgColor="'bg-main-color'" :isBack="true">
<block slot="backText">返回</block> <block slot="backText">返回</block>
<block slot="content">提现</block> <block slot="content">提现账户</block>
</cu-custom> </cu-custom>
<view class="margin-lr-sm margin-tb-lg shadow-warp"> <!-- <view class="margin-lr-sm margin-tb-lg shadow-warp">
<view @click="bindAccount"> <view @click="bindAccount">
<view v-if="bindBankCard && bindBankCard.bankNum" class="bg-gray flex justify-between align-center text-xl padding"> <view v-if="bindBankCard && bindBankCard.bankNum" class="bg-gray flex justify-between align-center text-xl padding">
<view> <view>
@ -45,11 +45,27 @@
</view> </view>
</view> </view>
</view> </view>
</view> -->
<view class="margin-sm shadow-warp">
<view class="padding-tb-lg padding-lr bg-gradual-color light" v-if="bindBankCard && bindBankCard.bankNum">
<view>提现账户</view>
<view class="flex justify-between margin-top-sm">
<!-- <text class="cu-tag bg-white radius margin-right-sm">已绑定</text> -->
<text class="text-xxl">{{bindBankCard.encodeBankNum}}</text>
<view class="cu-btn bg-white radius" @click="bindAccount">帐号另绑</view>
</view>
</view>
<view class="padding-tb-lg padding-lr bg-gradual-color light" v-else>
<view class="padding-bottom">提现帐号未绑定</view>
<view class="cu-btn bg-white radius" @click="bindAccount">前往绑定</view>
</view>
<view class="padding bg-white flex justify-between">
</view>
</view> </view>
<!-- 操作按钮 --> <!-- 操作按钮 -->
<view class="margin-lr"> <!-- <view class="margin-lr">
<button class="cu-btn lg bg-main-color long-btn shadow-blur" @click="withdraw">提现</button> <button class="cu-btn lg bg-main-color long-btn shadow-blur" @click="withdraw">提现</button>
</view> </view> -->
</view> </view>
</template> </template>
@ -82,7 +98,9 @@
workerId: this.curUserInfo.workerId workerId: this.curUserInfo.workerId
}); });
this.bindBankCard = res.data; this.bindBankCard = res.data;
this.bindBankCard.encodeBankNum = '****' + this.bindBankCard.bankNum.substring(this.bindBankCard.bankNum.length - 4); if (this.bindBankCard && this.bindBankCard.bankNum) {
this.bindBankCard.encodeBankNum = '****' + this.bindBankCard.bankNum.substring(this.bindBankCard.bankNum.length - 4);
}
}, },
bindAccount() { bindAccount() {
uni.navigateTo({ uni.navigateTo({

12
pages/order-manage/order-manage.vue
View File

@ -113,6 +113,10 @@
:second="$dateUtil.countDownDiff(order.expectTimeEnd).seconds"> :second="$dateUtil.countDownDiff(order.expectTimeEnd).seconds">
</uni-countdown> </uni-countdown>
</view> </view>
<view class="margin-top-sm" v-if="order.orderStatus > 3">
<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
<text>完成时间：{{order.workFinishTime}}</text>
</view>
<view class="margin-top-sm flex justify-start align-center" v-if="order.subState === 4 && order.chargeReachDate"> <view class="margin-top-sm flex justify-start align-center" v-if="order.subState === 4 && order.chargeReachDate">
<text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text> <text class="text-main-color text-lg margin-right-xs"><text class="cuIcon-time"></text></text>
<text>距到帐：</text> <text>距到帐：</text>
@ -128,9 +132,11 @@
<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-popup="dispatchOrder" @click="getCanAssignList(order)" @tap="togglePopup($event, order)">派单</button> <!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-popup="dispatchOrder" @click="getCanAssignList(order)" @tap="togglePopup($event, order)">派单</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm">改价</button> <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm">改价</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm">转发</button> --> <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm">转发</button> -->
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="showServOrderDetail(order)">查看</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="updateMasterOrder(order, 1)">确认接单</button> <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="updateMasterOrder(order, 1)">确认接单</button>
</view> </view>
<view v-if="order.orderStatus === 1"> <view v-if="order.orderStatus === 1">
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="showServOrderDetail(order)">查看</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-popup="dispatchOrder" @click="getCanAssignList(order)" @tap="togglePopup($event, order)">派单</button> <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-popup="dispatchOrder" @click="getCanAssignList(order)" @tap="togglePopup($event, order)">派单</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="assignWork2MySelf(order)">自己承接</button> <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="assignWork2MySelf(order)">自己承接</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showTimeArrangeModal" @tap="showModal($event, order)">预约时间</button> <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showTimeArrangeModal" @tap="showModal($event, order)">预约时间</button>
@ -149,9 +155,9 @@
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="finishOrder(order)" v-if="order.payStatus === 1">发起完单</button> <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="finishOrder(order)" v-if="order.payStatus === 1">发起完单</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showPayQrcodeModal" v-if="order.payStatus === 0" @tap="makePayQrcode($event, order)">生成收款码</button> <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showPayQrcodeModal" v-if="order.payStatus === 0" @tap="makePayQrcode($event, order)">生成收款码</button>
</view> </view>
<!-- <view v-if="order.orderStatus === 4"> <view v-if="order.orderStatus === 4 || order.orderStatus === 5">
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="sendUrgentMsgModal" @tap="showModal($event, order)">师傅急报</button> <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="showServOrderDetail(order)">查看</button>
</view> --> </view>
<!-- <view v-if="order.orderStatus === 'afterSaleService'"> <!-- <view v-if="order.orderStatus === 'afterSaleService'">
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="makePhoneCall(order.customerPhone)">联系客户</button> <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="makePhoneCall(order.customerPhone)">联系客户</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showEditTimeArrangeModal" @tap="showModal($event, order)">修改时间</button> <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showEditTimeArrangeModal" @tap="showModal($event, order)">修改时间</button>

49
pages/order-manage/serv-detail.vue
View File

@ -32,8 +32,11 @@
<view class="bg-white margin-lr-sm margin-top-sm padding"> <view class="bg-white margin-lr-sm margin-top-sm padding">
<view class="flex align-center"> <view class="flex align-center">
<text class="text-xl margin-right">{{servDetail.goodsName}}</text> <text class="text-xl margin-right">{{servDetail.goodsName}}</text>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 5">已完成</view>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 4">待确认</view>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 3">服务中</view> <view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 3">服务中</view>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 2">待上门</view> <view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 2">待上门</view>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus === 1">未约/未排</view>
</view> </view>
<!-- <view class="margin-top-sm"> <!-- <view class="margin-top-sm">
<view v-for="(item, index) in servDetail.mainServOrder.orderTag" class='cu-tag radius margin-right-sm'> <view v-for="(item, index) in servDetail.mainServOrder.orderTag" class='cu-tag radius margin-right-sm'>
@ -56,7 +59,7 @@
<text class="cuIcon-time text-main-color margin-right-xs"></text> <text class="cuIcon-time text-main-color margin-right-xs"></text>
<text>排单时间：{{servDetail.mainServOrder.boodTime}}</text> <text>排单时间：{{servDetail.mainServOrder.boodTime}}</text>
</view> --> </view> -->
<view class="margin-top-sm" v-if="servDetail.orderStatus === 3"> <view class="margin-top-sm" v-if="servDetail.orderStatus >= 3">
<text class="cuIcon-time text-main-color margin-right-xs"></text> <text class="cuIcon-time text-main-color margin-right-xs"></text>
<text>上门时间：{{servDetail.workBeginTime}}</text> <text>上门时间：{{servDetail.workBeginTime}}</text>
</view> </view>
@ -86,12 +89,12 @@
</view> </view>
</view> </view>
<!-- 完成记录 --> <!-- 完成记录 -->
<view class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm" v-for="(item, index) in servDetail.standardList"> <view v-if="[0, 1].indexOf(servDetail.orderStatus) === -1" class="bg-white margin-lr-sm padding-lr padding-bottom margin-top-sm" v-for="(item, index) in servDetail.standardList">
<view class="cu-bar solid-bottom"> <view class="cu-bar solid-bottom">
<view class="action bar-first-action"> <view class="action bar-first-action">
<text class="cuIcon-titles text-main-color"></text> 完成记录 <text class="cuIcon-titles text-main-color"></text> 完成记录
</view> </view>
<view class='cu-tag bg-purple radius light margin-right-sm' v-if="item.finishTime">{{item.finishTime}}</view> <view class='cu-tag bg-purple radius light margin-right-sm' v-if="servDetail.orderStatus > 3">{{servDetail.workFinishTime}}</view>
</view> </view>
<view class="margin-top-sm"> <view class="margin-top-sm">
<product-picked :pickedList="[item]" :columnTitleArr="servedColumnHeaders" :valFieldArr="servedValFields"></product-picked> <product-picked :pickedList="[item]" :columnTitleArr="servedColumnHeaders" :valFieldArr="servedValFields"></product-picked>
@ -99,12 +102,13 @@
</view> </view>
<!-- 订单编码和时间 --> <!-- 订单编码和时间 -->
<view class="bg-white margin-top-sm padding margin-lr-sm margin-bottom-with-bar"> <view class="bg-white margin-top-sm padding margin-lr-sm margin-bottom-with-bar">
<view>订单编码：{{servDetail.orderDetailCode}}</view> <view v-if="[0, 1].indexOf(servDetail.orderStatus) !== -1">订单编码：{{servDetail.orderMasterCode}}</view>
<view v-else>订单编码：{{servDetail.orderDetailCode}}</view>
<view class="margin-top-xs">订单时间：{{servDetail.createTime}}</view> <view class="margin-top-xs">订单时间：{{servDetail.createTime}}</view>
</view> </view>
<!-- 底部操作栏 --> <!-- 底部操作栏 -->
<view class="cu-bar bg-white tabbar border fixed-bottom-bar"> <view class="cu-bar bg-white tabbar border fixed-bottom-bar" v-if="servDetail.orderStatus === 2">
<view class="action" data-popup="orderManage" @click="togglePopup"> <!-- <view class="action" data-popup="orderManage" @click="togglePopup">
<view class="cuIcon-list"></view> 订单管理 <view class="cuIcon-list"></view> 订单管理
</view> </view>
<view class="action" data-modal="sendUrgentMsgModal" @click="showModal"> <view class="action" data-modal="sendUrgentMsgModal" @click="showModal">
@ -112,6 +116,10 @@
<view class="cu-tag badge" v-if="servDetail.talkMsgNum > 0">{{servDetail.talkMsgNum}}</view> <view class="cu-tag badge" v-if="servDetail.talkMsgNum > 0">{{servDetail.talkMsgNum}}</view>
</view> </view>
发送急报 发送急报
</view> -->
<view class="action" data-popup="orderManage">
</view>
<view class="action" data-modal="sendUrgentMsgModal">
</view> </view>
<view v-if="servDetail.orderStatus === 2" class="bg-main-color submit" @click="workBegin">立即上门</view> <view v-if="servDetail.orderStatus === 2" class="bg-main-color submit" @click="workBegin">立即上门</view>
</view> </view>
@ -172,23 +180,25 @@
if (options && options.order) { if (options && options.order) {
this.order = JSON.parse(decodeURIComponent(options.order)); this.order = JSON.parse(decodeURIComponent(options.order));
} }
this.loadData(this.order.orderDetailId); this.loadData();
}, },
methods: { methods: {
async loadData(orderDetailId) { async loadData() {
// this.servDetail = await this.$api.data('servDetail'); let orderId = null;
let servDetailRes = await this.$request.getOrderDetail({ let funName = null;
id: orderDetailId if ([0, 1].indexOf(this.order.orderStatus) !== -1) {
// 展示主单信息
orderId = this.order.orderMasterId;
funName = "getOrderMasterDetail";
} else {
// 展示子单信息
orderId = this.order.orderDetailId;
funName = "getOrderDetail";
}
let servDetailRes = await this.$request[funName]({
id: orderId
}); });
this.servDetail = servDetailRes.data; this.servDetail = servDetailRes.data;
// this.finishList4Show = this.servDetail.finishRecord;
// for (let i = 0; i < this.finishList4Show.length; i++) {
// let finishList = this.finishList4Show[i].finishList;
// for (let j = 0; j < finishList.length; j++) {
// finishList[j].secondColumnNum = finishList[j].servedNum;
// }
// this.finishList4Show[i].finishList = finishList;
// }
}, },
changePopupState(e) { changePopupState(e) {
this.ifShowPageMeta = e.show; this.ifShowPageMeta = e.show;
@ -224,7 +234,6 @@
orderStatus: 3, orderStatus: 3,
workBeginTime: formatCurDate workBeginTime: formatCurDate
} }
console.log(params)
let res = await this.$request.updateDetailOrder(params); let res = await this.$request.updateDetailOrder(params);
if (res && res.code === 0) { if (res && res.code === 0) {
this.loadData(this.servDetail.orderDetailId); this.loadData(this.servDetail.orderDetailId);