From 8d85fcce3fbf49a35a2f48830f3bac4f6c0330ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Thu, 26 Sep 2024 15:31:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/oa/app/model/index.ts                     |   2 +
 api/shop/goods/model/index.ts                 |   4 +-
 components/AppHeader.vue                      |  15 +-
 pages/case/components/CardList.vue            |   6 +-
 .../components/{Header.vue => PageBanner.vue} |  10 +-
 pages/case/index.vue                          |  11 +-
 pages/components/ArticleList.vue              |   4 +-
 pages/components/Flash.vue                    |  11 +-
 pages/components/PlugList.vue                 |   2 +-
 pages/components/ProductList.vue              |   8 +-
 pages/developer/components/CardList.vue       |  48 +++++
 pages/developer/index.vue                     | 165 +++++++++++++++++
 pages/developer/join-in.vue                   | 149 +++++++++++++++
 pages/docs/index.vue                          |  11 +-
 pages/index.vue                               |   8 +-
 pages/item/components/PageBanner.vue          |   7 +-
 pages/item/index.vue                          | 158 ++++++++++++++--
 pages/market/components/CardList.vue          |   2 +-
 pages/merchant/index.vue                      |  82 +++++++++
 pages/merchant/join-in.vue                    | 174 ++++++++++++++++++
 pages/passport/login.vue                      |   1 +
 21 files changed, 810 insertions(+), 68 deletions(-)
 rename pages/case/components/{Header.vue => PageBanner.vue} (91%)
 create mode 100644 pages/developer/components/CardList.vue
 create mode 100644 pages/developer/index.vue
 create mode 100644 pages/developer/join-in.vue
 create mode 100644 pages/merchant/index.vue
 create mode 100644 pages/merchant/join-in.vue

diff --git a/api/oa/app/model/index.ts b/api/oa/app/model/index.ts
index 920449c..901487b 100644
--- a/api/oa/app/model/index.ts
+++ b/api/oa/app/model/index.ts
@@ -137,6 +137,8 @@ export interface App {
   showCase?: boolean;
   showIndex?: boolean;
   recommend?: boolean;
+  categoryName?: string;
+  title?: string;
 }
 
 /**
diff --git a/api/shop/goods/model/index.ts b/api/shop/goods/model/index.ts
index 100ab74..b3f2ce7 100644
--- a/api/shop/goods/model/index.ts
+++ b/api/shop/goods/model/index.ts
@@ -36,9 +36,9 @@ export interface Goods {
   // 货架
   position?: string;
   // 进货价格
-  price?: string;
+  price?: number;
   // 销售价格
-  salePrice?: string;
+  salePrice?: number;
   // 库存计算方式(10下单减库存 20付款减库存)
   deductStockType?: number;
   // 封面图
diff --git a/components/AppHeader.vue b/components/AppHeader.vue
index 989c1e6..c374c0a 100644
--- a/components/AppHeader.vue
+++ b/components/AppHeader.vue
@@ -42,6 +42,9 @@
             </el-sub-menu>
             <el-menu-item v-else :index="`${item.path}`"><h3>{{ item.title }}</h3></el-menu-item>
           </template>
+          <el-menu-item v-if="user.roleId === 858" :index="`/merchant`"><h3>商家中心</h3></el-menu-item>
+          <el-menu-item v-if="user.roleId === 859" :index="`/developer`"><h3>开发者中心</h3></el-menu-item>
+          <el-menu-item v-else :index="`/developer`"><h3>入驻</h3></el-menu-item>
 
           <!-- 顶部菜单超出数量折叠 -->
           <!--            <el-sub-menu index="more" v-if="navigations && navigations.length > (config.elMenuMaxNumber)">-->
@@ -65,7 +68,7 @@
           <ClientOnly>
             <template v-if="token">
               <el-dropdown @command="handleCommand">
-                <el-avatar class="cursor-pointer" :src="userInfo?.avatar" :size="30"/>
+                <el-avatar class="cursor-pointer" :src="user?.avatar" :size="30"/>
                 <el-button circle :icon="ElIconUserFilled" color="#155FAA"></el-button>
                 <template #dropdown>
                   <el-dropdown-menu>
@@ -95,13 +98,11 @@ import {
   useConfigInfo,
   useMenu,
   useProductAffix,
-  useShowLogin,
   useSysDomain,
   useToken,
   useUser,
   useWebsite
 } from "~/composables/configState";
-import UnderMaintenance from "~/components/UnderMaintenance.vue";
 import {useServerRequest} from "~/composables/useServerRequest";
 import type {ApiResult} from "~/api";
 import type {User} from "~/api/system/user/model";
@@ -113,10 +114,8 @@ const route = useRoute();
 const runtimeConfig = useRuntimeConfig();
 const website = useWebsite()
 const showPassport = ref<boolean>(false);
-const searchValue = ref<string>();
 const token = useToken();
-const userInfo = ref<User>();
-const showLogin = useShowLogin();
+const user = useUser();
 const navigations = useMenu();
 const config = useConfigInfo();
 const affix = useProductAffix();
@@ -167,7 +166,9 @@ const reload = async () => {
   }
   if (token && token != '') {
     const {data: response} = await useServerRequest<ApiResult<User>>('/auth/user', {baseURL: runtimeConfig.public.apiServer})
-    userInfo.value = response.value?.data;
+    if(response.value?.data){
+      user.value = response.value?.data;
+    }
     // 获取后台管理地址
     const {data: company} = await useServerRequest<ApiResult<Company>>('/system/company/profile', {baseURL: runtimeConfig.public.apiServer})
     if (company.value?.data?.domain) {
diff --git a/pages/case/components/CardList.vue b/pages/case/components/CardList.vue
index 528e2a5..e83554f 100644
--- a/pages/case/components/CardList.vue
+++ b/pages/case/components/CardList.vue
@@ -4,16 +4,16 @@
       <template v-for="(item,index) in list" :key="index">
         <el-col :span="6" class="mb-5 min-w-xs">
           <el-card shadow="hover" :body-style="{ padding: '0px' }" class="hover:bg-gray-50 cursor-pointer">
-            <el-image :src="item.companyLogo" fit="fill" :lazy="true" class="w-full h-[150px] cursor-pointer" />
+            <el-image :src="item.appIcon" fit="contain" :lazy="true" class="w-full h-[150px] cursor-pointer" />
             <div class="flex-1 px-4 py-5 sm:p-6 !p-4">
               <p class="text-gray-700 dark:text-white text-base font-semibold  flex items-center gap-1.5">
-                <span class="flex-1 text-xl cursor-pointer">{{ item.tenantName }}</span>
+                <span class="flex-1 text-xl cursor-pointer">{{ item.appName }}</span>
               </p>
               <p class="flex items-center gap-1.5 py-2 text-gray-500 justify-between">
                 <span class="text-gray-500">{{ item.comments }} </span>
               </p>
               <div class="button-group flex justify-center mt-3">
-                <el-button class="w-full" :icon="ElIconView" @click="openSpmUrl(`https://websoft.top/item`,item,item.companyId)">查看详情</el-button>
+                <el-button class="w-full" :icon="ElIconView" @click="openSpmUrl(`https://websoft.top/item`,item,item.appId)">查看详情</el-button>
                 <el-button v-if="item.price > 0" class="w-full" :icon="ElIconShoppingCart">购买</el-button>
                 <el-button v-else class="w-full" :icon="ElIconSetting">控制台</el-button>
               </div>
diff --git a/pages/case/components/Header.vue b/pages/case/components/PageBanner.vue
similarity index 91%
rename from pages/case/components/Header.vue
rename to pages/case/components/PageBanner.vue
index afcad15..d87c511 100644
--- a/pages/case/components/Header.vue
+++ b/pages/case/components/PageBanner.vue
@@ -36,19 +36,11 @@
             </div>
 
             <el-space class="mt-4">
-              <el-button
-                  :icon="ElIconView"
-                  size="large"
-                  v-if="layout.demoUrl"
-                  @click="openSpmUrl(layout.demoUrl)"
-              >
-                演示地址
-              </el-button>
               <el-button
                   v-if="layout.buyUrl"
                   :icon="ElIconBottom"
                   size="large"
-                  @click="openSpmUrl(layout.buyUrl)"
+                  @click="openSpmUrl(`http://git.gxwebsoft.com/gxwebsoft/websoft-cms.git`, {},0,true)"
               >
                 下载模版
               </el-button>
diff --git a/pages/case/index.vue b/pages/case/index.vue
index 328cf60..c4a0278 100644
--- a/pages/case/index.vue
+++ b/pages/case/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <Header :layout="layout" />
+  <PageBanner :layout="layout" />
   <CardList :list="list" :disabled="disabled" @done="onSearch" />
 </template>
 <script setup lang="ts">
@@ -8,16 +8,15 @@ import {useServerRequest} from "~/composables/useServerRequest";
 import {useWebsite} from "~/composables/configState";
 import type {Navigation} from "~/api/cms/navigation/model";
 import type {CompanyParam} from "~/api/system/company/model";
-import type {Tenant} from "~/api/system/tenant/model";
-import type {Article} from "~/api/cms/article/model";
 import CardList from './components/CardList.vue';
-import Header from "./components/Header.vue";
+import PageBanner from "./components/PageBanner.vue";
+import type {App} from "~/api/oa/app/model";
 
 const route = useRoute();
 
 // 页面信息
 const runtimeConfig = useRuntimeConfig();
-const list = ref<Tenant[]>([]);
+const list = ref<App[]>([]);
 const page = ref<number>(1);
 const resultText = ref('');
 const layout = ref<any>();
@@ -46,7 +45,7 @@ const onSearch = () => {
 
 // 请求数据
 const reload = async (path: string) => {
-  const {data: response} = await useServerRequest<ApiResult<PageResult<Article>>>('/system/company/pageAll',{baseURL: runtimeConfig.public.apiServer, params: {
+  const {data: response} = await useServerRequest<ApiResult<PageResult<App>>>('/oa/oa-app/page',{baseURL: runtimeConfig.public.apiServer, params: {
       page: page.value,
       limit: 8,
       keywords: where.keywords
diff --git a/pages/components/ArticleList.vue b/pages/components/ArticleList.vue
index 7348c12..4d9408b 100644
--- a/pages/components/ArticleList.vue
+++ b/pages/components/ArticleList.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="text-center flex flex-col items-center py-10">
     <h2 class="text-3xl font-bold tracking-tight text-gray-900 dark:text-white sm:text-4xl lg:text-5xl">
-      文章推荐
+      开发者社区
     </h2>
     <div class="sub-title">
       <p class="text-gray-500 dark:text-gray-400 py-3">
-        拥抱开源、坚守品质；致力于打造安全稳定高可用的WEB应用！
+        分享研发成果 交流技术经验
       </p>
     </div>
   </div>
diff --git a/pages/components/Flash.vue b/pages/components/Flash.vue
index 160548e..792f362 100644
--- a/pages/components/Flash.vue
+++ b/pages/components/Flash.vue
@@ -96,8 +96,10 @@
         <div class="mt-10 flex flex-wrap gap-x-6 gap-y-3 justify-center">
           <div class="flex flex-col gap-4">
             <div class="flex items-center gap-2">
-              <el-button size="large" type="primary" :icon="ElIconArrowRight" @click="openSpmUrl(`http://git.gxwebsoft.com/gxwebsoft/websoft-cms.git`, {},0,true)">立即开始</el-button>
-              <el-button size="large" type="success"  :icon="ElIconBottom">下载源码</el-button>
+              <el-button size="large" type="primary" v-if="!token" :icon="ElIconArrowRight" @click="openSpmUrl(`https://websoft.top/passport/login`, {},0,true)">立即开始</el-button>
+              <el-button size="large" type="primary" v-else :icon="ElIconArrowRight" @click="openSpmUrl(`https://${sysDomain}/token-login`,{},undefined,true)">进入控制台</el-button>
+              <el-button size="large" type="success"  :icon="ElIconDownload" @click="openSpmUrl(`http://git.gxwebsoft.com/gxwebsoft/websoft-cms.git`, {},0,true)">下载源码</el-button>
+              <el-button size="large" type="warning"  :icon="ElIconShoppingCart">商业版授权</el-button>
             </div>
           </div>
         </div>
@@ -107,7 +109,10 @@
 
 </template>
 <script setup lang="ts">
-
+import {useSysDomain, useToken} from "~/composables/configState";
+import {openSpmUrl} from "~/utils/common";
+const token = useToken();
+const sysDomain = useSysDomain();
 </script>
 
 <style scoped lang="less">
diff --git a/pages/components/PlugList.vue b/pages/components/PlugList.vue
index 7510be3..f9ecbbc 100644
--- a/pages/components/PlugList.vue
+++ b/pages/components/PlugList.vue
@@ -26,7 +26,7 @@
                 <div class="text-gray-500">{{ item.comments }}</div>
               </p>
               <div class="button-group flex justify-center mt-3">
-                <el-button class="w-full" :icon="ElIconView">查看详情</el-button>
+                <el-button class="w-full" :icon="ElIconView" @click="openSpmUrl('https://websoft.top/item', item,item.plugId)">查看详情</el-button>
                 <el-button type="primary" v-if="item.price > 0" class="w-full" :icon="ElIconShoppingCart">购买
                 </el-button>
                 <el-button v-else class="w-full" :icon="ElIconShoppingCart">下载</el-button>
diff --git a/pages/components/ProductList.vue b/pages/components/ProductList.vue
index fe89db1..bf1e084 100644
--- a/pages/components/ProductList.vue
+++ b/pages/components/ProductList.vue
@@ -20,14 +20,14 @@
             <div class="flex-1 px-4 py-5 sm:p-6 !p-4">
               <p class="text-gray-700 dark:text-white text-base font-semibold  flex flex-col gap-1.5">
                 <div class="flex-1 text-xl cursor-pointer">{{ item.goodsName }}</div>
-<!--                <div class="text-red-500">￥{{ item.price }}</div>-->
+                <div class="text-red-500">￥{{ item.price }}</div>
               </p>
-              <p v-if="item?.price > 0" class="flex items-center gap-1.5 py-2 text-gray-500 justify-between">
+              <p v-if="item.price > 0" class="flex items-center gap-1.5 py-2 text-gray-500 justify-between">
                 <div class="text-gray-500">{{ item.comments }}</div>
               </p>
               <div class="button-group flex justify-center mt-3">
-                <el-button class="w-full" :icon="ElIconView">查看详情</el-button>
-                <el-button type="primary" v-if="item?.price > 0" class="w-full" :icon="ElIconShoppingCart">购买
+                <el-button class="w-full" :icon="ElIconView" @click="openSpmUrl('https://websoft.top/item', item,item.goodsId)">查看详情</el-button>
+                <el-button type="primary" v-if="item.price > 0" class="w-full" :icon="ElIconShoppingCart">购买
                 </el-button>
                 <el-button v-else class="w-full" :icon="ElIconShoppingCart">下载</el-button>
               </div>
diff --git a/pages/developer/components/CardList.vue b/pages/developer/components/CardList.vue
new file mode 100644
index 0000000..381a452
--- /dev/null
+++ b/pages/developer/components/CardList.vue
@@ -0,0 +1,48 @@
+<template>
+  <div class="md:w-screen-xl m-auto relative sm:flex" v-infinite-scroll="load">
+    <el-row :gutter="24" class="flex">
+      <template v-for="(item,index) in list" :key="index">
+        <el-col :span="6" class="mb-5 min-w-xs">
+          <el-card shadow="hover" :body-style="{ padding: '0px' }" class="hover:bg-gray-50 cursor-pointer" @click="openSpmUrl(`https://websoft.top/detail`,item,item.articleId)">
+            <el-image :src="item.image" fit="fill" :lazy="true" class="w-full h-[150px] cursor-pointer" />
+            <div class="flex-1 px-4 py-5 sm:p-6 !p-4">
+              <p class="text-gray-700 dark:text-white text-base font-semibold  flex items-center gap-1.5">
+                <span class="flex-1 text-xl cursor-pointer max-h-[57px] overflow-hidden">{{ item.title }}</span>
+              </p>
+              <p class="flex items-center gap-1.5 py-2 text-gray-500">
+                <el-avatar :src="item.avatar" :size="20" />
+                <span>{{ item.nickname }} · {{ dayjs(item.createTime).format('MM-DD hh:mm') }}</span>
+              </p>
+            </div>
+          </el-card>
+        </el-col>
+      </template>
+    </el-row>
+  </div>
+  <div v-if="disabled" class="px-1 text-center text-gray-500 min-h-xs">
+    没有更多了
+  </div>
+</template>
+
+<script setup lang="ts">
+import {openSpmUrl} from "~/utils/common";
+import dayjs from "dayjs";
+
+const props = withDefaults(
+    defineProps<{
+      list?: any[];
+      disabled?: boolean;
+    }>(),
+    {}
+);
+
+const emit = defineEmits<{
+  (e: 'done'): void;
+}>();
+
+const load = () => {
+  if(!props.disabled){
+    emit('done')
+  }
+}
+</script>
diff --git a/pages/developer/index.vue b/pages/developer/index.vue
new file mode 100644
index 0000000..31a02ba
--- /dev/null
+++ b/pages/developer/index.vue
@@ -0,0 +1,165 @@
+<template>
+  <PageBanner :layout="layout" />
+  <div class="md:w-screen-xl m-auto relative sm:flex bg-white rounded-lg py-4 ">
+    <el-tabs class="px-7 bg-white">
+      <el-tab-pane label="个人开发者认证">
+        <el-form :model="form" label-width="auto" size="large" label-position="top" class="sm:w-screen-md w-full sm:py-2">
+          <el-form-item label="真实姓名">
+            <el-input v-model="form.realName" placeholder="请输入真实姓名" />
+          </el-form-item>
+          <el-form-item label="证件号码">
+            <el-input v-model="form.idCard"  placeholder="请输入证件号码" />
+          </el-form-item>
+          <el-form-item label="身份证(正面)">
+            <Upload />
+          </el-form-item>
+          <el-form-item label="身份证(反面)">
+            <Upload />
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="large" @click="onSubmit">提交</el-button>
+          </el-form-item>
+        </el-form>
+        <el-result
+            icon="success"
+            title="个人认证成功"
+            sub-title="认证完成时间 2024-09-30"
+        >
+          <template #extra>
+            <el-button type="text">修改认证信息</el-button>
+          </template>
+        </el-result>
+      </el-tab-pane>
+      <el-tab-pane label="企业开发者认证">
+        <el-form :model="form" label-width="auto" size="large" label-position="top" class="sm:w-screen-md w-full sm:py-2">
+          <el-form-item label="企业名称">
+            <el-input v-model="form.companyName" placeholder="请输入企业名称" />
+          </el-form-item>
+          <el-form-item label="社会信用代码">
+            <el-input v-model="form.idCard"  placeholder="请输入社会信用代码" />
+          </el-form-item>
+          <el-form-item label="营业执照">
+            <Upload />
+          </el-form-item>
+          <el-form-item label="所属行业">
+            <el-select v-model="form.city" placeholder="请选择所属行业">
+            </el-select>
+          </el-form-item>
+          <el-form-item label="网站信息">
+            <el-input v-model="form.idCard"  placeholder="请输入网站信息" />
+          </el-form-item>
+          <el-form-item label="您的身份">
+            <el-radio-group v-model="form.sex">
+              <el-radio value="1">法定代表人</el-radio>
+              <el-radio value="2">被授权人</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="用户协议">
+            <el-checkbox v-model="form.status">请务必提供真实信息，我司有权自行或委托第三方审查您提供的身份信息是否属真实，有效。若提供虚假信息，由此的全部后果由您承担。</el-checkbox>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" size="large" @click="onSubmit">提交</el-button>
+          </el-form-item>
+        </el-form>
+        <el-result
+            icon="success"
+            title="企业认证成功"
+            sub-title="认证完成时间 2024-09-30"
+        >
+          <template #extra>
+            <el-button type="text">修改认证信息</el-button>
+          </template>
+        </el-result>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+<script setup lang="ts">
+import type {ApiResult, PageResult} from "~/api";
+import {useServerRequest} from "~/composables/useServerRequest";
+import {useWebsite} from "~/composables/configState";
+import type {Navigation} from "~/api/cms/navigation/model";
+import type {CompanyParam} from "~/api/system/company/model";
+import type {Article} from "~/api/cms/article/model";
+import CardList from './components/CardList.vue';
+
+const route = useRoute();
+
+// 页面信息
+const runtimeConfig = useRuntimeConfig();
+const list = ref<Article[]>([]);
+const page = ref<number>(1);
+const resultText = ref('');
+const layout = ref<any>();
+const disabled = ref<boolean>(false);
+const activeName = ref(undefined)
+
+// 获取状态
+const form = ref<Navigation>();
+const website = useWebsite();
+
+// 搜索表单
+const where = reactive<CompanyParam>({
+  keywords: ''
+});
+
+const handleClick = (e:any) => {
+  console.log(e.index)
+}
+
+const onSearch = () => {
+  if(!disabled.value){
+    page.value++;
+    reload(route.path);
+  }
+}
+
+// 请求数据
+const reload = async (path: string) => {
+  const {data: response} = await useServerRequest<ApiResult<PageResult<Article>>>('/cms/cms-article/page',{baseURL: runtimeConfig.public.apiServer, params: {
+      page: page.value,
+      limit: 8,
+      userId: 0,
+      keywords: where.keywords
+    }})
+  if(response.value?.data){
+    if (list.value.length < response.value?.data.count) {
+      disabled.value = false;
+      if (response.value?.data.list) {
+        list.value = list.value.concat(response.value?.data.list);
+      }
+    }else {
+      disabled.value = true;
+    }
+    if(response.value.data.count == 0){
+      resultText.value = '暂无相关结果'
+    }
+  }
+}
+
+const { data: nav } = await useServerRequest<ApiResult<Navigation>>('/cms/cms-navigation/getNavigationByPath',{query: {path: route.path}})
+console.log(nav.value?.data)
+if(nav.value?.data){
+  form.value = nav.value?.data;
+  console.log(form.value,'form...')
+}
+// 页面布局
+if(form.value?.layout){
+  layout.value = JSON.parse(form.value?.layout)
+}
+
+useHead({
+  title: `文档 - ${website.value.websiteName}`,
+  bodyAttrs: {
+    class: "page-container",
+  }
+});
+
+watch(
+    () => route.path,
+    (path) => {
+      reload(path);
+    },
+    { immediate: true }
+);
+</script>
diff --git a/pages/developer/join-in.vue b/pages/developer/join-in.vue
new file mode 100644
index 0000000..701ed25
--- /dev/null
+++ b/pages/developer/join-in.vue
@@ -0,0 +1,149 @@
+<template>
+  <PageBanner :layout="layout" />
+  <div class="login-layout mt-[100px] m-auto sm:w-screen-xl w-full">
+    <div class="mt-[100px] m-auto flex sm:flex-row flex-col sm:p-0 p-3">
+      <div class="flash ml-8 bg-white rounded-lg px-7 py-4 w-full">
+        <el-tabs class="flash bg-white ml-0">
+          <el-tab-pane label="个人开发者">
+            <el-form :model="form" label-width="auto" size="large" label-position="top" class="sm:w-screen-md w-full sm:py-2">
+              <el-form-item label="真实姓名">
+                <el-input v-model="form.realName" placeholder="请输入真实姓名" />
+              </el-form-item>
+              <el-form-item label="证件号码">
+                <el-input v-model="form.idCard"  placeholder="请输入证件号码" />
+              </el-form-item>
+              <el-form-item label="身份证(正面)">
+                <Upload />
+              </el-form-item>
+              <el-form-item label="身份证(反面)">
+                <Upload />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" size="large" @click="onSubmit">提交</el-button>
+              </el-form-item>
+            </el-form>
+            <el-result
+                icon="success"
+                title="个人认证成功"
+                sub-title="认证完成时间 2024-09-30"
+            >
+              <template #extra>
+                <el-button type="text">修改认证信息</el-button>
+              </template>
+            </el-result>
+          </el-tab-pane>
+          <el-tab-pane label="企业开发者">
+            <el-form :model="form" label-width="auto" size="large" label-position="top" class="sm:w-screen-md w-full sm:py-2">
+              <el-form-item label="企业名称">
+                <el-input v-model="form.companyName" placeholder="请输入企业名称" />
+              </el-form-item>
+              <el-form-item label="社会信用代码">
+                <el-input v-model="form.idCard"  placeholder="请输入社会信用代码" />
+              </el-form-item>
+              <el-form-item label="营业执照">
+                <Upload />
+              </el-form-item>
+              <el-form-item label="所属行业">
+                <el-select v-model="form.city" placeholder="请选择所属行业">
+                </el-select>
+              </el-form-item>
+              <el-form-item label="网站信息">
+                <el-input v-model="form.idCard"  placeholder="请输入网站信息" />
+              </el-form-item>
+              <el-form-item label="您的身份">
+                <el-radio-group v-model="form.sex">
+                  <el-radio value="1">法定代表人</el-radio>
+                  <el-radio value="2">被授权人</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="用户协议">
+                <el-checkbox v-model="form.status">请务必提供真实信息，我司有权自行或委托第三方审查您提供的身份信息是否属真实，有效。若提供虚假信息，由此的全部后果由您承担。</el-checkbox>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" size="large" @click="onSubmit">提交</el-button>
+              </el-form-item>
+            </el-form>
+            <el-result
+                icon="success"
+                title="企业认证成功"
+                sub-title="认证完成时间 2024-09-30"
+            >
+              <template #extra>
+                <el-button type="text">修改认证信息</el-button>
+              </template>
+            </el-result>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import {useConfigInfo, useToken, 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";
+
+// 配置信息
+const runtimeConfig = useRuntimeConfig();
+const route = useRoute();
+const activeIndex = ref('');
+const website = useWebsite()
+const config = useConfigInfo();
+const token = useToken();
+const userInfo = ref<User>();
+
+// 配置信息
+const { form, assignFields } = useFormData<User>({
+  userId: undefined,
+  nickname: '',
+  username: '',
+  phone: '',
+  mobile: '',
+  sex: '',
+  sexName: '',
+  email: '',
+  password: '',
+  code: '',
+  smsCode: '',
+  comments: '',
+  remember: true
+});
+
+useHead({
+  title: `用户中心 - ${config.value?.siteName}`,
+  meta: [{ name: website.value.keywords, content: website.value.comments }]
+});
+
+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 {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);
+  }
+}
+
+watch(
+    () => route.path,
+    (path) => {
+      activeIndex.value = path;
+      console.log(path,'=>Path')
+      reload();
+    },
+    { immediate: true }
+);
+</script>
diff --git a/pages/docs/index.vue b/pages/docs/index.vue
index e9dfe6b..7e64f24 100644
--- a/pages/docs/index.vue
+++ b/pages/docs/index.vue
@@ -1,15 +1,13 @@
 <template>
   <PageBanner :layout="layout" />
   <el-tabs v-model="activeName" class="md:w-screen-xl m-auto relative sm:flex pb-2" @tab-click="handleClick">
-    <el-tab-pane label="轻松一刻" name="happy"></el-tab-pane>
     <el-tab-pane label="企业官网" name="website"></el-tab-pane>
     <el-tab-pane label="企业商城" name="weShop"></el-tab-pane>
     <el-tab-pane label="内容管理" name="cms"></el-tab-pane>
     <el-tab-pane label="点餐外卖" name="food"></el-tab-pane>
     <el-tab-pane label="派单系统" name="task"></el-tab-pane>
     <el-tab-pane label="办公OA" name="oa"></el-tab-pane>
-    <el-tab-pane label="问答" name="ask"></el-tab-pane>
-    <el-tab-pane label="分享" name="share"></el-tab-pane>
+    <el-tab-pane label="常见问题" name="ask"></el-tab-pane>
   </el-tabs>
   <CardList :list="list" :disabled="disabled" @done="onSearch" />
 
@@ -57,7 +55,10 @@ const onSearch = () => {
 // 请求数据
 const reload = async (path: string) => {
   const {data: response} = await useServerRequest<ApiResult<PageResult<Article>>>('/cms/cms-article/page',{baseURL: runtimeConfig.public.apiServer, params: {
-      page: page.value,limit: 8, keywords: where.keywords
+      page: page.value,
+      limit: 8,
+      userId: 0,
+      keywords: where.keywords
     }})
   if(response.value?.data){
     if (list.value.length < response.value?.data.count) {
@@ -75,8 +76,10 @@ const reload = async (path: string) => {
 }
 
 const { data: nav } = await useServerRequest<ApiResult<Navigation>>('/cms/cms-navigation/getNavigationByPath',{query: {path: route.path}})
+console.log(nav.value?.data)
 if(nav.value?.data){
   form.value = nav.value?.data;
+  console.log(form.value,'form...')
 }
 // 页面布局
 if(form.value?.layout){
diff --git a/pages/index.vue b/pages/index.vue
index a637d53..6992ece 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -51,10 +51,10 @@ const reload = async () => {
 
   // 未登录状态(是否强制登录)
   if (!token.value || token.value == '') {
-    if (config.value.MustLogin) {
-      navigateTo('/passport/login');
-      return false;
-    }
+    // if (config.value.MustLogin) {
+    //   navigateTo('/passport/login');
+    //   return false;
+    // }
   }
 
   // seo
diff --git a/pages/item/components/PageBanner.vue b/pages/item/components/PageBanner.vue
index b9f5665..74862be 100644
--- a/pages/item/components/PageBanner.vue
+++ b/pages/item/components/PageBanner.vue
@@ -27,7 +27,7 @@
         <div class="gap-8 sm:gap-y-16 lg:items-center" v-if="form">
           <div class="w-full">
             <div class="flex">
-              <el-avatar :src="form.companyLogo" class="mr-2" />
+              <el-avatar :src="form.appIcon" shape="square" class="mr-2" />
               <h1
                   class="text-2xl font-bold tracking-tight text-gray-900 dark:text-white sm:text-3xl lg:text-4xl">
                 <span v-if="form.title">{{ form.title }}</span>
@@ -73,9 +73,8 @@
 </template>
 
 <script setup lang="ts">
-import {openSpmUrl} from "~/utils/common";
 import Breadcrumb from "~/components/Breadcrumb.vue";
-import type {Article} from "~/api/cms/article/model";
+import type {App} from "~/api/oa/app/model";
 
 
 withDefaults(
@@ -83,7 +82,7 @@ withDefaults(
       title?: string;
       desc?: string;
       buyUrl?: string;
-      form?: Article;
+      form?: App;
     }>(),
     {
       title: 'Templates',
diff --git a/pages/item/index.vue b/pages/item/index.vue
index e4a0d66..64f8cd1 100644
--- a/pages/item/index.vue
+++ b/pages/item/index.vue
@@ -5,7 +5,25 @@
   <div class="page-main md:w-screen-xl m-auto">
     <el-row :gutter="24">
       <el-col :span="18">
-        <div class="p-6 leading-7 bg-white rounded-lg text-lg line-height-loose text-gray-600 content" v-html="form?.content">
+        <div class="leading-7 bg-white rounded-lg text-lg line-height-loose text-gray-600 content">
+          <el-tabs
+              v-model="activeName"
+              type="card"
+              class="demo-tabs"
+              @tab-click="handleClick"
+          >
+            <el-tab-pane label="基本信息" name="base">基本信息</el-tab-pane>
+            <el-tab-pane label="成员管理" name="users">成员管理</el-tab-pane>
+            <el-tab-pane label="项目参数" name="param">项目参数</el-tab-pane>
+            <el-tab-pane label="账号密码" name="domain">账号密码</el-tab-pane>
+            <el-tab-pane label="开发文档" name="profile">协同文档</el-tab-pane>
+            <el-tab-pane label="项目附件" name="annex">项目附件</el-tab-pane>
+            <el-tab-pane label="项目工单" name="task">项目工单</el-tab-pane>
+            <el-tab-pane label="应用截图" name="photo">应用截图</el-tab-pane>
+            <el-tab-pane label="项目介绍" name="about">
+              <div class="p-6 content" v-html="form?.content"></div>
+            </el-tab-pane>
+          </el-tabs>
         </div>
       </el-col>
       <el-col :span="6">
@@ -31,6 +49,7 @@ import type {Article} from "~/api/cms/article/model";
 import useFormData from "~/utils/use-form-data";
 import PageBanner from './components/PageBanner.vue';
 import type {Company} from "~/api/system/company/model";
+import type {App} from "~/api/oa/app/model";
 
 // 引入状态管理
 const route = useRoute();
@@ -41,33 +60,136 @@ const nextArticle = ref<Article>();
 
 
 // 配置信息
-const { form, assignFields } = useFormData<Company>({
-  companyId: undefined,
-  companyName: undefined,
-  companyLogo: undefined,
-  shortName: undefined,
-  domain: undefined,
-  email: undefined,
-  tenantId: undefined,
-  tenantName: '',
+const { form, assignFields } = useFormData<App>({
+  // 应用id
+  appId: undefined,
+  // 应用秘钥
+  appSecret: '',
+  enName: '',
+  // 应用名称
+  appName: '',
+  // 上级id, 0是顶级
+  parentId: undefined,
+  // 应用编号
+  appCode: '',
+  // 应用图标
+  appIcon: '',
+  appQrcode: '',
+  // 应用截图
+  images: '',
+  // 应用类型
+  appType: '',
+  appTypeMultiple: undefined,
+  // 菜单类型
+  menuType: undefined,
+  // 应用地址
+  appUrl: '',
+  // 后台管理地址
+  adminUrl: undefined,
+  // 下载地址
+  downUrl: undefined,
+  serverUrl: undefined,
+  callbackUrl: undefined,
+  gitUrl: undefined,
+  docsUrl: undefined,
+  prototypeUrl: undefined,
+  ipAddress: undefined,
+  fileUrl: undefined,
+  // 应用包名
+  packageName: '',
+  // 点击次数
+  clicks: '',
+  // 安装次数
+  installs: '',
+  // 项目介绍
+  content: '',
+  // 开发者(个人)
+  developer: '',
+  director: '',
+  projectDirector: '',
+  salesman: '',
+  // 软件定价
+  price: '',
+  // 评分
+  score: '',
+  // 星级
+  star: '',
+  // 菜单组件地址
+  component: '',
+  // 菜单路由地址
+  path: '',
+  // 权限标识
+  authority: '',
+  // 打开位置
+  target: '',
+  // 是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)
+  hide: undefined,
+  // 菜单侧栏选中的path
+  active: '',
+  // 其它路由元信息
+  meta: '',
+  // 版本
+  edition: '',
+  // 版本号
+  version: '',
+  // 是否已安装
+  isUse: undefined,
+  // 排序
+  sortNumber: undefined,
+  // 备注
   comments: '',
-  nickname: undefined,
-  version: undefined,
-  createTime: undefined,
-  title: '',
-  parentName: '',
-  categoryName: ''
+  tenantName: '',
+  companyName: '',
+  // 租户编号
+  tenantCode: '',
+  // 租户id
+  tenantId: undefined,
+  // 创建时间
+  createTime: '',
+  appStatus: '开发中',
+  // 状态
+  status: undefined,
+  // 发布者
+  userId: '',
+  // 发布者昵称
+  nickname: '',
+  // 子菜单
+  children: [],
+  // 权限树回显选中状态, 0未选中, 1选中
+  checked: false,
+  //
+  key: undefined,
+  //
+  value: undefined,
+  //
+  parentIds: [],
+  //
+  openType: undefined,
+  //
+  search: undefined,
+  // 成员管理
+  users: [],
+  // 项目需求
+  requirement: '',
+  file1: '[]',
+  file2: '[]',
+  file3: '[]',
+  showCase: undefined,
+  showIndex: undefined,
+  recommend: undefined,
+  categoryName: '',
+  title: ''
 });
 
 // 请求数据
 const reload = async () => {
 
   // 存在spm(优先级高)
-  const { data: nav } = await useServerRequest<ApiResult<Company>>('/system/company/profileAll/' + getIdBySpm(5))
+  const { data: nav } = await useServerRequest<ApiResult<App>>('/oa/oa-app/' + getIdBySpm(5))
   if (nav.value?.data) {
     assignFields(nav.value.data)
     form.nickname = nav.value.data?.companyName;
-    form.title = nav.value.data?.tenantName;
+    form.title = nav.value.data?.appName;
     form.categoryName = '应用详情';
   }
 
diff --git a/pages/market/components/CardList.vue b/pages/market/components/CardList.vue
index 71d8958..c671978 100644
--- a/pages/market/components/CardList.vue
+++ b/pages/market/components/CardList.vue
@@ -14,7 +14,7 @@
                 <div class="text-gray-500">{{ item.comments }} </div>
               </p>
               <div class="button-group flex justify-center mt-3">
-                <el-button class="w-full" @click="navigateTo(`/market/detail/${item.plugId}`)">查看详情</el-button>
+                <el-button class="w-full" @click="openSpmUrl(`https://websoft.top/item`, item, item.plugId)">查看详情</el-button>
                 <el-button type="primary" v-if="item.price > 0" class="w-full" :icon="ElIconShoppingCart">购买</el-button>
                 <el-button v-else class="w-full">下载插件</el-button>
               </div>
diff --git a/pages/merchant/index.vue b/pages/merchant/index.vue
new file mode 100644
index 0000000..a9785c0
--- /dev/null
+++ b/pages/merchant/index.vue
@@ -0,0 +1,82 @@
+<template>
+
+</template>
+<script setup lang="ts">
+import type {ApiResult} from "~/api";
+import {useServerRequest} from "~/composables/useServerRequest";
+import {useConfigInfo, useForm, useToken, useWebsite} from "~/composables/configState";
+import type {BreadcrumbItem} from "~/types/global";
+import type {Navigation} from "~/api/cms/navigation/model";
+import {getIdBySpm} from "~/utils/common";
+
+// 引入状态管理
+const route = useRoute();
+const user = useUser();
+const layout = ref<any>();
+const config = useConfigInfo();
+const token = useToken();
+const form = useForm();
+const breadcrumb = ref<BreadcrumbItem>();
+
+// 请求数据
+const reload = async () => {
+
+  // 存在spm(优先级高)
+  const {data: nav} = await useServerRequest<ApiResult<Navigation>>('/cms/cms-navigation/' + getIdBySpm(5))
+  if (nav.value?.data) {
+    form.value = nav.value.data
+  } else {
+    const {data: nav} = await useServerRequest<ApiResult<Navigation>>('/cms/cms-navigation/getNavigationByPath', {query: {path: route.path}})
+    if (nav.value?.data) {
+      form.value = nav.value?.data;
+    }
+  }
+  // 页面布局
+  if (form.value?.layout) {
+    layout.value = JSON.parse(form.value?.layout)
+  }
+
+  // 未登录状态(是否强制登录)
+  if (!token.value || token.value == '') {
+    if (config.value.MustLogin) {
+      navigateTo('/passport/login');
+      return false;
+    }
+  }
+  // 判断是否开发者身份
+  if(!user.value?.merchantId){
+    navigateTo('/user/auth');
+    return false;
+  }
+  // 开发者身份者跳转控制台
+  if(user.value.merchantId){
+    console.log('已认证未开发者>')
+  }
+
+  // seo
+  useHead({
+    title: `现代Web应用开发(Vue)框架 · WEBSOFT`,
+    meta: [{name: form.value.design?.keywords, content: form.value.design?.description}],
+    bodyAttrs: {
+      class: "page-container",
+    },
+    script: [
+      {
+        children: `console.log(${JSON.stringify(form.value)})`,
+      },
+    ],
+  });
+  // 面包屑
+  breadcrumb.value = form.value
+}
+
+watch(
+    () => route.path,
+    (path) => {
+      console.log(path, '=>Path')
+
+      reload();
+    },
+    {immediate: true}
+);
+</script>
diff --git a/pages/merchant/join-in.vue b/pages/merchant/join-in.vue
new file mode 100644
index 0000000..15287b0
--- /dev/null
+++ b/pages/merchant/join-in.vue
@@ -0,0 +1,174 @@
+<template>
+  <div class="login-layout mt-[100px] m-auto sm:w-screen-xl w-full">
+    <div class="mt-[100px] m-auto flex sm:flex-row flex-col sm:p-0 p-3">
+      <!-- 用户菜单 -->
+      <UserMenu :activeIndex="activeIndex" @done="onDone" />
+      <div class="flash ml-8 bg-white rounded-lg px-7 py-4 w-full">
+        <el-tabs class="flash bg-white ml-0">
+          <el-tab-pane label="个人认证">
+            <el-form :model="form" label-width="auto" size="large" label-position="top" class="sm:w-screen-md w-full sm:py-2">
+              <el-form-item label="真实姓名">
+                <el-input v-model="form.realName" placeholder="请输入真实姓名" />
+              </el-form-item>
+              <el-form-item label="证件号码">
+                <el-input v-model="form.idCard"  placeholder="请输入证件号码" />
+              </el-form-item>
+              <el-form-item label="身份证(正面)">
+                <Upload />
+              </el-form-item>
+              <el-form-item label="身份证(反面)">
+                <Upload />
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" size="large" @click="onSubmit">提交</el-button>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+          <el-tab-pane label="企业认证">
+            <el-form :model="form" label-width="auto" size="large" label-position="top" class="sm:w-screen-md w-full sm:py-2">
+              <el-form-item label="企业名称">
+                <el-input v-model="form.companyName" placeholder="请输入企业名称" />
+              </el-form-item>
+              <el-form-item label="社会信用代码">
+                <el-input v-model="form.idCard"  placeholder="请输入社会信用代码" />
+              </el-form-item>
+              <el-form-item label="营业执照">
+                <Upload />
+              </el-form-item>
+              <el-form-item label="所属行业">
+                <el-select v-model="form.city" placeholder="请选择所属行业">
+                </el-select>
+              </el-form-item>
+              <el-form-item label="网站信息">
+                <el-input v-model="form.idCard"  placeholder="请输入网站信息" />
+              </el-form-item>
+              <el-form-item label="您的身份">
+                <el-radio-group v-model="form.sex">
+                  <el-radio value="1">法定代表人</el-radio>
+                  <el-radio value="2">被授权人</el-radio>
+                </el-radio-group>
+              </el-form-item>
+              <el-form-item label="用户协议">
+                <el-checkbox v-model="form.status">请务必提供真实信息，我司有权自行或委托第三方审查您提供的身份信息是否属真实，有效。若提供虚假信息，由此的全部后果由您承担。</el-checkbox>
+              </el-form-item>
+              <el-form-item>
+                <el-button type="primary" size="large" @click="onSubmit">提交</el-button>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+          <el-tab-pane label="个人认证成功">
+            <el-result
+                icon="success"
+                title="个人认证成功"
+                sub-title="认证完成时间 2024-09-30"
+            >
+              <template #extra>
+                <el-button type="text">修改认证信息</el-button>
+              </template>
+            </el-result>
+          </el-tab-pane>
+          <el-tab-pane label="企业认证成功">
+            <el-result
+                icon="success"
+                title="企业认证成功"
+                sub-title="认证完成时间 2024-09-30"
+            >
+              <template #extra>
+                <el-button type="text">修改认证信息</el-button>
+              </template>
+            </el-result>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+
+    </div>
+  </div>
+</template>
+<script setup lang="ts">
+import {useConfigInfo, useToken, useWebsite} from "~/composables/configState";
+import useFormData from '@/utils/use-form-data';
+import type { User } from '@/api/system/user/model';
+import { ref } from 'vue'
+import { Plus } from '@element-plus/icons-vue'
+import {useServerRequest} from "~/composables/useServerRequest";
+import type {ApiResult} from "~/api";
+import UserMenu from "~/components/UserMenu.vue";
+
+// 配置信息
+const runtimeConfig = useRuntimeConfig();
+const route = useRoute();
+const activeIndex = ref('');
+const website = useWebsite()
+const config = useConfigInfo();
+const token = useToken();
+const userInfo = ref<User>();
+
+// 配置信息
+const { form, assignFields } = useFormData<User>({
+  userId: undefined,
+  nickname: '',
+  username: '',
+  phone: '',
+  mobile: '',
+  sex: '',
+  sexName: '',
+  email: '',
+  password: '',
+  code: '',
+  smsCode: '',
+  comments: '',
+  remember: true
+});
+
+useHead({
+  title: `用户中心 - ${config.value?.siteName}`,
+  meta: [{ name: website.value.keywords, content: website.value.comments }]
+});
+
+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 handleAvatarSuccess: UploadProps['onSuccess'] = (
+    response,
+    uploadFile
+) => {
+  imageUrl.value = URL.createObjectURL(uploadFile.raw!)
+}
+
+const beforeAvatarUpload: UploadProps['beforeUpload'] = (rawFile) => {
+  if (rawFile.type !== 'image/jpeg') {
+    ElMessage.error('Avatar picture must be JPG format!')
+    return false
+  } else if (rawFile.size / 1024 / 1024 > 2) {
+    ElMessage.error('Avatar picture size can not exceed 2MB!')
+    return false
+  }
+  return true
+}
+
+const reload = async () => {
+  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);
+  }
+}
+
+watch(
+    () => route.path,
+    (path) => {
+      activeIndex.value = path;
+      console.log(path,'=>Path')
+      reload();
+    },
+    { immediate: true }
+);
+</script>
diff --git a/pages/passport/login.vue b/pages/passport/login.vue
index 7503e86..93d04ee 100644
--- a/pages/passport/login.vue
+++ b/pages/passport/login.vue
@@ -356,6 +356,7 @@ const doLogin = async (data: any) => {
     user.value.gradeName = data.user.gradeName;
     user.value.avatar = data.user.avatar;
     localStorage.setItem('UserId',data.user.userId);
+    localStorage.setItem('Avatar',data.user.avatar);
     localStorage.setItem('TID_ADMIN',data.user.tenantId);
   }
   setTimeout(() => {