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

问题修复

This commit is contained in:
donqi 2022-10-27 00:45:08 +08:00
parent 04986cb28a
commit 4769feecfd
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/js/request.js
View File

@ -11,9 +11,9 @@ export default {
title: '加载中' title: '加载中'
}) })
// request 触发前拼接 url // request 触发前拼接 url
args.url = 'https://www.opsoul.com:8881' + args.url; // args.url = 'https://www.opsoul.com:8881' + args.url;
// args.url = 'http://192.168.2.42:80' + args.url; // args.url = 'http://192.168.2.42:80' + args.url;
// args.url = 'http://127.0.0.1:80' + args.url; args.url = 'http://127.0.0.1:80' + args.url;
if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') { if (args.data && Object.prototype && Object.prototype.toString.call(args.data) === '[object Object]') {
args.data.deptId = globalData.deptId; args.data.deptId = globalData.deptId;
args.data.from = globalData.from; args.data.from = globalData.from;

3
pages/my/my-order.vue
View File

@ -74,7 +74,8 @@
class="padding-tb-sm solid-top"> class="padding-tb-sm solid-top">
<view>约定服务时间：</view> <view>约定服务时间：</view>
<view class="flex justify-between align-end"> <view class="flex justify-between align-end">
<view>{{shopOrder.expectTimeStart + '~' + shopOrder.expectTimeEnd}}</view> <view v-if="shopOrder.expectTimeEndFront">{{shopOrder.expectTimeStartFront + '~' + shopOrder.expectTimeEndFront}}</view>
<view v-else>{{shopOrder.expectTimeStartFront}}</view>
<view> <view>
<button v-if="shopOrder.agreedServTime.customerAgreeStatus === 1" <button v-if="shopOrder.agreedServTime.customerAgreeStatus === 1"
class="cu-btn sm bg-yellow margin-right-sm" class="cu-btn sm bg-yellow margin-right-sm"

5
pages/my/serv-detail.vue
View File

@ -53,7 +53,8 @@
</view> </view>
<view class="margin-top-sm"> <view class="margin-top-sm">
<text class="cuIcon-time text-main-color margin-right-xs"></text> <text class="cuIcon-time text-main-color margin-right-xs"></text>
<text>预约时间：{{servDetail.expectTimeStart + '~' + servDetail.expectTimeEnd}}</text> <text v-if="servDetail.expectTimeEndFront">预约时间：{{servDetail.expectTimeStartFront + '~' + servDetail.expectTimeEndFront}}</text>
<text v-else>预约时间：{{servDetail.expectTimeStartFront}}</text>
</view> </view>
<!-- <view class="margin-top-sm"> <!-- <view class="margin-top-sm">
<text class="cuIcon-time text-main-color margin-right-xs"></text> <text class="cuIcon-time text-main-color margin-right-xs"></text>
@ -102,7 +103,7 @@
<view class="margin-top-sm"> <view class="margin-top-sm">
<view>师傅：{{item.workerName}}</view> <view>师傅：{{item.workerName}}</view>
<view class="margin-top-sm">联系方式：{{item.workerPhone}}</view> <view class="margin-top-sm">联系方式：{{item.workerPhone}}</view>
<view class="margin-top-sm">预约时间：{{item.expectTimeStart + '~' + item.expectTimeEnd}}</view> <view class="margin-top-sm">预约时间：{{item.expectTimeStartFront + '~' + item.expectTimeEndFront}}</view>
<view class="margin-top-sm" v-if="servDetail.orderStatus >= 3">上门时间：{{item.workBeginTime}}</view> <view class="margin-top-sm" v-if="servDetail.orderStatus >= 3">上门时间：{{item.workBeginTime}}</view>
<view class="margin-top-sm" v-if="servDetail.orderStatus >= 4">完成时间：{{item.workFinishTime}}</view> <view class="margin-top-sm" v-if="servDetail.orderStatus >= 4">完成时间：{{item.workFinishTime}}</view>
<simple-product-picked :pickedList="item.orderStandardList" :columnTitleArr="servedColumnHeaders" <simple-product-picked :pickedList="item.orderStandardList" :columnTitleArr="servedColumnHeaders"