Browse Source

Merge branch 'test' into master_tencent

* test:
  feat: 处理立即购买非官方随机配置的流量卡扫码充值时提示语
  feat: 处理非官方随机配置的流量卡扫码充值时提示语
  feat: 处理流量卡不是内置卡数据时候,toast提示
  feat: 处理特殊情况PDF文件显示黑影的问题
  feat: 处理特殊情况PDF文件显示不出来的问题
zeng.chen 2 months ago
parent
commit
fa4695233b
2 changed files with 20 additions and 5 deletions
  1. 6 5
      src/pages/explain/index.vue
  2. 14 0
      src/pages/pay/index.vue

+ 6 - 5
src/pages/explain/index.vue

@@ -69,9 +69,9 @@ export default {
       currentPage: 1,
       currentPage: 1,
       numPages: 0,
       numPages: 0,
       scale: 1,
       scale: 1,
-      loadedPages: 1,
+      loadedPages: 0,
 
 
-      isLoading: true,
+      isLoading: false,
       text: "拼命加载中...",
       text: "拼命加载中...",
       zIndex: 9999,
       zIndex: 9999,
     };
     };
@@ -139,11 +139,12 @@ export default {
 
 
         that.numPages = numPages;
         that.numPages = numPages;
         that.fileUrl = fileUrl;
         that.fileUrl = fileUrl;
-        await that.sleep(500);
+        // await that.sleep(600);
         that.loadAll = true;
         that.loadAll = true;
         that.loadedPages = numPages;
         that.loadedPages = numPages;
-        await that.sleep(2000);
-        that.isLoading = false;
+        // that.isLoading = false;
+        // await that.sleep(2000);
+        // that.isLoading = false;
       } catch (e) {
       } catch (e) {
         console.error("PDF加载失败:", e);
         console.error("PDF加载失败:", e);
       }
       }

+ 14 - 0
src/pages/pay/index.vue

@@ -291,6 +291,13 @@ export default {
           this.info = res.data;
           this.info = res.data;
           this.rateplan = res.data.rateplan;
           this.rateplan = res.data.rateplan;
           this.percent = (this.rateplan.used / this.rateplan.total) * 100;
           this.percent = (this.rateplan.used / this.rateplan.total) * 100;
+        } else if (res.code == 1017) {
+          uni.showToast({
+            title: "请使用官方配置的流量卡进行充值",
+            icon: "none",
+            mask: true,
+            duration: 2000,
+          });
         }
         }
       });
       });
     },
     },
@@ -350,6 +357,13 @@ export default {
           } else {
           } else {
             this.onBridgeReady();
             this.onBridgeReady();
           }
           }
+        } else if (res.code == 1017) {
+          uni.showToast({
+            title: "请使用官方配置的流量卡进行充值",
+            icon: "none",
+            mask: true,
+            duration: 2000,
+          });
         }
         }
       });
       });
     },
     },