首页 发现 帮助
注册 登录
mabaoyi
/
factoryDirector
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

更新

mabaoyi 5 月之前
父节点
21f9d53b24
当前提交
d3e6f5348e
共有 10 个文件被更改，包括 53 次插入 和 54 次删除
合并视图 显示文件统计
  1. 2 23
      dist/index.html
  2. 1 2
      src/components/Banne/index.vue
  3. 1 0
      src/components/Layout/bottom.vue
  4. 1 1
      src/utils/common.ts
  5. 23 0
      src/view/AboutUs/index.vue
  6. 2 0
      src/view/Home/index.vue
  7. 10 10
      src/view/Home/price.vue
  8. 3 0
      src/view/PersonalCenter/component/mineCollect.vue
  9. 2 10
      src/view/PersonalCenter/component/mineOnTrial.vue
  10. 8 8
      src/view/video/info.vue

+ 2 - 23
dist/index.html
查看文件 

@@ -1,23 +1,3 @@
 
-<<<<<<< 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>
 
 <!DOCTYPE html>
 
 <html lang="en">
 
 <html lang="en">
 
   <head>
 
   <head>
 
@@ -29,14 +9,13 @@
 
     />
 
     />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
 
     <title>云厂长</title>
 
     <title>云厂长</title>
 
-    <script type="module" crossorigin src="./assets/index-CvLX--VT.js"></script>
 
-    <link rel="stylesheet" crossorigin href="./assets/index-D9MQ9Cfc.css">
 
+    <script type="module" crossorigin src="./assets/index-BsGjXa_G.js"></script>
 
+    <link rel="stylesheet" crossorigin href="./assets/index-D_c4N80q.css">
 
   </head>
 
   </head>
 
   <body>
 
   <body>
 
     <div id="app"></div>
 
     <div id="app"></div>
 
   </body>
 
   </body>
 
 </html>
 
 </html>
 
->>>>>>> refs/remotes/origin/master
 
 <style lang="scss">* {
 
 <style lang="scss">* {
 
   margin: 0;
 
   margin: 0;
 
   padding: 0;
 
   padding: 0;

+ 1 - 2
src/components/Banne/index.vue
查看文件 

@@ -1,6 +1,6 @@
 
 <template>
 
 <template>
 
   <div class="block text-center">
 
   <div class="block text-center">
 
-    <el-carousel arrow="never">
 
+    <el-carousel arrow="never" interval="5000" motion-blur>
 
       <el-carousel-item
 
       <el-carousel-item
 
         v-for="(item, index) in props.banneImageList"
 
         v-for="(item, index) in props.banneImageList"
 
         :key="index"
 
         :key="index"
 
@@ -39,7 +39,6 @@ const props = defineProps({
 
 
 
 console.log(props.banneImageList);
 
 console.log(props.banneImageList);
 
 
 
-
 
 const toUrl = (url: string) => {
 
 const toUrl = (url: string) => {
 
   if (!url) {
 
   if (!url) {
 
     ElMessage({
 
     ElMessage({

+ 1 - 0
src/components/Layout/bottom.vue
查看文件 

@@ -75,6 +75,7 @@ const info = async () => {
 
 onMounted(info);
 
 onMounted(info);
 
 const topage = (url) => {
 
 const topage = (url) => {
 
   window.location.href = window.location.origin + "/#" + url;
 
   window.location.href = window.location.origin + "/#" + url;
 
+  // router.push(url);
 
 };
 
 };
 
 </script>
 
 </script>

+ 1 - 1
src/utils/common.ts
查看文件 

@@ -1,7 +1,7 @@
 
 import { ElMessage } from "element-plus";
 
 import { ElMessage } from "element-plus";
 
 
 
 //复制
 
 //复制
 
-export function copyDomText(val) {
 
+export function copyDomText(val: any) {
 
   // 获取需要复制的元素以及元素内的文本内容
 
   // 获取需要复制的元素以及元素内的文本内容
 
   const text = val;
 
   const text = val;
 
   // 添加一个input元素放置需要的文本内容
 
   // 添加一个input元素放置需要的文本内容

+ 23 - 0
src/view/AboutUs/index.vue
查看文件 

@@ -94,8 +94,31 @@ const onTrial = () => {
 
   });
 
   });
 
 };
 
 };
 
 
 
+const scrollToTop = (
 
+  scrollContainer: any,
 
+  speed: number = 10,
 
+  step: number = 10
 
+) => {
 
+  // scrollContainer：要滚动的容器元素，可以是 window 或任意具有 scrollTop 属性的元素
 
+  // speed：每次滚动的距离，即返回顶部的速度，默认为 10
 
+  // step：每次滚动的时间间隔，单位为毫秒，默认为 10
 
+
 
+  let scrollTop = scrollContainer.scrollTop;
 
+  const time = setInterval(() => {
 
+    scrollTop -= speed;
 
+    if (scrollTop <= 0) {
 
+      clearInterval(time);
 
+      scrollContainer.scrollTop = 0;
 
+    } else {
 
+      scrollContainer.scrollTop = scrollTop;
 
+    }
 
+  }, step);
 
+};
 
+
 
 onMounted(() => {
 
 onMounted(() => {
 
   getInfo();
 
   getInfo();
 
+  // 返回 window 顶部
 
+  scrollToTop(window, 20, 5);
 
 });
 
 });
 
 </script>
 
 </script>
 
 <style scoped lang="less">
 
 <style scoped lang="less">

+ 2 - 0
src/view/Home/index.vue
查看文件 

@@ -91,6 +91,8 @@ const toPlugIn = () => {
 
 
 
 //试用
 
 //试用
 
 const startTrial = () => {
 
 const startTrial = () => {
 
+  console.log(window);
 
+  return;
 
   dialogTableVisible2.value = true;
 
   dialogTableVisible2.value = true;
 
 };
 
 };

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

@@ -118,7 +118,7 @@
 
             一对一专业顾问演示服务，助您快速了解系统功能
 
             一对一专业顾问演示服务，助您快速了解系统功能
 
           </div>
 
           </div>
 
           <!-- <div class="image"></div> -->
 
           <!-- <div class="image"></div> -->
 
-          <img class="image" :src="img" alt="">
 
+          <img class="image" :src="img" alt="" />
 
           <div class="bottom_font">手机扫码添加微信</div>
 
           <div class="bottom_font">手机扫码添加微信</div>
 
         </div>
 
         </div>
 
       </el-dialog>
 
       </el-dialog>
 
@@ -134,7 +134,7 @@ import bottom from "../../components/Layout/bottom.vue";
 
 import application from "../../components/Application .vue";
 
 import application from "../../components/Application .vue";
 
 import corporation from "../../components/corporation.vue";
 
 import corporation from "../../components/corporation.vue";
 
 import * as configApi from "../../api/config";
 
 import * as configApi from "../../api/config";
 
-import froma from '../../components/Form/from.vue'
 
+import froma from "../../components/Form/from.vue";
 
 
 
 //价格配置
 
 //价格配置
 
 const config = async () => {
 
 const config = async () => {
 
@@ -157,16 +157,16 @@ const configa = async () => {
 
 };
 
 };
 
 onMounted(configa);
 
 onMounted(configa);
 
 // 客服二维码
 
 // 客服二维码
 
-const img = ref('')
 
+const img = ref("");
 
 const configb = async () => {
 
 const configb = async () => {
 
   try {
 
   try {
 
     const { data } = await configApi.config({
 
     const { data } = await configApi.config({
 
       module: "basic",
 
       module: "basic",
 
     });
 
     });
 
-    img.value = data.service_mobile
 
+    img.value = data.service_qr_code;
 
   } catch (error) {}
 
   } catch (error) {}
 
 };
 
 };
 
-onMounted(configa);
 
+onMounted(configb);
 
 
 
 //更换标签
 
 //更换标签
 
 const tabs = ref("0");
 
 const tabs = ref("0");
 
@@ -193,9 +193,9 @@ const pricea = reactive({
 
 const infoa = reactive({
 
 const infoa = reactive({
 
   info: {},
 
   info: {},
 
 });
 
 });
 
-const close = ()=>{
 
-  dialogTableVisible2.value = false
 
-}
 
+const close = () => {
 
+  dialogTableVisible2.value = false;
 
+};
 
 </script>
 
 </script>
 
 
 
 <style lang="scss" scoped>
 
 <style lang="scss" scoped>
 
@@ -203,13 +203,13 @@ const close = ()=>{
 
   width: 1200px;
 
   width: 1200px;
 
   margin-bottom: 70px;
 
   margin-bottom: 70px;
 
 }
 
 }
 
-::v-deep(.one .el-dialog){
 
+::v-deep(.one .el-dialog) {
 
   --el-dialog-width: 420px !important;
 
   --el-dialog-width: 420px !important;
 
 }
 
 }
 
 :deep(.two .el-dialog) {
 
 :deep(.two .el-dialog) {
 
   --el-dialog-width: 520px !important;
 
   --el-dialog-width: 520px !important;
 
 }
 
 }
 
-::v-deep(.el-form-item__label){
 
+::v-deep(.el-form-item__label) {
 
   width: 83px !important;
 
   width: 83px !important;
 
 }
 
 }
 
 .button {
 
 .button {

+ 3 - 0
src/view/PersonalCenter/component/mineCollect.vue
查看文件 

@@ -98,7 +98,10 @@ onMounted(() => {
 
   }
 
   }
 
   .collect-list {
 
   .collect-list {
 
     display: flex;
 
     display: flex;
 
+    flex-wrap: wrap;
 
     .collect-content {
 
     .collect-content {
 
+      margin-bottom: 20px;
 
+      margin-right: 10px;
 
       .collect-img {
 
       .collect-img {
 
         width: 214px;
 
         width: 214px;
 
         height: 130px;
 
         height: 130px;

+ 2 - 10
src/view/PersonalCenter/component/mineOnTrial.vue
查看文件 

@@ -110,6 +110,7 @@
 
 import { reactive, onMounted, ref } from "vue";
 
 import { reactive, onMounted, ref } from "vue";
 
 import { ElMessage } from "element-plus";
 
 import { ElMessage } from "element-plus";
 
 import { getApplicationInformation } from "../../../api/homepage";
 
 import { getApplicationInformation } from "../../../api/homepage";
 
+import { copyDomText } from "../../../utils/common";
 
 
 
 const onTrialData = reactive({
 
 const onTrialData = reactive({
 
   visionName: "云厂长企业版",
 
   visionName: "云厂长企业版",
 
@@ -141,16 +142,7 @@ const getInfo = () => {
 
 
 
 //复制
 
 //复制
 
 const cope = (text: string) => {
 
 const cope = (text: string) => {
 
-  let oInput = document.createElement("input");
 
-  oInput.value = text;
 
-  document.body.appendChild(oInput);
 
-  oInput.select(); // 选择对象;
 
-  document.execCommand("Copy"); // 执行浏览器复制命令
 
-  oInput.remove();
 
-  ElMessage({
 
-    type: "success",
 
-    message: "复制成功！",
 
-  });
 
+  copyDomText(text);
 
 };
 
 };
 
 
 
 onMounted(() => {
 
 onMounted(() => {

+ 8 - 8
src/view/video/info.vue
查看文件 

@@ -119,7 +119,7 @@
 
                 </dd>
 
                 </dd>
 
               </dl>
 
               </dl>
 
             </div>
 
             </div>
 
-            <div v-if="commentList.list.length>0">
 
+            <div v-if="commentList.list.length > 0">
 
               <el-pagination
 
               <el-pagination
 
                 background
 
                 background
 
                 layout="prev, pager, next"
 
                 layout="prev, pager, next"
 
@@ -173,7 +173,7 @@
 
 
 
 <script setup>
 
 <script setup>
 
 import { useRouter, useRoute } from "vue-router";
 
 import { useRouter, useRoute } from "vue-router";
 
-import { onMounted, reactive, ref ,onUnmounted} from "vue";
 
+import { onMounted, reactive, ref, onUnmounted } from "vue";
 
 import bottom from "../../components/Layout/bottom.vue";
 
 import bottom from "../../components/Layout/bottom.vue";
 
 import row from "../../components/row/row.vue";
 
 import row from "../../components/row/row.vue";
 
 import * as videoAPi from "../../api/kecheng";
 
 import * as videoAPi from "../../api/kecheng";
 
@@ -221,11 +221,11 @@ const shareLink = async () => {
 
 //点赞
 
 //点赞
 
 const is_like = ref(0);
 
 const is_like = ref(0);
 
 const like = () => {
 
 const like = () => {
 
-  if (is_like.value == 0) {
 
-  } else {
 
-    // is_like.value = 0
 
-    likea();
 
-  }
 
+  //   if (is_like.value == 0) {
 
+  //   } else {
 
+  // is_like.value = 0
 
+  likea();
 
+  // }
 
 };
 
 };
 
 //收藏
 
 //收藏
 
 const is_collect = ref(0);
 
 const is_collect = ref(0);
 
@@ -346,7 +346,7 @@ const handleCurrentChange = (val) => {
 
 };
 
 };
 
 
 
 const read = ref(0);
 
 const read = ref(0);
 
-let intervalId = null
 
+let intervalId = null;
 
 //播放结束
 
 //播放结束
 
 const onVideoEnded = () => {
 
 const onVideoEnded = () => {
 
   read.value = 1;
 
   read.value = 1;