diff --git a/app.js b/app.js index 9ab2972..ade7531 100644 --- a/app.js +++ b/app.js @@ -1,7 +1,7 @@ //app.js App({ //----------------------------------------------globalData-------------------------------------- - evn: 2,//0:开发环境，1：测试环境，2：生产环境 + evn: 0,//0:开发环境，1：测试环境，2：生产环境 tmplIds: ['SUjEgwDopCv9xkkSZ4KbS0L7XbAiVQor6GmPg14K760'], agentMsgIds: ['kG8DErWDpyzBHCFaLlSKYMF7xVy8UpgogCwV_WSNt10', 'oLbv-IyJOia2tenh64_Lc8xeAzwgzu3gh1vFJ1Se-ME'], version: 152, diff --git a/app.json b/app.json index 2db4308..8e7ee48 100644 --- a/app.json +++ b/app.json @@ -31,6 +31,9 @@ "pages/article/price-detail/index", "pages/article/queue-detail/index", "pages/article/factory/index", + "pages/article/newInfo/index", + "pages/article/allNewInfo/index", + "pages/article/feedback/index", "pages/article/list/index", "pages/goods/ablility/index", "pages/goods/index/index", diff --git a/assets/info/factoryDown.png b/assets/info/factoryDown.png new file mode 100644 index 0000000..a56e96c Binary files /dev/null and b/assets/info/factoryDown.png differ diff --git a/assets/info/factoryUp.png b/assets/info/factoryUp.png new file mode 100644 index 0000000..4a03f7b Binary files /dev/null and b/assets/info/factoryUp.png differ diff --git a/assets/info/feedback-white.png b/assets/info/feedback-white.png new file mode 100644 index 0000000..4aa3603 Binary files /dev/null and b/assets/info/feedback-white.png differ diff --git a/assets/info/feedback.png b/assets/info/feedback.png new file mode 100644 index 0000000..967f1a1 Binary files /dev/null and b/assets/info/feedback.png differ diff --git a/assets/info/noData.png b/assets/info/noData.png new file mode 100644 index 0000000..cf61c71 Binary files /dev/null and b/assets/info/noData.png differ diff --git a/assets/info/px-jx.png b/assets/info/px-jx.png new file mode 100644 index 0000000..f4d1cf4 Binary files /dev/null and b/assets/info/px-jx.png differ diff --git a/assets/info/px-mr.png b/assets/info/px-mr.png new file mode 100644 index 0000000..da84510 Binary files /dev/null and b/assets/info/px-mr.png differ diff --git a/assets/info/px-sx.png b/assets/info/px-sx.png new file mode 100644 index 0000000..17ea22d Binary files /dev/null and b/assets/info/px-sx.png differ diff --git a/pages/api/ztb.js b/pages/api/ztb.js index a7db35e..8dab779 100644 --- a/pages/api/ztb.js +++ b/pages/api/ztb.js @@ -127,6 +127,9 @@ const updateUserInfo = (params) => mPost(`/recycle-service/user/update/user-info const updateUserInfoZtb = (params) => mPost(`/recycle-service/user/update/user-info`, params, zconfig) //用户关注，取消关注纸厂 const userPushFollowMill = (params) => mPost(`/recycle-service/user/push/follow-mill`, params, zconfig) +//用户在情报中获取纸厂 +const getPaperMillOfInformationList = (params) => mGet(`/recycle-service/get/paper-mill-of-information-list`, params, zconfig) + export { @@ -222,5 +225,6 @@ export { getLategoriesList, updateUserInfo, updateUserInfoZtb, - userPushFollowMill + userPushFollowMill, + getPaperMillOfInformationList } \ No newline at end of file diff --git a/pages/article/allNewInfo/index.js b/pages/article/allNewInfo/index.js new file mode 100644 index 0000000..3a76c55 --- /dev/null +++ b/pages/article/allNewInfo/index.js @@ -0,0 +1,63 @@ +const util = require('../../../utils/util') +const app = getApp() +import { + getPaperMillOfInformationList +} from "../../api/ztb" + +Page({ + + /** + * 页面的初始数据 + */ + data: { + height: app.globalData.safeFragmentHeight - 190, + safeBottom: app.globalData.safeBottom, + orderList: [], + tableSgin: null, + loading: false + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + StatusBar: app.globalData.StatusBar || 40, + CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 80), + }) + this.getPaperMillOfInformationListFct({ + queryWay: 1 + }) + + }, + toPage: function (e) { + if (e.currentTarget.id == 'toqb') { + util.navigateTo('/pages/article/index/index') + } + }, + changeTable: function (e) { + var a = e.currentTarget.id + if (e.currentTarget.id === this.data.tableSgin) { + this.setData({ + tableSgin: null + }) + } else { + this.setData({ + tableSgin: e.currentTarget.id + }) + } + }, + getPaperMillOfInformationListFct(model) { + this.setData({ + loading: true + }) + getPaperMillOfInformationList(model).then(res => { + this.setData({ + orderList: res.data + }) + this.setData({ + loading: false + }) + }) + }, +}) \ No newline at end of file diff --git a/pages/article/allNewInfo/index.json b/pages/article/allNewInfo/index.json new file mode 100644 index 0000000..ab34018 --- /dev/null +++ b/pages/article/allNewInfo/index.json @@ -0,0 +1,12 @@ +{ + "component": true, + "usingComponents": { + "wux-tabi": "/components/tabi/index", + "hot": "/pages/article/hot-index/index", + "price": "/pages/article/price-index/index", + "queue": "/pages/article/queue-index/index", + "point": "/pages/article/point-index/index", + "wux-accordion-group": "/components/accordion-group/index", + "wux-accordion": "/components/accordion/index" + } +} \ No newline at end of file diff --git a/pages/article/allNewInfo/index.wxml b/pages/article/allNewInfo/index.wxml new file mode 100644 index 0000000..33cd453 --- /dev/null +++ b/pages/article/allNewInfo/index.wxml @@ -0,0 +1,63 @@ + + + + 全部纸厂 + + + + 纸厂情报 + 2021-01-04 + + + 全部纸厂> + Icon + + + + + + 纸厂名称 + 价格涨跌 + 纸厂排队 + 最近扣点 + 更多 + + + + + + + + + + {{item.name}} + {{item.biggestFloatPrice||0}} + {{item.yesterdayRetainedQuantity || 0}}辆 + {{item.minimumDeductionPoint || 0}}% + + + + + 品类 + 价格 + 涨跌 + 最近扣点 + 操作 + + + {{cell.categoryName|| '---'}} + {{cell.unitPrice|| 0}} + {{cell.floatPrice|| 0}} + {{cell.curDeductionPoint|| 0}} + 我要代卖 + + + + + + + + diff --git a/pages/article/allNewInfo/index.wxss b/pages/article/allNewInfo/index.wxss new file mode 100644 index 0000000..adbec2e --- /dev/null +++ b/pages/article/allNewInfo/index.wxss @@ -0,0 +1,108 @@ +/* pages/main/index.wxss */ +page { + background-color: white; +} + +.booking-tool { + width: calc(100% - 20px); + background-color: #008AFF; + position: fixed; + left: 25px; +} + +.roder-add { + display: flex; + justify-content: center; + align-items: center; + width: 100rpx; + height: 100rpx; + background-color: #008AFF; + border-radius: 50rpx; + position: absolute; + top: 24px; + right: 24px; + box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); +} + +.boderLine { + width: 100%; + height: 50rpx; + background-color: #f3f3f3; +} + +.midTietle { + height: 100rpx; + width: 100%; + background-color: white; + display: flex; + justify-content: space-between; + padding: 0rpx 40rpx 0rpx 40rpx; +} + +.midTietleText1 { + height: 100rpx; + line-height: 100rpx; +} + +.zt { + padding: 0rpx 40rpx 0rpx 40rpx; + background-color: white; +} + +.topTitle { + display: flex; + justify-content: space-between; +} + +.topRight { + width: 50%; + height: 60rpx; +} + +.topLeft { + width: 50%; + height: 60rpx; + display: flex; + justify-content: space-between; +} + +.topLeftText { + font-family: PingFangSC-Medium; + font-size: 36rpx; + color: #FFFFFF; + letter-spacing: 0; + height: 60rpx; + line-height: 60rpx; + padding-left: 32rpx; +} + +.topLeftTime { + font-family: PingFangSC-Medium; + font-size: 28rpx; + color: #FFFFFF; + letter-spacing: 0; + height: 60rpx; + line-height: 60rpx; +} + +.topRightText { + font-family: PingFangSC-Medium; + font-size: 28rpx; + color: #FFFFFF; + letter-spacing: 0; + height: 60rpx; + line-height: 60rpx; + float: right; + margin-right: 38.5rpx; +} + +.topRightIcon { + font-family: PingFangSC-Medium; + font-size: 28rpx; + color: #FFFFFF; + letter-spacing: 0; + height: 60rpx; + line-height: 60rpx; + float: right; + margin-right: 36.3rpx; +} \ No newline at end of file diff --git a/pages/article/feedback/index.js b/pages/article/feedback/index.js new file mode 100644 index 0000000..a7bdcb1 --- /dev/null +++ b/pages/article/feedback/index.js @@ -0,0 +1,74 @@ +// pages/article/feedback/index.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + picker: ['喵喵喵', '汪汪汪', '哼唧哼唧'], + index: null, + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + PickerChange(e) { + console.log(e); + this.setData({ + index: e.detail.value + }) + }, +}) \ No newline at end of file diff --git a/pages/article/feedback/index.json b/pages/article/feedback/index.json new file mode 100644 index 0000000..db47fda --- /dev/null +++ b/pages/article/feedback/index.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "picker-view": "/components/picker-view/index" + } +} \ No newline at end of file diff --git a/pages/article/feedback/index.wxml b/pages/article/feedback/index.wxml new file mode 100644 index 0000000..33c5d7f --- /dev/null +++ b/pages/article/feedback/index.wxml @@ -0,0 +1,35 @@ + + + 反馈情报 + + + + + 反馈纸厂 + + + {{index?picker[index]:'禁止换行，超出容器部分会以 ... 方式截断'}} + + + + + + + 反馈类型 + + + {{index?picker[index]:'禁止换行，超出容器部分会以 ... 方式截断'}} + + + + + + + 反馈内容 + + + + + + + \ No newline at end of file diff --git a/pages/article/feedback/index.wxss b/pages/article/feedback/index.wxss new file mode 100644 index 0000000..459f438 --- /dev/null +++ b/pages/article/feedback/index.wxss @@ -0,0 +1,30 @@ +/* pages/article/feedback/index.wxss */ +page{ + background-color: white; +} +.zt{ + width: 100%; + padding: 0rpx 32rpx 0rpx 32rpx; +} +.view1{ + width: 100%; + height: 100rpx; + border-top: 2rpx solid #f3f3f3; +} +.view2{ + width: 100%; + height: 100rpx; + border-top: 2rpx solid #f3f3f3; +} +.view3{ + width: 100%; + height: 394rpx; + border-top: 2rpx solid #f3f3f3; +} +.textarea{ + height:306rpx; + +} +.textareaView{ + border: 2prx solid black; +} \ No newline at end of file diff --git a/pages/article/index/index.js b/pages/article/index/index.js index fe0579a..58666e3 100644 --- a/pages/article/index/index.js +++ b/pages/article/index/index.js @@ -18,6 +18,9 @@ Component({ tabIndex: 0 }, methods: { + onLoad:function(){ + this.onRestart() + }, onRestart: function () { var fragment = this.selectComponent('#fragment' + this.data.tabIndex) if (fragment) { diff --git a/pages/article/index/index.wxml b/pages/article/index/index.wxml index 9bd745e..c498d76 100644 --- a/pages/article/index/index.wxml +++ b/pages/article/index/index.wxml @@ -1,5 +1,5 @@ - + 情报 @@ -18,4 +18,4 @@ - \ No newline at end of file + diff --git a/pages/article/newInfo/index.js b/pages/article/newInfo/index.js new file mode 100644 index 0000000..4a0eb45 --- /dev/null +++ b/pages/article/newInfo/index.js @@ -0,0 +1,102 @@ +// pages/stock/index.js +const util = require('../../../utils/util') +const app = getApp() +import { + getPaperMillOfInformationList +} from "../../api/ztb" + +Component({ + options: { + addGlobalClass: true, + multipleSlots: true + }, + /** + * 页面的初始数据 + */ + data: { + height: app.globalData.safeFragmentHeight - 190, + safeBottom: app.globalData.safeBottom, + orderList: [], + tableSgin: null, + loading:false, + pximg:'/assets/info/px-mr.png' + + }, + methods: { + onRestart: function () { + this.setData({ + StatusBar: app.globalData.StatusBar || 40, + CustomBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 80), + }) + this.getPaperMillOfInformationListFct({ + queryWay: 0 + }) + }, + toPage: function (e) { + if (e.currentTarget.id == 'toqb') { + util.navigateTo('/pages/article/index/index') + } + if (e.currentTarget.id == 'toAllFactory') { + util.navigateTo('/pages/article/allNewInfo/index') + } + if(e.currentTarget.id == 'toAttentionFactory'){ + util.navigateTo('/pages/home/attentionPaperList/index') + } + if(e.currentTarget.id == 'tofeedback'){ + util.navigateTo('/pages/article/feedback/index') + } + + }, + changeTable: function (e) { + var a = e.currentTarget.id + if (e.currentTarget.id === this.data.tableSgin) { + this.setData({ + tableSgin: null + }) + } else { + this.setData({ + tableSgin: e.currentTarget.id + }) + } + }, + getPaperMillOfInformationListFct:function(model) { + this.setData({ + loading:true + }) + getPaperMillOfInformationList(model).then(res => { + this.setData({ + orderList: res.data + }) + this.setData({ + loading:false + }) + }) + }, + changeSort:function(){ + if(this.data.pximg=='/assets/info/px-mr.png'){ + this.setData({ + pximg:'/assets/info/px-sx.png' + }) + this.getPaperMillOfInformationListFct({queryWay: 0,priceSort:1}) + return + } + if(this.data.pximg=='/assets/info/px-sx.png'){ + this.setData({ + pximg:'/assets/info/px-jx.png' + }) + this.getPaperMillOfInformationListFct({queryWay: 0,priceSort:0}) + return + } + if(this.data.pximg=='/assets/info/px-jx.png'){ + this.setData({ + pximg:'/assets/info/px-mr.png' + }) + this.getPaperMillOfInformationListFct({queryWay: 0}) + return + } + } + + }, + + +}) \ No newline at end of file diff --git a/pages/article/newInfo/index.json b/pages/article/newInfo/index.json new file mode 100644 index 0000000..ab34018 --- /dev/null +++ b/pages/article/newInfo/index.json @@ -0,0 +1,12 @@ +{ + "component": true, + "usingComponents": { + "wux-tabi": "/components/tabi/index", + "hot": "/pages/article/hot-index/index", + "price": "/pages/article/price-index/index", + "queue": "/pages/article/queue-index/index", + "point": "/pages/article/point-index/index", + "wux-accordion-group": "/components/accordion-group/index", + "wux-accordion": "/components/accordion/index" + } +} \ No newline at end of file diff --git a/pages/article/newInfo/index.wxml b/pages/article/newInfo/index.wxml new file mode 100644 index 0000000..39d312f --- /dev/null +++ b/pages/article/newInfo/index.wxml @@ -0,0 +1,119 @@ + + + + + + + 情报 + + + + + + 纸厂情报 + 2021-01-04 + + + 全部纸厂> + + + + + + + + + + 纸厂名称 + 价格涨跌 + + 纸厂排队 + 最近扣点 + 更多 + + + + + + + + + + {{item.name}} + {{item.biggestFloatPrice||0}} % + {{item.yesterdayRetainedQuantity || 0}}辆 + {{item.minimumDeductionPoint || 0}}% + + + + + + + + + + + 品类 + 价格 + 涨跌 + 最近扣点 + 操作 + + + {{cell.categoryName|| '---'}} + {{cell.unitPrice|| 0}} + {{cell.floatPrice|| 0}} + {{cell.curDeductionPoint|| 0}} + + 代卖 + + + + + + + + + + 行业情报 + 更多资讯> + + + + + + + 玖龙扣点加重或引发涨价潮，玖龙扣点。 + + 纸通宝情报中心 + 2021-02-04 10:13 + + + + + + + 玖龙扣点加重或引发涨价潮，玖龙扣点。 + + 纸通宝情报中心 + 2021-02-04 10:13 + + + + + + + #东莞玖龙玖龙扣点加重或引发涨价潮，玖龙扣点。 + + 纸通宝情报中心 + 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 new file mode 100644 index 0000000..fdb3b57 --- /dev/null +++ b/pages/article/newInfo/index.wxss @@ -0,0 +1,201 @@ +/* pages/main/index.wxss */ +page { + background-color: white; +} + +.booking-tool { + width: calc(100% - 20px); + background-color: #008AFF; + position: fixed; + left: 25px; +} + +.roder-add { + display: flex; + justify-content: center; + align-items: center; + width: 100rpx; + height: 100rpx; + background-color: #008AFF; + border-radius: 50rpx; + position: absolute; + top: 24px; + right: 24px; + box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16); +} + +.boderLine { + width: 100%; + height: 50rpx; + background-color: #f3f3f3; +} + +.midTietle { + height: 100rpx; + width: 100%; + background-color: white; + display: flex; + justify-content: space-between; + padding: 0rpx 40rpx 0rpx 40rpx; +} + +.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 { + background-color: white; +} + +.topTitle { + display: flex; + justify-content: space-between; +} + +.topRight { + width: 50%; + height: 60rpx; +} + +.topLeft { + width: 50%; + height: 60rpx; + display: flex; + justify-content: space-between; +} + +.topLeftText { + font-family: PingFangSC-Medium; + font-size: 36rpx; + color: #FFFFFF; + letter-spacing: 0; + height: 60rpx; + line-height: 60rpx; + padding-left: 32rpx; +} + +.topLeftTime { + font-family: PingFangSC-Medium; + font-size: 28rpx; + color: #FFFFFF; + letter-spacing: 0; + height: 60rpx; + line-height: 60rpx; +} + +.topRightText { + font-family: PingFangSC-Medium; + font-size: 28rpx; + color: #FFFFFF; + letter-spacing: 0; + height: 60rpx; + line-height: 60rpx; + float: right; + margin-right: 38.5rpx; +} + +.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: 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; + 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; +} + +.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; +} \ No newline at end of file diff --git a/pages/goods/create/index.js b/pages/goods/create/index.js index 6b1688d..9be1053 100644 --- a/pages/goods/create/index.js +++ b/pages/goods/create/index.js @@ -126,6 +126,7 @@ Page({ this.data.dopantList.forEach(element => { if (Number(element.value) == Number(result.data.dopantRate)) { this.data.dopantName = element.text + debugger } }) } diff --git a/pages/index/index.js b/pages/index/index.js index c9b92b3..36c7484 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -242,7 +242,7 @@ Page({ } // wx.navigateTo({ url: '/pages/home/tab1/index' }) var a=storage.get('isTokenHaveStatus') - if(a==true){ + if(a==true && app.globalData.token){ getBaseInfo().then(result => { this.setData({ hasShowedLoginTag: result.data.hasShowedLoginTag diff --git a/pages/index/index.json b/pages/index/index.json index 4a41061..4315329 100644 --- a/pages/index/index.json +++ b/pages/index/index.json @@ -1,7 +1,7 @@ { "usingComponents": { "mall": "/pages/mall/index/index", - "article": "/pages/article/index/index", + "article": "/pages/article/newInfo/index", "home": "/pages/home/index/index", "wux-image": "/components/image/index", "wux-popup": "/components/popup/index" diff --git a/utils/util.js b/utils/util.js index 2075caa..a38bbee 100644 --- a/utils/util.js +++ b/utils/util.js @@ -186,7 +186,10 @@ const tokenList = [ '/pages/agent/order/index', '/pages/home/idcard/index', '/pages/shop/detail/index', - '/pages/article/publish/index' + '/pages/article/publish/index', + '/pages/home/attentionPaperList/index', + '/pages/article/feedback/index' + ] function navigateTo(url){