diff --git a/pages.json b/pages.json index 9cf4aac..85f6922 100644 --- a/pages.json +++ b/pages.json @@ -48,6 +48,13 @@ "style": { "navigationBarTitleText": "服务条款" } + }, { + "path": "pages/user/followOfficial", + "name": "Official", + "auth": true, + "style": { + "navigationBarTitleText": "关注公众号" + } }, { "path": "pages/vip/vip", "name": "vipIndex", diff --git a/pages/found/index.vue b/pages/found/index.vue index ec3b473..4fbe20e 100644 --- a/pages/found/index.vue +++ b/pages/found/index.vue @@ -21,6 +21,9 @@ + + 已签 + @@ -257,9 +260,9 @@ margin: 0 0 30rpx; padding: 0 30rpx; box-sizing: border-box; - overflow: hidden; .sign-list { width: calc(14.28% - 20rpx); + position: relative; margin: 0 10rpx; display: inline-block; text-align: center; @@ -267,6 +270,33 @@ border-radius: 10rpx; padding: 20rpx 0; box-sizing: border-box; + .sign-tips { + position: absolute; + top: -20rpx; + left: calc(50% - 30rpx); + background-color: #ef4034; + font-size: 24rpx; + color: #FFFFFF; + height: 32rpx; + line-height: 30rpx; + width: 60rpx; + text-align: center; + border-radius: 6rpx; + .sign-tips-text { + transform: scale(0.85); + } + &::after { + position: absolute; + content: ''; + left: calc(50% - 8rpx); + bottom: -6rpx; + width: 0; + height: 0; + border-left: 8rpx solid transparent; + border-right: 8rpx solid transparent; + border-top: 8rpx solid #ef4034; + } + } .sign-list-img { width: 38rpx; height: 38rpx; diff --git a/pages/instrument/Spread.vue b/pages/instrument/Spread.vue index 946a64f..3da95e6 100644 --- a/pages/instrument/Spread.vue +++ b/pages/instrument/Spread.vue @@ -1,29 +1,27 @@ @@ -37,6 +35,7 @@ }, created() { companiesCode().then(res=>{ + console.log(res.code) this.companyInfo = res }) }, @@ -153,75 +152,62 @@ .codeContent { position: relative; - width: 100%; - height: 100vh; - .codeContent-back { - width: 100%; - height: 100%; - z-index: 1; + left: 0; + right: 0; + top: 0; + .codeTop { position: absolute; - } - .codeContent-cont { left: 5%; + top: 240rpx; width: 90%; - top: 100px; - z-index: 2; - position: absolute; - } - .codeContent-tips { - position: absolute; - top: 0; - right: 20rpx; - width: 200rpx; - z-index: 2; - } - .textContent { - position: absolute; - padding: 20rpx 20rpx 0 40rpx; + background-color: #FFFFFF; + border-radius: 30rpx; + padding: 0 50rpx; box-sizing: border-box; - width: 70%; - z-index: 3; - left: 15%; - right: 15%; - top: 140px; - } - .company { - width: 100%; - .company-logo { + box-shadow: 0 0 40rpx rgba(94,59,201,.5); + z-index: 2; + display: flex; + height: 200rpx; + .codeTop-cover { width: 120rpx; height: 120rpx; border-radius: 50%; + margin: 40rpx 30rpx 0 0; + border: 4rpx solid #FFFFFF; + box-shadow: 0 5rpx 10rpx rgba(94,59,201,.3); } - .company-cont { - position: absolute; - width: 100%; - height: 230rpx; - left: 0; - top: 0; - padding: 20rpx 20rpx 30rpx 210rpx; - font-size: $title-size; - .company-name { + .codeTop-title { + padding-top: 50rpx; + .codeTop-name { font-weight: 600; - margin: 10rpx 0; + font-size: 36rpx; + margin-bottom: 10rpx; } - .company-tips { - font-size: 26rpx; - color: #787878; + .codeTop-tips { + color: $text-gray-m; } } } - .code { + .codeCode { + background-color: #FFFFFF; + box-shadow: 0 0 40rpx rgba(27, 0, 111,.4); + position: absolute; + padding: 400rpx 0 200rpx; + left: 10%; + top: 160rpx; + width: 80%; + border-radius: 30rpx; + z-index: 1; text-align: center; - width: 100%; - box-sizing: border-box; - margin-bottom: $margin; - .code-img { - width: 90%; + .codeImg-code { + width: 360rpx; + height: 360rpx; + margin: 0 0 20rpx; + border: 2px solid #f3f3f3; } - .code-text { - color: #787878; - margin-top: $margin - 10; - font-size: $title-size; + .codeImg-text { + font-size: 32rpx; + color: $text-color; } } } diff --git a/pages/user/followOfficial.vue b/pages/user/followOfficial.vue new file mode 100644 index 0000000..f280314 --- /dev/null +++ b/pages/user/followOfficial.vue @@ -0,0 +1,20 @@ + + + + + + + diff --git a/pages/user/index.vue b/pages/user/index.vue index f6934ab..c729b3e 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -71,6 +71,9 @@ 去开通 + + 终身有效 + @@ -89,7 +92,7 @@ 查看会员专属权益 - 全部权益 + 全部更多 @@ -170,7 +173,7 @@ - + 企业工具 @@ -291,6 +294,7 @@ userInfo() { // 读取配置信息 userIndex().then(res=>{ + console.log(res.identityShow) this.userData = res this.helpDoc = res.help_doc this.userIdentity = res.identityShow diff --git a/pages/user/partner.vue b/pages/user/partner.vue index 6b482f4..73d7e5d 100644 --- a/pages/user/partner.vue +++ b/pages/user/partner.vue @@ -135,7 +135,8 @@ margin-right: 10rpx; } .partner-identity { - width: 120rpx; + width: 84rpx; + margin-top: 4rpx; } } } diff --git a/pages/vip/vip.vue b/pages/vip/vip.vue index f7ee67b..538c239 100644 --- a/pages/vip/vip.vue +++ b/pages/vip/vip.vue @@ -12,28 +12,23 @@ {{item.count.stock > 0 ? '剩余名额:' + item.count.residue : '不限名数'}} - - - {{item.title}} - - - + {{item.title}} - + {{item.title}} - + {{item.title}} - + {{item.title}} @@ -132,7 +127,6 @@ // 当前用户信息 idenInfo(){ identities().then(res => { - console.log(res.identities) this.loding = false this.identitie = res.identities this.rights = res.identities[this.tabsIndex].rights @@ -147,6 +141,7 @@ // 切换开通身份 swiperChange(e) { + console.log(e.detail.current) this.tabsIndex = e.detail.current // 获取当前用户信息 this.idenInfo(); diff --git a/static/user/follow_back.png b/static/user/follow_back.png new file mode 100644 index 0000000..671f253 Binary files /dev/null and b/static/user/follow_back.png differ diff --git a/static/user/wallet-code.png b/static/user/wallet-code.png new file mode 100644 index 0000000..853cffa Binary files /dev/null and b/static/user/wallet-code.png differ