Почетна Преглед Помоћ
Регистрација Пријавите се
mabaoyi
/
factoryDirector
1
0
Креирај огранак 0
Датотеке Дискусије 0 Захтеви за спајање 0 Вики
Преглед изворни кода

Merge branch 'master' of http://gits.hdlkeji.com:3000/mabaoyi/factoryDirector

mabaoyi пре 5 месеци
родитељ
ba2e470d87 4ca9905447
комит
21f9d53b24
17 измењених фајлова са 420 додато и 117 уклоњено
Подељен поглед Покажи статистику Diff
  1. 21 0
      dist/index.html
  2. 8 0
      src/api/document.ts
  3. 8 0
      src/api/login.ts
  4. BIN
      src/assets/close.png
  5. BIN
      src/assets/inputpg.png
  6. 3 0
      src/components/Banne/index.vue
  7. 10 1
      src/components/Layout/header.vue
  8. 5 5
      src/components/row/row.vue
  9. 16 0
      src/router/index.ts
  10. 24 0
      src/view/Login/agreement.vue
  11. 24 3
      src/view/Login/index.vue
  12. 82 79
      src/view/handbook/bookinfo.vue
  13. 12 0
      src/view/handbook/handbook.vue
  14. 174 0
      src/view/handbook/input.vue
  15. 4 4
      src/view/video/course.vue
  16. 1 1
      src/view/video/index.vue
  17. 28 24
      src/view/video/info.vue

+ 21 - 0
dist/index.html
Прегледај датотеку 

@@ -1,3 +1,23 @@
 
+<<<<<<< HEAD
 
+<!DOCTYPE html>

+<html lang="en">

+  <head>

+    <meta charset="UTF-8" />

+    <link

+      rel="icon"

+      type="image/svg+xml"

+      href="./src/assets/image/a8e890b2-ad35-490e-b0cc-1548d7dd1401.png"

+    />

+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />

+    <title>云厂长</title>

+    <script type="module" crossorigin src="./assets/index-Ca-dzkFe.js"></script>
 
+    <link rel="stylesheet" crossorigin href="./assets/index-D83HsbiY.css">
 
+  </head>

+  <body>

+    <div id="app"></div>


+  </body>

+</html>

+=======
 
 <!DOCTYPE html>
 
 <html lang="en">
 
   <head>
 
@@ -16,6 +36,7 @@
 
     <div id="app"></div>
 
   </body>
 
 </html>
 
+>>>>>>> refs/remotes/origin/master
 
 <style lang="scss">* {
 
   margin: 0;
 
   padding: 0;

+ 8 - 0
src/api/document.ts
Прегледај датотеку 

@@ -23,6 +23,14 @@ export const document = (params: any) => {
 
     params,
 
   });
 
 };
 
+//搜索
 
+export const search = (params: any) => {
 
+  return request({
 
+    url: "document",
 
+    method: "get",
 
+    params,
 
+  });
 
+};
 
 // //文档分类列表
 
 // export const detail = (params: any) => {
 
 //   return request({

+ 8 - 0
src/api/login.ts
Прегледај датотеку 

@@ -57,3 +57,11 @@ export const getCode = (data: any) => {
 
     method: "get",
 
   });
 
 };
 
+//协议
 
+export const agreement = (data: any) => {
 
+  return request({
 
+    url: 'agreement',
 
+    method: "get",
 
+    data
 
+  });
 
+};

BIN
src/assets/close.png
Прегледај датотеку


BIN
src/assets/inputpg.png
Прегледај датотеку


+ 3 - 0
src/components/Banne/index.vue
Прегледај датотеку 

@@ -37,6 +37,9 @@ const props = defineProps({
 
   },
 
 });
 
 
+console.log(props.banneImageList);
 
+
 
+
 
 const toUrl = (url: string) => {
 
   if (!url) {
 
     ElMessage({

+ 10 - 1
src/components/Layout/header.vue
Прегледај датотеку 

@@ -135,7 +135,7 @@
 
       v-if="!headerData.userinfo || JSON.stringify(headerData.userinfo) == '{}'"
 
     >
 
       <p class="login" @click="toLogin">登录</p>
 
-      <p class="register">立即注册</p>
 
+      <p class="register" @click="register">立即注册</p>
 
     </div>
 
     <el-dropdown v-else>
 
       <div class="login-register">
 
@@ -245,6 +245,15 @@ const toproduct = (index) => {
 
 const toLogin = () => {
 
   router.push("/login");
 
 };
 
+//注册
 
+const register = () => {
 
+  router.push({
 
+    name:'/login',
 
+    query:{
 
+      isLogin:false
 
+    }
 
+  });
 
+};
 
 
 // 跳转到价格
 
 const prick = (index) => {

+ 5 - 5
src/components/row/row.vue
Прегледај датотеку 

@@ -149,13 +149,13 @@ userid.value = JSON.parse(localStorage.getItem("USER_STORE"));
 
               >@{{ reply }}:</a
 
             >
 
           </template>
 
-          <p v-if="existReply" class="comment-row-main__descs replycomment">
 
+          <!-- <p v-if="existReply" class="comment-row-main__descs replycomment">
 
             {{ descs }}
 
-          </p>
 
+          </p> -->
 
         </div>
 
         <!-- <div class="timebox"> {{ Props.crateTime }}</div> -->
 
       </div>
 
-      <p v-if="existReply == ''" class="comment-row-main__descs">{{ descs }}</p>
 
+      <p  class="comment-row-main__descs">{{ descs }}</p>
 
       <div class="martop"></div>
 
       <ul class="comment-row-main__footer flex-row">
 
         <li>
 
@@ -202,7 +202,7 @@ userid.value = JSON.parse(localStorage.getItem("USER_STORE"));
 
         <div class="qu" @click.stop="delectshow = false">取消</div>
 
         <div class="delec" @click.stop="dele">删除</div>
 
       </div>
 
-      <img @click.stop="delectshow = false" class="closeimg" src="" alt="" />
 
+      <img @click.stop="delectshow = false" class="closeimg" src="../../assets/close.png" alt="" />
 
     </div>
 
   </div>
 
 </template>
 
@@ -214,7 +214,7 @@ userid.value = JSON.parse(localStorage.getItem("USER_STORE"));
 
   top: 0;
 
   left: 0;
 
   z-index: 1900;
 
-  // width: 1920px;
 
+  width: 100vw;
 
   height: 100vh;
 
   display: flex;
 
   align-items: center;

+ 16 - 0
src/router/index.ts
Прегледај датотеку 

@@ -11,6 +11,14 @@ const routes = [
 
     },
 
   },
 
   {
 
+    path: "/agreement",
 
+    name: "agreement",
 
+    component: () => import("../view/Login/agreement.vue"),
 
+    mate: {
 
+      name: "协议",
 
+    },
 
+  },
 
+  {
 
     path: "/",
 
     redirect: "/home",
 
     component: Layout, //添加公共组件
 
@@ -111,6 +119,14 @@ const routes = [
 
           name: "文档",
 
         },
 
       },
 
+      {
 
+        path: "/input",
 
+        name: "input",
 
+        component: () => import("../view/handbook/input.vue"),
 
+        mate: {
 
+          name: "搜索",
 
+        },
 
+      },
 
     ],
 
   },
 
 ];

+ 24 - 0
src/view/Login/agreement.vue
Прегледај датотеку 

@@ -0,0 +1,24 @@
 
+<template>
 
+  <div class=""></div>
 
+</template>
 
+
 
+<script setup>
 
+import {useRouter,useRoute } from "vue-router"
 
+import {onMounted ,ref} from "vue"
 
+import * as agreementAPi from '../../api/login'
 
+const route = useRoute()
 
+const type = ref('')
 
+type.value = route.query.type
 
+console.log(route.query.type);
 
+//协议接口
 
+const agreement = async () => {
 
+  try {
 
+    const { data } = await agreementAPi.agreement({
 
+        code:type.value
 
+    });
 
+  } catch (error) {}
 
+};
 
+onMounted(agreement)
 
+</script>
 
+
 
+<style lang="scss" scoped></style>

+ 24 - 3
src/view/Login/index.vue
Прегледај датотеку 

@@ -85,9 +85,17 @@
 
           >
 
             <el-checkbox v-model="checked1" size="large" />
 
             <span style="margin-left: 6px">我已阅读并同意</span>
 
-            <span style="color: rgba(13, 15, 255, 1)">《平台服务条款》</span>
 
+            <span
 
+              style="color: rgba(13, 15, 255, 1); cursor: pointer"
 
+              @click="agreement('privacy')"
 
+              >《平台服务条款》</span
 
+            >
 
             <span>和</span>
 
-            <span style="color: rgba(13, 15, 255, 1)">《隐私政策》</span>
 
+            <span
 
+              style="color: rgba(13, 15, 255, 1); cursor: pointer"
 
+              @click="agreement('service')"
 
+              >《隐私政策》</span
 
+            >
 
           </div>
 
           <!-- 开始体验 -->
 
           <div v-if="isLogin" class="tiyan" @click="toindex">立即登录</div>
 
@@ -119,6 +127,9 @@ const router = useRouter();
 
 const route = useRoute();
 
 const isLogin = ref(true);
 
 
+if (route.query.isLogin == "false") {
 
+  isLogin.value = false;
 
+}
 
 const isQRCode: any = ref(false);
 
 
 //微信登录
 
@@ -132,6 +143,16 @@ const code = ref("");
 
 const checked1 = ref("");
 
 const time = ref(60);
 
 
+//跳转协议
 
+const agreement = (type)=>{
 
+  router.push({
 
+    path:'/agreement',
 
+    query:{
 
+      type:type
 
+    }
 
+  })
 
+}
 
+
 
 //登录接口
 
 const __topic__ = async () => {
 
   try {
 
@@ -156,7 +177,7 @@ const getQrCode = () => {
 
   loginApi
 
     .getCode({
 
       mobile: phone.value,
 
-      type: isLogin ? "login" : "register",
 
+      type: isLogin.value ? "login" : "register",
 
     })
 
     .then((res) => {
 
       isQRCode.value = true;

+ 82 - 79
src/view/handbook/bookinfo.vue
Прегледај датотеку 

@@ -22,78 +22,77 @@
 
         :prefix-icon="Search"
 
       />
 
       <div class="menu">
 
-        <el-col :span="12">
 
-          <el-menu
 
-            :default-openeds="book.category"
 
-            :unique-opened="true"
 
+        <el-menu
 
+          class="el-menu-vertical-demo"
 
+          @open="handleOpen"
 
+          @close="closeb"
 
+          :unique-opened="true"
 
+        >
 
+          <el-sub-menu
 
             v-for="(item, idx) in book.category"
 
             :key="idx"
 
-            class="el-menu-vertical-demo"
 
-            @open="document(item.id, item.name)"
 
-            @close="handleClose"
 
+            :index="String(item.id)"
 
           >
 
-            <el-sub-menu :index="idx">
 
-              <template #title>
 
-                <div>
 
-                  <span>{{ item.name }}</span>
 
-                </div>
 
-              </template>
 
-              <template v-if="item.children">
 
-                <el-sub-menu
 
-                  @click="document(item2.id, item2.name)"
 
-                  v-for="(item2, ind) in item.children"
 
-                  :key="ind"
 
-                  :index="idx + '*' + 1"
 
-                >
 
-                  <template #title>{{ item2.name }}</template>
 
+            <template #title>
 
+              <div>
 
+                <span>{{ item.name }}</span>
 
+              </div>
 
+            </template>
 
+            <template v-if="item.children">
 
+              <el-sub-menu
 
+                v-for="(item2, ind) in item.children"
 
+                :key="ind"
 
+                :index="item.id + '-' + item2.id"
 
+              >
 
+                <template #title>{{ item2.name }}</template>
 
 
-                  <template v-if="item2.children">
 
-                    <el-sub-menu
 
-                      @click="document(item3.id, item3.name)"
 
-                      v-for="(item3, inda) in item2.children"
 
-                      :key="inda"
 
-                      :index="idx+'*'+ind + '*' + 1"
 
-                    >
 
-                      <template #title>{{ item3.name }}</template>
 
-                      <el-menu-item
 
-                        v-for="(child, inx) in book.documentlist"
 
-                        :key="inx"
 
-                        @click="change(e, child.content, child.title)"
 
-                        :index="
 
-                          idx + '-' + idx + 1 + '-' + ind + 1 + '-' + inx + 1
 
-                        "
 
-                        >{{ child.title }}</el-menu-item
 
-                      >
 
-                    </el-sub-menu>
 
-                  </template>
 
-                  <template v-else>
 
+                <template v-if="item2.children">
 
+                  <el-sub-menu
 
+                    v-for="(item3, inda) in item2.children"
 
+                    :key="inda"
 
+                    :index="item.id + '-' + item2.id + '-' + item3.id"
 
+                  >
 
+                    <template #title>{{ item3.name }}</template>
 
                     <el-menu-item
 
-                      v-for="(child, index) in book.documentlist"
 
-                      :key="index"
 
-                      @click="change(e, child.content, child.title)"
 
-                      :index="idx+'-'+ind +'-' + index"
 
+                      v-for="(child, inx) in book.documentlist"
 
+                      :key="inx"
 
+                      @click="change(child.content, child.title)"
 
+                      :index="
 
+                        item.id +
 
+                        '-' +
 
+                        item2.id +
 
+                        '-' +
 
+                        item3.id +
 
+                        '-' +
 
+                        child.id
 
+                      "
 
                       >{{ child.title }}</el-menu-item
 
                     >
 
-                  </template>
 
-                </el-sub-menu>
 
-              </template>
 
-              <template v-else>
 
-                <el-menu-item
 
-                  v-for="(child, index) in book.documentlist"
 
-                  :key="index"
 
-                  @click="change(e, child.content, child.title)"
 
-                  :index="idx + '-' + index + 1"
 
-                  >{{ child.title }}</el-menu-item
 
-                >
 
-              </template>
 
-            </el-sub-menu>
 
-          </el-menu>
 
-        </el-col>
 
+                  </el-sub-menu>
 
+                </template>
 
+                <template v-else>
 
+                  <el-menu-item
 
+                    v-for="(child, index) in book.documentlist"
 
+                    :key="index"
 
+                    @click="change(child.content, child.title)"
 
+                    :index="item.id + '-' + item2.id + '-' + child.id"
 
+                    >{{ child.title }}</el-menu-item
 
+                  >
 
+                </template>
 
+              </el-sub-menu>
 
+            </template>
 
+            <template v-else>
 
+              <el-menu-item
 
+                v-for="(child, index) in book.documentlist"
 
+                :key="index"
 
+                :index="item.id + '-' + child.id"
 
+                >{{ child.title }}</el-menu-item
 
+              >
 
+            </template>
 
+          </el-sub-menu>
 
+        </el-menu>
 
       </div>
 
     </div>
 
-    <!-- <div class="right" >
 
-      <div v-html="book.content.con"></div>
 
-    </div> -->
 
     <div class="right">
 
       <div style="display: flex; align-items: center; column-gap: 6px">
 
         <span class="topsm">{{ changefont }}</span>
 
@@ -124,6 +123,10 @@ changeindex.value = route.query.index;
 
 type_id.value = route.query.id;
 
 const categoryname = ref("");
 
 const docu = ref("");
 
+const category_id = ref("");
 
+const input2 = ref("");
 
+
 
+category_id.value = route.query.category_id;
 
 //更换文档
 
 const topchange = (name, index, id) => {
 
   changefont.value = name;
 
@@ -144,6 +147,14 @@ const book = reactive({
 
     con: "",
 
   },
 
 });
 
+
 
+const handleOpen = (key, keyPath) => {
 
+  console.log("key1", key);
 
+  console.log("key", key.split("-").pop());
 
+  document(key.split("-").pop());
 
+};
 
+const closeb = (key, keyPath) => {};
 
+
 
 //文档类型列表
 
 const documentType = async () => {
 
   try {
 
@@ -152,7 +163,7 @@ const documentType = async () => {
 
   } catch (error) {}
 
 };
 
 onMounted(documentType);
 
-const category_id = ref("");
 
+
 
 //文档分类列表
 
 const category = async () => {
 
   try {
 
@@ -166,20 +177,17 @@ const category = async () => {
 
         categoryname.value = data[0].children[0].children[0].name;
 
         category_id.value = data[0].children[0].children[0].id;
 
         console.log(category_id.value);
 
-
 
-        document(category_id.value);
 
+        // document(category_id.value);
 
       } else {
 
         console.log(222);
 
         categoryname.value = data[0].children[0].name;
 
         category_id.value = data[0].children[0].id;
 
-        console.log(category_id.value);
 
-        document(category_id.value);
 
+        // document(category_id.value);
 
       }
 
     } else {
 
-      console.log(333);
 
       categoryname.value = data[0].name;
 
       category_id.value = data[0].id;
 
-      document(category_id.value);
 
+      // document(category_id.value);
 
     }
 
   } catch (error) {}
 
 };
 
@@ -193,20 +201,15 @@ const document = async (id, name) => {
 
       category_id: category_id.value,
 
     });
 
     book.documentlist = data.data;
 
-    categoryname.value = categoryname.value ? categoryname.value : name;
 
-    docu.value = data.data[0].title;
 
-    book.content.con = data.data[0].content;
 
+    // categoryname.value = categoryname.value ? categoryname.value : name;
 
+    // docu.value = data.data[0].title ||'';
 
+    // book.content.con = data.data[0].content;
 
   } catch (error) {
 
     console.log(error);
 
   }
 
 };
 
-// onMounted(document);
 
 
-const handleOpen = (key, keyPath) => {
 
-  console.log(key, keyPath);
 
-};
 
-const content = ref("");
 
-const change = (e, content, title) => {
 
+const change = (content, title) => {
 
   book.content.con = content;
 
   docu.value = title;
 
 };

+ 12 - 0
src/view/handbook/handbook.vue
Прегледај датотеку 

@@ -4,6 +4,7 @@
 
       <div class="title">云厂长功能手册</div>
 
       <div>
 
         <el-input
 
+          @change="toinput"
 
           v-model="input2"
 
           style="width: 240px"
 
           placeholder="你可以输入关键词，或者直接输入问题"
 
@@ -56,6 +57,7 @@
 
 import { useRouter } from "vue-router";
 
 import { onMounted, reactive, ref } from "vue";
 
 import bottom from "../../components/Layout/bottom.vue";
 
+import { Calendar, Search, ArrowRight } from "@element-plus/icons-vue";
 
 import * as bookApi from "../../api/document";
 
 const router = useRouter();
 
 const bookinfo = (name, idx, id) => {
 
@@ -68,6 +70,16 @@ const bookinfo = (name, idx, id) => {
 
     },
 
   });
 
 };
 
+const input2 = ref('')
 
+//跳转搜索页面
 
+const toinput = () => {
 
+  router.push({
 
+    path:'/input',
 
+    query:{
 
+      input2: input2.value
 
+    }
 
+  });
 
+};
 
 const book = reactive({
 
   list: [],
 
 });

+ 174 - 0
src/view/handbook/input.vue
Прегледај датотеку 

@@ -0,0 +1,174 @@
 
+<template>
 
+  <div class="inputbg">
 
+    <div style="flex-direction: column; display: flex; align-items: center">
 
+      <div class="toptitle">共搜索到 {{ total }} 条相关结果</div>
 
+      <div class="input">
 
+        <el-input
 
+          v-model="input"
 
+          class="w-50 m-2"
 
+          placeholder="请输入你要搜索的内容"
 
+        >
 
+          <template #prefix>
 
+            <el-icon class="el-input__icon"><search /></el-icon>
 
+          </template>
 
+          <template #suffix>
 
+            <!-- <el-icon class="el-input__icon"><calendar /></el-icon> -->
 
+            <el-icon @click="cleara" v-if="input" style="cursor: pointer"
 
+              ><CircleCloseFilled
 
+            /></el-icon>
 
+            <div v-if="input" class="line"></div>
 
+            <div class="search" @click="searcha">搜索</div>
 
+          </template>
 
+        </el-input>
 
+      </div>
 
+    </div>
 
+    <div class="content">
 
+      <div class="item" v-for="(item, idx) in result.info" :key="idx" @click="tobookinfo(item)">
 
+        <div class="title">{{ item.title }}</div>
 
+        <div class="con" v-html="getSimpleText(item.content)"></div>
 
+        <div class="bottom">
 
+          <div class="left">{{ item.type_name }}/{{ item.category_name }}</div>
 
+          <div class="right">{{ item.created_at }}</div>
 
+        </div>
 
+      </div>
 
+    </div>
 
+  </div>
 
+</template>
 
+
 
+<script setup>
 
+import { useRouter, useRoute } from "vue-router";
 
+import { onMounted, reactive, ref } from "vue";
 
+import { Calendar, Search } from "@element-plus/icons-vue";
 
+import * as bookApi from "../../api/document";
 
+const input = ref("");
 
+const total = ref(0);
 
+const route = useRoute();
 
+const router = useRouter();
 
+input.value = route.query.useRoute;
 
+const cleara = () => {
 
+  input.value = "";
 
+};
 
+const page = ref(1);
 
+const result = reactive({
 
+  info: [],
 
+});
 
+
 
+const searcha = async () => {
 
+  try {
 
+    const { data } = await bookApi.search({
 
+      category_id: "",
 
+      keyword: input.value,
 
+      page: page.value,
 
+    });
 
+    result.info = data.data;
 
+    total.value = data.total
 
+  } catch (error) {}
 
+};
 
+
 
+const tobookinfo = (item)=>{
 
+  router.push({
 
+    path:'bookinfo',
 
+    query:{
 
+      category_id:item.category_id,
 
+      id:item.type_id
 
+    }
 
+  })
 
+}
 
+
 
+const getSimpleText = (html) => {
 
+  var re1 = new RegExp("<.+?>", "g"); //匹配html标签的正则表达式，"g"是搜索匹配多个符合的内容
 
+  var msg = html.replace(re1, ""); //执行替换成空字符
 
+  var end = msg.replace(/&nbsp;/g, '')
 
+  const regex = new RegExp(input.value, 'gi');
 
+  return end.replace(regex, match => `<span style="color: rgba(19, 21, 254, 1);">${match}</span>`);
 
+};
 
+</script>
 
+
 
+<style lang="scss" scoped>
 
+.right {
 
+  margin-left: 20px;
 
+}
 
+.bottom {
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 400;
 
+  font-size: 12px;
 
+  color: #666666;
 
+  line-height: 17px;
 
+  text-align: left;
 
+  font-style: normal;
 
+  margin-top: 16px;
 
+  display: flex;
 
+}
 
+.item {
 
+  padding: 20px 0;
 
+  border-bottom: 1px solid rgba(151, 151, 151, 0.3);
 
+  cursor: pointer;
 
+}
 
+.con {
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 400;
 
+  font-size: 14px;
 
+  color: rgba(51, 51, 51, 1);
 
+  line-height: 20px;
 
+  text-align: justify;
 
+  font-style: normal;
 
+  margin-top: 16px;
 
+  //   display: -webkit-box;
 
+  //   -webkit-box-orient: vertical;
 
+  //   -webkit-line-clamp: 2;
 
+  //   overflow: hidden;
 
+}
 
+.title {
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 500;
 
+  font-size: 18px;
 
+  color: #333333;
 
+  line-height: 25px;
 
+  text-align: left;
 
+  font-style: normal;
 
+}
 
+.content {
 
+  width: 1200px;
 
+  margin: 0 auto;
 
+  margin-top: 20px;
 
+}
 
+.line {
 
+  width: 1px;
 
+  height: 22px;
 
+  background: #979797;
 
+  opacity: 0.3;
 
+  margin: 0 15px;
 
+}
 
+.search {
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 400;
 
+  font-size: 14px;
 
+  color: #1315fe;
 
+  line-height: 20px;
 
+  text-align: justify;
 
+  font-style: normal;
 
+  cursor: pointer;
 
+}
 
+.input {
 
+  width: 600px;
 
+  height: 40px;
 
+  margin-top: 40px;
 
+}
 
+.inputbg {
 
+  background: url("../../assets/inputpg.png") no-repeat;
 
+  background-size: 100% 720px;
 
+  width: 100%;
 
+  min-height: 100vh;
 
+  overflow: hidden;
 
+}
 
+.toptitle {
 
+  font-family: PingFangSC, PingFang SC;
 
+  font-weight: 600;
 
+  font-size: 54px;
 
+  color: #222222;
 
+  line-height: 75px;
 
+  text-align: center;
 
+  font-style: normal;
 
+  margin-top: 178px;
 
+}
 
+</style>

+ 4 - 4
src/view/video/course.vue
Прегледај датотеку 

@@ -126,11 +126,11 @@
 
     <div class="content">
 
       <div class="course" v-if="active == 1">
 
         <div v-if="islogin">
 
-          <div class="bigtitle">评论</div>
 
+          <!-- <div class="bigtitle">评论</div> -->
 
           <div>
 
             <el-input
 
               v-model="textarea"
 
-              :rows="2"
 
+              :rows="4"
 
               type="textarea"
 
               placeholder="请输入评论内容…"
 
             />
 
@@ -171,7 +171,7 @@
 
               </dd>
 
             </dl>
 
           </div>
 
-          <div>
 
+          <div v-if="commentList.list.length>0">
 
             <el-pagination
 
               background
 
               layout="prev, pager, next"
 
@@ -328,7 +328,7 @@ const join = async () => {
 
 const url = ref();
 
 const shareLink = async () => {
 
   url.value =
 
-    "https://www.yixiangvr.com/web/#/course?" +
 
+    "http://yczgw.hdlkeji.com/#/course?" +
 
     "id=" +
 
     route.query.id +
 
     "&read=" +

+ 1 - 1
src/view/video/index.vue
Прегледај датотеку 

@@ -26,7 +26,7 @@
 
         </div>
 
       </div>
 
     </div>
 
-    <div class="bottompage">
 
+    <div class="bottompage" v-if="imgList.list.length>0">
 
       <el-pagination
 
         background
 
         layout="prev, pager, next"

+ 28 - 24
src/view/video/info.vue
Прегледај датотеку 

@@ -8,7 +8,7 @@
 
       </div>
 
     </div>
 
     <div class="videobox">
 
-      <div class="content" style="position: relative;">
 
+      <div class="content" style="position: relative">
 
         <!-- <div > -->
 
         <video
 
           controls
 
@@ -19,7 +19,7 @@
 
           :initial-time="timeStamp"
 
           @play="time"
 
         ></video>
 
-        <div class="jindu" ></div>
 
+        <div class="jindu"></div>
 
         <!-- </div> -->
 
         <div class="like">
 
           <div class="flex" @click="like" style="cursor: pointer">
 
@@ -75,7 +75,7 @@
 
             <div>
 
               <el-input
 
                 v-model="textarea"
 
-                :rows="2"
 
+                :rows="4"
 
                 type="textarea"
 
                 placeholder="请输入评论内容…"
 
               />
 
@@ -119,7 +119,7 @@
 
                 </dd>
 
               </dl>
 
             </div>
 
-            <div>
 
+            <div v-if="commentList.list.length>0">
 
               <el-pagination
 
                 background
 
                 layout="prev, pager, next"
 
@@ -137,7 +137,7 @@
 
             >
 
               <img class="suo" src="../../assets/images/suo.png" alt="" />
 
               <div class="login">登录后才能查看评论</div>
 
-              <div class="log" @click='tologin(0)'>立即登录</div>
 
+              <div class="log" @click="tologin(0)">立即登录</div>
 
             </div>
 
           </div>
 
         </div>
 
@@ -173,7 +173,7 @@
 
 
 <script setup>
 
 import { useRouter, useRoute } from "vue-router";
 
-import { onMounted, reactive, ref } from "vue";
 
+import { onMounted, reactive, ref ,onUnmounted} from "vue";
 
 import bottom from "../../components/Layout/bottom.vue";
 
 import row from "../../components/row/row.vue";
 
 import * as videoAPi from "../../api/kecheng";
 
@@ -206,7 +206,7 @@ const toinfo = (id) => {
 
 const url = ref();
 
 const shareLink = async () => {
 
   url.value =
 
-    "https://www.yixiangvr.com/web/#/course?" +
 
+    "http://yczgw.hdlkeji.com/#/course?" +
 
     "id=" +
 
     route.query.id +
 
     "&read=" +
 
@@ -237,14 +237,14 @@ const collect = () => {
 
   }
 
 };
 
 //去登陆
 
-const tologin = (index)=>{
 
+const tologin = (index) => {
 
   router.push({
 
-    name:'/login',
 
-    query:{
 
-      index:index
 
-    }
 
-  })
 
-}
 
+    name: "/login",
 
+    query: {
 
+      index: index,
 
+    },
 
+  });
 
+};
 
 //收藏接口
 
 const collectadd = async () => {
 
   try {
 
@@ -346,7 +346,7 @@ const handleCurrentChange = (val) => {
 
 };
 
 
 const read = ref(0);
 
-let intervalId = ref();
 
+let intervalId = null
 
 //播放结束
 
 const onVideoEnded = () => {
 
   read.value = 1;
 
@@ -368,9 +368,11 @@ const study_record = async () => {
 
   } catch (error) {}
 
 };
 
 const time = () => {
 
-  intervalId.value = setInterval(() => {
 
-    study_record();
 
-  }, 7000);
 
+  if (islogin) {
 
+    intervalId = setInterval(() => {
 
+      study_record();
 
+    }, 7000);
 
+  }
 
 };
 
 const timeUpdate = (e) => {
 
   allTime.value = parseInt(e.target.duration);
 
@@ -380,9 +382,8 @@ const timeUpdate = (e) => {
 
 
 //返回课程
 
 const returna = () => {
 
-  if (intervalId.value) {
 
-    clearInterval(intervalId.value);
 
-    intervalId.value = null;
 
+  if (intervalId) {
 
+    clearInterval(intervalId);
 
   }
 
   router.replace({
 
     name: "course",
 
@@ -392,17 +393,20 @@ const returna = () => {
 
     },
 
   });
 
 };
 
+onUnmounted(() => {
 
+  clearInterval(intervalId);
 
+});
 
 </script>
 
 
 <style lang="scss" scoped>
 
-.jindu{
 
+.jindu {
 
   width: 100%;
 
-  height: 30px;
 
+  height: 50px;
 
   opacity: 0;
 
   background: #000;
 
   position: absolute;
 
   z-index: 300;
 
-  top: 600px;
 
+  top: 580px;
 
 }
 
 .comment {
 
   &-list {