TmOct5/BlockChainH5
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'main' of https://git.yuzhankeji.cn/TmOct5/BlockChainH5

Browse Source
This commit is contained in:
张冬雪
2021-09-28 11:02:36 +08:00
parent eeb40535df 16065cc638
commit f2e1121f3c
179 changed files with 227 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
pages/login/login.vue
View File

@@ -26,8 +26,11 @@
</view>
</view>
<!-- 用户登录注册协议 -->
<view class="agreement">未注册的手机号验证后将自动创建账号，登录即表示同意接收<navigator url="/pages/login/agreement?name=secret">用户隐私协议</navigator>和<navigator url="/pages/login/agreement?name=service">用户服务协议
</navigator>
<view class="agreement">
未注册的手机号验证后将自动创建账号，登录即表示同意接收
<view @click="$Router.push({name: 'agreement', params: {name : 'secret'}})">用户隐私协议</view>
和
<view @click="$Router.push({name: 'agreement', params: {name : 'service'}})">用户服务协议</view>
</view>
</view>
</template>
@@ -253,8 +256,7 @@
padding-top: $padding * 2;
font-size: $title-size-sm;
color: $text-gray;
navigator {
view {
color: $text-price;
display: inline-block;
padding: 0 10rpx;

4
pages/setting/setting.vue
View File

@@ -278,9 +278,7 @@
},
loginOut() {
this.$store.commit('setToken', '')
uni.reLaunch({
url: '/pages/login/login'
})
this.$Router.push({name: 'Login'})
},
// 上传头像
updImgs(type) {

15
pages/user/code.vue
View File

@@ -1,5 +1,5 @@
<template>
<view>
<view class="background">
<view class="codeContent">
<!-- 邀请码图 -->
<view class="codeBack">
@@ -98,13 +98,14 @@
}
</script>
<style>
page {
background-image: linear-gradient(to top, #7c52fc, #976dff);
}
</style>
<style lang="scss">
// 背景色
.background{
min-height: 100vh;
background: linear-gradient(to top, #7c52fc, #976dff);
}
// 背景
.codeImg {
width: 100%;

2
pages/user/index.vue
View File

@@ -967,7 +967,7 @@
width: 100%;
z-index: 99;
left: 0;
top: 196px;
top: 200px;
// padding-top: var(--status-bar-height);
background-color: #F8F8F8;
transition: .5s;

6
pages/vip/agree.vue
View File

@@ -15,7 +15,11 @@
}
},
created() {
userAgree().then(res => {
let newUrl = ''
if(this.$Route.query.type == 'vipAgree') newUrl = 'articles/agreement/openvip'
if(this.$Route.query.type == 'loginPrivacy') newUrl = 'articles/agreement/secret'
if(this.$Route.query.type == 'loginService') newUrl = 'articles/agreement/service'
userAgree(newUrl).then(res => {
this.content = res.content
}).catch(err =>{
uni.showToast({

46
pages/vip/vip.vue
View File

@@ -62,10 +62,15 @@
<view class="privilege-text">
<view class="privilege-name">
升级条件
</view>
<view class="privilege-label" :class="{'active' : item.finish == true}" v-for="(item, index) in identitie[tabsIndex].get_condition" :key="index">
&{{item.message}}
</view>
</view>
<block v-if="openCondition.energy_shard">
<view class="privilege-label" :class="{'active' : openCondition.energy_shard.finish}">{{openCondition.energy_shard.message}}<uni-icons v-if="openCondition.energy_shard.finish" type="checkmarkempty" size="17" color="#f6b338"></uni-icons></view>
<view class="privilege-label" :class="{'active' : openCondition.price.finish}" v-if="!openCondition.energy_shard.finish">{{openCondition.price.message}}</view>
<view class="privilege-label" v-else>{{openCondition.service_charge.message}}</view>
</block>
<block v-else>
<view class="privilege-label" :class="{'active' : openCondition.price.finish}">{{openCondition.price.message}}</view>
</block>
</view>
</view>
<view class="privilege-list">
@@ -82,7 +87,7 @@
</view>
<!-- 用户协议 -->
<view class="agree">
<view class="agree">
<view class="agree-tips" @click="$Router.push({name: 'vipAgree', params: {type : 'vipAgree'}})">
请仔细阅读并确认服务协议
</view>
@@ -127,7 +132,8 @@
canForm : false, // 凭证弹出
canFromImg : {
showpath: '',
path : ''
path : ''
},
openCondition: {}
}
},
@@ -138,11 +144,23 @@
methods: {
// 当前用户信息
idenInfo(){
identities().then(res => {
this.loding = false
this.identitie = res.identities
this.rights = res.identities[this.tabsIndex].rights
this.total = res.identities[this.tabsIndex].price
identities().then(res => {
res.identities.map(item => {
item.obj_condition = new Object
for(let val of item.get_condition){
item.obj_condition[val.name] = {
message: val.message,
finish: val.finish
}
}
return item
})
this.identitie = res.identities
this.openCondition = res.identities[this.tabsIndex].obj_condition
this.rights = res.identities[this.tabsIndex].rights
this.total = res.identities[this.tabsIndex].price
this.canBtn = res.identities[this.tabsIndex].can
this.loding = false
}).catch(err =>{
uni.showToast({
@@ -153,7 +171,7 @@
},
// 切换开通身份
swiperChange(e) {
swiperChange(e) {
this.tabsIndex = e.detail.current
// 获取当前用户信息
this.idenInfo();
@@ -169,9 +187,7 @@
icon : 'none'
})
return
}
}
if(can.on_line) {
if(can.on_line) {
if(can.buy) {
// 开通vip提交
@@ -183,7 +199,6 @@
icon : 'none'
})
}
} else {
} else {
if(can.buy) {
// 上传凭证
@@ -195,7 +210,6 @@
})
}
}
return
return
},
// 开通vip提交

4
pages/wallet/extract.vue
View File

@@ -171,9 +171,7 @@
},
// 选择银行卡
bankLists() {
uni.navigateTo({
url: '/pages/wallet/bankList'
})
this.$Router.push({name: 'bankList'})
},
// 提现记录
withdrawDetail() {