Browse Source

上传

master
前端-胡立永 4 months ago
parent
commit
9dad4671e2
6 changed files with 79 additions and 45 deletions
  1. +2
    -1
      components/user/couponList.vue
  2. +5
    -3
      mixins/order.js
  3. +3
    -3
      pages/index/order.vue
  4. +11
    -1
      pages_order/order/createWash.vue
  5. +46
    -30
      pages_order/order/damageReport.vue
  6. +12
    -7
      pages_order/order/orderDetail.vue

+ 2
- 1
components/user/couponList.vue View File

@ -58,7 +58,8 @@
mixins : [mixinList],
props : {
height : {
default : 'calc(90vh - 180rpx)'
default : 'auto'
// default : 'calc(90vh - 180rpx)'
},
//
depositPrice : {


+ 5
- 3
mixins/order.js View File

@ -51,7 +51,7 @@ export default {
}
})
},
// 水洗店确认接单 0确认接单 1确认正常 2破损上报
// 水洗店确认接单
orderConfirmAccept(item){
let self = this
this.$api('orderConfirmAccept', {
@ -66,18 +66,20 @@ export default {
}
})
},
// 水洗店确认破损0无破损,1破损
orderConfirmedDamage(item, flag){
// 水洗店确认破损 0确认接单 1确认正常 2破损上报
orderConfirmedDamage(item, flag, args = {}, fn){
let self = this
this.$api('orderConfirmAccept', {
id: item.id,
flag,
...args
}, res => {
if (res.code == 200) {
uni.showToast({
title: '上报成功',
icon: 'none'
})
fn && fn()
self.getData()
}
})


+ 3
- 3
pages/index/order.vue View File

@ -45,9 +45,9 @@
<view class="text-hidden-1">
租赁地址{{item.userAddress}}
</view>
<!-- <view class="text-hidden-1">
总计时间{{item.useTime}}分钟
</view> -->
<view class="text-hidden-1">
数量{{ item.num }}
</view>
</view>


+ 11
- 1
pages_order/order/createWash.vue View File

@ -14,7 +14,14 @@
>
<view v-for="(item, index) in list" :key="index" class="item">
<view class="checkbox">
<uv-checkbox :name="item.id" :disabled="item.status != 0 || !item.startTime && item.leaseFlag" activeColor="#FA5A0A" size="40rpx" icon-size="35rpx"></uv-checkbox>
<uv-checkbox
:name="item.id"
:disabled="item.status != 0
|| !item.startTime && item.leaseFlag
|| item.isWash"
activeColor="#FA5A0A"
size="40rpx"
icon-size="35rpx"></uv-checkbox>
</view>
<image class="image" :src="item.pic || 'https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg'"
@ -41,6 +48,9 @@
<view class="wan" v-else-if="item.status != 0">
{{ statusText[item.status] }}
</view>
<view class="wan" v-else-if="item.isWash">
水洗中
</view>
<view class="price" v-else>
<view class="" v-if="item.zujin">
租金


+ 46
- 30
pages_order/order/damageReport.vue View File

@ -2,15 +2,25 @@
<!-- 破损上报 -->
<view class="help">
<navbar title="破损上报" leftClick @leftClick="$utils.navigateBack" />
<view class="type">
<span>破损数量</span>
<span>
<uv-number-box
v-model="form.num" :min="1"
:max="order.num"></uv-number-box>
</span>
</view>
<view class="help-box">
<view>
<!-- <view class="help-issue">
<text>问题和意见</text>
<text style="color: #BD3624;">*</text>
</view> -->
<uv-textarea v-model="value" :count="true" border="none" height="400"
placeholder="请输入破损的细节部位....."
:text-style="{color:'#000',fontSize:'28rpx'}" />
<uv-textarea
:count="true"
v-model="form.info"
border="none" height="400"
placeholder="请输入破损的细节部位....."
:text-style="{color:'#000',fontSize:'28rpx'}" />
</view>
<view>
@ -28,38 +38,23 @@
</view>
</view>
<!-- <view>
<view class="help-issue">
<text>联系方式</text>
<text style="color: #BD3624;">*</text>
</view>
<uv-input placeholder="请输入联系方式" fontSize="24rpx" border="bottom"
:custom-style="{backgroundColor: '#fff'}">
<template #prefix>
<uv-text text="联系姓名" size="24rpx" margin="20rpx 10rpx 20rpx 10rpx" />
</template>
</uv-input>
<uv-input placeholder="请输入联系姓名" border="none" fontSize="24rpx"
:custom-style="{backgroundColor: '#fff'}">
<template #prefix>
<uv-text text="联系方式" size="24rpx" margin="20rpx 10rpx 20rpx 10rpx" />
</template>
</uv-input>
</view> -->
<view class="help-button">
<view>提交审核</view>
<view
@click="submit">提交审核</view>
</view>
</view>
</view>
</template>
<script>
import mixinOrder from '@/mixins/order.js'
export default {
mixins : [mixinOrder],
data() {
return {
value: "",
fileList: [],
form : {
num : 1,
info : '',
},
order: {},
@ -100,13 +95,17 @@
submit(){
this.form.pic = this.fileList.map(item=>item.url).join(",")
if (this.$utils.verificationAll(this.form, {
id: '请选择租赁物品',
info: '请输入破损的细节部位',
pic: '请选择地址',
pic: '请上传图片',
})) {
return
}
this.orderConfirmedDamage(this.order, 2, this.form,
() => {
uni.redirectTo({
url:'/pages/index/order'
})
})
},
}
}
@ -114,6 +113,23 @@
<style scoped lang="scss">
.help {
.type {
display: flex;
align-items: center;
background-color: #FFF;
width: 92%;
margin: 30rpx 4%;
padding: 20rpx;
box-sizing: border-box;
>span:nth-of-type(1) {
width: 70%;
}
>span:nth-of-type(2) {
width: 30%;
}
}
.help-box {
width: 92%;
margin-left: 4%;


+ 12
- 7
pages_order/order/orderDetail.vue View File

@ -21,13 +21,13 @@
<view class="btns">
<view
v-if="[4, 18, 19].includes(order.status)"
@click.stop="orderConfirmAccept(order)" class="b2">
@click.stop="orderConfirmAccept(order)">
确认接单
</view>
<!-- 待收货 -->
<template v-if="order.status == 2">
<view @click.stop="confirmReceiveGoods(order)" class="b2">
<view @click.stop="confirmReceiveGoods(order)">
确认收货
</view>
<view @click.stop="" class="b1">
@ -37,13 +37,14 @@
<!-- 待检查 -->
<template v-if="order.status == 5">
<view @click.stop="orderConfirmedDamage(order, 1)" class="b2"
<view @click.stop="orderConfirmedDamage(order, 1)"
>
确认无破损
</view>
<view @click.stop="$utils.navigateTo
(`/pages_order/order/damageReport?id=${item.id}`)" class="b1"
(`/pages_order/order/damageReport?id=${order.id}`)"
class="btn2"
>
破损上报
</view>
@ -51,7 +52,7 @@
<view
v-if="[6].includes(order.status)"
@click.stop="orderFinishedWashing(order)" class="b2">
@click.stop="orderFinishedWashing(order)">
水洗完成
</view>
@ -100,6 +101,10 @@
<view class="desc">规格{{order.sku}}</view>
</view>
<view class="sales-volume" style="margin-top: 5px;">
<view class="desc">数量{{order.num}}</view>
</view>
<view class="time-coupon">
<!-- <view class="flex">
@ -489,8 +494,8 @@
width: 100%;
.img-box {
width: 150rpx;
height: 150rpx;
width: 180rpx;
height: 180rpx;
border-radius: 10rpx;
overflow: hidden;


Loading…
Cancel
Save