修改文字

This commit is contained in:
zhangmanman
2021-09-27 12:12:50 +08:00
parent 9e9fc63c1b
commit 3e3215df42
9 changed files with 129 additions and 86 deletions

View File

@@ -48,6 +48,13 @@
"style": { "style": {
"navigationBarTitleText": "服务条款" "navigationBarTitleText": "服务条款"
} }
}, {
"path": "pages/user/followOfficial",
"name": "Official",
"auth": true,
"style": {
"navigationBarTitleText": "关注公众号"
}
}, { }, {
"path": "pages/vip/vip", "path": "pages/vip/vip",
"name": "vipIndex", "name": "vipIndex",

View File

@@ -21,6 +21,9 @@
</view> </view>
<view class="sign"> <view class="sign">
<view class="sign-list" :class="{ active: item.sign }" v-for="(item, index) in sign.signArr" :key="index"> <view class="sign-list" :class="{ active: item.sign }" v-for="(item, index) in sign.signArr" :key="index">
<view class="sign-tips" v-if="item.sign">
<view class="sign-tips-text">已签</view>
</view>
<block v-if="index == 7"> <block v-if="index == 7">
<image class="sign-list-img" :src="item.sign ? '../../static/user/sign_icon_last_active.png' : '../../static/user/sign_icon_last.png'" mode="aspectFill"></image> <image class="sign-list-img" :src="item.sign ? '../../static/user/sign_icon_last_active.png' : '../../static/user/sign_icon_last.png'" mode="aspectFill"></image>
</block> </block>
@@ -257,9 +260,9 @@
margin: 0 0 30rpx; margin: 0 0 30rpx;
padding: 0 30rpx; padding: 0 30rpx;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden;
.sign-list { .sign-list {
width: calc(14.28% - 20rpx); width: calc(14.28% - 20rpx);
position: relative;
margin: 0 10rpx; margin: 0 10rpx;
display: inline-block; display: inline-block;
text-align: center; text-align: center;
@@ -267,6 +270,33 @@
border-radius: 10rpx; border-radius: 10rpx;
padding: 20rpx 0; padding: 20rpx 0;
box-sizing: border-box; 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 { .sign-list-img {
width: 38rpx; width: 38rpx;
height: 38rpx; height: 38rpx;

View File

@@ -1,29 +1,27 @@
<template> <template>
<view class="content"> <view class="content">
<view class="codeContent"> <view class="codeContent">
<!-- <image class="codeContent-back" src="../../static/icons/store_codeBack.png" mode="widthFix"></image> --> <view class="codeTop">
<image class="codeContent-cont" src="../../static/icons/store_contBack.png" mode="widthFix"></image> <image class="codeTop-cover" :src="companyInfo.cover" mode="aspectFill"></image>
<view class="textContent"> <view class="codeTop-title">
<view class="company"> <view class="codeTop-name">
<image class="company-logo" :src="companyInfo.cover" mode="aspectFill"></image> {{companyInfo.name}}
<view class="company-cont"> </view>
<view class="nowrap company-name">{{companyInfo.name}}</view> <view class="codeTop-tips">
<view class="company-tips">易货平台</view> 邀请你 加入链商星球
</view> </view>
</view> </view>
<view class="code"> </view>
<image class="code-img" :src="companyInfo.code" mode="aspectFit"></image> <view class="codeCode">
<!-- <view class="code-text">简单扫一扫即可进入平台</view> --> <!-- <image class="codeImg-code" :src="companyInfo.code" mode="aspectFill"></image> -->
</view> <!-- 先默认死数据 -->
<!-- @click="shareCanvas" --> <image class="codeImg-code" src="/static/user/wallet-code.png" mode="aspectFill"></image>
<view class="codeBnt"> <view class="codeImg-text">
扫码推广 长按二维码进行保存
</view> </view>
</view> </view>
</view> </view>
<!-- <canvas class="codeImg" canvas-id="qrcodeCard"></canvas> -->
<canvas class="codeImg" canvas-id="qrcodeCard"></canvas>
</view> </view>
</template> </template>
@@ -37,6 +35,7 @@
}, },
created() { created() {
companiesCode().then(res=>{ companiesCode().then(res=>{
console.log(res.code)
this.companyInfo = res this.companyInfo = res
}) })
}, },
@@ -153,75 +152,62 @@
.codeContent { .codeContent {
position: relative; position: relative;
width: 100%; left: 0;
height: 100vh; right: 0;
.codeContent-back { top: 0;
width: 100%; .codeTop {
height: 100%;
z-index: 1;
position: absolute; position: absolute;
}
.codeContent-cont {
left: 5%; left: 5%;
top: 240rpx;
width: 90%; width: 90%;
top: 100px; background-color: #FFFFFF;
z-index: 2; border-radius: 30rpx;
position: absolute; padding: 0 50rpx;
}
.codeContent-tips {
position: absolute;
top: 0;
right: 20rpx;
width: 200rpx;
z-index: 2;
}
.textContent {
position: absolute;
padding: 20rpx 20rpx 0 40rpx;
box-sizing: border-box; box-sizing: border-box;
width: 70%; box-shadow: 0 0 40rpx rgba(94,59,201,.5);
z-index: 3; z-index: 2;
left: 15%; display: flex;
right: 15%; height: 200rpx;
top: 140px; .codeTop-cover {
}
.company {
width: 100%;
.company-logo {
width: 120rpx; width: 120rpx;
height: 120rpx; height: 120rpx;
border-radius: 50%; border-radius: 50%;
margin: 40rpx 30rpx 0 0;
border: 4rpx solid #FFFFFF;
box-shadow: 0 5rpx 10rpx rgba(94,59,201,.3);
} }
.company-cont { .codeTop-title {
position: absolute; padding-top: 50rpx;
width: 100%; .codeTop-name {
height: 230rpx;
left: 0;
top: 0;
padding: 20rpx 20rpx 30rpx 210rpx;
font-size: $title-size;
.company-name {
font-weight: 600; font-weight: 600;
margin: 10rpx 0; font-size: 36rpx;
margin-bottom: 10rpx;
} }
.company-tips { .codeTop-tips {
font-size: 26rpx; color: $text-gray-m;
color: #787878;
} }
} }
} }
.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; text-align: center;
width: 100%; .codeImg-code {
box-sizing: border-box; width: 360rpx;
margin-bottom: $margin; height: 360rpx;
.code-img { margin: 0 0 20rpx;
width: 90%; border: 2px solid #f3f3f3;
} }
.code-text { .codeImg-text {
color: #787878; font-size: 32rpx;
margin-top: $margin - 10; color: $text-color;
font-size: $title-size;
} }
} }
} }

View File

@@ -0,0 +1,20 @@
<template>
<view>
<image class="followBack" src="/static/user/follow_back.png" mode="widthFix"></image>
</view>
</template>
<script>
</script>
<style>
page {
background-color: #ffffff;
}
</style>
<style lang="scss" scoped>
.followBack {
width: 100%;
}
</style>

View File

@@ -71,6 +71,9 @@
<view class="userVip-top-btn" v-if="!userIdentity.is_top" @click="$Router.push({name: 'vipIndex'})"> <view class="userVip-top-btn" v-if="!userIdentity.is_top" @click="$Router.push({name: 'vipIndex'})">
去开通<image class="userVip-top-arrow" src="/static/user/userVip_arrow.png"></image> 去开通<image class="userVip-top-arrow" src="/static/user/userVip_arrow.png"></image>
</view> </view>
<view class="userVip-top-btn" v-else>
终身有效
</view>
</view> </view>
<!-- 未认证后显示 --> <!-- 未认证后显示 -->
@@ -89,7 +92,7 @@
<view class="userVip-rights"> <view class="userVip-rights">
<view class="userVip-rightst-title"> <view class="userVip-rightst-title">
<view class="userVip-rightst-title-name">查看会员专属权益</view> <view class="userVip-rightst-title-name">查看会员专属权益</view>
<view class="userVip-rightst-more">全部权益 <image class="userVip-rightst-more-img" src="/static/user/userVip_more_arrow.png"></image></view> <view class="userVip-rightst-more" @click="$Router.push({name: 'vipIndex'})">全部更多 <image class="userVip-rightst-more-img" src="/static/user/userVip_more_arrow.png"></image></view>
</view> </view>
<view class="userVip-rightst-list" v-if="userIdentity.right"> <view class="userVip-rightst-list" v-if="userIdentity.right">
<view v-for="(item, index) in userIdentity.right.rights" :key="index" class="userVip-rightst-label"> <view v-for="(item, index) in userIdentity.right.rights" :key="index" class="userVip-rightst-label">
@@ -170,7 +173,7 @@
</view> </view>
<!-- 企业工具 --> <!-- 企业工具 -->
<view class="userPartner"> <view class="userPartner" v-if="userData.is_company">
<view class="partner-title"> <view class="partner-title">
企业工具 企业工具
</view> </view>
@@ -291,6 +294,7 @@
userInfo() { userInfo() {
// 读取配置信息 // 读取配置信息
userIndex().then(res=>{ userIndex().then(res=>{
console.log(res.identityShow)
this.userData = res this.userData = res
this.helpDoc = res.help_doc this.helpDoc = res.help_doc
this.userIdentity = res.identityShow this.userIdentity = res.identityShow

View File

@@ -135,7 +135,8 @@
margin-right: 10rpx; margin-right: 10rpx;
} }
.partner-identity { .partner-identity {
width: 120rpx; width: 84rpx;
margin-top: 4rpx;
} }
} }
} }

View File

@@ -12,28 +12,23 @@
{{item.count.stock > 0 ? '剩余名额:' + item.count.residue : '不限名数'}} {{item.count.stock > 0 ? '剩余名额:' + item.count.residue : '不限名数'}}
</view> </view>
<view class="vip-tips"> <view class="vip-tips">
<!-- 轻节点 -->
<view v-if="item.identity_id == 2" class="vip-tips-text vip-tips-color-00">
{{item.title}}
</view>
<!-- 会员 --> <!-- 会员 -->
<view v-else-if="item.identity_id == 3" class="vip-tips-text vip-tips-color-01"> <view v-if="item.identity_id == 2" class="vip-tips-text vip-tips-color-01">
{{item.title}} {{item.title}}
</view> </view>
<!-- VIP节点 --> <!-- VIP节点 -->
<view v-else-if="item.identity_id == 4" class="vip-tips-text vip-tips-color-02"> <view v-else-if="item.identity_id == 3" class="vip-tips-text vip-tips-color-02">
{{item.title}} {{item.title}}
</view> </view>
<!-- 主节点 --> <!-- 主节点 -->
<view v-else-if="item.identity_id == 5" class="vip-tips-text vip-tips-color-03"> <view v-else-if="item.identity_id == 4" class="vip-tips-text vip-tips-color-03">
{{item.title}} {{item.title}}
</view> </view>
<!-- 超级节点 --> <!-- 超级节点 -->
<view v-else-if="item.identity_id == 6" class="vip-tips-text vip-tips-color-04"> <view v-else-if="item.identity_id == 5" class="vip-tips-text vip-tips-color-04">
{{item.title}} {{item.title}}
</view> </view>
</view> </view>
@@ -132,7 +127,6 @@
methods: { methods: {
// 当前用户信息 // 当前用户信息
idenInfo(){ idenInfo(){
identities().then(res => {
identities().then(res => { identities().then(res => {
this.loding = false this.loding = false
this.identitie = res.identities this.identitie = res.identities
@@ -147,6 +141,7 @@
}, },
// 切换开通身份 // 切换开通身份
swiperChange(e) {
console.log(e.detail.current) console.log(e.detail.current)
this.tabsIndex = e.detail.current this.tabsIndex = e.detail.current
// 获取当前用户信息 // 获取当前用户信息

BIN
static/user/follow_back.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

BIN
static/user/wallet-code.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB