gxwebsoft/template-10490
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复：用户资料及认证提交页面，需求定制页面

Browse Source
This commit is contained in:
赵忠林
2025-02-15 18:38:21 +08:00
parent ca3b5a296e
commit 9081e41188
29 changed files with 925 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/detail/[id].vue
View File

@@ -7,7 +7,7 @@
<span class="font-600 mr-3"> 文章详情 </span>
</template>
<el-card shadow="hover" class=" my-5 px-2">
<el-card shadow="hover" class=" my-10 px-2">
<!-- 新闻详细 -->
<div class=" bg-white">

2
pages/index.vue
View File

@@ -3,7 +3,7 @@
<Flash/>
<CompanyList :param="{official: true,recommend: true,limit: 4}" :fit="`cover`" />
<CompanyList title="产品服务" :param="{official: true,recommend: true,limit: 4}" :fit="`cover`" />
</template>
<script setup lang="ts">

2
pages/item/[id].vue
View File

@@ -205,7 +205,7 @@ const reload = async () => {
page.value = {
image: data.websiteLogo,
title: data.websiteName,
categoryName: '应用市场',
categoryName: '插件市场',
...data,
}

10
pages/m/index.vue
View File

@@ -154,11 +154,11 @@ await getSiteInfo({
lang: i18n.locale.value
}).then(data => {
website.value = data
topNavs.value = data.topNavs?.filter(d => d.title === '产品系列' || d.title === 'Product')
if(topNavs.value[0].children){
cpCategory.value = topNavs.value[0].children;
}
caseCategory.value = data.topNavs?.filter(d => d.title === '项目展示' || d.title === 'Case')[0].children
// topNavs.value = data.topNavs?.filter(d => d.title === '产品系列' || d.title === 'Product')
// if(topNavs.value[0].children){
// cpCategory.value = topNavs.value[0].children;
// }
// caseCategory.value = data.topNavs?.filter(d => d.title === '项目展示' || d.title === 'Case')[0].children
})
const reload = async () => {

2
pages/market/[id].vue
View File

@@ -207,7 +207,7 @@ const reload = async () => {
page.value = {
image: data.websiteLogo,
title: data.websiteName,
categoryName: '应用市场',
categoryName: '插件市场',
...data,
}

2
pages/market/components/AppInfo.vue
View File

@@ -9,7 +9,7 @@
<div class="item text-center flex flex-col items-center">
<div class="text-gray-400">插件ID</div>
<el-icon size="24" class="py-1"><Cpu /></el-icon>
<span class="text-gray-500">{{ form.websiteCode }}</span>
<span class="text-gray-500">{{ form.websiteId }}</span>
</div>
<el-divider class="opacity-40" style="height: 40px" direction="vertical" />
<nuxt-link class="item text-center flex flex-col items-center">

6
pages/market/index.vue
View File

@@ -4,7 +4,7 @@
<div class="xl:w-screen-xl m-auto py-4 mt-20">
<el-page-header :icon="ArrowLeft" @back="goBack">
<template #content>
<span class="text-large font-600 mr-3"> 应用市场 </span>
<span class="text-large font-600 mr-3"> 插件市场 </span>
</template>
<template #extra>
<el-space class="flex items-center">
@@ -16,7 +16,7 @@
<!-- :value="item.value"-->
<!-- />-->
<!-- </el-select>-->
<el-input v-model="where.keywords" style="width: 400px" :placeholder="`应用搜索`" :suffix-icon="Search" @change="reload"/>
<el-input v-model="where.keywords" style="width: 400px" :placeholder="`插件ID | 插件名称 | 域名`" :suffix-icon="Search" @change="reload"/>
<el-button-group v-model:value="where" @tab-click="handleClick" @change="reload">
<el-button>综合</el-button>
<el-button>最新</el-button>
@@ -61,7 +61,7 @@ import { ArrowLeft,View,Search } from '@element-plus/icons-vue'
import { ElNotification as notify } from 'element-plus'
import { useLayout, usePage} from "~/composables/configState";
import type {CmsNavigation} from "~/api/cms/cmsNavigation/model";
import type {CmsArticle, CmsArticleParam} from "~/api/cms/cmsArticle/model";
import type {CmsArticleParam} from "~/api/cms/cmsArticle/model";
import type { ComponentSize } from 'element-plus'
import { ElNotification } from 'element-plus'
import type { TabsPaneContext } from 'element-plus'

2
pages/market/search.vue
View File

@@ -4,7 +4,7 @@
<div class="xl:w-screen-xl m-auto py-4 mt-20">
<el-page-header :icon="ArrowLeft" @back="goBack">
<template #content>
<span class="text-large font-600 mr-3"> 应用市场 </span>
<span class="text-large font-600 mr-3"> 插件市场 </span>
</template>
<template #extra>
<el-space class="flex items-center">

169
pages/order/[id].vue
View File

@@ -1,89 +1,107 @@
<template>
<!-- Banner -->
<Banner :layout="layout" />
<Banner :layout="layout"/>
<!-- 主体部分 -->
<div class="xl:w-screen-xl m-auto bg-white">
<el-row :gutter="50" id="container" class="clearfix">
<el-col :span="5" class="left">
<!-- 内页左侧组件 -->
<Left :category="category" />
</el-col>
<el-col :span="19" class="right">
<div class="sitemp h-[32px] flex justify-between pt-5">
<h2>{{ page.title }}</h2>
<Breadcrumb :data="page" />
</div>
<div class="form-box p-5">
<el-form
ref="formRef"
:model="form"
:rules="rules"
label-width="120"
label-position="left"
status-icon
>
<el-form-item :label="$t('order.title')" prop="title" class="hover:bg-gray-50 p-2">
<el-input v-model="form.title" :placeholder="$t('order.title')"/>
</el-form-item>
<el-form-item :label="$t('order.content')" prop="content" class="hover:bg-gray-50 p-2">
<el-input type="textarea" :rows="5" cols="80" v-model="form.content" :placeholder="$t('order.content')"/>
</el-form-item>
<el-form-item :label="$t('order.realName')" prop="realName" class="hover:bg-gray-50 p-2">
<el-input v-model="form.realName" :placeholder="$t('order.realName')"/>
</el-form-item>
<el-form-item :label="$t('order.phone')" prop="phone" class="hover:bg-gray-50 p-2">
<el-input v-model="form.phone" :maxlength="11" :placeholder="$t('order.phone')"/>
</el-form-item>
<el-form-item :label="$t('order.email')" prop="email" class="hover:bg-gray-50 p-2">
<el-input v-model="form.email" :placeholder="$t('order.email')"/>
</el-form-item>
<el-form-item :label="$t('order.address')" prop="address" class="hover:bg-gray-50 p-2">
<el-input v-model="form.address" :placeholder="$t('order.address')"/>
</el-form-item>
<el-form-item :label="$t('order.code')" prop="code" class="hover:bg-gray-50 p-2">
<el-space class="flex">
<el-input size="large" :placeholder="$t('order.imgCode')" maxlength="5" v-model="form.code" />
<el-image :alt="$t('order.imgCode')" v-if="captcha" :src="captcha" @click="changeCaptcha" />
</el-space>
</el-form-item>
<el-form-item>
<div class="submitForm ml-2">
<el-button type="primary" size="large" @click.stop="submitForm(formRef)">
{{ $t('order.submit') }}
</el-button>
</div>
</el-form-item>
</el-form>
</div>
</el-col>
</el-row>
<div class="xl:w-screen-xl m-auto py-4 mt-20">
<el-page-header :icon="ArrowLeft" @back="goBack">
<template #content>
<span class="text-large font-600 mr-3"> {{ page.title }} </span>
</template>
<template #extra>
</template>
<el-card shadow="hover" class="my-10 px-2">
<el-row :gutter="30" justify="space-between">
<el-col :span="13">
<el-alert title="填写您的需求，为您量身定制." type="warning" />
<el-form
ref="formRef"
:model="form"
:rules="rules"
label-width="120"
label-position="left"
class="mt-5"
status-icon
>
<el-form-item :label="$t('order.title')" prop="title" class="hover:bg-gray-50 p-2">
<el-select
v-model="form.title"
filterable
placeholder="选择咨询的产品"
>
<el-option
v-for="item in siteList"
:key="item.websiteId"
:label="item.websiteName"
:value="`${item.websiteId}`"
/>
</el-select>
</el-form-item>
<el-form-item :label="$t('order.content')" prop="content" class="hover:bg-gray-50 p-2">
<el-input type="textarea" :rows="5" cols="80" v-model="form.content" :placeholder="$t('order.content')"/>
</el-form-item>
<el-form-item :label="$t('order.realName')" prop="realName" class="hover:bg-gray-50 p-2">
<el-input v-model="form.realName" :placeholder="$t('order.realName')"/>
</el-form-item>
<el-form-item :label="$t('order.phone')" prop="phone" class="hover:bg-gray-50 p-2">
<el-input v-model="form.phone" :maxlength="11" :placeholder="$t('order.phone')"/>
</el-form-item>
<el-form-item :label="$t('order.email')" prop="email" class="hover:bg-gray-50 p-2">
<el-input v-model="form.email" :placeholder="$t('order.email')"/>
</el-form-item>
<!-- <el-form-item :label="$t('order.address')" prop="address" class="hover:bg-gray-50 p-2">-->
<!-- <el-input v-model="form.address" :placeholder="$t('order.address')"/>-->
<!-- </el-form-item>-->
<el-form-item :label="$t('order.code')" prop="code" class="hover:bg-gray-50 p-2">
<el-space class="flex">
<el-input size="large" :placeholder="$t('order.imgCode')" maxlength="5" v-model="form.code"/>
<el-image :alt="$t('order.imgCode')" v-if="captcha" :src="captcha" @click="changeCaptcha"/>
</el-space>
</el-form-item>
<el-form-item>
<div class="submitForm ml-2">
<el-button type="primary" size="large" @click.stop="submitForm(formRef)">
{{ $t('order.submit') }}
</el-button>
</div>
</el-form-item>
</el-form>
</el-col>
<el-col :span="10">
<el-image class="py-2" v-if="page.icon" :src="page.icon" />
</el-col>
</el-row>
</el-card>
</el-page-header>
</div>
<el-dialog v-model="dialogVisible">
<div class="flex justify-center">
<el-image w-full :src="dialogImageUrl" alt="查看证件" />
<el-image w-full :src="dialogImageUrl" alt="查看证件"/>
</div>
</el-dialog>
</template>
<script setup lang="ts">
import {useLayout, usePage} from "~/composables/configState";
import type {CmsNavigation} from "~/api/cms/cmsNavigation/model";
import {ArrowLeft, View, Search} from '@element-plus/icons-vue'
import {useLayout, usePage, useUser} from "~/composables/configState";
import {getNavIdByParamsId} from "~/utils/common";
import type {FormInstance, FormRules} from 'element-plus'
import type {CmsOrder} from "~/api/cms/cmsOrder/model";
import useFormData from "~/utils/use-form-data";
import Left from "~/components/Left.vue";
import {addCmsOrder} from "~/api/cms/cmsOrder";
import {getCaptcha} from "~/api/passport/login";
import {getCmsNavigation, listCmsNavigation} from "~/api/cms/cmsNavigation";
import {listCmsWebsite, pageCmsWebsiteAll} from "~/api/cms/cmsWebsite";
import type {CmsWebsite} from "~/api/cms/cmsWebsite/model";
// 引入状态管理
const route = useRoute();
const router = useRouter();
const navId = ref();
const layout = useLayout();
const user = useUser();
const page = usePage();
const category = ref<CmsNavigation[]>([]);
const siteList = ref<CmsWebsite[]>([]);
const dialogVisible = ref(false)
const formRef = ref<FormInstance>()
const dialogImageUrl = ref('')
@@ -149,14 +167,14 @@ const {form, resetFields} = useFormData<CmsOrder>({
const rules = reactive<FormRules<CmsOrder>>({
title: [
{required: true, message: '请输入产品名称', trigger: 'blur'},
{required: true, message: '请输入产品名称', trigger: 'blur'},
],
phone: [
{required: true, message: '请输入手机号码', trigger: 'blur'},
{pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号码', trigger: 'blur'},
],
realName: [
{required: true, message: '请输入联系人姓名', trigger: 'blur'},
{required: true, message: '请输入联系人姓名', trigger: 'blur'},
],
content: [
{required: true, message: '请输入留言内容', trigger: 'blur'},
@@ -177,11 +195,16 @@ const reload = async () => {
page.value = data
layout.value.banner = data.banner;
// 二级栏目分类
listCmsNavigation({
parentId: data.parentId == 0 ? data.navigationId : data.parentId
}).then(categoryData => {
category.value = categoryData;
pageCmsWebsiteAll({
}).then(res => {
siteList.value = res?.list || [];
})
// 用户信息
if(user.value){
form.realName = user.value.realName;
form.phone = user.value.phone;
form.email = user.value.email;
}
// seo
useSeoMeta({
description: data.comments || data.title,
@@ -195,12 +218,12 @@ const reload = async () => {
// 提交表单
const submitForm = (formEl: FormInstance | undefined) => {
if (!formEl) return
if(form.code !== text.value){
if (form.code !== text.value) {
changeCaptcha();
ElMessage.error('验证码不正确！');
return false;
}
formEl.validate((valid) => {
formEl.validate((valid) => {
if (valid) {
addCmsOrder(form).then(res => {
if (res.code == 0) {
@@ -214,13 +237,17 @@ const submitForm = (formEl: FormInstance | undefined) => {
})
}
const goBack = () => {
router.back();
}
watch(
() => route.params.id,
(id) => {
navId.value = getNavIdByParamsId(id);
reload();
},
{ immediate: true }
{immediate: true}
);
</script>

2
pages/page/[id].vue
View File

@@ -5,7 +5,7 @@
<div class="xl:w-screen-xl m-auto py-4 mt-2">
<el-page-header :icon="ArrowLeft" @back="goBack">
<template #content>
<span class="text-large font-600 mr-3"> {{ page.title }} </span>
<span class="text-large font-600 mr-3"> {{ page.title || '页面标题' }} </span>
</template>
<el-card shadow="hover" class=" my-5">

2
pages/passport/login.vue
View File

@@ -338,7 +338,7 @@ const doLogin = async (data: any) => {
user.value.balance = data.user.balance;
localStorage.setItem('UserId',data.user.userId);
localStorage.setItem('Avatar',data.user.avatar);
localStorage.setItem('TID_ADMIN',data.user.tenantId);
localStorage.setItem('ServerTenantId',data.user.tenantId);
// localStorage.setItem('TenantId',data.user.tenantId);
}
setTimeout(() => {

5
pages/user/auth.vue
View File

@@ -7,7 +7,7 @@
<div class="login-layout m-auto mt-10 sm:w-screen-xl w-full">
<div class="m-auto flex sm:flex-row flex-col sm:px-0 px-3 ">
<!-- 用户菜单 -->
<UserMenu :activeIndex="activeIndex" @done="reload"/>
<!-- <UserMenu :activeIndex="activeIndex" @done="reload"/>-->
<div class="flash bg-white rounded-lg w-full">
<div class="sm:w-screen-md w-full sm:px-4 sm:py-2">
<Auth @done="reload"/>
@@ -27,6 +27,7 @@ import type {ApiResult} from "~/api";
import UserMenu from "./components/UserMenu.vue";
import Auth from './components/Auth.vue';
import type {ShopMerchantApply} from "~/api/shop/shopMerchantApply/model";
import {COMMON_API_URL} from "~/config";
// 配置信息
const runtimeConfig = useRuntimeConfig();
@@ -44,7 +45,7 @@ const reload = async () => {
navigateTo('/passport/login');
return false;
}
const {data: response} = await useServerRequest<ApiResult<ShopMerchantApply>>('/shop/shop-merchant-apply/getByUserId', {baseURL: runtimeConfig.public.apiServer})
const {data: response} = await useServerRequest<ApiResult<ShopMerchantApply>>(COMMON_API_URL + '/shop/shop-merchant-apply/getByUserId', {baseURL: runtimeConfig.public.apiServer})
if (response.value?.data) {
merchantApply.value = response.value.data;
}

9
pages/user/components/Auth.vue
View File

@@ -10,8 +10,8 @@
status-icon
>
<el-tabs v-model="form.type" class="flash bg-white ml-0">
<el-tab-pane :name="0" label="个人认证"/>
<el-tab-pane :name="1" label="企业认证"/>
<!-- <el-tab-pane :name="0" label="个人认证"/>-->
<el-tab-pane :name="1" label="实名认证"/>
</el-tabs>
<!-- 已完成认证 -->
<template v-if="form.status === 1">
@@ -205,9 +205,10 @@ import type {ApiResult} from "~/api";
import {useServerRequest} from "~/composables/useServerRequest";
import type {ShopMerchant} from "~/api/shop/shopMerchant/model";
import useFormData from "~/utils/use-form-data";
import {COMMON_API_URL} from "~/config";
const token = useToken();
const tenantId = localStorage.getItem('TID_ADMIN')
const tenantId = localStorage.getItem('ServerTenantId')
const formRef = ref<FormInstance>()
const yyzzFile = ref<UploadUserFile[]>([])
const sfzFile = ref<UploadUserFile[]>([])
@@ -393,7 +394,7 @@ const resetForm = (formEl: FormInstance | undefined) => {
}
const reload = async () => {
const {data: response} = await useServerRequest<ApiResult<ShopMerchant>>('/shop/shop-merchant-apply/getByUserId')
const {data: response} = await useServerRequest<ApiResult<ShopMerchant>>(COMMON_API_URL + '/shop/shop-merchant-apply/getByUserId')
if (response.value?.data) {
isUpdate.value = true;
assignFields(response.value.data)

9
pages/user/components/Base.vue
View File

@@ -39,6 +39,15 @@ withDefaults(
}>(),
{}
);
const emit = defineEmits<{
(e: 'done', where: any): void
}>()
const onSubmit = () => {
emit('done')
}
</script>
<style scoped lang="less">

10
pages/user/components/UserMenu.vue
View File

@@ -29,11 +29,11 @@ const activities = [
name: '账号信息',
path: '/user'
},
{
icon: Lock,
name: '密码修改',
path: '/user/password'
},
// {
// icon: Lock,
// name: '密码修改',
// path: '/user/password'
// },
{
icon: Postcard,
name: '实名认证',

51
pages/user/index.vue
View File

@@ -7,11 +7,23 @@
<div class="login-layout mt-10 sm:w-screen-xl w-full">
<div class="m-auto flex sm:flex-row flex-col sm:px-0 px-3">
<!-- 用户菜单 -->
<UserMenu :activeIndex="activeIndex" @done="onDone" class="sm:flex hidden"/>
<!-- <UserMenu :activeIndex="activeIndex" @done="onDone" class="sm:flex hidden"/>-->
<div class="flash bg-white rounded-lg w-full">
<div class="title text-xl text-gray-700 md:px-8 p-4 md:mt-3 font-500">账号信息</div>
<div class="sm:w-screen-md w-full sm:px-4 sm:py-2">
<Base :form="form"/>
<div class="lg:w-screen-lg w-full sm:px-4 sm:py-4 mb-10">
<el-descriptions class="px-4" :column="2" border>
<el-descriptions-item label="用户ID">{{user?.userId}}</el-descriptions-item>
<el-descriptions-item label="手机号码">{{user?.mobile}}</el-descriptions-item>
<el-descriptions-item label="昵称">{{user?.nickname}}</el-descriptions-item>
<el-descriptions-item label="性别">{{user?.sexName}}</el-descriptions-item>
<el-descriptions-item label="邮箱">{{user?.email}}</el-descriptions-item>
<el-descriptions-item label="生日">{{user?.birthday}}</el-descriptions-item>
<el-descriptions-item label="所在省份">{{user?.province}}</el-descriptions-item>
<el-descriptions-item label="所在城市">{{user?.city}}</el-descriptions-item>
<el-descriptions-item label="可用余额">{{user?.balance}}</el-descriptions-item>
<el-descriptions-item label="可用积分">{{user?.points}}</el-descriptions-item>
<el-descriptions-item label="个人简介">{{user?.introduction}}</el-descriptions-item>
</el-descriptions>
</div>
</div>
</div>
@@ -25,20 +37,19 @@ import {useWebsite} from "~/composables/configState";
import useFormData from '@/utils/use-form-data';
import type {User} from '@/api/system/user/model';
import {ref} from 'vue'
import {useServerRequest} from "~/composables/useServerRequest";
import type {ApiResult} from "~/api";
import UserMenu from "./components/UserMenu.vue";
import Base from './components/Base.vue';
import {updateUser} from "~/api/layout";
import {openUrl} from "~/utils/common";
// 配置信息
const runtimeConfig = useRuntimeConfig();
const route = useRoute();
const router = useRouter();
const website = useWebsite()
const userInfo = ref<User>();
const user = useUser();
const activeIndex = ref('');
// 配置信息
const {form, assignFields} = useFormData<User>({
userId: undefined,
@@ -67,17 +78,6 @@ const onDone = (index: string) => {
activeIndex.value = index;
}
const onSubmit = async () => {
const {data: modify} = await useServerRequest<ApiResult<User>>('/auth/user', {
baseURL: runtimeConfig.public.apiServer,
method: 'put',
body: form
})
if (modify.value?.code == 0) {
ElMessage.success('修改成功')
}
}
const reload = async () => {
// 未登录状态(是否强制登录)
const token = localStorage.getItem('token');
@@ -85,10 +85,14 @@ const reload = async () => {
navigateTo('/passport/login');
return false;
}
const {data: response} = await useServerRequest<ApiResult<User>>('/auth/user', {baseURL: runtimeConfig.public.apiServer})
if (response.value?.data) {
userInfo.value = response.value?.data;
assignFields(response.value?.data);
if(user.value){
form.userId = user.value.userId;
form.nickname = user.value.nickname;
form.realName = user.value.realName;
form.mobile = user.value.mobile;
form.email = user.value.email;
form.sex = user.value.sex;
form.comments = user.value.comments;
}
}
@@ -100,7 +104,6 @@ watch(
() => route.path,
(path) => {
activeIndex.value = path;
console.log(path, '=>Path')
reload();
},
{immediate: true}