diff --git a/pages.json b/pages.json
index b415c2f..fb2398a 100644
--- a/pages.json
+++ b/pages.json
@@ -10,14 +10,14 @@
"path": "pages/shouye/index",
"style": {
"navigationStyle": "custom",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
"path": "pages/shouye/detail",
"style": {
"navigationStyle": "custom",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -25,7 +25,7 @@
"style": {
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#222222",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -33,7 +33,7 @@
"style": {
"navigationBarTitleText": "预售日历",
"navigationBarBackgroundColor": "#161616",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -41,7 +41,7 @@
"style": {
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#161616",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -49,7 +49,7 @@
"style": {
"navigationBarTitleText": "无限令",
"navigationBarBackgroundColor": "#222222",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -57,7 +57,7 @@
"style": {
"navigationBarTitleText": "换箱",
"navigationBarBackgroundColor": "#222222",
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationStyle": "custom"
}
},
@@ -81,7 +81,7 @@
"path": "pages/user/index",
"style": {
"navigationStyle": "custom",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -89,7 +89,7 @@
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "星钻明细",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -97,7 +97,7 @@
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "消费记录",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -105,7 +105,7 @@
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "打包记录",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -113,7 +113,7 @@
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "发货记录",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -121,7 +121,7 @@
"style": {
"navigationBarBackgroundColor": "#222222",
"navigationBarTitleText": "订单详情",
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationStyle": "custom"
}
},
@@ -130,7 +130,7 @@
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "星钻记录",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -138,7 +138,7 @@
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "积分记录",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -146,7 +146,7 @@
"style": {
"navigationBarBackgroundColor": "#222222",
"navigationBarTitleText": "奖励明细",
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationStyle": "custom"
}
},
@@ -156,16 +156,16 @@
"style": {
"navigationStyle": "custom",
"navigationBarTitleText": "会员中心",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
"path": "pages/guize/guize",
"style": {
- "navigationBarBackgroundColor": "#222222",
+ "navigationBarBackgroundColor": "#FFFFFF",
"navigationBarTitleText": "",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -173,7 +173,7 @@
"style": {
"navigationBarTitleText": "欧气券",
"navigationBarBackgroundColor": "#222222",
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationStyle": "custom"
}
},
@@ -182,7 +182,7 @@
"style": {
"navigationBarTitleText": "查看物流",
"navigationBarBackgroundColor": "#222222",
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationStyle": "custom"
}
},
@@ -191,7 +191,7 @@
"style": {
"navigationBarTitleText": "我的卡册",
"navigationBarBackgroundColor": "#222222",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
@@ -199,13 +199,13 @@
"style": {
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#222222",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
"path": "pages/sangdai/hegui",
"style": {
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationStyle": "custom",
"disableSwipeBack": true
}
@@ -231,7 +231,7 @@
"style": {
"navigationBarTitleText": "邀请好友",
"navigationStyle": "custom",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
@@ -240,20 +240,20 @@
"style": {
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#222222",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
"path": "pages/DrawCard/index",
"style": {
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationStyle": "custom"
}
},
{
"path": "pages/DrawCard/cardDetail",
"style": {
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationStyle": "custom"
}
},
@@ -262,13 +262,13 @@
"style": {
"navigationBarBackgroundColor": "#222222",
"navigationBarTitleText": "图鉴",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
"path": "pages/chouka/ka",
"style": {
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationStyle": "custom"
}
},
@@ -277,27 +277,27 @@
"style": {
"navigationBarBackgroundColor": "#222222",
"navigationBarTitleText": "卡册",
- "navigationBarTextStyle": "white"
+ "navigationBarTextStyle": "black"
}
},
{
"path": "pages/chouka/detail",
"style": {
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationStyle": "custom"
}
},
{
"path": "pages/jiaoliu/jiaoliu",
"style": {
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationStyle": "custom"
}
},
{
"path": "pages/zizhi/index",
"style": {
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationBarTitleText": "自制赏",
"navigationBarBackgroundColor": "#222222"
}
@@ -305,7 +305,7 @@
{
"path": "pages/zizhi/detail",
"style": {
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationBarTitleText": "龙珠手办店",
"navigationBarBackgroundColor": "#222222"
}
@@ -313,7 +313,7 @@
{
"path": "pages/infinite/index",
"style": {
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationStyle": "custom",
"navigationBarBackgroundColor": "#222222"
}
@@ -321,7 +321,7 @@
{
"path": "pages/infinite/UnlimitedOrder",
"style": {
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationBarTitleText": "魔晶令",
"navigationBarBackgroundColor": "#222222",
"navigationStyle": "custom"
@@ -502,7 +502,7 @@
}
],
"globalStyle": {
- "navigationBarTextStyle": "white",
+ "navigationBarTextStyle": "black",
"navigationBarTitleText": "友达赏",
"navigationBarBackgroundColor": "#222222",
"backgroundColor": "#000000"
diff --git a/pages/guize/guize.vue b/pages/guize/guize.vue
index c6854b5..3092133 100644
--- a/pages/guize/guize.vue
+++ b/pages/guize/guize.vue
@@ -1,6 +1,6 @@
-
+
@@ -120,6 +120,7 @@
height: 100vh;
position: relative;
padding: 24rpx;
+ background-color: #FFFFFF;
box-sizing: border-box;
}
diff --git a/pages/infinite/index.vue b/pages/infinite/index.vue
index cdb61aa..2e9cede 100644
--- a/pages/infinite/index.vue
+++ b/pages/infinite/index.vue
@@ -5,6 +5,9 @@
+
+ 福利
+
@@ -17,7 +20,7 @@
-
+
{{ item.title }}
-
+
@@ -44,7 +44,7 @@
- 今日推荐
+ 今日推荐
@@ -90,7 +90,7 @@
{{ item.sale_stock }}/{{ item.stock }}
-
+
@@ -99,12 +99,8 @@
-
+
{{ item.type_text }}
@@ -137,7 +133,7 @@
-
+
@@ -499,7 +495,7 @@
height: 200rpx;
flex: 0 0 auto;
background-color: gray;
- margin-right: 10rpx;
+ margin-right: 40rpx;
border-radius: 10rpx;
}
@@ -633,8 +629,7 @@
.swiper-box {
width: 750rpx;
height: 460rpx;
- margin: 0 auto;
- background: #000000;
+ margin: 40rpx auto;
overflow: hidden;
}
@@ -663,6 +658,7 @@
width: 100%;
height: 100%;
border-radius: inherit;
+ background-color: #FFFFFF;
}
.news-box {
@@ -713,9 +709,10 @@
}
.yqhy {
- width: 691rpx;
+ width: 100%;
height: 300rpx;
- margin: 30rpx auto 0;
+ margin-top: 30rpx;
+ margin-left: 32rpx;
}
.nav2 {
@@ -745,7 +742,6 @@
padding: 0 30rpx;
font-weight: 400;
color: #ffffff;
- font-family: YouSheBiaoTiHei;
font-weight: 400;
font-size: 36rpx;
color: #cccccc;
@@ -775,20 +771,19 @@
margin-right: 30rpx;
}
- font-size: 28rpx;
- font-family: Source Han Sans CN;
- font-weight: 400;
+ font-size: 24rpx;
color: #999999;
&.act {
color: #333333;
- font-size: 32rpx;
+ font-weight: 600;
+ font-size: 28rpx;
&::before {
content: "";
display: block;
width: 60rpx;
- height: 2rpx;
+ height: 4rpx;
background: #333333;
border-radius: 30rpx;
position: absolute;
@@ -846,8 +841,6 @@
background: linear-gradient(0deg, #1ac762 0%, #35ed85 100%);
border-radius: 18rpx;
font-size: 26rpx;
- font-family: Source Han Sans CN;
- font-weight: 400;
color: #111111;
display: flex;
align-items: center;
@@ -928,11 +921,9 @@
align-items: center;
text {
- font-size: 14rpx;
- // font-family: YouSheBiaoTiHei;
+ font-size: 16rpx;
font-weight: 400;
color: #ffffff;
- // text-shadow: 2rpx 2rpx #FFFFFF;
}
}
@@ -963,7 +954,6 @@
align-items: center;
font-size: 22rpx;
- font-family: Source Han Sans CN;
font-weight: 400;
color: #222222;
@@ -992,8 +982,7 @@
.list_2 {
padding: 28rpx 20rpx 0;
font-size: 20rpx;
- font-family: Source Han Sans CN;
- font-weight: 400;
+ font-weight: 500;
color: #333333;
}
@@ -1013,7 +1002,6 @@
.item-price {
font-size: 16rpx;
- font-family: Source Han Sans CN;
font-weight: 400;
color: #333333;
@@ -1110,7 +1098,7 @@
>view:nth-child(1) {
width: 168rpx;
height: 168rpx;
-
+
>text:nth-child(1) {
font-weight: 400;
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 64e65b4..2e908e7 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -63,7 +63,7 @@
-->
- {{ userinfo.coupon || 0 }}
+ {{ userinfo.money || '0.00' }}
{{$config.getAppSetting('balance_name')}}
@@ -344,13 +344,13 @@
icon: 'my/s7.png',
path: '/pages/guize/guize?type=4'
},
- {
- id: 8,
- show: true,
- title: '道具卡',
- icon: 'my/s8.png',
- path: '/package/mine/skill-card'
- },
+ // {
+ // id: 8,
+ // show: true,
+ // title: '道具卡',
+ // icon: 'my/s8.png',
+ // path: '/package/mine/skill-card'
+ // },
// {
// id: 9,
// show:true,
@@ -1427,8 +1427,12 @@
>view {
width: 618rpx;
height: 6rpx;
- border-radius: 12rpx;
- border: 1px solid #111111;
+ border-radius: 6rpx;
+ // border: 1px solid #111111;
+
+ /deep/.cmd-progress-inner {
+ background: #CCCCCC;
+ }
>text {
font-weight: 400;
diff --git a/pages/user/xfjl.vue b/pages/user/xfjl.vue
index 44bcc25..fe10e99 100644
--- a/pages/user/xfjl.vue
+++ b/pages/user/xfjl.vue
@@ -1,221 +1,194 @@
-
-
-
-
-
-
-
-
-
- {{ item.content }}
- {{ item.addtime }}
-
- {{ item.change_money }}
-
-
-
-
+
+
+
+
+
+
+
+ {{ item.content }}
+ {{ item.addtime }}
+
+ {{ item.change_money }}
+
+
+
+
+ image {
+ width: 48rpx;
+ height: 48rpx;
+ }
+ }
+ }
+ }
+
\ No newline at end of file