合并前

src/assets/sass/_app.scss

@@ -146,4 +146,27 @@ background: none;
     .el-pagination button:disabled {
         background: none;
     }
+}
+
+
+.infoBgPng {
+    .el-progress-bar__outer {
+        background:rgba(255,255,255,0.3);
+        width: 70px;
+    }
+}
+
+.divButtom {
+    .el-progress-bar {
+        padding: 0;
+    }
+    .el-progress-bar__outer {
+        width: 100%;
+    }
+    
+}
+
+
+.el-progress__text {
+    display: none;
 }

src/modules/Crad.vue

@@ -5,7 +5,7 @@
         <div class="LeftPng">
           <img src="@/assets/images/niao.png" alt="" />
         </div>
-        <span> 嗨如意</span>
+        <span>嗨如意</span>
       </div>
       <div class="cardRihgt">
         <div class="icon-box">

src/modules/Crad2.vue

@@ -1,11 +1,15 @@
 <template>
-  <div class="card_body intro-x" @change="isCard == true?isCard = true :''">
+  <div
+    class="card_body intro-x"
+    @change="isCard == true ? (isCard = true) : ''"
+    v-if="CardData"
+  >
     <div class="card_header">
       <div class="img-box">
         <div class="LeftPng">
           <img src="@/assets/images/niao.png" alt="" />
         </div>
-        <span> 智莺生活</span>
+        <span>{{ CardData.app_name }}</span>
       </div>
       <div class="cardRihgt">
         <div class="icon-box" @click="setCard">
@@ -13,63 +17,91 @@
         </div>
       </div>
       <div class="cardRight2">
-        <img :src="CardData.img" alt="" />
-        <span>11个模块</span>
+        <img :src="CardDataImg" alt="" />
+        <span>{{ CardData.module_count }}个模块</span>
       </div>
     </div>
     <div class="cardListText">
       <ul>
         <li>
           <span class="leftText">版本信息</span>
-          <span class="rightText">授信版本</span>
+          <span class="rightText">{{ CardData.name }} </span>
         </li>
         <li>
-          <span class="leftText">APPKEY</span>
-          <span class="rightText">21524564545</span>
+          <span class="leftText">APPID</span>
+          <span class="rightText">{{ CardData.id }}</span>
         </li>
         <li>
           <span class="leftText">到期时间</span>
-          <span class="rightText">2021-01-10</span>
+          <span class="rightText">{{ CardData.expire }}</span>
         </li>
       </ul>
     </div>
     <div class="cardButtom">查看详情</div>
 
     <div class="Card-box -intro-x" v-if="isCard">
-        <div class="card-item cardClass" @click="getCardIiem('停用此软件')">停用此软件</div>
-        <div class="card-item cardClass" @click="getCardIiem('前往后台设置')" >前往后台设置</div>
-        <div class="card-item" style="color:#FF4242" @click="getCardIiem('删除此软件')">删除此软件</div>
+      <div class="card-item cardClass" @click="getCardIiem('停用此软件')">
+        停用此软件
+      </div>
+      <div class="card-item cardClass" @click="getCardIiem('前往后台设置')">
+        前往后台设置
+      </div>
+      <div
+        class="card-item"
+        style="color: #ff4242"
+        @click="getCardIiem('删除此软件')"
+      >
+        删除此软件
+      </div>
     </div>
-
   </div>
 </template>
 
 <script>
 export default {
   props: ["CardData"],
+  computed: {
+    CardDataImg: function () {
+ 
+      var url = null;
+ 
+      // if (this.CardData.platform === "ios") {
+      //   url = require("../assets/images/ios.png");
+      // }
+      // if (this.CardData.platform === "android") {
+      //   url = require("../assets/images/anzhuo.png");
+      // }
+      // if (this.CardData.platform === "web") {
+      //   url = require("../assets/images/h5.png");
+      // }
+
+      // if (this.CardData.platform === "applet") {
+      //   url = require("../assets/images/xiaochengxu.png");
+      // }
+
+      return url;
+    },
+  },
   data() {
     return {
       isCard: false,
     };
   },
-  mounted(){
- 
-  },
+  mounted() {},
   created() {},
   methods: {
     setCard: function () {
       this.isCard = !this.isCard;
     },
 
-    getCardIiem: function( value ){
-        if(value === '删除此软件') {
-            this.$emit('getCardPop', true)
-            this.isCard = false
-        } else {
-            this.isCard = false
-        }
-        
-    }
+    getCardIiem: function (value) {
+      if (value === "删除此软件") {
+        this.$emit("getCardPop", true);
+        this.isCard = false;
+      } else {
+        this.isCard = false;
+      }
+    },
   },
 };
 </script>
@@ -240,21 +272,17 @@ li {
   top: 65px;
 }
 .card-item {
-    line-height: 46px;
-    height: 46px;
-    width: 100%;
-    text-indent: 16px;
-    font-size: 14;
-    color: #BBC6DA;
-    cursor: pointer;
+  line-height: 46px;
+  height: 46px;
+  width: 100%;
+  text-indent: 16px;
+  font-size: 14;
+  color: #bbc6da;
+  cursor: pointer;
 }
 
 .cardClass:hover {
-    background: #F7F8FB;
-    color: #1890FF;
-
+  background: #f7f8fb;
+  color: #1890ff;
 }
-
- 
-
 </style>

src/modules/createAn1.vue

@@ -57,8 +57,8 @@ export default {
     overflow: hidden;
     position: relative;
     img {
-      height: 100%;
       float: left;
+      width: 166px;
     }
     .rightUl {
       float: left;
@@ -109,4 +109,10 @@ export default {
 .left-box:nth-child(1) {
   margin-right: 20px;
 }
+
+@media screen and (max-width: 1140px) {
+  .left-box:nth-child(1) {
+    margin-right: 0;
+  }
+}
 </style>

src/modules/createAn5.vue

@@ -42,7 +42,6 @@ import lodash from "lodash";
 export default {
   filters: {
     phoneFilter: function (phone) {
- 
       return String(phone).substring(0, 3) + '****' + String(phone).substring(7, 13);
     },
   },

src/router/index.js

@@ -3,6 +3,8 @@ import { FastForwardIcon } from 'vue-feather-icons';
 import VueRouter from 'vue-router';
 import { apost } from '../utils/api/login'
 
+import Cookies from "js-cookie";
+
 Vue.use(VueRouter);
 
 const routes = [
@@ -411,20 +413,15 @@ router.beforeEach((to, from, next) => {
 	document.title = to.meta.title ? to.meta.title + ' - ZhiOS智莺' : 'ZhiOS智莺'
 	if (to.path != '/' && to.path != '/register' && to.path != '/isRegister') {
 		apost("/api/sign/status").then((res) => {
+			Cookies.set('discount',res.data.discount)
 			// 用户登录未失效， 直接跳转到会员中心页面
 			if (to.path === '/') {
 				next('/Dashboard')
 			}
-
 		}).catch(err => {
-
-
 			next('/login')
 		})
-
 	}
-
-
 	next()
 })
 

src/utils/api/userInfo.js

@@ -0,0 +1,20 @@
+
+import request from '@/utils/request'
+ 
+
+export function apost (url,data){
+    return request({
+        url: url,//自己的接口地址
+        method: 'post',//请求方法
+        data //需要携带的参数
+    })
+}
+
+
+export function aget(url){
+    return request({
+        url:url,
+        method:'get'
+    })
+}
+

src/views/Chat.vue

@@ -10,25 +10,25 @@
           v-for="(item, index) in messageData"
           :key="index"
           @click="getDetails(item)"
-          
         >
-          <div class="PopStatus -intro-x" v-show="item.type">
-            <div class="div1">
-              <i
-                class="el-icon-share"
-                style="font-size: 15px; margin-right: 5px"
-              ></i
-              ><span>分享</span>
-            </div>
-            <div class="div1">
-              <i
-                class="el-icon-download"
-                style="font-size: 15px; margin-right: 5px"
-              ></i>
-              <span>下载</span>
+          <el-collapse-transition>
+            <div class="PopStatus" v-show="item.type">
+              <div class="div1">
+                <i
+                  class="el-icon-share"
+                  style="font-size: 15px; margin-right: 5px"
+                ></i
+                ><span>分享</span>
+              </div>
+              <div class="div1">
+                <i
+                  class="el-icon-download"
+                  style="font-size: 15px; margin-right: 5px"
+                ></i>
+                <span>下载</span>
+              </div>
             </div>
-          </div>
-
+          </el-collapse-transition>
           <div class="mssageHeader">
             <div class="headerItem">
               <div class="head-">
@@ -248,9 +248,9 @@ export default {
         }
       }
     },
-    getDetails: function( data ){
-        this.$router.push('chat/CreateAn')
-    }
+    getDetails: function (data) {
+      this.$router.push("chat/CreateAn");
+    },
   },
 };
 </script>

src/views/CreateAn.vue

@@ -86,9 +86,7 @@ import createAn6 from "../modules/createAn6";
 import createAn7 from "../modules/createAn7";
 import createAn8 from "../modules/createAn8";
 
-
-
-import { aget } from '../utils/api/myapp'
+import { aget } from "../utils/api/myapp";
 
 export default {
   data() {
@@ -109,16 +107,9 @@ export default {
 
   mounted() {
  
-    this.getInit()
   },
   methods: {
 
-    getInit: function(){
-      console.log(123)
-      aget('/api/myapp/list').then(res=>{
-        console.log(res)
-      })
-    },
     nextStep: function () {
       if (this.component === 1) {
         // 第一步
@@ -236,7 +227,6 @@ export default {
       this.isButtom2 = false;
       this.isSucceed = true;
     },
-
   },
   components: {
     createAn1,

src/views/Dashboard.vue

@@ -162,7 +162,7 @@
                     <a
                       
                       class="flex items-center block p-2 transition duration-300 ease-in-out bg-white hover:bg-gray-200:bg-dark-2 rounded-md"
-                      >January</a
+                      >Januar1y</a
                     >
                     <a
                       

src/views/Dropdown.vue

@@ -648,7 +648,7 @@
                       <a
                         
                         class="flex items-center block p-2 transition duration-300 ease-in-out bg-white hover:bg-gray-200:bg-dark-2 rounded-md"
-                        >January</a
+                        >January1</a
                       >
                       <a
                         
@@ -703,7 +703,7 @@
                             <a
                               
                               class="flex items-center block p-2 transition duration-300 ease-in-out bg-white hover:bg-gray-200:bg-dark-2 rounded-md"
-                              >January</a
+                              >January2</a
                             >
                             <a
                               

src/views/MyApp.vue

@@ -99,67 +99,41 @@
 
 <script>
 import CardView from "../modules/Crad2";
+import { aget } from "../utils/api/myapp";
 
 export default {
   data() {
     return {
       isACT: "全部",
       isCardPop: false,
-      CardData: [
-        {
-          img: require("../assets/images/ios.png"),
-          value:'IOS端'
-        },
-        {
-          img: require("../assets/images/anzhuo.png"),
-           value:'安卓端'
-        },
-        {
-          img: require("../assets/images/xiaochengxu.png"),
-           value:'小程序端'
-        },
-        {
-          img: require("../assets/images/h5.png"),
-           value:'WEB端'
-        },
-      ],
-
-            CardDatas: [
-        {
-          img: require("../assets/images/ios.png"),
-          value:'IOS端'
-        },
-        {
-          img: require("../assets/images/anzhuo.png"),
-           value:'安卓端'
-        },
-        {
-          img: require("../assets/images/xiaochengxu.png"),
-           value:'小程序端'
-        },
-        {
-          img: require("../assets/images/h5.png"),
-           value:'WEB端'
-        },
-      ],
+      CardData: [],
+
     };
   },
   components: {
     CardView,
   },
+  mounted() {
+    this.getAppInit();
+  },
+
   methods: {
+    getAppInit: function () {
+      aget("/api/myapp/list").then((res) => {
+        console.log(res);
+        this.CardData = res.data
+      });
+    },
+
     getTitle: function (value) {
       this.isACT = value;
- 
-      if(value != '全部') {
-        this.CardData = this.CardDatas.filter(item=>{
-          return item.value === value
-        })
-      }else { 
-        this.CardData = this.CardDatas
+      if (value != "全部") {
+        this.CardData = this.CardDatas.filter((item) => {
+          return item.value === value;
+        });
+      } else {
+        this.CardData = this.CardDatas;
       }
-
-      
     },
     getCardPop(event) {
       this.isCardPop = true;

src/views/ProfileOverview3.vue

@@ -927,7 +927,7 @@
                     <a
                       
                       class="flex items-center block p-2 transition duration-300 ease-in-out bg-white hover:bg-gray-200:bg-dark-2 rounded-md"
-                      >January</a
+                      >January4</a
                     >
                     <a
                       

src/views/index.vue

@@ -109,10 +109,8 @@
             <el-carousel
               width="296px;"
               height="612px"
-           
               :autoplay="false"
               ref="swiper"
-         
             >
               <el-carousel-item
                 v-for="item in carouselData"
@@ -1335,7 +1333,7 @@ export default {
 
 .intro-Y {
   transform: translateY(100px);
-  animation: .5s intro-y-animation linear 0.5s;
+  animation: 0.5s intro-y-animation linear 0.5s;
   animation-fill-mode: forwards;
   animation-delay: 0;
   @apply opacity-0 relative;

vue.config.js

@@ -20,8 +20,6 @@ module.exports = {
 			}
 		},
 	},
-
-
 	configureWebpack: {
 		plugins: [
 			new webpack.ProvidePlugin({