diff --git a/app.json b/app.json index 8e7ee48..06a2002 100644 --- a/app.json +++ b/app.json @@ -35,6 +35,7 @@ "pages/article/allNewInfo/index", "pages/article/feedback/index", "pages/article/list/index", + "pages/article/attentionPaperFactory/index", "pages/goods/ablility/index", "pages/goods/index/index", "pages/goods/detail/index", diff --git a/assets/info/addgzicon.png b/assets/info/addgzicon.png new file mode 100644 index 0000000..33c5665 Binary files /dev/null and b/assets/info/addgzicon.png differ diff --git a/pages/article/allNewInfo/index.js b/pages/article/allNewInfo/index.js index 3a76c55..05502c2 100644 --- a/pages/article/allNewInfo/index.js +++ b/pages/article/allNewInfo/index.js @@ -34,6 +34,9 @@ Page({ if (e.currentTarget.id == 'toqb') { util.navigateTo('/pages/article/index/index') } + if(e.currentTarget.id == 'toAttentionPaperFctory'){ + util.navigateTo('/pages/article/attentionPaperFactory/index') + } }, changeTable: function (e) { var a = e.currentTarget.id diff --git a/pages/article/allNewInfo/index.wxml b/pages/article/allNewInfo/index.wxml index 33cd453..0167d85 100644 --- a/pages/article/allNewInfo/index.wxml +++ b/pages/article/allNewInfo/index.wxml @@ -3,43 +3,42 @@ 全部纸厂 - - - 纸厂情报 - 2021-01-04 - - - 全部纸厂> - Icon - - - - 纸厂名称 - 价格涨跌 + + 纸厂名称 + 价格涨跌 + 纸厂排队 最近扣点 更多 - - + + - - + + - {{item.name}} - {{item.biggestFloatPrice||0}} + {{item.name}} + {{item.biggestFloatPrice*1000||0}} {{item.yesterdayRetainedQuantity || 0}}辆 {{item.minimumDeductionPoint || 0}}% - + + + + + + - + + 品类 价格 @@ -47,17 +46,21 @@ 最近扣点 操作 - + {{cell.categoryName|| '---'}} - {{cell.unitPrice|| 0}} - {{cell.floatPrice|| 0}} + {{cell.unitPrice*1000|| 0}} + {{cell.floatPrice*1000|| 0}} {{cell.curDeductionPoint|| 0}} - 我要代卖 + + 代卖 + - - - + + + 关注纸厂 + + \ No newline at end of file diff --git a/pages/article/allNewInfo/index.wxss b/pages/article/allNewInfo/index.wxss index adbec2e..fdd85b3 100644 --- a/pages/article/allNewInfo/index.wxss +++ b/pages/article/allNewInfo/index.wxss @@ -42,10 +42,24 @@ page { .midTietleText1 { height: 100rpx; line-height: 100rpx; + font-family: PingFangSC-Medium; + font-size: 36rpx; + color: rgba(0, 0, 0, 0.85); + letter-spacing: 0; + text-align: left; +} + +.midTietleText2 { + height: 100rpx; + line-height: 100rpx; + font-family: PingFangSC-Regular; + font-size: 28rpx; + color: rgba(0, 0, 0, 0.65); + letter-spacing: 0; + text-align: right; } .zt { - padding: 0rpx 40rpx 0rpx 40rpx; background-color: white; } @@ -97,12 +111,144 @@ page { } .topRightIcon { + height: 60rpx; + float: right; + display: flex; + align-items: center; + margin-right: 36.3rpx; +} + +.onDataImg { + width: 320rpx; + height: 249rpx; +} + +.img-nodata { + width: 100%; + height: 548rpx; + display: flex; + flex-direction: column; + align-items: center; + margin-top: 30rpx; +} + +.top-nodata-text1 { font-family: PingFangSC-Medium; - font-size: 28rpx; + font-size: 30rpx; + color: rgba(0, 0, 0, 0.75); + letter-spacing: 0; + text-align: left; + margin-top: 16rpx; +} + +.top-nodata-text2 { + width: 480rpx; + height: 88rpx; + background: #007AFF; + border-radius: 10rpx; + border-radius: 10rpx; + font-family: PingFangSC-Medium; + font-size: 36rpx; color: #FFFFFF; letter-spacing: 0; - height: 60rpx; - line-height: 60rpx; + text-align: left; + line-height: 88rpx; + text-align: center; + margin-top: 41rpx; +} + +.bottomView { + width: 750rpx; + height: 228rpx; + + padding: 24rpx 32rpx 24rpx 32rpx +} + +.bottomViewleft { + width: 423rpx; + height: 180rpx; + + float: left; +} + +.bottomViewRight { + width: 240rpx; + height: 180rpx; + background-color: green; float: right; - margin-right: 36.3rpx; +} + +.tableStyle { + width: 100%; + line-height: 100rpx; + font-size: 34rpx; + color: rgba(0, 0, 0, 0.85); + letter-spacing: 0; +} + +.son-table-btn { + width: 120rpx; + height: 56rpx; + line-height: 56rpx; + font-size: 26rpx; + color: #007AFF; + letter-spacing: 0; + text-align: left; + background: #FFFFFF; + border: 1rpx solid #007AFF; + border-radius: 28rpx; + border-radius: 28rpx; + text-align: center; +} + +.bottomViewleft-top { + width: 100%; + height: 90rpx; + +} + +.bottomViewleft-bottem { + width: 100%; + height: 33rpx; + + margin-top: 57rpx; +} + +.bottomViewRightImg { + width: 240rpx; + height: 180rpx; +} + +.gzBtn { + width: 255rpx; + height: 96rpx; + background: #F4F4F4; + border: 1rpx solid #F4F4F4; + box-shadow: 0 5rpx 10rpx 0 rgba(0, 0, 0, 0.10); + border-radius: 48rpx; + border-radius: 48rpx; + position: absolute; + right: 32rpx; + bottom: 233rpx; + display: flex; + align-items: center; + justify-content: space-between; +} + +.gzBtnIcon { + height: 96rpx; + display: flex; + align-items: center; + margin-left: 35rpx; +} + +.gzBtnText { + height: 96rpx; + display: flex; + align-items: center; + font-family: PingFangSC-Semibold; + font-size: 30rpx; + color: rgba(0, 0, 0, 0.60); + letter-spacing: 2px; + margin-right: 35rpx; } \ No newline at end of file diff --git a/pages/article/attentionPaperFactory/index.js b/pages/article/attentionPaperFactory/index.js new file mode 100644 index 0000000..b2e6d1f --- /dev/null +++ b/pages/article/attentionPaperFactory/index.js @@ -0,0 +1,129 @@ +// pages/home/tab4/index.js +import { + getFactoryPrice, + userPushFollowMill +} from '../../api/ztb' +const event = require('../../../utils/event.js') +const storage = require('../../../utils/storage') +const app = getApp() +Page({ + + /** + * 页面的初始数据 + */ + data: { + loopRequesting:false, + form: { + paperMillIds: [], + + }, + model: { + paperMillIds: [], + cityId: '', + enableSalesAgent: 1, + pageNum: 1, + listType: 0, + pageSize:1000 + }, + categoryListone: [], + safeBottom: app.globalData.safeBottom, + userInfo: null, + loading:true + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ safeBottom: app.globalData.safeBottom, userInfo: app.globalData.userInfo }) + this.getFactoryPriceFct(this.data.model) + }, + toMyInfo: function () { + event.emit('attentionPaperList', { what: 1100, desc: 'attentionPaperList' }) + wx.navigateBack({ + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + backspace: function () { + // console.log('点击返回被触发4') + wx.redirectTo({ + url: '/pages/home/tab3/index' + }) + + }, + getFactoryPriceFct:function(model){ + getFactoryPrice(model).then(res=>{ + this.setData({ + categoryListone:res.data.records, + loading:false + }) + }) + }, + checkboxChange: function (e) { + console.log(e) + this.setData({ + 'form.paperMillIds':e.detail.value, + 'form.follow':true + }) + }, + bindtap: function (e) { + console.log(e) + }, + submitForm:function(){ + userPushFollowMill(this.data.form).then(result => { + this.data.loopRequesting = false + setTimeout(() => this.toMyInfo(), 1000) + }).catch(err => { + this.data.loopRequesting = false + }) + } +}) \ No newline at end of file diff --git a/pages/article/attentionPaperFactory/index.json b/pages/article/attentionPaperFactory/index.json new file mode 100644 index 0000000..51ec566 --- /dev/null +++ b/pages/article/attentionPaperFactory/index.json @@ -0,0 +1,7 @@ +{ + "usingComponents": { + "wux-cascader": "/components/cascader/index", + "wux-accordion-group": "/components/accordion-group/index", + "wux-accordion": "/components/accordion/index" + } +} \ No newline at end of file diff --git a/pages/article/attentionPaperFactory/index.wxml b/pages/article/attentionPaperFactory/index.wxml new file mode 100644 index 0000000..69cbae0 --- /dev/null +++ b/pages/article/attentionPaperFactory/index.wxml @@ -0,0 +1,38 @@ + + + 关注纸厂 + + + + + + HI,\n欢迎使用纸通宝\n开启一站式废纸交易 + + + + + + + 你经常卖的纸厂是？ + + + + + + + + {{item.name}} + + + + + + + + + \ No newline at end of file diff --git a/pages/article/attentionPaperFactory/index.wxss b/pages/article/attentionPaperFactory/index.wxss new file mode 100644 index 0000000..9277633 --- /dev/null +++ b/pages/article/attentionPaperFactory/index.wxss @@ -0,0 +1,77 @@ +/* pages/home/attentionPaperList/index.wxss */ +page{ + background-color: white; +} +.bj { + background-color: white; + min-height: 900rpx; +} + +.vip-btn { + /* height: 90rpx; */ + width: 180rpx; + background: #F5F5F5; + float: right; + color: rgba(0, 0, 0, 0.45); + font-size: 28rpx; +} + +.top { + height: 258rpx; + width: 100%; +} + +.topText { + width: 440rpx; + height: 258rpx; + float: left; + padding-left: 48rpx; + padding-top: 60rpx; + font-size: 44rpx; + color: #000000; + font-family: PingFangSC-Medium; +} + +.mid { + height: 150rpx; + padding-top: 100rpx; + padding-left: 48rpx; + font-family: PingFangSC-Medium; + font-size: 36rpx; + color: #000000; + letter-spacing: 2px; +} + +.bottom { + height: 410rpx; + padding: 48rpx; +} + +.bg-blue{ + color: #FFFFFF; + background-color: #008AFF; +} + +.page-btn { + height: 90rpx; + width: 100%; + background: linear-gradient(312deg, rgba(38, 125, 214, 1) 0%, rgba(0, 138, 255, 1) 100%); + box-shadow: 0px 10px 13px -8px rgba(35, 126, 217, 0.53); + color: white; + font-size: 32rpx; +} +.interestthreecheckbox .wx-checkbox-input { + border-radius: 50%; + width: 40rpx; + height: 40rpx; +} +.interestthreecheckbox .wx-checkbox-input.wx-checkbox-input-checked{ + background: white; + border: 1px solid #007AFF; +} +.interestthreecheckbox .wx-checkbox-input.wx-checkbox-input-checked::before{ + width: 40rpx;/* 选中后对勾大小 */ + height: 40rpx;/* 选中后对勾大小 */ + font-size:40rpx; /* 对勾大小30rpx */ + color:#007AFF; /* 对勾颜色 白色 */ +} \ No newline at end of file diff --git a/pages/article/feedback/index.wxss b/pages/article/feedback/index.wxss index 459f438..8367264 100644 --- a/pages/article/feedback/index.wxss +++ b/pages/article/feedback/index.wxss @@ -26,5 +26,5 @@ page{ } .textareaView{ - border: 2prx solid black; + border: 1px solid; } \ No newline at end of file diff --git a/pages/article/index/index.wxml b/pages/article/index/index.wxml index c498d76..65e3279 100644 --- a/pages/article/index/index.wxml +++ b/pages/article/index/index.wxml @@ -1,6 +1,6 @@ - 情报 + 全部资讯 diff --git a/pages/article/newInfo/index.js b/pages/article/newInfo/index.js index 4a0eb45..93cac0a 100644 --- a/pages/article/newInfo/index.js +++ b/pages/article/newInfo/index.js @@ -2,9 +2,9 @@ const util = require('../../../utils/util') const app = getApp() import { - getPaperMillOfInformationList + getPaperMillOfInformationList, } from "../../api/ztb" - +import { getPreferList } from "../../api/moment" Component({ options: { addGlobalClass: true, @@ -19,7 +19,14 @@ Component({ orderList: [], tableSgin: null, loading:false, - pximg:'/assets/info/px-mr.png' + pximg:'/assets/info/px-mr.png', + curDate: '2018-12-25', + querFrom:{ + curDate: '2018-12-25', + queryWay: 0, + priceSort:0 + }, + factoryList:[] }, methods: { @@ -28,9 +35,9 @@ Component({ StatusBar: app.globalData.StatusBar || 40, CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 80), }) - this.getPaperMillOfInformationListFct({ - queryWay: 0 - }) + this.data.querFrom.queryWay=0 + this.getPaperMillOfInformationListFct(this.data.querFrom) + this.fetchMomentList() }, toPage: function (e) { if (e.currentTarget.id == 'toqb') { @@ -44,8 +51,11 @@ Component({ } if(e.currentTarget.id == 'tofeedback'){ util.navigateTo('/pages/article/feedback/index') - } - + } + }, + toPageDetails:function(e){ + util.navigateTo('/pages/article/detail/index?id='+e.currentTarget.id) + }, changeTable: function (e) { var a = e.currentTarget.id @@ -77,26 +87,42 @@ Component({ this.setData({ pximg:'/assets/info/px-sx.png' }) - this.getPaperMillOfInformationListFct({queryWay: 0,priceSort:1}) + this.data.querFrom.priceSort=1 + this.getPaperMillOfInformationListFct(this.data.querFrom) return } if(this.data.pximg=='/assets/info/px-sx.png'){ this.setData({ pximg:'/assets/info/px-jx.png' }) - this.getPaperMillOfInformationListFct({queryWay: 0,priceSort:0}) + this.data.querFrom.priceSort=0 + this.getPaperMillOfInformationListFct(this.data.querFrom) return } if(this.data.pximg=='/assets/info/px-jx.png'){ this.setData({ pximg:'/assets/info/px-mr.png' }) - this.getPaperMillOfInformationListFct({queryWay: 0}) + this.data.querFrom.priceSort=0 + this.getPaperMillOfInformationListFct(this.data.querFrom) return } + }, + curDateChange(e) { + this.setData({ + curDate: e.detail.value + }) + this.data.querFrom.curDate=e.detail.value + this.getPaperMillOfInformationListFct(this.data.querFrom) + }, + fetchMomentList: function(){ + getPreferList().then(result => { + this.setData({ factoryList: result.data.records.slice(0, 3) }) + }) + }, + toMill(e){ + util.navigateTo('/pages/agent/factory/index?id=' + e.currentTarget.id) } - - }, - + } }) \ No newline at end of file diff --git a/pages/article/newInfo/index.wxml b/pages/article/newInfo/index.wxml index 39d312f..0a65884 100644 --- a/pages/article/newInfo/index.wxml +++ b/pages/article/newInfo/index.wxml @@ -11,7 +11,13 @@ 纸厂情报 - 2021-01-04 + + + + {{curDate}} + + + 全部纸厂> @@ -45,7 +51,7 @@ {{item.name}} - {{item.biggestFloatPrice||0}} % + {{item.biggestFloatPrice*1000||0}} {{item.yesterdayRetainedQuantity || 0}}辆 {{item.minimumDeductionPoint || 0}}% @@ -66,8 +72,8 @@ {{cell.categoryName|| '---'}} - {{cell.unitPrice|| 0}} - {{cell.floatPrice|| 0}} + {{cell.unitPrice*1000|| 0}} + {{cell.floatPrice*1000|| 0}} {{cell.curDeductionPoint|| 0}} 代卖 @@ -86,34 +92,24 @@ - + - 玖龙扣点加重或引发涨价潮，玖龙扣点。 - - 纸通宝情报中心 - 2021-02-04 10:13 + + + + # + {{item.millPaperName}} + + {{item.title}} + - - - - - - 玖龙扣点加重或引发涨价潮，玖龙扣点。 - 纸通宝情报中心 - 2021-02-04 10:13 + {{item.creatorName}} + {{item.updateTime}} - - - - - #东莞玖龙玖龙扣点加重或引发涨价潮，玖龙扣点。 - - 纸通宝情报中心 - 2021-02-04 10:13 - + + - - \ No newline at end of file + diff --git a/pages/article/newInfo/index.wxss b/pages/article/newInfo/index.wxss index fdb3b57..c821134 100644 --- a/pages/article/newInfo/index.wxss +++ b/pages/article/newInfo/index.wxss @@ -198,4 +198,8 @@ page { height: 33rpx; margin-top: 57rpx; +} +.bottomViewRightImg{ + width: 240rpx; + height: 180rpx; } \ No newline at end of file