Trang chủ Khám phá Trợ giúp
Đăng ký Đăng nhập
qcf
/
pc--vr
1
0
Fork 0
Các tập tin Các vấn đề 0 Yêu cầu khéo về 0 Wiki
Browse Source

4.19

zhaogongxue 11 tháng trước cách đây
mục cha
ca2a177183
commit
824ace24ba
29 tập tin đã thay đổi với 975 bổ sung và 222 xóa
Split View Hiển thị tình trạng sai khác
  1. 0 1
      dist/assets/Footer.f4f6b959.css
  2. 0 0
      dist/assets/index.vue_vue_type_style_index_0_scoped_true_lang.152134e5.css
  3. 2 2
      dist/index.html
  4. 1 1
      src/api/common.js
  5. 6 0
      src/api/user.js
  6. 3 2
      src/components/ActivateMembership/index.vue
  7. 92 42
      src/components/MomentLayout/index.vue
  8. 79 9
      src/components/UserCard/index.vue
  9. 42 37
      src/components/layouts/Footer.vue
  10. 61 13
      src/components/layouts/Header.vue
  11. 5 0
      src/router/index.js
  12. 2 0
      src/store/user.js
  13. 5 3
      src/useHook/useUserOperate.js
  14. 2 2
      src/utils/constance.js
  15. 1 1
      src/views/articles/index.vue
  16. 45 15
      src/views/forum/index.vue
  17. 1 1
      src/views/index/content.vue
  18. 91 15
      src/views/index/follow.vue
  19. 2 6
      src/views/market/conversion.vue
  20. 1 1
      src/views/market/placeOrder.vue
  21. 2 2
      src/views/more.vue
  22. 61 25
      src/views/personal/components/sett.vue
  23. 390 23
      src/views/personal/index.vue
  24. 22 11
      src/views/personal/make.vue
  25. 13 2
      src/views/postDetail.vue
  26. 13 3
      src/views/reservation/index.vue
  27. 30 2
      src/views/tongzhi/components/comment.vue
  28. 2 2
      src/views/tongzhi/components/inform.vue
  29. 1 1
      src/views/zixun/index.vue

+ 0 - 1
dist/assets/Footer.f4f6b959.css
Xem Tập Tin 

@@ -1 +0,0 @@
 
-.index-title-container[data-v-3b883079]{padding-left:16px;border-left:4px solid #00b0b0}.index-title-container .title[data-v-3b883079]{font-size:18px;font-weight:600;color:#333;line-height:2em}.index-title-container .more[data-v-3b883079]{cursor:pointer;font-size:14px;font-weight:400;color:#57c3c2;color:#00b0b0}.index-title-container .more span[data-v-3b883079]{display:inline-block;margin-right:6px}.index-title-container .more .icon[data-v-3b883079]{border-radius:50%;border:1px solid #00b0b0}.layout-footer-container .line[data-v-90c226da]{margin-top:20px;height:2px;background:#e5e5e5;margin-bottom:40px}.layout-footer-container .content[data-v-90c226da]{padding-bottom:20px}.layout-footer-container .content .left[data-v-90c226da]{width:38%;font-size:16px;font-weight:400;color:#333;line-height:2}.layout-footer-container .content .right[data-v-90c226da]{width:0;flex:1;line-height:34px}.layout-footer-container .content .right ul[data-v-90c226da]{list-style:none}.layout-footer-container .content .right ul li[data-v-90c226da]{text-align:right;font-size:14px;font-family:SFPro,SFPro;font-weight:400}.layout-footer-container .content .right ul li a[data-v-90c226da]{text-decoration:none;color:#666}.layout-footer-container .footer .navigation ul[data-v-90c226da]{padding:0;margin:0;list-style:none;column-gap:14px;font-size:14px;font-family:PingFangSC,PingFang SC;font-weight:400;line-height:20px}.layout-footer-container .footer .navigation ul a[data-v-90c226da]{color:#444}

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
dist/assets/index.vue_vue_type_style_index_0_scoped_true_lang.152134e5.css


+ 2 - 2
dist/index.html
Xem Tập Tin 

@@ -6,8 +6,8 @@
 
   <link rel="icon" href="./favicon.ico" />
 
   <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
   <title>Vite App</title>
 
-  <script type="module" crossorigin src="./assets/index.fd04c950.js"></script>
 
-  <link rel="stylesheet" href="./assets/index.05afc744.css">
 
+  <script type="module" crossorigin src="./assets/index.67a4211c.js"></script>
 
+  <link rel="stylesheet" href="./assets/index.65f6f037.css">
 
 </head>
 
 
 <body>

+ 1 - 1
src/api/common.js
Xem Tập Tin 

@@ -41,7 +41,7 @@ export const getConfig = params => request({
 
 })
 
 
 // 资质证书列表
 
-export const getQualification = params => request({
 
+export const getQualification = () => request({
 
   method: 'GET',
 
   url: 'qualification'
 
 })

+ 6 - 0
src/api/user.js
Xem Tập Tin 

@@ -141,6 +141,12 @@ export const feedback = data => request({
 
   method: 'POST',
 
   data
 
 })
 
+//额外字段
 
+export const extra = params => request({
 
+  url: 'user/extra',
 
+  method: 'GET',
 
+  params
 
+})

+ 3 - 2
src/components/ActivateMembership/index.vue
Xem Tập Tin 

@@ -129,9 +129,10 @@ const handleLogin = () => {
 
         <div class="left">
 
           <div class="title">开通权益</div>
 
           <ul>
 
-            <li>购买额外赠送{{ info.integral }}积分</li>
 
+            <li>购买额外赠送{{ info.integral||0 }}积分</li>
 
             <li>开通赠送{{ info.coupon_count || 0 }}张优惠券</li>
 
-            <li>开通会员天数{{ info.days }}天</li>
 
+            <li>升级领福利</li>
 
+            <li>积分商城折扣</li>
 
           </ul>
 
         </div>
 
         <div class="right">

+ 92 - 42
src/components/MomentLayout/index.vue
Xem Tập Tin 

@@ -15,7 +15,8 @@ import debounce from "lodash/debounce";
 
 import { useUserOperate } from "~/useHook/useUserOperate";
 
 import { useTools } from "~/useHook/useTools";
 
 import { ElMessage } from "element-plus";
 
-
 
+import { useUser } from "~/store/user";
 
+const User = useUser();
 
 const { getSvgCol } = useTools();
 
 
 const {
 
@@ -33,9 +34,13 @@ const Props = defineProps({
 
     type: Object,
 
     default: () => ({}),
 
   },
 
+  add: {
 
+    type: String,
 
+  },
 
 });
 
 
-const Emits = defineEmits(["refresh", "todetails"]);
 
+console.log("detail", Props.detail);
 
+const Emits = defineEmits(["refresh", "other", "detail", "delec"]);
 
 const Author = Props.detail.user ? toReactive(toRefs(Props.detail?.user)) : {};
 
 
 console.log("%c author >>>", "background: blue; color: #fff", Author);
 
@@ -48,19 +53,17 @@ const handleOperate = debounce(async function (type) {
 
     // 如果是消息跳转到详情评论
 
     // TODO: jump to message
 
     if (type === "message") {
 
-      return;
 
+      Emits("detail");
 
     }
 
     const fObjs = {
 
       like: __operate_link__,
 
       collect: __operate_collect__,
 
       forward: __operate_share__,
 
     };
 
-
 
-    const result = await fObjs[type](Props.type, Props.detail.id);
 
-
 
-    // TODO: 分享接口成功后要弹出 链接供用户使用
 
-    // 分享不弹出提示。
 
-
 
+    const result = await fObjs[type](
 
+      Props.type,
 
+      Props.add == "fllow" ? Props.detail.source.id : Props.detail.id
 
+    );
 
     ElMessage.success(result.msg);
 
     Emits("refresh");
 
   } catch (error) {
 
@@ -69,24 +72,23 @@ const handleOperate = debounce(async function (type) {
 
 }, 200);
 
 
 //点击头像
 
-
 
-const others = (id) => {
 
-  Emits("other", id);
 
+const other = () => {
 
+  Emits("other");
 
+};
 
+const detail = () => {
 
+  Emits("detail");
 
 };
 
-const todetail = (id) => {
 
-  Emits("detail", id);
 
+const delec = () => {
 
+  Emits("delec");
 
+  console.log("111");
 
 };
 
 </script>
 
 
 <template>
 
-  <div class="moment-layout-container">
 
+  <div class="moment-layout-container" style="margin-bottom: 20px">
 
     <!-- header -->
 
     <div class="header flex-row flex-aic flex-jc-sb">
 
-      <div
 
-        class="avatar"
 
-        style="cursor: pointer"
 
-        @click="others(Author.user_id)"
 
-      >
 
+      <div class="avatar" style="cursor: pointer" @click="other(Author.id)">
 
         <!-- https://dummyimage.com/40x40/e3e3e3/fff -->
 
         <img :src="Author.avatar" alt="" />
 
       </div>
 
@@ -119,8 +121,9 @@ const todetail = (id) => {
 
               </el-icon>
 
             </template>
 
             <div class="more__main">
 
-              <ul>
 
-                <li @click="handleReportError">举报</li>
 
+              <ul style="cursor: pointer">
 
+                <li v-if="Author.id == User.id" @click="delec">删除</li>
 
+                <li v-else @click="handleReportError">举报</li>
 
               </ul>
 
             </div>
 
           </el-popover>
 
@@ -129,7 +132,7 @@ const todetail = (id) => {
 
     </div>
 
 
     <!-- main -->
 
-    <div class="main" @click="todetail">
 
+    <div class="main" @click="detail">
 
       <!-- 
         放置多种内容
 
         文章内容
 
@@ -138,27 +141,41 @@ const todetail = (id) => {
 
         视频内容
 
         论坛内容 PS: 可以多图
 
        -->
 
-      <template v-if="['article', 'news'].includes(Props.type)">
 
+      <template v-if="['article', 'news', 'info'].includes(Props.type)">
 
         <component
 
           :is="Common"
 
-          :image="Props.detail.image"
 
-          :title="Props.detail.title"
 
-          :introduction="Props.detail.description"
 
+          :image="Props.detail.image || Props.detail.source.image"
 
+          :title="Props.detail.title || Props.detail.source.title"
 
+          :introduction="
 
+            Props.detail.description
 
+              ? Props.detail.description
 
+              : Props.detail.source.description
 
+          "
 
         />
 
       </template>
 
       <template v-else-if="Props.type === 'video'">
 
         <component
 
           :is="videoContent"
 
-          :image="Props.detail.image"
 
-          :video-title="Props.detail.video_title"
 
-          :introdection="Props.detail.title"
 
+          :image="Props.detail.image || Props.detail.source.image"
 
+          :video-title="
 
+            Props.detail.video_title || Props.detail.source.video_title
 
+          "
 
+          :introdection="Props.detail.title || Props.detail.source.title"
 
         />
 
       </template>
 
-      <template v-else-if="Props.type === 'forum'">
 
+      <template v-else>
 
         <component
 
           :is="forumContent"
 
-          :images="Props.detail.images"
 
-          :content="Props.detail.content"
 
+          :images="
 
+            Props.detail.images
 
+              ? Props.detail.images
 
+              : Props.detail.source.images
 
+          "
 
+          :content="
 
+            Props.detail.content
 
+              ? Props.detail.content
 
+              : Props.detail.source.content
 
+          "
 
         />
 
       </template>
 
     </div>
 
@@ -175,35 +192,68 @@ const todetail = (id) => {
 
     <!-- footer -->
 
     <div class="footer flex-row flex-aic flex-jc-sb">
 
       <div class="l">
 
-        <span class="btn like" @click="handleOperate('like')">
 
+        <span
 
+          :style="{ color: Props.detail.is_like == 1 ? '#00b0b0' : '#999999' }"
 
+          class="btn like"
 
+          @click="handleOperate('like')"
 
+          v-if="Props.detail"
 
+        >
 
           <SvgIcon
 
             name="like"
 
             :size="20"
 
             :color="Props.detail.is_like == 1 ? '#00b0b0' : '#999999'"
 
           />
 
-          {{ Props.detail.like_count }}
 
+          {{
 
+            Props.detail.like_count ||
 
+            (Props.detail.source ? Props.detail.source.like_count : "0")
 
+          }}
 
         </span>
 
-        <span class="btn collect" @click="handleOperate('collect')">
 
+        <span
 
+          key=""
 
+          :style="{
 
+            color: Props.detail.is_collect == 1 ? '#00b0b0' : '#999999',
 
+          }"
 
+          class="btn collect"
 
+          @click="handleOperate('collect')"
 
+          v-if="Props.detail"
 
+        >
 
           <SvgIcon
 
             name="collect"
 
             :size="20"
 
             :color="Props.detail.is_collect == 1 ? '#00b0b0' : '#999999'"
 
           />
 
-          {{ Props.detail.collect_count }}
 
+          {{
 
+            Props.detail.collect_count ||
 
+            (Props.detail.source ? Props.detail.source.collect_count : 0)
 
+          }}
 
         </span>
 
       </div>
 
-      <div class="r"  @click="todetail">
 
-        <span class="btn message" @click="handleOperate('message')">
 
+      <div class="r" @click="todetail">
 
+        <span
 
+          v-if="Props.detail"
 
+          class="btn message"
 
+          @click="handleOperate('message')"
 
+        >
 
           <SvgIcon
 
             name="message"
 
             :size="20"
 
             :color="getSvgCol(Props.detail.is_comment)"
 
           />
 
-          {{ Props.detail.comment_count }}
 
+          {{
 
+            Props.detail.comment_count ||
 
+            (Props.detail.source ? Props.detail.source.comment_count : 0)
 
+          }}
 
         </span>
 
-        <span class="btn forward" @click="handleOperate('forward')">
 
+        <span
 
+          v-if="Props.detail"
 
+          class="btn forward"
 
+          @click="handleOperate('forward')"
 
+        >
 
           <SvgIcon name="forward" :size="20" :color="getSvgCol(0)" />
 
-          {{ Props.detail.share_count }}
 
+          {{
 
+            Props.detail.share_count ||
 
+            (Props.detail.source ? Props.detail.source.share_count : 0)
 
+          }}
 
         </span>
 
       </div>
 
     </div>

+ 79 - 9
src/components/UserCard/index.vue
Xem Tập Tin 

@@ -1,8 +1,8 @@
 
 <script setup>
 
-import { ref, computed } from "vue";
 
+import { ref, computed, onMounted } from "vue";
 
 import { useRouter } from "vue-router";
 
 import { EditPen, Promotion } from "@element-plus/icons-vue";
 
-
 
+import * as user from "~/api/user";
 
 import { placeholderPic } from "~/utils/util";
 
 
 const Router = useRouter();
 
@@ -22,35 +22,93 @@ const Prope = defineProps({
 
 let followingTxt = computed(() =>
 
   Prope.type === "myself" ? "我关注" : "已关注"
 
 );
 
-
 
+// //勋章列表
 
+// const badgeList = ref([]);
 
+// const badge = async () => {
 
+//   try {
 
+//     const { data } = await user.badge({
 
+//       code: "boutique_post",
 
+//     });
 
+//     badgeList.value = data;
 
+//   } catch (error) {}
 
+// };
 
+// onMounted(badge);
 
 // 个人发布动态
 
 const handleRecordMoment = () => {
 
   Router.push({
 
     name: "ForumEdit",
 
   });
 
 };
 
+const Emit = defineEmits(["change"]);
 
+//关注
 
+const about = async (id) => {
 
+  try {
 
+    const { msg } = await user.userfollow({
 
+      id: id,
 
+    });
 
+    ElMessage.success({
 
+      message: msg,
 
+      type: "success",
 
+    });
 
+    change();
 
+  } catch (error) {}
 
+};
 
+const change = () => {
 
+  Emit("change");
 
+};
 
 </script>
 
 
 <template>
 
   <div class="user-card-container">
 
-    <img :src="placeholderPic(60, 60)" alt="" class="avatar circle" />
 
+    <img
 
+      :src="Prope.detail.avatar"
 
+      style="width: 60px; height: 60px"
 
+      alt=""
 
+      class="avatar circle"
 
+    />
 
     <div class="user-card__namebox flex-row flex-aic">
 
-      <span>{{ Prope.detail.username }}</span>
 
-      <el-icon :size="18">
 
+      <div>
 
+        <span>{{ Prope.detail.username }}</span>
 
+        <img
 
+          v-if="Prope.detail.is_vip == 1"
 
+          class="circle"
 
+          style="width: 22px; height: 22px"
 
+          src="../../assets/bage/icon3.png"
 
+        />
 
+      </div>
 
+      <el-icon v-if="type === 'myself'" :size="18">
 
         <EditPen></EditPen>
 
       </el-icon>
 
     </div>
 
 
     <ul class="user-card__tag flex-row flex-aic">
 
       <li>
 
-        <img class="circle" :src="placeholderPic(22, 22)" />
 
+        <img
 
+          class="circle"
 
+          style="width: 22px; height: 22px"
 
+          :src="Prope.detail.boutique_post_badge"
 
+        />
 
       </li>
 
       <li>
 
-        <img class="circle" :src="placeholderPic(22, 22)" />
 
+        <img
 
+          class="circle"
 
+          style="width: 22px; height: 22px"
 
+          :src="Prope.detail.like_badge"
 
+        />
 
       </li>
 
       <li>
 
+        <img
 
+          class="circle"
 
+          style="width: 22px; height: 22px"
 
+          :src="Prope.detail.post_badge"
 
+        />
 
+      </li>
 
+      <!-- <li>
 
         <img class="circle" :src="placeholderPic(22, 22)" />
 
       </li>
 
+      <li>
 
+        <img class="circle" :src="placeholderPic(22, 22)" />
 
+      </li> -->
 
     </ul>
 
 
     <div class="user-card__line"></div>
 
@@ -72,7 +130,19 @@ const handleRecordMoment = () => {
 
       <p class="user-card__desc">{{ Prope.detail.introduction }}</p>
 
 
       <div class="user-card__btns flex-row flex-aic">
 
-        <el-button type="primary" size="large">关注</el-button>
 
+        <el-button
 
+          v-if="Prope.detail.is_follow == 0"
 
+          type="primary"
 
+          size="large"
 
+          @click="about(Prope.detail.id)"
 
+          >关注</el-button
 
+        >
 
+        <el-button
 
+          v-if="Prope.detail.is_follow == 1"
 
+          size="large"
 
+          @click="about(Prope.detail.id)"
 
+          >已关注</el-button
 
+        >
 
         <el-button size="large">私信</el-button>
 
       </div>
 
     </template>

+ 42 - 37
src/components/layouts/Footer.vue
Xem Tập Tin 

@@ -1,34 +1,30 @@
 
 <script setup name="YXFooter">
 
-import { ref } from "vue";
 
+import { ref, onMounted } from "vue";
 
 import { useRouter } from "vue-router";
 
+import * as getConfig from "~/api/common";
 
 const router = useRouter();
 
 const vals = ref([
 
-  {
 
-    label: "营业执照",
 
-  },
 
-  {
 
-    label: "增值电信业务经营许可证 京B2-20191060",
 
-  },
 
-  {
 
-    label: "京ICP备17068232号-1",
 
-  },
 
-  {
 
-    label: "广播电视节目制作经营许可证",
 
-  },
 
-  {
 
-    label: "网络文化经营许可证京网文[2019]1067-097号",
 
-  },
 
-  {
 
-    label: "京公网安备 11010502036937号",
 
-  },
 
-  {
 
-    label: "食品经营许可证 JY11105052461621",
 
-  },
 
-  {
 
-    label: "出版物经营许可证 新出发京零字朝190063号",
 
-  },
 
 ]);
 
-
 
+//站点描述
 
+const content = ref([]);
 
+const like = async () => {
 
+  try {
 
+    const { data } = await getConfig.getConfig({
 
+      module: "basic",
 
+    });
 
+    content.value = data.site_description;
 
+  } catch (error) {}
 
+};
 
+onMounted(like);
 
+const getQualification = async () => {
 
+  try {
 
+    const { data } = await getConfig.getQualification({
 
+      module: "basic",
 
+    });
 
+    vals.value = data;
 
+  } catch (error) {}
 
+};
 
+onMounted(getQualification);
 
 // const toagument = (type) => {
 
 //   router.push({
 
 //     name: "Arguments",
 
@@ -37,9 +33,12 @@ const vals = ref([
 
 //     },
 
 //   });
 
 // };
 
-const emit = defineEmits(['upture'])
 
-const upture = ()=>{
 
-  emit('agument')
 
+const emit = defineEmits(["upture"]);
 
+const upture = () => {
 
+  emit("agument");
 
+};
 
+const tourl = (url)=>{
 
+  window.open(url)
 
 }
 
 </script>
 
 
@@ -47,21 +46,27 @@ const upture = ()=>{
 
   <div class="layout-footer-container">
 
     <div class="line"></div>
 
     <div class="hbox">
 
-      <img src="https://dummyimage.com/120x70/e3e3e3/fff" alt="" />
 
+      <img
 
+        src="../../assets/logoidx.png"
 
+        style="width: 140px; height: 30px"
 
+        alt=""
 
+      />
 
     </div>
 
     <div class="content flex-row flex-jc-sb">
 
       <div class="left">
 
-        <p>
 
+        <!-- <p>
 
           机核从2010年开始一直致力于分享游戏玩家的生活，以及深入探讨游戏相关的文化。我们开发原创的播客以及视频节目，一直在不断寻找民间高质量的内容创作者。
 
         </p>
 
         <p>
 
           我们坚信游戏不止是游戏，游戏中包含的科学，文化，历史等各个层面的知识和故事，它们同时也会辐射到二次元甚至电影的领域，这些内容非常值得分享给热爱游戏的您。
 
-        </p>
 
+        </p> -->
 
+        <p>{{ content }}</p>
 
       </div>
 
       <div class="right">
 
         <ul>
 
           <li v-for="(item, idx) in vals" :key="idx">
 
-            <a href="#">{{ item.label }}</a>
 
+            <!-- <a href="#">{{ item.title }}</a> -->
 
+            <span style="cursor: pointer;" @click="tourl(item.url)" >{{ item.title }}</span>
 
           </li>
 
         </ul>
 
       </div>
 
@@ -69,14 +74,14 @@ const upture = ()=>{
 
     <div class="footer flex-row flex-jc-sb">
 
       <div class="navigation">
 
         <ul class="flex-row flex-aic">
 
-          <li >
 
-            <a href="javascript:;" @click="upture" > 错误反馈 </a>
 
+          <li>
 
+            <a href="javascript:;" @click="upture"> 错误反馈 </a>
 
           </li>
 
           <li>
 
-            <a href="#/argument?type=user" > 用户协议 </a>
 
+            <a href="#/argument?type=user"> 用户协议 </a>
 
           </li>
 
           <li>
 
-            <a href="#/argument?type=private" > 隐私政策 </a>
 
+            <a href="#/argument?type=private"> 隐私政策 </a>
 
           </li>
 
           <li>
 
             <a href="#/argument?type=software"> 开源软件声明 </a>

+ 61 - 13
src/components/layouts/Header.vue
Xem Tập Tin 

@@ -31,7 +31,8 @@ const collect = (idx) => {
 
 
 const dialogVisible = ref();
 
 //关注弹出层
 
-const attentio = () => {
 
+const attentio = (idx) => {
 
+  inde.value = idx;
 
   dialogVisible.value = true;
 
 };
 
 //关注
 
@@ -280,6 +281,9 @@ const toinform = (idx) => {
 
   } else if (idx == 2) {
 
     router.push({
 
       path: "/reservation",
 
+      query: {
 
+        type: "activeName",
 
+      },
 
     });
 
   } else if (idx == 1) {
 
     router.push({
 
@@ -321,22 +325,33 @@ const handleLogin = () => {
 
   visibilityLoginDialog.value = true;
 
 };
 
 
+const indexa = ref(1);
 
 const attention = (idx) => {
 
   if (idx == 0) {
 
     router.replace({
 
       name: "Follow",
 
     });
 
+    indexa.value = 0;
 
   } else {
 
     router.replace({
 
       name: "Home",
 
     });
 
+    indexa.value = 1;
 
   }
 
 };
 
 </script>
 
 
 <template>
 
   <div class="header-container flex-row flex-aic flex-jc-sb">
 
-    <div class="logo">ny-logo</div>
 
+    <div class="logo">
 
+      <div>
 
+        <img
 
+          src="../../assets/logoidx.png"
 
+          style="width: 104px; height: 24px"
 
+          alt=""
 
+        />
 
+      </div>
 
+    </div>
 
     <div class="header__content flex-row flex-aic flex-jc-sb">
 
       <el-input
 
         v-model="keyword"
 
@@ -345,8 +360,12 @@ const attention = (idx) => {
 
         :suffix-icon="Search"
 
       />
 
       <el-button-group>
 
-        <el-button @click="attention(0)">关注</el-button>
 
-        <el-button @click="attention(1)" type="primary">最新</el-button>
 
+        <el-button @click="attention(0)" :type="indexa == 0 ? 'primary' : ''"
 
+          >关注</el-button
 
+        >
 
+        <el-button @click="attention(1)" :type="indexa == 1 ? 'primary' : ''"
 
+          >最新</el-button
 
+        >
 
       </el-button-group>
 
       <div class="header__content__right flex-row flex-aic">
 
         <el-popover
 
@@ -365,7 +384,7 @@ const attention = (idx) => {
 
             <div class="vip-card flex-col flex-jc-sb">
 
               <div class="vip-card__header flex-row">
 
                 <div class="vip-avatar">
 
-                  <img :src="User.avatar" :alt="User.name" class="circle" />
 
+                  <img :src="User.avatar" alt="" class="circle" />
 
                 </div>
 
                 <div class="vip-userinfo">
 
                   <div class="vname">{{ User.name }}</div>
 
@@ -393,7 +412,20 @@ const attention = (idx) => {
 
                 v-for="(item, idx) in levelList"
 
                 :key="idx"
 
               >
 
-                <div class="prize-box__img"></div>
 
+                <div class="">
 
+                  <img
 
+                    v-if="item.prize_type == 'integral'"
 
+                    style="width: 48px; height: 48px"
 
+                    src="../../assets/jifen.png"
 
+                    alt=""
 
+                  />
 
+                  <img
 
+                    v-else
 
+                    style="width: 48px; height: 48px"
 
+                    :src="item.prize_image"
 
+                    alt=""
 
+                  />
 
+                </div>
 
                 <div class="prize-box__title">等级达到{{ item.level }}级</div>
 
                 <div class="prize-box__sub-title">{{ item.prize_name }}</div>
 
                 <el-button type="primary" disabled v-if="item.is_received == 1"
 
@@ -557,11 +589,11 @@ const attention = (idx) => {
 
                 </div>
 
               </div>
 
               <div class="uc__part">
 
-                <div style="cursor: pointer" @click="attentio">
 
+                <div style="cursor: pointer" @click="attentio(0)">
 
                   <div>{{ User.follow_count || 0 }}</div>
 
                   <div>关注</div>
 
                 </div>
 
-                <div style="cursor: pointer" @click="attentio">
 
+                <div style="cursor: pointer" @click="attentio(1)">
 
                   <div>{{ User.fans_count || 0 }}</div>
 
                   <div>粉丝</div>
 
                 </div>
 
@@ -748,6 +780,14 @@ const attention = (idx) => {
 
 
 <style lang="scss" scoped>
 
 @import "~/styles/variable.scss";
 
+.logo {
 
+  display: flex;
 
+  flex-direction: column;
 
+  align-items: center;
 
+  justify-content: center;
 
+  width: 210px;
 
+  height: 66px;
 
+}
 
 .atten {
 
   width: 92px;
 
   height: 38px;
 
@@ -885,10 +925,9 @@ const attention = (idx) => {
 
     }
 
   }
 
 
-  .logo {
 
-    width: 210px;
 
-    height: 66px;
 
-  }
 
+  // .logo {
 
+
 
+  // }
 
 
   .searchbox {
 
     width: 346px;
 
@@ -918,7 +957,7 @@ const attention = (idx) => {
 
     width: 300px;
 
     height: 122px;
 
     border-radius: 10px;
 
-    background-image: url("~/assets/vip/bgc.png");
 
+    background-image: url("../../assets/vip/bgc.png");
 
     background-size: 300px 122px;
 
     padding: 14px 12px 18px 14px;
 
     box-sizing: border-box;
 
@@ -953,6 +992,11 @@ const attention = (idx) => {
 
           font-weight: 400;
 
           color: #ffffff;
 
           line-height: 22px;
 
+          height: 20px;
 
+          text-overflow: ellipsis;
 
+          overflow: hidden;
 
+          white-space: nowrap;
 
+          width: 200px;
 
         }
 
       }
 
     }
 
@@ -998,6 +1042,10 @@ const attention = (idx) => {
 
         color: #888888;
 
         line-height: 18px;
 
         margin-bottom: 6px;
 
+        height: 15px;
 
+        overflow: hidden;
 
+        text-overflow: ellipsis;
 
+        white-space: nowrap;
 
       }
 
 
       .el-button.el-button--primary.is-disabled {

+ 5 - 0
src/router/index.js
Xem Tập Tin 

@@ -158,6 +158,11 @@ const routes = [
 
         path: '/topic',
 
         name: 'topic',
 
         component: () => import('~/views/postDetail.vue')
 
+      },
 
+      {
 
+        path: '/rest',
 
+        name: 'rest',
 
+        component: () => import('~/views/forum/rest.vue')
 
       }
 
     ]
 
   },

+ 2 - 0
src/store/user.js
Xem Tập Tin 

@@ -49,6 +49,7 @@ export const useUser = defineStore('user', {
 
 
     // save userinfo.
 
     setLogin(payload) {
 
+      console.log(payload);
 
       this.token = payload.token
 
       this.id = payload.id
 
       this.mobile = payload.mobile
 
@@ -63,6 +64,7 @@ export const useUser = defineStore('user', {
 
         console.log('%c getUserInfo >>>', 'background: blue; color: #fff', data);
 
         if (data) {
 
           // TODO: 需要的数据在此处写入
 
+          this.mobile = data.mobile
 
           this.is_vip = data.is_vip
 
           this.vip_expired_at = data.vip_expired_at
 
           this.name = data.username

+ 5 - 3
src/useHook/useUserOperate.js
Xem Tập Tin 

@@ -13,7 +13,9 @@ const SOURCE_TYPE = {
 
   'article': 'article',
 
   'news': 'info',
 
   'video': 'video',
 
-  'forum': 'post'
 
+  'forum': 'post',
 
+  'info': 'info',
 
+  "post": 'post'
 
 }
 
 
 import * as gatherApi from '~/api/gather'
 
@@ -40,7 +42,7 @@ export const useUserOperate = () => {
 
       })
 
     })
 
   }
 
-  
+
 
   const __operate_share__ = (type, id) => {
 
     return new Promise((resolve, reject) => {
 
       gatherApi.share(__foramt_data__(type, id)).then(result => {
 
@@ -49,7 +51,7 @@ export const useUserOperate = () => {
 
     })
 
   }
 
 
-  const __operate_comment__ = () => {}
 
+  const __operate_comment__ = () => { }
 
 
   return {
 
     __operate_link__,

+ 2 - 2
src/utils/constance.js
Xem Tập Tin 

@@ -41,7 +41,7 @@ export const PERSONAL_SUB_NAV_LIST = [
 
 export const PERSONAL_SECOND_SUB_NAV_LIST = [
 
   {
 
     label: "资讯",
 
-    value: "news"
 
+    value: "info"
 
   },
 
   {
 
     label: "文章",
 
@@ -53,7 +53,7 @@ export const PERSONAL_SECOND_SUB_NAV_LIST = [
 
   },
 
   {
 
     label: "论坛",
 
-    value: "forum"
 
+    value: "post"
 
   },
 
   {
 
     label: "商品",

+ 1 - 1
src/views/articles/index.vue
Xem Tập Tin 

@@ -100,7 +100,7 @@ const todetails = (id) => {
 
     <div class="article-main">
 
       <template v-for="(item, idx) in articleListj" :key="idx">
 
         <IndexSection
 
-          @article="__articles__()"
 
+          @article="__article__()"
 
           @update="todetails(item.id)"
 
           :type="!item.image ? 'article' : 'common'"
 
           :title="item.title"

+ 45 - 15
src/views/forum/index.vue
Xem Tập Tin 

@@ -13,6 +13,21 @@ import { useScrollEvent } from "~/useHook/useScrollEvent";
 
 import { useForumIndex } from "~/useHook/useForum";
 
 import * as topic from "~/api/topic";
 
 import * as user from "~/api/user";
 
+import * as delApi from "~/api/forum";
 
+
 
+//删除
 
+const delect = async (id) => {
 
+  console.log(222);
 
+  try {
 
+    const { data } = await delApi.del({
 
+      id: id,
 
+    });
 
+    ElMessage({
 
+      message: "删除成功",
 
+      type: "success",
 
+    });
 
+  } catch (error) {}
 
+};
 
 
 const handleGetScrollEnd = () => {
 
   console.log("%c 触底触发加载事件 >>>", "background: blue; color: #fff");
 
@@ -47,6 +62,8 @@ const {
 
 console.log("%c forumty >>>", "background: blue; color: #fff", forumType.value);
 
 
 const handleRefreshListData = () => {
 
+  handleLoadForumData();
 
+  handleSwitchForumType();
 
   useForumIndex();
 
 };
 
 
@@ -114,8 +131,12 @@ const __other__ = async (id) => {
 
 
 //其他用户信息
 
 const other = (id) => {
 
-  type.value = "other";
 
-  __other__(id);
 
+  router.push({
 
+    path: "/rest",
 
+    query: {
 
+      id: id,
 
+    },
 
+  });
 
 };
 
 
 //跳转到话题详情
 
@@ -169,7 +190,8 @@ onMounted(() => {
 
       <div class="context-main">
 
         <template v-for="(item, idx) in forumTableData" :key="idx">
 
           <MomentLayout
 
-            @other="other(item.id)"
 
+            @delec="delect(item.id)"
 
+            @other="other(item.user_id)"
 
             type="forum"
 
             :detail="item"
 
             @refresh="handleRefreshListData"
 
@@ -210,19 +232,27 @@ onMounted(() => {
 
       <dl class="forum-recommend">
 
         <dt>我参与的</dt>
 
         <!-- 省略 ellipsis -->
 
-        <dd
 
-          @click="topicinfo(item.id)"
 
-          v-for="(item, idx) in aboutMeList"
 
-          :key="idx"
 
-          class="ellipsis"
 
-        >
 
-          {{ item.title }}
 
-        </dd>
 
-        <dd class="more" @click="tomore()">
 
-          <span style="cursor: pointer" v-if="totala.length > 5 && show == true"
 
-            >查看更多话题</span
 
+        <div v-if="aboutMeList.length > 0">
 
+          <dd
 
+            @click="topicinfo(item.id)"
 
+            v-for="(item, idx) in aboutMeList"
 
+            :key="idx"
 
+            class="ellipsis"
 
           >
 
-        </dd>
 
+            {{ item.title }}
 
+          </dd>
 
+          <dd class="more" @click="tomore()">
 
+            <span
 
+            
+              style="cursor: pointer"
 
+              v-if="totala.length > 5 && show == true"
 
+              >查看更多话题</span
 
+            >
 
+          </dd>
 
+        </div>
 
+        <div v-else style="display: flex;justify-content: center;align-items: center">
 
+          <div style="font-size: 15px;margin-top: 10px">暂无内容</div>
 
+        </div>
 
       </dl>
 
     </div>
 
   </div>

+ 1 - 1
src/views/index/content.vue
Xem Tập Tin 

@@ -342,7 +342,7 @@ const topicinfo = (id) => {
 
       margin-bottom: 30px;
 
       column-gap: 18px;
 
       flex-wrap: wrap;
 
-      height: 255px;
 
+      height: 280px;
 
       overflow: hidden;
 
 
       &--c2 {

+ 91 - 15
src/views/index/follow.vue
Xem Tập Tin 

@@ -14,26 +14,90 @@ import ChooseSubjectToTalk from "~/components/ChooseSubjectToTalk/index.vue";
 
 import Login from "~/components/Login/Login.vue";
 
 import { ref, onMounted, reactive, onActivated } from "vue";
 
 import * as userApi from "~/api/user";
 
+import * as summary from "~/api/gather";
 
+import { useRouter } from "vue-router";
 
+const router = useRouter();
 
 //用户信息
 
-let userInfo = ref([{}]);
 
-const __news__ = async () => {
 
+// let userInfo = ref([{}]);
 
+// const __news__ = async () => {
 
+//   try {
 
+//     const { data } = await userApi.list({});
 
+//     userInfo.value = data;
 
+//     __follow__(data.id);
 
+//   } catch (error) {}
 
+// };
 
+// __news__();
 
+
 
+// //关注
 
+// const folow = ref("");
 
+// const __follow__ = async (id) => {
 
+//   try {
 
+//     const { data } = await userApi.follow({
 
+//       id: id,
 
+//     });
 
+//     folow.value = data;
 
+//   } catch (error) {}
 
+// };
 
+//关注的内容
 
+const tableData = ref([]);
 
+const summarya = async () => {
 
   try {
 
-    const { data } = await userApi.list({});
 
-    userInfo.value = data;
 
-    __follow__(data.id);
 
+    const { data } = await summary.summary({
 
+      type: "follow",
 
+      is_page: 0,
 
+      // title: "",
 
+      // topic_id: "",
 
+    });
 
+    tableData.value = data;
 
   } catch (error) {}
 
 };
 
-__news__();
 
-
 
-//关注
 
-const folow = ref("");
 
-const __follow__ = async (id) => {
 
-  try {
 
-    const { data } = await userApi.follow({
 
+onMounted(summarya);
 
+const handleRefreshListData = () => {
 
+  summarya();
 
+};
 
+//其他用户信息
 
+const other = (id) => {
 
+  router.push({
 
+    path: "/rest",
 
+    query: {
 
       id: id,
 
+    },
 
+  });
 
+};
 
+const todetail = (type, id) => {
 
+  //论坛
 
+  if (type == "post") {
 
+    router.push({
 
+      name: "post",
 
+      query: {
 
+        id: id,
 
+      },
 
     });
 
-    folow.value = data;
 
-  } catch (error) {}
 
+  }
 
+  if (type == "info") {
 
+    router.push({
 
+      name: "news",
 
+      query: {
 
+        id: id,
 
+      },
 
+    });
 
+  }
 
+  if (type == "article") {
 
+    router.push({
 
+      name: "articles",
 
+      query: {
 
+        id: id,
 
+      },
 
+    });
 
+  }
 
+  if (type == "video") {
 
+    router.push({
 
+      name: "videos",
 
+      query: {
 
+        id: id,
 
+      },
 
+    });
 
+  }
 
 };
 
 </script>
 
 
@@ -44,8 +108,20 @@ const __follow__ = async (id) => {
 
       <UnloginContent />
 
 
       <!-- 登录但是无关注用户发动态 -->
 
-      <FloowEmpty />
 
+      <div v-if="tableData.length>0">
 
+        <template  v-for="(item, idx) in tableData" :key="idx">
 
+        <MomentLayout
 
+          @other="other(item.user_id)"
 
+          :type="item.source_type"
 
+          :detail="item"
 
+          @refresh="handleRefreshListData"
 
+          @detail="todetail(item.source_type, item.source_id)"
 
+          add='fllow'
 
+        />
 
+      </template>
 
+      </div>
 
       <!-- <MomentLayout /> -->
 
+      <FloowEmpty v-else />
 
       <!-- Choose subject of a talk -->
 
       <!-- <ChooseSubjectToTalk /> -->
 
       <Login />

+ 2 - 6
src/views/market/conversion.vue
Xem Tập Tin 

@@ -55,12 +55,8 @@
 
         </div>
 
         <div class="button">
 
           <div class="money">{{ item.goods.price }}积分</div>
 
-          <div
 
-            class="ke"
 
-            style="cursor: pointer"
 
-            @click="visibilityDialog2 = true"
 
-          >
 
-            联系客服
 
+          <div class="ke" style="cursor: pointer" @click="getConfiguser">
 
+            添加客服
 
           </div>
 
         </div>
 
       </div>

+ 1 - 1
src/views/market/placeOrder.vue
Xem Tập Tin 

@@ -182,7 +182,7 @@ const result = () => {
 
 const you = ref(0);
 
 const couponid = ref();
 
 const changeyou = (idx) => {
 
-  couponid.value = coupon.value[idx].coupon.id;
 
+  couponid.value = coupon.value[idx].id;
 
   you.value = coupon.value[idx].coupon.amount;
 
 };

+ 2 - 2
src/views/more.vue
Xem Tập Tin 

@@ -79,7 +79,7 @@ const todetails = (id, type) => {
 
 <template>
 
   <div class="articles-container">
 
     <div class="title">{{ title }}</div>
 
-    <div class="article-main" style="height: 730px">
 
+    <div class="article-main" style="min-height: 730px">
 
       <template v-for="(item, idx) in videoList" :key="idx">
 
         <IndexSection
 
           @update="todetails(item.id, !item.image ? 'article' : 'common')"
 
@@ -94,7 +94,7 @@ const todetails = (id, type) => {
 
           :comment_count="item.comment_count"
 
           :collect_count="item.collect_count"
 
           :share_count="item.share_count"
 
-          :image = item.image
 
+          :image="item.image"
 
         />
 
       </template>
 
     </div>

+ 61 - 25
src/views/personal/components/sett.vue
Xem Tập Tin 

@@ -80,11 +80,16 @@
 
         <div class="title">更多信息</div>
 
         <div class="font">完善信息可以获得更多积分</div>
 
       </div>
 
-      <div class="fla" style="margin-top: 22px">
 
-        <div class="title">预留字段1</div>
 
+      <div
 
+        v-for="(item, idx) in arr"
 
+        :key="idx"
 
+        class="fla"
 
+        style="margin-top: 22px"
 
+      >
 
+        <div class="title">{{ item.label }}</div>
 
         <div>
 
           <el-input
 
-            v-model="column_1"
 
+            v-model="item[item.key]"
 
             style="width: 422px; height: 44px"
 
             placeholder=""
 
           />
 
@@ -119,22 +124,22 @@
 
           </div>
 
         </div>
 
         <!-- " style="margin-top: 40px"> -->
 
-        <!-- <div v-if="inviteList.length > 0"> -->
 
-        <div
 
-          v-for="(item, idx) in inviteList"
 
-          :key="idx"
 
-          style="margin-top: 40px"
 
-        >
 
-          <img
 
-            :src="item.avatar"
 
-            alt=""
 
-            style="width: 36px; height: 36px; border-radius: 50%"
 
-          />
 
-          <span style="margin-left: 14px" class="bei">邀请人备份</span>
 
-          <span style="margin-left: 40px" class="time">2023-02-12</span>
 
+        <div v-if="inviteList.length > 0">
 
+          <div
 
+            v-for="(item, idx) in inviteList"
 
+            :key="idx"
 
+            style="margin-top: 40px"
 
+          >
 
+            <img
 
+              :src="item.avatar"
 
+              alt=""
 
+              style="width: 36px; height: 36px; border-radius: 50%"
 
+            />
 
+            <span style="margin-left: 14px" class="bei">邀请人备份</span>
 
+            <span style="margin-left: 40px" class="time">2023-02-12</span>
 
+          </div>
 
         </div>
 
-        <!-- </div>
 
-        <div v-else>
 
+        <!-- <div v-else>
 
           <div></div>
 
         </div> -->
 
       </div>
 
@@ -263,7 +268,9 @@
 
         <div style="margin-top: 30px">谁能收藏我的内容</div>
 
         <div style="margin-top: 24px; display: flex">
 
           <div>
 
-            <el-radio v-model="who_can_collect" label="all">任何人</el-radio>
 
+            <el-radio @change="postconfig" v-model="who_can_collect" label="all"
 
+              >任何人</el-radio
 
+            >
 
           </div>
 
           <div>
 
             <el-radio
 
@@ -287,7 +294,9 @@
 
         <div style="margin-top: 30px">谁能评论回复我</div>
 
         <div style="margin-top: 24px; display: flex">
 
           <div>
 
-            <el-radio v-model="who_can_comment" label="all">任何人</el-radio>
 
+            <el-radio @change="postconfig" v-model="who_can_comment" label="all"
 
+              >任何人</el-radio
 
+            >
 
           </div>
 
           <div>
 
             <el-radio
 
@@ -333,7 +342,7 @@
 
         alt=""
 
       />
 
       <div class="titletop">恭喜您完善信息成功</div>
 
-      <div class="ji">获得积分+2</div>
 
+      <div class="ji">获得积分+{{ reward_integral }}</div>
 
       <div class="btn" style="" @click="enter()">确定</div>
 
     </div>
 
   </el-dialog>
 
@@ -359,7 +368,7 @@
 
           placeholder="请输入验证码"
 
         ></el-input>
 
         <div
 
-          style="position: absolute; cursor: pointer; right: 30px; top: 15px"
 
+          style="position: absolute; cursor: pointer; right: 30px; top: 2px"
 
           class="code"
 
           @click="handleStartTimeCount(elformRef)"
 
         >
 
@@ -494,7 +503,6 @@ avatar.value = User.avatar;
 
 backgroud_image.value = User.backgroud_image;
 
 username.value = User.name;
 
 introduction.value = User.introduction;
 
-column_1.value = User.column_1;
 
 //修改头像
 
 const handleRemove = (value) => {
 
   avatar.value = value.data.url;
 
@@ -528,6 +536,25 @@ const config = async () => {
 
   } catch (error) {}
 
 };
 
 onMounted(config);
 
+
 
+//额外字段
 
+const extraList = ref([]);
 
+const arr = ref([]);
 
+const extra = async () => {
 
+  try {
 
+    arr.value = []
 
+    const { data } = await userApi.extra({});
 
+    extraList.value = data;
 
+    extraList.value.forEach((item) => {
 
+      arr.value.push({
 
+        [item.column_id]:item.value,
 
+        key: item.column_id,
 
+        label: item.name,
 
+      });
 
+    });
 
+  } catch (error) {}
 
+};
 
+onMounted(extra);
 
 //设置用户配置
 
 const postconfig = async () => {
 
   try {
 
@@ -604,7 +631,9 @@ const change = async () => {
 
       message: "修改成功",
 
       type: "success",
 
     });
 
-    User.setLogin();
 
+    mobile.value = "";
 
+    code.value = "";
 
+    User.getUser();
 
   } catch (error) {}
 
 };
 
 
@@ -621,17 +650,24 @@ const discountList = USER_INFO;
 
 //保存
 
 //模态框控件
 
 const dialogVisible = ref(false);
 
+const reward_integral = ref(0);
 
 const save = async () => {
 
   try {
 
+    var from = {};
 
+    arr.value.forEach((item) => {
 
+      from[item.key] = item[item.key];
 
+    });
 
     const { data } = await userApi.updata({
 
       username: username.value,
 
       avatar: avatar.value,
 
       introduction: introduction.value,
 
       backgroud_image: backgroud_image.value,
 
-      column_1: column_1.value,
 
+      ...from,
 
     });
 
     User.getUser();
 
+    extra()
 
     dialogVisible.value = true;
 
+    reward_integral.value = data.reward_integral;
 
   } catch (error) {}
 
 };
 
 //防抖

+ 390 - 23
src/views/personal/index.vue
Xem Tập Tin 

@@ -11,12 +11,166 @@ import {
 
   PERSONAL_SUB_NAV_LIST,
 
   PERSONAL_SECOND_SUB_NAV_LIST,
 
 } from "~/utils/constance";
 
-
 
 import { usePersonalIndexList } from "~/useHook/usePersonalIndex";
 
 import debounce from "loadsh/debounce";
 
 import * as follow from "~/api/user";
 
-import { collect } from "~/api/gather";
 
-import { useRoute } from "vue-router";
 
+import * as collect from "~/api/gather";
 
+import { useRoute, useRouter } from "vue-router";
 
+import * as delApi from "~/api/forum";
 
+import * as artivleApi from "~/api/article";
 
+import * as videoApi from "~/api/video";
 
+import * as infoApi from "~/api/news";
 
+const router = useRouter();
 
+//删除
 
+const delect = (id) => {
 
+  if (subNavCurrent.value == "forum") {
 
+    delecta(id);
 
+  }
 
+  if (subNavCurrent.value == "news") {
 
+    //资讯
 
+    delectd(id);
 
+  }
 
+  if (subNavCurrent.value == "article") {
 
+    delectb(id);
 
+  }
 
+  if (subNavCurrent.value == "video") {
 
+    delectc(id);
 
+  }
 
+};
 
+//论坛删除
 
+const delecta = async (id) => {
 
+  try {
 
+    const { data } = await delApi.del({
 
+      id: id,
 
+    });
 
+    ElMessage({
 
+      message: "删除成功",
 
+      type: "success",
 
+    });
 
+    refrenshTableData();
 
+  } catch (error) {}
 
+};
 
+//文章删除
 
+const delectb = async (id) => {
 
+  try {
 
+    const { data } = await artivleApi.del({
 
+      id: id,
 
+    });
 
+    ElMessage({
 
+      message: "删除成功",
 
+      type: "success",
 
+    });
 
+    refrenshTableData();
 
+  } catch (error) {}
 
+};
 
+//视频删除
 
+const delectc = async (id) => {
 
+  try {
 
+    const { data } = await videoApi.del({
 
+      id: id,
 
+    });
 
+    ElMessage({
 
+      message: "删除成功",
 
+      type: "success",
 
+    });
 
+    refrenshTableData();
 
+  } catch (error) {}
 
+};
 
+//咨询删除
 
+const delectd = async (id) => {
 
+  try {
 
+    const { data } = await infoApi.del({
 
+      id: id,
 
+    });
 
+    ElMessage({
 
+      message: "删除成功",
 
+      type: "success",
 
+    });
 
+    refrenshTableData();
 
+  } catch (error) {}
 
+};
 
+
 
+//跳转到详情
 
+const todetail = (id) => {
 
+  //论坛
 
+  if (subNavCurrent.value == "forum") {
 
+    router.push({
 
+      name: "post",
 
+      query: {
 
+        id: id,
 
+      },
 
+    });
 
+  }
 
+  if (subNavCurrent.value == "news") {
 
+    router.push({
 
+      name: "news",
 
+      query: {
 
+        id: id,
 
+      },
 
+    });
 
+  }
 
+  if (subNavCurrent.value == "article") {
 
+    router.push({
 
+      name: "articles",
 
+      query: {
 
+        id: id,
 
+      },
 
+    });
 
+  }
 
+  if (subNavCurrent.value == "video") {
 
+    router.push({
 
+      name: "videos",
 
+      query: {
 
+        id: id,
 
+      },
 
+    });
 
+  }
 
+};
 
+//跳转到详情
 
+const todetails = (id) => {
 
+  //论坛
 
+  if (secondSubNavCurrent.value == "post") {
 
+    router.push({
 
+      name: "post",
 
+      query: {
 
+        id: id,
 
+      },
 
+    });
 
+  }
 
+  if (secondSubNavCurrent.value == "info") {
 
+    router.push({
 
+      name: "news",
 
+      query: {
 
+        id: id,
 
+      },
 
+    });
 
+  }
 
+  if (secondSubNavCurrent.value == "article") {
 
+    router.push({
 
+      name: "articles",
 
+      query: {
 
+        id: id,
 
+      },
 
+    });
 
+  }
 
+  if (secondSubNavCurrent.value == "video") {
 
+    router.push({
 
+      name: "videos",
 
+      query: {
 
+        id: id,
 
+      },
 
+    });
 
+  }
 
+  if (secondSubNavCurrent.value == "goods") {
 
+    router.push({
 
+      name: "PointShoping",
 
+      query: {
 
+        id: id,
 
+      },
 
+    });
 
+  }
 
+};
 
+
 
 const route = useRoute();
 
 //弹出层
 
 const dialogVisible = ref(false);
 
@@ -113,13 +267,28 @@ const handleSwitchSubNav = debounce((type) => {
 
 }, 160);
 
 
 // news, article, video, forum, goods
 
-const secondSubNavCurrent = ref("news"); // second nav
 
+const secondSubNavCurrent = ref("info"); // second nav
 
 const secondSubNavList = PERSONAL_SECOND_SUB_NAV_LIST;
 
 
+const subList = ref([]);
 
+const __subnav__ = async () => {
 
+  try {
 
+    const { data } = await collect.summary({
 
+      is_page: 0,
 
+      source_type: secondSubNavCurrent.value,
 
+      type: "collect",
 
+    });
 
+    subList.value = data;
 
+    console.log(subList.value);
 
+  } catch (error) {}
 
+};
 
+onMounted(__subnav__);
 
 // 防抖
 
 const handleSwitchSecondSubNav = debounce((type) => {
 
   if (secondSubNavCurrent.value === type) return;
 
   secondSubNavCurrent.value = type;
 
+  console.log("type", type);
 
+  __subnav__();
 
 }, 240);
 
 
 // 首页列表数据
 
@@ -156,10 +325,10 @@ const __reset_params__ = () =>
 
 watchEffect(() => {
 
   let temporary = {};
 
   switch (subNavCurrent.value) {
 
-    case "forum":
 
+    case "post":
 
       temporary.source_type = "post";
 
       break;
 
-    case "news":
 
+    case "info":
 
       temporary.source_type = "info";
 
       break;
 
     case "article":
 
@@ -168,9 +337,9 @@ watchEffect(() => {
 
     case "video":
 
       temporary.source_type = "video";
 
       break;
 
-    case "collect":
 
-      // temporary.source_type = '<++>'
 
-      break;
 
+    // case "collect":
 
+    //   // temporary.source_type = '<++>'
 
+    //   break;
 
   }
 
 
   console.log(
 
@@ -179,20 +348,35 @@ watchEffect(() => {
 
     subNavCurrent.value
 
   );
 
 
-  // 收藏接口不走接口
 
-  if (subNavCurrent.value === "collect") {
 
-    // TODO: 收藏
 
-  } else {
 
-    Object.assign(params, __reset_params__(), temporary);
 
-  }
 
+  // // 收藏接口不走接口
 
+  // if (subNavCurrent.value === "collect") {
 
+  //   __subnav__()
 
+  // } else {
 
+  //   Object.assign(params, __reset_params__(), temporary);
 
+  // }
 
 });
 
 
 // onMounted()
 
 const { tableData, pagination, refrenshTableData } =
 
   usePersonalIndexList(params);
 
 
-const handleRefreshListData = () => {
 
-  refrenshTableData();
 
+// const handleRefreshListData = () => {
 
+//   refrenshTableData();
 
+//   usePersonalIndexList();
 
+// };
 
+//其他用户信息接口
 
+const __other__ = async (id) => {
 
+  try {
 
+    const { data } = await user.other({
 
+      user_id: id,
 
+    });
 
+    userInfo.value = data;
 
+  } catch (error) {}
 
+};
 
+//其他用户信息
 
+const other = (id) => {
 
+  type.value = "other";
 
+  __other__(id);
 
 };
 
 </script>
 
 
@@ -215,11 +399,81 @@ const handleRefreshListData = () => {
 
             <div class="rheader flex-row flex-aic">
 
               <div class="name">{{ User.name || "匿名用户" }}</div>
 
               <Level :level="User.level" full />
 
-              <ul class="tags flex-row flex-aic">
 
-                <li>徽章</li>
 
-                <li>徽章</li>
 
-                <li>徽章</li>
 
-              </ul>
 
+              <div class="tags flex-row flex-aic">
 
+                <div v-if="User.is_vip == 1">
 
+                  <img
 
+                    src="../../assets/bage/icon3.png"
 
+                    style="width: 22px; height: 22px"
 
+                    alt=""
 
+                  />
 
+                </div>
 
+                <el-dropdown>
 
+                  <div v-if="User.boutique_post_badge != ''">
 
+                    <img
 
+                      :src="User.boutique_post_badge"
 
+                      style="width: 22px; height: 22px"
 
+                      alt=""
 
+                    />
 
+                  </div>
 
+                  <template #dropdown>
 
+                    <el-dropdown-menu>
 
+                      <el-dropdown-item
 
+                        >勋章等级：{{
 
+                          User.boutique_post_level
 
+                        }}</el-dropdown-item
 
+                      >
 
+                    </el-dropdown-menu>
 
+                  </template>
 
+                </el-dropdown>
 
+                <el-dropdown>
 
+                  <div v-if="User.like_badge != ''">
 
+                    <img
 
+                      :src="User.like_badge"
 
+                      style="width: 22px; height: 22px"
 
+                      alt=""
 
+                    />
 
+                  </div>
 
+                  <template #dropdown>
 
+                    <el-dropdown-menu>
 
+                      <el-dropdown-item
 
+                        >勋章等级：{{ User.like_level }}</el-dropdown-item
 
+                      >
 
+                    </el-dropdown-menu>
 
+                  </template>
 
+                </el-dropdown>
 
+                <el-dropdown>
 
+                  <div v-if="User.post_badge != ''">
 
+                    <img
 
+                      :src="User.post_badge"
 
+                      style="width: 22px; height: 22px"
 
+                      alt=""
 
+                    />
 
+                  </div>
 
+                  <template #dropdown>
 
+                    <el-dropdown-menu>
 
+                      <el-dropdown-item
 
+                        >勋章等级：{{ User.post_level }}</el-dropdown-item
 
+                      >
 
+                    </el-dropdown-menu>
 
+                  </template>
 
+                </el-dropdown>
 
+                <el-dropdown>
 
+                  <div v-if="User.shoot_badge != ''">
 
+                    <img
 
+                      :src="User.shoot_badge"
 
+                      style="width: 22px; height: 22px"
 
+                      alt=""
 
+                    />
 
+                  </div>
 
+                  <template #dropdown>
 
+                    <el-dropdown-menu>
 
+                      <el-dropdown-item
 
+                        >勋章等级：{{ User.shoot_level }}</el-dropdown-item
 
+                      >
 
+                    </el-dropdown-menu>
 
+                  </template>
 
+                </el-dropdown>
 
+              </div>
 
             </div>
 
             <div class="rdesc">{{ User.introduction }}</div>
 
           </div>
 
@@ -302,14 +556,86 @@ const handleRefreshListData = () => {
 
         >
 
           <template v-for="(item, idx) in tableData" :key="idx">
 
             <MomentLayout
 
+              @delec="delect(item.id)"
 
+              @other="other(item.id)"
 
               :type="subNavCurrent"
 
               :detail="item"
 
               @refresh="handleRefreshListData"
 
+              @detail="todetail(item.id)"
 
             />
 
           </template>
 
         </template>
 
         <!-- 收藏 -->
 
-        <div v-else></div>
 
+        <div v-else>
 
+          <div
 
+            v-if="
 
+              secondSubNavCurrent == 'info' ||
 
+              secondSubNavCurrent == 'article' ||
 
+              secondSubNavCurrent == 'video'
 
+            "
 
+            class="flex-row"
 
+            style="column-gap: 16px; flex-wrap: wrap"
 
+          >
 
+            <template v-for="(item, idx) in subList" :key="idx">
 
+              <IndexNews
 
+                style="width: 260px"
 
+                @update="todetails(item.id)"
 
+                :title="item.title"
 
+                :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"
 
+              />
 
+            </template>
 
+          </div>
 
+          <div
 
+            v-if="secondSubNavCurrent == 'post'"
 
+            class="flex-row"
 
+            style="column-gap: 20px; flex-wrap: wrap"
 
+          >
 
+            <template v-for="(item, idx) in subList" :key="idx">
 
+              <div @click="todetails(item.id)" class="lunbox">
 
+                <img
 
+                  :src="item.image"
 
+                  style="width: 112px; height: 112px"
 
+                  alt=""
 
+                />
 
+                <div style="margin-left: 10px">
 
+                  <div class="cont">{{ item.content }}</div>
 
+                  <div class="smell">
 
+                    <span>{{ item.like_count }}喜欢·</span>
 
+                    <span>{{ item.comment_count }}评论</span>
 
+                  </div>
 
+                </div>
 
+              </div>
 
+            </template>
 
+          </div>
 
+          <div
 
+            v-if="secondSubNavCurrent == 'goods'"
 
+            class="flex-row"
 
+            style="column-gap: 20px; flex-wrap: wrap"
 
+          >
 
+            <template v-for="(item, idx) in subList" :key="idx">
 
+              <div @click="todetails(item.id)" class="goodsbox" style="margin-bottom: 20px">
 
+                <img
 
+                  :src="item.image"
 
+                  style="width: 182px; height: 182px"
 
+                  alt=""
 
+                />
 
+                <div style="margin-left: 10px">
 
+                  <div style="margin-top: 14px; text-align: center">
 
+                    {{ item.title }}
 
+                  </div>
 
+                  <div style="margin-top: 10px; text-align: center">
 
+                    {{ item.integral }}
 
+                  </div>
 
+                </div>
 
+              </div>
 
+            </template>
 
+          </div>
 
+        </div>
 
       </div>
 
       <div class="pm-side">
 
         <ExperienceCard />
 
@@ -388,6 +714,47 @@ const handleRefreshListData = () => {
 
 
 <style lang="scss" scoped>
 
 @import "~/styles/variable.scss";
 
+.goodsbox {
 
+  width: 222px;
 
+  height: 276px;
 
+  border: 1px solid #e3e3e3;
 
+  padding: 20px 20px 13px;
 
+  box-sizing: border-box;
 
+}
 
+.smell {
 
+  font-family: SFPro, SFPro;
 
+  font-weight: 400;
 
+  font-size: 12px;
 
+  color: #777777;
 
+  line-height: 14px;
 
+  text-align: left;
 
+  font-style: normal;
 
+  margin-top: 16px;
 
+}
 
+.lunbox {
 
+  width: 374px;
 
+  height: 132px;
 
+  background: #ffffff;
 
+  border-radius: 6px;
 
+  padding: 10px;
 
+  box-sizing: border-box;
 
+  display: flex;
 
+  margin-bottom: 20px;
 
+}
 
+.cont {
 
+  width: 232px;
 
+  height: 72px;
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 400;
 
+  font-size: 13px;
 
+  color: #333333;
 
+  line-height: 18px;
 
+  text-align: justify;
 
+  font-style: normal;
 
+  text-overflow: ellipsis;
 
+  overflow: hidden;
 
+  white-space: nowrap;
 
+}
 
 .active {
 
   font-family: PingFangSC, PingFang SC;
 
   font-weight: 500;

+ 22 - 11
src/views/personal/make.vue
Xem Tập Tin 

@@ -33,21 +33,23 @@
 
               display: flex;
 
               justify-content: space-between;
 
               align-items: center;
 
-              margin-bottom:20px;
 
+              margin-bottom: 20px;
 
             "
 
           >
 
             <div>
 
               <div>
 
                 <span class="success">提交成功</span>
 
-                <span style="margin-left: 10px" class="date"
 
-                  >{{ item.updated_at }}</span
 
-                >
 
+                <span style="margin-left: 10px" class="date">{{
 
+                  item.updated_at
 
+                }}</span>
 
               </div>
 
               <div style="margin-top: 21px" class="topbto">
 
                 恭喜！你已成功的提交了预约申请
 
               </div>
 
             </div>
 
-            <div class="add" style="cursor: pointer;" @click="getConfiguser">添加客服</div>
 
+            <div class="add" style="cursor: pointer" @click="getConfiguser">
 
+              添加客服
 
+            </div>
 
           </div>
 
         </div>
 
       </div>
 
@@ -136,7 +138,7 @@
 
                 v-for="(item, idx) in couponList"
 
                 :key="idx"
 
                 :label="item.coupon.name"
 
-                :value="item.coupon.id"
 
+                :value="item.id"
 
               ></el-option>
 
             </el-select>
 
           </el-form-item>
 
@@ -229,7 +231,7 @@ const imageshow = ref(false);
 
 //添加客服接口
 
 const customer_service_qrcode = ref();
 
 const getConfiguser = async () => {
 
-  visibilityDialog2.value = false
 
+  visibilityDialog2.value = false;
 
   try {
 
     const { data } = await commonApi.getConfiguser({
 
       module: "basic",
 
@@ -261,7 +263,7 @@ const handleClick = (tab) => {
 
     type.value = 0;
 
   } else if (tab.index == 1) {
 
     type.value = 1;
 
-    getbox()
 
+    getbox();
 
   }
 
 };
 
 
@@ -279,7 +281,7 @@ const change = (val) => {
 
 const visibilityDialog2 = ref(false);
 
 //预约拍摄
 
 const submit = async () => {
 
-  visibilityDialog.value = false
 
+  visibilityDialog.value = false;
 
   try {
 
     const { data } = await shootApi.shoot({
 
       ...form,
 
@@ -287,8 +289,16 @@ const submit = async () => {
 
     visibilityDialog2.value = true;
 
   } catch (error) {}
 
 };
 
-userApi;
 
+// userApi;
 
+//优惠券列表
 
 //优惠券列表
 
+const arr = ref([])
 
+arr.value = [{
 
+  coupon:{
 
+    name:'不使用',
 
+    id:''
 
+  }
 
+}]
 
 const couponList = ref([]);
 
 const list = async () => {
 
   try {
 
@@ -298,7 +308,8 @@ const list = async () => {
 
       is_use: 0,
 
       type: "shoot",
 
     });
 
-    couponList.value = data.list;
 
+    // couponList.value = data;
 
+    couponList.value =arr.value.concat(data) ;
 
   } catch (error) {}
 
 };
 
 onMounted(list);

+ 13 - 2
src/views/postDetail.vue
Xem Tập Tin 

@@ -345,9 +345,15 @@ console.log("%c route >>>", "background: blue; color: #fff", Route, Route.name);
 
     </div>
 
     <div class="tip">本文系用户投稿，不代表忆象网观点</div>
 
     <div class="post-context" v-html="details.content"></div>
 
+    <div>{{ details.image }}</div>
 
     <div class="post-footer flex-row flex-aic flex-jc-sb">
 
       <div class="left">
 
-        <span @click="share(0)" :style="{color:details.is_like == 1 ? '#00b0b0' : '#999999'}" class="link" style="cursor: pointer">
 
+        <span
 
+          @click="share(0)"
 
+          :style="{ color: details.is_like == 1 ? '#00b0b0' : '#999999' }"
 
+          class="link"
 
+          style="cursor: pointer"
 
+        >
 
           <SvgIcon
 
             name="like"
 
             :size="22"
 
@@ -356,7 +362,12 @@ console.log("%c route >>>", "background: blue; color: #fff", Route, Route.name);
 
           />
 
           {{ details.like_count || 0 }}
 
         </span>
 
-        <span :style="{color:details.is_collect == 1 ? '#00b0b0' : '#999999'}" @click="share(1)" class="collect" style="cursor: pointer">
 
+        <span
 
+          :style="{ color: details.is_collect == 1 ? '#00b0b0' : '#999999' }"
 
+          @click="share(1)"
 
+          class="collect"
 
+          style="cursor: pointer"
 
+        >
 
           <SvgIcon
 
             name="collect"
 
             :size="22"

+ 13 - 3
src/views/reservation/index.vue
Xem Tập Tin 

@@ -110,7 +110,7 @@
 
                 v-for="(item, idx) in couponList"
 
                 :key="idx"
 
                 :label="item.coupon.name"
 
-                :value="item.coupon.id"
 
+                :value="item.id"
 
               ></el-option>
 
             </el-select>
 
           </el-form-item>
 
@@ -260,12 +260,22 @@ const submit = async () => {
 
       ...form,
 
     });
 
     visibilityDialog2.value = true;
 
+    visibilityDialog = fasle;
 
     shootlist();
 
   } catch (error) {}
 
 };
 
-userApi;
 
+// userApi;
 
 //优惠券列表
 
 const couponList = ref([]);
 
+const arr = ref([]);
 
+arr.value = [
 
+  {
 
+    coupon: {
 
+      name: "不使用",
 
+      id: "",
 
+    },
 
+  },
 
+];
 
 const list = async () => {
 
   try {
 
     const { data } = await userApi.coupon({
 
@@ -274,7 +284,7 @@ const list = async () => {
 
       is_use: 0,
 
       type: "lease",
 
     });
 
-    couponList.value = data.list;
 
+    couponList.value = arr.value.concat(data);
 
   } catch (error) {}
 
 };
 
 onMounted(list);

+ 30 - 2
src/views/tongzhi/components/comment.vue
Xem Tập Tin 

@@ -3,7 +3,7 @@
 
     class="box"
 
     v-for="(item, idx) in newsList"
 
     :key="idx"
 
-    style="margin-bottom: 20px"
 
+    style="margin-bottom: 20px; border-bottom: 1px solid #f0f0f0;padding-bottom: 24px;"
 
   >
 
     <div style="display: flex">
 
       <div>
 
@@ -25,7 +25,16 @@
 
         </div>
 
         <div>
 
           <div class="content">{{ item.content }}</div>
 
-          <div></div>
 
+          <div style="display: flex;margin-top: 19px;">
 
+            <div style="cursor: pointer;" @click="like(item.source_id, item.source_type)">
 
+              <SvgIcon name="like" :size="16" :rgap="2" :color="item.is_like == 1 ? '#00b0b0' : '#999999'" />
 
+              <span>赞</span>
 
+            </div>
 
+            <div @click="todetail(item.source_id, item.source_type)" style="margin-left: 26px;cursor: pointer;">
 
+              <SvgIcon name="message" :size="16" :rgap="2"  />
 
+              <span>回复</span>
 
+            </div>
 
+          </div>
 
         </div>
 
         <div
 
           @click="todetail(item.source_id, item.source_type)"
 
@@ -54,6 +63,7 @@ import { useRouter } from "vue-router";
 
 import { onMounted, ref } from "vue";
 
 import * as commentApi from "~/api/comment";
 
 import { useUser } from "~/store/user";
 
+import * as gatherApi from "~/api/gather";
 
 const User = useUser();
 
 let newsList = ref([]);
 
 const __news__ = async () => {
 
@@ -109,6 +119,22 @@ const todetail = (id, type) => {
 
     });
 
   }
 
 };
 
+//点赞
 
+const like = async (id,type) => {
 
+  try {
 
+    const { msg } = await gatherApi.like({
 
+      source_type: type,
 
+      source_id:id,
 
+    });
 
+    ElMessage({
 
+      message: msg,
 
+      type: "success",
 
+    });
 
+    __news__()
 
+  } catch (error) {
 
+    console.log("error", error);
 
+  }
 
+};
 
 
 onMounted(__news__);
 
 </script>
 
@@ -127,6 +153,8 @@ onMounted(__news__);
 
   background: #f7f7f7;
 
   border-radius: 6px;
 
   cursor: pointer;
 
+  padding: 10px;
 
+  box-sizing: border-box;
 
 }
 
 .ping {
 
   background: rgba(0, 176, 176, 0.1);

+ 2 - 2
src/views/tongzhi/components/inform.vue
Xem Tập Tin 

@@ -44,10 +44,10 @@ import { onMounted, ref } from "vue";
 
 import * as informApi from "~/api/infrom";
 
 
 //改变
 
-const type = ref("");
 
+const type = ref("system");
 
 const handleClick = (tab) => {
 
   if (tab.index == 0) {
 
-    type.value = "";
 
+    type.value = "system";
 
   } else if (tab.index == 1) {
 
     type.value = "like";
 
   } else {

+ 1 - 1
src/views/zixun/index.vue
Xem Tập Tin 

@@ -65,7 +65,7 @@ const zixunMore = (val) => {
 
   <div class="articles-container">
 
     <Banner type="info" />
 
     <IndexTitle title="精选资讯" @seeMore="zixunMore" />
 
-    <div class="content-list flex-row">
 
+    <div class="content-list flex-row" style="height: 280px;">
 
       <template v-for="(item, idx) in newsList" :key="idx">
 
         <IndexNews
 
           @update="todetails(item.id)"

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác