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

打卡功能及时间选择框右侧增加下拉箭头

This commit is contained in:
donqi 2022-10-23 00:40:08 +08:00
parent c29727b626
commit f7269ff824
6 changed files with 44 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/js/request.js
View File

@ -13,9 +13,9 @@ export default {
})
let userInfo = _this.getCurUserInfo();
// request 触发前拼接 url
// args.url = 'https://www.opsoul.com' + args.url;
args.url = 'http://127.0.0.1:80' + args.url;
// args.url = 'http://192.168.2.42:80' + args.url;
args.url = 'https://www.opsoul.com' + args.url;
// args.url = 'http://127.0.0.1:80' + args.url;
// args.url = 'http://192.168.2.50:80' + args.url;
if (!args.data) {
args.data = {}

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

@ -21,8 +21,10 @@
<view class="padding">
<view class="margin-bottom-xs">
<view class="margin-bottom-xs">选择日期：</view>
<picker mode="date" :value="date" :start="curDate" @change="dateChange">
<input class="radius-input" v-model="date" disabled></input>
<picker class="relative-view" mode="date" :value="date" :start="curDate" @change="dateChange">
<input class="radius-input" v-model="date" disabled>
<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
</input>
</picker>
</view>
<view>
@ -32,9 +34,11 @@
<input class="radius-input" v-model="time"></input>
</picker>
<text class="margin-lr-xs">或</text> -->
<picker mode="selector" :value="timeRangeIndex" :range="timeRangeList"
<picker class="relative-view" mode="selector" :value="timeRangeIndex" :range="timeRangeList"
@change="timeRangeChange">
<input class="radius-input" v-model="timeRange" disabled></input>
<input class="custom-input radius-input" v-model="timeRange" disabled>
<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
</input>
</picker>
</view>
</view>
@ -181,4 +185,14 @@
top: 35rpx;
z-index: 1;
}
.relative-view {
position: relative;
}
.input-arrow {
position: absolute;
right: 10rpx;
top: 25%;
}
</style>

2
pages/order-manage/modal/new-serv-price-offline.vue
View File

@ -178,6 +178,6 @@
<style scoped>
.inline-input {
flex-basis: 25%;
flex-basis: 30%;
}
</style>

2
pages/order-manage/modal/new-serv-price-online.vue
View File

@ -178,6 +178,6 @@
<style scoped>
.inline-input {
flex-basis: 25%;
flex-basis: 30%;
}
</style>

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

@ -21,8 +21,10 @@
<view class="padding">
<view class="margin-bottom-xs">
<view class="margin-bottom-xs">选择日期：</view>
<picker mode="date" :value="date" :start="curDate" @change="dateChange">
<input class="radius-input" v-model="date" disabled></input>
<picker class="relative-view" mode="date" :value="date" :start="curDate" @change="dateChange">
<input class="radius-input" v-model="date" disabled>
<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
</input>
</picker>
</view>
<view>
@ -32,9 +34,11 @@
<input class="radius-input" v-model="time" disabled></input>
</picker>
<text class="margin-lr-xs">或</text> -->
<picker mode="selector" :value="timeRangeIndex" :range="timeRangeList"
<picker class="relative-view" mode="selector" :value="timeRangeIndex" :range="timeRangeList"
@change="timeRangeChange">
<input class="radius-input" v-model="timeRange" disabled></input>
<input class="radius-input" v-model="timeRange" disabled>
<view class="text-lg input-arrow"><text class="cuIcon-triangledownfill"></text></view>
</input>
</picker>
</view>
</view>
@ -153,4 +157,14 @@
top: 35rpx;
z-index: 1;
}
.relative-view {
position: relative;
}
.input-arrow {
position: absolute;
right: 10rpx;
top: 25%;
}
</style>

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

@ -190,6 +190,8 @@
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click="recordClockInLocation(order)" v-show="order.orderDetailId != null && !order.clockInLocation">打卡到达</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click = "changePrice($event, order)" data-ref="newServPriceOffline" data-modal="showNewServPriceOfflineModal" v-show="order.orderDetailId != null && order.clockInLocation && order.payType === 1">报价/完单</button>
<button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click = "changePrice($event, order)" data-ref="newServPriceOnline" data-modal="showNewServPriceOnlineModal" v-show="order.orderDetailId != null && order.clockInLocation && order.payType === 0">报价/完单</button>
<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click = "changePrice($event, order)" data-ref="newServPriceOffline" data-modal="showNewServPriceOfflineModal" v-show="order.orderDetailId != null && order.payType === 1">报价/完单</button> -->
<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @click = "changePrice($event, order)" data-ref="newServPriceOnline" data-modal="showNewServPriceOnlineModal" v-show="order.orderDetailId != null && order.payType === 0">报价/完单</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)" v-show="order.orderDetailId != null">重新排期</button>
<!-- <button class="cu-btn bg-main-color margin-right-xs shadow-blur margin-top-sm" @tap="finishOrder(order)" v-if="order.payStatus === 1" v-show="order.orderDetailId != null">发起完单</button> -->
@ -1053,7 +1055,7 @@
if (!res || !res.latitude) {
uni.showToast({
title: '定位获取失败，打卡失败，请稍后重试',
icon: 'error',
icon: 'none',
duration: 2500
})
} else {