revert 解决冲突
This commit is contained in:
2025-11-27 15:38:24 +08:00
parent 3da220526b
commit 64abd3d4ab
28 changed files with 1059 additions and 705 deletions

View File

@@ -4,7 +4,7 @@
<view class="payment-item">
<view class="payment-left">
<image src="/static/icon/pay_3.png" class="payment-icon" />
<text class="">{{ $t('global.coin') }}</text>
<text class="">{{ $t('order.virtualCoin') }}</text>
<text class="text-[#7dc1f0]">
({{ $t('order.balance') }}{{ peanutCoin || 0 }})
</text>
@@ -25,12 +25,19 @@
<view class="tip-title">{{ $t('order.paymentTipTitle') }}</view>
<view class="tip-item">{{ $t('order.paymentTip1') }}</view>
<view class="tip-item">
{{ $t('order.paymentTip2-1') }}
<text class="link-text" @click="copyToClipboard('yilujiankangkefu')">yilujiankangkefu</text>
{{ $t('order.paymentTip2-2') }}
<text class="link-text" @click="copyToClipboard('AmazingLimited@163.com')">
AmazingLimited@163.com
{{ $t('order.paymentTip2') }}
<text class="link-text" @click="makePhoneCall('022-24142321')">022-24142321</text>
</view>
<view class="tip-item">
{{ $t('order.paymentTip3') }}
<text class="link-text" @click="copyToClipboard('publisher@tmrjournals.com')">
publisher@tmrjournals.com
</text>
{{ $t('order.paymentTip3_1') }}
<text class="link-text" @click="copyToClipboard('yilujiankangkefu')">
yilujiankangkefu
</text>
{{ $t('order.paymentTip3_2') }}
</view>
</view>
</view>
@@ -46,15 +53,6 @@ const props = defineProps({
default: 0
}
})
/**
* 跳转到充值页面
*/
const goToRecharge = () => {
uni.navigateTo({
url: '/pages/user/wallet/recharge/index?source=order'
})
}
</script>
<style lang="scss" scoped>