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

问题修复

This commit is contained in:
donqi 2022-06-22 17:40:50 +08:00
parent 9b4574f9a2
commit 222a0fabb0
7 changed files with 603 additions and 517 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/ay-qrcode/ay-qrcode.vue
View File

@ -366,8 +366,8 @@
.canvas-qrcode { .canvas-qrcode {
margin: auto; margin: auto;
display: inline-block; // display: inline-block;
float: left; // float: left;
} }

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

@ -6,10 +6,10 @@
<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">
<view class="cu-avatar round" <view class="cu-avatar round"
:style="'width: 120rpx; height: 120rpx; background-image:url(' + curUserInfo.workerLogoUrl + ');'"> :style="'width: 120rpx; height: 120rpx; background-image:url(' + curUserInfo.deptLogoUrl + ');'">
</view> </view>
<view class="margin-lr-sm"> <view class="margin-lr-sm">
<view class="text-xl margin-bottom-xs">{{curUserInfo.name}}</view> <view class="text-xl margin-bottom-xs">{{curUserInfo.deptName}}</view>
<!-- <view class="padding-xs text-sm"> <!-- <view class="padding-xs text-sm">
<view class='cu-tag bg-white radius'>编辑</view> <view class='cu-tag bg-white radius'>编辑</view>
</view> --> </view> -->

13
pages/index/index.vue
View File

@ -29,9 +29,12 @@
curPageCode: 'indexPage' curPageCode: 'indexPage'
} }
}, },
onLoad() { onLoad(options) {
this.loadData(); this.loadData();
this.bindEvent(); this.bindEvent();
if (options && options.menuCode) {
this.changeCurPageCode(options.menuCode)
}
}, },
onUnload() { onUnload() {
this.offEvent(); this.offEvent();
@ -62,7 +65,11 @@
uni.$off('getCurPageInfo') uni.$off('getCurPageInfo')
}, },
changeCurPageCode(targetPageCode) { changeCurPageCode(targetPageCode) {
this.$refs.moduleBar.navChangeByCode(targetPageCode, true); // #ifdef MP
this.$nextTick(() => {
this.$refs.moduleBar.navChangeByCode(targetPageCode, true);
})
// #endif
} }
} }
} }

1023
pages/my/new-serv.vue
View File

File diff suppressed because it is too large Load Diff

4
pages/order-manage/modal/edit-time-arrange.vue
View File

@ -22,7 +22,7 @@
<view class="margin-bottom-xs"> <view class="margin-bottom-xs">
<view class="margin-bottom-xs">选择日期：</view> <view class="margin-bottom-xs">选择日期：</view>
<picker mode="date" :value="date" :start="curDate" @change="dateChange"> <picker mode="date" :value="date" :start="curDate" @change="dateChange">
<input class="radius-input" v-model="date"></input> <input class="radius-input" v-model="date" disabled></input>
</picker> </picker>
</view> </view>
<view> <view>
@ -34,7 +34,7 @@
<text class="margin-lr-xs">或</text> --> <text class="margin-lr-xs">或</text> -->
<picker mode="selector" :value="timeRangeIndex" :range="timeRangeList" <picker mode="selector" :value="timeRangeIndex" :range="timeRangeList"
@change="timeRangeChange"> @change="timeRangeChange">
<input class="radius-input" v-model="timeRange"></input> <input class="radius-input" v-model="timeRange" disabled></input>
</picker> </picker>
</view> </view>
</view> </view>

16
pages/order-manage/modal/pay-qrcode.vue
View File

@ -1,23 +1,23 @@
<template> <template>
<!-- 报价/客户支付模态框 --> <!-- 报价/客户支付模态框 -->
<view class="cu-modal" :class="show?'show':''"> <view class="cu-modal" :class="show?'show':''">
<view class="cu-dialog"> <view class="cu-dialog bg-white">
<view class="cu-bar bg-white justify-end"> <view class="cu-bar bg-white justify-end">
<view class="content">支付宝扫码支付</view> <view class="content">支付宝扫码支付</view>
<view class="action" data-modal="showPayQrcodeModal" @click="finishQrPay"> <view class="action" data-modal="showPayQrcodeModal" @click="finishQrPay">
<text class="cuIcon-close text-red"></text> <text class="cuIcon-close text-red"></text>
</view> </view>
</view> </view>
<view class="bg-white padding-bottom-xl"> <view class="bg-white">
<view class="padding-tb-sm" style="width: 300px; margin: 0 auto;"> <view class="padding-tb-sm" style="width: 300px; margin: 0 auto;" v-show="modal_qr">
<ayQrcode ref="qrcode" :modal="modal_qr" :url="url" @hideQrcode="hideQrcode" :height="300" <ayQrcode ref="qrcode" :modal="modal_qr" :url="url" @hideQrcode="hideQrcode" :height="300"
:width="300" /> :width="300" />
</view> </view>
</view> </view>
<!-- <view class="text-center padding-bottom-xl"> <view class="text-center padding-bottom-xl">
<view>请客户扫描码付款后方能提交完单</view> <view>请客户扫描码付款后方能提交完单</view>
<view class="text-red">必须按二维码生成金额支付</view> <view class="text-red">必须按二维码生成金额支付</view>
</view> --> </view>
</view> </view>
</view> </view>
</template> </template>
@ -50,12 +50,12 @@
}, },
methods: { methods: {
finishQrPay(e) { finishQrPay(e) {
this.$emit('finishQrPay', e); this.$emit('finishQrPay', e);
this.hideQrcode();
}, },
// 展示二维码 // 展示二维码
showQrcode(url) { showQrcode(url) {
this.url = url; this.url = url;
console.log(url);
let _this = this; let _this = this;
this.modal_qr = true; this.modal_qr = true;
// uni.showLoading() // uni.showLoading()

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

@ -37,7 +37,11 @@
</view> </view>
<!-- 状态分类tab --> <!-- 状态分类tab -->
<view class="cu-list grid no-border col-5 padding-top-sm bg-white"> <view class="cu-list grid no-border col-5 padding-top-sm bg-white">
<view class="cu-item" :class="stateCur === 0 ? 'bg-main-color light' : ''" :data-id="0" @tap="statusSelect"> <view class="cu-item" :class="index==stateCur?'bg-main-color light cur':''" v-for="(item,index) in stateList" :key="index" :data-id="index" @tap="statusSelect">
<view class="margin-bottom-xs">{{item.name}}</view>
<view>(0)</view>
</view>
<!-- <view class="cu-item" :class="stateCur === 0 ? 'bg-main-color light' : ''" :data-id="0" @tap="statusSelect">
<view class="margin-bottom-xs">超时单</view> <view class="margin-bottom-xs">超时单</view>
<view>({{myOrders.summary.overtimeOrderNum}})</view> <view>({{myOrders.summary.overtimeOrderNum}})</view>
</view> </view>
@ -53,10 +57,10 @@
<view class="margin-bottom-xs">急报单</view> <view class="margin-bottom-xs">急报单</view>
<view>({{myOrders.summary.urgentMsgOrderNum}})</view> <view>({{myOrders.summary.urgentMsgOrderNum}})</view>
</view> </view>
<view class="cu-item" :class="stateCur === 4 ? 'bg-main-color light' : ''" :data-id="4" @tap="statusSelect"> <view class="cu-item" :class="stateCur === 0 ? 'bg-main-color light' : ''" :data-id="4" @tap="statusSelect">
<view class="margin-bottom-xs">新订单</view> <view class="margin-bottom-xs">新订单</view>
<view>({{myOrders.summary.newOrderNum}})</view> <view>({{myOrders.summary.newOrderNum}})</view>
</view> </view> -->
</view> </view>
<!-- 子状态分类tab --> <!-- 子状态分类tab -->
<scroll-view scroll-x class="bg-white nav text-center" :scroll-with-animation="true" :scroll-left="scrollLeft"> <scroll-view scroll-x class="bg-white nav text-center" :scroll-with-animation="true" :scroll-left="scrollLeft">
@ -143,7 +147,7 @@
<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>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="finishOrder(order)">发起完单</button> <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="finishOrder(order)">发起完单</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" data-modal="showPayQrcodeModal" @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">
<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" data-modal="sendUrgentMsgModal" @tap="showModal($event, order)">师傅急报</button>
@ -264,22 +268,22 @@
areaMultiIndex: [0, 0, 0], areaMultiIndex: [0, 0, 0],
categoryList: [], categoryList: [],
categoryMultiIndex: [0, 0, 0], categoryMultiIndex: [0, 0, 0],
// stateList: [{ stateList: [{
// code: 1, code: 1,
// name: '超时单' name: '超时单'
// }, { }, {
// code: 2, code: 2,
// name: '今日单' name: '今日单'
// }, { }, {
// code: 3, code: 3,
// name: '明日单' name: '明日单'
// }, { }, {
// code: 4, code: 4,
// name: '急报单' name: '急报单'
// }, { }, {
// code: 5, code: 0,
// name: '新订单' name: '新订单'
// }], }],
subStateList: [{ subStateList: [{
code: 1, code: 1,
name: '未约/未排' name: '未约/未排'
@ -309,7 +313,7 @@
scrollLeft: 0, scrollLeft: 0,
stickyTop: this.CustomBar, stickyTop: this.CustomBar,
tabCur: 0, tabCur: 0,
stateCur: 0, stateCur: null,
showTimeArrangeModal: false, showTimeArrangeModal: false,
showArrangeFailTimeModal: false, showArrangeFailTimeModal: false,
showNewServPriceModal: false, showNewServPriceModal: false,
@ -368,9 +372,9 @@
this.loadMasterOrderPage(); this.loadMasterOrderPage();
}, },
async loadMasterOrderPage(params = {}) { async loadMasterOrderPage(params = {}) {
params.pageNum = this.pageParams[this.tabCur].pageNum;
params.pageSize = this.$globalData.initPageSize; params.pageSize = this.$globalData.initPageSize;
params.orderStatus = this.subStateList[this.tabCur].code; params.orderStatus = this.subStateList[this.tabCur].code;
params.pageNum = this.pageParams[this.tabCur].pageNum;
this.$refs.loadStatusBar.showLoading(); this.$refs.loadStatusBar.showLoading();
try { try {
let res = null; let res = null;
@ -527,15 +531,17 @@
orderKeywords: '' orderKeywords: ''
} }
}, },
tabSelect(e) { tabSelect(e) {
this.stateCur = null;
this.tabCur = e.currentTarget.dataset.id; this.tabCur = e.currentTarget.dataset.id;
this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60 this.scrollLeft = (e.currentTarget.dataset.id - 1) * 60
// this.reloadMasterOrderPage(this.stateCur, this.subStateList[this.tabCur].code); // this.reloadMasterOrderPage(this.stateCur, this.subStateList[this.tabCur].code);
this.reloadMasterOrderPage(); this.reloadMasterOrderPage();
}, },
statusSelect(e) { statusSelect(e) {
this.tabCur = null;
this.stateCur = e.currentTarget.dataset.id; this.stateCur = e.currentTarget.dataset.id;
this.loadData(this.stateCur, this.subStateList[this.tabCur].code); this.reloadMasterOrderPage();
}, },
getCurDateAndTime() { getCurDateAndTime() {
let date = new Date(); let date = new Date();
@ -644,8 +650,8 @@
} }
let res = await this.$request.qrPay(orderInfo); let res = await this.$request.qrPay(orderInfo);
if (res && res.code === 0) { if (res && res.code === 0) {
this.$refs.payQrcode.showQrcode(res.data.expend.qrcode_url);
this.showModal(e, orderInfo); this.showModal(e, orderInfo);
this.$refs.payQrcode.showQrcode(res.data.expend.qrcode_url);
} }
}, },
showServOrderDetail(order) { showServOrderDetail(order) {