vip

src/App.vue

@@ -301,7 +301,7 @@ provide('promptLogin', promptLogin)
                 color: #ffffff;
                 line-height: 24px;
                 // text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
-                .gradient-text(#ddffc1, #55f6ca);
+                .gradient-text(linear-gradient(180deg, #ddffc1 0%, #55f6ca 100%));
                 text-transform: uppercase;
                 .f-col();
                 align-items: center;
@@ -311,7 +311,7 @@ provide('promptLogin', promptLogin)
                     color: #ffef33;
                     line-height: 24px;
                     // text-shadow: 0px 2px 4px rgba(0, 0, 0, 0.5);
-                    .gradient-text(#fff797, #ffef33);
+                    .gradient-text(linear-gradient(180deg, #fff797 0%, #ffef33 100%));
                     margin-top: 5px;
                 }
             }

src/locales/en.json

@@ -79,7 +79,7 @@
         "tips2": ""
     },
     "common": {
-        "alert": "Hint",
+        "alert": "Alert",
         "cancel": "Cancel",
         "close": "Close",
         "confirm": "Confirm",
@@ -114,7 +114,8 @@
         "reward": "Reward",
         "official": "Official",
         "broker": "Broker",
-        "error": "Some error occurred, please try again later"
+        "error": "Some error occurred, please try again later",
+        "yes": "Yes"
     },
     "delegate": {
         "increase": "Increase",
@@ -336,7 +337,7 @@
         "dayTimes": "You can snap up {times} times a day",
         "pla": "Please enter",
         "to": "to",
-        "sureClose": "Are you sure you want to close automatic acquisition?",
+        "togglePrompt": "Are you sure you want to {status} automatic acquisition?",
         "closed": "Closed successfully",
         "errorInterval": "Please enter the correct interval",
         "opened": "Opened successfully"

src/locales/zh.json

@@ -111,7 +111,8 @@
         "reward": "奖励",
         "official": "官方",
         "broker": "代理人",
-        "error": "发生错误，请稍后再试"
+        "error": "发生错误，请稍后再试",
+        "yes": "是的"
     },
     "delegate": {
         "increase": "加价",
@@ -213,7 +214,7 @@
         "dayTimes": "每日最多可抢购{times}次",
         "pla": "请输入",
         "to": "至",
-        "sureClose": "确认要关闭自动收购吗？",
+        "togglePrompt": "确认要{status}自动收购吗？",
         "closeSu": "关闭成功",
         "errorInterval": "请输入正确区间",
         "openSu": "开启成功"

src/styles/common.less

@@ -26,8 +26,8 @@
     -webkit-line-clamp: @line;
     -webkit-box-orient: vertical;
 }
-.gradient-text(@color1, @color2, @deg : 180deg) {
-    background: linear-gradient(@deg, @color1 0%, @color2 100%);
+.gradient-text(@gd) {
+    background: @gd;
     -webkit-background-clip: text;
     background-clip: text;
     -webkit-text-fill-color: transparent;

src/styles/fonts.less

@@ -7,8 +7,3 @@
     font-family: 'alibabaPuHui';
     src: url(/fonts/alibabaPuHui.ttf);
 }
-
-@font-face {
-    font-family: 'AlimamaShuHeiTi';
-    src: url(/fonts/AlimamaShuHeiTi-Bold.ttf);
-}

src/views/MinePage.vue

@@ -480,6 +480,13 @@ async function toggleAutoTrade() {
         return
     }
     try {
+        await showConfirmDialog({
+            title: t('common.alert'),
+            message: t('vip.togglePrompt', {
+                status: userVip.value.autoTradeEnabled ? t('common.close') : t('common.open')
+            }),
+            confirmButtonText: t('common.yes')
+        })
         Toast.loading({
             message: t('common.loading') + '...',
             forbidClick: true
@@ -491,6 +498,7 @@ async function toggleAutoTrade() {
         Toast.success(userVip.value.autoTradeEnabled ? t('vip.closed') : t('vip.opened'))
         getMineVip()
     } catch (e) {
+        if (e == 'cancel') return
         Toast.error(e?.error || t('common.error'))
     }
 }
@@ -819,7 +827,7 @@ ion-content {
             overflow: hidden;
             .text1 {
                 font-size: 14px;
-                font-family: AlimamaShuHeiTi;
+                font-family: TsangerYuMo;
                 color: #0044b4;
                 line-height: 24px;
                 overflow: hidden;
@@ -846,7 +854,7 @@ ion-content {
             }
             span {
                 font-size: 12px;
-                font-family: AlimamaShuHeiTi;
+                font-family: TsangerYuMo;
                 color: #0044b4;
                 line-height: 24px;
                 position: absolute;
@@ -915,7 +923,6 @@ ion-content {
     padding-top: 2px;
     overflow: hidden;
     height: 100%;
-
     .bg {
         position: absolute;
         top: 0;
@@ -947,12 +954,10 @@ ion-content {
             .title {
                 .text1 {
                     font-size: 18px;
-                    font-family: AlimamaShuHeiTi;
+                    font-family: TsangerYuMo;
                     color: #ffffff;
                     line-height: 24px;
-                    background: linear-gradient(135deg, #deffce 0%, #85f9c4 51%, #3df3bc 100%);
-                    -webkit-background-clip: text;
-                    -webkit-text-fill-color: transparent;
+                    .gt();
                 }
 
                 .text2 {
@@ -978,11 +983,9 @@ ion-content {
             .van-tab {
                 color: #ffffff;
                 line-height: 24px;
-                background: linear-gradient(135deg, #deffce 0%, #85f9c4 51%, #3df3bc 100%);
-                -webkit-background-clip: text;
-                -webkit-text-fill-color: transparent;
                 font-size: 18px;
-                font-family: AlimamaShuHeiTi;
+                font-family: TsangerYuMo;
+                .gt();
             }
             .van-tabs__line {
                 background: #d8d8d8 linear-gradient(135deg, #deffce 0%, #85f9c4 51%, #3df3bc 100%);
@@ -1041,10 +1044,7 @@ ion-content {
                         color: #c5f2ac;
                         line-height: 30px;
                         margin-top: 4px;
-                        background: linear-gradient(180deg, #dcff91 0%, #5ff6c0 100%),
-                            linear-gradient(135deg, #deffce 0%, #85f9c4 51%, #3df3bc 100%);
-                        -webkit-background-clip: text;
-                        -webkit-text-fill-color: transparent;
+                        .gt();
                         small {
                             font-size: 16px;
                             margin-top: 5px;

src/views/RankPage.vue

@@ -434,37 +434,6 @@ function goInvite() {
             }
         }
     }
-
-    &.rank-val_0 {
-        .val-content {
-            .text1 {
-                .gradient-text(#ed5701, #c40800);
-            }
-            .text2 {
-                .gradient-text(#ed5701, #c40800);
-            }
-        }
-    }
-    &.rank-val_1 {
-        .val-content {
-            .text1 {
-                .gradient-text(#004f84, #0a4268);
-            }
-            .text2 {
-                .gradient-text(#004f84, #0a4268);
-            }
-        }
-    }
-    &.rank-val_2 {
-        .val-content {
-            .text1 {
-                .gradient-text(#ae4432, #9d1c06);
-            }
-            .text2 {
-                .gradient-text(#ae4432, #9d1c06);
-            }
-        }
-    }
 }
 
 .nor {