Przeglądaj źródła

Merge branch 'ctt_dev_new' into dev

dev
chutingting 1 rok temu
rodzic
commit
17064ca715
10 zmienionych plików z 236 dodań i 88 usunięć
  1. +75
    -0
      src/lang/package/en.ts
  2. +75
    -0
      src/lang/package/zh-cn.ts
  3. +0
    -2
      src/types/auto-imports.d.ts
  4. +9
    -9
      src/views/apiManage/businessCheck.vue
  5. +2
    -2
      src/views/apiManage/model.vue
  6. +12
    -12
      src/views/userManage/rechargeList.vue
  7. +9
    -9
      src/views/userManage/userMouldList.vue
  8. +11
    -11
      src/views/userManage/userVoiceList.vue
  9. +41
    -41
      src/views/userManage/videoList.vue
  10. +2
    -2
      src/views/userManage/voiceMould.vue

+ 75
- 0
src/lang/package/en.ts Wyświetl plik

@@ -318,5 +318,80 @@ export default {
chineseName: 'Chinese name',
cancel: 'Cancel',
confirm: 'Confirm association'
},
rechargeList: {
phone: 'phone',
phonePlaceholder: 'Please enter your phone number',
search: 'search',
productName: 'product name',
productNamePlaceholder: 'Please enter the product name',
time: 'Recharge time period',
orderNumber: 'Order No',
payVendor: 'Payment method',
orderPriceStr: 'Payment amount',
createDate: 'CreateTime'
},
userMouldList: {
phone: 'phone',
phonePlaceholder: 'Please enter your phone number',
search: 'search',
coverImg: 'Cover Image',
mouldSmId: 'Template number',
mouldSmIdPlaceholder: 'Please enter the template number',
bindPhone: 'Bind phone number',
createDate: 'CreateTime'
},
userVoiceList: {
phone: 'phone',
phonePlaceholder: 'Please enter your phone number',
mouldSmId: 'Template number',
mouldSmIdPlaceholder: 'Please enter the template number',
search: 'search',
lang: 'language',
country: 'country',
enName: 'English name',
chineseName: 'Chinese name',
bindPhone: 'Bind phone number',
createDate: 'CreateTime'
},
videoList: {
phone: 'phone',
phonePlaceholder: 'Please enter your phone number',
text: 'text',
textPlaceholder: 'Please enter text',
type: 'type',
typePlaceholder: 'Please select a type',
portrait: 'Portrait',
transversePlate: 'horizontal version',
status: 'status',
statusPlaceholder: 'Please select a status',
notDeleted: 'Not deleted',
deleted: 'Deleted',
time: 'Create time period',
search: 'search',
title: 'Video Title',
coverImg: 'Cover Image',
videoPlayUrl: 'Video address',
videoTime: 'Video duration',
videoSize: 'Video size',
videoMsg: 'Video Generation Information',
costPoints: 'Consumption coins',
costPointsDetail: 'Consumption Gold Coin Details',
createDate: 'CreateTime',
view: 'view',
del: 'delete',
videoDetail: 'Video Details',
name: 'name',
videType: 'Video type',
close: 'Close'
},
businessCheck: {
detail: 'Key details',
copy: 'copy',
status: 'Key Status',
normal: 'normal',
loseEfficacy: 'lose efficacy',
restore: 'restore',
cancel: 'cancel'
}
};

+ 75
- 0
src/lang/package/zh-cn.ts Wyświetl plik

@@ -317,5 +317,80 @@ export default {
chineseName: '中文名称',
cancel: '取消',
confirm: '确认关联'
},
rechargeList: {
phone: '手机号',
phonePlaceholder: '请输入手机号',
search: '查询',
productName: '商品名称',
productNamePlaceholder: '请输入商品名',
time: '充值时间段',
orderNumber: '订单号',
payVendor: '支付方式',
orderPriceStr: '支付金额',
createDate: '创建时间'
},
userMouldList: {
phone: '手机号',
phonePlaceholder: '请输入手机号',
search: '查询',
coverImg: '封面图',
mouldSmId: '模版号',
mouldSmIdPlaceholder: '请输入模版号',
bindPhone: '绑定手机号',
createDate: '创建时间'
},
userVoiceList: {
phone: '手机号',
phonePlaceholder: '请输入手机号',
mouldSmId: '模版号',
mouldSmIdPlaceholder: '请输入模版号',
search: '查询',
lang: '语言',
country: '国家',
enName: '英文名称',
chineseName: '中文名称',
bindPhone: '绑定手机号',
createDate: '创建时间'
},
videoList: {
phone: '手机号',
phonePlaceholder: '请输入手机号',
text: '文本',
textPlaceholder: '请输入文本',
type: '类型',
typePlaceholder: '请选择类型',
portrait: '竖版',
transversePlate: '横版',
status: '状态',
statusPlaceholder: '请选择状态',
notDeleted: '未删除',
deleted: '已删除',
time: '创建时间段',
search: '查询',
title: '视频标题',
coverImg: '封面图',
videoPlayUrl: '视频地址',
videoTime: '视频时长',
videoSize: '视频大小',
videoMsg: '视频生成信息',
costPoints: '消耗金币',
costPointsDetail: '消耗金币明细',
createDate: '创建时间',
view: '查看',
del: '删除',
videoDetail: '视频详情',
name: '名称',
videType: '视频类型',
close: '关闭'
},
businessCheck: {
detail: '密钥详情',
copy: '复制',
status: '密钥状态',
normal: '正常',
loseEfficacy: '失效',
restore: '恢复',
cancel: '作废'
}
};

+ 0
- 2
src/types/auto-imports.d.ts Wyświetl plik

@@ -2,7 +2,6 @@
export {}
declare global {
const EffectScope: typeof import('vue')['EffectScope']
const ElForm: typeof import('element-plus/es')['ElForm']
const ElMessage: typeof import('element-plus/es')['ElMessage']
const ElMessageBox: typeof import('element-plus/es')['ElMessageBox']
const asyncComputed: typeof import('@vueuse/core')['asyncComputed']
@@ -271,7 +270,6 @@ import { UnwrapRef } from 'vue'
declare module 'vue' {
interface ComponentCustomProperties {
readonly EffectScope: UnwrapRef<typeof import('vue')['EffectScope']>
readonly ElForm: UnwrapRef<typeof import('element-plus/es')['ElForm']>
readonly ElMessage: UnwrapRef<typeof import('element-plus/es')['ElMessage']>
readonly ElMessageBox: UnwrapRef<typeof import('element-plus/es')['ElMessageBox']>
readonly asyncComputed: UnwrapRef<typeof import('@vueuse/core')['asyncComputed']>


+ 9
- 9
src/views/apiManage/businessCheck.vue Wyświetl plik

@@ -1,7 +1,7 @@
<template>
<div class="page flex justify-around">
<div class="card">
<div class="title">密钥详情</div>
<div class="title">{{ $t("businessCheck.detail") }}</div>
<div class="key">
<span class="text">{{ $t("keyMangage.name") }}:{{ name }}</span>
</div>
@@ -10,7 +10,7 @@
<span class="text">appId:{{ showCode }}</span>
<span class="showOrHide" @click="showHideCode">{{ showText }}</span>
<span v-if="showText == '隐藏'" class="copy" @click="copyKey(showCode)"
>复制</span
>{{ $t("businessCheck.copy") }}</span
>
</div>
<!-- appKey -->
@@ -21,7 +21,7 @@
v-if="showTextII == '隐藏'"
class="copy"
@click="copyKey(showCodeII)"
>复制</span
>{{ $t("businessCheck.copy") }}</span
>
</div>
<!-- signKey -->
@@ -31,18 +31,18 @@
showTextIII
}}</span>
<span v-if="showTextIII == '隐藏'" class="copy" @click="copyKey"
>复制</span
>{{ $t("businessCheck.copy") }}</span
>
</div>
<div class="keyStatus">
<span class="text"
>密钥状态
<span v-if="!keyStatus" style="color: #36db43">正常</span>
<span v-else style="color: #ff0000">失效</span>
>{{ $t("businessCheck.status") }}
<span v-if="!keyStatus" style="color: #36db43">{{ $t("businessCheck.normal") }}</span>
<span v-else style="color: #ff0000">{{ $t("businessCheck.loseEfficacy") }}</span>
</span>
<span v-if="keyStatus" class="fail" @click="changeStatus(0)">恢复</span>
<span v-if="keyStatus" class="fail" @click="changeStatus(0)">{{ $t("businessCheck.restore") }}</span>
<span v-if="!keyStatus" class="success" @click="changeStatus(1)"
>作废</span
>{{ $t("businessCheck.cancel") }}</span
>
</div>
</div>


+ 2
- 2
src/views/apiManage/model.vue Wyświetl plik

@@ -8,9 +8,9 @@
</el-checkbox-group>
<div style="margin-top: 20px">
<el-button @click="handleClose"
>取消</el-button
>{{ $t('personMould.cancel') }}</el-button
>
<el-button type="primary" @click="addModel()">确认关联</el-button>
<el-button type="primary" @click="addModel()">{{ $t('personMould.confirm') }}</el-button>
</div>
</div>
</template>


+ 12
- 12
src/views/userManage/rechargeList.vue Wyświetl plik

@@ -2,13 +2,13 @@
<div class="page justify-around">
<div class="addbtn">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="手机号">
<el-input v-model="formInline.phone" placeholder="请输入手机号" clearable />
<el-form-item :label="$t('rechargeList.phone')">
<el-input v-model="formInline.phone" :placeholder="$t('rechargeList.phonePlaceholder')" clearable />
</el-form-item>
<el-form-item label="商品名">
<el-input v-model="formInline.mouldSmIdLike" placeholder="请输入商品名" clearable />
<el-form-item :label="$t('rechargeList.productName')">
<el-input v-model="formInline.mouldSmIdLike" :placeholder="$t('rechargeList.productNamePlaceholder')" clearable />
</el-form-item>
<el-form-item label="充值时间段">
<el-form-item :label="$t('rechargeList.time')">
<el-date-picker
v-model="formInline.time"
type="daterange"
@@ -20,7 +20,7 @@
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getListData()">查询</el-button>
<el-button type="primary" @click="getListData()">{{ $t('rechargeList.search') }}</el-button>
</el-form-item>
</el-form>
</div>
@@ -34,18 +34,18 @@
>
<el-table-column
prop="orderNumber"
label="订单号"
:label="$t('rechargeList.orderNumber')"
align="center"
/>
<el-table-column
prop="productTitle"
label="商品名称"
:label="$t('rechargeList.productName')"
align="center"
/>
<el-table-column
prop="payVendor"
label="支付方式"
:label="$t('rechargeList.payVendor')"
align="center"
>
<template #default="scope">
@@ -54,12 +54,12 @@
</el-table-column>
<el-table-column
prop="orderPriceStr"
label="支付金额"
:label="$t('rechargeList.orderPriceStr')"
align="center"
/>
<el-table-column
prop="phone"
label="手机号"
:label="$t('rechargeList.phone')"
align="center"
>
<template #default="scope">
@@ -69,7 +69,7 @@
<el-table-column
prop="createDate"
label="创建时间"
:label="$t('rechargeList.createDate')"
align="center"
>
<template #default="scope">


+ 9
- 9
src/views/userManage/userMouldList.vue Wyświetl plik

@@ -2,14 +2,14 @@
<div class="page justify-around">
<div class="addbtn">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="手机号">
<el-input v-model="formInline.phone" placeholder="请输入手机号" clearable />
<el-form-item :label="$t('userMouldList.phone')">
<el-input v-model="formInline.phone" :placeholder="$t('userMouldList.phonePlaceholder')" clearable />
</el-form-item>
<el-form-item label="模版号">
<el-input v-model="formInline.mouldSmIdLike" placeholder="请输入模版号" clearable />
<el-form-item :label="$t('userMouldList.mouldSmId')">
<el-input v-model="formInline.mouldSmIdLike" :placeholder="$t('userMouldList.mouldSmIdPlaceholder')" clearable />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getListData()">查询</el-button>
<el-button type="primary" @click="getListData()">{{$t('userMouldList.search')}}</el-button>
</el-form-item>
</el-form>
</div>
@@ -23,7 +23,7 @@
>
<el-table-column
prop="coverImg"
label="封面图"
:label="$t('userMouldList.coverImg')"
align="center"
>
<template #default="scope">
@@ -33,12 +33,12 @@
<el-table-column
prop="mouldSmId"
label="模版号"
:label="$t('userMouldList.mouldSmId')"
align="center"
/>
<el-table-column
prop="wxCUserBasicInfoList"
label="绑定手机号"
:label="$t('userMouldList.bindPhone')"
align="center"
>
<template #default="scope">
@@ -48,7 +48,7 @@
<el-table-column
prop="createDate"
label="创建时间"
:label="$t('userMouldList.createDate')"
align="center"
>
<template #default="scope">


+ 11
- 11
src/views/userManage/userVoiceList.vue Wyświetl plik

@@ -2,14 +2,14 @@
<div class="page justify-around">
<div class="addbtn">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="手机号">
<el-input v-model="formInline.phone" placeholder="请输入手机号" clearable />
<el-form-item :label="$t('userVoiceList.phone')">
<el-input v-model="formInline.phone" :placeholder="$t('userVoiceList.phonePlaceholder')" clearable />
</el-form-item>
<el-form-item label="模版号">
<el-input v-model="formInline.mouldSmIdLike" placeholder="请输入模版号" clearable />
<el-form-item :label="$t('userVoiceList.mouldSmId')">
<el-input v-model="formInline.mouldSmIdLike" :placeholder="$t('userVoiceList.mouldSmIdPlaceholder')" clearable />
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getListData()"> 查询</el-button>
<el-button type="primary" @click="getListData()"> {{ $t('userVoiceList.search') }}</el-button>
</el-form-item>
</el-form>
</div>
@@ -23,29 +23,29 @@
>
<el-table-column
prop="name"
label="英文名称"
:label="$t('userVoiceList.enName')"
align="center"
/>

<el-table-column
prop="chineseName"
label="中文名称"
:label="$t('userVoiceList.chineseName')"
align="center"
/>
<el-table-column
prop="country"
label="国家"
:label="$t('userVoiceList.country')"
align="center"
/>
<el-table-column
prop="language"
label="语言"
:label="$t('userVoiceList.lang')"
align="center"
/>

<el-table-column
prop="wxCUserBasicInfoList"
label="绑定手机号"
:label="$t('userVoiceList.bindPhone')"
align="center"
>
<template #default="scope">
@@ -55,7 +55,7 @@

<el-table-column
prop="createDate"
label="创建时间"
:label="$t('userVoiceList.createDate')"
align="center"
>
<template #default="scope">


+ 41
- 41
src/views/userManage/videoList.vue Wyświetl plik

@@ -2,33 +2,33 @@
<div class="page justify-around">
<div class="addbtn">
<el-form :inline="true" :model="formInline" class="demo-form-inline">
<el-form-item label="手机号">
<el-input v-model="formInline.phone" placeholder="请输入手机号" clearable />
<el-form-item :label="$t('videoList.phone')">
<el-input v-model="formInline.phone" :placeholder="$t('videoList.phonePlaceholder')" clearable />
</el-form-item>
<el-form-item label="文本">
<el-input v-model="formInline.paperwork" placeholder="请输入文本" clearable />
<el-form-item :label="$t('videoList.text')">
<el-input v-model="formInline.paperwork" :placeholder="$t('videoList.textPlaceholder')" clearable />
</el-form-item>
<el-form-item label="类型">
<el-form-item :label="$t('videoList.type')">
<el-select
v-model="formInline.videoType"
placeholder="请选择类型"
:placeholder="$t('videoList.typePlaceholder')"
clearable
>
<el-option label="竖版" value="1" />
<el-option label="横板" value="2" />
<el-option :label="$t('videoList.portrait')" value="1" />
<el-option :label="$t('videoList.transversePlate')" value="2" />
</el-select>
</el-form-item>
<el-form-item label="状态">
<el-form-item :label="$t('videoList.status')">
<el-select
v-model="formInline.isDel"
placeholder="请选择状态"
:placeholder="$t('videoList.statusPlaceholder')"
clearable
>
<el-option label="未删除" value="0" />
<el-option label="已删除" value="1" />
<el-option :label="$t('videoList.notDeleted')" value="0" />
<el-option :label="$t('videoList.deleted')" value="1" />
</el-select>
</el-form-item>
<el-form-item label="创建时间段">
<el-form-item :label="$t('videoList.time')">
<el-date-picker
v-model="formInline.time"
type="daterange"
@@ -40,7 +40,7 @@
/>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="getListData()">查询</el-button>
<el-button type="primary" @click="getListData()">{{ $t('videoList.search') }}</el-button>
</el-form-item>
</el-form>
</div>
@@ -54,7 +54,7 @@
>
<el-table-column
prop="videoType"
label="类型"
:label="$t('videoList.type')"
align="center"
>
<template #default="scope">
@@ -64,12 +64,12 @@
<el-table-column
prop="paperwork"
label="文本内容"
:label="$t('videoList.text')"
align="center"
/>
<el-table-column
prop="isDel"
label="状态"
:label="$t('videoList.status')"
align="center"
>
<template #default="scope">
@@ -78,12 +78,12 @@
</el-table-column>
<el-table-column
prop="title"
label="视频标题"
:label="$t('videoList.title')"
align="center"
/>
<el-table-column
prop="coverImg"
label="封面图"
:label="$t('videoList.coverImg')"
align="center"
>
<template #default="scope">
@@ -92,38 +92,38 @@
</el-table-column>
<el-table-column
prop="videoPlayUrl"
label="视频地址"
:label="$t('videoList.videoPlayUrl')"
align="center"
/>
<el-table-column
prop="videoTime"
label="视频时长"
:label="$t('videoList.videoTime')"
align="center"
>
</el-table-column>
<el-table-column
prop="videoSize"
label="视频大小"
:label="$t('videoList.videoSize')"
align="center"
/>
<el-table-column
prop="videoMsg"
label="视频生成信息"
:label="$t('videoList.videoMsg')"
align="center"
/>
<el-table-column
prop="costPoints"
label="消耗金币"
:label="$t('videoList.costPoints')"
align="center"
/>
<el-table-column
prop="costPointsDetail"
label="消耗金币明细"
:label="$t('videoList.costPointsDetail')"
align="center"
/>
<el-table-column
prop="createDate"
label="创建时间"
:label="$t('videoList.createDate')"
align="center"
>
<template #default="scope">
@@ -137,8 +137,8 @@
align="center"
>
<template #default="scope">
<el-button link type="primary" size="small" @click="showDetail(scope.row.id)">查看</el-button>
<el-button v-if="scope.row.isDel === 0" link type="primary" size="small" @click="confirmDel(scope.row.id)">删除</el-button>
<el-button link type="primary" size="small" @click="showDetail(scope.row.id)">{{$t('videoList.view')}}</el-button>
<el-button v-if="scope.row.isDel === 0" link type="primary" size="small" @click="confirmDel(scope.row.id)">{{$t('videoList.del')}}</el-button>
</template>
</el-table-column>
@@ -158,41 +158,41 @@
@current-change="handleCurrentChange"
/>
</div>
<el-dialog v-model="dialogVisible" v-if="dialogVisible" title="视频详情:" width="40%">
<el-dialog v-model="dialogVisible" v-if="dialogVisible" :title="`${$t('videoList.videoDetail')}:`" width="40%">
<el-form :model="form" label-width="120px">
<el-form-item label="名称">
<el-form-item :label="$t('videoList.name')">
<el-input v-model="form.title" />
</el-form-item>
<el-form-item label="视频类型">
<el-form-item :label="$t('videoList.videType')">
<el-radio-group v-model="form.videoType">
<el-radio :label="1">竖版</el-radio>
<el-radio :label="2">横版</el-radio>
<el-radio :label="1">{{$t('videoList.portrait')}}</el-radio>
<el-radio :label="2">{{$t('videoList.transversePlate')}}</el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="文案">
<el-form-item :label="$t('videoList.text')">
<el-input v-model="form.paperwork" type="textarea" />
</el-form-item>
<el-form-item label="封面图">
<el-form-item :label="$t('videoList.coverImg')">
<img :src="form.coverImg" alt="" style="width:100%;max-height: 200px;">
</el-form-item>
<el-form-item label="视频地址">
<el-form-item :label="$t('videoList.videoPlayUrl')">
<el-input v-model="form.videoPlayUrl" />
<!-- <video :src="form.videoPlayUrl" style="width:100%;max-height: 300px;"></video> -->
</el-form-item>
<el-form-item label="视频时长">
<el-form-item :label="$t('videoList.videoTime')">
<el-input v-model="form.videoTime" />
</el-form-item>
<el-form-item label="创建时间">
<el-form-item :label="$t('videoList.createDate')">
<el-input v-model="form.createDate" />
</el-form-item>
<el-form-item label="消耗金币">
<el-form-item :label="$t('videoList.costPoints')">
<el-input v-model="form.costPoints" />
</el-form-item>
<el-form-item label="消耗金币明细">
<el-form-item :label="$t('videoList.costPointsDetail')">
<el-input v-model="form.costPointsDetail" />
</el-form-item>
<el-form-item>
<el-button @click="dialogVisible = false">关闭</el-button>
<el-button @click="dialogVisible = false">{{ $t('videoList.close') }}</el-button>
</el-form-item>
</el-form>
</el-dialog>


+ 2
- 2
src/views/userManage/voiceMould.vue Wyświetl plik

@@ -8,9 +8,9 @@
</el-checkbox-group>
<div style="margin-top: 20px">
<el-button @click="handleClose"
>取消</el-button
>{{ $t('personMould.cancel') }}</el-button
>
<el-button type="primary" @click="addModel()">确认关联</el-button>
<el-button type="primary" @click="addModel()">{{ $t('personMould.confirm') }}</el-button>
</div>
</div>
</template>


Ładowanie…
Anuluj
Zapisz