From 5d3914bb8085b35d3708905b1d85f5432b8994eb Mon Sep 17 00:00:00 2001 From: huziyuan Date: Fri, 5 Feb 2021 21:29:43 +0800 Subject: [PATCH] 202125 --- app.js | 2 +- app.json | 3 + assets/info/factoryDown.png | Bin 0 -> 456 bytes assets/info/factoryUp.png | Bin 0 -> 445 bytes assets/info/feedback-white.png | Bin 0 -> 452 bytes assets/info/feedback.png | Bin 0 -> 437 bytes assets/info/noData.png | Bin 0 -> 11947 bytes assets/info/px-jx.png | Bin 0 -> 319 bytes assets/info/px-mr.png | Bin 0 -> 266 bytes assets/info/px-sx.png | Bin 0 -> 331 bytes pages/api/ztb.js | 6 +- pages/article/allNewInfo/index.js | 63 +++++++++ pages/article/allNewInfo/index.json | 12 ++ pages/article/allNewInfo/index.wxml | 63 +++++++++ pages/article/allNewInfo/index.wxss | 108 +++++++++++++++ pages/article/feedback/index.js | 74 ++++++++++ pages/article/feedback/index.json | 5 + pages/article/feedback/index.wxml | 35 +++++ pages/article/feedback/index.wxss | 30 +++++ pages/article/index/index.js | 3 + pages/article/index/index.wxml | 4 +- pages/article/newInfo/index.js | 102 ++++++++++++++ pages/article/newInfo/index.json | 12 ++ pages/article/newInfo/index.wxml | 119 ++++++++++++++++ pages/article/newInfo/index.wxss | 201 ++++++++++++++++++++++++++++ pages/goods/create/index.js | 1 + pages/index/index.js | 2 +- pages/index/index.json | 2 +- utils/util.js | 5 +- 29 files changed, 845 insertions(+), 7 deletions(-) create mode 100644 assets/info/factoryDown.png create mode 100644 assets/info/factoryUp.png create mode 100644 assets/info/feedback-white.png create mode 100644 assets/info/feedback.png create mode 100644 assets/info/noData.png create mode 100644 assets/info/px-jx.png create mode 100644 assets/info/px-mr.png create mode 100644 assets/info/px-sx.png create mode 100644 pages/article/allNewInfo/index.js create mode 100644 pages/article/allNewInfo/index.json create mode 100644 pages/article/allNewInfo/index.wxml create mode 100644 pages/article/allNewInfo/index.wxss create mode 100644 pages/article/feedback/index.js create mode 100644 pages/article/feedback/index.json create mode 100644 pages/article/feedback/index.wxml create mode 100644 pages/article/feedback/index.wxss create mode 100644 pages/article/newInfo/index.js create mode 100644 pages/article/newInfo/index.json create mode 100644 pages/article/newInfo/index.wxml create mode 100644 pages/article/newInfo/index.wxss 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 0000000000000000000000000000000000000000..a56e96cce0f63799aecc8a519f4cdd21c53f6beb GIT binary patch literal 456 zcmeAS@N?(olHy`uVBq!ia0vp^G9b*s1|*Ak?@s|zjKx9jP7LeL$-D$|Tv8)E(|mmy zw18|52FCVG1{RPKAeI7R1_tH@j10^`nh_+nfC(-uvw#`F1}RM0`(+VOnUSZ9V~7Xu z+bPlhOojrj;S&@jm@<+&{{IhO+0n?(F{?sxLB-+Exwm{bztk&j6u&fi&RjohWA(YY zvsDB)GH+zw$v4NM&i8TSjk0Io3}aTF@cFa!hNgV8_RZ|qZ!Ufd;Wl&;E=#?*p_%!{ znr+$^(=U8yJhH;`tw^c$gujB~kCwjp7rk?;qjvt$^5}!2Det_WsKChM7!gh2Nox(r54_1IawU}Wz4|6l#*sctEzqQHkWvs800$F@fwa#pu|Syq46Irq z-H*Kb@A41#9=cuU^^h+!FlCB(s7uB2CGC5TFx5N1-`7&8qt^ey?O^{#mc{+AjYRDZ z|Bz5TSj(7MX4saaRAJvXVZz3Gu^nu?rP%k0{h0T8%?$4o8T&cb>382QYn|e^bMbwV zLhD42AH{EOukd^uU(6{!^E1QiUE6M73~-TIurJ+-t^L-?Nlc!NJD9ZB_RIL#S9pE` O1)Zm>pUXO@geCwKaiwSg literal 0 HcmV?d00001 diff --git a/assets/info/feedback-white.png b/assets/info/feedback-white.png new file mode 100644 index 0000000000000000000000000000000000000000..4aa3603684479c43584a1732f15c06bc16390753 GIT binary patch literal 452 zcmeAS@N?(olHy`uVBq!ia0vp^8X(NU3?z3ec*Fy#>Hwb*S0Md=fWX-%w+|pUl?3?( zGt}3x2fR1YJieQ6zu@G;&*dJkp0_XVP8Yv(`_f!RwlABP7ew0Y@o;2?m)QdKT<~;p z46!(U_u@&uCIgYyhrzC|FRW5H(X;v6-}x72FJm;nQM=Gx}l zN0a$xJ==9Fzqi!E=FtU-*~LDY3z|=fy}rEj;>&k!{Gz@y7JaurJnehH=Ya14)8=Ta hw(WYEAzQahoco3GhQkGZ2|&Lwc)I$ztaD0e0swqf1b+Yk literal 0 HcmV?d00001 diff --git a/assets/info/feedback.png b/assets/info/feedback.png new file mode 100644 index 0000000000000000000000000000000000000000..967f1a1cb414c7fa4b44b3cd13fa6328a68c4620 GIT binary patch literal 437 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjR8I(u0R?H{{R0EBy)3f!8|Ad z6a<3bzkdVC{QUf*M~?y-Q>RX?si^@n;41(A{R?DIo;>-@n>TR5XV0FQo0|i<$;rvZ z#l@R9Z+`ILfq;O3sHiAJ4bX({?rtD?hvl3SP)NHZ$S;^7ts!y~Qy?!_pjv*GO_g*|HbVxzK^LO8i*F{bwB-}6(@I~^8_fLrUWl;k^kq5LkM}RV rbs~E89sNI|@51iwD0%*gt^O5fz9_H8!f6IaL80O4>gTe~DWM4fx%RZY literal 0 HcmV?d00001 diff --git a/assets/info/noData.png b/assets/info/noData.png new file mode 100644 index 0000000000000000000000000000000000000000..cf61c7185bd1999f5dadede0b472e290f6d73037 GIT binary patch literal 11947 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 At^fc4 literal 0 HcmV?d00001 diff --git a/assets/info/px-sx.png b/assets/info/px-sx.png new file mode 100644 index 0000000000000000000000000000000000000000..17ea22d76dc3c8f6ccddee6d820275b5d2b5795b GIT binary patch literal 331 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM3?#3wJbMaAH)d`HOzn{h^wRr6agy(Nqtw={jQ?-T}dCR9ZBz3WnG})4-NfqDqs_|9sX;F0yP@? z&V2@yP%a7b3uZ_Qx@aZEWp}SnRhaqviQ_w0u9#7k7#$hl;bLZNpe7^6!^WSRyA-HA z+tbA{MC1I~i{?TN20Si-ryG3FSvJ3`cP}`-=D2QF-N!Cnm6+viN0;dK@w2G-+MLVh zE=Xp6XAm-Ht-zmIhgl9iEo5gTe~DWM4fptopH literal 0 HcmV?d00001 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){