Skip to content

S
self-support
Commit 0cf0902c authored by Damon's avatar Damon
Browse files
Options

Merge branch 'dev' of https://git.banshouhui.com/lijundan/self-support into dev

parents fb9889fd 71c5f166
Hide whitespace changes
Inline Side-by-side
Showing with 134 additions and 53 deletions
.env.js
View file @ 0cf0902c
...@@ -12,8 +12,11 @@ ...@@ -12,8 +12,11 @@
} }
} else if (process.env.NODE_ENV === "production") { } else if (process.env.NODE_ENV === "production") {
ENV_VAR = require('./.env.prod.js'); if (NODE_ENV === 'test') {
// ENV_VAR = require('./.env.test.js'); ENV_VAR = require('./.env.test.js');
} else if (NODE_ENV === 'prod') {
ENV_VAR = require('./.env.prod.js');
}
} }
if (ENV_VAR) { if (ENV_VAR) {
process.uniEnv = {}; process.uniEnv = {};
......
src/common/api/order.js
View file @ 0cf0902c
...@@ -40,7 +40,10 @@ let orderApiFun = function(vm){ ...@@ -40,7 +40,10 @@ let orderApiFun = function(vm){
* 订单详情查询 * 订单详情查询
*/ */
let orderDetail = async (params = {},orderId) => await vm.$u.get('/wxh-worker-rest/rest/order/revision/'+ vm.vuex_token+'/'+orderId, params); let orderDetail = async (params = {},orderId) => await vm.$u.get('/wxh-worker-rest/rest/order/revision/'+ vm.vuex_token+'/'+orderId, params);
/**
* 结算详情查询
*/
let querySettleByOrder = async (params = {},orderId) => await vm.$u.get('/wxh-worker-rest/rest/settle/'+ vm.vuex_token+'/querySettleByOrder/'+orderId, params);
/* 过程反馈查询接口 */ /* 过程反馈查询接口 */
let feedbackConfig = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/order/v2/getFeedBack/' + vm.vuex_token, params) let feedbackConfig = async (params = {}) => await vm.$u.get('/wxh-worker-rest/rest/order/v2/getFeedBack/' + vm.vuex_token, params)
...@@ -172,6 +175,7 @@ let orderApiFun = function(vm){ ...@@ -172,6 +175,7 @@ let orderApiFun = function(vm){
workerAppointment, workerAppointment,
maintainWorkerCheckin, maintainWorkerCheckin,
orderDetail, orderDetail,
querySettleByOrder,
listOrderRecord, listOrderRecord,
orderAccept, orderAccept,
orderGan, orderGan,
......
src/pages/mine/wallet/index.vue
View file @ 0cf0902c
...@@ -148,7 +148,7 @@ ...@@ -148,7 +148,7 @@
}, },
handleClickCell(orderId) { handleClickCell(orderId) {
this.$u.route({ this.$u.route({
url: 'pages/order/detail', url: 'pages/order/detail?isFromMine=1',
params: { params: {
id: orderId id: orderId
} }
......
src/pages/mine/wallet/statement.vue
View file @ 0cf0902c
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
handleClickCell(orderId) { handleClickCell(orderId) {
uni.navigateTo({ uni.navigateTo({
url: 'pages/order/detail?id=' + orderId url: 'pages/order/detail?isFromMine=1&id=' + orderId
}) })
}, },
async loadStatement() { async loadStatement() {
......
src/pages/order/detail.vue
View file @ 0cf0902c
...@@ -72,10 +72,29 @@ ...@@ -72,10 +72,29 @@
</view> </view>
<!-- </u-read-more> --> <!-- </u-read-more> -->
</view> </view>
<view class="card appoint-item" v-show="showTimeSelect"> <!-- 从我的页面进来显示计算信息 -->
<appoint-time :dateList="dateList" :timeList="timeList" @dateChange="dateChange" @timeChange="timeChange" @weekChange="weekChange"></appoint-time> <view v-if="isFromMine" class="settlement-view">
<view class="settlement-title">结算信息</view>
<view class="settlement-content">
<text class="content-left">工单确认时间：</text>
<text>{{settlementInfo.formatTime}}</text>
</view>
<view class="settlement-content" v-for="(item, index) in settlementInfo.list" :key="index">
<text class="content-left">{{item.businessSettlementType + '：'}}</text>
<text>{{(item.realSettlementAmount || item.settlementAmount) + '元'}}</text>
<text v-if="item.adjustmentRemark">{{'-' + item.adjustmentRemark}}</text>
</view>
<view class="settlement-content">
<text class="content-left">最终结算金额：</text>
<text>{{settlementInfo.amount}}元</text>
</view>
</view> </view>
<view class="card order-item record-item"> <!-- 其他页面进来 -->
<view v-else>
<view class="card appoint-item" v-show="showTimeSelect">
<appoint-time :dateList="dateList" :timeList="timeList" @dateChange="dateChange" @timeChange="timeChange" @weekChange="weekChange"></appoint-time>
</view>
<view class="card order-item record-item">
<view class="top-item"> <view class="top-item">
<text class="title">履约记录</text> <text class="title">履约记录</text>
</view> </view>
...@@ -113,53 +132,57 @@ ...@@ -113,53 +132,57 @@
<view v-else style="height: 10rpx;"></view> <view v-else style="height: 10rpx;"></view>
</view> </view>
</view> </view>
</view>
<view v-if="showCenterBtn" class="toolbar">
<!-- 背景，内容，请求接口 根据状态不同改变 {{operationDoing[order.orderStatus].background}} -->
<!-- 过程反馈 -->
<view class="left">
<view v-if="allowFeedback" @click="clickFeedback" class="button">
<text>反馈</text>
</view>
</view> </view>
<!--接单，抢单，已被抢， 预约 ，签到 ，去完工 timestampDiff(order.currentOverTime)>0 --> </view>
<view class="center"> <!-- 不是从我的页面进来不用显示 -->
<view> <template v-if="!isFromMine">
<u-toast ref="uToast" /> <view v-if="showCenterBtn" class="toolbar">
<!-- 背景，内容，请求接口 根据状态不同改变 {{operationDoing[order.orderStatus].background}} -->
<!-- 过程反馈 -->
<view class="left">
<view v-if="allowFeedback" @click="clickFeedback" class="button">
<text>反馈</text>
</view>
</view> </view>
<view v-if="showCenterBtn" @click="$u.throttle(handleBtn, 500)" class="button" :class="['center-button-view', btnClass]"> <!--接单，抢单，已被抢， 预约 ，签到 ，去完工 timestampDiff(order.currentOverTime)>0 -->
<text>{{ centerButtonText }}</text> <view class="center">
<view v-if="order.currentOverTime && showTimeOut" class="time-view"> <view>
<text style="padding-right: 8rpx;">{{order.currentOverTime > new Date().getTime()?'剩':'超'}}</text> <u-toast ref="uToast" />
<u-count-down </view>
:timestamp="timestampDiff(order.currentOverTime)" <view v-if="showCenterBtn" @click="$u.throttle(handleBtn, 500)" class="button" :class="['center-button-view', btnClass]">
font-size="20" <text>{{ centerButtonText }}</text>
color="#FFFFFF" <view v-if="order.currentOverTime && showTimeOut" class="time-view">
bg-color="transparent" <text style="padding-right: 8rpx;">{{order.currentOverTime > new Date().getTime()?'剩':'超'}}</text>
separator-color="#FFFFFF" <u-count-down
separator-size="20" :timestamp="timestampDiff(order.currentOverTime)"
:ref="'uCountDown'" font-size="20"
show-days color="#FFFFFF"
height="20" bg-color="transparent"
:show-days="threeDays()" separator-color="#FFFFFF"
:show-minutes="!threeDays()" separator-size="20"
:show-seconds="!threeDays()" :ref="'uCountDown'"
:separator="threeDays() ? 'zh' : 'colon'" show-days
@change="timeOutChange(order.currentOverTime)" > height="20"
</u-count-down> :show-days="threeDays()"
:show-minutes="!threeDays()"
:show-seconds="!threeDays()"
:separator="threeDays() ? 'zh' : 'colon'"
@change="timeOutChange(order.currentOverTime)" >
</u-count-down>
</view>
</view> </view>
</view> </view>
</view> <!-- 异常预约 ，现场拍照 这里是调用拍照的两个组件-->
<!-- 异常预约 ，现场拍照 这里是调用拍照的两个组件--> <view class="right">
<view class="right"> <view v-if="errorSignIn || scenePhoto" @click="$u.throttle(handleClickRight, 500)" :class="['button', {'active': scenePhoto}]">
<view v-if="errorSignIn || scenePhoto" @click="$u.throttle(handleClickRight, 500)" :class="['button', {'active': scenePhoto}]"> <text :style="errorSignIn ? 'font-size:24rpx' : ''">{{errorSignIn ? '异常\n签到' : '拍照'}}</text>
<text :style="errorSignIn ? 'font-size:24rpx' : ''">{{errorSignIn ? '异常\n签到' : '拍照'}}</text>
</view>
</view> </view>
</view> </view>
</view> <take-photo type="test" v-if="takeStatus" @close="closeTake" :num="1"></take-photo>
<take-photo type="test" v-if="takeStatus" @close="closeTake" :num="1"></take-photo> <PopView title="查看交互规范" message="为完善交付质量，请查看对应的交付规范" :visible.sync="visibale" @click="handleClick"/>
<PopView title="查看交互规范" message="为完善交付质量，请查看对应的交付规范" :visible.sync="visibale" @click="handleClick"/> </template>
</view> </view>
</template> </template>
...@@ -237,7 +260,9 @@ ...@@ -237,7 +260,9 @@
showTimeOut:true, showTimeOut:true,
clicking: false, clicking: false,
dateItem: null, dateItem: null,
centerBtnDisabled:false centerBtnDisabled:false,
isFromMine: false,
settlementInfo: {formatTime: '-', list: [], amount: ''}
} }
}, },
onLoad(option) { onLoad(option) {
...@@ -246,9 +271,17 @@ ...@@ -246,9 +271,17 @@
this.orderId = option.id this.orderId = option.id
} }
this.loadOrderDetail() this.loadOrderDetail()
this.loadOrderRecord() if (option && option.isFromMine) {
this.getLocation() this.isFromMine = true
this.getSignDistance() // 获取结算信息
this.loadSettlement()
} else {
this.loadOrderRecord()
this.getLocation()
this.getSignDistance()
}
}, },
onHide() { onHide() {
this.closeLocationChange() this.closeLocationChange()
...@@ -295,7 +328,7 @@ ...@@ -295,7 +328,7 @@
address += self.order.contactAddress || "" address += self.order.contactAddress || ""
} }
return address return address
}, }
}, },
methods: { methods: {
openLocation(address){ openLocation(address){
...@@ -404,6 +437,26 @@ ...@@ -404,6 +437,26 @@
if(self.order.isFirstOrder){ if(self.order.isFirstOrder){
this.visibale = true this.visibale = true
} }
// 格式化时间
this.settlementInfo.formatTime = this.order.settleCenterSyncDatetime ? this.$u.timeFormat(this.order.settleCenterSyncDatetime, 'yyyy.mm.dd hh:MM:ss') : '-'
} else {
console.log(res.message, "获取订单详情失败！");
}
});
},
loadSettlement() { // 获取工单详情
let self = this
var data = {
'orderId': self.orderId
};
self.$u.api.querySettleByOrder(data, self.orderId).then((res) => {
if (res.code == 200) {
var amount = 0
for (var item of res.data) {
amount += (item.realSettlementAmount || item.settlementAmount)
}
this.settlementInfo.amount = amount
this.settlementInfo.list = res.data
} else { } else {
console.log(res.message, "获取订单详情失败！"); console.log(res.message, "获取订单详情失败！");
} }
...@@ -1137,4 +1190,25 @@ ...@@ -1137,4 +1190,25 @@
text-align: left; text-align: left;
flex-shrink: 0; flex-shrink: 0;
} }
.settlement-view {
padding: 30rpx;
background-color: #FFFFFF;
border-radius: 12rpx;
.settlement-title {
font-size: 32rpx;
font-weight: bold;
color: #333333;
margin-bottom: 30rpx;
}
.settlement-content {
font-size: 26rpx;
color: #333333;
margin-bottom: 20rpx;
display: flex;
align-items: flex-start;
.content-left {
flex-shrink: 0;
}
}
}
</style> </style>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment