Skip to content

J
japan7-Radix
Commit a990a4b4 by lanse
Options

update

parent b1f3a576
Showing with 83 additions and 53 deletions
src/langurage/cn.ts
......@@ -454,6 +454,7 @@ const messages = {
forget_password: '忘记密码',
register: '沒有帳戶？',
button_text: '登录',
kefu: '联系客服',
user_info_null: '用户信息已失效，请重新登录'
},
register: {
......
src/langurage/ja.ts
......@@ -328,7 +328,7 @@ const messages = {
tip22: 'メールアドレス',
tip23: 'メールアドレスを入力してください',
tip24: '今すぐ申請します',
tip25: 'もう一回融資を申請',
tip25: 'もう一度融資を申請する',
tip26: 'さらに融資します',
tip27: '申請資料を審査に提出します',
tip28: '融資が承認されました',
......@@ -339,7 +339,7 @@ const messages = {
tip33: '最低融資額 500,000円',
tip34: '融資可能な最大額は300万円',
tip35: '情報が不足しています',
tip36: '顧客の服',
tip36: 'カスタマーサポートへ',
tip37: 'ホームへ戻る',
tip38: '単一のクレジット限度額',
tip39: '50-300',
......@@ -455,6 +455,7 @@ const messages = {
forget_password: 'パスワードを忘れた',
register: 'アカウントがありませんか?',
button_text: 'ログイン',
kefu: 'カスタマーサポートへ連絡',
user_info_null: 'ユーザー情報の有効期限が切れています。再度ログインしてください'
},
register: {
......
src/pages/index/index.vue
......@@ -159,7 +159,8 @@ const buttonList = [
{ label: t('index.button1'), icon: '/static/image/index/logo1.png', url: '/subPackages/index/ipo/ipo' },
{ label: t('hongli.title'), icon: '/static/image/index/logo2.png', url: '/subPackages/index/hongli/hongli' },
{ label: t('index.button4'), icon: '/static/image/index/logo3.png', url: '/subPackages/transactionLog/transactionLog?isLs=1' },
{ label: t('rongzi.title'), icon: '/static/image/index/logo4.png', url: '/subPackages/index/rongzi/rongzi' }
{ label: t('rongzi.title'), icon: '/static/image/index/logo4.png', url: '/subPackages/index/rongzi/rongzi' },
{ label: t('login.kefu'), icon: '/static/image/index/logo5.png', type: 'kefu' }
]
const gupiaoActive = ref(0)
......
src/pages/jiaoyi/jiaoyi.vue
......@@ -35,7 +35,7 @@
<div class="right">
<div class="price">
<view class="label">{{ t('jiaoyi.xianjia') }}：</view>
<view class="value" :class="{ red: item.yingkui > 0, green: item.yingkui <= 0 }">{{ qfw(item?.product?.price) }}</view>
<view class="value" :class="{ red: item.yingkui > 0, green: item.yingkui <= 0 }">{{ qfw(item?.product?.price) }}{{ t('common.unit') }}</view>
</div>
</div>
</div>
......@@ -53,7 +53,7 @@
<div class="row">
<div class="flex">
<view class="label">{{ t('jiaoyi.goumaijiage') }}</view>
<view class="value">{{ qfw(item.price) }}</view>
<view class="value">{{ qfw(item.price) }}{{ t('common.unit') }}</view>
</div>
<div class="flex">
<view class="label">{{ t('jiaoyi.yugusunyi') }}</view>
......@@ -94,7 +94,7 @@
<div class="right">
<div class="price">
<view class="label">{{ t('jiaoyi.xianzaijiage') }}：</view>
<view class="value" :class="{ red: item.yingkui > 0, green: item.yingkui <= 0 }">{{ qfw(item?.sellprice) }}</view>
<view class="value" :class="{ red: item.yingkui > 0, green: item.yingkui <= 0 }">{{ qfw(item?.sellprice) }}{{ t('common.unit') }}</view>
</div>
</div>
</div>
......@@ -112,7 +112,7 @@
<div class="row">
<div class="flex">
<view class="label">{{ t('jiaoyi.goumaijiage') }}</view>
<view class="value">{{ qfw(item.price) }}</view>
<view class="value">{{ qfw(item.price) }}{{ t('common.unit') }}</view>
</div>
<div class="flex">
<view class="label">{{ t('jiaoyi.yugusunyi2') }}</view>
......@@ -148,7 +148,7 @@
<div class="row">
<div class="flex">
<view class="label">{{ t('jiaoyi.jiage') }}</view>
<view class="value">{{ changeMoney(item.price) }}</view>
<view class="value">{{ changeMoney(item.price) }}{{ t('common.unit') }}</view>
</div>
<div class="flex">
<view class="label">{{ t('jiaoyi.zhognqianshuliang') }}</view>
......
src/pages/user/user.vue
......@@ -24,7 +24,7 @@
<van-icon v-else name="eye-o" color="#fff" size="20" class="showIcon" @click="isShowInfo = !isShowInfo" />
</view>
<span v-if="!isShowInfo" class="zichan-box-money">******</span>
<span v-else class="zichan-box-money">{{ Number(store.$state.userInfo?.total).toLocaleString() || 0 }}</span>
<span v-else class="zichan-box-money">{{ Number(store.$state.userInfo?.total).toLocaleString() || 0 }}{{ t('common.unit') }}</span>
</view>
</view>
</view>
......@@ -42,15 +42,15 @@
<image :src="recharge" mode="" />
<div class="label">{{ t('user.chongzhi') }}</div>
</div>
<div class="button" @click="goPage('/subPackages/withdrawal/withdrawal')">
<!-- <div class="button" @click="goPage('/subPackages/withdrawal/withdrawal')">
<image :src="withdraw" mode="" />
<div class="label">{{ t('user.tixian') }}</div>
</div>
</div> -->
</view>
</view>
<view class="page-list-box">
<view v-for="(item, i) in pageListArr" :key="i" class="page-list-item" @click="item.name === 'user.zhuxiao' ? store.clearState() : goPage(item.url, i == 5 ? true : false)">
<view v-for="(item, i) in pageListArr" :key="i" class="page-list-item" @click="item.name === 'user.zhuxiao' ? store.clearState() : goPage(item.url, item.isKefu ? true : false)">
<view style="display: flex; align-items: center">
<div class="image_wrap">
<image class="page-list-item-icon" :src="item.imgUrl" />
......@@ -74,7 +74,7 @@ import { getCzhiurlApi } from '@/api/user'
import { changeMoney } from '@/common/common'
import set from '@/static/image/user/set.png'
import recharge from '@/static/image/user/recharge.png'
import withdraw from '@/static/image/user/withdraw.png'
// import withdraw from '@/static/image/user/withdraw.png'
const store = useCounterStore()
// 基于准备好的dom，初始化echarts实例
......@@ -125,6 +125,11 @@ const pageListArr = [
url: '/subPackages/bankAccount/bankAccount'
},
{
name: 'user.tixian',
imgUrl: '/static/image/user/withdraw.png',
url: '/subPackages/withdrawal/withdrawal'
},
{
name: 'user.shouru',
imgUrl: '/static/image/user/img2.png',
url: '/subPackages/transactionLog/transactionLog'
......@@ -147,7 +152,8 @@ const pageListArr = [
{
name: 'user.kefuzhongxin',
imgUrl: '/static/image/user/img6.png',
url: '/subPackages/customerService/customerService'
url: '/subPackages/customerService/customerService',
isKefu: true
},
// {
// name: 'user.qiehuanyuyan',
......@@ -180,7 +186,8 @@ const userAssetsInfo = ref([
{
t: 'user.beiyongzijin',
num: count_market,
tou: '#50F0AA'
tou: '#50F0AA',
unit: true
},
{
t: 'user.fudongsunyi',
......@@ -349,7 +356,8 @@ uni-view {
height: 0.94rem;
}
.button {
width: 8.13rem;
// width: 8.13rem;
width: 100%;
height: 3.75rem;
background: #fff;
border-radius: 0.38rem;
......
src/subPackages/index/gupiaoDetail/gupiaoDetail.vue
......@@ -105,8 +105,8 @@
<div class="row_group">
<view class="row">
<view class="label">{{ t('gupiaoDetail.windowLabel1') }}</view>
<view v-if="buyGupiaoParams.buytype == 0" class="value">{{ gupiaoDetail.price ? changeMoney(gupiaoDetail.price) : '-' }}</view>
<view v-else class="value">{{ price ? changeMoney(price) : gupiaoDetail.price ? changeMoney(gupiaoDetail.price) : '-' }}</view>
<view v-if="buyGupiaoParams.buytype == 0" class="value">{{ gupiaoDetail.price ? changeMoney(gupiaoDetail.price) : '-' }}{{ t('common.unit') }}</view>
<view v-else class="value">{{ price ? changeMoney(price) : gupiaoDetail.price ? changeMoney(gupiaoDetail.price) : '-' }}{{ t('common.unit') }}</view>
</view>
<view class="row">
<view class="label">{{ t('gupiaoDetail.windowLabel2') }}</view>
......@@ -114,47 +114,55 @@
</view>
<view class="row">
<view class="label">{{ t('gupiaoDetail.windowLabel3') }}</view>
<view v-if="buyGupiaoParams.buytype == 0" class="value">{{
gupiaoDetail.price !== '-'
? userMoneyInfo.peizi_data === '1'
? changeMoney((gupiaoDetail.price * buyGupiaoParams.shuliang) / buyGupiaoParams.ganggan_ratio)
: changeMoney(gupiaoDetail.price * buyGupiaoParams.shuliang)
: '-'
}}</view>
<view v-else class="value">{{
price !== ''
? buyGupiaoParams.price
<view v-if="buyGupiaoParams.buytype == 0" class="value"
>{{
gupiaoDetail.price !== '-'
? userMoneyInfo.peizi_data === '1'
? changeMoney((price * buyGupiaoParams.shuliang) / buyGupiaoParams.ganggan_ratio)
: changeMoney(price * buyGupiaoParams.shuliang)
? changeMoney((gupiaoDetail.price * buyGupiaoParams.shuliang) / buyGupiaoParams.ganggan_ratio)
: changeMoney(gupiaoDetail.price * buyGupiaoParams.shuliang)
: '-'
: gupiaoDetail.price !== '-'
? userMoneyInfo.peizi_data === '1'
? changeMoney((gupiaoDetail.price * buyGupiaoParams.shuliang) / buyGupiaoParams.ganggan_ratio)
: changeMoney(gupiaoDetail.price * buyGupiaoParams.shuliang)
: '-'
}}</view>
}}{{ t('common.unit') }}</view
>
<view v-else class="value"
>{{
price !== ''
? buyGupiaoParams.price
? userMoneyInfo.peizi_data === '1'
? changeMoney((price * buyGupiaoParams.shuliang) / buyGupiaoParams.ganggan_ratio)
: changeMoney(price * buyGupiaoParams.shuliang)
: '-'
: gupiaoDetail.price !== '-'
? userMoneyInfo.peizi_data === '1'
? changeMoney((gupiaoDetail.price * buyGupiaoParams.shuliang) / buyGupiaoParams.ganggan_ratio)
: changeMoney(gupiaoDetail.price * buyGupiaoParams.shuliang)
: '-'
}}{{ t('common.unit') }}</view
>
</view>
<view class="row">
<view class="label">{{ t('gupiaoDetail.windowLabel4') }}</view>
<view class="value">{{ gupiaoDetail.price !== '-' ? changeMoney(gupiaoDetail.price * buyGupiaoParams.shuliang) : '-' }}</view>
<view class="value">{{ gupiaoDetail.price !== '-' ? changeMoney(gupiaoDetail.price * buyGupiaoParams.shuliang) : '-' }}{{ t('common.unit') }}</view>
</view>
<view class="row">
<view class="label">{{ t('gupiaoDetail.windowLabel6') }}</view>
<view v-if="buyGupiaoParams.buytype === 0" class="value">{{ userMoneyInfo.peizi_data === '1' ? changeMoney(heji / buyGupiaoParams.ganggan_ratio) : changeMoney(heji) }}</view>
<view v-else class="value">{{
price === ''
? userMoneyInfo.peizi_data === '1'
? changeMoney((gupiaoDetail.price * (buyGupiaoParams.shuliang || 0)) / buyGupiaoParams.ganggan_ratio)
: changeMoney(gupiaoDetail.price * (buyGupiaoParams.shuliang || 0))
: userMoneyInfo.peizi_data === '1'
? changeMoney((price * (buyGupiaoParams.shuliang || 0)) / buyGupiaoParams.ganggan_ratio)
: changeMoney(price * (buyGupiaoParams.shuliang || 0))
}}</view>
<view v-if="buyGupiaoParams.buytype === 0" class="value"
>{{ userMoneyInfo.peizi_data === '1' ? changeMoney(heji / buyGupiaoParams.ganggan_ratio) : changeMoney(heji) }}{{ t('common.unit') }}</view
>
<view v-else class="value"
>{{
price === ''
? userMoneyInfo.peizi_data === '1'
? changeMoney((gupiaoDetail.price * (buyGupiaoParams.shuliang || 0)) / buyGupiaoParams.ganggan_ratio)
: changeMoney(gupiaoDetail.price * (buyGupiaoParams.shuliang || 0))
: userMoneyInfo.peizi_data === '1'
? changeMoney((price * (buyGupiaoParams.shuliang || 0)) / buyGupiaoParams.ganggan_ratio)
: changeMoney(price * (buyGupiaoParams.shuliang || 0))
}}{{ t('common.unit') }}</view
>
</view>
<view class="row">
<view class="label">{{ t('gupiaoDetail.windowLabel7') }}</view>
<view class="value">{{ changeMoney(userMoneyInfo.money) }}</view>
<view class="value">{{ changeMoney(userMoneyInfo.money) }}{{ t('common.unit') }}</view>
</view>
</div>
<view class="button" @click="buyGupiao">{{ t('gupiaoDetail.submit') }}</view>
......@@ -565,21 +573,26 @@ button {
flex-wrap: wrap;
// gap: 10%;
.row {
width: 50%;
// width: 50%;
}
}
.title {
text-align: center;
padding: 0.8rem 0 0.5rem;
font-size: 1rem;
width: 100% !important;
}
.row {
display: flex;
justify-content: space-between;
padding: 0.64rem 0.56rem;
view {
width: 55%;
&:nth-child(2n-1) {
width: 45%;
}
> view {
color: $color-black;
font-size: 0.81rem;
font-size: 0.73rem;
}
.label {
color: $color-gray;
......
src/subPackages/index/rongzi/rongzi.vue
......@@ -552,6 +552,7 @@ input::placeholder {
color: #fff;
font-weight: 500;
border-radius: 0.5rem;
margin-bottom: 15px;
}
.last {
......
src/subPackages/indexLoading/indexLoading.vue
......@@ -13,7 +13,7 @@ import { onHide, onShow } from '@dcloudio/uni-app'
import { reactive, Ref, ref } from 'vue'
import { useI18n } from 'vue-i18n'
import { check_token } from '@/api/index'
import bg from '@/static/loading.png'
import bg from '@/static/loading2.png'
const { t } = useI18n()
// const store = useCounterStore()
......
src/subPackages/login/login.vue
......@@ -17,6 +17,7 @@
<view class="button" @click="login">{{ t('login.button_text') }}</view>
<view class="text" @click="goPage('/subPackages/register/register')">{{ t('login.register') }}</view>
<view class="button circle_button" @click="goPage('/subPackages/register/register')">{{ t('register.tip4') }}</view>
<view class="text" @click="openKefu()">{{ t('login.kefu') }}</view>
</view>
</view>
</view>
......@@ -52,6 +53,10 @@ const getCzhiurlFn = async () => {
}
}
const openKefu = () => {
window.open(kefu_url.value)
}
const checkArr = [
{ key: 'account', message: t('login.account_error') },
{ key: 'password', message: t('login.password_error') }
......
src/subPackages/withdrawal/withdrawal.vue
......@@ -134,7 +134,7 @@ const sumbit = async () => {
</van-popup>
<Navigator :title="t('user.tixian')" />
<view class="top-money">
<span>{{ t('withdrawal.zhanghuyue') }}</span> {{ Number(store.$state.userInfo?.money).toLocaleString() }}
<span>{{ t('withdrawal.zhanghuyue') }}</span> {{ Number(store.$state.userInfo?.money).toLocaleString() }}{{ t('common.unit') }}
</view>
<view class="box">
<view v-if="bankDataList.length === 0" class="bank-crad" @click="goPage('/subPackages/bankAccount/bankAccount')">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment