vbea 2 anni fa
parent
commit
9e75c70f9b

+ 2 - 2
Strides-APP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Fri Mar 15 14:50:36 CST 2024
-VERSION_CODE=411
+#Thu Mar 28 12:00:11 CST 2024
+VERSION_CODE=414

+ 1 - 1
Strides-APP/android/build.gradle

@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        versionName = "3.1.3" //★★★★★版本号★★★★★
+        versionName = "3.1.4" //★★★★★版本号★★★★★
         buildToolsVersion = "33.0.2"
         minSdkVersion = 23
         compileSdkVersion = 33

+ 4 - 4
Strides-APP/app.json

@@ -1,8 +1,8 @@
 {
   "name": "Strides",
   "displayName": "ChargEco",
-  "versionCode": 410,
-  "versionName": "V3.1.3",
+  "versionCode": 420,
+  "versionName": "V3.1.4",
   "product": false,
   "debug": true,
   "isWhitelabel": true,
@@ -29,7 +29,7 @@
   "v3": {
     "drawer": true,
     "summary": true,
-    "overview": true,
+    "overview": false,
     "anzPayment": false,
     "paymentMethod": false
   },
@@ -45,6 +45,6 @@
     "enable": true,
     "showArticle": true,
     "showCampaigns": true,
-    "description": "如果showCampaigns为true,需确保showArticle也为true,如果showArticle为false,则只显示Alert"
+    "description": "濡傛灉showCampaigns涓簍rue锛岄渶纭�繚showArticle涔熶负true锛屽�鏋渟howArticle涓篺alse锛屽垯鍙�樉绀篈lert"
   }
 }

+ 1 - 1
Strides-APP/app/pages/chargeV2/ChargeAdapter.js

@@ -42,7 +42,7 @@ export default class ChargeAdapter extends Component {
       title: $t('charging.tabCharge'),
       name: "Charge",
       component: Charge
-    }/*, {
+    }, {
       title: $t('charging.tabReserve'),
       name: "Reserve",
       component: Reserve

+ 13 - 2
Strides-APP/app/pages/wallet/Overview.js

@@ -25,6 +25,7 @@ export default class Overview extends Component {
       weekIndex: 0,
       monthIndex: 0,
       chartReady: false,
+      chartReady2: false
     };
     this.nowDataString = new Date().toDateString()
     this.refreshing = false;
@@ -54,6 +55,11 @@ export default class Overview extends Component {
             chartReady: true
           })
         }, 500);
+        setTimeout(() => {
+          this.setState({
+            chartReady2: true
+          })
+        }, 1000);
       }
     } else if (this.state.chartReady) {
       this.setState({
@@ -116,6 +122,11 @@ export default class Overview extends Component {
           skeleton: false,
           chartReady: true
         }, () => {
+          setTimeout(() => {
+            this.setState({
+              chartReady2: true
+            })
+          }, 500);
           this.stopRefresh();
         })
       });
@@ -133,7 +144,7 @@ export default class Overview extends Component {
     this.refreshing = false;
     setTimeout(() => {
       Dialog.dismissLoading();
-    }, 1000);
+    }, 2000);
   }
 
   barTheme = (active) => ({
@@ -279,7 +290,7 @@ export default class Overview extends Component {
               </svg> */}
               { this.enableChartArea
               ? <Svg height={200}>
-                { this.state.chartReady &&
+                { this.state.chartReady2 &&
                   <VictoryChart
                     theme={VictoryTheme.material}
                     height={200}