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

package-lock.json

@@ -9,6 +9,7 @@
       "version": "0.0.0",
       "dependencies": {
         "@element-plus/icons-vue": "^2.3.1",
+        "animate.css": "^4.1.1",
         "axios": "^1.6.8",
         "echarts": "^5.5.0",
         "element-china-area-data": "^6.1.0",
@@ -827,6 +828,11 @@
         "url": "https://github.com/sponsors/antfu"
       }
     },
+    "node_modules/animate.css": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/animate.css/-/animate.css-4.1.1.tgz",
+      "integrity": "sha512-+mRmCTv6SbCmtYJCN4faJMNFVNN5EuCTTprDTAo7YzIGji2KADmakjVA3+8mVDkZ2Bf09vayB35lSQIex2+QaQ=="
+    },
     "node_modules/ansi-regex": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",

package.json

@@ -10,6 +10,7 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^2.3.1",
+    "animate.css": "^4.1.1",
     "axios": "^1.6.8",
     "echarts": "^5.5.0",
     "element-china-area-data": "^6.1.0",

src/components/Application .vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 应用模块组件 -->
-  <div class="bg">
+  <div class="bg animate__animated animate__bounceInUp">
     <div class="content">
       <div class="title">{{ title }}</div>
     <div class="sm_font">{{ titleinfo }}</div>
@@ -15,6 +15,7 @@
 </template>
 
 <script setup>
+import 'animate.css';
 import { useRouter } from "vue-router";
 import { onMounted, ref } from "vue";
 onMounted(() => {});

src/components/Form/from.vue

@@ -88,9 +88,24 @@ const emit = defineEmits(["todetails"], ["like"]);
 const todetails = () => {
   emit("clos");
 };
+const islogin = ref(0);
+if(localStorage.getItem("access_token")){
+  islogin.value = 1
+}
 // show.value = props.dialogTableVisible2;
 //发起试用申请
-const apply = async () => {
+const apply = () => {
+  if (islogin.value == 1) {
+    applya();
+  } else {
+    ElMessage({
+      message: "未登录",
+      type: "error",
+    });
+  }
+};
+
+const applya = async () => {
   try {
     const { data } = await configApi.trial({
       realname: formLabelAlign.name,
@@ -98,10 +113,6 @@ const apply = async () => {
       email: formLabelAlign.email,
       type: formLabelAlign.type,
     });
-    ElMessage({
-      message: "申请成功",
-      type: "success",
-    });
     show.value = false;
     todetails();
   } catch (error) {}
@@ -124,6 +135,9 @@ onMounted(type);
 </script>
 
 <style lang="scss" scoped>
+:deep(.el-input) {
+  width: 350px !important;
+}
 .two {
   overflow: hidden;
 }

src/components/advantage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- 方案优势组件 -->
-  <div class="bgbox">
+  <div class="bgbox animate__animated animate__bounceInUp" >
     <div class="title">{{ title }}</div>
     <div class="top_font" v-if="titleinfo">{{ titleinfo }}</div>
     <div style="position: relative">
@@ -36,9 +36,11 @@
               <div>{{ child }}</div>
             </div>
           </div>
-          <div class="trybtn" v-if="item.button_title" @click="apply">申请试用</div>
+          <div class="trybtn" v-if="item.button_title" @click="apply">
+            申请试用
+          </div>
         </div>
-        <div class="right">
+        <div :class="state==1?'animate__animated animate__pulse':''" @mouseover="changestate" @mouseleave="leave" class="righta ">
           <!-- <img class="right" src="../../assets/images/model.png" alt="" /> -->
           <img class="right" :src="item.image" alt="" />
         </div>
@@ -72,12 +74,21 @@ const apply = () => {
     });
   }
 };
+const state = ref(0)
+
+const changestate = ()=>{
+  state.value = 1
+}
+const leave =()=>{
+  state.value = 0
+}
+
+
 //关闭
 const close = () => {
   dialogTableVisible2.value = false;
 };
 
-
 const activeName = ref(0);
 
 const handleClick = (tab, event) => {
@@ -166,10 +177,15 @@ const props = defineProps({
     cursor: pointer;
   }
 }
+
 .right {
   width: 770px;
   height: 500px;
+  transition: width 0.5s ease-in-out; /* 设置过渡效果 */
 }
+
+
+
 .line {
   background: #e4e7ed;
   height: 2px;

src/view/Home/component/userSound.vue

@@ -134,7 +134,8 @@ onMounted(() => {
       display: flex;
       align-items: center;
       flex-wrap: wrap;
-      width: 106%;
+      column-gap: 30px;
+      width: 100%;
       .enterprise-logo {
         width: 180px;
         height: 82px;
@@ -142,7 +143,6 @@ onMounted(() => {
         line-height: 82px;
         background-color: #fff;
         margin-bottom: 10px;
-        margin-right: 10px;
         img {
           width: 100%;
           height: 100%;

src/view/Home/price.vue

@@ -1,10 +1,10 @@
 <template>
   <div class="price">
     <img class="img" src="../../assets/images/price_bg.png" alt="" />
-    <div class="content">
+    <div class="content animate__animated animate__bounceInUp">
       <div class="title">请根据业务场景，选择您需要的套餐</div>
-      <div class="tabs">
-        <div class="tab">
+      <div class="tabs " >
+        <div class="tab ">
           <div
             class="item"
             :class="tabs == 0 ? 'active' : ''"
@@ -30,7 +30,7 @@
       </div>
       <div class="bankuai">
         <div v-if="tabs == 0" class="flex">
-          <img
+          <img 
             @click="dialogTableVisible2 = true"
             class="image"
             :src="pricea.price.month_group"
@@ -91,21 +91,22 @@
         </div>
       </div>
       <!-- 免费获取 -->
-      <div class="get">
+      <div class="get animate__animated animate__bounceInUp">
         <div class="draw_font">
           免费领取一对一专业顾问演示服务,助您快速了解系统功能
         </div>
         <div class="draw" @click="dialogTableVisible = true">免费领取</div>
       </div>
       <!-- 功能对比 -->
-      <div class="Compare">各个版本功能对比</div>
+      <div class="Compare animate__animated animate__bounceInUp">各个版本功能对比</div>
     </div>
-    <div class="content">
+    <div class="content animate__animated animate__bounceInUp">
       <img class="bigimage" :src="pricea.price.version_compare" alt="" />
     </div>
     <application
+      class="animate__animated animate__bounceInUp"
       :titleinfo="infoa.info.scene_content"
-      :image="infoa.info.scene_image"
+      :image="infoa.info.scene_image"  
     ></application>
     <!-- <corporation></corporation> -->
     <bottom></bottom>
@@ -128,6 +129,7 @@
 </template>
 
 <script setup>
+import 'animate.css';
 import { useRouter } from "vue-router";
 import { onMounted, ref, reactive } from "vue";
 import bottom from "../../components/Layout/bottom.vue";
@@ -244,6 +246,7 @@ const close = () => {
     width: 300px;
     height: 300px;
     margin-top: 22px;
+    
   }
   .bottom_font {
     font-family: PingFangSC, PingFang SC;
@@ -345,12 +348,16 @@ const close = () => {
       margin-top: 62px;
       .image {
         width: 380px;
-        height: 900px;
-        cursor: pointer;
+        box-shadow: 2px 2px 2px 0px rgba(185, 185, 185, 0.1);
+        border-radius: 10px;
+        
+        // height: 900px;
+        // cursor: pointer;
       }
       .flex {
         display: flex;
-        justify-content: space-between;
+        column-gap: 28px;
+        // justify-content: space-between;
       }
     }
     .tabs {

src/view/Home/product.vue

@@ -1,8 +1,8 @@
 <template>
   <!-- 产品团队 -->
   <banner :banneImageList="imgList.banneImageList" />
-  <div v-if="index != 3" class="content">
-    <div class="fang">
+  <div v-if="index != 3" class="content animate__animated animate__bounceInUp">
+    <div class="fang ">
       <div class="title">方案概述</div>
       <div v-if="index == 0" class="top_font">
         {{ tabbar.info.overview_content_group }}
@@ -52,7 +52,7 @@
   </advantage>
   <!-- 安装增包 -->
   <corporation
-    style="background: rgba(245, 249, 255, 1)"
+    style="background: rgba(245, 249, 255, 1)"  
     title="按需安装增强包，减少企业成本"
     :info="tabbar.info.enhancement_package_content"
     v-if="index == 3"
@@ -82,6 +82,7 @@
 </template>
 
 <script setup>
+import 'animate.css';
 import { useRouter, useRoute } from "vue-router";
 import { onMounted, ref, reactive, watch } from "vue";
 import banner from "../../components/Banne/index.vue";
@@ -93,7 +94,7 @@ import * as productApi from "../../api/login";
 import * as configApi from "../../api/config";
 const route = useRoute();
 const index = ref();
-index.value = route.query.index;
+index.value = route.query.index;     
 
 // 方案概述列表
 const overviewList = reactive({

src/view/Login/index.vue

@@ -186,6 +186,7 @@ const getQrCode = () => {
         if (time.value == 0) {
           isQRCode.value = false;
           clearInterval(timer);
+          time.value = 60;
         }
       }, 1000);
     });