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

merge

Browse Source
This commit is contained in:
唐明明
2021-09-29 17:56:11 +08:00
parent e76c84789b d156ad6042
commit 292ec179cb
135 changed files with 57200 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
pages/found/index.vue
View File

@@ -38,12 +38,16 @@
<view class="sign-record">再签到{{ sign.nextTask.day }}天额外赠送{{ sign.nextTask.diff }}个能量碎片</view>
</view>
<view class="signBtn">
<view class="signBtn-go" v-if="sign.signCan" @click="signClick" style="cursor:pointer" >
签到领取能量碎片
</view>
<view class="signBtn-go" v-else @click="$Router.push({name:'Fragment'})">
能量碎片记录<image class="signBtn-go-icon" src="/static/user/sign_arrow.png" mode="aspectFill"></image>
</view>
<block v-if="sign.signCan">
<view class="signBtn-go" @tap="signClick" style="cursor:pointer" >
签到领取能量碎片
</view>
</block>
<block v-else>
<view class="signBtn-go" @click="$Router.push({name:'Fragment'})">
能量碎片记录<image class="signBtn-go-icon" src="/static/user/sign_arrow.png" mode="aspectFill"></image>
</view>
</block>
</view>
<!-- 水晶任务 -->
<view class="task">
@@ -323,6 +327,7 @@
z-index: 2;
.signBtn-go {
width: 100%;
height: 100rpx;
line-height: 100rpx;
border-radius: 80rpx;
background-color: #f9dc4a;

4
pages/news/index.vue
View File

@@ -1,7 +1,7 @@
<template>
<view class="News">
<view class="list" v-for="(item,index) in items" :key="index" v-if="items.length>0">
<navigator class="item" open-type="navigate" hover-class="none" :url="'/pages/news/detail?type='+item.type">
<view class="item" @click="$Router.push({name:'newsDetail',params:{type:item.type}})" >
<view class="left">
<image class="img" v-if='item.type ==="SystemNotification"' :src="item.icon?item.icon:'/static/imgs/news_1.png'" mode="aspectFill"></image>
<image class="img" v-if='item.type ==="OrderNotification"' :src="item.icon?item.icon:'/static/imgs/news_2.png'" mode="aspectFill"></image>
@@ -12,7 +12,7 @@
</view>
</view>
<view class="num" v-if="item.count>0">{{item.count}}</view>
</navigator>
</view>
</view>
<view class="no-news" v-else>
<image src="/static/img/no-news.png" mode="widthFix"></image>

8
pages/user/index.vue
View File

@@ -479,8 +479,8 @@
position: fixed;
background-color: $uni-bg-color;
border-radius: $radius;
left: 60rpx;
right: 60rpx;
left: 80rpx;
right: 80rpx;
top: 30%;
z-index: 1002;
font-size: $uni-font-size-sm;
@@ -494,11 +494,11 @@
font-weight: 600;
}
.newCont-text {
padding: 0 40rpx;
padding: 50rpx 40rpx;
box-sizing: border-box;
line-height: 48rpx;
text-align: justify;
height: 260rpx;
max-height: 400rpx;
overflow: hidden;
overflow-y: scroll;
}

6
pages/wallet/addBank.vue
View File

@@ -4,7 +4,7 @@
<view class="item-name">{{bank_account_id===''?'添加':'编辑'}}提现银行</view>
<view class="item">
<view class="title">收款人姓名</view>
<input class="input_num" v-model="name" maxlength="16" placeholder="请输入收款人姓名"
<input class="input_num" v-model="name" maxlength="13" placeholder="请输入收款人姓名"
placeholder-style="color:#999;font-weight:normal; font-size:30rpx;" />
</view>
<view class="item">
@@ -22,12 +22,12 @@
</view>
<view class="item">
<view class="title">收款人账号</view>
<input class="input_num" v-model="no" type="number" placeholder="请输入收款人账号"
<input class="input_num" v-model="no" maxlength="20" type="number" placeholder="请输入收款人账号"
placeholder-style="color:#999;font-weight:normal; font-size:30rpx;" />
</view>
<view class="item">
<view class="title">支行名称</view>
<input class="input_num" v-model="branch_name" maxlength="30" placeholder="省-市-区-支行名称"
<input class="input_num" v-model="branch_name" maxlength="20" placeholder="省-市-区-支行名称"
placeholder-style="color:#999;font-weight:normal; font-size:30rpx;" />
</view>
</view>

9
pages/wallet/bankList.vue
View File

@@ -1,5 +1,6 @@
<template>
<view class="selectCard">
<view class="demo" v-if="lists.length>0"><u-icon name="info-circle-fill" label-color='#cacaca' color='#cacaca' label='长按删除添加银行卡'/></view>
<view class="bankInfo" v-if="lists.length>0" v-for="(item,index) in lists" :key='index'
@longpress='delBank(item.bank_account_id,index)'>
<image class="bankLogin" @click="selectBank(item)" :src="item.bank.cover" mode="widthFix" />
@@ -110,7 +111,7 @@
uni.setStorageSync('refresh', true)
}
}).catch(err => {
this.$refs.uToast.show({
that.$refs.uToast.show({
title: err.message,
type: 'primary',
duration: 3000
@@ -161,7 +162,11 @@
padding-top: 30rpx;
background-color: #fff;
padding-bottom: 80rpx;
.demo{
color: #cacaca;
font-size: 26rpx;
text-align: center;
}
.bankInfo {
width: calc(100% - 60rpx);
background-image: linear-gradient(to right, #7c52fc, #976dff);