add

Strides-APP/android/app/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.google.gms.google-services'
 
 import com.android.build.OutputFile
 
-def myVersionName = "2.2.1" //★★★★★版本号★★★★★
+def myVersionName = "2.2.2" //★★★★★版本号★★★★★
 /**
  * The react.gradle file registers a task for each build variant (e.g. bundleDebugJsAndAssets
  * and bundleReleaseJsAndAssets).

Strides-APP/android/app/version.properties

@@ -1,2 +1,2 @@
-#Wed Mar 15 19:12:06 CST 2023
-VERSION_CODE=184
+#Fri Apr 14 19:59:53 CST 2023
+VERSION_CODE=193

Strides-APP/app.json

@@ -1,8 +1,8 @@
 {
   "name": "JuicePlus",
   "displayName": "ChargEco",
-  "versionCode": 130,
-  "versionName": "V2.2.1",
-  "product": false,
+  "versionCode": 190,
+  "versionName": "V2.2.2",
+  "product": true,
   "debug": true
 }

Strides-APP/app/api/http.js

@@ -4,7 +4,7 @@ import app from '../../app.json';
 
 //config
 //const hostUrl = 'http://161.117.183.142/';
-const hostUrl = app.product ? 'https://chargeco.global/' : 'https://uat.chargeco.global/';
+const hostUrl = app.product ? 'https://csms.chargeco.global/' : 'https://uat.chargeco.global/';
 const service = 'chargeco/'
 export const host = hostUrl;
 
@@ -34,6 +34,7 @@ export const get = (path, params) => {
       params: params,
       method: 'GET',
       headers: {
+        'lang': 'SG',
         'Accept': 'application/json',
         'accessToken': global.accessToken ?? ''
       }
@@ -57,6 +58,7 @@ export const post = (path, params) => {
     Axios.post(host + service + path, params, {
       method: 'POST',
       headers: {
+        'lang': 'SG',
         'Accept': 'application/json',
         'accessToken': global.accessToken ?? ''
       }
@@ -80,6 +82,7 @@ export const upload = (path, params, header) => {
     Axios.post(host + service + path, params, {
       method: 'POST',
       headers: {
+        'lang': 'SG',
         'Accept': 'application/json',
         'Content-Type': 'multipart/form-data',
         'accessToken': global.accessToken ?? '',
@@ -118,6 +121,7 @@ export const GET = (url, params) => {
     fetch(request, {
       method: 'GET',
       headers: {
+        'lang': 'SG',
         'Accept': 'application/json',
         'accessToken': global.accessToken ?? ''
       }.then((response) => {
@@ -140,6 +144,7 @@ export const POST = (url, params) => {
     fetch(host + service + url, {
       method: 'POST',
       headers: {
+        'lang': 'SG',
         'Accept': 'application/json',
         'content-type': 'application/json',
         'accessToken': global.accessToken ?? ''

Strides-APP/app/pages/chargeV2/TabCharge.js

@@ -633,6 +633,9 @@ export default class TabCharge extends Component {
           isPending: true,
           isCharging: true
         });
+        if (res.msg) {
+          toastShort(res.msg)
+        }
         this.canAutoRefresh = true;
         this.autoCheckChargeStatus();
         /*setTimeout(() => {
@@ -662,6 +665,9 @@ export default class TabCharge extends Component {
     this.canAutoRefresh = false;
     Dialog.showProgressDialog();
     apiCharge.stopCharge().then(res => {
+      if (res.msg) {
+        toastShort(res.msg)
+      }
       if (res.data.chargingPk) {
         setTimeout(() => {
           Dialog.dismissLoading();

Strides-Admin/src/views/site/detail.vue

@@ -536,6 +536,19 @@ export default {
           this.ratesForm.specialChargeRates = srate;
         }
       }
+      if (this.siteForm.siteTypes && this.siteForm.siteTypes.length) {
+        for (let type of this.siteForm.siteTypes) {
+          if (type.siteType == "PRI_USR_WHI") {
+            this.enableWhitelistUser = (type.allDay || (type.startTime && type.endTime))
+          } else if (type.siteType == "PRI_FLE_WHI") {
+            this.enableWhitelistFleet = (type.allDay || (type.startTime && type.endTime))
+          } else if (type.siteType == "PUB") {
+            this.enablePublic = (type.allDay || (type.startTime && type.endTime))
+          } else {
+            continue;
+          }
+        }
+      }
       if (this.siteForm.siteSummary) {
         this.summaryInfo = Object.assign(this.siteForm.siteSummary, {});
         delete this.siteForm.siteSummary;