diff --git a/app.wxss b/app.wxss index e6485d0..ba3e559 100644 --- a/app.wxss +++ b/app.wxss @@ -44,4 +44,32 @@ .solid-bottom, .solid-bottom::after { border-bottom: 1rpx solid #f3f3ff; +} + +.wux-close { + width: 100%; + text-align: end; + display: inline-block; + padding-bottom: 24rpx; +} + +.wux-landscape{ + width: 100%; + max-width: 750rpx; +} + +.wux-landscape__popup { + background-color: transparent!important +} + +.wux-landscape__popup-body { + padding: 0!important +} +.wux-landscape__inner { + line-height: 1.5; + color: rgba(0,0,0,.65) +} +.wux-landscape__inner > image { + width: 100%; + max-width: 100% } \ No newline at end of file diff --git a/assets/popup/need-member.png b/assets/popup/need-member.png new file mode 100644 index 0000000..24d9441 Binary files /dev/null and b/assets/popup/need-member.png differ diff --git a/assets/popup/send-member.png b/assets/popup/send-member.png new file mode 100644 index 0000000..a94739c Binary files /dev/null and b/assets/popup/send-member.png differ diff --git a/assets/tabs/icon-agent-home.png b/assets/tabs/icon-agent-home.png new file mode 100644 index 0000000..e444969 Binary files /dev/null and b/assets/tabs/icon-agent-home.png differ diff --git a/assets/tabs/icon-home-active.png b/assets/tabs/icon-home-active.png new file mode 100644 index 0000000..ad8c179 Binary files /dev/null and b/assets/tabs/icon-home-active.png differ diff --git a/assets/tabs/icon-home-trans.png b/assets/tabs/icon-home-trans.png new file mode 100644 index 0000000..fbe854b Binary files /dev/null and b/assets/tabs/icon-home-trans.png differ diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml index 987dc51..f55bb8d 100644 --- a/pages/agent/factory/index.wxml +++ b/pages/agent/factory/index.wxml @@ -180,7 +180,7 @@ - + diff --git a/pages/agent/factory/index.wxss b/pages/agent/factory/index.wxss index 9f91e08..34d1d92 100644 --- a/pages/agent/factory/index.wxss +++ b/pages/agent/factory/index.wxss @@ -90,26 +90,4 @@ .transform { transform-origin: 50% 50%; transform: rotate(180deg); -} - - -.wux-landscape{ - width: 100%; - max-width: 750rpx; -} - -.wux-landscape__popup { - background-color: transparent!important -} - -.wux-landscape__popup-body { - padding: 0!important -} -.wux-landscape__inner { - line-height: 1.5; - color: rgba(0,0,0,.65) -} -.wux-landscape__inner > image { - width: 100%; - max-width: 100% } \ No newline at end of file diff --git a/pages/article/detail/index.wxml b/pages/article/detail/index.wxml index 3b152f5..96ffebc 100644 --- a/pages/article/detail/index.wxml +++ b/pages/article/detail/index.wxml @@ -169,7 +169,7 @@ - + diff --git a/pages/article/detail/index.wxss b/pages/article/detail/index.wxss index 1815d17..aa60b89 100644 --- a/pages/article/detail/index.wxss +++ b/pages/article/detail/index.wxss @@ -194,25 +194,4 @@ font-size: 48rpx; color: #3539F8; margin-bottom: 30rpx; -} - -.wux-landscape{ - width: 100%; - max-width: 750rpx; -} - -.wux-landscape__popup { - background-color: transparent!important -} - -.wux-landscape__popup-body { - padding: 0!important -} -.wux-landscape__inner { - line-height: 1.5; - color: rgba(0,0,0,.65) -} -.wux-landscape__inner > image { - width: 100%; - max-width: 100% } \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index de5351c..279b471 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -96,7 +96,7 @@ Page({ util.navigateTo(this.data.path) } if(!app.globalData.userInfo){ - this.setData({ landInfo: {otherType: 10, picUrl: '/assets/popup/eighty-member.png'} }) + this.setData({ landInfo: {otherType: 10, picUrl: '/assets/popup/send-member.png'} }) } else { hasGetMemberInfo().then(result => { if (!result.data && !this.data.landInfo) { diff --git a/pages/index/index.wxss b/pages/index/index.wxss index ecacb86..a809855 100644 --- a/pages/index/index.wxss +++ b/pages/index/index.wxss @@ -1,31 +1,3 @@ -.wux-close { - width: 100%; - text-align: end; - display: inline-block; - padding-bottom: 24rpx; -} - -.wux-landscape{ - width: 100%; - max-width: 750rpx; -} - -.wux-landscape__popup { - background-color: transparent!important -} - -.wux-landscape__popup-body { - padding: 0!important -} -.wux-landscape__inner { - line-height: 1.5; - color: rgba(0,0,0,.65) -} -.wux-landscape__inner > image { - width: 100%; - max-width: 100% -} - -.button--hover { + .button--hover { background-color: #ececec } \ No newline at end of file diff --git a/pages/mall/fragment/index.wxml b/pages/mall/fragment/index.wxml index 1d3a9db..9e034a1 100644 --- a/pages/mall/fragment/index.wxml +++ b/pages/mall/fragment/index.wxml @@ -36,11 +36,11 @@ - + - + - +