From e17698d3d99039b1c3532d490687f8492ca87704 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期六, 19 七月 2025 14:53:28 +0800
Subject: [PATCH] 调接口
---
small-program/pages/packaging-worker/packaging-worker.vue | 263 ++++++++-----
small-program/pages/demand-hall/demand-hall.vue | 12
small-program/pages/sorting/sorting.vue | 253 +++++++-----
small-program/pages/using-workers/using-workers.vue | 177 ++++----
small-program/pages/index/index.vue | 40 +
small-program/pages/order-details/order-details.vue | 8
small-program/pages/freight/freight.vue | 314 +++++++++-------
small-program/pages/success/success.vue | 21
8 files changed, 625 insertions(+), 463 deletions(-)
diff --git a/small-program/pages/demand-hall/demand-hall.vue b/small-program/pages/demand-hall/demand-hall.vue
index 1467814..b953303 100644
--- a/small-program/pages/demand-hall/demand-hall.vue
+++ b/small-program/pages/demand-hall/demand-hall.vue
@@ -213,6 +213,13 @@
} else {
this.typeViewId = 0
}
+ if (!this.isOnce) {
+ this.commentStatus = ''
+ this.orderList = []
+ this.next = true
+ this.page = 1
+ this.getOrderList()
+ }
},
data() {
return {
@@ -242,7 +249,8 @@
next: true,
page: 1,
- orderList: []
+ orderList: [],
+ isOnce: true
};
},
async onLoad() {
@@ -327,6 +335,8 @@
queryLgt: this.longitude
}
}).then(res => {
+ if (res.code !== 200) return;
+ this.isOnce = false
res.data.records.forEach(item => {
// 璁㈤鍗�
if (item.type === 2) {
diff --git a/small-program/pages/freight/freight.vue b/small-program/pages/freight/freight.vue
index aedbe08..7fc5791 100644
--- a/small-program/pages/freight/freight.vue
+++ b/small-program/pages/freight/freight.vue
@@ -6,20 +6,24 @@
<view class="list-item-label-x"></view>
<text>杞﹁締鍙婅矾绾�</text>
</view>
- <view class="list-item-row" @click="show = true">
- <view class="list-item-row-label">杞﹁締绫诲瀷<b>*</b></view>
- <view class="list-item-row-val">
- <text :style="{ color: form.categoryName ? '#111111' : '' }">{{form.categoryName ? form.categoryName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
+
+ <template v-if="!(info.type !== 2 && info.status === 2)">
+ <view class="list-item-row" @click="show = true">
+ <view class="list-item-row-label">杞﹁締绫诲瀷<b>*</b></view>
+ <view class="list-item-row-val">
+ <text :style="{ color: form.categoryName ? '#111111' : '' }">{{form.categoryName ? form.categoryName : '璇烽�夋嫨'}}</text>
+ <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
+ </view>
</view>
- </view>
- <view class="list-item-row" @click="show3 = true">
- <view class="list-item-row-label">璐ц溅鍨嬪彿<b>*</b></view>
- <view class="list-item-row-val">
- <text :style="{ color: form.carUnit ? '#111111' : '' }">{{form.carUnit ? form.carUnit : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
+ <view class="list-item-row" @click="show3 = true">
+ <view class="list-item-row-label">璐ц溅鍨嬪彿<b>*</b></view>
+ <view class="list-item-row-val">
+ <text :style="{ color: form.carUnit ? '#111111' : '' }">{{form.carUnit ? form.carUnit : '璇烽�夋嫨'}}</text>
+ <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
+ </view>
</view>
- </view>
+ </template>
+
<view class="list-item-row" @click="show2 = true">
<view class="list-item-row-label">鐢ㄨ溅鏃堕棿<b>*</b></view>
<view class="list-item-row-val">
@@ -27,132 +31,138 @@
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
- <view class="list-item-row">
- <view class="list-item-row-label">
- 杩愯揣鍦板潃<b>*</b>
- <view class="list-item-row-label-add" @click="addAddr">+澧炲姞閫旂粡鐐�</view>
- </view>
- <view class="address">
- <view class="address-item" @click="selectAddress(2)">
- <view class="address-item-img">
- <image src="/static/icon/ic_qidian@2x.png" mode="widthFix"></image>
- <text :style="{color: form.location ? '#111111' : ''}">{{form.location ? form.location : '璇烽�夋嫨璧风偣'}}</text>
- </view>
- <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
+
+ <template v-if="!(info.type !== 2 && info.status === 2)">
+ <view class="list-item-row">
+ <view class="list-item-row-label">
+ 杩愯揣鍦板潃<b>*</b>
+ <view class="list-item-row-label-add" @click="addAddr">+澧炲姞閫旂粡鐐�</view>
</view>
- <view class="address-item" v-for="(item, index) in form.wayInfoDTOList" :key="index" @click="selectAddress(4, index)">
- <view class="address-item-img">
- <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
- <text :style="{color: item.location ? '#111111' : ''}">{{item.location ? item.location : '璇烽�夋嫨閫旂粡鍦扮偣'}}</text>
+ <view class="address">
+ <view class="address-item" @click="selectAddress(2)">
+ <view class="address-item-img">
+ <image src="/static/icon/ic_qidian@2x.png" mode="widthFix"></image>
+ <text :style="{color: form.location ? '#111111' : ''}">{{form.location ? form.location : '璇烽�夋嫨璧风偣'}}</text>
+ </view>
+ <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
- <view style="display: flex; align-items: center; flex-shrink: 0;">
- <image src="/static/icon/ic_delete@2x.png" style="margin-right: 22rpx; width: 32rpx; height: 32rpx;" @click.stop="form.wayInfoDTOList.splice(index, 1)" mode="widthFix"></image>
+ <view class="address-item" v-for="(item, index) in form.wayInfoDTOList" :key="index" @click="selectAddress(4, index)">
+ <view class="address-item-img">
+ <image src="/static/icon/ic_jingguo@2x.png" mode="widthFix"></image>
+ <text :style="{color: item.location ? '#111111' : ''}">{{item.location ? item.location : '璇烽�夋嫨閫旂粡鍦扮偣'}}</text>
+ </view>
+ <view style="display: flex; align-items: center; flex-shrink: 0;">
+ <image src="/static/icon/ic_delete@2x.png" style="margin-right: 22rpx; width: 32rpx; height: 32rpx;" @click.stop="form.wayInfoDTOList.splice(index, 1)" mode="widthFix"></image>
+ <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
+ </view>
+ </view>
+ <view class="address-item" @click="selectAddress(3)">
+ <view class="address-item-img">
+ <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix"></image>
+ <text :style="{color: form.locationEnd ? '#111111' : ''}">{{form.locationEnd ? form.locationEnd : '璇烽�夋嫨缁堢偣'}}</text>
+ </view>
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
- <view class="address-item" @click="selectAddress(3)">
- <view class="address-item-img">
- <image src="/static/icon/ic_zhongdian@2x.png" mode="widthFix"></image>
- <text :style="{color: form.locationEnd ? '#111111' : ''}">{{form.locationEnd ? form.locationEnd : '璇烽�夋嫨缁堢偣'}}</text>
- </view>
+ </view>
+ </template>
+
+ </view>
+ <template v-if="!(info.type !== 2 && info.status === 2)">
+ <view class="list-item">
+ <view class="list-item-label">
+ <view class="list-item-label-x"></view>
+ <text>闇�姹�</text>
+ </view>
+ <view class="list-item-row" @click="show1 = true">
+ <view class="list-item-row-label">杩愯緭鍝佺<b>*</b></view>
+ <view class="list-item-row-val">
+ <text :style="{ color: form.transportTypeName ? '#111111' : '' }">{{form.transportTypeName ? form.transportTypeName : '璇烽�夋嫨'}}</text>
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
- </view>
- </view>
- <view class="list-item">
- <view class="list-item-label">
- <view class="list-item-label-x"></view>
- <text>闇�姹�</text>
- </view>
- <view class="list-item-row" @click="show1 = true">
- <view class="list-item-row-label">杩愯緭鍝佺<b>*</b></view>
- <view class="list-item-row-val">
- <text :style="{ color: form.transportTypeName ? '#111111' : '' }">{{form.transportTypeName ? form.transportTypeName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
- </view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鐢ㄨ溅鏁伴噺<b>*</b></view>
- <view class="list-item-row-val">
- <input type="number" v-model="form.priceNum2" disabled placeholder="1" />
- <text>杈�</text>
- </view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">杩愯緭閲嶉噺/鏁伴噺<b>*</b></view>
- <view class="list-item-row-val">
- <input type="text" v-model="form.transportNum" placeholder="璇疯緭鍏�" />
- <text @click="show4 = true">{{form.transportUnit}}</text>
- <u-icon name="arrow-down" color="#111111" size="16"></u-icon>
- </view>
- </view>
- <view class="list-item-row" v-if="viewStatus">
- <view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
- <view class="list-item-row-val">
- <textarea cols="30" v-model="form.supplement" rows="10" placeholder="璇疯緭鍏�" maxlength="200"></textarea>
- </view>
- </view>
- <view class="list-item-row" v-if="viewStatus">
- <view class="list-item-row-label">鍥剧墖</view>
- <view class="list-item-row-upload">
- <view class="upload-item" v-for="(item, index) in form.multifileList" :key="index">
- <image :src="item.url" mode="widthFix"></image>
- <image class="upload-item-dele" @click="form.multifileList.splice(index, 1)" src="/static/icon/ic_delete1@2x.png" mode="widthFix"></image>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鐢ㄨ溅鏁伴噺<b>*</b></view>
+ <view class="list-item-row-val">
+ <input type="number" v-model="form.priceNum2" disabled placeholder="1" />
+ <text>杈�</text>
</view>
- <view class="upload-item" @click="uploadImg">
- <u-icon name="plus" color="#999999" size="24"></u-icon>
- <text>鐐瑰嚮涓婁紶</text>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">杩愯緭閲嶉噺/鏁伴噺<b>*</b></view>
+ <view class="list-item-row-val">
+ <input type="text" v-model="form.transportNum" placeholder="璇疯緭鍏�" />
+ <text @click="show4 = true">{{form.transportUnit}}</text>
+ <u-icon name="arrow-down" color="#111111" size="16"></u-icon>
+ </view>
+ </view>
+ <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
+ <view class="list-item-row-val">
+ <textarea cols="30" v-model="form.supplement" rows="10" placeholder="璇疯緭鍏�" maxlength="200"></textarea>
+ </view>
+ </view>
+ <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row-label">鍥剧墖</view>
+ <view class="list-item-row-upload">
+ <view class="upload-item" v-for="(item, index) in form.multifileList" :key="index">
+ <image :src="item.url || item.fileurlFull" mode="widthFix"></image>
+ <image class="upload-item-dele" @click="form.multifileList.splice(index, 1)" src="/static/icon/ic_delete1@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="upload-item" @click="uploadImg">
+ <u-icon name="plus" color="#999999" size="24"></u-icon>
+ <text>鐐瑰嚮涓婁紶</text>
+ </view>
+ </view>
+ </view>
+ <view class="list-item-zk" @click="viewStatus = !viewStatus">
+ <text>{{viewStatus ? '鏀惰捣' : '琛ュ厖闇�姹�'}}</text>
+ <u-icon :name="viewStatus ? 'arrow-up' : 'arrow-down'" color="#00BC12" size="16"></u-icon>
+ </view>
+ </view>
+ <view class="list-item">
+ <view class="list-item-label">
+ <view class="list-item-label-x"></view>
+ <text>璐圭敤</text>
+ </view>
+ <view class="list-item-cate">
+ <view :class="item.id === form.carType ? 'list-item-cate-item active' : 'list-item-cate-item'" v-for="(item, index) in ff" :key="index" @click="form.carType = item.id">鎸夊ぉ浠樿垂</view>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">澶╂暟</view>
+ <view class="list-item-row-val">
+ <input type="number" v-model="form.priceNum1" disabled placeholder="璇疯緭鍏�" />
+ <text>澶�</text>
+ </view>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">璐圭敤鏍囧噯<b>*</b></view>
+ <view class="list-item-row-val">
+ <input type="number" @blur="getPrice" v-model="form.price" placeholder="璇疯緭鍏�" />
+ <text>{{form.priceUnit}}</text>
</view>
</view>
</view>
- <view class="list-item-zk" @click="viewStatus = !viewStatus">
- <text>{{viewStatus ? '鏀惰捣' : '琛ュ厖闇�姹�'}}</text>
- <u-icon :name="viewStatus ? 'arrow-up' : 'arrow-down'" color="#00BC12" size="16"></u-icon>
- </view>
- </view>
- <view class="list-item">
- <view class="list-item-label">
- <view class="list-item-label-x"></view>
- <text>璐圭敤</text>
- </view>
- <view class="list-item-cate">
- <view :class="item.id === form.carType ? 'list-item-cate-item active' : 'list-item-cate-item'" v-for="(item, index) in ff" :key="index" @click="form.carType = item.id">鎸夊ぉ浠樿垂</view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">澶╂暟</view>
- <view class="list-item-row-val">
- <input type="number" v-model="form.priceNum1" disabled placeholder="璇疯緭鍏�" />
- <text>澶�</text>
+ <view class="list-item">
+ <view class="list-item-label">
+ <view class="list-item-label-x"></view>
+ <text>鑱旂郴浜轰俊鎭�</text>
+ <text class="list-item-label-info">榛樿鍙戝崟鏂硅仈绯绘柟寮忥紝鍙慨鏀硅仈绯讳汉</text>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鑱旂郴浜哄鍚�</view>
+ <view class="list-item-row-val">
+ <input type="text" v-model="form.linkName" placeholder="璇疯ˉ鍏�" />
+ </view>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鑱旂郴鐢佃瘽<b>*</b></view>
+ <view class="list-item-row-val">
+ <input type="text" v-model="form.linkPhone" maxlength="11" placeholder="璇疯ˉ鍏�" />
+ </view>
</view>
</view>
- <view class="list-item-row">
- <view class="list-item-row-label">璐圭敤鏍囧噯<b>*</b></view>
- <view class="list-item-row-val">
- <input type="number" @blur="getPrice" v-model="form.price" placeholder="璇疯緭鍏�" />
- <text>{{form.priceUnit}}</text>
- </view>
- </view>
- </view>
- <view class="list-item">
- <view class="list-item-label">
- <view class="list-item-label-x"></view>
- <text>鑱旂郴浜轰俊鎭�</text>
- <text class="list-item-label-info">榛樿鍙戝崟鏂硅仈绯绘柟寮忥紝鍙慨鏀硅仈绯讳汉</text>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鑱旂郴浜哄鍚�</view>
- <view class="list-item-row-val">
- <input type="text" v-model="form.linkName" placeholder="璇疯ˉ鍏�" />
- </view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鑱旂郴鐢佃瘽<b>*</b></view>
- <view class="list-item-row-val">
- <input type="text" v-model="form.linkPhone" maxlength="11" placeholder="璇疯ˉ鍏�" />
- </view>
- </view>
- </view>
+ </template>
</view>
<view style="width: 100%; height: calc(214rpx + env(safe-area-inset-bottom));"></view>
<view class="footer">
@@ -228,12 +238,14 @@
},
data() {
return {
+ info: {},
show: false,
show1: false,
show2: false,
show3: false,
show4: false,
form: {
+ id: null,
startDate: '',
endDate: '',
lat: '',
@@ -284,22 +296,41 @@
}
}
},
- onLoad() {
- const res = uni.getStorageSync('carData');
- this.form.linkPhone = this.userInfo.telephone
- this.form.startDate = res.startDate
- this.form.endDate = res.endDate
- this.form.lat = res.lat
- this.form.lgt = res.lgt
- this.form.priceNum1 = res.days
- this.form.categoryId = res.categoryId
- this.form.categoryName = res.categoryName
- this.form.location = res.location
- this.form.latEnd = res.latEnd
- this.form.lgtEnd = res.lgtEnd
- this.form.locationEnd = res.locationEnd
- this.form.wayInfoDTOList = res.wayInfoDTOList
- uni.removeStorageSync('carData');
+ onLoad(option) {
+ if (option.id) {
+ this.form.id = option.id
+ this.$u.api.getDetail({
+ orderId: option.id
+ }).then(res => {
+ this.info = res.data
+ for (const key in this.form) {
+ this.form[key] = res.data[key]
+ }
+ this.form.price = Number(this.form.price) / 100
+ if (!this.form.multifileList) {
+ this.form.multifileList = []
+ }
+ if (!this.form.wayInfoDTOList) {
+ this.form.wayInfoDTOList = []
+ }
+ })
+ } else {
+ const res = uni.getStorageSync('carData');
+ this.form.linkPhone = this.userInfo.telephone
+ this.form.startDate = res.startDate
+ this.form.endDate = res.endDate
+ this.form.lat = res.lat
+ this.form.lgt = res.lgt
+ this.form.priceNum1 = res.days
+ this.form.categoryId = res.categoryId
+ this.form.categoryName = res.categoryName
+ this.form.location = res.location
+ this.form.latEnd = res.latEnd
+ this.form.lgtEnd = res.lgtEnd
+ this.form.locationEnd = res.locationEnd
+ this.form.wayInfoDTOList = res.wayInfoDTOList
+ uni.removeStorageSync('carData');
+ }
this.getCategoryLists()
},
methods: {
@@ -349,6 +380,7 @@
})
},
uploadImg() {
+ var that = this;
uni.chooseImage({
success: (chooseImageRes) => {
const tempFilePaths = chooseImageRes.tempFilePaths;
@@ -361,7 +393,7 @@
},
success: (uploadFileRes) => {
const res = JSON.parse(uploadFileRes.data)
- this.form.multifileList.push({
+ that.form.multifileList.push({
fileurl: res.data.imgaddr,
name: res.data.originname,
url: res.data.url,
diff --git a/small-program/pages/index/index.vue b/small-program/pages/index/index.vue
index 23f4457..9a93d5f 100644
--- a/small-program/pages/index/index.vue
+++ b/small-program/pages/index/index.vue
@@ -223,10 +223,10 @@
</view>
<view class="box-hz-list-item" @click="selectAddress(1)">
<view class="box-hz-list-item-label"><text>鐢ㄥ伐鍦扮偣锛�</text></view>
- <view :class="form.location ? 'box-hz-list-item-val active' :'box-hz-list-item-val'">
+ <view :class="form.address ? 'box-hz-list-item-val active' :'box-hz-list-item-val'">
<view class="box-hz-list-item-val-left">
<image class="icon" src="/static/icon/ic_location@2x.png" mode="widthFix"></image>
- <text>{{form.location ? form.location : '璇烽�夋嫨鐢ㄥ伐鍦扮偣'}}</text>
+ <text>{{form.address ? form.address : '璇烽�夋嫨鐢ㄥ伐鍦扮偣'}}</text>
</view>
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
@@ -326,15 +326,6 @@
return this.form.estimatedAccount / 100
}
},
- onShow(options) {
- this.typeViewId = 0
- if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}'){
- this.isLogin = true
- }
- if (this.userInfo && this.userInfo.useIdentity == 1) {
- this.typeViewId = 1
- }
- },
data() {
return {
show: false,
@@ -394,7 +385,9 @@
orderList: [],
typeVal: '',
page: 1,
- next: true
+ next: true,
+
+ isOnce: true
}
},
async onLoad() {
@@ -402,6 +395,21 @@
this.getCategoryLists()
this.getOrderList()
this.form.linkPhone = this.userInfo.telephone
+ },
+ onShow(options) {
+ this.typeViewId = 0
+ if(this.token && this.token != '' && this.userInfo && JSON.stringify(this.userInfo) != '{}'){
+ this.isLogin = true
+ }
+ if (this.userInfo && this.userInfo.useIdentity == 1) {
+ this.typeViewId = 1
+ }
+ if (!this.isOnce && this.userInfo.useIdentity == 1) {
+ this.page = 1
+ this.next = true
+ this.orderList = []
+ this.getOrderList()
+ }
},
watch: {
typeId: {
@@ -496,6 +504,8 @@
queryLgt: this.longitude
}
}).then(res => {
+ if (res.code !== 200) return;
+ this.isOnce = false
res.data.records.forEach(item => {
// 璁㈤鍗�
if (item.type === 2) {
@@ -689,17 +699,17 @@
// 閲囨憳宸�
if (this.form.workType === 0) {
uni.navigateTo({
- url: `/pages/using-workers/using-workers?days=${form.days}&startDate=${form.startDate}&endDate=${form.endDate}&latitude=${form.latitude}&longitude=${form.longitude}&address=${form.location}&workType=${form.workType}`
+ url: `/pages/using-workers/using-workers?days=${form.days}&startDate=${form.startDate}&endDate=${form.endDate}&latitude=${form.latitude}&longitude=${form.longitude}&address=${form.address}&workType=${form.workType}`
})
// 鍒嗘嫞宸�
} else if (this.form.workType === 1) {
uni.navigateTo({
- url: `/pages/sorting/sorting?days=${form.days}&startDate=${form.startDate}&endDate=${form.endDate}&latitude=${form.latitude}&longitude=${form.longitude}&address=${form.location}&workType=${form.workType}`
+ url: `/pages/sorting/sorting?days=${form.days}&startDate=${form.startDate}&endDate=${form.endDate}&latitude=${form.latitude}&longitude=${form.longitude}&address=${form.address}&workType=${form.workType}`
})
// 鍖呰宸�
} else if (this.form.workType === 2) {
uni.navigateTo({
- url: `/pages/packaging-worker/packaging-worker?days=${form.days}&startDate=${form.startDate}&endDate=${form.endDate}&latitude=${form.latitude}&longitude=${form.longitude}&address=${form.location}&workType=${form.workType}`
+ url: `/pages/packaging-worker/packaging-worker?days=${form.days}&startDate=${form.startDate}&endDate=${form.endDate}&latitude=${form.latitude}&longitude=${form.longitude}&address=${form.address}&workType=${form.workType}`
})
}
// 杩愯揣
diff --git a/small-program/pages/order-details/order-details.vue b/small-program/pages/order-details/order-details.vue
index bc57561..22dded0 100644
--- a/small-program/pages/order-details/order-details.vue
+++ b/small-program/pages/order-details/order-details.vue
@@ -163,8 +163,8 @@
</view>
</view>
</view>
- <view style="width: 100%; height: calc(108rpx + env(safe-area-inset-bottom));"></view>
- <view class="order-footer">
+ <view style="width: 100%; height: calc(108rpx + env(safe-area-inset-bottom));" v-if="![4, 99].includes(info.status)"></view>
+ <view class="order-footer" v-if="![4, 99].includes(info.status)">
<view class="order-footer-btn">
<view class="order-footer-btn-a" @click="show = true" v-if="userInfo.id === info.acceptMemberId && info.status ===2">鍙栨秷璁㈠崟</view>
<view class="order-footer-btn-a" @click="show = true" v-if="userInfo.id === info.releaseMemberId && (info.status ===0 || info.status ===1|| info.status ===2)">鍙栨秷璁㈠崟</view>
@@ -231,7 +231,9 @@
</view>
<view slot="confirmButton" style="display: flex; justify-content: space-between; align-items: center; width: 100%;">
<view class="btn1" @click="show5=false">鎴戝啀鎯虫兂</view>
- <view class="btn2" style="color: red;" @click="confirmUpdDo(1)">涓嶅悓鎰�</view>
+ <view style="width: 20rpx; height: 100%;"></view>
+ <view class="btn2" style="background-color: #f56c6c; color: #ffffff;" @click="confirmUpdDo(1)">涓嶅悓鎰�</view>
+ <view style="width: 20rpx; height: 100%;"></view>
<view class="btn2" @click="confirmUpdDo(0)">鍚屾剰</view>
</view>
</u-modal>
diff --git a/small-program/pages/packaging-worker/packaging-worker.vue b/small-program/pages/packaging-worker/packaging-worker.vue
index 82fe0a7..3e044c9 100644
--- a/small-program/pages/packaging-worker/packaging-worker.vue
+++ b/small-program/pages/packaging-worker/packaging-worker.vue
@@ -13,105 +13,112 @@
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
- <view class="list-item-row" @click="selectAddress()">
- <view class="list-item-row-label">鐢ㄥ伐鍦扮偣<b>*</b></view>
- <view class="list-item-row-val">
- <text>{{form.location ? form.location : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
- </view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鍦扮偣鎻忚堪</view>
- <view class="list-item-row-val">
- <input type="text" v-model="form.locationRemark" placeholder="璇疯緭鍏�" />
- </view>
- </view>
- </view>
- <view class="list-item">
- <view class="list-item-label">
- <view class="list-item-label-x"></view>
- <text>闇�姹�</text>
- </view>
- <view class="list-item-row" @click="show1 = true">
- <view class="list-item-row-label">鍖呰鍝佺<b>*</b></view>
- <view class="list-item-row-val">
- <text>{{form.categoryName ? form.categoryName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
- </view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鐢ㄥ伐鏁伴噺<b>*</b></view>
- <view class="list-item-row-val">
- <input type="number" v-model="form.priceNum2" @blur="getPrice" placeholder="璇疯緭鍏�" />
- <text>浜�</text>
- </view>
- </view>
- <view class="list-item-row" v-if="viewStatus">
- <view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
- <view class="list-item-row-val">
- <textarea v-model="form.supplement" cols="30" rows="10" placeholder="濡傛灉鏈夌壒娈婅姹傦紝璇峰湪姝ゅ璇存槑" maxlength="200"></textarea>
- </view>
- </view>
- <view class="list-item-row" v-if="viewStatus">
- <view class="list-item-row-label">鍥剧墖</view>
- <view class="list-item-row-upload">
- <view class="upload-item" v-for="(item, index) in form.multifileList" :key="index">
- <image :src="item.url" mode="widthFix"></image>
- <image class="upload-item-dele" @click="form.multifileList.splice(index, 1)" src="/static/icon/ic_delete1@2x.png" mode="widthFix"></image>
+
+ <template v-if="!(info.type !== 2 && info.status === 2)">
+ <view class="list-item-row" @click="selectAddress()">
+ <view class="list-item-row-label">鐢ㄥ伐鍦扮偣<b>*</b></view>
+ <view class="list-item-row-val">
+ <text>{{form.location ? form.location : '璇烽�夋嫨'}}</text>
+ <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
- <view class="upload-item" @click="uploadImg">
- <u-icon name="plus" color="#999999" size="24"></u-icon>
- <text>鐐瑰嚮涓婁紶</text>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鍦扮偣鎻忚堪</view>
+ <view class="list-item-row-val">
+ <input type="text" v-model="form.locationRemark" placeholder="璇疯緭鍏�" />
+ </view>
+ </view>
+ </template>
+
+ </view>
+ <template v-if="!(info.type !== 2 && info.status === 2)">
+ <view class="list-item">
+ <view class="list-item-label">
+ <view class="list-item-label-x"></view>
+ <text>闇�姹�</text>
+ </view>
+ <view class="list-item-row" @click="show1 = true">
+ <view class="list-item-row-label">鍖呰鍝佺<b>*</b></view>
+ <view class="list-item-row-val">
+ <text>{{form.categoryName ? form.categoryName : '璇烽�夋嫨'}}</text>
+ <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
+ </view>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鐢ㄥ伐鏁伴噺<b>*</b></view>
+ <view class="list-item-row-val">
+ <input type="number" v-model="form.priceNum2" @blur="getPrice" placeholder="璇疯緭鍏�" />
+ <text>浜�</text>
+ </view>
+ </view>
+ <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
+ <view class="list-item-row-val">
+ <textarea v-model="form.supplement" cols="30" rows="10" placeholder="濡傛灉鏈夌壒娈婅姹傦紝璇峰湪姝ゅ璇存槑" maxlength="200"></textarea>
+ </view>
+ </view>
+ <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row-label">鍥剧墖</view>
+ <view class="list-item-row-upload">
+ <view class="upload-item" v-for="(item, index) in form.multifileList" :key="index">
+ <image :src="item.url || item.fileurlFull" mode="widthFix"></image>
+ <image class="upload-item-dele" @click="form.multifileList.splice(index, 1)" src="/static/icon/ic_delete1@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="upload-item" @click="uploadImg">
+ <u-icon name="plus" color="#999999" size="24"></u-icon>
+ <text>鐐瑰嚮涓婁紶</text>
+ </view>
+ </view>
+ </view>
+ <view class="list-item-zk" @click="viewStatus = !viewStatus">
+ <text>{{viewStatus ? '鏀惰捣' : '琛ュ厖闇�姹�'}}</text>
+ <u-icon :name="viewStatus ? 'arrow-up' : 'arrow-down'" color="#00BC12" size="16"></u-icon>
+ </view>
+ </view>
+ <view class="list-item">
+ <view class="list-item-label">
+ <view class="list-item-label-x"></view>
+ <text>璐圭敤</text>
+ </view>
+ <view class="list-item-cate">
+ <view :class="form.carType === item.id ? 'list-item-cate-item active' : 'list-item-cate-item'" v-for="(item, index) in settlementType" :key="index" @click="clickType(item.id)">{{item.name}}</view>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">澶╂暟</view>
+ <view class="list-item-row-val">
+ <input v-model="form.priceNum1" disabled @blur="getPrice" type="number" placeholder="璇疯緭鍏�" />
+ <text>澶�</text>
+ </view>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">璐圭敤鏍囧噯<b>*</b></view>
+ <view class="list-item-row-val">
+ <input v-model="form.price" type="number" @blur="getPrice" placeholder="璇疯緭鍏�" />
+ <text>{{form.priceUnit}}</text>
</view>
</view>
</view>
- <view class="list-item-zk" @click="viewStatus = !viewStatus">
- <text>{{viewStatus ? '鏀惰捣' : '琛ュ厖闇�姹�'}}</text>
- <u-icon :name="viewStatus ? 'arrow-up' : 'arrow-down'" color="#00BC12" size="16"></u-icon>
- </view>
- </view>
- <view class="list-item">
- <view class="list-item-label">
- <view class="list-item-label-x"></view>
- <text>璐圭敤</text>
- </view>
- <view class="list-item-cate">
- <view :class="form.carType === item.id ? 'list-item-cate-item active' : 'list-item-cate-item'" v-for="(item, index) in settlementType" :key="index" @click="clickType(item.id)">{{item.name}}</view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">澶╂暟</view>
- <view class="list-item-row-val">
- <input v-model="form.priceNum1" disabled @blur="getPrice" type="number" placeholder="璇疯緭鍏�" />
- <text>澶�</text>
+ <view class="list-item">
+ <view class="list-item-label">
+ <view class="list-item-label-x"></view>
+ <text>鑱旂郴浜轰俊鎭�</text>
+ <text class="list-item-label-info">榛樿鍙戝崟鏂硅仈绯绘柟寮忥紝鍙慨鏀硅仈绯讳汉</text>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鑱旂郴浜哄鍚�</view>
+ <view class="list-item-row-val">
+ <input type="text" v-model="form.linkName" placeholder="璇疯ˉ鍏�" />
+ </view>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鑱旂郴鐢佃瘽<b>*</b></view>
+ <view class="list-item-row-val">
+ <input type="text" v-model="form.linkPhone" maxlength="11" placeholder="璇疯ˉ鍏�" />
+ </view>
</view>
</view>
- <view class="list-item-row">
- <view class="list-item-row-label">璐圭敤鏍囧噯<b>*</b></view>
- <view class="list-item-row-val">
- <input v-model="form.price" type="number" @blur="getPrice" placeholder="璇疯緭鍏�" />
- <text>{{form.priceUnit}}</text>
- </view>
- </view>
- </view>
- <view class="list-item">
- <view class="list-item-label">
- <view class="list-item-label-x"></view>
- <text>鑱旂郴浜轰俊鎭�</text>
- <text class="list-item-label-info">榛樿鍙戝崟鏂硅仈绯绘柟寮忥紝鍙慨鏀硅仈绯讳汉</text>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鑱旂郴浜哄鍚�</view>
- <view class="list-item-row-val">
- <input type="text" v-model="form.linkName" placeholder="璇疯ˉ鍏�" />
- </view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鑱旂郴鐢佃瘽<b>*</b></view>
- <view class="list-item-row-val">
- <input type="text" v-model="form.linkPhone" maxlength="11" placeholder="璇疯ˉ鍏�" />
- </view>
- </view>
- </view>
+ </template>
+
</view>
<view style="width: 100%; height: calc(214rpx + env(safe-area-inset-bottom));"></view>
<view class="footer">
@@ -162,9 +169,11 @@
},
data() {
return {
+ info: {},
show: false,
show1: false,
form: {
+ id: null,
days: '',
startDate: '',
endDate: '',
@@ -197,14 +206,32 @@
};
},
onLoad(option) {
- this.form.linkPhone = this.userInfo.telephone
- this.form.priceNum1 = option.days
- this.form.startDate = option.startDate
- this.form.endDate = option.endDate
- this.form.lat = option.latitude
- this.form.lgt = option.longitude
- this.form.location = option.address
- this.form.workType = option.workType
+ if (option.id) {
+ this.form.id = option.id
+ this.$u.api.getDetail({
+ orderId: option.id
+ }).then(res => {
+ this.info = res.data
+ for (const key in this.form) {
+ this.form[key] = res.data[key]
+ }
+ this.form.days = res.data.totalDays
+ this.form.price = Number(this.form.price) / 100
+ if (!this.form.multifileList) {
+ this.form.multifileList = []
+ }
+ // this.clickType()
+ })
+ } else {
+ this.form.linkPhone = this.userInfo.telephone
+ this.form.priceNum1 = option.days
+ this.form.startDate = option.startDate
+ this.form.endDate = option.endDate
+ this.form.lat = option.latitude
+ this.form.lgt = option.longitude
+ this.form.location = option.address
+ this.form.workType = option.workType
+ }
this.getCateList()
},
methods: {
@@ -222,14 +249,29 @@
if (!this.form.linkPhone) {
return uni.showToast({ title: '璇疯緭鍏ヨ仈绯荤數璇�', icon: 'none' })
}
- this.$u.api.release({ ...this.form, price: Number(this.form.price) * 100 })
- .then(res => {
- if (res.code == 200) {
- uni.navigateTo({
- url: `/pages/success/success?orderId=${res.data.id}`
- })
- }
- })
+ if (!this.form.id) {
+ this.$u.api.release({ ...this.form, price: Number(this.form.price) * 100 })
+ .then(res => {
+ if (res.code == 200) {
+ uni.navigateTo({
+ url: `/pages/success/success?orderId=${res.data.id}`
+ })
+ }
+ })
+ } else {
+ this.$u.api.updateOrder({ ...this.form, price: Number(this.form.price) * 100 })
+ .then(res => {
+ if (res.code == 200) {
+ if (res.code == 200) {
+ uni.showToast({ title: '缂栬緫鎴愬姛', icon: 'success', mask: true, duration: 2000 })
+ setTimeout(() => {
+ uni.navigateBack({ delta: 1 });
+ uni.$emit('refresh')
+ }, 1500)
+ }
+ }
+ })
+ }
},
// 璁＄畻閲戦
getPrice() {
@@ -248,8 +290,9 @@
confirmDate(e) {
this.form.startDate = e[0]
this.form.endDate = e[e.length - 1]
- this.form.days = e.length;
+ this.form.priceNum1 = e.length;
this.show = false
+ this.getPrice()
},
selectAddress() {
uni.chooseLocation({
diff --git a/small-program/pages/sorting/sorting.vue b/small-program/pages/sorting/sorting.vue
index b7e942b..d01a6ba 100644
--- a/small-program/pages/sorting/sorting.vue
+++ b/small-program/pages/sorting/sorting.vue
@@ -13,102 +13,108 @@
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
- <view class="list-item-row" @click="selectAddress()">
- <view class="list-item-row-label">鐢ㄥ伐鍦扮偣<b>*</b></view>
- <view class="list-item-row-val">
- <text>{{form.location ? form.location : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
- </view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鍦扮偣鎻忚堪</view>
- <view class="list-item-row-val">
- <input type="text" v-model="form.locationRemark" placeholder="璇疯緭鍏�" />
- </view>
- </view>
- </view>
- <view class="list-item">
- <view class="list-item-label">
- <view class="list-item-label-x"></view>
- <text>闇�姹�</text>
- </view>
- <view class="list-item-row" @click="show1 = true">
- <view class="list-item-row-label">鍒嗘嫞鍝佺<b>*</b></view>
- <view class="list-item-row-val">
- <text>{{form.categoryName ? form.categoryName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
- </view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鐢ㄥ伐鏁伴噺<b>*</b></view>
- <view class="list-item-row-val">
- <input type="number" v-model="form.priceNum2" @blur="getPrice" placeholder="璇疯緭鍏�" />
- <text>浜�</text>
- </view>
- </view>
- <view class="list-item-row" v-if="viewStatus">
- <view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
- <view class="list-item-row-val">
- <textarea v-model="form.supplement" cols="30" rows="10" placeholder="濡傛灉鏈夌壒娈婅姹傦紝璇峰湪姝ゅ璇存槑" maxlength="200"></textarea>
- </view>
- </view>
- <view class="list-item-row" v-if="viewStatus">
- <view class="list-item-row-label">鍥剧墖</view>
- <view class="list-item-row-upload">
- <view class="upload-item" v-for="(item, index) in form.multifileList" :key="index">
- <image :src="item.url" mode="widthFix"></image>
- <image class="upload-item-dele" @click="form.multifileList.splice(index, 1)" src="/static/icon/ic_delete1@2x.png" mode="widthFix"></image>
+ <template v-if="!(info.type !== 2 && info.status === 2)">
+ <view class="list-item-row" @click="selectAddress()">
+ <view class="list-item-row-label">鐢ㄥ伐鍦扮偣<b>*</b></view>
+ <view class="list-item-row-val">
+ <text>{{form.location ? form.location : '璇烽�夋嫨'}}</text>
+ <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
- <view class="upload-item" @click="uploadImg">
- <u-icon name="plus" color="#999999" size="24"></u-icon>
- <text>鐐瑰嚮涓婁紶</text>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鍦扮偣鎻忚堪</view>
+ <view class="list-item-row-val">
+ <input type="text" v-model="form.locationRemark" placeholder="璇疯緭鍏�" />
+ </view>
+ </view>
+ </template>
+
+ </view>
+ <template v-if="!(info.type !== 2 && info.status === 2)">
+ <view class="list-item">
+ <view class="list-item-label">
+ <view class="list-item-label-x"></view>
+ <text>闇�姹�</text>
+ </view>
+ <view class="list-item-row" @click="show1 = true">
+ <view class="list-item-row-label">鍒嗘嫞鍝佺<b>*</b></view>
+ <view class="list-item-row-val">
+ <text>{{form.categoryName ? form.categoryName : '璇烽�夋嫨'}}</text>
+ <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
+ </view>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鐢ㄥ伐鏁伴噺<b>*</b></view>
+ <view class="list-item-row-val">
+ <input type="number" v-model="form.priceNum2" @blur="getPrice" placeholder="璇疯緭鍏�" />
+ <text>浜�</text>
+ </view>
+ </view>
+ <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
+ <view class="list-item-row-val">
+ <textarea v-model="form.supplement" cols="30" rows="10" placeholder="濡傛灉鏈夌壒娈婅姹傦紝璇峰湪姝ゅ璇存槑" maxlength="200"></textarea>
+ </view>
+ </view>
+ <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row-label">鍥剧墖</view>
+ <view class="list-item-row-upload">
+ <view class="upload-item" v-for="(item, index) in form.multifileList" :key="index">
+ <image :src="item.url || item.fileurlFull" mode="widthFix"></image>
+ <image class="upload-item-dele" @click="form.multifileList.splice(index, 1)" src="/static/icon/ic_delete1@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="upload-item" @click="uploadImg">
+ <u-icon name="plus" color="#999999" size="24"></u-icon>
+ <text>鐐瑰嚮涓婁紶</text>
+ </view>
+ </view>
+ </view>
+ <view class="list-item-zk" @click="viewStatus = !viewStatus">
+ <text>{{viewStatus ? '鏀惰捣' : '琛ュ厖闇�姹�'}}</text>
+ <u-icon :name="viewStatus ? 'arrow-up' : 'arrow-down'" color="#00BC12" size="16"></u-icon>
+ </view>
+ </view>
+ <view class="list-item">
+ <view class="list-item-label">
+ <view class="list-item-label-x"></view>
+ <text>璐圭敤</text>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">澶╂暟</view>
+ <view class="list-item-row-val">
+ <input v-model="form.priceNum1" disabled @blur="getPrice" type="number" placeholder="璇疯緭鍏�" />
+ <text>澶�</text>
+ </view>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">璐圭敤鏍囧噯<b>*</b></view>
+ <view class="list-item-row-val">
+ <input v-model="form.price" type="number" @blur="getPrice" placeholder="璇疯緭鍏�" />
+ <text>鍏�/浜�/澶�</text>
</view>
</view>
</view>
- <view class="list-item-zk" @click="viewStatus = !viewStatus">
- <text>{{viewStatus ? '鏀惰捣' : '琛ュ厖闇�姹�'}}</text>
- <u-icon :name="viewStatus ? 'arrow-up' : 'arrow-down'" color="#00BC12" size="16"></u-icon>
- </view>
- </view>
- <view class="list-item">
- <view class="list-item-label">
- <view class="list-item-label-x"></view>
- <text>璐圭敤</text>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">澶╂暟</view>
- <view class="list-item-row-val">
- <input v-model="form.priceNum1" disabled @blur="getPrice" type="number" placeholder="璇疯緭鍏�" />
- <text>澶�</text>
+ <view class="list-item">
+ <view class="list-item-label">
+ <view class="list-item-label-x"></view>
+ <text>鑱旂郴浜轰俊鎭�</text>
+ <text class="list-item-label-info">榛樿鍙戝崟鏂硅仈绯绘柟寮忥紝鍙慨鏀硅仈绯讳汉</text>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鑱旂郴浜哄鍚�</view>
+ <view class="list-item-row-val">
+ <input type="text" v-model="form.linkName" placeholder="璇疯ˉ鍏�" />
+ </view>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鑱旂郴鐢佃瘽<b>*</b></view>
+ <view class="list-item-row-val">
+ <input type="text" v-model="form.linkPhone" maxlength="11" placeholder="璇疯ˉ鍏�" />
+ </view>
</view>
</view>
- <view class="list-item-row">
- <view class="list-item-row-label">璐圭敤鏍囧噯<b>*</b></view>
- <view class="list-item-row-val">
- <input v-model="form.price" type="number" @blur="getPrice" placeholder="璇疯緭鍏�" />
- <text>鍏�/浜�/澶�</text>
- </view>
- </view>
- </view>
- <view class="list-item">
- <view class="list-item-label">
- <view class="list-item-label-x"></view>
- <text>鑱旂郴浜轰俊鎭�</text>
- <text class="list-item-label-info">榛樿鍙戝崟鏂硅仈绯绘柟寮忥紝鍙慨鏀硅仈绯讳汉</text>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鑱旂郴浜哄鍚�</view>
- <view class="list-item-row-val">
- <input type="text" v-model="form.linkName" placeholder="璇疯ˉ鍏�" />
- </view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鑱旂郴鐢佃瘽<b>*</b></view>
- <view class="list-item-row-val">
- <input type="text" v-model="form.linkPhone" maxlength="11" placeholder="璇疯ˉ鍏�" />
- </view>
- </view>
- </view>
+ </template>
+
</view>
<view style="width: 100%; height: calc(214rpx + env(safe-area-inset-bottom));"></view>
<view class="footer">
@@ -159,9 +165,11 @@
},
data() {
return {
+ info: {},
show: false,
show1: false,
form: {
+ id: null,
days: '',
startDate: '',
endDate: '',
@@ -188,14 +196,31 @@
};
},
onLoad(option) {
- this.form.linkPhone = this.userInfo.telephone
- this.form.priceNum1 = option.days
- this.form.startDate = option.startDate
- this.form.endDate = option.endDate
- this.form.lat = option.latitude
- this.form.lgt = option.longitude
- this.form.location = option.address
- this.form.workType = option.workType
+ if (option.id) {
+ this.form.id = option.id
+ this.$u.api.getDetail({
+ orderId: option.id
+ }).then(res => {
+ this.info = res.data
+ for (const key in this.form) {
+ this.form[key] = res.data[key]
+ }
+ this.form.days = res.data.totalDays
+ this.form.price = Number(this.form.price) / 100
+ if (!this.form.multifileList) {
+ this.form.multifileList = []
+ }
+ })
+ } else {
+ this.form.linkPhone = this.userInfo.telephone
+ this.form.priceNum1 = option.days
+ this.form.startDate = option.startDate
+ this.form.endDate = option.endDate
+ this.form.lat = option.latitude
+ this.form.lgt = option.longitude
+ this.form.location = option.address
+ this.form.workType = option.workType
+ }
this.getCateList()
},
methods: {
@@ -213,14 +238,27 @@
if (!this.form.linkPhone) {
return uni.showToast({ title: '璇疯緭鍏ヨ仈绯荤數璇�', icon: 'none' })
}
- this.$u.api.release({ ...this.form, price: Number(this.form.price) * 100 })
- .then(res => {
- if (res.code == 200) {
- uni.navigateTo({
- url: `/pages/success/success?orderId=${res.data.id}`
- })
- }
- })
+ if (!this.form.id) {
+ this.$u.api.release({ ...this.form, price: Number(this.form.price) * 100 })
+ .then(res => {
+ if (res.code == 200) {
+ uni.navigateTo({
+ url: `/pages/success/success?orderId=${res.data.id}`
+ })
+ }
+ })
+ } else {
+ this.$u.api.updateOrder({ ...this.form, price: Number(this.form.price) * 100 })
+ .then(res => {
+ if (res.code == 200) {
+ uni.showToast({ title: '缂栬緫鎴愬姛', icon: 'success', mask: true, duration: 2000 })
+ setTimeout(() => {
+ uni.navigateBack({ delta: 1 });
+ uni.$emit('refresh')
+ }, 1500)
+ }
+ })
+ }
},
// 璁＄畻閲戦
getPrice() {
@@ -240,8 +278,9 @@
confirmDate(e) {
this.form.startDate = e[0]
this.form.endDate = e[e.length - 1]
- this.form.days = e.length;
+ this.form.priceNum1 = e.length;
this.show = false
+ this.getPrice()
},
selectAddress() {
uni.chooseLocation({
diff --git a/small-program/pages/success/success.vue b/small-program/pages/success/success.vue
index 008d2f0..48c6b78 100644
--- a/small-program/pages/success/success.vue
+++ b/small-program/pages/success/success.vue
@@ -4,9 +4,9 @@
<text class="success-a">鍙戝崟鎴愬姛</text>
<text class="success-b">璇风瓑寰呮帴鍗�</text>
<view class="success-footer">
- <view class="success-footer-btn">鍥炲埌棣栭〉</view>
+ <view class="success-footer-btn" @click="toIndex">鍥炲埌棣栭〉</view>
<view style="width: 20rpx; height: 100%;"></view>
- <view class="success-footer-btn1">鏌ョ湅璇︽儏</view>
+ <view class="success-footer-btn1" @click="toDesc">鏌ョ湅璇︽儏</view>
</view>
</view>
</template>
@@ -15,8 +15,23 @@
export default {
data() {
return {
-
+ orderId: null
};
+ },
+ onLoad(option) {
+ this.orderId = option.orderId
+ },
+ methods: {
+ toIndex() {
+ uni.switchTab({
+ url: '/pages/index/index'
+ });
+ },
+ toDesc() {
+ uni.navigateTo({
+ url: `/pages/order-details/order-details?id=${this.orderId}`
+ })
+ }
}
}
</script>
diff --git a/small-program/pages/using-workers/using-workers.vue b/small-program/pages/using-workers/using-workers.vue
index 4be22fe..a7bddd6 100644
--- a/small-program/pages/using-workers/using-workers.vue
+++ b/small-program/pages/using-workers/using-workers.vue
@@ -13,95 +13,101 @@
<u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
</view>
- <view class="list-item-row" @click="selectAddress()">
- <view class="list-item-row-label">鐢ㄥ伐鍦扮偣<b>*</b></view>
- <view class="list-item-row-val">
- <text>{{form.location ? form.location : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
- </view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鍦扮偣鎻忚堪</view>
- <view class="list-item-row-val">
- <input type="text" v-model="form.locationRemark" placeholder="璇疯緭鍏�" />
- </view>
- </view>
- </view>
- <view class="list-item">
- <view class="list-item-label">
- <view class="list-item-label-x"></view>
- <text>闇�姹�</text>
- </view>
- <view class="list-item-row" @click="show1 = true">
- <view class="list-item-row-label">閲囨憳鍝佺<b>*</b></view>
- <view class="list-item-row-val">
- <text>{{form.categoryName ? form.categoryName : '璇烽�夋嫨'}}</text>
- <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
- </view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">閲囨憳閲嶉噺<b>*</b></view>
- <view class="list-item-row-val">
- <input type="number" v-model="form.priceNum1" @blur="getPrice" placeholder="璇疯緭鍏�" />
- <text>鏂�</text>
- </view>
- </view>
- <view class="list-item-row" v-if="viewStatus">
- <view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
- <view class="list-item-row-val">
- <textarea v-model="form.supplement" cols="30" rows="10" placeholder="璇疯緭鍏�" maxlength="200"></textarea>
- </view>
- </view>
- <view class="list-item-row" v-if="viewStatus">
- <view class="list-item-row-label">鍥剧墖</view>
- <view class="list-item-row-upload">
- <view class="upload-item" v-for="(item, index) in form.multifileList" :key="index">
- <image :src="item.url || item.fileurlFull" mode="widthFix"></image>
- <image class="upload-item-dele" @click="form.multifileList.splice(index, 1)" src="/static/icon/ic_delete1@2x.png" mode="widthFix"></image>
+ <template v-if="!(info.type !== 2 && info.status === 2)">
+ <view class="list-item-row" @click="selectAddress()">
+ <view class="list-item-row-label">鐢ㄥ伐鍦扮偣<b>*</b></view>
+ <view class="list-item-row-val">
+ <text>{{form.location ? form.location : '璇烽�夋嫨'}}</text>
+ <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
</view>
- <view class="upload-item" @click="uploadImg">
- <u-icon name="plus" color="#999999" size="24"></u-icon>
- <text>鐐瑰嚮涓婁紶</text>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鍦扮偣鎻忚堪</view>
+ <view class="list-item-row-val">
+ <input type="text" v-model="form.locationRemark" placeholder="璇疯緭鍏�" />
+ </view>
+ </view>
+ </template>
+
+ </view>
+ <template v-if="!(info.type !== 2 && info.status === 2)">
+ <view class="list-item">
+ <view class="list-item-label">
+ <view class="list-item-label-x"></view>
+ <text>闇�姹�</text>
+ </view>
+ <view class="list-item-row" @click="show1 = true">
+ <view class="list-item-row-label">閲囨憳鍝佺<b>*</b></view>
+ <view class="list-item-row-val">
+ <text>{{form.categoryName ? form.categoryName : '璇烽�夋嫨'}}</text>
+ <u-icon name="arrow-right" color="#111111" size="16"></u-icon>
+ </view>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">閲囨憳閲嶉噺<b>*</b></view>
+ <view class="list-item-row-val">
+ <input type="number" v-model="form.priceNum1" @blur="getPrice" placeholder="璇疯緭鍏�" />
+ <text>鏂�</text>
+ </view>
+ </view>
+ <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row-label">闇�姹傝ˉ鍏�</view>
+ <view class="list-item-row-val">
+ <textarea v-model="form.supplement" cols="30" rows="10" placeholder="璇疯緭鍏�" maxlength="200"></textarea>
+ </view>
+ </view>
+ <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row-label">鍥剧墖</view>
+ <view class="list-item-row-upload">
+ <view class="upload-item" v-for="(item, index) in form.multifileList" :key="index">
+ <image :src="item.url || item.fileurlFull" mode="widthFix"></image>
+ <image class="upload-item-dele" @click="form.multifileList.splice(index, 1)" src="/static/icon/ic_delete1@2x.png" mode="widthFix"></image>
+ </view>
+ <view class="upload-item" @click="uploadImg">
+ <u-icon name="plus" color="#999999" size="24"></u-icon>
+ <text>鐐瑰嚮涓婁紶</text>
+ </view>
+ </view>
+ </view>
+ <view class="list-item-zk" @click="viewStatus = !viewStatus">
+ <text>{{viewStatus ? '鏀惰捣' : '琛ュ厖闇�姹�'}}</text>
+ <u-icon :name="viewStatus ? 'arrow-up' : 'arrow-down'" color="#00BC12" size="16"></u-icon>
+ </view>
+ </view>
+ <view class="list-item">
+ <view class="list-item-label">
+ <view class="list-item-label-x"></view>
+ <text>璐圭敤</text>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">璐圭敤鏍囧噯<b>*</b></view>
+ <view class="list-item-row-val">
+ <input v-model="form.price" type="number" @blur="getPrice" placeholder="璇疯緭鍏�" />
+ <text>鍏�/鏂�</text>
</view>
</view>
</view>
- <view class="list-item-zk" @click="viewStatus = !viewStatus">
- <text>{{viewStatus ? '鏀惰捣' : '琛ュ厖闇�姹�'}}</text>
- <u-icon :name="viewStatus ? 'arrow-up' : 'arrow-down'" color="#00BC12" size="16"></u-icon>
- </view>
- </view>
- <view class="list-item">
- <view class="list-item-label">
- <view class="list-item-label-x"></view>
- <text>璐圭敤</text>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">璐圭敤鏍囧噯<b>*</b></view>
- <view class="list-item-row-val">
- <input v-model="form.price" type="number" @blur="getPrice" placeholder="璇疯緭鍏�" />
- <text>鍏�/鏂�</text>
+ <view class="list-item">
+ <view class="list-item-label">
+ <view class="list-item-label-x"></view>
+ <text>鑱旂郴浜轰俊鎭�</text>
+ <text class="list-item-label-info">榛樿鍙戝崟鏂硅仈绯绘柟寮忥紝鍙慨鏀硅仈绯讳汉</text>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鑱旂郴浜哄鍚�</view>
+ <view class="list-item-row-val">
+ <input type="text" v-model="form.linkName" placeholder="璇疯ˉ鍏�" />
+ </view>
+ </view>
+ <view class="list-item-row">
+ <view class="list-item-row-label">鑱旂郴鐢佃瘽<b>*</b></view>
+ <view class="list-item-row-val">
+ <input type="text" v-model="form.linkPhone" maxlength="11" placeholder="璇疯ˉ鍏�" />
+ </view>
</view>
</view>
- </view>
- <view class="list-item">
- <view class="list-item-label">
- <view class="list-item-label-x"></view>
- <text>鑱旂郴浜轰俊鎭�</text>
- <text class="list-item-label-info">榛樿鍙戝崟鏂硅仈绯绘柟寮忥紝鍙慨鏀硅仈绯讳汉</text>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鑱旂郴浜哄鍚�</view>
- <view class="list-item-row-val">
- <input type="text" v-model="form.linkName" placeholder="璇疯ˉ鍏�" />
- </view>
- </view>
- <view class="list-item-row">
- <view class="list-item-row-label">鑱旂郴鐢佃瘽<b>*</b></view>
- <view class="list-item-row-val">
- <input type="text" v-model="form.linkPhone" maxlength="11" placeholder="璇疯ˉ鍏�" />
- </view>
- </view>
- </view>
+ </template>
+
</view>
<view style="width: 100%; height: calc(214rpx + env(safe-area-inset-bottom));"></view>
<view class="footer">
@@ -152,6 +158,7 @@
},
data() {
return {
+ info: {},
show: false,
show1: false,
form: {
@@ -188,11 +195,15 @@
this.$u.api.getDetail({
orderId: option.id
}).then(res => {
+ this.info = res.data
for (const key in this.form) {
this.form[key] = res.data[key]
}
this.form.days = res.data.totalDays
this.form.price = Number(this.form.price) / 100
+ if (!this.form.multifileList) {
+ this.form.multifileList = []
+ }
})
} else {
this.form.linkPhone = this.userInfo.telephone
--
Gitblit v1.9.3