Переглянути джерело

【第一版开发】

1.优化loading触发代码
ChenYL 10 місяців тому
батько
коміт
a2f23adc2c

+ 26 - 33
src/pages/login.vue

@@ -59,39 +59,32 @@ const loginFormRules = ref({
 
 // 方法
 const login = async () => {
-  try {
-    let formData = await loginForm.value.validate();
-    uni.showLoading({
-      title: "登录中...",
-    });
-    // 获取供应商
-    let providerResult = await uni.getProvider({ service: "oauth" });
-    // 获取登录code
-    let loginResult = await uni.login({ provider: providerResult.provider[0] });
-    // 登录
-    let token = await userApi.login({
-      code: loginResult.code,
-      nickname: formData.nickname
-    });
-
-    // 保存用户信息(token)
-    uni.setStorageSync(cacheKey.TOKEN, token);
-    uni.setStorageSync(cacheKey.NICKNAME, formData.nickname);
-
-    uni.showToast({
-      title: "登录成功",
-      icon: "success",
-      duration: 1000,
-      success: () => {
-        // 登录结束返回主页
-        uni.switchTab({
-          url: router.SUBSCRIPTION_SOURCE_MARKET_PAGE,
-        });
-      },
-    });
-  } finally {
-    uni.hideLoading();
-  }
+  let formData = await loginForm.value.validate();
+  // 获取供应商
+  let providerResult = await uni.getProvider({ service: "oauth" });
+  // 获取登录code
+  let loginResult = await uni.login({ provider: providerResult.provider[0] });
+  // 登录
+  let token = await userApi.login({
+    code: loginResult.code,
+    nickname: formData.nickname
+  });
+
+  // 保存用户信息(token)
+  uni.setStorageSync(cacheKey.TOKEN, token);
+  uni.setStorageSync(cacheKey.NICKNAME, formData.nickname);
+
+  uni.showToast({
+    title: "登录成功",
+    icon: "success",
+    duration: 1000,
+    success: () => {
+      // 登录结束返回主页
+      uni.switchTab({
+        url: router.SUBSCRIPTION_SOURCE_MARKET_PAGE,
+      });
+    },
+  });
 };
 
 // 生命周期

+ 1 - 12
src/pages/subscriptionSourceMarket.vue

@@ -27,18 +27,7 @@ const subscriptionSourceList = ref([]);
  * 加载数据
  */
 const loadData = async () => {
-  subscriptionSourceList.value = [];
-  // 已登录
-  try {
-    uni.showLoading({
-      title: '加载中',
-      mask: true
-    });
-    let value = await subscriptionApi.querySubscriptionSource();
-    subscriptionSourceList.value = value;
-  } finally {
-    uni.hideLoading();
-  }
+  subscriptionSourceList.value = await subscriptionApi.querySubscriptionSource();
 };
 
 /**

+ 1 - 10
src/pages/subscriptionUserConfig.vue

@@ -39,16 +39,7 @@ const subscriptionUserConfigList = ref([]);
  * 加载数据
  */
 const loadData = async () => {
-  subscriptionUserConfigList.value = [];
-  try {
-    uni.showLoading({
-      title: '加载中',
-      mask: true
-    });
-    subscriptionUserConfigList.value = await subscriptionApi.querySubscriptionUserConfig();
-  } finally {
-    uni.hideLoading();
-  }
+  subscriptionUserConfigList.value = await subscriptionApi.querySubscriptionUserConfig();
 };
 
 /**