From cf8021554981025dc78e66b6b89c12fbdb5b6fa0 Mon Sep 17 00:00:00 2001
From: wangmingzhe <wmz_0826@163.com>
Date: Sun, 26 Apr 2020 11:35:19 +0800
Subject: [PATCH] =?UTF-8?q?[NEW]=20=E5=B0=86vantLoading=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=94=B9=E4=B8=BA=E8=87=AA=E5=AE=9A=E4=B9=89gif=E5=8A=A8?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/ebiz/Loading.vue |  9 ++++-----
 src/views/ebiz/sale/PayMent.vue | 17 +++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/components/ebiz/Loading.vue b/src/components/ebiz/Loading.vue
index 13fbc8ebf..95da45919 100644
--- a/src/components/ebiz/Loading.vue
+++ b/src/components/ebiz/Loading.vue
@@ -2,14 +2,14 @@
   <div class="loading-container">
     <van-overlay :show="isLoading" z-index="999">
       <div class="flex align-items-c justify-content-c wrapper">
-        <van-loading type="spinner" color="#E9332E" />
+        <img :src="src" width="80" height="80" />
       </div>
     </van-overlay>
   </div>
 </template>
 
 <script>
-import { Overlay, Loading } from 'vant'
+import { Overlay } from 'vant'
 export default {
   name: 'Loading',
   props: {
@@ -20,12 +20,11 @@ export default {
   },
   data() {
     return {
-      // src: this.$assetsUrl + '/images/loading.gif'
+      src: this.$assetsUrl + 'images/loading.gif'
     }
   },
   components: {
-    [Overlay.name]: Overlay,
-    [Loading.name]: Loading
+    [Overlay.name]: Overlay
   }
 }
 </script>
diff --git a/src/views/ebiz/sale/PayMent.vue b/src/views/ebiz/sale/PayMent.vue
index d1e876f96..09a480e1d 100644
--- a/src/views/ebiz/sale/PayMent.vue
+++ b/src/views/ebiz/sale/PayMent.vue
@@ -205,12 +205,14 @@ export default {
   methods: {
     // 点击支付
     payMent() {
-      this.$toast.loading({
-        duration: 0, // 持续展示 toast
-        forbidClick: true, // 禁用背景点击
-        loadingType: 'spinner',
-        message: '加载中……'
-      })
+      if (!this.isWeixin) {
+        this.$toast.loading({
+          duration: 0, // 持续展示 toast
+          forbidClick: true, // 禁用背景点击
+          loadingType: 'spinner',
+          message: '加载中……'
+        })
+      }
       let that = this
       let data = {
         orderNo: window.localStorage.getItem('orderNo'),
@@ -252,9 +254,8 @@ export default {
 
           window.localStorage.setItem('payStatus', res.payStatus)
           window.localStorage.setItem('payInfo', JSON.stringify(res))
-          if (!this.isWeixin) {
+          if (this.isWeixin) {
             this.isLoading = false
-            console.log('隐藏')
           }
         } else {
           if (!this.isWeixin) {