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-11-04 08:59:00 +08:00
parent 5a478ed794 cbe6cc912b
commit f8aa690216
15 changed files with 1505 additions and 1115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
pages.json
View File

@@ -136,7 +136,11 @@
"style": {
"navigationBarTitleText": "我的权证",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#8b64fd"
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
}
},
{
@@ -145,7 +149,11 @@
"style": {
"navigationBarTitleText": "权证详情",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#8b64fd"
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
}
},
{
@@ -154,8 +162,12 @@
"style": {
"enablePullDownRefresh": true,
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#8b64fd",
"navigationBarTitleText": "已使用服务类订单"
"navigationBarTitleText": "已使用服务类订单",
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
}
}, {
"path": "pages/user/order/servicesOrderInfo",
@@ -163,8 +175,12 @@
"style": {
"enablePullDownRefresh": true,
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#8b64fd",
"navigationBarTitleText": "订单详情"
"navigationBarTitleText": "订单详情",
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
}
},
{
@@ -173,7 +189,11 @@
"style": {
"navigationBarTitleText": "已经提货",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#8b64fd"
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
}
}, {
"path": "pages/user/order/logistics",
@@ -181,7 +201,11 @@
"style": {
"navigationBarTitleText": "查看物流",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#8b64fd"
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
}
}, {
"path": "pages/user/order/mallShipmentsInfo",
@@ -189,7 +213,11 @@
"style": {
"navigationBarTitleText": "提货单详情页面",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#8b64fd"
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
}
},
{
@@ -198,7 +226,11 @@
"style": {
"navigationBarTitleText": "地址管理",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#8b64fd"
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
}
}, {
"path": "pages/user/address/create",
@@ -206,7 +238,11 @@
"style": {
"navigationBarTitleText": "地址新增",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor": "#8b64fd"
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
}
},
{
@@ -257,8 +293,12 @@
"name": "vipAgree",
"style": {
"navigationBarTitleText": "用户协议",
"navigationBarBackgroundColor": "#774ffd",
"navigationBarTextStyle":"white"
"navigationBarTextStyle":"white",
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
}
}, {
"path": "pages/vip/examine",
@@ -302,7 +342,7 @@
"navigationBarTitleText": "权证详情",
"navigationBarTextStyle":"white",
"titleNView": {
"backgroundColor": "#8b64fd",
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)",
"type": "transparent",
"buttons": [{
"text": "分享",
@@ -437,7 +477,7 @@
"style": {
"navigationBarTitleText": "现金红包",
"enablePullDownRefresh": false,
"navigationBarTextStyle": "white",
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor":"#976dff"
}
},
@@ -447,8 +487,8 @@
"style": {
"navigationBarTitleText": "提现通证",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#976dff",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor":"#976dff"
}
},
{
@@ -457,8 +497,8 @@
"style": {
"navigationBarTitleText": "提现红包",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#976dff",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"navigationBarBackgroundColor":"#976dff"
}
}, {
"path": "pages/verification/index",
@@ -466,8 +506,12 @@
"auth": true,
"style": {
"navigationBarTitleText": "扫码核销",
"navigationBarBackgroundColor":"#076cff",
"navigationBarTextStyle":"white"
"navigationBarTextStyle":"white",
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
}
}, {
"path": "pages/verification/history",
@@ -475,8 +519,12 @@
"auth": true,
"style": {
"navigationBarTitleText": "核销记录",
"navigationBarBackgroundColor":"#076cff",
"navigationBarTextStyle":"white"
"navigationBarTextStyle":"white",
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
}
}, {
"path": "pages/shop/lists",
@@ -566,8 +614,12 @@
"style": {
"navigationBarTitleText": "贡献值记录",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#774ffd",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
}
},
{
@@ -575,8 +627,12 @@
"style": {
"navigationBarTitleText": "添加银行卡",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#774ffd",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
},
"name": "addBank"
}, {
@@ -584,8 +640,12 @@
"style": {
"navigationBarTitleText": "银行卡列表",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#774ffd",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
},
"name": "bankList"
}, {
@@ -593,8 +653,12 @@
"style": {
"navigationBarTitleText": "红包提现记录",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#774ffd",
"navigationBarTextStyle": "white"
"navigationBarTextStyle": "white",
"app-plus":{
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
}
},
"name": "withdrawList"
}, {

8
pages/coupons/management.vue
View File

@@ -118,8 +118,8 @@
height: 60rpx;
line-height: 60rpx;
&.show{
color: $text-price;
border-bottom: solid 4rpx $text-price;
color: $mian-color;
border-bottom: solid 4rpx $mian-color;
}
}
}
@@ -138,8 +138,8 @@
margin-right: $margin/2;
color: $text-gray;
&.show{
background-color: rgba($color: $text-price, $alpha: .1);
color: $text-price;
background-color: rgba($color: $mian-color, $alpha: .1);
color: $mian-color;
}
}
}

10
pages/employees/list.vue
View File

@@ -21,7 +21,8 @@
<view class="content">
<view class="nickname nowrap">{{item.name}}<text>{{item.job}}</text></view>
<view class="job nowrap">
<text v-for="(permissionItem, permissionIndex) in item.permission" :key="permissionIndex">{{permissionItem}}</text>
<text v-for="(permissionItem, permissionIndex) in item.permission" :key="permissionIndex" v-if="permissionIndex < 3">{{permissionItem}}</text>
<text v-if="item.permission.length > 3">等{{item.permission.length}}项权限</text>
</view>
</view>
</view>
@@ -55,13 +56,14 @@
text : '编辑',
type : 'PUT',
style : {
backgroundColor: '#8b64fd'
color: '#8b64fd',
backgroundColor: '#eff4f2'
}
},{
text : '删除',
type : 'DELETE',
style : {
backgroundColor: '#e93340'
backgroundColor: '#ee4c47'
}
}]
};
@@ -158,7 +160,7 @@
position: absolute;
top: $padding - 10;
left: $padding;
background: $text-price;
background: $mian-color;
color: white;
height: 88rpx;
width: 88rpx;

2
pages/goods/add.vue
View File

@@ -571,7 +571,7 @@
.footer-btn{
border: none;
border-radius: 0;
background: $text-price;
background: $mian-color;
height: 90rpx;
line-height: 90rpx;
font-weight: bold;

2
pages/goods/addClassify.vue
View File

@@ -68,7 +68,7 @@
position: absolute;
height: 40rpx;
width: 5rpx;
background: $text-price;
background: $mian-color;
content: " ";
left: 0;
top: 20rpx;

1
pages/goods/details.vue
View File

@@ -218,7 +218,6 @@
onBackPress({
from
}) {
console.log(from);
if (from == 'backbutton') {
this.$nextTick(function() {
uniShare.hide()

4
pages/instrument/basics.vue
View File

@@ -415,7 +415,7 @@
line-height: 88rpx;
height: 88rpx;
text-align: center;
color: $text-price;
color: $mian-color;
background: white;
box-sizing: border-box;
font-size: $title-size-lg;
@@ -446,7 +446,7 @@
.remove-btn {
line-height: 70rpx;
color: $text-price;
color: $mian-color;
text-align: right;
font-size: $title-size-m;
}

2
pages/shop/create.vue
View File

@@ -219,7 +219,7 @@
line-height: 86rpx;
height: 88rpx;
text-align: center;
color: $text-price;
color: $mian-color;
background: white;
width: calc(50% - 15rpx);
margin-right: 30rpx;

6
pages/verification/history.vue
View File

@@ -267,7 +267,7 @@
.record-top {
width: calc(100% - 60rpx);
height: 360rpx;
background-image: linear-gradient(to left, #076cff, #076cff);
background-image: linear-gradient(to right, $mian-color, $mian-color-deep);
box-shadow: 0 10rpx 20rpx 0rpx rgba($color: $mian-color, $alpha: 0.4);
margin: 0 30rpx;
border-radius: 20rpx;
@@ -443,7 +443,7 @@
.tags {
padding: 4rpx 10rpx;
border-radius: 20rpx 0 20rpx 0;
background-color: #076cff;
background-color: $mian-color;
font-size: 26rpx;
color: #fff;
}
@@ -500,7 +500,7 @@
}
.shop-name {
background-color: #076cff;
background-color: $mian-color;
color: #fff;
font-size: 24rpx;
font-weight: 400;

37
pages/verification/index.vue
View File

@@ -162,6 +162,7 @@
.top-img {
margin-top: 100rpx;
width: 70vw;
}
.txt {
@@ -174,49 +175,43 @@
box-sizing: border-box;
.title {
font-size: 42rpx;
font-size: $title-size + 5;
font-weight: 500;
}
.des {
font-size: 34rpx;
color: rgba($color: #255a7c, $alpha: .4);
font-size: $title-size-m;
color: $text-gray-m;
padding-top: 20rpx;
font-weight: bold;
.dian {
color: #039bfe;
color: $mian-color;
padding: 0 10rpx;
}
}
}
.btn {
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
box-sizing: border-box;
margin-top: 140rpx;
display: flex;
width: 90vw;
.goods,
.coupons {
width: 310rpx;
width: 50%;
margin: 0 $margin/2;
height: 90rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: center;
box-sizing: border-box;
line-height: 90rpx;
text-align: center;
border-radius: 8rpx;
border: solid 1rpx #039bfe;
color: #039bfe;
border: solid 2rpx $mian-color;
color: $mian-color;
font-size: 34rpx;
font-weight: bold;
}
.coupons {
background-color: #039bfe;
background-color: $mian-color;
color: #fff;
margin-left: 30rpx;
}
@@ -224,9 +219,9 @@
.history {
text-align: center;
padding: $padding;
padding: ($padding * 2) $padding;
width: 100%;
color: #cacaca;
color: $title-size-m;
}
}

2
pages/wallet/extract.vue
View File

@@ -261,7 +261,7 @@
}
.all {
color: $text-price;
color: $mian-color;
width: 160rpx;
text-align: center;
}

2
pages/wallet/extractRed.vue
View File

@@ -290,7 +290,7 @@
}
.all {
color: $text-price;
color: $mian-color;
width: 160rpx;
text-align: center;
}

8
pages/wallet/property.vue
View File

@@ -302,7 +302,7 @@
width: 200rpx;
height: 75rpx;
line-height: 75rpx;
color: $text-price;
color: $mian-color;
margin: 0 $margin;
border-radius: $radius-m;
font-size: 28rpx;
@@ -332,10 +332,8 @@
.tabs-item {
position: relative;
padding: 0 $padding;
&.show {
color: $text-price;
color: $mian-color;
&::before {
position: absolute;
bottom: 0;
@@ -343,7 +341,7 @@
right: $padding;
height: 4rpx;
content: " ";
background-color: $text-price;
background-color: $mian-color;
}
}
}

9
pages/wallet/redProperty.vue
View File

@@ -266,13 +266,12 @@
display: flex;
justify-content: center;
margin-top: $margin * 2;
.balance-flex-item {
background-color: white;
width: 300rpx;
height: 75rpx;
line-height: 75rpx;
color: $text-price;
color: $mian-color;
margin: 0 $margin;
border-radius: $radius-m;
font-size: 28rpx;
@@ -302,10 +301,8 @@
.tabs-item {
position: relative;
padding: 0 $padding;
&.show {
color: $text-price;
color: $mian-color;
&::before {
position: absolute;
bottom: 0;
@@ -313,7 +310,7 @@
right: $padding;
height: 4rpx;
content: " ";
background-color: $text-price;
background-color: $mian-color;
}
}
}

2401
unpackage/dist/dev/app-plus/app-service.js vendored
View File

File diff suppressed because one or more lines are too long