From d32e0d43c0dd6363d11dd7b964f791f82e35dc41 Mon Sep 17 00:00:00 2001 From: huziyuan Date: Wed, 20 Jan 2021 22:31:27 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=99=BB?= =?UTF-8?q?=E9=99=864=E4=B8=AA=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 4 + assets/image/dbcicon.png | Bin 0 -> 1114 bytes assets/image/fzcicon.png | Bin 0 -> 922 bytes assets/image/qticon.png | Bin 0 -> 956 bytes assets/image/tabBj.png | Bin 0 -> 41824 bytes assets/image/zzcicon.png | Bin 0 -> 1006 bytes pages/agent/factory/index.js | 137 ++++++++++++++++------- pages/agent/factory/index.wxml | 4 +- pages/agent/index/index.js | 71 ++++++++++-- pages/agent/index/index.wxml | 34 +++++- pages/home/info/index.js | 182 ++++++++++++++++++++++--------- pages/home/info/index.wxml | 26 ++++- pages/home/tab1/index.js | 88 +++++++++++++++ pages/home/tab1/index.json | 3 + pages/home/tab1/index.wxml | 61 +++++++++++ pages/home/tab1/index.wxss | 94 ++++++++++++++++ pages/home/tab2/index.js | 129 ++++++++++++++++++++++ pages/home/tab2/index.json | 5 + pages/home/tab2/index.wxml | 31 ++++++ pages/home/tab2/index.wxss | 91 ++++++++++++++++ pages/home/tab3/index.js | 95 ++++++++++++++++ pages/home/tab3/index.json | 3 + pages/home/tab3/index.wxml | 43 ++++++++ pages/home/tab3/index.wxss | 79 ++++++++++++++ pages/home/tab4/index.js | 76 +++++++++++++ pages/home/tab4/index.json | 3 + pages/home/tab4/index.wxml | 25 +++++ pages/home/tab4/index.wxss | 46 ++++++++ pages/index/index.js | 5 + pages/login/index.js | 192 +++++++++++++++++++++++++-------- 30 files changed, 1373 insertions(+), 154 deletions(-) create mode 100644 assets/image/dbcicon.png create mode 100644 assets/image/fzcicon.png create mode 100644 assets/image/qticon.png create mode 100644 assets/image/tabBj.png create mode 100644 assets/image/zzcicon.png create mode 100644 pages/home/tab1/index.js create mode 100644 pages/home/tab1/index.json create mode 100644 pages/home/tab1/index.wxml create mode 100644 pages/home/tab1/index.wxss create mode 100644 pages/home/tab2/index.js create mode 100644 pages/home/tab2/index.json create mode 100644 pages/home/tab2/index.wxml create mode 100644 pages/home/tab2/index.wxss create mode 100644 pages/home/tab3/index.js create mode 100644 pages/home/tab3/index.json create mode 100644 pages/home/tab3/index.wxml create mode 100644 pages/home/tab3/index.wxss create mode 100644 pages/home/tab4/index.js create mode 100644 pages/home/tab4/index.json create mode 100644 pages/home/tab4/index.wxml create mode 100644 pages/home/tab4/index.wxss diff --git a/app.json b/app.json index a045be7..f768ff7 100644 --- a/app.json +++ b/app.json @@ -13,6 +13,10 @@ "pages/home/idcard/index", "pages/home/info/index", "pages/home/pinfo/index", + "pages/home/tab1/index", + "pages/home/tab2/index", + "pages/home/tab3/index", + "pages/home/tab4/index", "pages/shop/create/index", "pages/shop/detail/index", "pages/shop/order/index", diff --git a/assets/image/dbcicon.png b/assets/image/dbcicon.png new file mode 100644 index 0000000000000000000000000000000000000000..f9df5e3ea44d1d482e1cb18b1521cc1826d78d66 GIT binary patch literal 1114 zcmV-g1f~0lP)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NF#7RU!RA>e5SzU;YK^UInSY-Vr z7g!fc5|T)Y3)w5VK#@yzT47@^*eh<3*eeo6Emz`#A{!}*b%;{RPb9VL0wE+xBJ3W| zbL_kOo;lyoeBXZG+30)f*?DK?op;`MX1V|-YTat7^%umISm4)n7<9(7B>A}B$8fjk-X1=qYN)A_-`B>)%uqoDL06u(+@ zqhUG&d9KQzQnHIU0ZJ=Cj;bFxTa6%hC|CS|;yIrDo?}L*- z8zWJ01?&X7!HJ+Nv@c_IBRc?H7e(eYi_`NVb0d&E?XbQBT*(Z;e3Ssnja>f7I%BG5 z!=>#ODCzdx1SH?1WR@KSqo5heV(Uy$Ls4QHH2~V(3Thi(@?k1QM9l)AUqL~{ah^77 z8h~FAah)HM03-GP4kSFK$l=?7f20)*AVIxyRya3uub>^j+ zW%7ZiuDjED(__Y&F4LO(?%wFHX1oAinKoSE78$PaBtSc#%o}sFR4|P>o*&MLdlJuf z?!jHL0Y9HAt_dzpW>@aB6vR#S$r?ux9mX2Eg0qY4932Bdv(yeFNd%(0LwS3;I-xNSA{zz(kS84A{=o;b~wIOnfGi z4#3NK_+3USK_nSKkn^bpkz@ep;ias3I{ZkyM*0l=*_Y=`@cT&Q3`r^go}kP69AvT` zL zz69RDKERBe#!CWChF7*KTV8LY;T8rojwxG*28vD9yAY>ZZ~y||a)ugQY6a!QT_soj zplL(pDv$>pU(onibr#eQOUU+vv(*jW>MwB@MniQCSnty$k8(P{5u`5h5WHNL0{-kn zoh&2QbghTIuqAXcVn2LhoM-o=KMtwe4S|nT{4ib7;Hs$fqP&mtgI^3jQSHkjmx>oo zppfsF-1<0;+$OysONhIQ4Sny?vgkEI;4JwqA?`LGL4KDVApe(8b8JA5E#Qcn_ndW@ gjX*X6|HcUX0f1;Q7=et9{{R3007*qoM6N<$g7AOdmjD0& literal 0 HcmV?d00001 diff --git a/assets/image/fzcicon.png b/assets/image/fzcicon.png new file mode 100644 index 0000000000000000000000000000000000000000..f9caf9ba5b10f3a3c6869704f11eb1bed43bcfb5 GIT binary patch literal 922 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~ySip>6gB0F2&*1?oXYq7#49Q@9 z8|j@b;wZ2#PCi4agX3dk(*sXO7gvr~^#KBVJ7#ouv@67wJ4>(@3+lVsvK(O*bz#xB z)9Z4y;kHv?|EM5mqtVIXWU%9H`0m@U-}sf^zPs6Y^C1zD+p(dsUu&;kww=uzsF})s zito>LSpl{$)(P{Q)*1i!Y^J{;LDcGb)DK0brwy9PULLB6nUZWvKNnU+`J8?%*!I!= zM!aNANZ@bv+^c`}=J@?9h3(Y;vfxPjy`%?KCm{6Lio^Svrl4(NwGw72}Z^vL<*86D3oSD38lUUb{zP$f`` zp}cGT#Y3uJ1k@Ydi;R6wD0{kZoAys&#mT@s&c;_3FrO=k_qbR4b+rfc^iTQEw{ARe z!F|P4C$C2Kmm+Fw>OS@GB{wR4=&vun!9~6z$K5N{-j_aG*0?0JVC~x- z+Fv#qf0Jo>e?Z80@wIL9s{XL%JNN5ahSsL{FW}$O`cAF+j?Tk$hfAU&^UJjtcTW1k zeEm7I)WSk5<(hj>Vox3_Pw?8a++*Icv$BmR)}@7czR&2;D-XTk`{QV+Xnd(&e6$7Q zI+4!GUHa!QOIvl{41A&F+j0KQDep^y2~*bIek|pC$}*AUFp3p9ZeAkZ{-%<+Dt7#Wv22 t|7(L8EZNo@hz9J_i7Z?2#vx7i2eYlhT$NqiPd0$^g{P~Z%Q~loCIIB2eMkTR literal 0 HcmV?d00001 diff --git a/assets/image/qticon.png b/assets/image/qticon.png new file mode 100644 index 0000000000000000000000000000000000000000..7c1c7dc6a54e3c2339af8227a311f29553d357b9 GIT binary patch literal 956 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^R}E~ycoX}-P; zT0k}j17mw80}DtA5K93u0|WB{Mh0de%?J`(zyy~ySip>6gB0F2&*1?oSMzjn49Q@9 z8*ZB+;wbX(Sg?wiT;N9*NABDsTgt+k5?1;O=r*}Tw>GqPF1|hqNKEI|+dO7E|@~(Sgnu2HNoSc2OYEHB8?^cQza>Y%S$vx-uzKf`H@iQm zXZ|_e^>J=TsoF2s12Tess*B=TK0I44B=}sQ_>)CgH**wovdbQon45=-EI&3rYnHt| ztHq>!)y3qg2UFhe)-UW~y378%#=PTrr1y*1h)XRSH^@BmyTSh3C*s~3)sn7Be8IQn zrrEgV%rr0-v=IB)bF0IAzdFzKP=@_a)D8+cKCs9Bd_B_ib~eDHXn<< znl1Ao`P9!_U)nQeB^eJ$&u=)CX>-N;&&EQFW5tcE*-a5i{%#JE>t8g~eP0)Mkm=Qz z6+C6L|N8H6{w&IV80@b6N2_1)=e@A9wR$agaPgOjxo)BLrN^{y+&;L~#RBB;@`lbk zA;lp|-%oJQbLi?Q=FYi!&>-x@6BdJo(XTAo47~2?Obt2x{Kc=$=VX#ue3!N4I6cmq z*mk`joIio{_neh?e>53>z24^e^Ai(~@$?Vw#xd*TwzXXAPVL{*+8{T3^68K{#s}`d z>y5dwX5Wcf|9J~pWESnY^Xt;0a|inEQlw95zTyk9Wqjv<>e%YUPi>cvZPt_!u?~3C caEI>?yGqJ`hvj=hV?jB`)78&qol`;+0Fer$TL1t6 literal 0 HcmV?d00001 diff --git a/assets/image/tabBj.png b/assets/image/tabBj.png new file mode 100644 index 0000000000000000000000000000000000000000..1ab679873d5c2f4bc909d7462387f17c44f6372f GIT binary patch literal 41824 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 z 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 literal 0 HcmV?d00001 diff --git a/assets/image/zzcicon.png b/assets/image/zzcicon.png new file mode 100644 index 0000000000000000000000000000000000000000..eea8521f12ab30820cc8dd7618221370de58301c GIT binary patch literal 1006 zcmVPx#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFSV=@dRA>e5SxsmYK@@(|+EAz# z{}8Jnv^f-^p2U+yJZSOaMMOM!5HI!MK~xZ;LN$#b#)}|&vv?B3zo%!C(o0;8~D3*8z;u%=hGoU=!Z-@OV zu+F1BYV$V?m;&CI4*UR)y3N3xT+-pPScZ0)c}cG(r&ZF!Lw^VRv`1Um=3xww^c%z^ z049IjuagklCeXKU0A48+BB$1Nz3c-pNg=-}>p>$Qab3VCU@K5xF6c=(ZNNEKppA5p z&Zyt@AFA!q>qno5?rx>45AEbYD13@_L4kzzQbOGe(G-#|ARPsXaLJ()^sc!gG zj3$7T?gQDOGGRs6D5FNGqxgntoBQYqHJnP(1dwpt4+}J|9u`@r)eDp#?FeuyY$@x8 zN;Cm<(ig#}hsN|ku|B3Zp=4O1>8q`pmJR1zRmbubmoKC>z|Sfl!Z!UtGc=EzcXP2V zPq*lzo~1nThm(B~F49_h?RvJ3p_vsphrVY;|GYuxfMddDsYg@+%x2QMC~r3MXvPn7FGOmj?b!ttOd+?GE@46;&ns$*w$V|vF=x=V1_@v{2I(yg^a~{)eFuQO zfGzz{2JMQY990}>p=?XIR;1iyq67(m&vaY(b925_d4;kvvqaL*_HTI^B!IVq#Srv; zrTR&f)@!n5kbWhX))($Ptv|*zT;2l%03V%G0MEQ6{~Yx>Aan_`0{jj$3j7i5BzgWq zJ0;peRf7b;gdPK&Ixo2*gzbBP8DR@m4U$4OAx@6)CpR)GJZ#v;FYEz8pUGI^WR(lCfejb|X9 cfpBKvKT1HT2EPSG#{d8T07*qoM6N<$f)JvvQUCw| literal 0 HcmV?d00001 diff --git a/pages/agent/factory/index.js b/pages/agent/factory/index.js index 0f7cb5e..8794d19 100644 --- a/pages/agent/factory/index.js +++ b/pages/agent/factory/index.js @@ -1,6 +1,10 @@ // pages/mall/factory/index.js -import { getFactoryPriceDetail } from "../../api/ztb" -import { getPreferList } from "../../api/moment" +import { + getFactoryPriceDetail +} from "../../api/ztb" +import { + getPreferList +} from "../../api/moment" const event = require('../../../utils/event') const util = require('../../../utils/util') const app = getApp() @@ -18,7 +22,7 @@ Page({ scrollTop: 0, toView: null, id: null, - tabList: [ '报价信息', '讨论', '收货标准', '注意事项' ], + tabList: ['报价信息', '讨论', '收货标准', '注意事项'], tabIndex: 0, factoryDetail: null, cateIndex: 0, @@ -29,31 +33,38 @@ Page({ finished: false, form: { pageNum: 1 - } + }, + + attentionStatus: 1 }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - this.setData({ + this.setData({ safeBottom: app.globalData.safeBottom, - fragmentHeight: app.globalData.fragmentHeight - 90, - height: app.globalData.fragmentHeight, + fragmentHeight: app.globalData.fragmentHeight - 90, + height: app.globalData.fragmentHeight, kg: app.globalData.kg, stickyTop: app.globalData.CustomBar, daytimes: util.formatDate(new Date(), 'Y-M-D') // tabIndex: options.tabIndex ? parseInt(options.tabIndex) : 0 }) event.on('EventMessage', this, this.onEvent) - if(options.id){ + 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){ + if (result.data.paperCategoryList && result.data.paperCategoryList.length) { this.data.cateId = result.data.paperCategoryList[this.data.cateIndex].categoryId } - this.setData({ factoryDetail: result.data }) + this.setData({ + factoryDetail: result.data + }) wx.hideLoading() }).catch(err => { wx.hideLoading() @@ -66,65 +77,90 @@ 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){ + stopTouchMove: function (e) { return false }, - onTabChange: function({detail}){ - if(this.data.tabIndex == Number(detail.index)){ + onTabChange: function ({ + detail + }) { + if (this.data.tabIndex == Number(detail.index)) { return } - if(this.data.fixed){ - this.setData({ tabIndex: parseInt(detail.index), toView: 'sticky' }) + if (this.data.fixed) { + this.setData({ + tabIndex: parseInt(detail.index), + toView: 'sticky' + }) } else { - this.setData({ tabIndex: parseInt(detail.index) }) + this.setData({ + tabIndex: parseInt(detail.index) + }) } - if(this.data.tabIndex == 1 && !this.data.momentList.length){ + if (this.data.tabIndex == 1 && !this.data.momentList.length) { this.fetchMomentList() } }, - checkTag: function(e){ - if(!e.currentTarget.dataset){ + checkTag: function (e) { + if (!e.currentTarget.dataset) { return } - if(!e.currentTarget.dataset.index && e.currentTarget.dataset.index != 0){ + if (!e.currentTarget.dataset.index && e.currentTarget.dataset.index != 0) { return } - if(this.data.cateIndex == e.currentTarget.dataset.index){ + if (this.data.cateIndex == e.currentTarget.dataset.index) { return } - this.setData({cateIndex : e.currentTarget.dataset.index}) + this.setData({ + cateIndex: e.currentTarget.dataset.index + }) }, - saleGood: function(e){ - if(!app.globalData.userInfo){ - wx.navigateTo({ url: '/pages/login/index' }) + saleGood: function (e) { + if (!app.globalData.userInfo) { + wx.navigateTo({ + url: '/pages/login/index' + }) return } var item = this.data.factoryDetail.paperCategoryList[this.data.cateIndex] - if(util.isEmpty(item.unitPrice)){ + if (util.isEmpty(item.unitPrice)) { util.showToast('该纸品暂无报价，无法卖货') return } - wx.navigateTo({ url: '/pages/agent/edit/index?id=' + this.data.factoryDetail.paperMillId + '&categoryId=' + item.categoryId }) + wx.navigateTo({ + url: '/pages/agent/edit/index?id=' + this.data.factoryDetail.paperMillId + '&categoryId=' + item.categoryId + }) }, - postMoment: function(){ + postMoment: function () { util.navigateTo('/pages/article/publish/index?factoryId=' + this.data.factoryDetail.paperMillId + '&name=' + this.data.factoryDetail.name) }, //*************************************************momentList************************************************// onRefreshList: function () { - this.setData({ momentList: [], ['form.pageNum']: 1, finished: false }) + this.setData({ + momentList: [], + ['form.pageNum']: 1, + finished: false + }) this.fetchMomentList() }, - fetchMomentList: function(){ + fetchMomentList: function () { if (this.data.requesting || this.data.finished) { return } - this.setData({ requesting: true }) + this.setData({ + requesting: true + }) getPreferList(this.data.form).then(result => { if (result.data.records.length) { var respList = result.data.records @@ -138,10 +174,15 @@ Page({ finished }) } else { - this.setData({ finished: true, requesting: false }) + this.setData({ + finished: true, + requesting: false + }) } }).catch(err => { - this.setData({ requesting: false }) + this.setData({ + requesting: false + }) }) }, onShareAppMessage: function () { @@ -150,10 +191,26 @@ Page({ path: 'pages/index/index?url=/pages/agent/factory/index&key=id&value=' + this.data.factoryDetail.paperMillId } }, - toService: function(){ - wx.navigateTo({ url: '/pages/home/service/index'}) + toService: function () { + wx.navigateTo({ + url: '/pages/home/service/index' + }) }, - onUnload: function(){ + onUnload: function () { event.remove('EventMessage', this) + }, + onAttentionChange: function (e) { + if (e.currentTarget.dataset.cid == 1) { + this.setData({ + attentionStatus: 2, + }) + + } + if (e.currentTarget.dataset.cid == 2) { + this.setData({ + attentionStatus: 1, + }) + } + util.showToast(this.data.attentionStatus+'') } }) \ No newline at end of file diff --git a/pages/agent/factory/index.wxml b/pages/agent/factory/index.wxml index a0dea8f..4838212 100644 --- a/pages/agent/factory/index.wxml +++ b/pages/agent/factory/index.wxml @@ -8,7 +8,9 @@ - {{factoryDetail.name}} + {{factoryDetail.name}} + {{attentionStatus == 1 ? '关注' : '取消关注'}} + {{factoryDetail.locProvinceName + factoryDetail.locCityName + factoryDetail.locDistrictName}} | diff --git a/pages/agent/index/index.js b/pages/agent/index/index.js index 158ab81..bcd02a7 100644 --- a/pages/agent/index/index.js +++ b/pages/agent/index/index.js @@ -1,5 +1,8 @@ // pages/agent/index/index.js -import { getFactoryPrice, getFactoryCity } from "../../api/ztb" +import { + getFactoryPrice, + getFactoryCity +} from "../../api/ztb" const app = getApp() Page({ @@ -23,28 +26,65 @@ Page({ cityId: '', enableSalesAgent: 1, pageNum: 1 - } + }, + + form2: { + pageNum: 1 + }, + bidType: 1, + }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - this.setData({ height: app.globalData.fragmentHeight - 90, kg: app.globalData.kg, CustomBar: app.globalData.CustomBar }) + this.setData({ + height: app.globalData.fragmentHeight - 90, + kg: app.globalData.kg, + CustomBar: app.globalData.CustomBar + }) this.fetchRegionList() this.fetchPapersList() }, - fetchRegionList: function(){ + fetchRegionList: function () { getFactoryCity().then(result => { //成功回调 - this.data.cateList = [{cityId: '', cityName: '全部'}].concat(result.data) + this.data.cateList = [{ + cityId: '', + cityName: '全部' + }].concat(result.data) for (let index = 0; index < this.data.cateList.length; index++) { this.data.tabList.push(this.data.cateList[index].cityName) } - this.setData({ tabList: this.data.tabList, scrolled: this.data.cateList.length >= 5 }) + this.setData({ + tabList: this.data.tabList, + scrolled: this.data.cateList.length >= 5 + }) + }) + }, + //获取纸厂列表 + fetchRegionList2: function () { + + }, + onTabChangeTop: function (e) { + if (this.data.bidType == Number(e.currentTarget.dataset.index)) { + return + } + var tabIndex = Number(e.currentTarget.dataset.index) + this.data.firstCategoryId = '' + this.setData({ + pageIndex: 0, + ['bidType']: tabIndex }) + console.log(this.bidType) + if (this.data.bidType == 1) { + this.onRefreshList() + } }, - onTabChange: function ({detail}) { - if(this.data.tabIndex == Number(detail.index)){ + onTabChange: function ({ + detail + }) { + if (this.data.tabIndex == Number(detail.index)) { return } this.data.tabIndex = Number(detail.index) @@ -62,6 +102,13 @@ Page({ }) this.fetchPapersList() }, + // 下拉刷新关注... + onRefreshList2: function () { + this.setData({ + ['form2.pageNum']: 1, + }) + this.fetchPapersList() + }, // 获取特价列表 fetchPapersList: function () { if (this.data.requesting || this.data.finished) { @@ -70,7 +117,9 @@ Page({ if (this.data.loading) { this.data.requesting = true } else { - this.setData({ requesting: true }) + this.setData({ + requesting: true + }) } getFactoryPrice(this.data.form).then(result => { if (result.data.records.length) { @@ -78,7 +127,7 @@ Page({ let nowList = `orderList[${this.data.orderList.length}]` var num = result.data.current var finished = result.data.current >= result.data.pages - if(this.data.form.pageNum == 1){ + if (this.data.form.pageNum == 1) { this.setData({ [nowList]: respList, total: result.data.total, @@ -113,6 +162,6 @@ Page({ loading: false }) }) - } + } }) \ No newline at end of file diff --git a/pages/agent/index/index.wxml b/pages/agent/index/index.wxml index 924aef2..be1a8d4 100644 --- a/pages/agent/index/index.wxml +++ b/pages/agent/index/index.wxml @@ -4,12 +4,20 @@ 纸厂代卖 - - + + + + 全部 + + + 关注 + + + - + - + + + + + + + + + + + {{finished?'到底啦～':'加载中...'}} + + + + + \ No newline at end of file diff --git a/pages/home/info/index.js b/pages/home/info/index.js index 7a06da3..a8a4510 100644 --- a/pages/home/info/index.js +++ b/pages/home/info/index.js @@ -1,5 +1,10 @@ -import { zconfig, getBaseInfo } from '../../api/ztb' -import { updateUserInfo } from '../../api/user' +import { + zconfig, + getBaseInfo +} from '../../api/ztb' +import { + updateUserInfo +} from '../../api/user' const util = require('../../../utils/util') const app = getApp() @@ -11,25 +16,71 @@ Page({ backStatus: true, nickName: '', //用户昵称 avatarUrl: '', //用户头像 - banckCardList: [ - { id: 1, name: '个体回收户' }, - { id: 2, name: '打包站' }, - { id: 3, name: '废品站' }, - { id: 4, name: '印刷' }, - { id: 6, name: '包装厂' }, - { id: 7, name: '纸箱纸板厂' }, - { id: 8, name: '后加工' }, - { id: 5, name: '其他' } + banckCardList: [{ + id: 1, + name: '个体回收户' + }, + { + id: 2, + name: '打包站' + }, + { + id: 3, + name: '废品站' + }, + { + id: 4, + name: '印刷' + }, + { + id: 6, + name: '包装厂' + }, + { + id: 7, + name: '纸箱纸板厂' + }, + { + id: 8, + name: '后加工' + }, + { + id: 5, + name: '其他' + } ], - cardList: [ - { value: '1', text: '个体回收户' }, - { value: '2', text: '打包站' }, - { value: '3', text: '废品站' }, - { value: '4', text: '印刷' }, - { value: '6', text: '包装厂' }, - { value: '7', text: '纸箱纸板厂' }, - { value: '8', text: '后加工' }, - { value: '5', text: '其他' } + cardList: [{ + value: '1', + text: '个体回收户' + }, + { + value: '2', + text: '打包站' + }, + { + value: '3', + text: '废品站' + }, + { + value: '4', + text: '印刷' + }, + { + value: '6', + text: '包装厂' + }, + { + value: '7', + text: '纸箱纸板厂' + }, + { + value: '8', + text: '后加工' + }, + { + value: '5', + text: '其他' + } ], userInfo: null, userType: 1, @@ -49,14 +100,21 @@ Page({ linkPhone: res.data.mobile, companyAddress: res.data.fullAddress, userType: res.data.userType, - realName:res.data.realName || res.data.userName + realName: res.data.realName || res.data.userName }) }) }, uploadFile: function (path) { var that = this - wx.showLoading({ title: '上传中', mask: true }) - var header = { ...zconfig.header, 'X-APP-ID': app.xAppId, appversion: app.version } + wx.showLoading({ + title: '上传中', + mask: true + }) + var header = { + ...zconfig.header, + 'X-APP-ID': app.xAppId, + appversion: app.version + } this.task = wx.uploadFile({ url: zconfig.baseUrl + '/recycle-user-center/file-uploading/upload/image', filePath: path, @@ -68,7 +126,9 @@ Page({ resp = JSON.parse(result.data) } if (resp && resp.code === 0) { - that.updateMemberInfo({avatar: resp.data}) + that.updateMemberInfo({ + avatar: resp.data + }) } else { wx.hideLoading() util.showToast('头像上传失败，请重新上传') @@ -80,46 +140,60 @@ Page({ } }) }, - showDialog: function(){ + showDialog: function (e) { this.wuxDialog = this.wuxDialog || this.selectComponent('#wux-dialog') var that = this - this.wuxDialog.prompt({ - resetOnClose: true, - title: '修改昵称', - placeholder: that.data.userInfo.nickname || '请输入昵称', - maxlength: 18, - onConfirm(e, response) { - if(util.isEmpty(response)){ - util.showToast('请输入昵称') - return - } - that.updateMemberInfo({nickname: response}) - }, - }) + if (e.currentTarget.dataset.cid === 'nickname') { + this.wuxDialog.prompt({ + resetOnClose: true, + title: '修改昵称', + placeholder: that.data.userInfo.nickname || '请输入昵称', + maxlength: 18, + onConfirm(e, response) { + if (util.isEmpty(response)) { + util.showToast('请输入昵称') + return + } + that.updateMemberInfo({ + nickname: response + }) + }, + }) + + } }, - updateMemberInfo: function(form){ - if(form.nickname){ - wx.showLoading({ title: '处理中', mask: true }) + updateMemberInfo: function (form) { + if (form.nickname) { + wx.showLoading({ + title: '处理中', + mask: true + }) } updateUserInfo(form).then(result => { wx.hideLoading() - if(form.nickname){ - this.setData({['userInfo.nickname']: form.nickname}) - } else if(form.avatar){ - this.setData({avatarUrl: form.avatar}) + if (form.nickname) { + this.setData({ + ['userInfo.nickname']: form.nickname + }) + } else if (form.avatar) { + this.setData({ + avatarUrl: form.avatar + }) } }).catch(err => { wx.hideLoading() util.showToast(err) }) }, - toAuth: function(){ - if(this.data.userInfo && !this.data.userInfo.isAuth){ - wx.navigateTo({ url: '/pages/home/idcard/index' }) + toAuth: function () { + if (this.data.userInfo && !this.data.userInfo.isAuth) { + wx.navigateTo({ + url: '/pages/home/idcard/index' + }) } }, //通过事件执行更换头像方法比如点击头像执行该方法 - chooseImage: function() { + chooseImage: function () { var that = this wx.chooseImage({ count: 1, // 默认9 @@ -137,12 +211,16 @@ Page({ }, //裁剪图片回调 onCropback: function (event) { - this.setData({ visible: false }) + this.setData({ + visible: false + }) this.uploadFile(event.detail[0]) }, //关闭回调 closeCallback: function () { - this.setData({ visible: false }) - } + this.setData({ + visible: false + }) + }, }) \ No newline at end of file diff --git a/pages/home/info/index.wxml b/pages/home/info/index.wxml index c4bb482..2837ed0 100644 --- a/pages/home/info/index.wxml +++ b/pages/home/info/index.wxml @@ -51,10 +51,34 @@ 公司地址 {{companyAddress}} - + 昵称 {{userInfo.nickname || '点击修改昵称'}} + + 从业身份 + {{userInfo.card || '点击修改从业身份'}} + + + 所在城市 + {{userInfo.city || '点击修改所在城市'}} + + + 从业经验 + {{userInfo.age || '点击修改从业经验'}} + + + 希望采购品类 + {{userInfo.type || '点击修改希望采购品类'}} + + + 希望出货品类 + {{userInfo.type2 || '点击修改希望出货品类'}} + + + 月出货量 + {{userInfo.numberMoon || '点击修改月出货量'}} + + + 身份 + + + + + + + + + + HI,\n欢迎使用纸通宝\n开启一站式废纸交易 + + + + + + + 你的从业身份是？ + + + + + + + + 打包站 + + + + + + + + + 废品站 + + + + + + + + + 造纸厂 + + + + + + + + 其他 + + + + + + + \ No newline at end of file diff --git a/pages/home/tab1/index.wxss b/pages/home/tab1/index.wxss new file mode 100644 index 0000000..f7b3f16 --- /dev/null +++ b/pages/home/tab1/index.wxss @@ -0,0 +1,94 @@ +/* pages/home/tab1/index.wxss */ +.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; +} + +.btson1 { + height: 147rpx; + width: 315rpx; + float: left; + overflow: hidden; + border: 3rpx solid #D8D8D8; + border-radius: 10rpx; + border-radius: 10rpx; + padding: 22px 33px 22px 33px; +} + +.btson2 { + height: 147rpx; + width: 315rpx; + float: right; + overflow: hidden; + border: 3rpx solid #D8D8D8; + border-radius: 10rpx; + border-radius: 10rpx; + padding: 22px 33px 22px 33px; +} + +.btson3 { + height: 147rpx; + width: 315rpx; + float: left; + margin-top: 20rpx; + overflow: hidden; + border: 3rpx solid #D8D8D8; + border-radius: 10rpx; + border-radius: 10rpx; + padding: 22px 33px 22px 33px; +} + +.btson4 { + height: 147rpx; + width: 315rpx; + float: right; + margin-top: 20rpx; + overflow: hidden; + border: 3rpx solid #D8D8D8; + border-radius: 10rpx; + border-radius: 10rpx; + padding: 22px 33px 22px 33px; +} +.otherInpt{ + padding-left: 48rpx; +} \ No newline at end of file diff --git a/pages/home/tab2/index.js b/pages/home/tab2/index.js new file mode 100644 index 0000000..d91cda1 --- /dev/null +++ b/pages/home/tab2/index.js @@ -0,0 +1,129 @@ +// pages/home/tab2/index.js +const storage = require('../../../utils/storage') +import regions from '../../../utils/region' +Page({ + + /** + * 页面的初始数据 + */ + data: { + options: regions, + region: [440000, '', ''], + form: { + bidType: 1, + imgList: [], + secondCategoryId: null, + stock: null, + dopantRate: null, + waterRate: null + }, + cateName: '', + dopantName: '', + waterName: '', + intervalName: '', + sumAmount: 0, + keyboard: 0, + toView: '', + focus: false, + picking: false + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.cascaderView = this.cascaderView || this.selectComponent('#wux-cascader') + this.pickerView = this.pickerView || this.selectComponent('#picker-view') + + }, + toNextTab: function () { + wx.redirectTo({ + url: '/pages/home/tab3/index' + }) + }, + toMyInfo: function () { + storage.put('userIsLoginFirst', '1') + wx.redirectTo({ + url: '/pages/index/index' + }) + }, + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + backspace: function () { + console.log('点击返回被触发2') + wx.redirectTo({ + url: '/pages/home/tab1/index' + }) + + }, + showRegion: function () { + if (this.data.disabled) { + return + } + this.cascaderView.showPicker(this.data.region) + this.setData({ + picking: true + }) + }, + onRegionChange: function (e) { + if (e.detail && e.detail.options) { + this.setData({ + ['form.areaStr']: e.detail.options.map((n) => n.label).join(' '), + region: e.detail.value + }) + this.data.form['locProvinceId'] = e.detail.value[0] + this.data.form['locProvinceName'] = e.detail.options[0].label + this.data.form['locCityId'] = e.detail.value[1] + this.data.form['locCityName'] = e.detail.options[1].label + this.data.form['locDistrictId'] = e.detail.value[2] + this.data.form['locDistrictName'] = e.detail.options[2].label + } + this.setData({ picking: false }) + }, +}) \ No newline at end of file diff --git a/pages/home/tab2/index.json b/pages/home/tab2/index.json new file mode 100644 index 0000000..511cd66 --- /dev/null +++ b/pages/home/tab2/index.json @@ -0,0 +1,5 @@ +{ + "usingComponents": { + "wux-cascader": "/components/cascader/index" + } +} \ No newline at end of file diff --git a/pages/home/tab2/index.wxml b/pages/home/tab2/index.wxml new file mode 100644 index 0000000..2adab4b --- /dev/null +++ b/pages/home/tab2/index.wxml @@ -0,0 +1,31 @@ + + + 城市 + + + + + + + + + + HI,\n欢迎使用纸通宝\n开启一站式废纸交易 + + + + + + + 你所在的城市是？ + + + + + {{form.areaStr||'请选择所在地区'}} + + + + + \ No newline at end of file diff --git a/pages/home/tab2/index.wxss b/pages/home/tab2/index.wxss new file mode 100644 index 0000000..005a1fc --- /dev/null +++ b/pages/home/tab2/index.wxss @@ -0,0 +1,91 @@ +/* pages/home/tab1/index.wxss */ +.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; +} + +.btson1 { + height: 147rpx; + width: 315rpx; + float: left; + overflow: hidden; + border: 3rpx solid #D8D8D8; + border-radius: 10rpx; + border-radius: 10rpx; + padding: 22px 33px 22px 33px; +} + +.btson2 { + height: 147rpx; + width: 315rpx; + float: right; + overflow: hidden; + border: 3rpx solid #D8D8D8; + border-radius: 10rpx; + border-radius: 10rpx; + padding: 22px 33px 22px 33px; +} + +.btson3 { + height: 147rpx; + width: 315rpx; + float: left; + margin-top: 20rpx; + overflow: hidden; + border: 3rpx solid #D8D8D8; + border-radius: 10rpx; + border-radius: 10rpx; + padding: 22px 33px 22px 33px; +} + +.btson4 { + height: 147rpx; + width: 315rpx; + float: right; + margin-top: 20rpx; + overflow: hidden; + border: 3rpx solid #D8D8D8; + border-radius: 10rpx; + border-radius: 10rpx; + padding: 22px 33px 22px 33px; +} \ No newline at end of file diff --git a/pages/home/tab3/index.js b/pages/home/tab3/index.js new file mode 100644 index 0000000..c1c67d3 --- /dev/null +++ b/pages/home/tab3/index.js @@ -0,0 +1,95 @@ +// pages/home/tab3/index.js +const storage = require('../../../utils/storage') +Page({ + + /** + * 页面的初始数据 + */ + data: { + bidType: 1 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + toNextTab: function () { + wx.redirectTo({ + url: '/pages/home/tab4/index' + }) + }, + toMyInfo: function () { + storage.put('userIsLoginFirst', '1') + wx.redirectTo({ + url: '/pages/index/index' + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + backspace: function () { + console.log('点击返回被触发3') + wx.redirectTo({ + url: '/pages/home/tab2/index' + }) + + }, + onTabChangeTop: function (e) { + if (this.data.bidType == Number(e.currentTarget.dataset.index)) { + return + } + var tabIndex = Number(e.currentTarget.dataset.index) + this.data.firstCategoryId = '' + this.setData({ + ['bidType']: tabIndex + }) + }, +}) \ No newline at end of file diff --git a/pages/home/tab3/index.json b/pages/home/tab3/index.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/home/tab3/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/home/tab3/index.wxml b/pages/home/tab3/index.wxml new file mode 100644 index 0000000..8942fd6 --- /dev/null +++ b/pages/home/tab3/index.wxml @@ -0,0 +1,43 @@ + + + 经验 + + + + + + + + + + HI,\n欢迎使用纸通宝\n开启一站式废纸交易 + + + + + + + 你的从业经验是？ + + + + + 1年以下 + + + + + + 1~5年 + + + + + + 5年以上 + + + + + + \ No newline at end of file diff --git a/pages/home/tab3/index.wxss b/pages/home/tab3/index.wxss new file mode 100644 index 0000000..8c1a202 --- /dev/null +++ b/pages/home/tab3/index.wxss @@ -0,0 +1,79 @@ +/* pages/home/tab1/index.wxss */ +.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; +} + +.btson1 { + height: 147rpx; + width: 315rpx; + float: left; + overflow: hidden; + border: 3rpx solid #D8D8D8; + border-radius: 10rpx; + border-radius: 10rpx; + padding: 22px 35px 22px 35px; +} + +.btson2 { + height: 147rpx; + width: 315rpx; + float: right; + overflow: hidden; + border: 3rpx solid #D8D8D8; + border-radius: 10rpx; + border-radius: 10rpx; + padding: 22px 35px 22px 35px; +} + +.btson3 { + height: 147rpx; + width: 315rpx; + float: left; + margin-top: 20rpx; + overflow: hidden; + border: 3rpx solid #D8D8D8; + border-radius: 10rpx; + border-radius: 10rpx; + padding: 22px 35px 22px 35px; +} diff --git a/pages/home/tab4/index.js b/pages/home/tab4/index.js new file mode 100644 index 0000000..576b0b8 --- /dev/null +++ b/pages/home/tab4/index.js @@ -0,0 +1,76 @@ +// pages/home/tab4/index.js +const storage = require('../../../utils/storage') +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + toMyInfo:function(){ + storage.put('userIsLoginFirst', '1') + wx.redirectTo({ url: '/pages/index/index' }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + 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' }) + + }, +}) \ No newline at end of file diff --git a/pages/home/tab4/index.json b/pages/home/tab4/index.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/home/tab4/index.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/home/tab4/index.wxml b/pages/home/tab4/index.wxml new file mode 100644 index 0000000..ea67531 --- /dev/null +++ b/pages/home/tab4/index.wxml @@ -0,0 +1,25 @@ + + + 采购品类 + + + + + + + + + + HI,\n欢迎使用纸通宝\n开启一站式废纸交易 + + + + + + + 你希望采购的品类是？ + + + + + \ No newline at end of file diff --git a/pages/home/tab4/index.wxss b/pages/home/tab4/index.wxss new file mode 100644 index 0000000..7fd2026 --- /dev/null +++ b/pages/home/tab4/index.wxss @@ -0,0 +1,46 @@ +/* pages/home/tab1/index.wxss */ +.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; +} + diff --git a/pages/index/index.js b/pages/index/index.js index 29ccf15..4365d40 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -168,9 +168,14 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function () { + var userIsLoginFirst = storage.get('userIsLoginFirst') if(this.data.inited){ this.onResume() } + wx.navigateTo({ url: '/pages/home/tab1/index' }) + // if(userIsLoginFirst=='1'){ + // wx.navigateTo({ url: '/pages/home/tab1/index' }) + // } }, onEvent: function (message) { if(message.what == 250){ diff --git a/pages/login/index.js b/pages/login/index.js index 8168428..85e5c40 100644 --- a/pages/login/index.js +++ b/pages/login/index.js @@ -1,10 +1,30 @@ //获取应用实例 -import { $wuxCountDown } from '../../components/index' -import { config, postCaptcha, loginCaptcha, loginPwd, wechatApplet, loginWechat } from "../api/user" -import { zconfig, loginToken, getBaseInfo } from "../api/ztb" -import { pconfig } from "../api/payment" -import { mconfig } from "../api/moment" -import { sconfig, getOrderExists } from "../api/saas" +import { + $wuxCountDown +} from '../../components/index' +import { + config, + postCaptcha, + loginCaptcha, + loginPwd, + wechatApplet, + loginWechat +} from "../api/user" +import { + zconfig, + loginToken, + getBaseInfo +} from "../api/ztb" +import { + pconfig +} from "../api/payment" +import { + mconfig +} from "../api/moment" +import { + sconfig, + getOrderExists +} from "../api/saas" const storage = require('../../utils/storage') const util = require('../../utils/util') const event = require('../../utils/event') @@ -31,19 +51,25 @@ Page({ }, onLoad: function (options) { if (options.mobile) { - this.setData({ ['form.mobile']: options.mobile }) + this.setData({ + ['form.mobile']: options.mobile + }) } this.wxLogin() var check = storage.get('AgreeCheck') app.globalData.kg = storage.get('ztb-kg') if (check) { - this.setData({check: true}) + this.setData({ + check: true + }) } }, - wxLogin: function(){ + wxLogin: function () { wx.login({ success: res => { - wechatApplet({ authCode: res.code }).then(result => { + wechatApplet({ + authCode: res.code + }).then(result => { storage.put('tmpAuthToken', result.data.tmpAuthToken, 98) }) } @@ -55,21 +81,37 @@ Page({ return } app.globalData.token = authorization - config.header = { 'Authorization': 'QNT ' + authorization } - loginToken({loginToken: app.globalData.token}).then(result => { - zconfig.header = { 'Authorization': 'QNT ' + result.data.token } - pconfig.header = { 'Authorization': 'QNT ' + result.data.token } - mconfig.header = { 'Authorization': 'QNT ' + result.data.token } + config.header = { + 'Authorization': 'QNT ' + authorization + } + loginToken({ + loginToken: app.globalData.token + }).then(result => { + zconfig.header = { + 'Authorization': 'QNT ' + result.data.token + } + pconfig.header = { + 'Authorization': 'QNT ' + result.data.token + } + mconfig.header = { + 'Authorization': 'QNT ' + result.data.token + } // 登录流程完成； getBaseInfo().then(result => { - app.globalData.userInfo = result.data - if(!util.isEmpty(result.data.userToken)){ + storage.put('userIsLoginFirst', '0') + app.globalData.userInfo = result.data + if (!util.isEmpty(result.data.userToken)) { this.handleUserToken(result.data.userToken) } else { - this.setData({ loging: false}) + this.setData({ + loging: false + }) wx.hideLoading() wx.navigateBack() - event.emit('EventMessage', { what: 888, desc: 'Logined' }) + event.emit('EventMessage', { + what: 888, + desc: 'Logined' + }) } }).catch(err => { wx.hideLoading() @@ -77,7 +119,9 @@ Page({ app.globalData.token = null storage.remove('Authorization') config.header = null - this.setData({ loging: false}) + this.setData({ + loging: false + }) }) }).catch(err => { wx.hideLoading() @@ -85,18 +129,24 @@ Page({ app.globalData.token = null storage.remove('Authorization') config.header = null - this.setData({ loging: false}) + this.setData({ + loging: false + }) }) }, - handleUserToken: function(userToken){ + handleUserToken: function (userToken) { storage.put('userToken', userToken) - sconfig.header = {'user-token': userToken } + sconfig.header = { + 'user-token': userToken + } getOrderExists().then(result => { wx.hideLoading() if (Number(result.data) != 1 || !app.release) { wx.navigateBack() } else { - wx.reLaunch({ url: '/pages/paper/index' }) + wx.reLaunch({ + url: '/pages/paper/index' + }) } }).catch(err => { wx.hideLoading() @@ -104,15 +154,21 @@ Page({ app.globalData.token = null storage.remove('Authorization') config.header = null - this.setData({ loging: false}) + this.setData({ + loging: false + }) wx.navigateBack() }) }, changePwd: function () { if (this.data.pwdType === 'password') { - this.setData({ pwdType: 'text' }) + this.setData({ + pwdType: 'text' + }) } else { - this.setData({ pwdType: 'password' }) + this.setData({ + pwdType: 'password' + }) } }, bindInput: function (e) { @@ -121,19 +177,29 @@ Page({ var enable = false if ((/^1\d{10}$/.test(e.detail.value)) && e.detail.value.length == 11) { enable = true - this.setData({ mobileEnable: enable }) + this.setData({ + mobileEnable: enable + }) } } if ((/^1\d{10}$/.test(this.data.form.account)) && this.data.form.account.length == 11) { if (this.data.type == 1 && !util.isEmpty(this.data.form.captcha)) { - this.setData({ loginEnable: false }) + this.setData({ + loginEnable: false + }) } else if (this.data.type == 0 && !util.isEmpty(this.data.form.password)) { - this.setData({ loginEnable: false }) + this.setData({ + loginEnable: false + }) } else { - this.setData({ loginEnable: true }) + this.setData({ + loginEnable: true + }) } } else { - this.setData({ loginEnable: true }) + this.setData({ + loginEnable: true + }) } }, loginForm: function () { @@ -149,7 +215,10 @@ Page({ util.showToast('请输入密码') return } - wx.showLoading({ title: '登录中', mask: true }) + wx.showLoading({ + title: '登录中', + mask: true + }) if (this.data.type == 1) { loginCaptcha(this.data.form).then(result => { storage.put('Authorization', result.data.token) @@ -172,9 +241,17 @@ Page({ }, changeType: function () { if (this.data.type == 1) { - this.setData({ type: 0, ['form.captcha']: null, loginEnable: true }) + this.setData({ + type: 0, + ['form.captcha']: null, + loginEnable: true + }) } else { - this.setData({ type: 1, ['form.password']: null, loginEnable: true }) + this.setData({ + type: 1, + ['form.password']: null, + loginEnable: true + }) } }, fetchCode: function (e) { @@ -183,19 +260,33 @@ Page({ return } if (this.second && this.second.interval) return !1 - wx.showLoading({ title: '正在获取', mask: true }) - postCaptcha({ verifiableAccount: this.data.form.account, verifiableAccountType: 1, purpose: 1 }).then(result => { + wx.showLoading({ + title: '正在获取', + mask: true + }) + postCaptcha({ + verifiableAccount: this.data.form.account, + verifiableAccountType: 1, + purpose: 1 + }).then(result => { wx.hideLoading() - this.setData({ codeEnable: false }) + this.setData({ + codeEnable: false + }) util.showToast('验证码已经发送') this.wuxCountDown = new $wuxCountDown({ date: +(new Date) + 60000, onEnd() { - this.setData({ second: '重新获取验证码', codeEnable: true }) + this.setData({ + second: '重新获取验证码', + codeEnable: true + }) }, render(date) { const sec = this.leadingZeros(date.sec, 2) + ' 秒 ' - date.sec !== 0 && this.setData({ second: sec }) + date.sec !== 0 && this.setData({ + second: sec + }) }, }) }).catch(error => { @@ -204,20 +295,31 @@ Page({ }) }, readAgreement: function () { - wx.navigateTo({ url: '/pages/html/agreement/index' }) + wx.navigateTo({ + url: '/pages/html/agreement/index' + }) }, onGotUserInfo: function (e) { - this.setData({ loging: true }) - loginWechat({ encryptedData: e.detail.encryptedData, iv: e.detail.iv }).then(result => { + this.setData({ + loging: true + }) + loginWechat({ + encryptedData: e.detail.encryptedData, + iv: e.detail.iv + }).then(result => { storage.put('Authorization', result.data.token) app.globalData.token = result.data.token this.fetchUserInfo() }).catch(error => { wx.hideLoading() - this.setData({ loging: false }) + this.setData({ + loging: false + }) if (error && error.data) { if (error.code == 200101) { - this.setData({ wxflag: true }) + this.setData({ + wxflag: true + }) } this.data.userInfo = e.detail.userInfo this.data.form.tmpAuthToken = error.data.tmpAuthToken