Merge branch 'master' of ssh://gogs.zfire.top:2222/zfire-front/recycle-mobile

* 'master' of ssh://gogs.zfire.top:2222/zfire-front/recycle-mobile:
  feat:售后

src/components/zj-upload/index.vue

@@ -104,7 +104,8 @@ export default {
     },
     upload() {
       uni.chooseImage({
-        count: this.count === 0 ? 0 : this.count - this.files.length,
+        // count: this.count === 0 ? 0 : this.count - this.files.length,
+        count:1,
         success: async res => {
           let pathType = this.checkFileType(res.tempFiles[0].name)
           if (pathType !== 'image') {

src/pages/mine/myBuy/return.vue

@@ -34,7 +34,12 @@
       </view>
       <view class="content">
         <view class="label"><text style="color: red">*</text>退货原因</view>
-        <u--textarea :disabled="showDisable" v-model="formdata.applyNote" placeholder="请输入内容"></u--textarea>
+        <u--textarea
+          style="backgroundcolor: #fff"
+          :disabled="showDisable"
+          v-model="formdata.applyNote"
+          placeholder="请输入内容"
+        ></u--textarea>
       </view>
       <view class="content">
         <view class="label">上传图片(最多9张)</view>
@@ -82,6 +87,7 @@
 
 <script>
 import zjUpload from '@/components/zj-upload/index.vue'
+import { tr } from '@dcloudio/vue-cli-plugin-uni/packages/postcss/tags'
 export default {
   // #ifndef H5
   data() {
@@ -173,11 +179,15 @@ export default {
             this.showDisable = true
           }
         })
-        .catch(err => {})
+        .catch(err => {
+        })
+        .finally(() => {
+          this.refresherTriggered = false
+        })
     },
     refresherrefresh() {
       this.refresherTriggered = true
-      // this.getDetail()
+      this.getDetail()
     }
   }
   // #endif