From b2a448447c925f80d74a9ac0373bd7f44f65eacf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E5=BE=88=E5=B7=AE=E5=95=A6?=
 <17633066053@163.com>
Date: Thu, 2 Mar 2023 11:39:00 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20:bug:=20=E4=BF=AE=E5=A4=8D=E6=8A=95?=
 =?UTF-8?q?=E8=AF=89=E5=8A=9F=E6=9C=AA=E5=A1=AB=E5=86=99=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=90=8E=E7=AB=AF=E6=8A=A5=E9=94=99=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E4=BC=98=E5=8C=96=E6=8A=95=E8=AF=89=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/complain/complain.vue     | 14 +++++++++++---
 pages/order/complain/complainInfo.vue |  6 ++++--
 pages/order/complain/complainList.vue |  3 ++-
 pages/passport/wechatMPLogin.vue      | 16 ++++++++--------
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/pages/order/complain/complain.vue b/pages/order/complain/complain.vue
index be821f7..548b0df 100644
--- a/pages/order/complain/complain.vue
+++ b/pages/order/complain/complain.vue
@@ -45,13 +45,13 @@
       <view class="cell-item">
         <view class="cell-title"> 投诉凭证 </view>
         <view class="cell-view">
-          <u-upload ref="uUpload" :header=" { accessToken: storage.getAccessToken() }" upload-text=""  :action="action" width="100" @on-uploaded="onUploaded" :max-count="5">
+          <u-upload ref="uUpload" :header=" { accessToken: storage.getAccessToken() }"   :action="action" width="200" @on-uploaded="onUploaded" :max-count="5">
           </u-upload>
         </view>
       </view>
     </view>
 
-    <view class="submit-btn" @click="handleSumit">提交</view>
+    <view class="submit-btn" @click="handleSubmit">提交</view>
   </view>
 </template>
 
@@ -109,7 +109,15 @@ export default {
     /**
      * 提交
      */
-    handleSumit() {
+    handleSubmit() {
+      if(!this.images.length && !this.complainValue){
+        uni.showToast({
+          title:'请上传图片凭证和投诉内容',
+          icon:'none'
+        })
+        return
+
+      }
       // 循环出商品
       let goods = this.orderGoodsList.filter((item) => {
         return item.skuId == this.skuId;
diff --git a/pages/order/complain/complainInfo.vue b/pages/order/complain/complainInfo.vue
index 51b7027..45d55e3 100644
--- a/pages/order/complain/complainInfo.vue
+++ b/pages/order/complain/complainInfo.vue
@@ -49,11 +49,13 @@ export default {
     return {
       complainDetail: "", //投诉详情
       statusData: {
+         NEW: "新投诉",
         NO_APPLY: "未申请",
         APPLYING: "申请中",
-        COMPLETE: "已完成，此时可申请",
-        EXPIRED: "已失效，不可申请",
+        COMPLETE: "已完成",
+        EXPIRED: "已失效",
         CANCEL: "已取消",
+        WAIT_ARBITRATION:"等待仲裁"
       },
     };
   },
diff --git a/pages/order/complain/complainList.vue b/pages/order/complain/complainList.vue
index ccdec07..b09b75c 100644
--- a/pages/order/complain/complainList.vue
+++ b/pages/order/complain/complainList.vue
@@ -48,12 +48,13 @@ export default {
   data() {
     return {
       statusData: {
-        NEW: "新订单",
+        NEW: "新投诉",
         NO_APPLY: "未申请",
         APPLYING: "申请中",
         COMPLETE: "已完成",
         EXPIRED: "已失效",
         CANCEL: "已取消",
+        WAIT_ARBITRATION:"等待仲裁"
       },
       show: false,
       content: "是否撤销投诉？",
diff --git a/pages/passport/wechatMPLogin.vue b/pages/passport/wechatMPLogin.vue
index 0d26346..b58c991 100644
--- a/pages/passport/wechatMPLogin.vue
+++ b/pages/passport/wechatMPLogin.vue
@@ -232,14 +232,14 @@ text.shop {
   width: 92%;
   margin: 0 auto 40rpx;
   border-radius: 100px;
-  animation: mymove 5s infinite;
-  -webkit-animation: mymove 5s infinite; /*Safari and Chrome*/
-  animation-direction: alternate; /*轮流反向播放动画。*/
-  animation-timing-function: ease-in-out; /*动画的速度曲线*/
-  /* Safari 和 Chrome */
-  -webkit-animation: mymove 5s infinite;
-  -webkit-animation-direction: alternate; /*轮流反向播放动画。*/
-  -webkit-animation-timing-function: ease-in-out; /*动画的速度曲线*/
+  // animation: mymove 5s infinite;
+  // -webkit-animation: mymove 5s infinite; /*Safari and Chrome*/
+  // animation-direction: alternate; /*轮流反向播放动画。*/
+  // animation-timing-function: ease-in-out; /*动画的速度曲线*/
+  // /* Safari 和 Chrome */
+  // -webkit-animation: mymove 5s infinite;
+  // -webkit-animation-direction: alternate; /*轮流反向播放动画。*/
+  // -webkit-animation-timing-function: ease-in-out; /*动画的速度曲线*/
 }
 .btn-callback {
   text-align: center;