vbea 2 жил өмнө
parent
commit
0585774579

+ 2 - 1
Strides-APP/app/i18n/locales/en.js

@@ -496,8 +496,9 @@ export default {
   },
   notification: {
     tabAlerts: "Alerts",
+    tabArticles: "Articles",
     tabCampaign: "Campaigns",
-    tabPromotions: "Articles",
+    tabPromotions: "Promotions",
     viewMessage: "View Message",
     deleteMessage: "Delete",
     confirmDelete: "Are you sure you want to delete this message?",

+ 2 - 1
Strides-APP/app/i18n/locales/zh-TW.js

@@ -496,8 +496,9 @@ export default {
   },
   notification: {
     tabAlerts: "訊息",
+    tabArticles: "新聞",
     tabCampaign: "活動",
-    tabPromotions: "新聞",
+    tabPromotions: "資訊",
     viewMessage: "訊息",
     deleteMessage: "刪除訊息",
     confirmDelete: "您確認要刪除這條訊息嗎?",

+ 1 - 0
Strides-APP/app/i18n/locales/zh.js

@@ -496,6 +496,7 @@ export default {
   },
   notification: {
     tabAlerts: "通知",
+    tabArticles: "文章",
     tabCampaign: "活动",
     tabPromotions: "新闻",
     viewMessage: "信息",

+ 1 - 0
Strides-APP/app/pages/alert/AlertUtil.js

@@ -1,4 +1,5 @@
 export default {
+  isPromotion: false,
   setBadgeCount(info={}) {
     global.alertBadgeCountInfo = info;
   },

+ 1 - 1
Strides-APP/app/pages/alert/Notification.js

@@ -32,7 +32,7 @@ export default class Notification extends Component {
       name: "Alerts",
       component: ListAlerts
     }, {
-      title: $t('notification.tabPromotions'),
+      title: AlertUtil.isPromotion ? $t('notification.tabPromotions') : $t("notification.tabArticles"),
       name: "News",
       component: ListNews
     }]

+ 5 - 2
Strides-APP/app/pages/home/maps/LocationPermission.js

@@ -82,9 +82,9 @@ const getPermission = (back) => {
   });
 }
 
-const LocationPermission = ({visible=false, onView}) => (
+const LocationPermission = ({visible=false, bottomDivide=false, onView}) => (
   visible
-  ? <View style={styles.permissionView}>
+  ? <View style={[styles.permissionView, (bottomDivide ? styles.bottomTabDivide : {})]}>
       <TextView
         style={styles.permissionText}
         numberOfLines={1}>{$t("home.locationPermissionTips")}</TextView>
@@ -121,6 +121,9 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     backgroundColor: '#FEB751'
   },
+  bottomTabDivide: {
+    bottom: 76
+  },
   permissionText: {
     flex: 1,
     color: textDark,