From 58d63637b67a7c565618379268da604e6231fc4c Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期三, 27 八月 2025 18:16:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/using-workers/using-workers.vue | 131 +++++++++++++++++++++++++------------------
1 files changed, 77 insertions(+), 54 deletions(-)
diff --git a/small-program/pages/using-workers/using-workers.vue b/small-program/pages/using-workers/using-workers.vue
index a7bddd6..1294eec 100644
--- a/small-program/pages/using-workers/using-workers.vue
+++ b/small-program/pages/using-workers/using-workers.vue
@@ -23,8 +23,11 @@
</view>
<view class="list-item-row">
<view class="list-item-row-label">鍦扮偣鎻忚堪</view>
- <view class="list-item-row-val">
+ <!-- <view class="list-item-row-val">
<input type="text" v-model="form.locationRemark" placeholder="璇疯緭鍏�" />
+ </view> -->
+ <view class="list-item-row-val">
+ <textarea v-model="form.locationRemark" cols="30" rows="10" placeholder="璇疯緭鍏�" maxlength="200"></textarea>
</view>
</view>
</template>
@@ -132,6 +135,7 @@
:show="show"
color="#00BC12"
mode="range"
+ :allowSameDay="true"
@close="show = false"
@confirm="confirmDate" />
@@ -195,18 +199,22 @@
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]
+ if (res.code === 200) {
+ 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.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.linkName = this.userInfo.name
this.form.days = option.days
this.form.startDate = option.startDate
this.form.endDate = option.endDate
@@ -220,6 +228,7 @@
methods: {
// 鎻愪氦璁㈠崟
submit() {
+ var that = this;
if (!this.form.categoryId) {
return uni.showToast({ title: '璇烽�夋嫨閲囨憳鍝佺', icon: 'none' })
}
@@ -232,32 +241,41 @@
if (!this.form.linkPhone) {
return uni.showToast({ title: '璇疯緭鍏ヨ仈绯荤數璇�', icon: 'none' })
}
- 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}`
+ if (!that.form.id) {
+ uni.requestSubscribeMessage({
+ tmplIds: ['oVjOBLcHxIlGzOMJsdInmgI5CHGXh-UTvMzQqfFOnIg'],
+ success(res) {
+ that.$u.api.release({ ...that.form, price: Number(that.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
+ uni.requestSubscribeMessage({
+ tmplIds: ['3YSC7gouRlSjHXz4CrWOGFzPmGwEBtFj4snwdfMvKHk'],
+ success(res) {
+ that.$u.api.updateOrder({ ...that.form, price: Number(that.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)
+ }
})
- setTimeout(() => {
- uni.navigateBack({ delta: 1 });
- uni.$emit('refresh')
- }, 1500)
-
- }
- })
+ }
+ })
}
},
// 璁＄畻閲戦
@@ -271,8 +289,10 @@
type: this.form.type,
workType: this.form.workType
}).then(res => {
- this.modify = true
- this.form.estimatedAccount = res.data
+ if (res.code === 200) {
+ this.modify = true
+ this.form.estimatedAccount = res.data
+ }
})
}
},
@@ -287,7 +307,7 @@
success: (res) => {
this.form.lat = res.latitude
this.form.lgt = res.longitude
- this.form.address = res.address
+ this.form.address = res.name || res.address
}
});
},
@@ -300,30 +320,33 @@
this.$u.api.getCategoryList({
type: 0
}).then(res => {
- this.cateList = [res.data]
+ if (res.code === 200) {
+ this.cateList = [res.data]
+ }
})
},
uploadImg() {
uni.chooseImage({
success: (chooseImageRes) => {
- const tempFilePaths = chooseImageRes.tempFilePaths;
- uni.uploadFile({
- url: this.$baseUrl + '/web/public/upload',
- filePath: tempFilePaths[0],
- name: 'file',
- formData: {
- 'folder': 'orders'
- },
- success: (uploadFileRes) => {
- const res = JSON.parse(uploadFileRes.data)
- this.form.multifileList.push({
- fileurl: res.data.imgaddr,
- name: res.data.originname,
- url: res.data.url,
- type: 0
- })
- }
- });
+ for (let i = 0; i < chooseImageRes.tempFilePaths.length; i++) {
+ uni.uploadFile({
+ url: this.$baseUrl + '/web/public/upload',
+ filePath: chooseImageRes.tempFilePaths[i],
+ name: 'file',
+ formData: {
+ 'folder': 'orders'
+ },
+ success: (uploadFileRes) => {
+ const res = JSON.parse(uploadFileRes.data)
+ this.form.multifileList.push({
+ fileurl: res.data.imgaddr,
+ name: res.data.originname,
+ url: res.data.url,
+ type: 0
+ })
+ }
+ });
+ }
}
});
}
--
Gitblit v1.9.3