Merge branch 'master' of https://codebucket.lumicharging.com/EVCharge/ChargEco

合并到主题分支。

README.md

@@ -1,3 +1,3 @@
-# Strides
+# Strides ChargEco
 ---  
-2022 vbe@wormwood
+2026 vbe@lumicharging

Strides-Admin/src/router/SettingsRouter.js

@@ -2,7 +2,7 @@ import Layout from '@/layout'
 
 export default {
   path: '/system-settings',
-  redirect: '/system-settings/mail-settings',
+  redirect: 'noRedirect',
   component: Layout,
   alwaysShow: true,
   meta: {

Strides-Admin/src/settings.js

@@ -4,13 +4,13 @@ module.exports = {
    * @description Web page title
    */
   title: 'ChargEco CSMS',
-  version: 'v2.3.9',
+  version: 'v2.4.0',
   /**
    * @type {string}
    * @description project name
    */
   projectName: 'ChargEco',
-  company: 'Strides YTL Pte. Ltd.',
+  company: 'ChargEco Pte. Ltd.',
   defaultCountry: 'SG',
   defaultCalling: '65',
   dashboardVersion: 2,

Strides-Admin/src/views/charge/RegisteredChargeStations.vue

@@ -195,10 +195,10 @@
                 command="hardReset">
                 Hard Reset
               </el-dropdown-item>
-              <el-dropdown-item
+              <!-- <el-dropdown-item
                 command="delStation">
                 Delete
-              </el-dropdown-item>
+              </el-dropdown-item> -->
             </el-dropdown-menu>
           </el-dropdown>
           <!-- <TableAction

Strides-SPAPP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Wed May 06 15:26:31 CST 2026
-VERSION_CODE=961
+#Thu Jun 25 14:46:50 CST 2026
+VERSION_CODE=968

Strides-SPAPP/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 = "4.2.2" //★★★★★版本号★★★★★
+        versionName = "4.3.0" //★★★★★版本号★★★★★
         buildToolsVersion = "36.1.0"
         minSdkVersion = 24
         compileSdkVersion = 36

Strides-SPAPP/android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=100000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

Strides-SPAPP/app.json

@@ -2,8 +2,8 @@
   "name": "Strides",
   "displayName": "ChargEco",
   "versionCode": 960,
-  "versionName": "V4.2.2",
-  "product": true,
+  "versionName": "V4.3.0",
+  "product": false,
   "debug": true,
   "isWhitelabel": true,
   "isLumiWhitelabel": false,
@@ -16,9 +16,9 @@
     "nationally": false,
     "topup_payment_type": false,
     "support": {
-      "phone": "+6564775355",
+      "phone": "69167799",
       "whatsapp": "https://wa.me/6597285916",
-      "fdEmail": "feedback@chargeco.global"
+      "fdEmail": "emobility@spgroup.com.sg"
     }
   },
   "storeUrl": {
@@ -28,7 +28,7 @@
     "termsUseUrl": "https://chargeco.global/terms-of-use",
     "privacyPolicyUrl": "https://chargeco.global/privacy-policy"
   },
-  "company": "Strides YTL Pte. Ltd.",
+  "company": "ChargEco Pte. Ltd.",
   "v3": {
     "drawer": false,
     "overview": true,

Strides-SPAPP/app/pages/my/Referral.js

@@ -18,9 +18,6 @@ export default class Referral extends Component {
     return (
       <ScrollView
         style={styles.container}>
-        <Image
-          style={styles.topImage}
-          source={require('../../images/user/referral-top.png')}/>
         <View style={styles.codeView}>
           <Text style={styles.codeTitle}>Your Referral Code</Text>
           <Text style={styles.codeText}>{userInfo.referralCode}</Text>

Strides-SPAPP/app/pages/sign/RegisterV4.js

@@ -546,7 +546,7 @@ export default class RegisterV4 extends React.Component {
               />
               <View style={styles.agreeTextRow}>
                 <TextView style={styles.agreeText} onPress={() => this.changeAgree2(!this.state.agree2)}>
-                  I consent to Strides YTL Pte. Ltd. to collect, use and disclose my personal data for the above purposes and in accordance with the SMRT Corporation’s Privacy Statement and Personal Data Protection Act 2012.
+                  I consent to ChargEco Pte. Ltd. to collect, use and disclose my personal data for the above purposes.
                 </TextView>
               </View>
             </View>

Strides-SPAPP/ios/ChargEco/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -31,7 +31,7 @@
       "size" : "40x40"
     },
     {
-      "filename" : "ios120-1.png",
+      "filename" : "ios120.png",
       "idiom" : "iphone",
       "scale" : "3x",
       "size" : "40x40"
@@ -55,7 +55,7 @@
       "size" : "20x20"
     },
     {
-      "filename" : "ios40-1.png",
+      "filename" : "ios40.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "20x20"
@@ -67,19 +67,19 @@
       "size" : "29x29"
     },
     {
-      "filename" : "ios58-1.png",
+      "filename" : "ios58.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "29x29"
     },
     {
-      "filename" : "ios40-2.png",
+      "filename" : "ios40.png",
       "idiom" : "ipad",
       "scale" : "1x",
       "size" : "40x40"
     },
     {
-      "filename" : "ios80-1.png",
+      "filename" : "ios80.png",
       "idiom" : "ipad",
       "scale" : "2x",
       "size" : "40x40"

WebApp-Lite/pages/index/index.vue

@@ -162,8 +162,8 @@ export default {
 
 <style scoped>
 .logo {
-  width: 200rpx;
-  height: 200rpx;
+  width: 381rpx;
+  height: 120rpx;
 }
 .form-view {
   width: calc(100% - 64rpx);