From ab24a24d793ee0a1808a55f6f3d73ee424d00cea Mon Sep 17 00:00:00 2001
From: initwithout <initwithout@163.com>
Date: Fri, 19 May 2023 14:48:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8A=A0=E8=BD=BD=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/aftersales/apply.js |  7 ++++++-
 pages/user/user.wxml      | 40 +++++++++++++++++++--------------------
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/pages/aftersales/apply.js b/pages/aftersales/apply.js
index b79a4ce..8375c82 100644
--- a/pages/aftersales/apply.js
+++ b/pages/aftersales/apply.js
@@ -81,6 +81,10 @@ Page({
           } else {
             images = tempFiles;
           }
+          wx.showLoading({
+            title: '上传中...',
+            mask: true,
+          })
           wx.uploadFile({
             url: 'https://mall.gylservice.com/gw?api=resources.file.uploadFiles',
             filePath: images[that.data.imgIndex].tempFilePath,
@@ -95,6 +99,7 @@ Page({
               uploadType: 2,
             }, // HTTP 请求中其他额外的 form data
             success: function (res) {
+              wx.hideLoading();
               that.data.imgIndex++
               console.log(that.data.imgIndex)
               var data = JSON.parse(res.data)
@@ -134,7 +139,7 @@ Page({
   },
   confirmAct() {
     var that = this
-    if (!that.data.errordesc) {
+    if (!that.data.remark) {
       wx.showToast({
         title: '请输入退款说明',
         icon: 'none',
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 80710b9..b415f42 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -63,27 +63,27 @@
 
       <view class="card_bottom">
         <!-- bindtap="navToCoupon" -->
-            <view>
-                <view>{{user.coupon_num?user.coupon_num:'—'}}</view>
-                <text>优惠券</text>
-            </view>
-            <view bindtap="navToScore">
-                <view>{{user?user.score:'—'}}</view>
-                <text>积分</text>
-            </view>
-            <view bindtap="navToWallet">
-                <view>
-                    {{user?user.money:'—'}}
-                </view>
-                <text>余额</text>
-            </view>
-            <view bindtap="navToCollection">
-                <view class="relative" style="top: -6rpx;">
-                    {{user?collection_num:'—'}}
-                </view>
-                <text>我的收藏</text>
-            </view>
+        <view>
+          <view>{{user.coupon_num?user.coupon_num:'—'}}</view>
+          <text>优惠券</text>
+        </view>
+        <view bindtap="navToScore">
+          <view>{{user?user.score:'—'}}</view>
+          <text>积分</text>
         </view>
+        <view bindtap="navToWallet">
+          <view>
+            {{user?user.money:'—'}}
+          </view>
+          <text>余额</text>
+        </view>
+        <view bindtap="navToCollection">
+          <view class="relative" style="top: -6rpx;">
+            {{user?collection_num:'—'}}
+          </view>
+          <text>我的收藏</text>
+        </view>
+      </view>
       <!-- 我的订单 -->
       <view class='user_dd'>
         <view class='dd_stu'>