From a1c569d40b5d1d6571a197467a41fd3421c393ce Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 15 九月 2025 09:10:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
small-program/pages/using-workers/using-workers.vue | 140 +++++++++++++++++++++++++++-------------------
1 files changed, 81 insertions(+), 59 deletions(-)
diff --git a/small-program/pages/using-workers/using-workers.vue b/small-program/pages/using-workers/using-workers.vue
index 4b4b942..e87979b 100644
--- a/small-program/pages/using-workers/using-workers.vue
+++ b/small-program/pages/using-workers/using-workers.vue
@@ -17,14 +17,17 @@
<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>
+ <text style="width:80%;">{{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">
+ <!-- <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>
@@ -46,33 +49,34 @@
<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="璇疯緭鍏�" />
+ <input type="digit" v-model="form.priceNum1" @blur="getPrice" placeholder="璇疯緭鍏�" />
<text>鏂�</text>
</view>
</view>
- <view class="list-item-row" v-if="viewStatus">
+ <view class="list-item-row" >
<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" >
<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">
+ <view class="upload-item" v-for="(item, index) in form.multifileList" :key="index" @click="preview(index, form.multifileList)">
<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>
+ <image class="upload-item-dele" @click.stop="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 style="width: 215rpx; height: 0;"></view>
</view>
</view>
- <view class="list-item-zk" @click="viewStatus = !viewStatus">
+ <!-- <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>
<view class="list-item">
<view class="list-item-label">
@@ -82,7 +86,7 @@
<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="璇疯緭鍏�" />
+ <input v-model="form.price" type="digit" @blur="getPrice" placeholder="璇疯緭鍏�" />
<text>鍏�/鏂�</text>
</view>
</view>
@@ -119,9 +123,9 @@
</view>
</view>
<view class="footer-bottom">
- <div class="footer-bottom-btn" @click="submit">
- <text>绔嬪嵆涓嬪崟</text>
- <text>锛堟湇鍔″畬鎴愬悗浠樻锛�</text>
+ <div class="footer-bottom-btn" @click="submit" >
+ <text>{{form.id?'纭淇敼':'绔嬪嵆涓嬪崟'}}</text>
+ <text v-if="!form.id">锛堟湇鍔″畬鎴愬悗浠樻锛�</text>
</div>
</view>
<view style="width: 100%; height: env(safe-area-inset-bottom);"></view>
@@ -132,6 +136,7 @@
:show="show"
color="#00BC12"
mode="range"
+ :allowSameDay="true"
@close="show = false"
@confirm="confirmDate" />
@@ -185,7 +190,7 @@
},
modify: false,
cateList: [],
- viewStatus: false
+ viewStatus: true
};
},
onLoad(option) {
@@ -210,6 +215,7 @@
})
} 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
@@ -221,8 +227,13 @@
this.getCateList()
},
methods: {
+ preview(current, arr) {
+ let urls = arr.map(item => item.url || item.fileurlFull)
+ uni.previewImage({ current, urls })
+ },
// 鎻愪氦璁㈠崟
submit() {
+ var that = this;
if (!this.form.categoryId) {
return uni.showToast({ title: '璇烽�夋嫨閲囨憳鍝佺', icon: 'none' })
}
@@ -235,32 +246,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','AA97cHjvlPiNO4viMkVe4JifCf9TD5b5Eb7s6El3VS8'],
+ 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)
-
- }
- })
+ // }
+ // })
}
},
// 璁＄畻閲戦
@@ -292,7 +312,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
}
});
},
@@ -313,24 +333,25 @@
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
+ })
+ }
+ });
+ }
}
});
}
@@ -613,21 +634,22 @@
width: 100%;
display: flex;
align-items: center;
+ justify-content: space-between;
flex-wrap: wrap;
padding: 30rpx 0;
box-sizing: border-box;
.upload-item {
- width: 156rpx;
- height: 156rpx;
+ width: 215rpx;
+ height: 215rpx;
display: flex;
align-items: center;
flex-direction: column;
justify-content: center;
background: #F8F9FB;
border-radius: 8rpx;
- margin-right: 20rpx;
border: 2rpx solid #EEEEEE;
position: relative;
+ margin-bottom: 15rpx;
&:last-child {
margin: 0 !important;
}
--
Gitblit v1.9.3