bug修改

src/App.vue

@@ -3,10 +3,12 @@
     <Header v-if="!showHeader" class="Header" />
     <Navbar v-if="!showNavbar" class="Navbar" />
     <Content class="Content" />
+    <Footer class="Footer" v-if="routePath == '/index'" />
     <Abandon v-model="abandon.show" />
     <isLogin v-model="is_login.show" />
     <ConfirmPopup />
     <ToTop />
+    <ToContribute />
   </div>
 </template>
 
@@ -14,10 +16,13 @@
 import Header from "@/components/layout/Header.vue";
 import Navbar from "@/components/layout/Navbar.vue";
 import Content from "@/components/layout/Content.vue";
-import Abandon from "@/components/module/abandon.vue";
-import IsLogin from "@/components/module/is-login.vue";
-import ConfirmPopup from "@/components/module/confirm-popup.vue";
-import ToTop from "@/components/module/to-top.vue";
+import Footer from "@/components/layout/Footer.vue";
+
+import Abandon from "@/components/module/abandon.vue"; // 放弃投稿
+import IsLogin from "@/components/module/is-login.vue"; // 未登录
+import ConfirmPopup from "@/components/module/confirm-popup.vue"; // 确认-通用
+import ToTop from "@/components/module/to-top.vue"; // 回到顶部
+import ToContribute from "./components/module/to-contribute.vue"; // 发布投稿
 import { mapState } from "vuex";
 
 export default {
@@ -26,10 +31,12 @@ export default {
     Header,
     Navbar,
     Content,
+    Footer,
     Abandon,
     IsLogin,
     ConfirmPopup,
     ToTop,
+    ToContribute,
   },
   data() {
     return {
@@ -37,7 +44,7 @@ export default {
     };
   },
   computed: {
-    ...mapState(["abandon", "is_login"]),
+    ...mapState(["abandon", "is_login", "routePath"]),
     showHeader() {
       return this.$route.meta.empty
         ? this.$route.meta.empty.includes("Header")
@@ -73,6 +80,9 @@ body {
 }
 .Header {
   position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
   z-index: 100;
 }
 .Navbar {
@@ -83,4 +93,7 @@ body {
 .Content {
   padding-top: $headerHeight;
 }
+.Footer {
+  float: left;
+}
 </style>

src/components/card/image-text/my-collect-card.vue

@@ -7,8 +7,8 @@
       <div class="footer">
         <CardFooter
           :info="info"
-          v-on="$listeners"
           :dict="{ is_like: 'is_like', like_num: 'like_num' }"
+          v-on="$listeners"
         />
       </div>
     </CardBox>

src/components/card/image-text/my-release-card.vue

@@ -5,6 +5,7 @@
         <img :src="info.cover" alt="" v-if="is_normal" />
         <div class="is_normal" v-else>
           <img src="@/assets/icon/lapse.png" alt="" />
+          <div class="mark">已失效</div>
         </div>
         <div
           class="type"
@@ -120,10 +121,25 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
+        position: relative;
         img {
           width: 20px;
           height: 20px;
         }
+        .mark {
+          height: 18px;
+          padding: 0 5px;
+          font-size: 12px;
+          font-weight: 400;
+          color: #ffffff;
+          line-height: 18px;
+          text-align: center;
+          background: rgba(0, 0, 0, 0.7);
+          border-radius: 2px;
+          position: absolute;
+          bottom: 10px;
+          right: 10px;
+        }
       }
       .mark {
         padding: 0 3px;

src/components/card/information/my-release-card.vue

@@ -5,6 +5,7 @@
         <img :src="fileIcon" alt="" v-if="is_normal" />
         <div class="is_normal" v-else>
           <img src="@/assets/icon/lapse.png" alt="" />
+          <div class="mark">已失效</div>
         </div>
         <div
           class="type"
@@ -125,10 +126,25 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
+        position: relative;
         img {
           width: 20px;
           height: 20px;
         }
+        .mark {
+          height: 18px;
+          padding: 0 5px;
+          font-size: 12px;
+          font-weight: 400;
+          color: #ffffff;
+          line-height: 18px;
+          text-align: center;
+          background: rgba(0, 0, 0, 0.7);
+          border-radius: 2px;
+          position: absolute;
+          bottom: 10px;
+          right: 10px;
+        }
       }
     }
     .right {

src/components/card/video/my-release-card.vue

@@ -5,6 +5,7 @@
         <img :src="info.cover" alt="" v-if="is_normal" />
         <div class="is_normal" v-else>
           <img src="@/assets/icon/lapse.png" alt="" />
+          <div class="mark">已失效</div>
         </div>
         <div
           class="type"
@@ -119,10 +120,25 @@ export default {
         display: flex;
         align-items: center;
         justify-content: center;
+        position: relative;
         img {
           width: 20px;
           height: 20px;
         }
+        .mark {
+          height: 18px;
+          padding: 0 5px;
+          font-size: 12px;
+          font-weight: 400;
+          color: #ffffff;
+          line-height: 18px;
+          text-align: center;
+          background: rgba(0, 0, 0, 0.7);
+          border-radius: 2px;
+          position: absolute;
+          bottom: 10px;
+          right: 10px;
+        }
       }
     }
     .right {

src/components/layout/Footer.vue

@@ -0,0 +1,98 @@
+<template>
+  <div class="footer">
+    <div class="agreement-box">
+      <div
+        class="agreement-item"
+        v-for="item in agreement_list"
+        @click="item.click(item)"
+      >
+        {{ item.label }}
+      </div>
+    </div>
+    <div class="company-info">
+      crypto @ 辽宁搞一下汽车电子科技有限公司 辽备xxxxxxxxxxxxxx
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "Footer",
+  computed: {
+    agreement_list() {
+      return [
+        {
+          label: "用户协议",
+          key: "agreement",
+          click: this.toAgreement,
+        },
+        {
+          label: "隐私政策",
+          key: "privacy",
+          click: this.toAgreement,
+        },
+        {
+          label: "关于我们",
+          key: "about_us",
+          click: this.toAgreement,
+        },
+        {
+          label: "客服中心",
+          key: "customer_service",
+        },
+        {
+          label: "会员说明",
+          key: "user_equity",
+        },
+        {
+          label: "原创公约",
+          key: "original_pact",
+          click: this.toAgreement,
+        },
+      ];
+    },
+  },
+  methods: {
+    toAgreement(item) {
+      this.$router.push({
+        path: "/agreement",
+        query: {
+          configKey: item.key,
+        },
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.footer {
+  margin-top: 60px;
+  width: 100%;
+  .agreement-box {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .agreement-item {
+      padding: 0 10px;
+      height: 10px;
+      line-height: 10px;
+      font-size: 12px;
+      font-weight: 400;
+      color: #666666;
+      cursor: pointer;
+    }
+    :not(:last-child) {
+      border-right: 1px solid #666666;
+    }
+  }
+  .company-info {
+    width: 100%;
+    font-size: 12px;
+    font-weight: 400;
+    color: #999999;
+    text-align: center;
+    margin: 40px 0;
+  }
+}
+</style>

src/components/layout/Header.vue

@@ -116,7 +116,10 @@ export default {
     handleFilter() {
       let path = "";
       this.path.forEach((item) => {
-        if (this.routePath.includes(item)) {
+        if (
+          !this.routePath.includes("contribute") &&
+          this.routePath.includes(item)
+        ) {
           path = item;
         }
       });

src/components/module/comment.vue

@@ -167,7 +167,7 @@ export default {
           };
           this.params.sort_type == 1
             ? this.list.unshift(comment_detail)
-            : this.list.push();
+            : this.list.push(comment_detail);
         });
     },
     // 跳转
@@ -194,9 +194,11 @@ export default {
     // 删除
     handleDelete(item) {
       this.list = this.list.filter((i) => {
-        i.children = i.children.filter((j) => {
-          return j.id != item.id;
-        });
+        i.children =
+          i.children &&
+          i.children.filter((j) => {
+            return j.id != item.id;
+          });
         return i.id != item.id;
       });
     },
@@ -280,6 +282,7 @@ export default {
       line-height: 40px;
       border-radius: 22px;
       font-weight: 400;
+      font-size: 14px;
       background: #f4f4f4;
       color: #646464;
       margin-right: 10px;

src/components/module/detail-title.vue

@@ -30,11 +30,19 @@
           <img src="@/assets/icon/视频.png" alt="" />
           <span>相关视频</span>
         </div>
-        <!-- <div class="item" v-if="info.datum_id" @click="$emit('toImageTextDetail')">
+        <!-- <div
+          class="item"
+          v-if="info.article_id && showImageTextBtn"
+          @click="$emit('toImageTextDetail')"
+        >
           <img src="@/assets/icon/图文.png" alt="" />
           <span>相关图文</span>
         </div>
-        <div class="item" v-if="info.datum_id" @click="$emit('toInformationDetail')">
+        <div
+          class="item"
+          v-if="info.datum_id && showInformationBtn"
+          @click="$emit('toInformationDetail')"
+        >
           <img src="@/assets/icon/资料.png" alt="" />
           <span>相关资料</span>
         </div> -->
@@ -54,6 +62,7 @@
 <script>
 import Collection from "@/components/module/collection.vue";
 import DetailDesc from "@/components/module/detail-desc.vue";
+import { mapState } from "vuex";
 export default {
   name: "DetailTitle",
   components: {
@@ -77,6 +86,15 @@ export default {
       visible: false,
     };
   },
+  computed: {
+    ...mapState(["routePath"]),
+    showImageTextBtn() {
+      return !this.routePath.includes("image-text");
+    },
+    showInformationBtn() {
+      return !this.routePath.includes("information");
+    },
+  },
 };
 </script>
 

src/components/module/report.vue

@@ -108,7 +108,6 @@ export default {
         case_ids: this.reportIds.filter((item) => item != "other").join(","),
         content: this.reportIds.includes("other") ? this.reportContent : "",
       };
-      console.log(params,'111111');
       ReportService.userReport(params).then(({ msg, data }) => {
         this.$message.success(msg);
         this.$emit("visible", false);

src/components/module/sort.vue

@@ -19,15 +19,16 @@ export default {
       type: Number,
       default: 1,
     },
-  },
-  data() {
-    return {
-      list: [
-        { label: "默认排序", type: 1 },
-        { label: "按时间升序", type: 2 },
-        { label: "按时间降序", type: 3 },
-      ],
-    };
+    list: {
+      type: Array,
+      default() {
+        return [
+          { label: "默认排序", type: 1 },
+          { label: "按时间升序", type: 2 },
+          { label: "按时间降序", type: 3 },
+        ];
+      },
+    },
   },
 };
 </script>
@@ -39,8 +40,8 @@ export default {
   justify-content: flex-start;
   user-select: none;
   .sort-item {
+    width: 110px;
     height: 40px;
-    padding: 0 15px;
     line-height: 40px;
     text-align: center;
     background: white;

src/components/module/to-contribute.vue

@@ -0,0 +1,56 @@
+<template>
+  <div class="to-contribute" v-if="handleFilter()" @click="handleContribute">
+    <img src="@/assets/icon/发布投稿.png" alt="" />
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ToContribute",
+  data() {
+    return {
+      show: false,
+    };
+  },
+  computed: {
+    routePath() {
+      return this.$store.state.routePath;
+    },
+    contributePath() {
+      return `/${this.handleFilter()}-contribute`;
+    },
+  },
+  methods: {
+    // 跳转发布
+    handleContribute() {
+      if (this.routePath == this.contributePath) return;
+      this.$router.push(this.contributePath);
+    },
+    // 取值
+    handleFilter() {
+      let path = "";
+      ["video", "image-text", "information"].forEach((item) => {
+        if (
+          !this.routePath.includes("contribute") &&
+          this.routePath.includes(item)
+        ) {
+          path = item;
+        }
+      });
+      return path;
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.to-contribute {
+  position: fixed;
+  bottom: 80px;
+  right: 20px;
+  img {
+    width: 60px;
+    height: 60px;
+  }
+}
+</style>

src/components/module/to-top.vue

@@ -40,7 +40,7 @@ export default {
 <style lang="scss" scoped>
 .to-top {
   position: fixed;
-  bottom: 100px;
+  bottom: 150px;
   right: 20px;
   img {
     width: 60px;

src/components/video/video-interactive.vue

@@ -173,23 +173,41 @@ export default {
     },
     // 跳转图文
     toImageText() {
-      this.$router.push({
-        path: "/image-text-detail",
-        query: {
-          id: this.currentVideo.article_item,
-          article_id: this.currentVideo.article_id,
-        },
-      });
+      if (this.currentVideo.article_item) {
+        this.$router.push({
+          path: "/image-text-detail",
+          query: {
+            id: this.currentVideo.article_item,
+            article_id: this.currentVideo.article_id,
+          },
+        });
+      } else {
+        this.$router.push({
+          path: "/image-text-collection",
+          query: {
+            id: this.currentVideo.article_id,
+          },
+        });
+      }
     },
     // 跳转资料
     toInformation() {
-      this.$router.push({
-        path: "/information-detail",
-        query: {
-          id: this.currentVideo.datum_item,
-          datum_id: this.currentVideo.datum_id,
-        },
-      });
+      if (this.currentVideo.datum_item) {
+        this.$router.push({
+          path: "/information-detail",
+          query: {
+            id: this.currentVideo.datum_item,
+            datum_id: this.currentVideo.datum_id,
+          },
+        });
+      } else {
+        this.$router.push({
+          path: "/information-collection",
+          query: {
+            id: this.currentVideo.datum_id,
+          },
+        });
+      }
     },
   },
 };

src/components/vip/order-card.vue

@@ -1,11 +1,11 @@
 <template>
   <div class="order-card">
     <div class="card-header">
-      <div class="order-no">{{ info.order_no }}</div>
+      <div class="order-no">订单号&emsp;{{ info.order_no }}</div>
       <div class="time">{{ info.create_at }}</div>
     </div>
     <div class="card-center">
-      <div class="type">{{ info.level_name }}</div>
+      <div class="type">{{ info.level_name }}{{ info.level_title }}</div>
       <div class="price">
         <div>实付款</div>
         <div class="red">¥</div>

src/views/agreement/index.vue

@@ -45,6 +45,7 @@ export default {
 <style lang="scss" scoped>
 .wrap {
   width: 70%;
+  min-height: calc(100vh - 120px);
   margin: 0 auto;
   min-width: 1000px;
   background: white;

src/views/image-text/children/my-collect.vue

@@ -211,7 +211,8 @@ export default {
     handleForward(item) {
       ArticleService.articleTransmit({
         item_id: item.id,
-      }).then((_) => (item.transmit_num += 1));
+      }).then((_) => (item.transmit_num = Number(item.transmit_num) + 1));
+     
     },
     // 评论
     handleComment(item) {

src/views/image-text/children/my-like.vue

@@ -281,7 +281,7 @@ export default {
     handleForward(item) {
       ArticleService.articleTransmit({
         item_id: item.id,
-      }).then((_) => (item.transmit_num += 1));
+      }).then((_) => (item.transmit_num = Number(item.transmit_num) + 1));
     },
     // 评论
     handleComment(item) {

src/views/image-text/image-text-collection.vue

@@ -12,7 +12,14 @@
       />
     </div>
     <div class="sort">
-      <Sort :current="sort_type" @changeSort="changeSort" />
+      <Sort
+        :current="sort_type"
+        :list="[
+          { label: '正序', type: 2 },
+          { label: '倒序', type: 3 },
+        ]"
+        @changeSort="changeSort"
+      />
     </div>
     <div class="list">
       <div

src/views/image-text/image-text-detail.vue

@@ -6,7 +6,6 @@
         :series_info="article_info"
         @handleSwitch="handleSwitch"
         @toVideoDetail="toVideoDetail"
-        @toImageTextDetail="toImageTextDetail"
         @toInformationDetail="toInformationDetail"
         @toCollection="toCollection"
       />
@@ -165,25 +164,24 @@ export default {
         },
       });
     },
-    // 跳转图文
-    toImageTextDetail() {
-      this.$router.push({
-        path: "/image-text-detail",
-        query: {
-          id: this.info.article_item,
-          article_id: this.info.article_id,
-        },
-      });
-    },
     // 跳转资料
     toInformationDetail() {
-      this.$router.push({
-        path: "/information-detail",
-        query: {
-          id: this.info.datum_item,
-          datum_id: this.info.datum_id,
-        },
-      });
+      if (this.info.datum_item) {
+        this.$router.push({
+          path: "/information-detail",
+          query: {
+            id: this.info.datum_item,
+            datum_id: this.info.datum_id,
+          },
+        });
+      } else {
+        this.$router.push({
+          path: "/information-collection",
+          query: {
+            id: this.info.datum_id,
+          },
+        });
+      }
     },
     // 评论
     handleComment() {

src/views/information/children/my-collect.vue

@@ -208,10 +208,10 @@ export default {
     },
     // 分享
     handleForward(item) {
-      DatumService.articleTransmit({
-        video_id: item.video_id,
+      DatumService.datumTransmit({
+        datum_id: item.datum_id,
         url_id: item.url_id,
-      }).then((_) => (item.transmit_num += 1));
+      }).then((_) => (item.transmit_num = Number(item.transmit_num) + 1));
     },
     // 评论
     handleComment(item) {
@@ -220,9 +220,9 @@ export default {
     },
     // 点赞
     handleLike(item) {
-      DatumService.articleTags({
-        type: 2,
-        id: item.id,
+      DatumService.datumTags({
+        datum_id: item.datum_id,
+        url_id: item.url_id,
       }).then(({ data }) => {
         item.is_like = data.tags;
         item.like_num = data.tags

src/views/information/children/my-like.vue

@@ -278,12 +278,10 @@ export default {
     },
     // 分享
     handleForward(item) {
-      DatumService.articleTransmit({
-        video_id: item.video_id,
+      DatumService.datumTransmit({
+        datum_id: item.datum_id,
         url_id: item.url_id,
-      }).then(
-        (_) => (this.info.transmit_num = Number(this.info.transmit_num) + 1)
-      );
+      }).then((_) => (item.transmit_num = Number(item.transmit_num) + 1));
     },
     // 评论
     handleComment(item) {
@@ -292,9 +290,9 @@ export default {
     },
     // 点赞
     handleLike(item) {
-      DatumService.articleTags({
-        type: 2,
-        id: item.id,
+      DatumService.datumTags({
+        datum_id: item.datum_id,
+        url_id: item.url_id,
       }).then(({ data }) => {
         item.is_praise = data.tags;
         item.praise_num = data.tags

src/views/information/information-collection.vue

@@ -12,7 +12,15 @@
       />
     </div>
     <div class="sort">
-      <Sort v-if="!manageType" :current="sort_type" @changeSort="changeSort" />
+      <Sort
+        v-if="!manageType"
+        :current="sort_type"
+        :list="[
+          { label: '正序', type: 1 },
+          { label: '倒序', type: 2 },
+        ]"
+        @changeSort="changeSort"
+      />
       <div class="all_select" v-if="manageType">
         <el-checkbox
           v-model="allChecked"

src/views/information/information-detail.vue

@@ -8,7 +8,6 @@
         @handleSwitch="handleSwitch"
         @toVideoDetail="toVideoDetail"
         @toImageTextDetail="toImageTextDetail"
-        @toInformationDetail="toInformationDetail"
         @toCollection="toCollection"
       />
     </div>
@@ -184,23 +183,22 @@ export default {
     },
     // 跳转图文
     toImageTextDetail() {
-      this.$router.push({
-        path: "/image-text-detail",
-        query: {
-          id: this.info.article_item,
-          article_id: this.info.article_id,
-        },
-      });
-    },
-    // 跳转资料
-    toInformationDetail() {
-      this.$router.push({
-        path: "/information-detail",
-        query: {
-          id: this.info.datum_item,
-          datum_id: this.info.datum_id,
-        },
-      });
+      if (this.info.article_item) {
+        this.$router.push({
+          path: "/image-text-detail",
+          query: {
+            id: this.info.article_item,
+            article_id: this.info.article_id,
+          },
+        });
+      } else {
+        this.$router.push({
+          path: "/image-text-collection",
+          query: {
+            id: this.info.article_id,
+          },
+        });
+      }
     },
     // 评论
     handleComment() {

src/views/video/children/my-collect.vue

@@ -217,7 +217,7 @@ export default {
       VideoService.videoTransmit({
         video_id: item.video_id,
         url_id: item.url_id,
-      }).then((_) => (item.transmit_num += 1));
+      }).then((_) => (item.transmit_num = Number(item.transmit_num) + 1));
     },
     // 评论
     handleComment(item) {

src/views/video/children/my-like.vue

@@ -287,7 +287,7 @@ export default {
       VideoService.videoTransmit({
         video_id: item.video_id,
         url_id: item.url_id,
-      }).then((_) => (item.transmit_num += 1));
+      }).then((_) => (item.transmit_num = Number(item.transmit_num) + 1));
     },
     // 评论
     handleComment(item) {

src/views/video/components/child-content.vue

@@ -31,7 +31,6 @@ export default {
   },
   mounted() {
     this.$store.dispatch("getMarkNum", "video");
-    console.log('11111111');
   },
   methods: {},
 };

src/views/vip/children/rechargeOrder.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="wrap">
     <div class="wrap-title">
-      <TitleControl title="充值订单" :showSearch="false" />
+      <TitleControl title="充值订单" @handleChange="handleSearch" />
     </div>
     <div class="wrap-list">
       <div class="list-item" v-for="item in list">
@@ -26,12 +26,14 @@ export default {
       },
       list: [],
       finished: false,
+      list_copy: "",
     };
   },
   mounted() {
     this.getList();
   },
   methods: {
+    // 获取列表
     getList() {
       LevelOrderService.getOrderList(this.params).then(({ data }) => {
         const list = data.list;
@@ -43,6 +45,22 @@ export default {
         }
       });
     },
+    // 搜索
+    handleSearch(val) {
+      if (!this.list_copy) this.list_copy = this.list;
+      if (val) {
+        this.list = this.list_copy.filter((item) => {
+          return (
+            (item.order_no && item.order_no.includes(val)) ||
+            (item.level_name && item.level_name.includes(val)) ||
+            (item.level_title && item.level_title.includes(val))
+          );
+        });
+      } else {
+        this.list = this.list_copy;
+        this.list_copy = "";
+      }
+    },
   },
 };
 </script>