Merge remote-tracking branch 'origin/master'

rk

2025-08-27 58d63637b67a7c565618379268da604e6231fc4c

 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" />
      
@@ -210,6 +214,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
@@ -223,6 +228,7 @@
      methods: {
         // 提交订单
         submit() {
            var that = this;
            if (!this.form.categoryId) {
               return uni.showToast({ title: '请选择采摘品种', icon: 'none' })
            }
@@ -235,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)
								
                     }
                  })
                  }
               })
            }
         },
         // 计算金额
@@ -292,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
               }
            });
         },
@@ -313,24 +328,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
                           })
                        }
                     });
                  }
               }
            });
         }