From 0af3c8945685d47e94244a2c253b20bd5a85c987 Mon Sep 17 00:00:00 2001 From: xpz2018 <107107461@qq.com> Date: Tue, 11 May 2021 11:14:02 +0800 Subject: [PATCH] no message --- assets/image/message_black.png | Bin 592 -> 0 bytes assets/image/message_blue.png | Bin 576 -> 0 bytes assets/image/prase_black.png | Bin 579 -> 0 bytes assets/image/prase_blue.png | Bin 450 -> 0 bytes assets/info/feedback-white.png | Bin 452 -> 0 bytes assets/info/feedback.png | Bin 437 -> 0 bytes assets/tabbar/message-blue.png | Bin 1321 -> 0 bytes assets/tabbar/message-gray.png | Bin 2188 -> 0 bytes pages/agent/factory-detail/index.js | 21 --------- pages/agent/factory-detail/index.json | 1 - pages/agent/factory-detail/index.wxml | 21 +-------- pages/moment/article-item/index.js | 42 ------------------ pages/moment/article-item/index.json | 9 ---- pages/moment/article-item/index.wxml | 41 ------------------ pages/moment/article-item/index.wxss | 9 ---- pages/process/index/index.wxml | 2 +- pages/process/outside-list/index.js | 59 ++++++++++++-------------- 17 files changed, 30 insertions(+), 175 deletions(-) delete mode 100644 assets/image/message_black.png delete mode 100644 assets/image/message_blue.png delete mode 100644 assets/image/prase_black.png delete mode 100644 assets/image/prase_blue.png delete mode 100644 assets/info/feedback-white.png delete mode 100644 assets/info/feedback.png delete mode 100644 assets/tabbar/message-blue.png delete mode 100644 assets/tabbar/message-gray.png delete mode 100644 pages/moment/article-item/index.js delete mode 100644 pages/moment/article-item/index.json delete mode 100644 pages/moment/article-item/index.wxml delete mode 100644 pages/moment/article-item/index.wxss diff --git a/assets/image/message_black.png b/assets/image/message_black.png deleted file mode 100644 index 8ea351b4a4d16c8fb048f455ea412b5551bfe853..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 592 zcmeAS@N?(olHy`uVBq!ia0vp^T0pGC!3-qj{C2YdDVB6cUq=Rpjs4tz5?O(K#^NA% zCx&(BWL^R}E~ycoX}-Q-T^tOI?U@W9EsQ`c1;h*t%nKM9KxQ$5#1=5YWwjPC!`Vt8 zg-^2HodQy>0X`wFKADBfmMsej3Gw&$cXxO9@bCbV5QdkR7my1Pfw19H5J9jcNd4h6 zvJpT7#Y%$wf*F`N1gCu7@Huv0MnG(pjo5e~|+U59) z+ksr)`A@j^y}HYG_;kJSo4A;!{mRbk_Wa`4|DOF!&`&Sx;%1w58Mb0Pk-uF0JWgHC zUVCM6%S#R=qg}s`S*Vy_RZjSrZ>z%Q>0o(6MfPVFpW?DV()KPye2AMA?}w=Eak-ak_Vk z=b{z`9+$&BT^i@^{9hy=c;Q`s_C2lcLoHsM2SoMQedijvS+1JicbI=iuIG=2E#LfN zziQnHFu%IJXs2kN#(zZ-6B~!4E8m1vEP1zS(!>u;iSFg1aeIRDA$ zoqSCu$05lvd8yQ=r9R3x_e@_r<#F6uA2YRho-3AS1>5EOm!!R`%4NM-7shfn%=D?i z>D+^|S7n4%F7LFur8`OA<=Bz4PgmzgcFgnX%j8=(vm{dWu65#zg+?BkKG!>fFX=|G zs7{?NEoPp%=y=Z82UlBP{yF}4Gw;JzZi8aW)78&qol`;+0OwoX AtN;K2 diff --git a/assets/image/prase_black.png b/assets/image/prase_black.png deleted file mode 100644 index 7effcf7f3a1493cde5a81ea7a2c21b9b5ca9ee9d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 579 zcmeAS@N?(olHy`uVBq!ia0vp^8bGYY!3-q7y?7Y{q*&4&eH|GXHuiJ>Nn{1`8HYNls^q*H)Th^tR#p)o2jH8lkaSXfvRczyK%$k%e%9Bv2%P>2f{L zG|`eEzhH)!*MGjR@p-DeWQPbxTu83Tv7YJnZv?%)fv(c?ba4!^INdv?x35Kkr^PiO zpy25I%KzberxjJtKFc|GhRLJ!#Fp$3%nnFOIy_HEfPQJM`Xyf$&Xp~M9HWY zeO&KxUZylW*Pr-yT{|`IhoqQXPkHMo1>lS@b2mwrj@^UbKR+&DD@#}c80^Nw2;PmyH_$C zJ;Y@&-JdH!XAOusL27cSf~4k32g?Vw23^;GCx~7De(;ejZw1#ycH3wt#=NhaUNznf zTfn)j;8vCB#wmGhZIs;&{C{ z&T+>AgXRkw9PR>g`fm=tFxWB2@9LfRc~|a#sCc6K*2=gz>ZHit{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 diff --git a/assets/info/feedback.png b/assets/info/feedback.png deleted file mode 100644 index 967f1a1cb414c7fa4b44b3cd13fa6328a68c4620..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/assets/tabbar/message-blue.png b/assets/tabbar/message-blue.png deleted file mode 100644 index 357f41392b311b19cba61a242e60167a9451c561..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1321 zcmV+^1=jkBP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91GN1zh1ONa40RR91G5`Po0Cmf+s{jB5lSxEDRA>e5T1$)-MHD@EV2ABiRdv;^>IV#_!5(-jJs=H5 zZPAHn!ZIkP5%*<2C)J+7V?Mhe__Ov@T*e3-MXTK4?}nuQ6RGHQJj8o+aupq)Pp`^i zDm710|1g?y5EZ%7A4X-3rfsz9WD0jOZyW*#(A^xpR8@UM+H@wJ|CV`13aPPzizKuXyX10N*z!}N zO&62EuLD5Be4oYT;S}2RoyHPr(M<$CMiOJn0yjW!EbVqD>@JLIQ4?0h28(t4TzWAi`;pzaoiVICKN-?D6FzayXNi`*X$2SCDnABQTA z;By^OKap-OvB2!Ch665Fyn)-;l4aLFwJg*ST;a<$Jgea|kqdXQ;h63VZTwS9ust{u z)^m!HxQ|bKotPexicaBtyvjyHeGLMTRXJN;WhnDU+?Vu-RPk=WB+U0_=GAc$R!$QE zRwR{z`>hOL63Lxf77%vhX5b@Y6sj17@%UKo^zv~>2PDk*X1?@GdP&&RCGr@r z#Vdm@Cwz5@02AwQ{ybNYADHjuv{BZb=*d?0C&Mr-;JjbKBUMa@OI;#~%DAFa7VN=p zyvZeSDF=BD>wIT#b9@ClbWLu9o`H+=)uX@YZFbcrZ_3B$_*FQRk&@wk>t#BTWnXX6S% zmX(`qMgETa<`S_Q#i6)DkY!2xm?i>zMdzzQ5{R67#7H33*=ZsjV%Pr%gC!!^&uR60 z(!Vs3NTYo4mPCA-zXktr>bLt$WD)V{h9KL^_^r$5$n!*`lc&PW$k^T4eN;n`31h%! z9tpNeca}Thk4Uunt>p{enMK0nVG|KXeu58p6aQl#39AcvYTY4;_55n}eG!RlBEm}{ z-=VY&Vq1E(d$~HztA~VP`VTr*Q_*SsKC+HI zGunQ7lk)l~y7lYd*DQM%fN!`mwflB$ukC~|n@B=2^QRqkf%lnLlhn*iy>x~BVc-ng z9O2if14XM+y16UqKan_Io6cb0+PQo#oqV0om*}W{Kz+#E#nH80xr;iTbp9Bf|BJr| f(_jyT+ynmun!69r#TGJu00000NkvXXu0mjf1o&0^ diff --git a/assets/tabbar/message-gray.png b/assets/tabbar/message-gray.png deleted file mode 100644 index c33a5408ee09ea5bdbce1f72a7e31b54a9792f3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2188 zcmV;72y^#|P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91GN1zh1ONa40RR91G5`Po0Cmf+s{jB8_DMuRRA>e5T78UMRTV$yy_wxY zTcCj20#PcVU{y?vjS%ZcH8I#Pf+7jlG?I{Pw9S&%?oM}hw)?iTyY0@DRtiDakTiaU zq(J1OEbs>jsnr-DgjD%x7O957ijCHOZ0*jxx!2!$GxxnWGjBfHZFl-dZ!&w&J?GqW z&hLKT`P*WEon9Z*d^cVz8(PD!^UAOhk*8@ zwO>Yae}M2lwBoS|lwIZK=4-MRFsTJv(X9yo+t9hJtUmJ;dg)=B6CZRoZ1`_j)`&hM zAX~TZ{H$`_X8~Yg*f0}6L$>vsOYFjniA3T=SXPT39UYBN{OkDF$vMT`KG5qElqiE@uh+;`6wec0hJDc3u{@^FcJ?)^E*22Cm zHUQ=rvwcs0@22OQvDp+5XE3{-w0aP&W|f>AC5zWO$?kp4IB8a=)Z=>rX0hkTn>)15 zNhN;K$VNjT1B2OB7|Tz?xTlLhZ`#Cn^!0WBt&#Dwk&ldw%>7@Ue+7S71&a#-TlUIE zJyREmGrVIlDfMR<^@bC=`+1r-=Wb`+x|3%UWV3ao(FO)HLl^-)9vBQW%$Zy3&6%1& zyw$02@>LkUp=gZXnBC4xySln2n+<5Xdd^^G5B&eg^G`fJD}MQs&6_)pMcMVne3Sr7 zY<~cPKEfKmdL}`5F)g~j1EXNS&=}q~o_3F=qGA(m}a?D z*eY~ossfT88Mz5d?HW;pfjrr=u`-4#AcZ`CAIJ@V zkJGd9-O5TcUGC`U$TR5y@hh>ZJl|Crg9$jq*Q@-3=Er=x#l);QJ%wJGk}$MZt1H7P z1L9;d^D&^7h!R$dqqOu(2P!MHs_dQNG~q}jiN8EF^s`SC>EhoqAe5)&SaM4%8IL*3 zmbqc&R?|3~J|!_ojCsnf2**-8L)WPB5-5;xTE+BB=+*c^* z{qhq!7`B17)SaBto-MH{wgYK7l~3M(1dUNBaq9q~0Ei;{qjEFF((c{6+YwN|kzvRE zbY4&0XUZm*oG*ES;k>`MYltoD^Oj}bKD*tz zC7J9jb$6hJfOLPVYo#1G7>=U8&=jPr29mwD(39l*+mXEA%@M z-7aFy>Wj$s2pyG5t4qxlM(UIT_fE|?ct)A=c%@bE#hMC6z~LpAYxf9i>!7KFN%d8q zzEB8N@Q)^}`Mq#hWkbtqQ-3l-jDatt(;4q}Xn3v6_wLGwvgm0s_Rj+Ryl!);BD z{WZ83F?naMa3s}0?D!~7jd(rBgeQG99XVdL*@X?v1YLR@{HFMlVP&_`la+p}fH*xH zFo}3yps1>DV}b1aQ!+QO+h=@Fntm7ca$g0cSb^X6E4G+;>(JjH0FcEJ26|&E##SmS zq#8h?RA-(ykk0%V!~1^UGhXUbsZIaz%OT=|1>y{6mg9=|kckz&akxD;r{=DIK?1>} zc_$UT_h#8UWJsN`VzE^{JwG{WfK}!dN0dtO%$9fV+dq-=FhIjnn_$k-HobXQ*9th%293-EM@*n0w zw>mlL>~?&aO;k&&IRNuMmiC9*thtZY>-y@NMA8E%PPwab9NJ=5CZi|A38#!TI5j_O zc=hr~AadPQ3LiSpAi;4S>iB+0&*AraoaY=21C#w=eEfrt=PADc_q^LQ>lN5>mjQ%- znKSNCUp~FvfzJqU8D6725{NvT7IO4DoJ{L@0^|5NiuW;%&~QqCy}FBwr%(KItWE>r zMrZ^=9p*vsaiYWU?^f<(`#tTXY9CsTu$DB^vtPg0|~p7|AOFx`U-BB zx1fb@MsHmS`4ymZpeN9~cq`)xI315!v9aFX4Rznn!nQBc7h9l3E%1NiLh231xMD~E O0000 { - if (result.data.records.length) { - var respList = result.data.records - let nowList = `momentList[${this.data.momentList.length}]` - var num = this.data.form.pageNum - var finished = this.data.form.pageNum >= result.data.pages - this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), requesting: false, finished }) - } else { - this.setData({ finished: true, requesting: false }) - } - }).catch(err => { - this.setData({ requesting: false }) - }) - }, onAttentionChange: function (e) { var model = { follow: !this.data.hasFollowed, paperMillId: this.data.id } wx.showLoading({ title: '处理中', mask: true }) diff --git a/pages/agent/factory-detail/index.json b/pages/agent/factory-detail/index.json index fc07ba2..97a5b1a 100644 --- a/pages/agent/factory-detail/index.json +++ b/pages/agent/factory-detail/index.json @@ -7,7 +7,6 @@ "van-image": "/components/image/index", "van-button": "/components/button/index", "submit-layout": "/components/submit-layout/index", - "article-item": "/pages/moment/article-item/index", "notification": "/pages/message/notification/index" } } \ No newline at end of file diff --git a/pages/agent/factory-detail/index.wxml b/pages/agent/factory-detail/index.wxml index 378be3b..dab213c 100644 --- a/pages/agent/factory-detail/index.wxml +++ b/pages/agent/factory-detail/index.wxml @@ -4,7 +4,7 @@ 纸厂详情 - + @@ -82,25 +82,6 @@ - diff --git a/pages/moment/article-item/index.js b/pages/moment/article-item/index.js deleted file mode 100644 index 230ca6c..0000000 --- a/pages/moment/article-item/index.js +++ /dev/null @@ -1,42 +0,0 @@ -// pages/stock/index.js -import { likeMoment } from "../../../api/moment" -const util = require('../../../utils/util') -const app = getApp() - -Component({ - options: { - addGlobalClass: true, - multipleSlots: true - }, - properties: { - item: { type: Object, value: null }, - mclick: { type: Boolean, value: true } - }, - methods: { - toMill: function(){ - if(!this.data.mclick){ - return - } - util.navigateTo('/pages/agent/factory/index?tabIndex=1&id=' + this.data.item.millPaperId) - }, - lookItem: function(e){ - util.navigateTo('/pages/article/detail/index?id=' + this.data.item.id) - }, - likeItem: function(e){ - if(!app.globalData.userInfo){ - wx.navigateTo({ url: '/pages/login/index' }) - return - } - if(this.data.item.isLiked){ - util.showToast('请勿重复点赞') - return - } - // /article/like-or-cancel/article/{id} - likeMoment({articleId: this.data.item.id}).then(result => { - this.setData({ ['item.likeQuantity']: result.data.likeQuantity, ['item.isLiked']: 1 }) - }).catch(error => { - util.showToast(error) - }) - } - } -}) \ No newline at end of file diff --git a/pages/moment/article-item/index.json b/pages/moment/article-item/index.json deleted file mode 100644 index 3f69f2a..0000000 --- a/pages/moment/article-item/index.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "component": true, - "usingComponents": { - "van-image": "/components/image/index", - "sudoku-image": "/components/sudoku-image/index", - "fold-text": "/components/fold-text/index", - "van-tag": "/components/tag/index" - } -} \ No newline at end of file diff --git a/pages/moment/article-item/index.wxml b/pages/moment/article-item/index.wxml deleted file mode 100644 index d71a6a0..0000000 --- a/pages/moment/article-item/index.wxml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - {{item.creatorName || ''}} - {{moment.formatMTime(item.createTime)}} - - - - {{item.title}} - - - - - - - - # - {{item.millPaperName}} - - - - - - - - - {{item.likeQuantity}} - - - - {{item.replyQuantity}} - - - - \ No newline at end of file diff --git a/pages/moment/article-item/index.wxss b/pages/moment/article-item/index.wxss deleted file mode 100644 index 5580ebb..0000000 --- a/pages/moment/article-item/index.wxss +++ /dev/null @@ -1,9 +0,0 @@ -/* pages/main/index.wxss */ -.image-load { - width: 50px; - height: 50px; - display: flex; - align-items: center; - justify-content: center; - border-radius: 50rpx; -} \ No newline at end of file diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml index 3ff6924..f118ba4 100644 --- a/pages/process/index/index.wxml +++ b/pages/process/index/index.wxml @@ -44,7 +44,7 @@ - 收货管理 + 厂内收货 查看全部订单 diff --git a/pages/process/outside-list/index.js b/pages/process/outside-list/index.js index be664f3..70d1b00 100644 --- a/pages/process/outside-list/index.js +++ b/pages/process/outside-list/index.js @@ -91,7 +91,34 @@ Scene({ this.setData({ requesting: true }) } getFactoryOrderList(this.data.form).then(result => { - this.handResult(result) + if (result.data && result.data.records && result.data.records.length) { + var respList = result.data.records + // 对返回的消息列表进行处理，将同一天的消息显示在一起 + for (let i = 0; i < respList.length; i++) { + if (util.isEmpty(this.data.lastTime)) { + this.data.lastTime = respList[i].createTime + if (this.data.lastTime.length > 10) { + this.data.lastTime = this.data.lastTime.substring(0, 10) + } + respList[i].tipsTime = this.data.lastTime + } else { + var itemTime = respList[i].createTime + if (itemTime.length > 10) { + itemTime = itemTime.substring(0, 10) + } + if (this.data.lastTime !== itemTime) { + respList[i].tipsTime = itemTime + } + this.data.lastTime = itemTime + } + } + let nowList = `orderList[${this.data.orderList.length}]` + var num = this.data.form.pageNum + var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total + this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) + } else { + this.setData({ finished: true, requesting: false, loading: false }) + } }).catch(err => { this.setData({ requesting: false, loading: false }) util.showToast(err) @@ -100,36 +127,6 @@ Scene({ this.refresh.setRefresh(false) }) }, - handResult: function(result){ - if (result.data && result.data.records && result.data.records.length) { - var respList = result.data.records - // 对返回的消息列表进行处理，将同一天的消息显示在一起 - for (let i = 0; i < respList.length; i++) { - if (util.isEmpty(this.data.lastTime)) { - this.data.lastTime = respList[i].createTime - if (this.data.lastTime.length > 10) { - this.data.lastTime = this.data.lastTime.substring(0, 10) - } - respList[i].tipsTime = this.data.lastTime - } else { - var itemTime = respList[i].createTime - if (itemTime.length > 10) { - itemTime = itemTime.substring(0, 10) - } - if (this.data.lastTime !== itemTime) { - respList[i].tipsTime = itemTime - } - this.data.lastTime = itemTime - } - } - let nowList = `orderList[${this.data.orderList.length}]` - var num = this.data.form.pageNum - var finished = ((num - 1) * this.data.form.pageSize + respList.length) >= result.data.total - this.setData({ [nowList]: respList, ['form.pageNum']: (num + 1), finished, requesting: false, loading: false }) - } else { - this.setData({ finished: true, requesting: false, loading: false }) - } - }, cancelOrder: function(e){ Dialog.confirm({ title: '温馨提示', message: '确定取消该订单？' }).then(() => { wx.showLoading({ title: '正在获取', mask: true })