li.shaoyi 1 năm trước cách đây
mục cha
commit
e41729562d

+ 0 - 1
src/constants/order.ts

@@ -619,6 +619,5 @@ export function getGoodsCurrencyList() {
  */
 export function getGoodsCurrencyName(value: number) {
     const enums = getGoodsCurrencyList()
-    console.log(enums)
     return getEnumTypeName(enums, value)
 }

+ 17 - 14
src/packages/tss/App.vue

@@ -4,14 +4,15 @@
 </template>
 
 <script lang="ts" setup>
-import { reactive } from 'vue'
+import { reactive, onMounted } from 'vue'
+import { Locale } from 'vant'
 import { useNavigation } from '@mobile/router/navigation'
 import { dialog } from '@/utils/vant'
 import { useLogin } from '@/business/login'
+import { i18n } from '@/stores'
 import eventBus from '@/services/bus'
+import plus from '@/utils/h5plus'
 import Notify from '@mobile/components/base/notify/index.vue'
-import { i18n } from '@/stores'
-import { Locale } from 'vant'
 import enUS from 'vant/es/locale/lang/en-US'
 import enCN from 'vant/es/locale/lang/zh-CN'
 import thTH from 'vant/es/locale/lang/th-TH'
@@ -21,18 +22,18 @@ const { userLogout } = useLogin()
 const { backHome } = useNavigation()
 
 switch (i18n.global.locale) {
-    case 'en-US':
-      Locale.use(i18n.global.locale, enUS)
-      break;
-    case 'th':
-        Locale.use(i18n.global.locale, thTH)
-        break;
-      case 'zh-TW':
-        Locale.use(i18n.global.locale, zhTW)
-        break;
+  case 'en-US':
+    Locale.use(i18n.global.locale, enUS)
+    break;
+  case 'th':
+    Locale.use(i18n.global.locale, thTH)
+    break;
+  case 'zh-TW':
+    Locale.use(i18n.global.locale, zhTW)
+    break;
   default:
-        Locale.use(i18n.global.locale, enCN)
-        break;
+    Locale.use(i18n.global.locale, enCN)
+    break;
 }
 
 
@@ -73,4 +74,6 @@ eventBus.$on('RiskToWebNtf', (msg, type) => {
     })
   }
 })
+
+onMounted(() => plus.setStatusBarStyle('dark'))
 </script>

+ 1 - 1
src/packages/tss/views/bank/wallet/components/inoutapply/Index.vue

@@ -81,7 +81,7 @@ const goToAmtInByPaidUrl = (item: Model.AccountOutInApplyRsp) => {
             exchticket: item.exchticket
         }
     }).then((res) => {
-        openWebview(res.data)
+        openWebview(res.data.url)
     })
 }
 

+ 0 - 1
src/packages/tss/views/home/main/index.less

@@ -43,7 +43,6 @@
         min-height: 100%;
         background-repeat: no-repeat;
         background-size: 100% auto;
-        background-position: center -54px;
         padding-top: 120px;
     }
 

+ 18 - 4
src/packages/tss/views/home/main/index.vue

@@ -1,7 +1,7 @@
 <template>
   <app-view class="home-main">
     <template #header>
-      <app-statusbar class="home-main__header" :style="{ backgroundImage: `url(${getFileUrl(topBanners)})` }">
+      <app-statusbar class="home-main__header" @ready="onReady" :style="{ backgroundImage: `url(${getFileUrl(topBanners)})` }">
         <div class="searchbar">
           <Search shape="round" background="transparent" :placeholder="$t('tss.tips1')"
             @click="$router.push({ name: 'search' })" />
@@ -10,7 +10,7 @@
         </div>
       </app-statusbar>
     </template>
-    <div class="home-main__container" :style="{ backgroundImage: `url(${getFileUrl(topBanners)})` }">
+    <div ref="containerRef" class="home-main__container" :style="{ backgroundImage: `url(${getFileUrl(topBanners)})` }">
       <app-block class="home-main__notice">
         <h4 @click="$router.push({ name: 'notice-list' })">
           <span>{{ $t('routes.notice') }}</span>
@@ -51,13 +51,14 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, onMounted, onActivated } from 'vue'
+import { shallowRef, onMounted, onActivated, onDeactivated } from 'vue'
 import { Cell, CellGroup, Search, Icon } from 'vant'
 import { getFileUrl } from '@/filters'
 import { queryImageConfigs } from '@/services/api/common'
 import { queryNewTitles } from '@/services/api/news'
 import { queryTouristGoods, queryTouristQuoteDay } from '@/services/api/goods'
 import { useLoginStore, useNoticeStore, useGoodsCollectionStore, useFuturesStore } from '@/stores'
+import plus from '@/utils/h5plus'
 import ProductList from '../../product/list/components/waterfall-list/index.vue'
 
 const loginStore = useLoginStore()
@@ -65,6 +66,7 @@ const noticeStore = useNoticeStore()
 const goodsCollectionStore = useGoodsCollectionStore()
 const futuresStore = useFuturesStore()
 
+const containerRef = shallowRef<HTMLDivElement>()
 const refreshing = shallowRef(false) // 是否处于加载中状态
 const topBanners = shallowRef(''); // 背景图片
 const newsList = shallowRef<Model.NewTitlesRsp[]>([]) // 资讯列表
@@ -96,6 +98,11 @@ const onRefresh = () => {
   })
 }
 
+const onReady = (el: HTMLDivElement) => {
+    // 设置背景图位置
+    containerRef.value?.style.setProperty('background-position', `0 -${el.clientHeight}px`)
+}
+
 onMounted(() => {
   onRefresh()
 
@@ -125,7 +132,14 @@ onMounted(() => {
     })
   }
 
-  onActivated(() => onRefresh())
+  onActivated(() => {
+    plus.setStatusBarStyle('light')
+    onRefresh()
+  })
+
+  onDeactivated(() => {
+    plus.setStatusBarStyle('dark')
+  })
 })
 </script>
 

+ 8 - 1
src/packages/tss/views/mine/Index.vue

@@ -125,7 +125,7 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef, onActivated, computed } from 'vue'
+import { shallowRef, onActivated, onDeactivated, computed } from 'vue'
 import { Cell, CellGroup, Button, Icon } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
 // import { parsePercent } from '@/filters'
@@ -133,6 +133,7 @@ import { useNavigation } from '@mobile/router/navigation'
 import { AuthStatus } from '@/constants/account'
 import { queryBankAccountSign } from '@/services/api/bank'
 import { useLoginStore, useAccountStore, useUserStore, } from '@/stores'
+import plus from '@/utils/h5plus'
 import eventBus from '@/services/bus'
 import Iconfont from '@/components/base/iconfont/index.vue'
 import { i18n } from '@/stores'
@@ -192,11 +193,17 @@ const userLogout = () => {
 }
 
 onActivated(() => {
+    plus.setStatusBarStyle('light')
+    
     if (authStatus.value !== AuthStatus.Certified) {
         userStore.getUserData()
     }
     accountStore.getAccountList()
 })
+
+onDeactivated(() => {
+    plus.setStatusBarStyle('dark')
+})
 </script>
 
 <style lang="less">

+ 10 - 1
src/packages/tss/views/user/login/Index.vue

@@ -53,13 +53,14 @@
 </template>
 
 <script lang="ts" setup>
-import { shallowRef } from 'vue'
+import { onActivated, onDeactivated, shallowRef } from 'vue'
 import { Button, Field, CellGroup, Cell, Form, Checkbox, showFailToast, showToast } from 'vant'
 import { fullloading, dialog } from '@/utils/vant'
 import { useLogin } from '@/business/login'
 import { useNavigation } from '@mobile/router/navigation'
 import { useGlobalStore, i18n } from '@/stores'
 import service from '@/services'
+import plus from '@/utils/h5plus'
 import SliderVerify from '@/components/base/slider-verify/index.vue' // 临时调用,待优化
 import AppLuanguage from '@mobile/components/modules/luanguage/index.vue'
 
@@ -125,6 +126,14 @@ const formSubmit = () => {
     }
   }
 }
+
+onActivated(() => {
+  plus.setStatusBarStyle('light')
+})
+
+onDeactivated(() => {
+  plus.setStatusBarStyle('dark')
+})
 </script>
 
 <style lang="less">

+ 4 - 2
src/types/model/bank.d.ts

@@ -103,7 +103,9 @@ declare namespace Model {
 
     /** 获取银行支付地址 回应 */
     interface AmtInByPaidUrlRsp {
-        data: string;
+        channelmode: string;// 渠道类型:ChillPay,PayerMax,AsiaPay
+        params: string;// 支付参数,只有 AsiaPay 渠道需要
+        url: string;// 支付跳转地址
     }
 
     /** 查询充值出金 请求 */
@@ -524,7 +526,7 @@ declare namespace Model {
         /// 每页条数
         pagesize?: number
     }
- 
+
     /// 查询代扣入金申请表-回应
     interface GTWithHoldDepositApplyRsp {
         /// 资金账户ID