Merge remote-tracking branch 'origin/dev' into dev

src/mods/AppIntegralApply/add.vue

@@ -37,7 +37,8 @@
         <div class="line"></div>
 
         <u-form-item label="图片上传 (最多9张)" prop="applyFiles" :border-bottom="false" class="avatars" label-position="top">
-          <AiUploader v-model="forms.applyFiles" multiple placeholder="上传图片" :limit="9" action="/admin/file/add2"></AiUploader>
+          <AiUploader v-model="forms.applyFiles" multiple placeholder="上传图片" :limit="9"></AiUploader>
+          <!-- action="/admin/file/add2" -->
         </u-form-item>
 
         <div class="line"></div>
@@ -65,6 +66,7 @@ export default {
         description: '',
         applyFiles: [],
       },
+
       showStstus: false,
       flag: false,
       toDay: '',
@@ -122,7 +124,7 @@ export default {
               name: this.user.realName,
               residentPhone: this.forms.phone,
               applyIntegralType: this.forms.applyIntegralTypeValue,
-              description: this.forms.description,
+              description: this.forms.content,
               applyFiles: imgs || [],
               residentId: this.user.residentId,
             })

src/mods/AppServiceOnlineNew/serviceForm.vue

@@ -56,6 +56,14 @@
             <span></span>
             <h3>{{ item[0].groupName }}</h3>
           </div>
+
+          <!-- <div style="background: #999; color: #333">
+            <view class="section__title">时间选择器</view>
+            <picker mode="time" :value="time" start="00:00" bindchange="bindTimeChange">
+              <view class="picker"> 当前选择: {{ time }} </view>
+            </picker>
+          </div> -->
+
           <view v-for="(field, i) in item" :key="i">
             <div class="form-item" v-if="field.fieldDataType === '1' || field.fieldDataType === '0'">
               <div class="form-title">
@@ -104,6 +112,22 @@
                 </picker>
               </div>
             </div>
+
+            <div class="form-item" v-if="field.fieldDataType === '3'">
+              <div class="form-title">
+                <i :style="{ opacity: field.mustFill === '1' ? 1 : 0 }">*</i>
+                <span>{{ field.fieldName }}{{ field.fieldNameSuffix || '' }}</span>
+              </div>
+              <div class="form-item__wrapper">
+                <input placeholder="请选择" disabled :value="field.fieldValue || ''" />
+
+                <picker mode="time" :data-index="index" :data-i="i" value="08:00" start="00:00" @change="bindTimeChange">
+                  <div class="form-item__choose" hover-class="text-hover">选择</div>
+                </picker>
+              </div>
+            </div>
+
+            <!-- 时间日期 -->
             <div class="form-item" v-if="field.fieldDataType === '9'">
               <div class="form-title">
                 <i :style="{ opacity: field.mustFill === '1' ? 1 : 0 }">*</i>
@@ -161,6 +185,7 @@ export default {
       info: {},
       // isTouch: false,
       fileManage: null,
+      time: '',
     }
   },
 
@@ -202,46 +227,46 @@ export default {
       this.handwriting.uploadScaleEnd(event)
     },
 
-    submitSignature() {
+    // submitSignature() {
-      // if (!this.isTouch) {
+    //   if (!this.isTouch) {
-      //   return this.$toast('签名不能为空')
+    //     return this.$toast('签名不能为空')
-      // }
+    //   }
 
-      this.handwriting
+    //   this.handwriting
-        .saveCanvas()
+    //     .saveCanvas()
-        .then((res) => {
+    //     .then((res) => {
-          uni.getFileSystemManager().readFile({
+    //       uni.getFileSystemManager().readFile({
-            filePath: res,
+    //         filePath: res,
-            encoding: 'base64',
+    //         encoding: 'base64',
-            success: (res) => {
+    //         success: (res) => {
-              // this.$loading()
+    //           this.$loading()
-              this.$instance
+    //           this.$instance
-                .post(`/app/syssignaccount/xcx-draw-sign?openId=${this.user.openId}`, res.data, {
+    //             .post(`/app/syssignaccount/xcx-draw-sign?openId=${this.user.openId}`, res.data, {
-                  headers: {
+    //               headers: {
-                    'Content-Type': 'application/json',
+    //                 'Content-Type': 'application/json',
-                  },
+    //               },
-                })
+    //             })
-                .then((res) => {
+    //             .then((res) => {
-                  if (res.code === 0) {
+    //               if (res.code === 0) {
-                    this.signatureId = res.data
+    //                 this.signatureId = res.data
-                    // this.isShow = false
+    //                 this.isShow = false
-                    // this.$toast('签名成功')
+    //                 this.$toast('签名成功')
 
-                    this.$nextTick(() => {
+    //                 this.$nextTick(() => {
-                      this.submitForm()
+    //                   this.submitForm()
-                    })
+    //                 })
-                  }
+    //               }
-                })
+    //             })
-            },
+    //         },
-            fail: () => {
+    //         fail: () => {
-              this.$toast('签名生成失败')
+    //           this.$toast('签名生成失败')
-            },
+    //         },
-          })
+    //       })
-        })
+    //     })
-        .catch(() => {
+    //     .catch(() => {
-          this.$toast('签名绘制失败')
+    //       this.$toast('签名绘制失败')
-        })
+    //     })
-    },
+    // },
 
     IdCard(UUserCard, num) {
       if (num == 1) {
@@ -354,6 +379,13 @@ export default {
       this.$set(this.tableForm[index][i], 'fieldDictName', key)
     },
 
+    bindTimeChange(e) {
+      const index = e.target.dataset.index
+      const i = e.target.dataset.i
+      const value = e.detail.value
+      this.$set(this.tableForm[index][i], 'fieldValue', `${value}:00`)
+    },
+
     preview(list, url) {
       const imgs = list.map((v) => v.exampleFile.url)
       uni.previewImage({
@@ -397,7 +429,7 @@ export default {
                 // this.$set(this.info.processAnnexDefs[index], 'annexFileId', data.data[0].split(';')[1])
 
                 this.$set(this.info.processAnnexDefs[index], 'src', data.data.url)
-                this.$set(this.info.processAnnexDefs[index], 'id', data.data.id)
+                this.$set(this.info.processAnnexDefs[index], 'annexFileId', data.data.id)
               } else {
                 this.$toast(data.msg)
               }
@@ -413,7 +445,7 @@ export default {
     next() {
       if (this.currIndex === 2) {
         for (let item of this.info.processAnnexDefs) {
-          if (item.mustFill === '1' && !item.id) {
+          if (item.mustFill === '1' && !item.annexFileId) {
             return this.$toast(`请上传${item.annexName}`)
           }
         }