diff --git a/src/assets/images/index/Ai.png b/src/assets/images/index/Ai.png new file mode 100644 index 0000000..00d6c2b Binary files /dev/null and b/src/assets/images/index/Ai.png differ diff --git a/src/assets/images/index/SALE.png b/src/assets/images/index/SALE.png new file mode 100644 index 0000000..8a0204f Binary files /dev/null and b/src/assets/images/index/SALE.png differ diff --git a/src/assets/images/index/dianpu.png b/src/assets/images/index/dianpu.png new file mode 100644 index 0000000..cf37e62 Binary files /dev/null and b/src/assets/images/index/dianpu.png differ diff --git a/src/assets/images/index/douyin.png b/src/assets/images/index/douyin.png new file mode 100644 index 0000000..3401d02 Binary files /dev/null and b/src/assets/images/index/douyin.png differ diff --git a/src/assets/images/index/jiage.png b/src/assets/images/index/jiage.png new file mode 100644 index 0000000..e4ea285 Binary files /dev/null and b/src/assets/images/index/jiage.png differ diff --git a/src/assets/images/index/kanjia.png b/src/assets/images/index/kanjia.png new file mode 100644 index 0000000..6273786 Binary files /dev/null and b/src/assets/images/index/kanjia.png differ diff --git a/src/assets/images/index/shangpu.png b/src/assets/images/index/shangpu.png new file mode 100644 index 0000000..e66267b Binary files /dev/null and b/src/assets/images/index/shangpu.png differ diff --git a/src/assets/images/index/shixiang.png b/src/assets/images/index/shixiang.png new file mode 100644 index 0000000..5554e59 Binary files /dev/null and b/src/assets/images/index/shixiang.png differ diff --git a/src/assets/images/index/weixin.png b/src/assets/images/index/weixin.png new file mode 100644 index 0000000..1db24dc Binary files /dev/null and b/src/assets/images/index/weixin.png differ diff --git a/src/assets/images/infoBg.png b/src/assets/images/infoBg.png new file mode 100644 index 0000000..ca30c12 Binary files /dev/null and b/src/assets/images/infoBg.png differ diff --git a/src/assets/images/min-anquan.png b/src/assets/images/min-anquan.png new file mode 100644 index 0000000..3e49652 Binary files /dev/null and b/src/assets/images/min-anquan.png differ diff --git a/src/assets/images/min-home.png b/src/assets/images/min-home.png new file mode 100644 index 0000000..d2e85fa Binary files /dev/null and b/src/assets/images/min-home.png differ diff --git a/src/assets/images/min-my.png b/src/assets/images/min-my.png new file mode 100644 index 0000000..40af7ee Binary files /dev/null and b/src/assets/images/min-my.png differ diff --git a/src/assets/images/min-phone.png b/src/assets/images/min-phone.png new file mode 100644 index 0000000..e0e1854 Binary files /dev/null and b/src/assets/images/min-phone.png differ diff --git a/src/assets/images/min-renzheng.png b/src/assets/images/min-renzheng.png new file mode 100644 index 0000000..5784963 Binary files /dev/null and b/src/assets/images/min-renzheng.png differ diff --git a/src/assets/images/min-rili.png b/src/assets/images/min-rili.png new file mode 100644 index 0000000..ce900bf Binary files /dev/null and b/src/assets/images/min-rili.png differ diff --git a/src/assets/images/min-weixin.png b/src/assets/images/min-weixin.png new file mode 100644 index 0000000..1d85fbe Binary files /dev/null and b/src/assets/images/min-weixin.png differ diff --git a/src/assets/images/min-youxiang.png b/src/assets/images/min-youxiang.png new file mode 100644 index 0000000..38cf976 Binary files /dev/null and b/src/assets/images/min-youxiang.png differ diff --git a/src/assets/images/min-zhifubao.png b/src/assets/images/min-zhifubao.png new file mode 100644 index 0000000..a24a44d Binary files /dev/null and b/src/assets/images/min-zhifubao.png differ diff --git a/src/assets/images/min-zuanshi.png b/src/assets/images/min-zuanshi.png new file mode 100644 index 0000000..61ad40a Binary files /dev/null and b/src/assets/images/min-zuanshi.png differ diff --git a/src/assets/sass/_app.scss b/src/assets/sass/_app.scss index be326a9..93c054e 100644 --- a/src/assets/sass/_app.scss +++ b/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; } \ No newline at end of file diff --git a/src/modules/Crad.vue b/src/modules/Crad.vue index 9930f46..bd1bb80 100644 --- a/src/modules/Crad.vue +++ b/src/modules/Crad.vue @@ -5,7 +5,7 @@
- 嗨如意 + 嗨如意
diff --git a/src/modules/Crad2.vue b/src/modules/Crad2.vue index d75150e..7b94cf9 100644 --- a/src/modules/Crad2.vue +++ b/src/modules/Crad2.vue @@ -1,11 +1,15 @@ @@ -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; } - - - \ No newline at end of file diff --git a/src/modules/createAn1.vue b/src/modules/createAn1.vue index 850503c..ca6a2a7 100644 --- a/src/modules/createAn1.vue +++ b/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; + } +} \ No newline at end of file diff --git a/src/modules/createAn5.vue b/src/modules/createAn5.vue index 4a6fc1c..4849201 100644 --- a/src/modules/createAn5.vue +++ b/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); }, }, diff --git a/src/router/index.js b/src/router/index.js index 60f0f18..cc1b8cf 100644 --- a/src/router/index.js +++ b/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() }) diff --git a/src/utils/api/userInfo.js b/src/utils/api/userInfo.js new file mode 100644 index 0000000..489bc3d --- /dev/null +++ b/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' + }) +} + diff --git a/src/views/Chat.vue b/src/views/Chat.vue index 664195e..58ae653 100644 --- a/src/views/Chat.vue +++ b/src/views/Chat.vue @@ -10,25 +10,25 @@ v-for="(item, index) in messageData" :key="index" @click="getDetails(item)" - > -
-
- 分享 -
-
- - 下载 + +
+
+ 分享 +
+
+ + 下载 +
-
- +
@@ -248,9 +248,9 @@ export default { } } }, - getDetails: function( data ){ - this.$router.push('chat/CreateAn') - } + getDetails: function (data) { + this.$router.push("chat/CreateAn"); + }, }, }; diff --git a/src/views/CreateAn.vue b/src/views/CreateAn.vue index 7241822..1e2f340 100644 --- a/src/views/CreateAn.vue +++ b/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, diff --git a/src/views/Dashboard.vue b/src/views/Dashboard.vue index 1497bba..e02ac45 100644 --- a/src/views/Dashboard.vue +++ b/src/views/Dashboard.vue @@ -162,7 +162,7 @@ JanuaryJanuar1y JanuaryJanuary1 JanuaryJanuary2 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; diff --git a/src/views/Profile.vue b/src/views/Profile.vue index 68eeb9b..cbecf97 100644 --- a/src/views/Profile.vue +++ b/src/views/Profile.vue @@ -1,1001 +1,838 @@ + + \ No newline at end of file diff --git a/src/views/ProfileOverview3.vue b/src/views/ProfileOverview3.vue index acdcf23..3bcbda9 100644 --- a/src/views/ProfileOverview3.vue +++ b/src/views/ProfileOverview3.vue @@ -927,7 +927,7 @@ JanuaryJanuary4