add changes

Strides-APP/app/pages/payment/CreditCard.js

@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { View, Text, StyleSheet } from 'react-native';
 import * as Progress from 'react-native-progress';
 import WebView from 'react-native-webview';
-import Dialog from '../../components/Dialog';
+import routeUtil from '../../utils/routeUtil';
 import { PageList } from '../Router';
 
 export default class CreditCard extends Component {
@@ -24,12 +24,13 @@ export default class CreditCard extends Component {
   }
 
   onPostMessage(data) {
-    startPage(PageList.topup);
+    //toTopupPage()
+    routeUtil.bridge2Page(PageList.topupNew);
     /*if (data) {
       try {
         const msg = JSON.parse(data);
         if (msg.msg) {
-          Dialog.showResultDialog(msg.msg, 'OK', back => {
+          Dialog.showResultDialog(msg.msg, $t('nav.ok'), back => {
             startPage(PageList.topup);
           });
         }

Strides-Admin/src/views/feedback/Detail.vue

@@ -48,6 +48,26 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row :gutter="20">
+          <el-col :xs="24" :md="14" v-if="feedbackInfo.chargeBoxId">
+            <el-form-item
+              label="Charging Station:">
+              <el-input
+                class="add-text"
+                v-model="feedbackInfo.chargeBoxId"
+                readonly/>
+            </el-form-item>
+          </el-col>
+          <el-col :xs="24" :md="10" v-if="feedbackInfo.connectorId">
+            <el-form-item
+              label="Connector:">
+              <el-input
+                class="add-text"
+                v-model="feedbackInfo.connectorId"
+                readonly/>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <div class="section-title">Photos</div>
         <div class="feedback-photo">
           <img