diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue index 09fb896..e9b4d2a 100644 --- a/components/tab-bar/tab-bar.vue +++ b/components/tab-bar/tab-bar.vue @@ -56,7 +56,7 @@ id: 1, icon: '/static/tabbar/chousang.png', actIcon: '/static/tabbar/chousang_sel.png', - title: '抽赏', + title: '首页', path: '/pages/shouye/index' }, { @@ -94,7 +94,7 @@ id: 1, icon: '/static/tabbar/chousang.png', actIcon: '/static/tabbar/chousang_sel.png', - title: '抽赏', + title: '首页', path: '/pages/shouye/index' }, { diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 1cb2498..e50d588 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -8,7 +8,7 @@ Component({ "pagePath": "/pages/shouye/index", "iconPath": "/static/tabbar/m1.png", "selectedIconPath": "/static/tabbar/s1.png", - "text": "抽赏" + "text": "首页" }, { "index": 2, diff --git a/pages.json b/pages.json index 8cb8822..a10fafc 100644 --- a/pages.json +++ b/pages.json @@ -516,7 +516,7 @@ "pagePath": "pages/shouye/index", "iconPath": "static/tabbar/m1.png", "selectedIconPath": "static/tabbar/s1.png", - "text": "抽赏" + "text": "首页" }, { "pagePath": "pages/mall/index", diff --git a/pages/sangdai/sangdai.vue b/pages/sangdai/sangdai.vue index 50d868e..16fc07b 100644 --- a/pages/sangdai/sangdai.vue +++ b/pages/sangdai/sangdai.vue @@ -90,7 +90,7 @@ - + diff --git a/pages/shouye/detail_wuxian.vue b/pages/shouye/detail_wuxian.vue index 3e373ec..41b7b74 100644 --- a/pages/shouye/detail_wuxian.vue +++ b/pages/shouye/detail_wuxian.vue @@ -386,7 +386,7 @@ - {{previewData.shang_title}} + {{previewData.shang_title}} @@ -395,7 +395,8 @@ - {{ previewData.shang_title }} 概率:{{ previewData.pro }}% + + 概率:{{ previewData.pro }}% 产品类型:{{ optData.type_text }} @@ -2405,30 +2406,29 @@ .d-pop { position: relative; - width: 570rpx; + width: 564rpx; box-sizing: border-box; .pic { - width: 570rpx; - height: 598rpx; - // background: #8953DC; - background: #FFFFFF; - border: 2rpx solid #FFFFFF; + width: 564rpx; + height: 564rpx; + border-radius: 16rpx; >image { - width: 548rpx; - height: 549rpx; + width: 564rpx; + height: 564rpx; + border-radius: 16rpx; } >view { - width: 130rpx; - height: 46rpx; + width: 68rpx; + height: 32rpx; position: absolute; - top: -12rpx; - left: 0; + top: 24rpx; + left: 24rpx; font-weight: 400; - font-size: 20rpx; - color: #FFDF46; + font-size: 14rpx; + color: #FFFFFF; box-sizing: border-box; background: url($imgurl+'common/chouLabel.png') no-repeat 0 0 / 100% 100%; } @@ -2436,7 +2436,7 @@ .title { margin: 40rpx auto 0; - width: 574rpx; + width: 564rpx; height: 82rpx; box-sizing: border-box; display: flex; @@ -2444,14 +2444,14 @@ align-items: center; box-sizing: border-box; padding: 20rpx; - border: 2rpx solid #894DD3; + // border: 2rpx solid #894DD3; border-radius: 12rpx; - background: #313133; + background: #F5F5F5; >text { font-weight: 400; - font-size: 32rpx; - color: #FFFFFF; + font-size: 24rpx; + color: #333333; } } diff --git a/pages/shouye/index.vue b/pages/shouye/index.vue index 5548bf5..ba0600c 100644 --- a/pages/shouye/index.vue +++ b/pages/shouye/index.vue @@ -47,7 +47,7 @@ -