7.29

src/components/IndexNews/index.vue

@@ -41,7 +41,8 @@ const Props = defineProps({
         {{ title }}
       </div>
       <div class="footer flex-row flex-aic flex-jc-sb">
-        <span>{{ handleTimeAgo(timeAgo) }}</span>
+        <!-- <span>{{ handleTimeAgo(timeAgo) }}</span> -->
+        <span>{{ timeAgo }}</span>
         <div>
           <span>{{ likeCount }}喜欢</span>·<span>{{ commentCount }}评论</span>
         </div>

src/components/IndexSection/index.vue

@@ -35,7 +35,13 @@ const Props = defineProps({
   source_type: String,
 });
 
-const emit = defineEmits(["link", "todetails"]);
+const emit = defineEmits(["link", "todetails", "other"]);
+
+//点击头像
+const other = () => {
+  console.log(22222222);
+  emit("other");
+};
 const link = () => {
   emit("video");
   emit("article");
@@ -91,7 +97,7 @@ const share = () => {
   if (Props.source_type == "article") {
     url.value =
       // "https://vr-new.hdlkeji.com/web/#/article?" + "id=" + Props.source_id;
-    "https://www.yixiangvr.com/web/#/article?" + "id=" + Props.source_id;
+      "https://www.yixiangvr.com/web/#/article?" + "id=" + Props.source_id;
   } else {
     url.value =
       "https://www.yixiangvr.com/web/#/videos?" +
@@ -177,7 +183,7 @@ const __share__ = async () => {
 
       <div class="moment-user flex-row flex-aic flex-jc-sb">
         <div class="left flex-row flex-aic">
-          <div class="avatar">
+          <div class="avatar" @click="other">
             <img
               :src="authorAvatar"
               :alt="author"
@@ -186,10 +192,11 @@ const __share__ = async () => {
           </div>
           <div class="nickname ellipsis">{{ author }}</div>
         </div>
-        <div class="ago">{{ handleTimeAgo(timeAgo) }}</div>
+        <!-- <div class="ago">{{ handleTimeAgo(timeAgo) }}</div> -->
+        <div class="ago">{{ timeAgo }}</div>
       </div>
 
-      <div class="footer" style="margin-top: 15px;">
+      <div class="footer" style="margin-top: 15px">
         <ul class="flex-row flex-aic flex-jc-sb">
           <li
             @click="tolink(0)"

src/components/Login/Login.vue

@@ -219,7 +219,7 @@ const handleLoginForm = (formInstance) => {
 
 onUnmounted(() => {
   // 组件卸载时停止监听
-  window.removeEventListener("popstate", checkForCodeInUrl);
+  // window.removeEventListener("popstate", checkForCodeInUrl);
 });
 defineExpose({
   handleSwitchChannel

src/components/TheCharts/Item.vue

@@ -1,6 +1,18 @@
 <script setup name="TheChartItem">
 import { computed, h } from "vue";
 import { getPicUrl } from "~/utils/util";
+import { useRoute,useRouter } from "vue-router";
+
+const router = useRouter()
+
+const other = (id) => {
+  router.push({
+    path: "/rest",
+    query: {
+      id: id,
+    },
+  });
+};
 
 const Props = defineProps({
   nickname: {
@@ -20,6 +32,10 @@ const Props = defineProps({
     type: String,
     default: "",
   },
+  id:{
+    type:String,
+    default:''
+  }
 });
 
 const __score_comp__ = () => {
@@ -75,7 +91,7 @@ const rendeTop = computed(() => {
   <div class="the-charts-item-container flex-row flex-aic flex-jc-sb">
     <div class="main flex-row flex-aic">
       <!-- TODO: Default Avatar https://dummyimage.com/38x38/e3e3e3/fff -->
-      <img :src="avatar" alt="" class="avatar" />
+      <img style="cursor: pointer;" :src="avatar" alt="" class="avatar" @click="other(id)"/>
       <div class="info">
         <div class="nickname">{{ nickname }}</div>
         <div class="signature">{{ signature }}</div>

src/components/TheCharts/index.vue

@@ -59,6 +59,7 @@ const handleSeeMore = () => {
           :nickname="item.username"
           :signature="item.num ? enumMapTxt(item.num) : item.introduction"
           :avatar="item.avatar"
+          :id="item.id"
         />
       </template>
     </div>
@@ -71,7 +72,6 @@ const handleSeeMore = () => {
 <style lang="scss" scoped>
 @import "~/styles/variable.scss";
 
-
 .the-charts-container {
   width: 100%;
   background-color: #fff;

src/components/layouts/Footer.vue

@@ -64,16 +64,15 @@ const tourl = (url) => {
         </p> -->
         <p>{{ content }}</p>
       </div>
-      <div class="right">
+      <!-- <div class="right">
         <ul>
           <li v-for="(item, idx) in vals" :key="idx">
-            <!-- <a href="#">{{ item.title }}</a> -->
             <span style="cursor: pointer" @click="tourl(item.url)">{{
               item.title
             }}</span>
           </li>
         </ul>
-      </div>
+      </div> -->
     </div>
     <div class="footer flex-row flex-jc-sb">
       <div class="navigation">
@@ -99,10 +98,56 @@ const tourl = (url) => {
         </ul>
       </div>
       <div class="copyright">
-        copyright © 2009 - 2023 gamecores. all rights reserved
+        ©Copyright 2023-2024上海忆象虚拟现实信息科技有限公司 版权所有
       </div>
     </div>
   </div>
+  <div
+    style="
+      display: flex;
+      /* flex-direction: column; */
+      align-items: center;
+      /* justify-content: center; */
+      justify-content: space-around;
+      margin-top: 10px;
+    "
+  >
+    <div>
+      <img
+        style="width: 16px; height: 16px; margin-right: 5px"
+        src="https://www.easemob.com/statics/images/nav/icon-copy@2x.png"
+        alt=""
+      />
+      <a
+        href="https://beian.mps.gov.cn/#/query/webSearch?code=31011502401426"
+        rel="noreferrer"
+        target="_blank"
+        style="color: #444; font-size: 14px; text-decoration: none"
+        >沪公网安备31011502401426</a
+      >
+    </div>
+    <div>
+      <a
+        href="https://beian.miit.gov.cn"
+        style="color: #444; font-size: 14px; text-decoration: none"
+        >沪ICP备2024075434号-1A</a
+      >
+    </div>
+    <div>
+      <img
+        style="width: 16px; height: 16px; margin-right: 5px"
+        src="../../assets/dz.png"
+        alt=""
+      />
+      <a
+        href="https://zzlz.gsxt.gov.cn/businessCheck/verifKey.do?showType=p&serial=91310116MAC8J1KJ5R-SAIC_SHOW_10000091310116MAC8J1KJ5R1722242843607&signData=MEUCID5dTiYHso7x1bOB72refk1+FrDFSJ4sUTZn7TiY8mbzAiEA9BwZmQr9wvRbWiS0pFdRsSxuRZnIZVjtdCeLGnjsL1c="
+        rel="noreferrer"
+        target="_blank"
+        style="color: #444; font-size: 14px; text-decoration: none"
+        >电子营业执照</a
+      >
+    </div>
+  </div>
 </template>
 
 <style lang="scss" scoped>
@@ -118,7 +163,7 @@ const tourl = (url) => {
     padding-bottom: 20px;
 
     .left {
-      width: 38%;
+      // width: 38%;
       font-size: 16px;
       font-weight: 400;
       color: #333333;

src/views/articles/index.vue

@@ -64,6 +64,15 @@ const todetails = (id) => {
     },
   });
 };
+//其他用户信息
+const other = (id) => {
+  router.push({
+    path: "/rest",
+    query: {
+      id: id,
+    },
+  });
+};
 </script>
 
 <template>
@@ -74,6 +83,7 @@ const todetails = (id) => {
       <template v-for="(item, idx) in articleList" :key="idx">
         <IndexSection
           @article="__articles__()"
+          @other="other(item.user_id)"
           @update="todetails(item.id)"
           :type="!item.image ? 'article' : 'common'"
           :title="item.title"
@@ -102,6 +112,7 @@ const todetails = (id) => {
         <div style="margin-bottom: 20px">
           <IndexSection
             @article="__article__()"
+            @other="other(item.user_id)"
             @update="todetails(item.id)"
             :type="!item.image ? 'article' : 'common'"
             :title="item.title"

src/views/forum/rest.vue

@@ -15,6 +15,7 @@ import * as user from "~/api/user";
 import * as delApi from "~/api/forum";
 import { ArrowLeft, Promotion } from "@element-plus/icons-vue";
 import {} from "vue-router";
+import * as summaryApi  from '~/api/gather'
 const router = useRouter();
 const route = useRoute();
 
@@ -39,10 +40,11 @@ useScrollEvent({
 const forumTable = ref([]);
 const __list__ = async () => {
   try {
-    const { data } = await delApi.list({
+    const { data } = await summaryApi.summary({
       is_page: 0,
-      status: "normal",
-      user_id: route.query.id,
+      // status: "normal",
+      type:'all',
+      author_id: route.query.id,
     });
     forumTable.value = data;
   } catch (error) {}

src/views/index/content.vue

@@ -47,7 +47,6 @@ const tan = ref(false);
 //   }
 // };
 
-
 const User = useUser();
 
 const RankTitleEnum = {
@@ -353,6 +352,16 @@ const handleClickTopic = (item) => {
 //   handleSwitchForumType();
 //   useForumIndex();
 // };
+
+//其他用户信息
+const other = (id) => {
+  router.push({
+    path: "/rest",
+    query: {
+      id: id,
+    },
+  });
+};
 </script>
 
 <template>
@@ -430,6 +439,7 @@ const handleClickTopic = (item) => {
       <template v-for="(item, idx) in articleList" :key="idx">
         <IndexSection
           @article="__articles__()"
+          @other="other(item.user_id)"
           @update="todetail(item.id)"
           :type="!item.image ? 'article' : 'common'"
           :title="item.title"
@@ -447,6 +457,7 @@ const handleClickTopic = (item) => {
           :is_like="item.is_like"
           :is_collect="item.is_collect"
           :source_id="item.id"
+          :user_id="item.user_id"
           source_type="article"
         />
       </template>
@@ -456,6 +467,7 @@ const handleClickTopic = (item) => {
       <template v-for="(item, idx) in videoList" :key="idx">
         <IndexSection
           @video="__videos__()"
+          @other="other(item.user_id)"
           @update="detail(item.id, 'common')"
           :type="!item.image ? 'article' : 'common'"
           :title="item?.title"
@@ -463,6 +475,7 @@ const handleClickTopic = (item) => {
           :descs="item.description"
           :topic-name="item.topic?.title"
           :author="item.user?.username"
+          :user_id="item.user_id"
           :author-avatar="item.user?.avatar"
           :view_count="item.view_count || 0"
           :comment_count="item.comment_count || 0"
@@ -507,6 +520,7 @@ const handleClickTopic = (item) => {
         <TheCharts
           :list="boutiqueList"
           type="like"
+          
           @more="handleSeeMoreRank('boutique', 'like')"
           :is-show-more="true"
           :header-title="RankTitleEnum.like"

src/views/index/search.vue

@@ -154,6 +154,14 @@ const about = async (id) => {
     User.getUser()
   } catch (error) {}
 };
+const other = (id) => {
+  router.push({
+    path: "/rest",
+    query: {
+      id: id,
+    },
+  });
+};
 </script>
 
 <template>
@@ -202,6 +210,7 @@ const about = async (id) => {
             <IndexSection
               @article="__articles__()"
               @update="todetail(item.id)"
+              @other="other(item.user_id)"
               :type="!item.image ? 'article' : 'common'"
               :title="item.title"
               :time-ago="item.created_at"
@@ -239,6 +248,7 @@ const about = async (id) => {
             <IndexSection
               @video="__videos__()"
               @update="detail(item.id, 'common')"
+              @other="other(item.user_id)"
               :type="!item.image ? 'article' : 'common'"
               :title="item?.title"
               :time-ago="item.created_at"
@@ -303,7 +313,7 @@ const about = async (id) => {
           <template v-for="(item, idx) in userList" :key="idx">
             <div class="usebox">
               <div>
-                <img :src="item.avatar" style="width: 40px;height: 40px;border-radius: 50%;" alt="" />
+                <img @click="other(item.id)" :src="item.avatar" style="width: 40px;height: 40px;border-radius: 50%;cursor: pointer;" alt="" />
                 <span>{{ item.username }}</span>
               </div>
               <div

src/views/postDetail.vue

@@ -5,7 +5,7 @@
  */
 
 import { ref, onMounted, reactive } from "vue";
-import { useRoute } from "vue-router";
+import { useRoute,useRouter } from "vue-router";
 import { placeholderPic } from "~/utils/util";
 
 import Comments from "~/components/Comments/index.vue";
@@ -19,6 +19,7 @@ import * as gatherApi from "~/api/gather";
 import * as forumApi from "~/api/forum";
 
 const Route = useRoute();
+const router = useRouter()
 let postType = ref(); // [articles, news, videos]
 postType.value = Route.name;
 const toid = () => {
@@ -296,6 +297,17 @@ const open = (url) => {
 };
 
 console.log("%c route >>>", "background: blue; color: #fff", Route, Route.name);
+
+//跳转到个人页面
+//其他用户信息
+const other = (id) => {
+  router.push({
+    path: "/rest",
+    query: {
+      id: id,
+    },
+  });
+};
 </script>
 
 <template>
@@ -345,9 +357,11 @@ console.log("%c route >>>", "background: blue; color: #fff", Route, Route.name);
     <div class="sub-title" style="text-align: center;">{{ details.description }}</div>
     <div class="author-wrapper flex-row flex-aic" style="text-align: center;justify-content: center;">
       <img
+        @click="other(details.user.id)"
         class="author__avatar circle"
         v-if="details.user.avatar"
         :src="details.user.avatar"
+        style="cursor: pointer;"
         alt=""
       />
       <div class="author__name">{{ details.user.username }}</div>

src/views/sundry/editor.vue

@@ -145,9 +145,10 @@ const toolbarConfig = {
       // 单个文件的最大体积限制，默认为 2M
       maxFileSize: 1 * 1024 * 1024, // 1M
       // 最多可上传几个文件，默认为 100
-      maxNumberOfFiles: 10,
+      maxNumberOfFiles: 1,
       // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
       allowedFileTypes: ["image/*"],
+      fieldName: "file", //上传的文件名称
       // 自定义增加 http  header
       headers: {
         "Content-Type": "multipart/form-data",
@@ -164,20 +165,74 @@ const toolbarConfig = {
       customInsert(res, insertFn) {
         // JS 语法
         // res 即服务端的返回结果
-
         console.log(
           "%c custom insert >>>",
           "background: blue; color: #fff",
           res
         );
-
         // 从 res 中找到 url alt href ，然后插入图片
         insertFn(url, alt, href);
       },
     },
   },
 };
-const editorConfig = { placeholder: "请输入正文" };
+const imageUrl = ref("");
+const editorConfig = {
+  placeholder: "请输入正文",
+  MENU_CONF: {
+    uploadImage: {
+      // 上传图片的配置
+      server: `https://www.yixiangvr.com/api/upload/image`, // 上传图片的网址
+      fieldName: "file", // 上传文件的名称
+    },
+    // uploadImage: {
+    //   server: `https://www.yixiangvr.com/api/upload/image`,
+    //   // 单个文件的最大体积限制，默认为 2M
+    //   maxFileSize: 1 * 1024 * 1024, // 1M
+    //   // 最多可上传几个文件，默认为 100
+    //   maxNumberOfFiles: 1,
+    //   // 选择文件时的类型限制，默认为 ['image/*'] 。如不想限制，则设置为 []
+    //   allowedFileTypes: ["image/*"],
+    //   // 自定义增加 http  header
+    //   headers: {
+    //     "Content-Type":
+    //       "multipart/form-data; boundary=----WebKitFormBoundarycuSQMPBGnwAMTv7h",
+    //   },
+    //   timeout: 5 * 1000, // 5 秒
+
+    //   onBeforeUpload(file) {
+    //     console.log(file);
+    //     const formdata = new FormData();
+    //     //循环找出文本二进制文件
+    //     for (let key in file) {
+    //       console.log(file[key].data);
+    //       formdata.append("image", file[key].data);
+    //     }
+    //     console.log("onBeforeUpload", file);
+    //     useUploadImage(formdata).then((res) => {
+    //       imageUrl.value = res.imageFile.value;
+    //       // 自定义插入图片
+    //     });
+    //   },
+    //   // 单个文件上传成功之后
+    //   onSuccess(file, res) {
+    //     console.log(file);
+    //   },
+    //   customInsert(res, insertFn) {
+    //     // JS 语法
+    //     // res 即服务端的返回结果
+    //     console.log(
+    //       "%c custom insert >>>",
+    //       "background: blue; color: #fff",
+    //       res
+    //     );
+
+    //     insertFn(imageUrl.value);
+    //     // 从 res 中找到 url alt href ，然后插入图片
+    //   },
+    // },
+  },
+};
 
 // 组件销毁时，也及时销毁编辑器
 onBeforeUnmount(() => {
@@ -242,7 +297,10 @@ const handleCustomUploadImage = async (options) => {
     const { imageFile } = await useUploadImage(formdata);
 
     console.log("imageCove.value", imageCove.value);
-    if (imageFile.value && route.query.type == "forum" || route.query.type == "post") {
+    if (
+      (imageFile.value && route.query.type == "forum") ||
+      route.query.type == "post"
+    ) {
       imageCove.value = [imageFile.value];
       console.log("imageFile", imageCove.value);
     } else if (imageFile.value) imageCover.value = imageFile.value;
@@ -386,8 +444,8 @@ const handleReciveTopic = (topic) => {
 const cancel = () => {
   router.go(-1);
 };
-const verdict = route.query.verdict
-const dict = route.query.dict
+const verdict = route.query.verdict;
+const dict = route.query.dict;
 </script>
 
 <template>
@@ -491,11 +549,18 @@ const dict = route.query.dict
         <div class="fixed__left">字数：{{ wordLen }}</div>
         <div class="fixed__right">
           <el-button @click="cancel">取消发布</el-button>
-          <el-button v-if="dict != 2" @click="handleRecordMoment('draft')">存草稿</el-button>
-          <el-button v-if="dict != 2" type="primary" @click="handleRecordMoment('normal')"
+          <el-button v-if="dict != 2" @click="handleRecordMoment('draft')"
+            >存草稿</el-button
+          >
+          <el-button
+            v-if="dict != 2"
+            type="primary"
+            @click="handleRecordMoment('normal')"
+            >发布</el-button
+          >
+          <el-button v-if="dict == 2" type="primary" @click="redact()"
             >发布</el-button
           >
-          <el-button v-if="dict == 2" type="primary" @click="redact()">发布</el-button>
         </div>
       </div>
     </el-footer>

src/views/video/index.vue

@@ -63,6 +63,14 @@ const pickmore = (val) => {
     },
   });
 };
+const other = (id) => {
+  router.push({
+    path: "/rest",
+    query: {
+      id: id,
+    },
+  });
+};
 </script>
 
 <template>
@@ -74,6 +82,7 @@ const pickmore = (val) => {
         <IndexSection
           @video="__articles__()"
           @update="todetails(item.id)"
+          @other="other(item.user_id)"
           :type="!item.image ? 'article' : 'common'"
           :title="item.title"
           :time-ago="item.created_at"