Parcourir la source

Merge branch 'ctt_dev' into dev

dev
chutingting il y a 1 an
Parent
révision
a243eaa438
7 fichiers modifiés avec 134 ajouts et 44 suppressions
  1. +43
    -1
      src/lang/package/en.ts
  2. +42
    -0
      src/lang/package/zh-cn.ts
  3. +4
    -4
      src/layout/index.vue
  4. +2
    -2
      src/views/createVideo/index.vue
  5. +13
    -10
      src/views/my/coindeduc.vue
  6. +21
    -18
      src/views/my/recharge.vue
  7. +9
    -9
      src/views/myStore/index.vue

+ 43
- 1
src/lang/package/en.ts Voir le fichier

@@ -51,6 +51,7 @@ export default {
logout: "Logout",
goLogin: "Go and log in",
LanguageChange: "Language switching",
currencyValue: 'Current currency value'
},

// 创作视频
@@ -109,6 +110,7 @@ export default {
GeneratedText:'Generated Text',
SmartText:'Smart Text',
copy:'Copy to text',
custom: 'VIP'
},

// 我的视频
@@ -217,7 +219,7 @@ export default {
}
},
my: {
title: 'my',
title: 'My',
},

signSucceed: {
@@ -232,4 +234,44 @@ export default {
goLogin: "Login now",
reSend: "Resend",
},
recharge: {
title: 'Recharge order',
currencyValue: 'Current currency value',
productTitle: 'name',
orderNumber: 'Order No',
payment: 'amount of money',
createTime: 'Creation time',
operate: 'operate',
view: 'view',
detailTitle: 'Recharge Details',
payVendor: 'Payment method',
weChat: 'WeChat',
alipay: 'Alipay',
paymentStr: 'Payment amount',
orderStatus: 'Payment status',
paymentTime: 'Pay time',
close: 'close'
},
coindeduc: {
title: 'Coin deduction order',
currencyValue: 'Current currency value',
titleList: 'name',
videoPlayUrl: 'Video address',
videoTime: 'Video duration',
costPoints: 'Deduction quantity',
createTime: 'Creation time',
operate: 'operate',
view: 'view',
detailTitle: 'Deduction Details',
second: 'S'
},
store: {
priceRmb: 'original price',
glod: 'currency value',
createOrder: 'Create Order',
payType:'Choose payment method',
cancel: 'Cancel',
confirm: 'Confirm',
pay: 'Payment in progress...',
}
};

+ 42
- 0
src/lang/package/zh-cn.ts Voir le fichier

@@ -52,6 +52,7 @@ export default {
logout: "注销",
goLogin: "登录",
LanguageChange: "语言切换",
currencyValue: '当前币值'
},

// 创作视频
@@ -110,6 +111,7 @@ export default {
GeneratedText:'生成文本',
SmartText:'智能文本',
copy:'复制到文案',
custom: '私人订制'
},

// 我的视频
@@ -231,4 +233,44 @@ export default {
goLogin: "即将登录",
reSend: "重新发送",
},
recharge: {
title: '充值订单',
currencyValue: '当前币值',
productTitle: '名称',
orderNumber: '订单号',
payment: '金额',
createTime: '创建时间',
operate: '操作',
view: '查看',
detailTitle: '充值详情',
payVendor: '支付方式',
weChat: '微信',
alipay: '支付宝',
paymentStr: '支付金额',
orderStatus: '支付状态',
paymentTime: '支付时间',
close: '关闭'
},
coindeduc: {
title: '扣币订单',
currencyValue: '当前币值',
titleList: '名称',
videoPlayUrl: '视频地址',
videoTime: '视频时长',
costPoints: '扣币数量',
createTime: '创建时间',
operate: '操作',
view: '查看',
detailTitle: '扣币详情',
second: '秒'
},
store: {
priceRmb: '原价',
glod: '币值',
createOrder: '创建订单',
payType:'选择支付方式',
cancel: '取消',
confirm: '确定',
pay: '支付中...',
}
};

+ 4
- 4
src/layout/index.vue Voir le fichier

@@ -69,11 +69,11 @@
<el-sub-menu index="2">
<template #title>
<el-icon><location /></el-icon>
<span>我的</span>
<span>{{ $t("my.title") }}</span>
</template>
<el-menu-item-group>
<el-menu-item index="2-1" @click="router.push('/myRecharge')">充值订单</el-menu-item>
<el-menu-item index="2-2" @click="router.push('/coindeduc')">扣币订单</el-menu-item>
<el-menu-item index="2-1" @click="router.push('/myRecharge')">{{ $t("recharge.title") }} </el-menu-item>
<el-menu-item index="2-2" @click="router.push('/coindeduc')">{{ $t("coindeduc.title") }} </el-menu-item>
</el-menu-item-group>
</el-sub-menu>
</el-menu>
@@ -84,7 +84,7 @@
<div class="rightBox">
<!-- nav栏 -->
<div class="nav">
<div class="navItem">当前币值:{{ currentValue }}</div>
<div class="navItem">{{ $t("navbar.currencyValue") }}:{{ currentValue }}</div>
<!-- 语言 -->
<el-tooltip
style="cursor: pointer; z-index: 999"


+ 2
- 2
src/views/createVideo/index.vue Voir le fichier

@@ -294,7 +294,7 @@
@click="clickModelItem(item)"
>
<img class="boxCentreImg" :src="item.coverImg" alt="" />
<div v-if="item.customized === 1" class="subscript">私人定制</div>
<div v-if="item.customized === 1" class="subscript"> {{ $t("createVideo.custom") }}</div>
</div>
</div>
</div>
@@ -490,7 +490,7 @@
<span style="line-height: 20px">{{
lanChange == "zh-cn" ? item.chineseName : item.name
}}</span>
<span v-if="item.customized === 1" style="color:red">(私人订制)</span>
<span v-if="item.customized === 1" style="color:red">({{ $t("createVideo.custom") }})</span>
</el-option>
</el-select>
<p>{{ $t("createVideo.voices") }}</p>


+ 13
- 10
src/views/my/coindeduc.vue Voir le fichier

@@ -1,32 +1,32 @@
<template>
<div class="page justify-around">
<el-alert :title="`当前币值:${currentValue}`" type="success" :closable="false" />
<el-alert :title="`${$t('coindeduc.currencyValue')}:${currentValue}`" type="success" :closable="false" />

<el-table :data="tableData" style="width: 100%; height: 90%" size="large" align="center" border>
<el-table-column
prop="title"
label="名称"
:label="$t('coindeduc.titleList')"
align="center"
/>

<el-table-column
prop="videoPlayUrl"
label="视频地址"
:label="$t('coindeduc.videoPlayUrl')"
align="center"
/>
<el-table-column
prop="videoTime"
label="视频时长"
:label="$t('coindeduc.videoTime')"
align="center"
/>
<el-table-column
prop="costPoints"
label="扣币数量"
:label="$t('coindeduc.costPoints')"
align="center"
/>
<el-table-column
prop="createTime"
label="创建时间"
:label="$t('coindeduc.createTime')"
align="center"
>
<template #default="scope">
@@ -35,11 +35,11 @@
</el-table-column>
<el-table-column
fixed="right"
label="操作"
:label="$t('coindeduc.operate')"
align="center"
>
<template #default="scope">
<el-button link type="primary" size="small" @click="detailView(scope.row)">查看</el-button>
<el-button link type="primary" size="small" @click="detailView(scope.row)">{{ $t('coindeduc.view') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -58,7 +58,7 @@
@current-change="handleCurrentChange"
/>
</div>
<el-dialog v-model="dialogVisible" title="扣币详情:" width="40%" :before-close="handleClose" >
<el-dialog v-model="dialogVisible" :title="`${$t('coindeduc.detailTitle')}:`" width="40%" :before-close="handleClose" >
<el-form :model="form" label-width="120px">
<el-form-item label="名称">
<el-input v-model="form.title" />
@@ -104,6 +104,9 @@
//#region 导入
import { coindedApi, getDetailApi, getUserPoinsApi, findByIdApi } from '@/apis/my.js'
import dayjs from "dayjs";
import { useI18n } from "vue-i18n";
const { locale } = useI18n();
const lanChange = ref(locale);

const tableData = ref([]);

@@ -159,7 +162,7 @@ const form = ref({
function detailView(item) {
findByIdApi(item.id).then(res => {
res.data.createDate = getDate(res.data.createDate)
res.data.videoTime = res.data.videoTime + '(秒)'
res.data.videoTime = res.data.videoTime + (lanChange.value == "zh-cn" ? '(秒)' : '(S)')
form.value = res.data
dialogVisible.value = true
})


+ 21
- 18
src/views/my/recharge.vue Voir le fichier

@@ -1,28 +1,28 @@
<template>
<div class="page justify-around">
<el-alert :title="`当前币值:${currentValue}`" type="success" :closable="false" />
<el-alert :title="`${$t('recharge.currencyValue')}:${currentValue}`" type="success" :closable="false" />

<el-table :data="tableData" style="width: 100%; height: 90%" size="large" align="center" border>
<el-table-column
prop="productTitle"
label="名称"
:label="$t('recharge.productTitle')"
align="center"
/>

<el-table-column
prop="orderNumber"
label="订单号"
:label="$t('recharge.orderNumber')"
align="center"
/>
<el-table-column
prop="paymentStr"
label="金额"
:label="$t('recharge.payment')"
align="center"
/>
<el-table-column
prop="createTime"
label="创建时间"
:label="$t('recharge.createTime')"
align="center"
>
<template #default="scope">
@@ -31,11 +31,11 @@
</el-table-column>
<el-table-column
fixed="right"
label="操作"
:label="$t('recharge.operate')"
align="center"
>
<template #default="scope">
<el-button link type="primary" size="small" @click="detailView(scope.row)">查看</el-button>
<el-button link type="primary" size="small" @click="detailView(scope.row)">{{ $t('recharge.view') }}</el-button>
</template>
</el-table-column>
</el-table>
@@ -54,31 +54,31 @@
@current-change="handleCurrentChange"
/>
</div>
<el-dialog v-model="dialogVisible" title="充值详情:" width="40%" >
<el-dialog v-model="dialogVisible" :title="`${ $t('recharge.detailTitle')}:`" width="40%" >
<el-form :model="form" label-width="120px">
<el-form-item label="名称">
<el-form-item :label="$t('recharge.productTitle')">
<el-input v-model="form.productTitle" />
</el-form-item>
<el-form-item label="订单号">
<el-form-item :label="$t('recharge.orderNumber')">
<el-input v-model="form.orderNumber" />
</el-form-item>
<el-form-item label="支付方式">
<el-form-item :label="$t('recharge.payVendor')">
<el-radio-group v-model="form.payVendor">
<el-radio :label="2">微信</el-radio>
<el-radio :label="4">支付宝</el-radio>
<el-radio :label="2">{{ $t('recharge.weChat') }}</el-radio>
<el-radio :label="4">{{$t('recharge.alipay')}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="支付金额">
<el-form-item :label="$t('recharge.paymentStr')">
<el-input v-model="form.paymentStr" />
</el-form-item>
<el-form-item label="支付状态">
<el-form-item :label="$t('recharge.orderStatus')">
<el-input v-model="form.orderStatus" />
</el-form-item>
<el-form-item label="支付时间">
<el-form-item :label="$t('recharge.paymentTime')">
<el-input v-model="form.paymentTime" />
</el-form-item>
<el-form-item>
<el-button @click="dialogVisible = false">关闭</el-button>
<el-button @click="dialogVisible = false">{{ $t('recharge.close') }}</el-button>
</el-form-item>
</el-form>
</el-dialog>
@@ -90,6 +90,9 @@
//#region 导入
import { rechargeListApi, getDetailApi, getUserPoinsApi, findByNumberApi } from '@/apis/my.js'
import dayjs from "dayjs";
import { useI18n } from "vue-i18n";
const { locale } = useI18n();
const lanChange = ref(locale);

const tableData = ref([]);

@@ -145,7 +148,7 @@ const form = ref({
function detailView(item) {
findByNumberApi(item.id).then(res => {
res.data.paymentTime = getDate(res.data.paymentTime)
res.data.orderStatus = res.data.orderStatus === 3 ? '支付成功' : '支付失败'
res.data.orderStatus = res.data.orderStatus === 3 ? lanChange.value == "zh-cn" ? '支付成功' : 'Payment successful': lanChange.value == "zh-cn" ? '支付失败' : 'Payment failed'
form.value = res.data
dialogVisible.value = true
})


+ 9
- 9
src/views/myStore/index.vue Voir le fichier

@@ -16,14 +16,14 @@
<span class="price">{{
item.sellPriceRmb
}} ¥</span
>/ <span style="text-decoration:line-through;">原价{{ item.priceRmb }}</span>
>/ <span style="text-decoration:line-through;"> {{ $t("store.priceRmb") }}{{ item.priceRmb }}</span>
</div>
<div class="time">
币值<span>{{ item.glod }}</span
{{ $t("store.glod") }}<span>{{ item.glod }}</span
>
</div>
<div class="button" @click="createOrder(item)" :style="`background-color: #f3af00 ;`">
创建订单
{{ $t("store.createOrder") }}
</div>
</div>
<!-- 商品权益 -->
@@ -80,14 +80,14 @@
</div>
<!-- 对话框 v-if="false"-->
<el-dialog v-model="showPayDialog" v-if="showPayDialog"
title="选择支付方式" width="300px">
:title="$t('store.payType')" width="300px">
<div class="payDialog">
<el-radio-group v-model="payVendor">
<el-radio label="4" border>
<img src="../../assets/img/alipay.png" alt="" />支付宝
<img src="../../assets/img/alipay.png" alt="" />{{ $t("recharge.alipay") }}
</el-radio>
<el-radio label="2" border>
<img src="../../assets/img/weChat.png" alt="" />微信
<img src="../../assets/img/weChat.png" alt="" />{{ $t("recharge.weChat") }}
</el-radio>
</el-radio-group>
</div>
@@ -101,7 +101,7 @@
:close-on-click-modal="false"
>
<div class="orderCodeDialog" v-loading="loading"
element-loading-text="支付中...">
:element-loading-text="`${$t('store.pay')}`">
<div class="codeImg">
<my-Loading-Icon2
v-if="!payCodeUrl && !iframeBody"
@@ -132,9 +132,9 @@
</el-dialog>
<template #footer>
<span class="dialog-footer">
<el-button size="small" @click="showPayDialog = false">取消</el-button>
<el-button size="small" @click="showPayDialog = false">{{ $t("store.cancel") }}</el-button>
<el-button size="small" type="primary" @click="payConfirm">
确定
{{$t("store.confirm")}}
</el-button>
</span>
</template>


Chargement…
Annuler
Enregistrer