首頁 探索 說明
註冊 登入
mabaoyi
/
factoryDirector
1
0
複刻 0
檔案 問題管理 0 合併請求 0 Wiki
瀏覽代碼

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

mabaoyi 5 月之前
父節點
fc5771c268 6275ed2555
當前提交
f22b9f5b81
共有 11 個文件被更改，包括 209 次插入 和 99 次删除
分割檢視 顯示文件統計
  1. 二進制
      dist.zip
  2. 19 19
      dist/index.html
  3. 9 1
      src/api/login.ts
  4. 11 3
      src/components/Layout/bottom.vue
  5. 32 8
      src/components/advantage/index.vue
  6. 3 2
      src/components/corporation.vue
  7. 13 41
      src/view/Home/price.vue
  8. 33 7
      src/view/Login/index.vue
  9. 27 5
      src/view/handbook/bookinfo.vue
  10. 22 6
      src/view/video/course.vue
  11. 40 7
      src/view/video/index.vue

二進制
dist.zip
查看文件


+ 19 - 19
dist/index.html
查看文件 

@@ -1,21 +1,21 @@
 
-<!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-DOk_02cB.js"></script>
 
-    <link rel="stylesheet" crossorigin href="./assets/index-BkRXtAFK.css">
 
-  </head>
 
-  <body>
 
-    <div id="app"></div>
 
-  </body>
 
-</html>
 
+<!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-C7a-BVzJ.js"></script>
 
+    <link rel="stylesheet" crossorigin href="./assets/index-5TyMKneC.css">
 
+  </head>

+  <body>

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


+  </body>

+</html>

 <style lang="scss">* {
 
   margin: 0;
 
   padding: 0;
 
@@ -31,4 +31,4 @@ html {
 
   width: 100%;
 
   overflow-x: hidden;
 
 }
 
-</style>
 
+</style>

+ 9 - 1
src/api/login.ts
查看文件 

@@ -3,7 +3,15 @@ import request from "../utils/request";
 
 //登录
 
 export const login = (data: any) => {
 
   return request({
 
-    url: "/login",
 
+    url: "/login/code",
 
+    method: "post",
 
+    data,
 
+  });
 
+};
 
+//注册
 
+export const code_register = (data: any) => {
 
+  return request({
 
+    url: "/code_register",
 
     method: "post",
 
     data,
 
   });

+ 11 - 3
src/components/Layout/bottom.vue
查看文件 

@@ -3,7 +3,12 @@
 
     <div class="top">
 
       <div v-for="(item, idx) in foot.list" :key="idx">
 
         <div class="title">{{ item.title }}</div>
 
-        <div class="item" v-for="(child, index) in item.footer" :key="index">
 
+        <div
 
+          class="item"
 
+          @click="topage(child.url)"
 
+          v-for="(child, index) in item.footer"
 
+          :key="index"
 
+        >
 
           {{ child.title }}
 
         </div>
 
       </div>
 
@@ -43,6 +48,7 @@ import { useRouter } from "vue-router";
 
 import { onMounted, reactive, ref } from "vue";
 
 import * as tongApi from "../../api/tongyong";
 
 import * as configApi from "../../api/config";
 
+const router = useRouter();
 
 const foot = reactive({
 
   list: [],
 
   info: {},
 
@@ -65,7 +71,9 @@ const info = async () => {
 
   } catch (error) {}
 
 };
 
 onMounted(info);
 
-onMounted(() => {});
 
+const topage = (url) => {
 
+  window.location.href = url
 
+};
 
 </script>
 
 
 <style lang="scss" scoped>
 
@@ -112,7 +120,7 @@ onMounted(() => {});
 
   }
 
   .logo {
 
     width: 104px;
 
-    height: 44px;
 
+    height: 100px;
 
     // background: #d8d8d8;
 
   }
 
 }

+ 32 - 8
src/components/advantage/index.vue
查看文件 

@@ -23,10 +23,7 @@
 
     </div>
 
     <!-- 内容 -->
 
     <div v-for="(item, idx) in tabslist" :key="idx" class="contenta">
 
-      <div
 
-        v-if="idx == activeName"
 
-        style="display: flex; align-items: center"
 
-      >
 
+      <div v-if="idx == activeName" style="display: flex; align-items: center">
 
         <div class="left">
 
           <div class="title">{{ item.title }}</div>
 
           <div class="content">
 
@@ -39,7 +36,7 @@
 
               <div>{{ child }}</div>
 
             </div>
 
           </div>
 
-          <div class="trybtn" v-if="item.button_title">申请试用</div>
 
+          <div class="trybtn" v-if="item.button_title" @click="apply">申请试用</div>
 
         </div>
 
         <div class="right">
 
           <!-- <img class="right" src="../../assets/images/model.png" alt="" /> -->
 
@@ -48,12 +45,39 @@
 
       </div>
 
     </div>
 
   </div>
 
+  <forma :dialogTableVisible2="dialogTableVisible2" @clos="close"></forma>
 
 </template>
 
 
 <script setup lang="ts">
 
 import { useRouter } from "vue-router";
 
 import { onMounted, ref, reactive } from "vue";
 
-onMounted(() => {});
 
+import forma from "../../components/Form/from.vue";
 
+import { ElMessage, ElMessageBox } from "element-plus";
 
+const dialogTableVisible2 = ref(false);
 
+//申请
 
+//是否登录
 
+const is_login = ref(false);
 
+if (localStorage.getItem("access_token")) {
 
+  is_login.value = true;
 
+} else {
 
+  is_login.value = false;
 
+}
 
+const apply = () => {
 
+  if (is_login.value) {
 
+    dialogTableVisible2.value = true;
 
+  } else {
 
+    ElMessage({
 
+      message: "请先登录",
 
+      type: "error",
 
+    });
 
+  }
 
+};
 
+//关闭
 
+const close = () => {
 
+  dialogTableVisible2.value = false;
 
+};
 
+
 
+
 
 const activeName = ref(0);
 
 
 const handleClick = (tab, event) => {
 
@@ -83,10 +107,10 @@ const props = defineProps({
 
 </script>
 
 
 <style lang="scss" scoped>
 
-:deep(.el-tabs__item.is-active){
 
+:deep(.el-tabs__item.is-active) {
 
   color: rgba(13, 15, 255, 1) !important;
 
 }
 
-:deep(.el-tabs__active-bar){
 
+:deep(.el-tabs__active-bar) {
 
   background-color: rgba(13, 15, 255, 1) !important;
 
 }
 
 .bgbox {

+ 3 - 2
src/components/corporation.vue
查看文件 

@@ -59,6 +59,7 @@
 
 import { useRouter } from "vue-router";
 
 import { onMounted, reactive, ref, watch } from "vue";
 
 import forma from "../components/Form/from.vue";
 
+import { ElMessage, ElMessageBox } from "element-plus";
 
 onMounted(() => {});
 
 const props = defineProps({
 
   title: {
 
@@ -240,13 +241,13 @@ watch(
 
   margin-top: 60px;
 
   .item {
 
     width: 580px;
 
-    height: 560px;
 
+    // height: 560px;
 
     // background: red;
 
   }
 
 }
 
 .bgbox {
 
   width: 100%;
 
-  height: 820px;
 
+  // height: 820px;
 
   padding: 80px 360px 0;
 
   box-sizing: border-box;
 
   .title {

+ 13 - 41
src/view/Home/price.vue
查看文件 

@@ -117,50 +117,12 @@
 
           <div class="topfont">
 
             一对一专业顾问演示服务，助您快速了解系统功能
 
           </div>
 
-          <div class="image"></div>
 
+          <!-- <div class="image"></div> -->
 
+          <img class="image" :src="img" alt="">
 
           <div class="bottom_font">手机扫码添加微信</div>
 
         </div>
 
       </el-dialog>
 
     </div>
 
-    <!-- <div class="two">
 
-      <el-dialog v-model="dialogTableVisible2" :show-close="false">
 
-        <div class="width">
 
-          <div class="toptitle">申请免费试用</div>
 
-          <div class="topfont">请填写表单信息，我们团队将尽快与您联系</div>
 
-        </div>
 
-        <div class="formbox">
 
-          <el-form :model="formLabelAlign" style="max-width: 660px">
 
-            <el-form-item label="您的姓名">
 
-              <el-input
 
-                v-model="formLabelAlign.name"
 
-                placeholder="请填写您的真实姓名（必填）"
 
-              />
 
-            </el-form-item>
 
-            <el-form-item label="公司名称">
 
-              <el-input
 
-                v-model="formLabelAlign.corporation"
 
-                placeholder="请填写公司真实名称"
 
-              />
 
-            </el-form-item>
 
-            <el-form-item label="邮箱">
 
-              <el-input
 
-                v-model="formLabelAlign.emil"
 
-                placeholder="请填写您的邮箱地址"
 
-              />
 
-            </el-form-item>
 
-            <el-form-item label="申请版本">
 
-              <el-input
 
-                v-model="formLabelAlign.type"
 
-                placeholder="请填写您需要试用的版本（必填）"
 
-              />
 
-            </el-form-item>
 
-          </el-form>
 
-        </div>
 
-        <div style="display: flex; justify-content: center">
 
-          <div class="button" @click='apply'>立即申请</div>
 
-        </div>
 
-      </el-dialog>
 
-    </div> -->
 
     <froma :dialogTableVisible2="dialogTableVisible2" @clos="close"></froma>
 
   </div>
 
 </template>
 
@@ -194,6 +156,17 @@ const configa = async () => {
 
   } catch (error) {}
 
 };
 
 onMounted(configa);
 
+// 客服二维码
 
+const img = ref('')
 
+const configb = async () => {
 
+  try {
 
+    const { data } = await configApi.config({
 
+      module: "basic",
 
+    });
 
+    img.value = data.service_mobile
 
+  } catch (error) {}
 
+};
 
+onMounted(configa);
 
 
 //更换标签
 
 const tabs = ref("0");
 
@@ -270,7 +243,6 @@ const close = ()=>{
 
   .image {
 
     width: 300px;
 
     height: 300px;
 
-    background: rgba(125, 125, 157, 0.3);
 
     margin-top: 22px;
 
   }
 
   .bottom_font {

+ 33 - 7
src/view/Login/index.vue
查看文件 

@@ -91,7 +91,7 @@
 
           </div>
 
           <!-- 开始体验 -->
 
           <div v-if="isLogin" class="tiyan" @click="toindex">立即登录</div>
 
-          <div v-else class="tiyan">开始体验</div>
 
+          <div v-else class="tiyan" @click="register">开始体验</div>
 
         </div>
 
         <div class="bottom_line"></div>
 
         <div class="bottom_login">
 
@@ -137,7 +137,7 @@ const __topic__ = async () => {
 
   try {
 
     const { data } = await loginApi.login({
 
       mobile: phone.value,
 
-      password: 123456,
 
+      code:code.value,
 
     });
 
     if (route.query.index) {
 
       router.go(-1);
 
@@ -147,10 +147,6 @@ const __topic__ = async () => {
 
       });
 
     }
 
     localStorage.setItem("access_token", JSON.stringify(data.token));
 
-    router.push({
 
-      name: "home",
 
-    });
 
-    localStorage.setItem("access_token", JSON.stringify(data.token));
 
     localStorage.setItem("userInfo", JSON.stringify(data));
 
     localStorage.setItem("USER_STORE", JSON.stringify(data));
 
   } catch (error) {}
 
@@ -160,7 +156,7 @@ const getQrCode = () => {
 
   loginApi
 
     .getCode({
 
       mobile: phone.value,
 
-      type: "register",
 
+      type: isLogin ? "login" : "register",
 
     })
 
     .then((res) => {
 
       console.log(res);
 
@@ -185,6 +181,36 @@ const toindex = () => {
 
     __topic__();
 
   }
 
 };
 
+//注册
 
+const register = () => {
 
+  if (checked1.value == "") {
 
+    ElMessage({
 
+      message: "请勾选协议",
 
+      type: "warning",
 
+    });
 
+  } else {
 
+    __register__();
 
+  }
 
+};
 
+//注册接口
 
+const __register__ = async () => {
 
+  try {
 
+    const { data } = await loginApi.code_register({
 
+      mobile: phone.value,
 
+      code:code.value,
 
+    });
 
+    if (route.query.index) {
 
+      router.go(-1);
 
+    } else {
 
+      router.push({
 
+        name: "home",
 
+      });
 
+    }
 
+    localStorage.setItem("access_token", JSON.stringify(data.token));
 
+    localStorage.setItem("userInfo", JSON.stringify(data));
 
+    localStorage.setItem("USER_STORE", JSON.stringify(data));
 
+  } catch (error) {}
 
+};
 
 </script>
 
 <style lang="less" scoped>
 
 .image {

+ 27 - 5
src/view/handbook/bookinfo.vue
查看文件 

@@ -96,9 +96,9 @@
 
     <div class="right">
 
       <div style="display: flex; align-items: center; column-gap: 6px">
 
         <span class="topsm">{{ changefont }}</span>
 
-        <el-icon><ArrowRight /></el-icon>
 
+        <el-icon v-if="categoryname"><ArrowRight /></el-icon>
 
         <span class="topsm">{{ categoryname }}</span>
 
-        <el-icon><ArrowRight /></el-icon>
 
+        <el-icon v-if="docu"><ArrowRight /></el-icon>
 
         <span class="topsm">{{ docu }}</span>
 
       </div>
 
       <div class="bigtitle">{{ docu }}</div>
 
@@ -128,7 +128,10 @@ const topchange = (name, index, id) => {
 
   changefont.value = name;
 
   changeindex.value = index;
 
   type_id.value = id;
 
+  docu.value = ''
 
+  categoryname.value = ''
 
   book.documentlist = [];
 
+  book.content.con = "";
 
   category();
 
 };
 
 
@@ -156,9 +159,28 @@ const category = async () => {
 
       type_id: type_id.value,
 
     });
 
     book.category = data;
 
-    categoryname.value = data[0].name;
 
-    category_id.value = data[0].id;
 
-    document();
 
+    if (data[0].children) {
 
+      if (data[0].children[0].children) {
 
+        console.log(111);
 
+        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);
 
+      } 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);
 
+      }
 
+    } else {
 
+      console.log(333);
 
+      categoryname.value = data[0].name;
 
+      category_id.value = data[0].id;
 
+      document(category_id.value);
 
+    }
 
+    
   } catch (error) {}
 
 };
 
 onMounted(category);

+ 22 - 6
src/view/video/course.vue
查看文件 

@@ -52,7 +52,9 @@
 
             @click="videoinfo(child.id)"
 
           >
 
             <div style="display: flex; align-items: center">
 
-              <div>第{{ index + 1 }}课 {{ child.title }}</div>
 
+              <div class="videotitle">
 
+                第{{ index + 1 }}课 {{ child.title }}
 
+              </div>
 
               <div class="tim">{{ child.duration }}</div>
 
             </div>
 
             <div style="display: flex; align-items: center">
 
@@ -388,6 +390,13 @@ const videoinfo = (id, time) => {
 
 </script>
 
 
 <style lang="scss" scoped>
 
+.videotitle {
 
+  width: 420px;
 
+  -webkit-line-clamp: 2;
 
+  -webkit-box-orient: vertical;
 
+  display: -webkit-box;
 
+  overflow: hidden;
 
+}
 
 .log {
 
   width: 156px;
 
   height: 44px;
 
@@ -648,16 +657,23 @@ const videoinfo = (id, time) => {
 
     display: flex;
 
     align-items: center;
 
     justify-content: space-between;
 
-    font-family: PingFangSC, PingFang SC;
 
-    font-weight: 600;
 
+    // font-family: PingFangSC, PingFang SC;
 
+    // font-weight: 600;
 
+    // font-size: 16px;
 
+    // color: #222222;
 
+    // line-height: 22px;
 
+    // text-align: left;
 
+    // font-style: normal;
 
+    padding-left: 20px;
 
+    padding-right: 20px;
 
+    border-bottom: 1px solid rgba(151, 151, 151, 0.1);
 
+    font-family: SFPro, SFPro;
 
+    font-weight: 500;
 
     font-size: 16px;
 
     color: #222222;
 
     line-height: 22px;
 
     text-align: left;
 
     font-style: normal;
 
-    padding-left: 20px;
 
-    padding-right: 20px;
 
-    border-bottom: 1px solid rgba(151, 151, 151, 0.1);
 
   }
 
   .bigtitle {
 
     // width: 760px;

+ 40 - 7
src/view/video/index.vue
查看文件 

@@ -1,6 +1,13 @@
 
 <template>
 
   <Banne :banneImageList="imgList.banneImageList" />
 
-  <div class="videobox">
 
+  <div
 
+    class="videobox"
 
+    style="
 
+      display: flex;
 
+      justify-content: space-between;
 
+      flex-direction: column;
 
+    "
 
+  >
 
     <div class="box">
 
       <div
 
         @click="toinfo(item.id)"
 
@@ -19,6 +26,15 @@
 
         </div>
 
       </div>
 
     </div>
 
+    <div class="bottompage">
 
+      <el-pagination
 
+        background
 
+        layout="prev, pager, next"
 
+        :total="total"
 
+        @current-change="handleCurrentChange"
 
+        :page-size="8"
 
+      />
 
+    </div>
 
   </div>
 
   <!-- <div class="foot"></div> -->
 
   <bottom></bottom>
 
@@ -32,15 +48,27 @@ import * as videoAPi from "../../api/kecheng";
 
 import * as configApi from "../../api/config";
 
 const router = useRouter();
 
 
+//课程总数
 
+const total = ref(0)
 
+const page = ref(1)
 
 //课程列表
 
 const list = async () => {
 
   try {
 
-    const { data } = await videoAPi.list({});
 
+    const { data } = await videoAPi.list({
 
+      page:page.value,
 
+      limit:8
 
+    });
 
     imgList.list = data.data;
 
+    total.value = data.total
 
   } catch (error) {}
 
 };
 
 onMounted(list);
 
 
+const handleCurrentChange = (val) => {
 
+  page.value = val;
 
+  list()
 
+};
 
+
 
 const imgList = reactive({
 
   //banne图需要的数据
 
   banneImageList: [
 
@@ -61,12 +89,12 @@ const imgList = reactive({
 
 const getBanneList = async () => {
 
   try {
 
     const { data } = await configApi.getBanneList({
 
-      code:'video'
 
-  });
 
-  imgList.banneImageList = data;
 
+      code: "video",
 
+    });
 
+    imgList.banneImageList = data;
 
   } catch (error) {}
 
 };
 
-onMounted(getBanneList)
 
+onMounted(getBanneList);
 
 const toinfo = (id) => {
 
   router.push({
 
     name: "course",
 
@@ -78,11 +106,16 @@ const toinfo = (id) => {
 
 };
 
 </script>
 
 <style lang="less" scoped>
 
+.bottompage {
 
+  display: flex;
 
+  align-items: center;
 
+  justify-content: center;
 
+}
 
 .foot {
 
   height: 480px;
 
 }
 
 .videobox {
 
-  height: 640px;
 
+  min-height: 640px;
 
   padding: 60px 0 70px;
 
   box-sizing: border-box;
 
   background: rgba(245, 245, 247, 1);