diff --git a/assets/vip/icon-vip1.png b/assets/vip/icon-vip1.png new file mode 100644 index 0000000..95a8828 Binary files /dev/null and b/assets/vip/icon-vip1.png differ diff --git a/assets/vip/icon-vip2.png b/assets/vip/icon-vip2.png new file mode 100644 index 0000000..7c86797 Binary files /dev/null and b/assets/vip/icon-vip2.png differ diff --git a/assets/vip/icon-vip3.png b/assets/vip/icon-vip3.png new file mode 100644 index 0000000..afff9bb Binary files /dev/null and b/assets/vip/icon-vip3.png differ diff --git a/assets/vip/icon-vip4.png b/assets/vip/icon-vip4.png new file mode 100644 index 0000000..5597280 Binary files /dev/null and b/assets/vip/icon-vip4.png differ diff --git a/assets/vip/icon-vip5.png b/assets/vip/icon-vip5.png new file mode 100644 index 0000000..d488094 Binary files /dev/null and b/assets/vip/icon-vip5.png differ diff --git a/assets/vip/icon-vip6.png b/assets/vip/icon-vip6.png new file mode 100644 index 0000000..c7a067b Binary files /dev/null and b/assets/vip/icon-vip6.png differ diff --git a/assets/vip/icon-vip7.png b/assets/vip/icon-vip7.png new file mode 100644 index 0000000..32eb172 Binary files /dev/null and b/assets/vip/icon-vip7.png differ diff --git a/assets/vip/icon-vip8.png b/assets/vip/icon-vip8.png new file mode 100644 index 0000000..46d1f88 Binary files /dev/null and b/assets/vip/icon-vip8.png differ diff --git a/assets/vip/vip-checked.png b/assets/vip/vip-checked.png new file mode 100644 index 0000000..6bbf815 Binary files /dev/null and b/assets/vip/vip-checked.png differ diff --git a/const/city.js b/const/city.js index 1e167c5..cb489b8 100644 --- a/const/city.js +++ b/const/city.js @@ -8,6 +8,11 @@ module.exports = { "code": 513200, "keyword": "阿坝ABA" }, + { + "cityName": "阿尔山市", + "code": 152202, + "keyword": "阿尔山AERSHAN" + }, { "cityName": "阿克苏", "code": 652900, diff --git a/pages/agent/factory/index.js b/pages/agent/factory/index.js index 49f0040..e082219 100644 --- a/pages/agent/factory/index.js +++ b/pages/agent/factory/index.js @@ -32,7 +32,7 @@ Page({ pageNum: 1, pageSize:15 }, - + visible: false, hasFollowed: false }, /** @@ -52,18 +52,15 @@ Page({ if (options.id) { this.data.id = options.id this.data.form.millPaperId = options.id - wx.showLoading({ - title: '加载中', - mask: true - }) + wx.showLoading({ title: '加载中', mask: true }) getFactoryPriceDetail(options.id).then(result => { if (result.data.paperCategoryList && result.data.paperCategoryList.length) { this.data.cateId = result.data.paperCategoryList[this.data.cateIndex].categoryId } - this.setData({ - factoryDetail: result.data, - hasFollowed:result.data.hasFollowed - }) + if(result.data && result.data.isCooperate !== 1 && !app.globalData.userInfo.isVIP){ + this.data.visible = true + } + this.setData({ factoryDetail: result.data, hasFollowed:result.data.hasFollowed, visible: this.data.visible }) wx.hideLoading() }).catch(err => { wx.hideLoading() @@ -76,21 +73,18 @@ Page({ this.onRefreshList() } }, - onFixedChange: function ({ - detail - }) { + onFixedChange: function ({ detail }) { this.data.fixed = detail.fixed }, - onScroll: function ({ - detail - }) { - this.setData({ - scrollTop: detail.scrollTop - }) + onScroll: function ({ detail }) { + this.setData({ scrollTop: detail.scrollTop }) }, stopTouchMove: function (e) { return false }, + onImageClick: function(){ + wx.navigateTo({ url: '/pages/ztbvip/index' }) + }, onTabChange: function ({ detail }) { if (this.data.tabIndex == Number(detail.index)) { return diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml index fc03860..e1aba9f 100644 --- a/pages/agent/factory/index.wxml +++ b/pages/agent/factory/index.wxml @@ -178,16 +178,13 @@ + hasHeader="{{ false }}" hasFooter="{{ false }}" visible="{{ visible }}" mask="{{ true }}"> - - 活动规则 - diff --git a/pages/article/detail/index.js b/pages/article/detail/index.js index 7aeb624..0260e32 100644 --- a/pages/article/detail/index.js +++ b/pages/article/detail/index.js @@ -27,6 +27,7 @@ Page({ pageSize: 15 }, maskHidden: false, + visible: false }, onLoad: function (options) { this.data.keyboardHeight = wx.getStorageSync('keyboardHeight') @@ -41,14 +42,12 @@ Page({ if (options.id) { this.data.id = options.id this.data.form.articleId = options.id - wx.showLoading({ - title: '加载中', - mask: true - }) + wx.showLoading({ title: '加载中', mask: true }) getMomentDetail(options.id).then(result => { - this.setData({ - momentDetail: result.data - }) + if(result.data && result.data.membershipPrivileges === 1 && !app.globalData.userInfo.isVIP){ + this.data.visible = true + } + this.setData({ momentDetail: result.data, visible: this.data.visible }) this.fetchCommentList() wx.hideLoading() }).catch(err => { @@ -57,6 +56,9 @@ Page({ }) } }, + onImageClick: function(){ + wx.navigateTo({ url: '/pages/ztbvip/index' }) + }, onRefreshList: function () { if (this.data.requesting) { return diff --git a/pages/article/detail/index.wxml b/pages/article/detail/index.wxml index 70b09ac..fddc28b 100644 --- a/pages/article/detail/index.wxml +++ b/pages/article/detail/index.wxml @@ -167,15 +167,12 @@ + hasHeader="{{ false }}" hasFooter="{{ false }}" visible="{{ visible }}" mask="{{ true }}"> - - 活动规则 - \ No newline at end of file diff --git a/pages/moment/fragment/index.js b/pages/moment/fragment/index.js index de997a5..68f24b2 100644 --- a/pages/moment/fragment/index.js +++ b/pages/moment/fragment/index.js @@ -39,9 +39,7 @@ Component({ methods: { onRestart: function () { if(!this.data.firstShow){ - setTimeout(() => { - this.setData({ tabIndex: this.data.tabIndex, tabList: [ '推荐', '关注', '全部' , '资讯'] }) - }, 100) + setTimeout(() => { this.setData({ tabIndex: this.data.tabIndex, tabList: [ '推荐', '关注', '全部' , '资讯'] }) }, 100) params.date = util.formatDate(new Date(), 'Y-M-D') } this.data.firstShow = true diff --git a/pages/moment/info-item/index.wxml b/pages/moment/info-item/index.wxml index 0d025f3..967f439 100644 --- a/pages/moment/info-item/index.wxml +++ b/pages/moment/info-item/index.wxml @@ -8,7 +8,7 @@ {{item.createTime}} - {{item.readingQuantity}}次阅读 + {{item.readingQuantity || 0}}次阅读 diff --git a/pages/moment/moment-item/index.js b/pages/moment/moment-item/index.js index 4c1a2bc..7d3406f 100644 --- a/pages/moment/moment-item/index.js +++ b/pages/moment/moment-item/index.js @@ -46,10 +46,6 @@ Component({ util.navigateTo('/pages/login/index') return } - if(!app.globalData.userInfo.isVIP){ - util.showToast('当前纸厂信息仅仅VIP会员用户可查看') - return - } } util.navigateTo('/pages/agent/factory/index?id=' + this.data.item.paperMillId) }, diff --git a/pages/ztbvip/index.json b/pages/ztbvip/index.json index ae305a9..fd228ab 100644 --- a/pages/ztbvip/index.json +++ b/pages/ztbvip/index.json @@ -4,8 +4,7 @@ "wux-button": "/components/button/index", "wux-image": "/components/image/index", "wux-dialog": "/components/dialog/index", - "wux-cell-group": "/components/cell-group/index", - "wux-cell": "/components/cell/index", - "wux-divider": "/components/divider/index" + "wux-grids": "/components/grids/index", + "wux-grid": "/components/grid/index" } } \ No newline at end of file diff --git a/pages/ztbvip/index.wxml b/pages/ztbvip/index.wxml index 0bc9601..3c0f23e 100644 --- a/pages/ztbvip/index.wxml +++ b/pages/ztbvip/index.wxml @@ -1,75 +1,92 @@ - 纸通宝会员 + 会员中心 - - - - - - - - - {{userName || ''}} - - - {{userInfo.isAuth == 1 ? '已认证' : '未实名认证'}} - 去认证 - - - - - - {{vipInfo.isVIP==1?'付费会员':'非会员'}} - (到期时间：{{vipInfo.memberExpiredAt}}) - - - - - - 我的权益 - - - - 买卖保障 - - - - 竞价特权 - - - - 咨询特权 - + + + + + + + + + {{userName || '未登录'}} + + {{userInfo.isAuth == 1 ? '已认证' : '未实名认证'}} + 去认证 + {{userInfo.mobile}} + + (到期时间：{{vipInfo.memberExpiredAt}}) + 开通会员立享8项特权 + + - - - 选择购买的会员产品 - - - - 首月买一赠一 - - - {{item.days}}{{item.title}} - {{item.realPrice}} - 原价：￥{{item.bidPrice}} - + +选择购买的会员产品 + + + + + + {{item.days}}{{item.title}} + {{item.realPrice}} + 原价：￥{{item.bidPrice}} + + 每天仅需4.2元 + + + + - + + +会员特权 + + + + 纸厂价格 + + + + 扣点信息 + + + + 车辆排队 + + + + 收停快讯 + + + + 我的浏览 + + + + 权威分析 + + + + 同城交流 + + + + 行情分析 + + - - - + + + \ No newline at end of file diff --git a/pages/ztbvip/index.wxss b/pages/ztbvip/index.wxss index 1e67c5d..eb0b7f0 100644 --- a/pages/ztbvip/index.wxss +++ b/pages/ztbvip/index.wxss @@ -1,12 +1,12 @@ /* pages/ztbvip/index.wxss */ .header-box { - width: 700rpx; - height: 335rpx; - background-image: url(https://pic.downk.cc/item/5f1bab9214195aa594620821.png); - background-size: cover; - padding:32rpx 24rpx; - /* box-shadow: 0px 0px 15px -6px rgba(0, 0, 0, 0.32); - border-radius: 6px; */ + width: 686rpx; + height: 386rpx; + position: absolute; + top: 32rpx; + left: 32rpx; + padding: 16rpx 32rpx; + display: flex; } @@ -40,15 +40,13 @@ width: 32rpx; height: 32rpx; } - .page-btn { height: 90rpx; width: 100%; - background: #d0a45c; - box-shadow: 0px 4px 14px -6px rgba(255, 43, 45, 0.8); - color: white; - font-size: 32rpx; + background-image: linear-gradient(90deg, #FFEAD0 0%, #FFCE90 100%); + color: #7E561C; + font-size: 36rpx; } .vip-btn { @@ -67,10 +65,14 @@ } .openVip21{ border-radius: 6%; + height: 100%; + flex-direction: column; border: 2rpx solid #DBDBDB; } .openVip22{ border-radius: 6%; + height: 100%; + flex-direction: column; border: 2rpx solid #d0a45c; background-color: #fefaf1; } @@ -86,4 +88,15 @@ font-size: 24rpx; padding: 10rpx 16rpx; color: var(--white); +} +.cu-checked{ + position: absolute; + right: -2rpx; + top: -2rpx; + width: 40rpx; + height: 40rpx; +} + +.foot-bg{ + background-image: linear-gradient(180deg, #2B292C 0%, #3C3A34 100%); } \ No newline at end of file