9.23

.env.development

@@ -1,10 +1,10 @@
 
 NODE_ENV = 'development'
 
-VUE_APP_BASE_API = "https://www.yixiangvr.com/api"
-VITE_AP_BASE_API = "https://www.yixiangvr.com/api"
-# VITE_AP_BASE_API = "https://vr-new.hdlkeji.com/api"
-# VUE_APP_BASE_API = "https://vr-new.hdlkeji.com/api"
+# VUE_APP_BASE_API = "https://www.yixiangvr.com/api"
+# VITE_AP_BASE_API = "https://www.yixiangvr.com/api"
+VITE_AP_BASE_API = "https://vr-new.hdlkeji.com/api"
+VUE_APP_BASE_API = "https://vr-new.hdlkeji.com/api"
 
 
 # VUE_APP_BASE_API = "https://vr.hdlkeji.com/api"

.env.production

@@ -1,4 +1,4 @@
 NODE_ENV = 'production'
 
-# VUE_APP_BASE_API = "https://vr-new.hdlkeji.com/api"
-VUE_APP_BASE_API = "https://www.yixiangvr.com/api"
+VUE_APP_BASE_API = "https://vr-new.hdlkeji.com/api"
+# VUE_APP_BASE_API = "https://www.yixiangvr.com/api"

src/App.vue

@@ -52,10 +52,7 @@ const local = ref(zhCn);
   text-overflow: ellipsis;
   white-space: wrap;
   overflow: hidden;
-  white-space: wrap;
   -webkit-line-clamp: 2;
   -webkit-box-orient: vertical;
-  box-orient: vertical;
-  line-clamp: 2;
 }
 </style>  

src/components/ActivateMembership/index.vue

@@ -65,6 +65,7 @@ const topay = () => {
   define();
   paysuccess();
 };
+const payimage = ref('')
 //支付接口
 const paysuccess = async () => {
   try {
@@ -87,7 +88,10 @@ const paysuccess = async () => {
       document.forms[0].submit();
       console.log(document.forms[0].submit());
     }
-    visiblePay.value = false;
+    if (index.value == "wechat") {
+      payimage.value = data.qrcode
+    }
+    // visiblePay.value = false;
   } catch (error) {}
 };
 
@@ -225,7 +229,8 @@ defineExpose({
         </div>
         <!-- <div class="paybox__countdown">支付剩余时间：14:45</div> -->
         <div class="paybox__qrcode" style="margin-top: 10px">
-          <img src="https://dummyimage.com/140x140/e3e3e3/fff?text=qrcode" />
+          <!-- <img src="https://dummyimage.com/140x140/e3e3e3/fff?text=qrcode" /> -->
+          <img :src="payimage" />
         </div>
         <div class="paybox__foot flex-row flex-aic">
           <SvgIcon name="scan" :size="30" color="rgba(152, 152, 152, 1)" />

src/components/IndexNews/index.vue

@@ -1,6 +1,8 @@
 <script setup name="IndexNews">
 // import {context} from 'vue'
 import * as formatTime from "~/utils/formatTime";
+import { useRouter, useRoute } from "vue-router";
+const router = useRouter();
 const handleTimeAgo = formatTime.timeAgo;
 
 const emit = defineEmits(["todetails"]);
@@ -28,21 +30,39 @@ const Props = defineProps({
   },
   is_like: String,
   is_collect: String,
+  topic_id: Number,
+  topic_description: String,
+  topicName: String,
 });
+//跳转到话题详情
+const topicinfo = () => {
+  router.push({
+    path: "/forum/topic/:id",
+    query: {
+      id: Props.topic_id,
+      title:Props.topicName,
+      description:Props.topic_description
+    },
+  });
+};
 </script>
 
 <template>
   <div class="index-news-container" style="cursor: pointer" @click="todetails">
     <div class="imgbox" style="margin-bottom: 10px">
       <img :src="image" :alt="title" />
-    </div>  
+    </div>
     <div class="content">
-      <div class="title ellipsis-two" style="font-weight: 600;">
+      <div class="title ellipsis-two" style="font-weight: 600">
         {{ title }}
       </div>
-      <div class="footer flex-row flex-aic flex-jc-sb"  >
+      <!-- TODO: 话题是否必填   v-show="topicName" -->
+      <div @click.stop="topicinfo" class="flag" :style="{ opacity: topicName ? '1' : '0' }">
+        #{{ topicName }}
+      </div>
+      <div class="footer flex-row flex-aic flex-jc-sb">
         <!-- <span>{{ handleTimeAgo(timeAgo) }}</span> -->
-        <span>{{ timeAgo.slice(0,10) }}</span>
+        <span>{{ timeAgo.slice(0, 10) }}</span>
         <div>
           <span>{{ likeCount }}喜欢</span>·<span>{{ commentCount }}评论</span>
         </div>
@@ -52,12 +72,19 @@ const Props = defineProps({
 </template>
 
 <style lang="scss" scoped>
+.flag {
+  height: 30px;
+  line-height: 30px;
+  font-size: 13px;
+  font-weight: 400;
+  color: #ff6700;
+}
 .index-news {
   &-container {
     background-color: #fff;
     border-radius: 6px;
     overflow: hidden;
-    height: 264px;
+    height: 300px;
     margin-bottom: 20px;
 
     .imgbox {

src/components/IndexSection/index.vue

@@ -2,6 +2,8 @@
 // import { type } from "os";
 import SvgIcon from "~/components/SvgIcon/index.vue";
 import { useUser } from "~/store/user";
+import { useRouter, useRoute } from "vue-router";
+const router = useRouter();
 import * as formatTime from "~/utils/formatTime";
 import * as gatherApi from "~/api/gather";
 import { ref } from "vue";
@@ -18,7 +20,7 @@ const Props = defineProps({
   title: String,
   timeAgo: String,
   descs: String,
-  topicName: String,
+
   author: String,
   authorAvatar: {
     type: String,
@@ -33,6 +35,9 @@ const Props = defineProps({
   is_collect: String,
   source_id: String,
   source_type: String,
+  topic_id: Number,
+  topic_description: String,
+  topicName: String,
 });
 
 const emit = defineEmits(["link", "todetails", "other"]);
@@ -56,6 +61,17 @@ const tolink = (type) => {
     collect();
   }
 };
+//跳转到话题详情
+const topicinfo = () => {
+  router.push({
+    path: "/forum/topic/:id",
+    query: {
+      id: Props.topic_id,
+      title: Props.topicName,
+      description: Props.topic_description,
+    },
+  });
+};
 //点赞
 const like = async () => {
   try {
@@ -96,11 +112,12 @@ const share = () => {
   dialogVisible.value = true;
   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://vr-new.hdlkeji.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?" +
+      // "https://www.yixiangvr.com/web/#/videos?" +
+      "https://vr-new.hdlkeji.com/web/#/videos?" +
       "id=" +
       Props.source_id +
       "&type=" +
@@ -177,7 +194,11 @@ const __share__ = async () => {
       </div>
 
       <!-- TODO: 话题是否必填   v-show="topicName" -->
-      <div class="flag" :style="{ opacity: topicName ? '1' : '0' }">
+      <div
+        @click.stop="topicinfo()"
+        class="flag"
+        :style="{ opacity: topicName ? '1' : '0' }"
+      >
         #{{ topicName }}
       </div>
 
@@ -193,7 +214,7 @@ const __share__ = async () => {
           <div class="nickname ellipsis">{{ author }}</div>
         </div>
         <!-- <div class="ago">{{ handleTimeAgo(timeAgo) }}</div> -->
-        <div class="ago">{{ timeAgo.slice(0,10) }}</div>
+        <div class="ago">{{ timeAgo.slice(0, 10) }}</div>
       </div>
 
       <div class="footer" style="margin-top: 15px">

src/components/MomentLayout/com.vue

@@ -1,31 +1,35 @@
 <script setup>
+import { ref } from "vue";
 import { placeholderPic } from "~/utils/util";
 
 const Props = defineProps({
   image: {
     type: String,
-    default: () => ([])
+    default: () => [],
   },
   title: {
-    type: String
+    type: String,
   },
-  introduction: {
-    type: String
-  }
-})
+  content: {
+    type: String,
+  },
+});
+let contenta = ref();
+console.log('image',Props.content);
+contenta.value= Props.content.replace(/\<img/g, "<img style='width:100%;height:auto;'");
+
+
 </script>
 <template>
   <div class="moment-layout-com-container">
-    <div class="cover-image" v-if="Props.image">
-      <!-- placeholderPic(600, 300) -->
-      <img style="width: 100%;" :src="Props.image" alt="">
-    </div>
+    <!-- <div class="cover-image" v-if="Props.image">
+      <img style="width: 100%" :src="Props.image" alt="" />
+    </div> -->
     <h3 class="title">{{ Props.title }}</h3>
-    <p class="content">
-      {{ Props.introduction }}
+    <p class="content" v-html="contenta">
     </p>
-  </div>
-</template>
+  </div>  
+</template>  
 
 <style lang="scss">
 .moment-layout-com-container {

src/components/MomentLayout/forumContent.vue

@@ -1,6 +1,8 @@
 <script setup>
+
 import { placeholderPic } from "~/utils/util";
 import { ArrowRight } from "@element-plus/icons-vue";
+import { ref } from "vue";
 
 const Props = defineProps({
   images: {
@@ -11,7 +13,10 @@ const Props = defineProps({
     type: String,
     default: ''
   }
+  
 })
+let contenta = ref('');
+contenta.value= Props.content.replace(/\<img/g, "<img style='width:100%;'");
 </script>
 
 <template>
@@ -20,11 +25,11 @@ const Props = defineProps({
       <!-- 这个length有问题 -->
       <el-carousel height="400px" indicator-position="outside" v-if="Props.images.length">
         <el-carousel-item v-for="(src, idx) in Props.images" :key="idx">
-          <img :src="src" />
+          <img :src="src" style="width: 100%; height: 400px" />
         </el-carousel-item>
       </el-carousel>
     </div>
-    <p class="description" v-html="Props.content"></p>
+    <p class="description" v-html="contenta"></p>
   </div>
 </template>
 

src/components/MomentLayout/index.vue

@@ -50,6 +50,7 @@ const Props = defineProps({
     type: String,
   },
 });
+console.log("type", Props.type);
 
 console.log("detail", Props.detail);
 const Emits = defineEmits(["refresh", "other", "detail", "delec"]);
@@ -115,6 +116,17 @@ const compile = (id, type) => {
     },
   });
 };
+const topiclist = (item) => {
+  console.log("111111111111111111111", item);
+  router.push({
+    path: "/forum/topic/:id",
+    query: {
+      id: item.id,
+      title: item.title,
+      description: item.description,
+    },
+  });
+};
 </script>
 
 <template>
@@ -216,7 +228,6 @@ const compile = (id, type) => {
           " -->
       <template v-if="['article', 'news'].includes(Props.type) && Props.detail">
         <component
-          v-if="Props.detail"
           :is="Common"
           :image="
             Props.detail.source ? Props.detail.source.image : Props.detail.image
@@ -224,6 +235,11 @@ const compile = (id, type) => {
           :title="
             Props.detail.source ? Props.detail.source.title : Props.detail.title
           "
+          :content="
+            Props.detail.source
+              ? Props.detail.source.content
+              : Props.detail.content
+          "
         />
       </template>
       <template v-else-if="Props.type === 'video' && Props.detail">
@@ -269,6 +285,7 @@ const compile = (id, type) => {
     <div
       v-if="Props.detail.topic"
       class="subject-of-a-talk flex-row flex-aic flex-jc-sb"
+      @click="topiclist(Props.detail.topic)"
     >
       <span>#&nbsp;{{ Props.detail.topic?.title }}</span>
       <span>{{ Props.detail.topic?.sum }}&nbsp;讨论</span>
@@ -560,4 +577,4 @@ const compile = (id, type) => {
     }
   }
 }
-</style>
+</style>

src/components/TheCharts/index.vue

@@ -32,10 +32,10 @@ const enumMapTxt = computed(() => (count) => {
       tempStr = `累计获得${count}积分`;
       break;
     case "essence":
-      tempStr = `点赞总数${count}次`;
+      tempStr = `精品贴总数${count}篇`;
       break;
     case "like":
-      tempStr = `精品贴总数${count}篇`;
+      tempStr = `点赞总数${count}次`;
       break;
   }
   return tempStr;
@@ -120,4 +120,4 @@ const handleSeeMore = () => {
     }
   }
 }
-</style>
+</style>

src/components/layouts/Footer.vue

@@ -3,6 +3,7 @@ import { ref, onMounted } from "vue";
 import { useRouter } from "vue-router";
 import * as getConfig from "~/api/common";
 import ErrorReport from "~/components/ErrorReport/index.vue";
+import * as commonApi from "~/api/common";
 const router = useRouter();
 const vals = ref([]);
 //站点描述
@@ -41,6 +42,21 @@ const upture = () => {
 const tourl = (url) => {
   window.open(url);
 };
+const adnqrcode = ref("");
+const iosqrcode = ref("");
+const wechat_official_qrcode = ref("");
+const __getbasic__ = async () => {
+  try {
+    const { data } = await commonApi.getConfig({
+      module: "basic",
+    });
+    adnqrcode.value = data.android_download_qrcode;
+    iosqrcode.value = data.ios_download_qrcode;
+    wechat_official_qrcode.value = data.wechat_official_qrcode;
+  } catch (error) {}
+};
+
+onMounted(__getbasic__);
 </script>
 
 <template>
@@ -62,17 +78,20 @@ const tourl = (url) => {
         <p>
           我们坚信游戏不止是游戏，游戏中包含的科学，文化，历史等各个层面的知识和故事，它们同时也会辐射到二次元甚至电影的领域，这些内容非常值得分享给热爱游戏的您。
         </p> -->
-        <p>{{ content }}</p>
+        <p style="text-indent: 2ch;">{{ content }}</p>
+      </div>
+      <div class="right" style="margin-right: 5px;margin-left: 5px">
+        <div style="text-align: center;">android扫码下载</div>
+        <img :src="adnqrcode" style="width: 120px;height: 120px;" alt="">
+      </div>
+      <div class="right">
+        <div style="text-align: center;">ios扫码下载</div>
+        <img :src="iosqrcode" style="width: 120px;height: 120px;" alt="">
+      </div>
+      <div class="right">
+        <div style="text-align: center;">微信公众号</div>
+        <img :src="wechat_official_qrcode" style="width: 120px;height: 120px;" alt="">
       </div>
-      <!-- <div class="right">
-        <ul>
-          <li v-for="(item, idx) in vals" :key="idx">
-            <span style="cursor: pointer" @click="tourl(item.url)">{{
-              item.title
-            }}</span>
-          </li>
-        </ul>
-      </div> -->
     </div>
     <div class="footer flex-row flex-jc-sb">
       <div class="navigation">
@@ -86,9 +105,9 @@ const tourl = (url) => {
           <li>
             <a href="#/argument?type=private"> 隐私政策 </a>
           </li>
-          <li>
+          <!-- <li>
             <a href="#/argument?type=software"> 开源软件声明 </a>
-          </li>
+          </li> -->
           <li>
             <a href="#/argument?type=personal"> 个人信息收集清单 </a>
           </li>
@@ -170,6 +189,7 @@ const tourl = (url) => {
       font-weight: 400;
       color: #333333;
       line-height: 2;
+      flex: 6;
     }
 
     .right {

src/components/layouts/Header.vue

@@ -88,8 +88,8 @@ const handleClick = (tab, event) => {
 
 //邀请
 const qrCodeValue = ref();
-// qrCodeValue.value = "https://vr.hdlkeji.com/zhuce?text=" + User.invite_code;
-qrCodeValue.value = "https://www.yixiangvr.com/zhuce?text=" + User.invite_code;
+qrCodeValue.value = "https://vr.hdlkeji.com/zhuce?text=" + User.invite_code;
+// qrCodeValue.value = "https://www.yixiangvr.com/zhuce?text=" + User.invite_code;
 const qrCodeSize = ref();
 qrCodeSize.value = 170;
 const inviteshow = ref(false);
@@ -117,19 +117,20 @@ const sum = async () => {
     tongsum.value = data;
   } catch (error) {}
 };
+sum()
 onMounted(sum);
 //跳转
 const collect = (idx) => {
   if (idx == 0) {
     router.push({
-      path: "personal",
+      path: "/personal",
       query: {
         subNavCurrent: "collect",
       },
     });
   } else {
     router.push({
-      path: "foot",
+      path: "/foot",
     });
   }
 };
@@ -620,10 +621,13 @@ onMounted(
           v-model="keyword"
           class="searchbox"
           placeholder="VR拍摄"
-          :suffix-icon="Search"
           @input="bbb"
           @keyup.enter="callMethod"
-        />
+        >
+        <template #suffix >
+          <el-icon style="cursor: pointer;" class="el-input__icon" ><search @click="callMethod"/></el-icon>
+        </template>
+      </el-input>
         <div
           v-if="searchshow"
           style="

src/components/layouts/HeaderEditor.vue

@@ -5,6 +5,7 @@ import { useUser } from "~/store/user.js";
 import { useCommonStore } from "~/store/index.js";
 import ActivateMembership from "~/components/ActivateMembership/index.vue";
 
+
 const User = useUser();
 const Common = useCommonStore();
 const Router = useRouter();
@@ -30,7 +31,7 @@ onMounted(() => {
     value.value = "article";
   } else if (route.query.type == "video") {
     value.value = "video";
-  } else {
+  } else {   
     value.value = "forum";
   }
 });

src/styles/index.scss

@@ -28,21 +28,21 @@ img {
   overflow: hidden;
 }
 
-.ellipsis {
-  @include ellipsis();
+// .ellipsis {
+//   @include ellipsis();
 
-  &-two {
-    display: -webkit-box;
-    @include ellipsis();
-    white-space: wrap;
-    -webkit-line-clamp: 2;
-    -webkit-box-orient: vertical;
-    box-orient: vertical;
-    line-clamp: 2;
-    line-height: 1.2;
-    overflow: hidden;
-  }
-}
+//   &-two {
+//     display: -webkit-box;
+//     @include ellipsis();
+//     white-space: wrap;
+//     -webkit-line-clamp: 2;
+//     -webkit-box-orient: vertical;
+//     box-orient: vertical;
+//     line-clamp: 2;
+//     line-height: 1.2;
+//     overflow: hidden;
+//   }
+// }  
 
 .flex {
   &-row {

src/views/articles/index.vue

@@ -87,7 +87,7 @@ const other = (id) => {
           @update="todetails(item.id)"
           :type="!item.image ? 'article' : 'common'"
           :title="item.title"
-          :time-ago="item.original_published_at"
+          :time-ago="item.published_at"
           :descs="item.description"
           :topic-name="item.topic?.title"
           :author="item.user?.username"
@@ -102,6 +102,8 @@ const other = (id) => {
           :is_collect="item.is_collect"
           :source_id="item.id"
           source_type="article"
+          :topic_id="item.topic?.id"
+          :topic-description="item.topic?.description"
         />
       </template>
     </div>
@@ -116,7 +118,7 @@ const other = (id) => {
             @update="todetails(item.id)"
             :type="!item.image ? 'article' : 'common'"
             :title="item.title"
-            :time-ago="item.original_published_at"
+            :time-ago="item.published_at"
             :descs="item.description"
             :topic-name="item.topic?.title"
             :author="item.user?.username"
@@ -127,10 +129,12 @@ const other = (id) => {
             :collect_count="item.collect_count"
             :share_count="item.share_count"
             :image="item.image"
-            :is_like="item.is_like"
+            :is_like="item.is_like"   
             :is_collect="item.is_collect"
             :source_id="item.id"
             source_type="article"
+            :topic_id="item.topic?.id"
+            :topic-description="item.topic?.description"
           />
         </div>
       </template>
@@ -178,4 +182,4 @@ const other = (id) => {
     column-gap: 18px;
   }
 }
-</style>
+</style>

src/views/forum/index.vue

@@ -253,7 +253,8 @@ const topicinfo = (item) => {
     path: "/forum/topic/:id",
     query: {
       id: item.id,
-      title:item.title
+      title:item.title,
+      description:item.description
     },
   });
 };

src/views/forum/topic.vue

@@ -161,6 +161,7 @@ const todetail = (type, id) => {
 
 //汇总列表
 let toptitle = ref();
+let description = ref();
 let foruminfo = ref([]);
 const __list__ = async () => {
   try {
@@ -174,6 +175,7 @@ const __list__ = async () => {
     });
     foruminfo.value = data;
     toptitle.value = data[0].topic.title;
+    description.value = data[0].topic.description
     document.title = "【" + toptitle.value + "】话题";
   } catch (error) {}
 };
@@ -195,6 +197,7 @@ onMounted(__news__);
 const topicid = ref();
 topicid.value = route.query.id;
 toptitle.value = route.query.title;
+description.value = route.query.description;
 
 //参加话题
 const jointopic = () => {
@@ -223,6 +226,7 @@ const topicinfo = (item) => {
     query: {
       id: item.id,
       title: item.title,
+      description:item.description
     },
   });
 };
@@ -271,7 +275,7 @@ onMounted(() => {
         </div>
         <div class="topic__header-main">
           <div class="topic-title">#{{ toptitle }}</div>
-          <p class="topic-descs">记录你生活的点点滴滴</p>
+          <p class="topic-descs">{{ description }}</p>
           <el-button type="primary" :icon="EditPen" @click="jointopic"
             >参与</el-button
           >
@@ -285,7 +289,7 @@ onMounted(() => {
             @refresh="handleRefreshListData"
           /> -->
           <MomentLayout
-            type="forum"
+            :type="item.source_type"
             :detail="item"
             @refresh="handleRefreshListData"
             @detail="todetail(item.source_type, item.id)"

src/views/index/components/Recommend.vue

@@ -39,11 +39,13 @@ const next = () => {
 };
 
 //跳转到该话题
-const topicinfo = (id) => {
+const topicinfo = (item) => {
   router.push({
     path: "/forum/topic/:id",
     query: {
-      id: id,
+      id: item.id,
+      title:item.title,
+      description:item.description
     },
   });
 };
@@ -66,7 +68,7 @@ const topicinfo = (id) => {
     <div class="main">
       <ul class="">
         <li
-          @click="topicinfo(item.id)"
+          @click="topicinfo(item)"
           v-for="(item, idx) in list"
           :key="idx"
           class="flex-row flex-aic"

src/views/index/content.vue

@@ -4,6 +4,7 @@ import { ref, onMounted, reactive, onActivated } from "vue";
 import { useUser } from "~/store/user";
 
 import IndexTitle from "~/components/IndexTitle/index.vue";
+import Title from "~/components/Title/title.vue";
 import IndexNews from "~/components/IndexNews/index.vue";
 import IndexSection from "~/components/IndexSection/index.vue";
 import YXFooter from "~/components/layouts/Footer.vue";
@@ -61,7 +62,9 @@ const __news__ = async () => {
   try {
     const { data } = await newsApi.list({
       is_page: 0,
-      is_boutique: 1,
+      is_boutique: 0,
+      // format_type:'date'
+      status:'normal'
     });
     newsList.value = data;
   } catch (error) {}
@@ -74,7 +77,9 @@ const __articles__ = async () => {
   try {
     const { data } = await articleApi.list({
       is_page: 0,
-      is_boutique: 1,
+      is_boutique: 0,
+      status:'normal'
+      // format_type:'date'
     });
     articleList.value = data;
   } catch (error) {}
@@ -86,7 +91,9 @@ const __videos__ = async () => {
   try {
     const { data } = await videoApi.list({
       is_page: 0,
-      is_boutique: 1,
+      is_boutique: 0,
+      status:'normal'
+      // format_type:'date'
     });
     videoList.value = data;
   } catch (error) {}
@@ -94,11 +101,11 @@ const __videos__ = async () => {
 onMounted(__videos__);
 
 let topicList = ref([]);
-const __topic__ = async () => {
+const __topic__ = async () => {   
   try {
     const { data } = await topicApi.list({
       is_page: 0,
-      is_recommend: 1,
+      is_recommend: 0,
     });
     topicList.value = data;
   } catch (error) {}
@@ -210,11 +217,14 @@ onActivated(() => {
   __news__();
 });
 //跳转到话题详情
-const topicinfo = (id) => {
+const topicinfo = (item) => {
+  console.log(item);
   router.push({
     path: "/forum/topic/:id",
     query: {
-      id: id,
+      id: item.id,
+      title: item.title,
+      description: item.description,
     },
   });
 };
@@ -324,6 +334,8 @@ const handleClickTopic = (item) => {
     path: "/forum/topic/:id",
     query: {
       id: item.id,
+      title: item.title,
+      description: item.description,
     },
   });
   visibleDialog.value = false;
@@ -419,22 +431,27 @@ const other = (id) => {
     <div class="banner">
       <Banner type="index" />
     </div>
-    <IndexTitle title="精选资讯" @seeMore="zixunMore" />
+    <!-- <IndexTitle title="精选资讯" @seeMore="zixunMore" /> -->
+    <Title title="最新资讯" @seeMore="zixunMore" />
     <div class="content-list flex-row">
       <template v-for="(item, idx) in newsList" :key="idx">
         <IndexNews
           @update="todetails(item.id)"
           :title="item.title"
-          :time-ago="item.original_published_at"
+          :time-ago="item.published_at"
           :like-count="item.like_count || '0'"
           :comment-count="item.comment_count || '0'"
           :image="item.image"
           :is_like="item.is_like"
           :is_collect="item.is_collect"
+          :topic-name="item.topic?.title"
+          :topic_id="item.topic?.id"
+          :topic_description="item.topic?.description"
         />
       </template>
     </div>
-    <IndexTitle title="精选文章" @seeMore="pickmore" />
+    <!-- <IndexTitle title="精选文章" @seeMore="pickmore" /> -->
+    <Title title="最新文章" @seeMore="pickmore" />
     <div class="content-list content-list--c2 flex-row">
       <template v-for="(item, idx) in articleList" :key="idx">
         <IndexSection
@@ -443,9 +460,11 @@ const other = (id) => {
           @update="todetail(item.id)"
           :type="!item.image ? 'article' : 'common'"
           :title="item.title"
-          :time-ago="item.original_published_at"
+          :time-ago="item.published_at"
           :descs="item.description"
           :topic-name="item.topic?.title"
+          :topic_id="item.topic?.id"
+          :topic_description="item.topic?.description"
           :author="item.user?.username"
           :author-avatar="item.user?.avatar"
           :view_count="item.view_count || 0"
@@ -462,7 +481,8 @@ const other = (id) => {
         />
       </template>
     </div>
-    <IndexTitle title="精选视频" @seeMore="pickmore" />
+    <!-- <IndexTitle title="精选视频" @seeMore="pickmore" /> -->
+    <Title title="最新视频" @seeMore="pickmore" />
     <div class="content-list content-list--c2 flex-row">
       <template v-for="(item, idx) in videoList" :key="idx">
         <IndexSection
@@ -471,9 +491,11 @@ const other = (id) => {
           @update="detail(item.id, 'common')"
           :type="!item.image ? 'article' : 'common'"
           :title="item?.title"
-          :time-ago="item.original_published_at"
+          :time-ago="item.published_at"
           :descs="item.description"
-          :topic-name="item.topic?.title"
+          :topic_name="item.topic?.title"
+          :topic_id="item.topic?.id"   
+          :topic-description="item.topic?.description"
           :author="item.user?.username"
           :user_id="item.user_id"
           :author-avatar="item.user?.avatar"
@@ -493,7 +515,7 @@ const other = (id) => {
     <IndexTitle @seeMore="topicMore" title="大家在聊" />
     <div class="tags-container flex-row">
       <template v-for="(item, idx) in topicList" :key="idx">
-        <div @click="topicinfo(item.id)" class="tagbox">
+        <div @click="topicinfo(item)" class="tagbox">
           <span>{{ item.title }}</span>
         </div>
       </template>
@@ -520,7 +542,6 @@ const other = (id) => {
         <TheCharts
           :list="boutiqueList"
           type="like"
-          
           @more="handleSeeMoreRank('boutique', 'like')"
           :is-show-more="true"
           :header-title="RankTitleEnum.like"
@@ -668,7 +689,7 @@ const other = (id) => {
       margin-bottom: 30px;
       column-gap: 18px;
       flex-wrap: wrap;
-      height: 280px;
+      height: 300px;
       overflow: hidden;
 
       &--c2 {

src/views/index/search.vue

@@ -183,7 +183,7 @@ const other = (id) => {
             <IndexNews
               @update="todetails(item.id)"
               :title="item.title"
-              :time-ago="item.original_published_at"
+              :time-ago="item.published_at"
               :like-count="item.like_count || '0'"
               :comment-count="item.comment_count || '0'"
               :image="item.image"
@@ -213,7 +213,7 @@ const other = (id) => {
               @other="other(item.user_id)"
               :type="!item.image ? 'article' : 'common'"
               :title="item.title"
-              :time-ago="item.original_published_at"
+              :time-ago="item.published_at"
               :descs="item.description"
               :topic-name="item.topic?.title"
               :author="item.user?.username"
@@ -251,7 +251,7 @@ const other = (id) => {
               @other="other(item.user_id)"
               :type="!item.image ? 'article' : 'common'"
               :title="item?.title"
-              :time-ago="item.original_published_at"
+              :time-ago="item.published_at"
               :descs="item.description"
               :topic-name="item.topic?.title"
               :author="item.user?.username"
@@ -285,7 +285,7 @@ const other = (id) => {
           <template v-for="(item, idx) in postList" :key="idx">
             <IndexNews
               @update="details(item.id)"
-              :time-ago="item.original_published_at"
+              :time-ago="item.published_at"
               :like-count="item.like_count || '0'"
               :comment-count="item.comment_count || '0'"
               :image="item.images?item.images[0]:''"

src/views/market/outshoping.vue

@@ -30,6 +30,7 @@ const tourl = () => {
   <div class="out-shop-container">
     <div class="out-shop__header">
       <div class="title">即将前往外部链接</div>
+      <!-- <div class="title">商城筹建中，敬请期待 !</div> -->
       <div class="tips">请注意个人账号与财产安全</div>
     </div>
     <div class="out-shop__main">
@@ -38,7 +39,8 @@ const tourl = () => {
       </template>
     </div>
     <div class="out-shop__footer">
-      <el-button type="primary" size="large" @click="tourl">继续跳转</el-button>
+      <el-button type="primary" size="large" >商城筹建中，敬请期待 !</el-button>
+      <!-- <el-button type="primary" size="large" @click="tourl">继续跳转</el-button> -->
     </div>
   </div>
 </template>

src/views/more.vue

@@ -11,21 +11,26 @@ import * as videoApi from "~/api/video";
 import * as articleApi from "~/api/article";
 //标题
 // 精选视频
+const total = ref(0);
+const page = ref(0);
 let videoList = ref([]);
 const __videos__ = async () => {
   try {
     const { data } = await videoApi.list({
-      is_page: 0,
-      is_boutique: 1,
+      page: page.value,
+      limit: 12,
+      is_page: 1,
+      is_boutique: 0,
+      status: "normal",
     });
-    videoList.value = data;
-    total.value = data.length;
+    videoList.value = data.list;
+    total.value = data.total;
   } catch (error) {}
 };
 //分页器
 const handleCurrentChange = (val) => {
   page.value = val;
-  if (title.value == "精选视频") {
+  if (title.value == "最新视频") {
     __videos__();
   } else {
     __articles__();
@@ -33,23 +38,23 @@ const handleCurrentChange = (val) => {
 };
 
 //精彩文章
-const total = ref(0);
-const page = ref(0);
+
 const __articles__ = async () => {
   try {
     const { data } = await articleApi.list({
       page: page.value,
       limit: 12,
-      is_page: 0,
-      is_boutique: 1,
+      is_page: 1,
+      is_boutique: 0,
+      status: "normal",
     });
-    videoList.value = data;
-    total.value = data.length;
+    videoList.value = data.list;
+    total.value = data.total;
   } catch (error) {}
 };
 const title = ref("");
 title.value = route.query.title;
-if (title.value == "精选视频") {
+if (title.value == "最新视频") {
   onMounted(__videos__);
 } else {
   onMounted(__articles__);
@@ -86,7 +91,7 @@ const todetails = (id, type) => {
             @update="todetails(item.id, !item.image ? 'article' : 'common')"
             :type="!item.image ? 'article' : 'common'"
             :title="item.title"
-            :time-ago="item.original_published_at"
+            :time-ago="item.published_at"
             :descs="item.description"
             :topic-name="item.topic?.title"
             :author="item.user?.username"
@@ -169,4 +174,4 @@ const todetails = (id, type) => {
     flex-wrap: wrap;
   }
 }
-</style>
+</style>

src/views/personal/components/sett.vue

@@ -534,8 +534,8 @@ const User = useUser();
 const modelValue = ref(false);
 //邀请
 const qrCodeValue = ref();
-qrCodeValue.value = "https://www.yixiangvr.com/zhuce?text=" + User.invite_code;
-// qrCodeValue.value = "https://vr-new.hdlkeji.com/zhuce?text=" + User.invite_code;
+// qrCodeValue.value = "https://www.yixiangvr.com/zhuce?text=" + User.invite_code;
+qrCodeValue.value = "https://vr-new.hdlkeji.com/zhuce?text=" + User.invite_code;
 const qrCodeSize = ref();
 qrCodeSize.value = 170;
 const inviteshow = ref(false);

src/views/personal/index.vue

@@ -651,7 +651,7 @@ const other = (id) => {
                 style="width: 260px"
                 @update="todetails(item.id)"
                 :title="item.title"
-                :time-ago="item.original_published_at"
+                :time-ago="item.published_at"
                 :like-count="item.like_count || '0'"
                 :comment-count="item.comment_count || '0'"
                 :image="item.image"

src/views/postDetail.vue

@@ -5,7 +5,7 @@
  */
 
 import { ref, onMounted, reactive } from "vue";
-import { useRoute,useRouter } from "vue-router";
+import { useRoute, useRouter } from "vue-router";
 import { placeholderPic } from "~/utils/util";
 
 import Comments from "~/components/Comments/index.vue";
@@ -19,7 +19,7 @@ import * as gatherApi from "~/api/gather";
 import * as forumApi from "~/api/forum";
 
 const Route = useRoute();
-const router = useRouter()
+const router = useRouter();
 let postType = ref(); // [articles, news, videos]
 postType.value = Route.name;
 const toid = () => {
@@ -73,7 +73,8 @@ const details = reactive({
   is_comment: "",
   is_follow: "",
   video_title: "",
-  created_at:''
+  created_at: "",
+  topic: {},
 });
 //资讯
 const __postDetail__ = async () => {
@@ -99,7 +100,8 @@ const __postDetail__ = async () => {
       is_collect: data.is_collect,
       is_comment: data.is_comment,
       is_follow: data.is_follow,
-      created_at:data.original_published_at
+      created_at: data.published_at,
+      topic: data.topic,
     });
   } catch (error) {}
 };
@@ -127,7 +129,8 @@ const __articlesDetail__ = async () => {
       is_collect: data.is_collect,
       is_comment: data.is_comment,
       is_follow: data.is_follow,
-      created_at:data.original_published_at
+      created_at: data.published_at,
+      topic: data.topic,
     });
   } catch (error) {}
 };
@@ -157,7 +160,8 @@ const __videoDetail__ = async () => {
       is_comment: data.is_comment,
       is_follow: data.is_follow,
       video_title: data.video_title,
-      created_at:data.original_published_at
+      created_at: data.published_at,
+      topic: data.topic,
     });
   } catch (error) {}
 };
@@ -186,7 +190,8 @@ const __posDetail__ = async () => {
       is_collect: data.is_collect,
       is_comment: data.is_comment,
       is_follow: data.is_follow,
-      created_at:data.original_published_at
+      created_at: data.published_at,
+      topic: data.topic,
     });
   } catch (error) {}
 };
@@ -308,6 +313,18 @@ const other = (id) => {
     },
   });
 };
+
+//跳转到话题详情
+const topicinfo = (item) => {
+  router.push({
+    path: "/forum/topic/:id",
+    query: {
+      id: item.id,
+      title: item.title,
+      description: item.description,
+    },
+  });
+};
 </script>
 
 <template>
@@ -316,8 +333,8 @@ const other = (id) => {
     v-if="Route.name == 'videos'"
     @click="open(details.video_url)"
   >
-    <div  class="flex-row" style="align-items: center;">
-      <div style="position: relative" >
+    <div class="flex-row" style="align-items: center">
+      <div style="position: relative">
         <div>
           <img
             style="width: 176px; height: 99px; border-radius: 10px"
@@ -341,7 +358,9 @@ const other = (id) => {
           />
         </div>
       </div>
-      <div class="video_title" style="margin-left: 18px;">{{ details.video_title }}</div>
+      <div class="video_title" style="margin-left: 18px">
+        {{ details.video_title }}
+      </div>
     </div>
     <div>
       <img
@@ -353,19 +372,26 @@ const other = (id) => {
   </div>
   <div class="post-container">
     <!-- TODO: Videos box -->
-    <div class="title" style="text-align: center;">{{ details.title }}</div>
-    <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;">
+    <div class="title" style="text-align: center">{{ details.title }}</div>
+    <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;"
+        style="cursor: pointer"
         alt=""
       />
       <div class="author__name">{{ details.user.username }}</div>
-      <div class="author__post-time" style="margin-left: 10px;" >{{ details.created_at }}</div>
+      <div class="author__post-time" style="margin-left: 10px">
+        {{ details.created_at }}
+      </div>
     </div>
     <div class="tip">本文系用户投稿，不代表忆象网观点</div>
     <div
@@ -373,6 +399,15 @@ const other = (id) => {
       class="post-context"
       v-html="details.content"
     ></div>
+    <div
+      v-if="details.topic"
+      style="cursor: pointer"
+      @click="topicinfo(details.topic)"
+      class="flag"
+      :style="{ opacity: details.topic.title ? 1 : 0 }"
+    >
+      #{{ details.topic.title }}
+    </div>
     <div v-if="detaildType == 'post'">
       <div v-for="(item, idx) in details.image" :key="idx">
         <img style="width: 700px; margin-top: 24px" :src="item" alt="" />
@@ -454,6 +489,14 @@ const other = (id) => {
 </template>
 
 <style lang="scss" scoped>
+.flag {
+  height: 30px;
+  line-height: 30px;
+  font-size: 18px;
+  font-weight: 400;
+  color: #ff6700;
+  margin-top: 20px;
+}
 .video_title {
   font-family: PingFangSC, PingFang SC;
   font-weight: 600;
@@ -567,4 +610,4 @@ const other = (id) => {
     color: #555555;
   }
 }
-</style>
+</style>

src/views/video/index.vue

@@ -85,7 +85,7 @@ const other = (id) => {
           @other="other(item.user_id)"
           :type="!item.image ? 'article' : 'common'"
           :title="item.title"
-          :time-ago="item.original_published_at"
+          :time-ago="item.published_at"
           :descs="item.description"
           :topic-name="item.topic?.title"
           :author="item.user?.username"
@@ -100,6 +100,8 @@ const other = (id) => {
           :source_id="item.id"
           :like_count="item.like_count"
           source_type="video"
+          :topic_id="item.topic?.id"
+          :topic-description="item.topic?.description"
         />
       </template>
     </div>
@@ -113,7 +115,7 @@ const other = (id) => {
             @update="todetails(item.id)"
             :type="!item.image ? 'article' : 'common'"
             :title="item.title"
-            :time-ago="item.original_published_at"
+            :time-ago="item.published_at"
             :descs="item.description"
             :topic-name="item.topic?.title"
             :author="item.user?.username"
@@ -128,6 +130,8 @@ const other = (id) => {
             :source_id="item.id"
             :like_count="item.like_count"
             source_type="video"
+            :topic_id="item.topic?.id"
+            :topic-description="item.topic?.description"
           />
         </div>
       </template>
@@ -175,4 +179,4 @@ const other = (id) => {
     margin-bottom: 30px;
   }
 }
-</style>
+</style>

src/views/zixun.vue

@@ -49,7 +49,7 @@ const todetails = (id) => {
         <IndexNews
           @update="todetails(item.id)"
           :title="item.title"
-          :time-ago="item.original_published_at"
+          :time-ago="item.published_at"
           :like-count="item.like_count"
           :comment-count="item.comment_count"
           :image="item.image"

src/views/zixun/index.vue

@@ -65,17 +65,20 @@ const zixunMore = (val) => {
   <div class="articles-container">
     <Banner type="info" />
     <IndexTitle title="精选资讯" @seeMore="zixunMore" />
-    <div class="content-list flex-row" style="height: 280px;">
+    <div class="content-list flex-row" style="height: 300px;">
       <template v-for="(item, idx) in newsList" :key="idx">
         <IndexNews
           @update="todetails(item.id)"
           :title="item.title"
-          :time-ago="item.original_published_at"
+          :time-ago="item.published_at"
           :like-count="item.like_count"
           :comment-count="item.comment_count"
           :image="item.image"
           :is_like="item.is_like"
           :is_collect="item.is_collect"
+          :topic-name="item.topic?.title"
+          :topic_id="item.topic?.id"
+          :topic_description="item.topic?.description"
         />
       </template>
     </div>
@@ -86,12 +89,15 @@ const zixunMore = (val) => {
         <IndexNews
           @update="todetails(item.id)"
           :title="item.title"
-          :time-ago="item.original_published_at"
+          :time-ago="item.published_at"
           :like-count="item.like_count"
           :comment-count="item.comment_count"
           :image="item.image"
           :is_like="item.is_like"
           :is_collect="item.is_collect"
+          :topic-name="item.topic?.title"
+          :topic_id="item.topic?.id"
+          :topic_description="item.topic?.description"
         />
       </template>
     </div>

vite.config.js

@@ -29,8 +29,8 @@ export default defineConfig({
   server: {
     proxy: {
       '/api': {
-        target: 'https://www.yixiangvr.com/api/',
-        // target: 'https://vr-new.hdlkeji.com/api/',
+        // target: 'https://www.yixiangvr.com/api/',
+        target: 'https://vr-new.hdlkeji.com/api/',
         changeOrigin: true,
         rewrite: path => path.replace(/^\/api/, ''),
       }