wudebin 2 місяців тому
батько
коміт
d113b22337

+ 2 - 2
Strides-SPAPP/app.json

@@ -1,9 +1,9 @@
 {
   "name": "Strides",
   "displayName": "ChargEco",
-  "versionCode": 840,
+  "versionCode": 850,
   "versionName": "V4.1.2",
-  "product": false,
+  "product": true,
   "debug": true,
   "isWhitelabel": true,
   "isLumiWhitelabel": false,

+ 1 - 1
Strides-SPAPP/app/i18n/locales/es.js

@@ -1,5 +1,5 @@
 /**
- * 法国语言包
+ * 西班牙语言包
  */
 export default {
   name: "Español",

+ 6 - 2
Strides-SPAPP/app/pages/chargeV2/SummaryV2.js

@@ -394,16 +394,20 @@ export default class SummaryV2 extends Component {
                 <TextView style={styles.text}>{this.state.summaryInfo.idleFeeV2.idleRule}</TextView>
               </View>
               <View style={styles.formRow}>
-                <TextView style={styles.label}>Idle Fee Start Time:</TextView>
+                <TextView style={styles.label}>Grace Period Start Time:</TextView>
                 <TextView style={styles.text}>{this.state.summaryInfo.idleFeeV2.gracePeriodStartTime}</TextView>
               </View>
+              <View style={styles.formRow}>
+                <TextView style={styles.label}>Idle Fee Start Time:</TextView>
+                <TextView style={styles.text}>{this.state.summaryInfo.idleFeeV2.idlePeriodStartTime}</TextView>
+              </View>
               <View style={styles.formRow}>
                 <TextView style={styles.label}>Idle Fee Period:</TextView>
                 <TextView style={styles.text}>{this.state.summaryInfo.idleFeeV2.idlePeriod}</TextView>
               </View>
               <View style={styles.formRow}>
                 <TextView style={styles.label}>Idle Fee End Time:</TextView>
-                <TextView style={styles.text}>{this.state.summaryInfo.idleFeeV2.gracePeriodEndTime}</TextView>
+                <TextView style={styles.text}>{this.state.summaryInfo.idleFeeV2.idlePeriodEndTime}</TextView>
               </View>
               <View style={styles.formRow}>
                 <TextView style={styles.label}>{$t('receipt.labelIdleFeeSubtotal3')}</TextView>

+ 6 - 4
Strides-SPAPP/app/pages/chargingV2/DiscountView.js

@@ -13,14 +13,15 @@ export default DiscountView = ({visible=false}) => {
         <Path
           fill={colorAccent}
           d="M28 0H0L40 40V12C40 5.37258 34.6274 -30 28 0Z" />
+      </Svg>
+      <View style={styles.cardDiscount}>
         <MaterialCommunityIcons
           name="brightness-percent"
           size={15}
-          color={"white"}
-          style={{top: 3, right: 3, position: 'absolute'}}
+          color={"#ffff"}
+          style={{top: 0, right: 0, position: 'absolute'}}
         />
-      </Svg>
-      <View style={styles.cardDiscount}></View>
+      </View>
     </>);
   } else {
     return <></>;
@@ -33,6 +34,7 @@ const styles = StyleSheet.create({
     left: 0,
     right: 0,
     bottom: 0,
+    zIndex: 2,
     borderWidth: 3,
     borderRadius: 10,
     position: 'absolute',