From a1f9e72cd84fe9591817fb410b82c1e05273977f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cgrape=E2=80=9D?= <18746553572@163.com>
Date: Wed, 1 Feb 2023 14:49:52 +0800
Subject: [PATCH] 2.1

---
 src/components/common/ProductCard.vue  |  2 +-
 src/constants/api/login/common.api.ts  |  2 +-
 src/services/api.service.ts            |  2 +-
 src/views/authentication/LoginView.vue |  2 +-
 src/views/main/Main.vue                | 12 ++++++++----
 5 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/components/common/ProductCard.vue b/src/components/common/ProductCard.vue
index 0256057..0b5fa8d 100644
--- a/src/components/common/ProductCard.vue
+++ b/src/components/common/ProductCard.vue
@@ -90,8 +90,8 @@ export default class ProductCard extends Vue {
 
   @Prop({ default: {prodDesc:""} }) productData: any | {};//产品数据
   @Prop({ default: {prodDesc:""} }) desc: any | {};//产品数据
-
   
+
   //立即登录
   activeNames = [""];
   lodiing() {
diff --git a/src/constants/api/login/common.api.ts b/src/constants/api/login/common.api.ts
index 79b60ac..40b2dda 100644
--- a/src/constants/api/login/common.api.ts
+++ b/src/constants/api/login/common.api.ts
@@ -18,7 +18,7 @@ const onlinePrefix = process.env.VUE_APP_MS_GATEWAY_API + process.env.VUE_APP_ON
 const commonApi = {
   getPicCode: {
     url: prefix + "/get_phone_verify_code",
-    method: MethodType.POST.code,
+    method: MethodType.GET.code,
     header: HeaderType.AUTH.code,
   },
 
diff --git a/src/services/api.service.ts b/src/services/api.service.ts
index d57625c..33bf1fe 100644
--- a/src/services/api.service.ts
+++ b/src/services/api.service.ts
@@ -183,7 +183,7 @@ class ApiService {
      return Vue.axios.post(`${path}`, params, requestConfig).then(res=>{
       //TODO
       return res.data
-    });
+    }).catch(this.createErrorHandler());;
   }
   /**
    * POST请求 文件上传
diff --git a/src/views/authentication/LoginView.vue b/src/views/authentication/LoginView.vue
index 558e269..7317091 100644
--- a/src/views/authentication/LoginView.vue
+++ b/src/views/authentication/LoginView.vue
@@ -284,7 +284,7 @@ export default class LoginView extends Vue {
       } else {
         
         // this._updatePicCode();
-        // Toast(response.msg + "");
+        Toast(response.msg + "");
       }
     });
   }
diff --git a/src/views/main/Main.vue b/src/views/main/Main.vue
index 2844ad4..baae5f4 100644
--- a/src/views/main/Main.vue
+++ b/src/views/main/Main.vue
@@ -416,12 +416,13 @@
 
       <div>
         <van-list
-          :v-model="loading"
+          :loading="loading"
           :finished="finished"
           finished-text="没有更多了"
+          loading-text="加载中"
           @load="onLoad"
           :offset="0"
-          style="height: calc(100% - 50px); padding-bottom: 50px"
+          style="padding-bottom: 50px"
         >
           <div v-for="(item, index) in productList" :key="index">
             <picket-bar
@@ -674,6 +675,7 @@ export default class Main extends Vue {
       this.scrollTop = tableScorll.scrollTop; //data中定义scrollTop为0
       // console.log(tableScorll.scrollTop+"scroll");
     });
+    this.onLoad();
   }
   @Watch("scrollTop")
   scrollTopChange(newVal: any) {
@@ -702,7 +704,8 @@ export default class Main extends Vue {
 
       // 重新加载数据
       // 将 loading 设置为 true，表示处于加载状态
-      this.loading = true;
+      // this.loading = true;
+      console.log("refresh")
       this.onLoad();
   }
   onLoad() {
@@ -714,7 +717,7 @@ export default class Main extends Vue {
       }
       this.getProductList();
 
-      this.loading = false;
+      // this.loading = false;
 
       console.log("loading-----------");
 
@@ -736,6 +739,7 @@ export default class Main extends Vue {
       termMin: this.termMin,
       loanType: this.loanType,
     };
+    console.log("data")
     apiService
       .general(commonApi.getProductList, query, param, undefined)
       .then((response: RestfulResponse) => {
-- 
2.22.0