diff --git a/src/manifest.json b/src/manifest.json index 21ca479..d4e691e 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -23,14 +23,13 @@ "autoclose" : true, "delay" : 0 }, - - "compatible": { - "ignoreVersion": true // 忽略SDK版本不一致提示 + "compatible" : { + "ignoreVersion" : true // 忽略SDK版本不一致提示 }, /* 模块配置 */ "modules" : { "Share" : {}, - "Payment" : {} + "VideoPlayer" : {} }, /* 应用发布信息 */ "distribute" : { diff --git a/src/pages.json b/src/pages.json index 7336687..2f81c56 100644 --- a/src/pages.json +++ b/src/pages.json @@ -92,6 +92,13 @@ "enablePullDownRefresh": false } }, + { + "path": "pages/wallet/DepositGuide", + "style": { + "navigationBarTitleText": "How to use", + "enablePullDownRefresh": false + } + }, { "path": "pages/wallet/DepositHistory", "style": { diff --git a/src/pages/account/CustomService.vue b/src/pages/account/CustomService.vue index f574c4e..9fa4c6a 100644 --- a/src/pages/account/CustomService.vue +++ b/src/pages/account/CustomService.vue @@ -24,7 +24,8 @@ function newMsg(msg, type, mtype) { id, msg, type, - mtype + mtype, + commited: false, }) lastId.value = '' setTimeout(() => { @@ -67,13 +68,28 @@ const getQustionList = async () => { const _data = JSON.parse(data?.data) questions.value = _data } -const onNoZan = (id) => { - questionFailApi({questionId: id}) - newMsg('I\'m sorry that I can\'t help you.', 1,'msg') +const onNoZan = (id, msgId) => { + const idx = faqs.value.findIndex(item => item.id === msgId) + if (idx > -1) { + if (faqs.value[idx].commited) { + return + } + faqs.value[idx].commited = true + questionFailApi({ questionId: id }) + newMsg('Sorry, please contact online customer service.', 1, 'msg') + } + } -const onZan = (id) => { - questionSuccessApi({questionId: id}) - newMsg('I\'m glad that I could help you.!', 1,'msg') +const onZan = (id, msgId) => { + const idx = faqs.value.findIndex(item => item.id === msgId) + if (idx > -1) { + if (faqs.value[idx].commited) { + return + } + faqs.value[idx].commited = true + questionSuccessApi({ questionId: id }) + newMsg('I\'m glad that I could help you.!', 1, 'msg') + } } const onSend = () => { if (!inputVal.value) { @@ -141,12 +157,12 @@ onLoad(() => { {{ child.display }} - + style="margin-right: 10rpx;" @click="onZan(child.id, item.id)"> + style="margin-right: 10rpx;" @click="onNoZan(child.id, item.id)"> @@ -243,7 +259,8 @@ onLoad(() => { width: 40rpx; height: 40rpx; } - .zan-reverse{ + + .zan-reverse { margin-left: 30rpx; } } diff --git a/src/pages/wallet/Deposit.vue b/src/pages/wallet/Deposit.vue index fb011d8..161bf70 100644 --- a/src/pages/wallet/Deposit.vue +++ b/src/pages/wallet/Deposit.vue @@ -29,7 +29,7 @@ - + @@ -50,7 +50,7 @@ import { onLoad } from '@dcloudio/uni-app' import { reactive, ref } from 'vue' import { useThemeStore } from '@/store/useThemeStore' import OnlineDeposit from './components/OnlineDeposit.vue' -import OnlineDepositOld from './components/OnlineDepositOld.vue' +import OnlineDepositOldV1 from './components/OnlineDepositOldV1.vue' import TransferDeposit from './components/TransferDeposit.vue' import TransferDepositOld from './components/TransferDepositOld.vue' import AgencyDeposit from './components/AgencyDeposit.vue' diff --git a/src/pages/wallet/DepositGuide.vue b/src/pages/wallet/DepositGuide.vue new file mode 100644 index 0000000..f65fb7f --- /dev/null +++ b/src/pages/wallet/DepositGuide.vue @@ -0,0 +1,225 @@ + + + \ No newline at end of file diff --git a/src/pages/wallet/components/OnlineDeposit.vue b/src/pages/wallet/components/OnlineDeposit.vue index a5604c6..ef4c316 100644 --- a/src/pages/wallet/components/OnlineDeposit.vue +++ b/src/pages/wallet/components/OnlineDeposit.vue @@ -94,11 +94,12 @@ --> - - - + + + {{ $t('deposit.howtouse') }} + @@ -267,9 +268,12 @@ const handleDepositEventCheckClick = () => { } const handleHowtouseClick = () => { - let url = depositStore.onlinePaymentData.depositMethodSelectItem.isGuide - if (!url) { return } - openUrl(url) + // let url = depositStore.onlinePaymentData.depositMethodSelectItem.isGuide + // if (!url) { return } + // openUrl(url) + uni.navigateTo({ + url: '/pages/wallet/DepositGuide', + }) } const handleConfirmClick = async () => { @@ -391,7 +395,10 @@ const handleConfirmClick = async () => { position: relative; overflow: hidden; border-radius: 16rpx; - + .howto{ + font-size: 26rpx; + color: white; + } .nice-icon { position: absolute; top: 0rpx; diff --git a/src/pages/wallet/components/OnlineDepositOld.vue b/src/pages/wallet/components/OnlineDepositOldV1.vue similarity index 100% rename from src/pages/wallet/components/OnlineDepositOld.vue rename to src/pages/wallet/components/OnlineDepositOldV1.vue diff --git a/src/pages/wallet/components/OnlineDepositOld1.vue b/src/pages/wallet/components/OnlineDepositOldV2.vue similarity index 100% rename from src/pages/wallet/components/OnlineDepositOld1.vue rename to src/pages/wallet/components/OnlineDepositOldV2.vue diff --git a/src/theme/red.js b/src/theme/red.js index ede2d89..95299f9 100644 --- a/src/theme/red.js +++ b/src/theme/red.js @@ -176,7 +176,8 @@ export default { textColor: '#7A2500', activeBgColor: '#f37e1c', activeTextColor: '#ffffff', - } + }, + posterImg: `${imgSrc}/pay_guide/video_poster.png`, }, promo: { tgCode: {