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

隐藏部分未开发功能；修复展示bug

This commit is contained in:
donqi 2022-07-19 11:34:36 +08:00
parent dd78a6da99
commit 2e57cbd63e
5 changed files with 48 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pages/index/goods-manage.vue
View File

@ -53,8 +53,8 @@
<text class="margin-lr-xs text-sm">{{item.areaName}}<text v-if="index != good.goodsAreaList.length - 1">,</text></text>
</text>
</view>
<view class="text-gray">团购日期：</view>
<uni-datetime-picker :value="good.groupBuyDate" type="datetimerange" rangeSeparator="至" @change="changeGroupBuyDate($event, good)"/>
<!-- <view class="text-gray">团购日期：</view> -->
<!-- <uni-datetime-picker :value="good.groupBuyDate" type="datetimerange" rangeSeparator="至" @change="changeGroupBuyDate($event, good)"/> -->
</view>
</view>
<view class="flex justify-end oper-bar">
@ -67,8 +67,8 @@
<button class="cu-btn line-main-color margin-right-xs margin-top-sm" @click="addEditGood(good)">编辑</button>
<button class="cu-btn line-main-color margin-right-xs margin-top-sm" v-if="good.status === 0" @click="offGood(good)">下架</button>
<button class="cu-btn line-main-color margin-right-xs margin-top-sm" v-if="good.status === 1" @click="onGood(good)">上架</button>
<button class="cu-btn line-main-color margin-right-xs margin-top-sm" @click="copyGood(good)">复制</button>
<button class="cu-btn line-main-color margin-right-xs margin-top-sm">优惠券</button>
<!-- <button class="cu-btn line-main-color margin-right-xs margin-top-sm" @click="copyGood(good)">复制</button> -->
<!-- <button class="cu-btn line-main-color margin-right-xs margin-top-sm">优惠券</button> -->
<button class="cu-btn line-red shadow-blur margin-right-xs margin-top-sm" @click="delGood(good)">删除</button>
</view>
</view>
@ -78,9 +78,10 @@
<!-- 底部操作栏 -->
<view class="padding-tb-sm flex justify-around padding-tb-sm fixed-bottom-bar-with-bar bg-back">
<button class="cu-btn bg-main-color lg shadow-blur margin-left-xs" @click="addEditGood(null)">新增服务</button>
<button class="cu-btn bg-main-color lg shadow-blur">优惠券</button>
<button class="cu-btn bg-main-color lg shadow-blur">暂停售卖</button>
<button class="cu-btn bg-main-color lg shadow-blur margin-right-xs" data-modal="communityModal" @tap="showModal">社区</button>
<button class="cu-btn bg-main-color lg shadow-blur" disabled type="">优惠券</button>
<button class="cu-btn bg-main-color lg shadow-blur" disabled type="">暂停售卖</button>
<!-- <button class="cu-btn bg-main-color lg shadow-blur margin-right-xs" data-modal="communityModal" @tap="showModal">社区</button> -->
<button class="cu-btn bg-main-color lg shadow-blur margin-right-xs" disabled type="">社区</button>
</view>
<!-- 模态框 -->
<view class="cu-modal" :class="communityModal?'show':''">

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

@ -309,7 +309,7 @@
.nav-list-panel>.serv-module:first-child {
width: 46%;
height: 249rpx;
height: 246rpx;
line-height: 195rpx;
}

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

@ -52,13 +52,16 @@
:value="item.deduct" placeholder="追加提成额"></input>
</view>
<view class="flex-sub flex margin-left-xs">
<view class="flex-sub">
<!-- <view class="flex-sub">
<input class="radius-input" @input="inputSpecs($event, index, 'groupPrice')"
:value="item.groupPrice" placeholder="团购价"></input>
</view>
<view class="flex-sub margin-left-xs">
</view> -->
<!-- <view class="flex-sub margin-left-xs"> -->
<view class="flex-sub">
<input class="radius-input" @input="inputSpecs($event, index, 'unit')"
:value="item.unit" placeholder="单位"></input>
:value="item.unit" placeholder="单位"></input>
<!-- <my-uni-combox :candidates="productUnits" placeholder="请选择" v-model="formData.productUnit">
</my-uni-combox> -->
</view>
</view>
</view>
@ -68,8 +71,8 @@
@click="showAllSpecs()"><text :class="'cuIcon-' + (isShowAllSpecs ? 'fold' : 'unfold')"></text>
</view>
</view>
<view class="bg-white">
<view class="padding-lr flex align-center">
<!-- <view class="bg-white"> -->
<!-- <view class="padding-lr flex align-center">
<view class="flex-twice flex justify-start align-center">
<view style="width: 20%;">单位</view>
<my-uni-combox :candidates="productUnits" placeholder="请选择" v-model="formData.productUnit">
@ -78,8 +81,8 @@
<view class="flex-sub margin-left">
优惠券+
</view>
</view>
<view class="padding-lr flex align-center padding-tb-xs">
</view> -->
<!-- <view class="padding-lr flex align-center padding-tb-xs">
<view class="flex-sub">
<checkbox style="transform:scale(1)" class="main-color margin-right-xs" :value="true"
:v-model="formData.isGoldenServ" :checked="formData.isGoldenServ"></checkbox>
@ -90,8 +93,8 @@
<my-uni-combox :candidates="productProtectTimes" placeholder="请选择"
v-model="formData.productProtectTime"></my-uni-combox>
</view>
</view>
</view>
</view> -->
<!-- </view> -->
</view>
<view class="solid-top">
<view class="cu-form-group">
@ -118,11 +121,11 @@
<input name="areaDesc" :value="formData.areaDesc" :v-model="formData.areaDesc"
placeholder="请输入区域描述"></input>
</view>
<view class="cu-form-group">
<!-- <view class="cu-form-group">
<view class="title">上门费</view>
<input type="digit" name="doorPrice" :value="formData.doorPrice" :v-model="formData.doorPrice"
placeholder="单位:元/次"></input>
</view>
</view> -->
<view class="cu-bar bg-white solid-top">
<view class="action text-black">
商品封面图上传

29
pages/order-manage/dispatch-order.vue
View File

@ -25,19 +25,21 @@
</view>
</view>
<!-- 可指派成员 -->
<view class="bg-white padding" v-for="(member, index) in members">
<view class="flex justify-between align-center">
<view class="flex justify-start align-center">
<view class="cu-avatar round"
:style="'background-image:url(' + member.workerLogoUrl + ');min-width: 80rpx;min-height: 80rpx'"></view>
<view class="text-lg margin-left-sm">{{member.workerName}}</view>
</view>
<view>
<button class="cu-btn bg-main-color shadow-blur" @click="assignWork(member)">指派</button>
<text v-if="singleServ" class="padding-left text-lg text-gray text-bold" data-modal="showDispatchPriceModal" @click="showModal"><text class="cuIcon-right"></text></text>
<scroll-view class="certern-height-with-scroll" :scroll-y="true" :scroll-with-animation="true">
<view class="bg-white padding" v-for="(member, index) in members">
<view class="flex justify-between align-center">
<view class="flex justify-start align-center">
<view class="cu-avatar round"
:style="'background-image:url(' + member.workerLogoUrl + ');min-width: 80rpx;min-height: 80rpx'"></view>
<view class="text-lg margin-left-sm">{{member.workerName}}</view>
</view>
<view>
<button class="cu-btn bg-main-color shadow-blur" @click="assignWork(member)">指派</button>
<text v-if="singleServ" class="padding-left text-lg text-gray text-bold" data-modal="showDispatchPriceModal" @click="showModal"><text class="cuIcon-right"></text></text>
</view>
</view>
</view>
</view>
</scroll-view>
<!-- 派单金额模态框 -->
<view class="cu-modal" :class="showDispatchPriceModal?'show':''">
<view class="cu-dialog">
@ -161,4 +163,9 @@
</script>
<style scoped>
.certern-height-with-scroll {
height: 280rpx;
margin-bottom: calc(100rpx + constant(safe-area-inset-bottom) / 2);
margin-bottom: calc(100rpx + env(safe-area-inset-bottom) / 2);
}
</style>

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

@ -138,7 +138,7 @@
</view>
<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="dispatchOrderPopup" @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" data-modal="showTimeArrangeModal" @tap="showModal($event, order)">预约时间</button>
</view>
@ -226,11 +226,11 @@
<urgent-msg :show="sendUrgentMsgModal" @hideModal="hideModal"></urgent-msg>
<pic-modal ref="showPicModal" :imgList="picModalImgList"></pic-modal>
<!-- popup -->
<uni-popup ref="dispatchOrder" type="bottom" @change="changePopupState">
<view class="text-bold text-gray text-lg text-center left-top-sm-bar" data-popup="dispatchOrder" @click="togglePopup"><text
<uni-popup ref="dispatchOrderPopup" type="bottom" @change="changePopupState">
<view class="text-bold text-gray text-lg text-center left-top-sm-bar" data-popup="dispatchOrderPopup" @click="togglePopup"><text
class="cuIcon-close"></text></view>
<view ref="dispatchOrderContent" class="bg-white padding" style="padding-top: 74rpx; min-height: 600rpx;">
<dispatch-order v-if="myTeamMembers && myTeamMembers.length > 0" @assignWork="assignWork" :members="myTeamMembers"></dispatch-order>
<view class="bg-white padding" style="padding-top: 74rpx; min-height: 600rpx;">
<dispatch-order ref="dispatchOrder" v-if="myTeamMembers && myTeamMembers.length > 0" @assignWork="assignWork" :members="myTeamMembers"></dispatch-order>
<view v-else class="align-center-view text-xl">无可指派的师傅</view>
</view>
<!-- 底部占位 -->
@ -728,7 +728,7 @@
this.orderList[index].afterSaleDealStatus = status;
},
getCanAssignList(order) {
this.$refs.dispatchOrder.$children[0].loadData(order);
this.$refs.dispatchOrderPopup.$children[0].loadData(order);
},
async workBegin(order) {
let curDate = new Date();