shayu/cai-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
ahanhanhan
2024-02-26 11:48:09 +08:00
parent 4aba1f1371 d71035da8e
commit 27ea0e6de4
4 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/views/cai/agreementSetting/index.vue
View File

@@ -13,6 +13,12 @@
<div v-if="!anchorJoinAgreement" v-html="form.anchorJoinAgreement" style="width: 98%" />
<editor v-if="anchorJoinAgreement" v-model="form.anchorJoinAgreement" :min-height="192"></editor>
</el-tab-pane>
<el-tab-pane label="隐私协议" name="privacyAgreement">
<el-button type="primary" size="mini" v-hasPermi="['cai:agreementSetting:edit']" v-if="!privacyAgreement" @click="showEdit('privacyAgreement')">编辑</el-button>
<el-button :loading="buttonLoading" v-if="privacyAgreement" type="primary" size="mini" @click="submitForm2('privacyAgreement')">保存</el-button>
<div v-if="!privacyAgreement" v-html="form.privacyAgreement" style="width: 98%" />
<editor v-if="privacyAgreement" v-model="form.privacyAgreement" :min-height="192"></editor>
</el-tab-pane>
</el-tabs>
</div>
</template>
@@ -35,6 +41,7 @@ export default {
id: undefined,
userAgreement:undefined,
anchorJoinAgreement:undefined,
privacyAgreement: undefined,
},
activeName:'loansAgreement',
// 表单校验
@@ -43,6 +50,7 @@ export default {
formDisable:true,
userAgreement:false,
anchorJoinAgreement:false,
privacyAgreement: false,
};
},
created() {

8
src/views/cai/anchor/anchor-info-dialog.vue
View File

@@ -28,8 +28,8 @@
<el-descriptions-item label="城市">
{{info.user.city}}
</el-descriptions-item>
<el-descriptions-item label="主播">
<cai-dict-tag :options="isAnchorList" :value="info.user.isAnchor" />
<el-descriptions-item label="昵称">
{{info.user.nickname}}
</el-descriptions-item>
<el-descriptions-item label="相册" :span="3" v-if="info.userAlbums">
<span v-for='val in info.userAlbums'>
@@ -39,8 +39,8 @@
<el-descriptions-item label="资料完成">
<cai-dict-tag :options="authList" :value="info.user.finishStatus" />
</el-descriptions-item>
<el-descriptions-item label="相册完成度">
<cai-dict-tag :options="authList" :value="info.user.photoStatus" />
<el-descriptions-item label="自定义头像">
<cai-dict-tag :options="authList" :value="info.user.avatarState" />
</el-descriptions-item>
<el-descriptions-item label="自拍认证">
<cai-dict-tag :options="authList" :value="info.user.cameraStatus" />

2
src/views/cai/anchorApply/index.vue
View File

@@ -54,7 +54,7 @@
<cai-dict-tag :options="genderList" :value="scope.row.gender"/>
</template>
</el-table-column>
<el-table-column label="申请时间" align="center" prop="auditTime" width="180"/>
<el-table-column label="申请时间" align="center" prop="createTime" width="180"/>
<el-table-column label="审核时间" align="center" prop="auditTime" width="180"/>
<!-- <el-table-column label="审核备注" align="center" prop="auditRemark"/>-->
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="220">

11
src/views/cai/user/user-info-dialog.vue
View File

@@ -27,8 +27,8 @@
<el-descriptions-item label="城市">
{{info.user.city}}
</el-descriptions-item>
<el-descriptions-item label="主播">
<cai-dict-tag :options="isAnchorList" :value="info.user.isAnchor" />
<el-descriptions-item label="昵称">
{{info.user.nickname}}
</el-descriptions-item>
<el-descriptions-item label="相册" :span="3" v-if="info.userAlbums">
<span v-for='val in info.userAlbums'>
@@ -38,8 +38,8 @@
<el-descriptions-item label="资料完成">
<cai-dict-tag :options="authList" :value="info.user.finishStatus" />
</el-descriptions-item>
<el-descriptions-item label="相册完成度">
<cai-dict-tag :options="authList" :value="info.user.photoStatus" />
<el-descriptions-item label="自定义头像">
<cai-dict-tag :options="authList" :value="info.user.avatarState" />
</el-descriptions-item>
<el-descriptions-item label="自拍认证">
<cai-dict-tag :options="authList" :value="info.user.cameraStatus" />
@@ -83,6 +83,9 @@
<el-descriptions-item label="注册时间">
{{info.userInfo.regTime}}
</el-descriptions-item>
<el-descriptions-item label="主播">
<cai-dict-tag :options="isAnchorList" :value="info.user.isAnchor" />
</el-descriptions-item>
</el-descriptions>
</el-collapse-item>
<el-collapse-item title="钱包" name="account">