Develop DrawerV4 and Wallets Page

https://dev.wormwood.com.sg/zentao/task-view-512.html

Strides-APP/app/i18n/locales/en.js

@@ -80,6 +80,7 @@ export default {
     selectVoucher: "Select Voucher",
     pointsHistory: "Points History",
     wallet: "Transactions",
+    wallets: "Wallets",
     applyMember: "Apply Membership",
     yourMembers: "Your Membership",
     refundPolicy: "Refund Policy"
@@ -178,6 +179,7 @@ export default {
     sign: "Sign In",
     charging: "Charging",
     wallet: "Transactions",
+    wallets: "Wallets",
     topup: "Credits",
     feedback: "Feedback",
     settings: "Settings",
@@ -517,7 +519,7 @@ export default {
     labelReservationFeeSubtotal3: "Reservation Fee Subtotal:",
     labelSiteName: "Site Name:",
     labelTimeReservation: "Time of Reservation:",
-    labelTransactionID: "Transaction ID:",
+    labelTransactionID: "Transaction ID: ",
     labelPointsRewards: "Points Rewards",
     labelPointsRewarded: "Points Rewarded",
     labelVoucherUsage: "Voucher Usage",

Strides-APP/app/i18n/locales/zh-TW.js

@@ -80,6 +80,7 @@ export default {
     selectVoucher: "選擇優惠券",
     pointsHistory: "積點記錄",
     wallet: "我的餘額",
+    wallets: "我的錢包",
     applyMember: "申請會員",
     yourMembers: "我的會員",
     refundPolicy: "退款政策"
@@ -178,6 +179,7 @@ export default {
     sign: "請登⼊",
     charging: "充電",
     wallet: "我的餘額",
+    wallets: "我的錢包",
     topup: "餘額充值",
     feedback: "反饋",
     settings: "設定",

Strides-APP/app/i18n/locales/zh.js

@@ -80,6 +80,7 @@ export default {
     selectVoucher: "选择代金券",
     pointsHistory: "积分记录",
     wallet: "我的余额",
+    wallets: "我的钱包",
     applyMember: "申请会员",
     yourMembers: "我的会员",
     refundPolicy: "退款政策"
@@ -178,6 +179,7 @@ export default {
     sign: "请登录",
     charging: "充电",
     wallet: "我的余额",
+    wallets: "我的钱包",
     topup: "余额充值",
     feedback: "反馈",
     settings: "设置",

Strides-APP/app/pages/Router.js

@@ -76,6 +76,7 @@ import Transaction from './transaction/Transaction';
 import LoginVL from './signLumi/LoginVL';
 import RegisterVL from './signLumi/RegisterVL';
 import ForgotPwdVL from './signLumi/ForgotPwdVL';
+import Wallets from './wallets/Wallets';
 
 export var PageList = {
   'splash': {
@@ -189,6 +190,11 @@ export var PageList = {
     titleScope: 'route.wallet',
     component: Wallet
   },
+  'wallets': {
+    title: 'Wallets',
+    titleScope: 'route.wallets',
+    component: Wallets
+  },
   'history': {
     title: 'History',
     titleScope: 'route.history',

Strides-APP/app/pages/home/Index.js

@@ -16,6 +16,7 @@ import apiNotification from '../../api/apiNotification';
 import DrawerView from './Drawer.js';
 import DrawerViewV2 from './DrawerV2.js';
 import DrawerViewV3 from './DrawerV3.js';
+import DrawerViewV4 from './DrawerV4.js';
 
 const Drawer = createDrawerNavigator();
 
@@ -152,11 +153,13 @@ const CustomerDrawerContent = (props) => {
       {...props}
       canCancelContentTouches={true}
       style={(app.v3.drawer && !app.isLumiWhitelabel) ? styles.contentV2 : {}}>
-      { app.v3.drawer
-      ? app.isLumiWhitelabel
-        ? <DrawerViewV3 {...props}/>
-        : <DrawerViewV2 {...props}/>
-      : <DrawerView {...props}/>
+      { app.v4.drawer
+        ? <DrawerViewV4 {...props}/>
+        : app.v3.drawer
+        ? app.isLumiWhitelabel
+          ? <DrawerViewV3 {...props}/>
+          : <DrawerViewV2 {...props}/>
+        : <DrawerView {...props}/>
       }
     </DrawerContentScrollView>
   );

Strides-APP/app/pages/wallet/OverviewV2.js

@@ -33,7 +33,7 @@ export default class OverviewV2 extends Component {
     console.log("概述", this.props);
     if (!this.props.skeleton) {
       this.refreshing = true;
-      Dialog.showProgressDialog();
+      //Dialog.showProgressDialog();
       this.getOverview();
     }
   }

Strides-APP/app/pages/wallet/Wallet.js

@@ -14,6 +14,7 @@ import TextView from '../../components/TextView';
 import Dialog from '../../components/Dialog';
 import app from '../../../app.json';
 import OverviewV2 from './OverviewV2';
+import VbeSkeleton from '../../components/VbeSkeleton';
 
 export default class Wallet extends Component {
   constructor(props) {
@@ -25,7 +26,8 @@ export default class Wallet extends Component {
       tabWidth: 0,
       tabHeight: 0,
       balanceText: '',
-      pageShown: true
+      pageShown: true,
+      pageLoaded: false
     };
   }
 
@@ -63,6 +65,11 @@ export default class Wallet extends Component {
         }
       });
     }
+    setTimeout(() => {
+      this.setState({
+        pageLoaded: true
+      })
+    }, 300);
   }
 
   changeTab(index) {
@@ -96,6 +103,18 @@ export default class Wallet extends Component {
   }
 
   render() {
+    if (!this.state.pageLoaded) {
+      return (
+        <VbeSkeleton
+          style={[ui.flex1, $padding(16)]}
+          layout={[
+            {width: "100%", height: 62, borderRadius: 6},
+            {width: "100%", height: "80%", borderRadius: 6, marginTop: 24},
+          ]}
+          animationDirection={"horizontalRight"}
+        />
+      )
+    }
     return (
       <ScrollView
         style={styles.container}