diff --git a/env.js b/env.js
index 5b7fdb4..225bfc6 100644
--- a/env.js
+++ b/env.js
@@ -12,7 +12,7 @@ export const API_URL = `${BASE_URL}/addons/shopro/`
export const IMG_URL = 'https://fx.njrenzhou.cn'
//高德地图开发者Web服务key,逆坐标解析必须
-export const MAP_KEY = '265849207*********39753dc'
+export const MAP_KEY = '213ff5240e12efbd4c2ec6b7e2f02c6c'
//后台是否开通直播权限,根据情况在manifest.json中引入直播插件,并在pages.json中打开直播页面
export const HAS_LIVE = false
diff --git a/pages.json b/pages.json
index d3e9c80..fb11a04 100644
--- a/pages.json
+++ b/pages.json
@@ -522,7 +522,9 @@
{
"path": "payment/method",
"style": {
- "navigationBarTitleText": "收银台"
+ "navigationBarTitleText": "收银台",
+ "navigationBarBackgroundColor": "#21222B",
+ "navigationBarTextStyle": "white"
},
"meta": {
"auth": true,
diff --git a/pages/app/commission/commission-log.vue b/pages/app/commission/commission-log.vue
index 7aa57a4..c01f1ae 100644
--- a/pages/app/commission/commission-log.vue
+++ b/pages/app/commission/commission-log.vue
@@ -7,7 +7,7 @@
总收益(元)
{{ showMoney ? agentInfo.total_income || '0.00' : '***' }}
@@ -50,7 +50,7 @@
-
+
{{ item.buyer.nickname }}
{{ $u.timeFormat(item.createtime, 'yyyy.mm.dd') }}
@@ -74,7 +74,7 @@
mode="range"
start-text="开始"
end-text="结束"
- active-bg-color="#7063d2"
+ active-bg-color="#7063D2"
active-color="#fff"
range-bg-color="#e5e2ff"
range-color="#7063d2"
@@ -99,9 +99,9 @@ export default {
cancel: '已取消'
},
classType: {
- '-1': '#EB2B3D',
+ '-1': '#FFFFFF',
'0': '#05C3A1',
- '1': '#7063D2',
+ '1': '#DD5C3D',
'-2': '#EEEEEE'
},
statusList: [
diff --git a/pages/app/commission/goods.vue b/pages/app/commission/goods.vue
index 34be836..a78b459 100644
--- a/pages/app/commission/goods.vue
+++ b/pages/app/commission/goods.vue
@@ -113,11 +113,12 @@ page {
border-radius:20rpx;
border-bottom: 1rpx solid rgba(#dfdfdf, 0.5);
position: relative;
+ margin-bottom:20rpx;
.share-btn {
position: absolute;
bottom: 30rpx;
right: 30rpx;
- width: 160rpx;
+ width: 130rpx;
line-height: 60rpx;
background: #F0D2A0;
box-shadow: 0px 7rpx 11rpx 2rpx rgba(124, 103, 214, 0.34);
diff --git a/pages/app/commission/index.vue b/pages/app/commission/index.vue
index 7ed9ed3..d2ac417 100644
--- a/pages/app/commission/index.vue
+++ b/pages/app/commission/index.vue
@@ -703,7 +703,7 @@ export default {
.card-top {
padding: 40rpx 40rpx 30rpx;
margin-bottom: 30rpx;
- border-bottom: 1px solid rgba(#fff, 0.12);
+ // border-bottom: 1px solid rgba(#fff, 0.12);
.user-name {
line-height: 30rpx;
margin-bottom: 20rpx;
@@ -808,7 +808,7 @@ export default {
.log-scroll {
height: 380rpx;
.log-item-box {
- height: 78rpx;
+ height: 100rpx;
.log-time {
font-size: 26rpx;
font-family: Alibaba PuHuiTi;
diff --git a/pages/app/commission/order.vue b/pages/app/commission/order.vue
index 5c0932a..815d239 100644
--- a/pages/app/commission/order.vue
+++ b/pages/app/commission/order.vue
@@ -75,7 +75,7 @@
-
+
@@ -273,7 +273,7 @@ export default {
.direct-item {
width: 341rpx;
- height: 117rpx;
+ // height: 117rpx;
background: linear-gradient(0deg, #E1BC7D, #F0D2A0);
border-radius: 20rpx;
@@ -287,7 +287,8 @@ export default {
.item-value {
font-size: 36rpx;
font-weight: 600;
- color:#030300
+ color:#030300;
+ margin-top: 23rpx;
}
}
}
@@ -297,7 +298,7 @@ export default {
.data-card {
width: 340rpx;
border-radius: 20rpx;
- padding: 20rpx;
+ padding: 30rpx;
background: linear-gradient(0deg, #E1BC7D, #F0D2A0);
@@ -388,6 +389,7 @@ export default {
// 订单列表
.order-list {
background-color: #fff;
+ border-radius: 20rpx;
margin-top: 20rpx;
.order-head {
padding: 20rpx;
diff --git a/pages/app/commission/share-log.vue b/pages/app/commission/share-log.vue
index afce233..879c264 100644
--- a/pages/app/commission/share-log.vue
+++ b/pages/app/commission/share-log.vue
@@ -16,7 +16,7 @@
-
+
@@ -135,7 +135,7 @@ export default {
diff --git a/pages/user/address/edit.vue b/pages/user/address/edit.vue
index b615a6c..57e756d 100644
--- a/pages/user/address/edit.vue
+++ b/pages/user/address/edit.vue
@@ -3,7 +3,7 @@
-
+
{{ chooseAddress }}
@@ -262,6 +262,7 @@ export default {
// 点击定位
.location-item {
font-size: 28rpx;
+ padding:29rpx 20rpx;
font-weight: 500;
background-color: #fff;
// color: rgba(167, 111, 13, 1);
diff --git a/pages/user/favorite.vue b/pages/user/favorite.vue
index 9cbd8cb..2c57ff9 100644
--- a/pages/user/favorite.vue
+++ b/pages/user/favorite.vue
@@ -153,8 +153,9 @@ export default {
color: #999;
.all-num {
- color: #21222B;
+ color: #F0D2A0;
font-size: 36rpx;
+ margin:0 8rpx;
}
}
diff --git a/pages/user/wallet/index.vue b/pages/user/wallet/index.vue
index 1173862..8af8c90 100644
--- a/pages/user/wallet/index.vue
+++ b/pages/user/wallet/index.vue
@@ -42,7 +42,7 @@
-
+
{{ item.type_name }}{{ item.title ? '-' + item.title : '' }}
@@ -177,10 +177,11 @@
+
@@ -154,7 +440,8 @@
// 可提现
.wallet-num-box {
- padding: 20rpx 40rpx 0;
+ padding: 46rpx 40rpx 0;
+ align-items: baseline;
.num-title {
font-size: 30rpx;
@@ -217,12 +504,13 @@
width: 616rpx;
height: 86rpx;
line-height: 86rpx;
- background: linear-gradient(-90deg, #a36fff, #5336ff);
+ // background: linear-gradient(-90deg, #a36fff, #5336ff);
+ background: #F0D2A0;
box-shadow: 0px 7rpx 11rpx 2rpx rgba(124, 103, 214, 0.34);
border-radius: 43rpx;
font-size: 30rpx;
font-weight: 500;
- color: #ffffff;
+ color: #09090B;
}
// 充值卡片
diff --git a/pages/user/wallet/withdraw.vue b/pages/user/wallet/withdraw.vue
index 028a0bb..b78edcd 100644
--- a/pages/user/wallet/withdraw.vue
+++ b/pages/user/wallet/withdraw.vue
@@ -339,7 +339,7 @@ export default {
.head-box {
// background: url($IMG_URL+'/imgs/user/draw_money_head_bg.png') no-repeat;
background-size: 100% auto;
- min-height: 400rpx;
+ min-height: 300rpx;
padding-bottom: var(--status-bar-height);
// 可提现
.wallet-num-box {
@@ -378,7 +378,8 @@ export default {
border-radius: 20rpx;
width: 690rpx;
min-height: 530rpx;
- margin: -70rpx auto 0;
+ // margin: -70rpx auto 0;
+ margin: 0rpx auto 0;
padding: 30rpx;
.card-title {
font-size: 30rpx;
diff --git a/static/images/empty.png b/static/images/empty.png
new file mode 100644
index 0000000..67bd49d
Binary files /dev/null and b/static/images/empty.png differ