From 24415dc4ad7e095c82a0c45d538ef22c6e0cf16a Mon Sep 17 00:00:00 2001 From: THK3121 Date: Mon, 10 Jul 2023 10:11:29 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=88=E8=B4=A7=E5=90=8E=E6=AC=BE,=E5=85=A5?= =?UTF-8?q?=E5=BA=93,=E4=B8=8B=E5=8D=95.=E6=94=B6=E8=B4=A7,=E5=90=8C?= =?UTF-8?q?=E6=84=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pages/order_details/index.vue | 2 + pages/order_details/stay.vue | 24 +- pages/product/list/index.vue | 25 +- pages/users/order_confirm/index.vue | 5055 +++++++++++++-------------- pages/users/order_list/index.vue | 8 +- static/images/daoru.png | Bin 0 -> 4078 bytes 6 files changed, 2568 insertions(+), 2546 deletions(-) create mode 100644 static/images/daoru.png diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue index 2d7372e..e21e7d2 100644 --- a/pages/order_details/index.vue +++ b/pages/order_details/index.vue @@ -220,6 +220,8 @@ 支付宝支付 微信支付 + 先货后款 买家留言: diff --git a/pages/order_details/stay.vue b/pages/order_details/stay.vue index e9a6168..e477d14 100644 --- a/pages/order_details/stay.vue +++ b/pages/order_details/stay.vue @@ -131,9 +131,14 @@ 商品总额: ¥{{orderInfo.total_price}} - + 支付方式: - 先货后款 + 余额支付 + 支付宝支付 + 微信支付 + 先货后款 @@ -161,14 +166,14 @@ 实付款: - 先货后款 : ¥{{orderInfo.pay_price}} - ¥{{orderInfo.pay_price}} - - 结算周期到期后付款 ¥{{orderInfo.pay_price}} + 先货后款 : ¥{{orderInfo.pay_price}} + ¥{{orderInfo.pay_price}} + + 结算周期到期后付款 ¥{{orderInfo.interest.total_amount}} - - 结算周期:30天 日利率:0.05% + + 结算周期:{{orderInfo.orderList[0].merchant.settle_cycle}}天 日利率:{{orderInfo.orderList[0].merchant.interest_rate}}% @@ -283,7 +288,7 @@ } }, computed: configMap({hide_mer_status:0,alipay_open:0,yue_pay_status:0}, - mapGetters(['isLogin','uid','viewColor','keyColor'])), + mapGetters(['isLogin','uid','viewColor','keyColor',])), onLoad: function(options) { this.credit_buy=options.credit_buy if(options.product_type)this.product_type=options.product_type @@ -446,6 +451,7 @@ let _type = 0; uni.hideLoading(); that.$set(that, 'orderInfo', res.data); + console.log(that.orderInfo.orderList[0].merchant.settle_cycle); }).catch(err => { // console.log(err) uni.hideLoading(); diff --git a/pages/product/list/index.vue b/pages/product/list/index.vue index ec4aeb9..a1e50ed 100644 --- a/pages/product/list/index.vue +++ b/pages/product/list/index.vue @@ -52,6 +52,11 @@ 规格模板 + + + 商品导入 + @@ -230,7 +235,20 @@ this.on_line = action console.log(this.on_line); this.checkboxList1 = rowId - this.show = true + + if(!this.checkboxList1[0].sku && action == 0){ + navigateTo(1, '/pages/users/online_warehousing/index', { + mer_id: this.mer_id, + product_id: this.data.product_id, + unique: this.data.unique, + + }); + }else{ + this.data.product_id = this.checkboxList1[0].product_id + this.data.unique = this.checkboxList1[0].unique + this.show = true + console.log(this.data); + } }, close() { @@ -245,6 +263,11 @@ this.$util.Tips({ title: res.message }) + }).catch(err=>{ + this.show=false + this.$util.Tips({ + title: err.message + }) }) } if (this.on_line == 0) { diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue index e9cfb69..f3f5c64 100644 --- a/pages/users/order_confirm/index.vue +++ b/pages/users/order_confirm/index.vue @@ -1,2543 +1,2534 @@ \ No newline at end of file diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue index c7ee358..f554a54 100644 --- a/pages/users/order_list/index.vue +++ b/pages/users/order_list/index.vue @@ -144,8 +144,8 @@ 共{{item.orderNum || 0}}件商品,总金额 ¥{{item.pay_price}} - - 共{{item.total_num || 0}}件商品,结算周期到期后付款¥{{item.pay_price}} + + 共{{item.total_num || 0}}件商品,结算周期到期后付款¥{{item.interest.total_amount}} @@ -673,9 +673,9 @@ }).then(res => { console.log(res); that.isReady = true; - let list = res.data.list || []; + let list = res.data.return || []; let loadend = list.length < that.limit; - // console.log(that.orderList) + console.log(that.orderList) that.orderList = that.page == 1 ? list : that.$util.SplitArray(list, that .orderList); that.$set(that, 'orderList', that.orderList); diff --git a/static/images/daoru.png b/static/images/daoru.png new file mode 100644 index 0000000000000000000000000000000000000000..e3a669e26bbbb7ee7086bf5c4a58aa7550d19cc1 GIT binary patch literal 4078 zcmVPx^s7XXYRCr$PU3qlW)%E|}S+bCg5C{-5Loh%HflPu33Oyj87HUPoQ`xF*?eC}7 z^Yd3rty&ifty}4_wDr`Zp6Y3-AX@5Di!HSXdN4pl$fRU}lx-%2%_Jm&tTS_a-ZxB~ z$xLRxD@;n>Kb*t7yS&f$<}LT#dmkYNTQ%=YNkYm*fN~kWT=6e~M*|qlpi}~?2?YVA_#@xShjjLW@4U)pNOQz;Ea6mRt<}IzV?3=w<+M>W86-vJ;>!4E(`{ z`Yl9rJc_7w>U_z8ck|xK49j;+pydn<*J&K8*f4O~1lqvB?`>50FI7xb5?wOjk8xSC z33!x%+W|7G)Yl*~_7Z5b2mJFKD%x+5kRY~(1Al_cihZDG0DM(i3uC)6fWHyUk7d&& zr;(}}2EUi2 zp{er=scVuY4QcViFfut8_LO{Fl~#l}bAnN-0N_`$;kciOyjp~40=|y-4)Vgf8NdQ9 zO7unB*nSGTPQHf&U+jdJyJU&5n&MG7bT+Qbx)mvL8M0`Ub|T=f^}tdGIW8!r_4ii| zyqimg5C*-^pc!g~_eCcx{FB-@vG?>=Fnp@mo5_mnvKC@y)?%0pIW|xUV7|ph1r2Hx zR0X`7%SI7QA2K*!jnGImXIowPbItQ;>^Q9p>#U@)xPAOXNVX2vgYJM(63-jngf}MwjK~0+E3wZn+r#q%2D00 z8*QHO9^kaNp}4EyDT6GZO3diIF^i_Q$^~CG@XXsSwMc&#-JV2UTWeP{UOVt8TDn4~ zOM(g4j94Je)d`lQh;lu?PL!Vd8%pZl4*LPKlk>15f0aRVK5xlJ<85-iow9*N}Bj9*nDU$>f7r=$ga;`Chd5PXbk+yPL3bQ z;Vlbz7nk2k;CGC0avg83z{cvIg#~^2gjE=-a$autT)_IuCquv&Q`S9&&tq_WrW|~f z_F;x^v7L(FjYb$1_@lf(#{$zn0O`?~srh|F)f%{3s)9(x^s;Qi;~1T)ZT)WUtjB8y z9toNEug<&)H{}?1-fQ&0H)RYJAB%)XMBthCTHUbhB+xW9phlw+r_k3b9u4Vs?Z}0g zV_P1LT-NWE^`GLs!!HE&6;}WM#V^t)zwjO&mh-Y5_%&3{+$+y## z&=o$?V(DV%8w4yhN;4mOvG%h&LtFyOCp@WnZtt!0`L1(#VgG$W|D9+_#)DISXVmcg zd^g(2u_Bz1uomy;{nrDg?M7-PwtO#_hwe^)G<7{JCjA2re!cHrw0fF?hV=a@uV9cR z)yQEo;G1is;vKz(^Z~qcH-PCzY7}l8DYkgubNt2-vEg=4cTai_!w2OUBJWG4yvIgG z*G2{Y7(3^hfo)o}@%lX2bLxFm)$hXDHn&)4LfBoE=D?CXaXa{B>uXQ1MHfHq(!9qo zCao}tl{h~LnW3N%h9%lCap+7;8*wwt8e^-xz`PuCd=w}r#Nyptz7^n`vf z{464iaKImFD#M!xpVK0`PueAUk4l#$fo;>lXCxm_q&6{QCT`7rK&wuFw~-_0&LRkS z5&L2WeXiw%>T0gUhU%Y2Ra97?u)@H0q{)dl4?Y`}R!s--*Cjr-Qs71Z?-V?T5lNb+ zBqn%^vuR3C$Vd?IZZ3NnpnKE|%un-i?Ix7eMLjV~UdE-prkYr^crmWo*-J4a>ozU0 zNLPk7D!SLtqzCw;ygk8;^pgbAbYt*O*Lr+*>Vv3C_9u&KlX4+2F|} znkwC4_5knZvc&-XSv~7+$^qc}Mv&oK(qr)z zT#=j#j|f#u901-p-~n!HhBdQ*3eHOw?`G$G5v-{dbR|XI^&8j@pDV*#hm6@y z-ZB0Wj#?1`sDBe~X5nu3H!pkeV%Y;Y-_;mZn4Z8h@Qj@tkNYit7l4psZB&iI zbdU?YAT7?k5p!+J5ob<>*u#q}K)oXj{3;4}^X=mv!syhA5VunwxnGC#tUPy=p1=dN z!$yU3sCyeZq=|G&g^|0f@dFZPN`TdzAcf^!ik56mM~Amn(FfKSc(i-akWNQ=e~|?y z-LfE*0)HvM)+$41;NgLNgsF#)pGfh436$xiOx^zF#vpY zpcr_ZTo$Q9ho>G7%d5`o&u?e^F zg{~%~SkpnIcPR!g8#q7#7?nH@%krLp)f_K<1QCR_srqS%n9GcWEG(VyIK=&dUX6gA zSG>z$#GtFNJpTy@f4yk+ZFSgCy+*Qjf15C5Iu?zUm0=_6+c2>HiguD^Cfcz)e-%XJ zuxO3#ry*i2dndsSA2bGcPtq^Yih#$iShuj4LRRGeM9P5`O{DF-UbPxc9cM$VcCPK4 zm_G9BvaDH7C&?{*C0>N2Scl--1y3V6t~;$u+Zh7g`aogDM!=&%7rrnIL z41bitc7U&!{mCM9jCJ61(~59MUUxu6m$w7!t5${NM~UAEg#3&dvO~1RlvOlr9?}z{ z6&AdB*)4>)+4&OytFHv$=jZ${iZka)L;a-oPx!P>bJSuFY$96Xp2^Q6B`%^PV6}}L zYc5*6eyKOHZt;ORR(&NVXfeR~Isb#=%o`%G@XZmaITG+9#KVFiVma4bye-y&4~&z4 z=ilp4-LOXs&LOnnBGv*ro%f(&*ch7A-m_G@*twB_Wm>g}b>IVQ860i;7d9PyTI-N| z=qC=DfrYsbMA`xMWB~>OzmS0Uv}zISz>D0b?@n6V1J0h4f0d%jdN*;B{l@r*WtZ2A zGsnxwAoSgAqhcv}pa*!7K3@x~*vM*fO2j(wV$e6*zm2IQM4WDS`^dFHN|x*0h9+j? z&iplcWtrEXM%T!xy%Q6k#c%gKHC0Uxs{RN3c>BT=*uELqN?&20BlX9is%_j8^I523ooeDn*#I%o;`tnZ! zR#i{3zX3165SJWxP5fEUiBr@zt7-fkAj0^;Q#FAu4#+lg%X@(o|^|WA+MR~1ianoccN7&*!5eo$YrYZs{sw>jhfg~o7m8pcN%9@otURr!l zT{t3DauUTP6t)%*I>wKoX{W-`MVw09?EDdcwMqnv>oZY@CS1i1C46F~uSkx&ukhDM ziyx{;B?7I?rowf75k&;PyF|Hl7Xeo*k-EF?FW6qYQ3*-R_U(Pjm8ocHHVS7FQJ+s8 zMO{4AmOpg2RHL%K1oiDFz^tw!w#-55-c4BfutYoZGp>_DKNL3Y%8vK3qrmkN(45-Hwu8fc*i zY;A^RVF49%$^l2V#S3O4BEbX84gy^xhxrxMr__wDIfj%m|8mONlfg(R0Wkgw0=Cbg zGPr_Zou%~23Pl$0mwuS{+T&o|3Sh#O3_gLXI?y>km!<}niTdD96}ed9Zw&xL-WgFl@CbCJ41Us1MgK5>cMnU$ zf%i+Qwn+d$}cX;>X)wKGu z+|pb&-~;g$F6R_@uQdTTF!%<5uK_eZQ}CsLE&@s!w2gsnEimtv>$)}424VvE-UF=W z>XamOOay$n49W#)EP?ERZ!m*W37pCx=`V!9O$=%#a5I2&3_1?*VS?$f_%|MwicBg9 g|Kz2S$VTD)A5YCLjl7~pq5uE@07*qoM6N<$g5|5m9smFU literal 0 HcmV?d00001