From d442e3bb74d11f86ac165fd04bda1e5ca495de7c Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Wed, 19 Jan 2022 14:22:30 +0800 Subject: [PATCH 1/6] Adding repayOrderWX API --- .../royalcanin/good/OrderController.java | 27 +++++++++++++++++++ .../good/constant/OrderResponseCodeConst.java | 2 ++ .../royalcanin/good/service/OrderService.java | 22 +++++++++++++++ 3 files changed, 51 insertions(+) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index e9e2de00..cd08e592 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -1,6 +1,7 @@ package net.lab1024.smartadmin.module.system.royalcanin.good; +import com.alibaba.fastjson.JSONObject; import com.alipay.api.internal.util.AlipaySignature; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -13,6 +14,7 @@ import net.lab1024.smartadmin.module.system.alipay.alipayModel.AliPayEntity; import net.lab1024.smartadmin.module.system.alipay.conf.AlipayConfig; import net.lab1024.smartadmin.module.system.royalcanin.good.constant.OrderResponseCodeConst; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderAddress; +import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrderEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.model.OrdersEntity; import net.lab1024.smartadmin.module.system.royalcanin.good.service.CartService; import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService; @@ -168,6 +170,31 @@ public class OrderController { } } + @ApiOperation(value = "重新支付", notes = "重新支付") + @PostMapping("royalcanin/repayOrderWX") + public ResponseDTO repayOrderWX(String orderNo) throws Exception { + OrderEntity ordersEntity = orderService.findByOrderId(orderNo); + if(ordersEntity != null){ + QueryEntity queryEntity = new QueryEntity(); + queryEntity.setOrderNumber(ordersEntity.getOrderNo()); + String orderInfo = orderService.query(queryEntity); + com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(orderInfo); + JSONObject jsonObject = (JSONObject)jsonArray.get(0); + if(jsonObject.getString("status") == "0") { + WxPayEntity wxPayEntity = new WxPayEntity(); + wxPayEntity.setProduct_id(ordersEntity.getProductCode()); + wxPayEntity.setTotal_fee(jsonObject.getString("salesAmount")); + wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo()); + return ResponseDTO.succData(orderInfo, wxpayService.generateQRCode(wxPayEntity)); + }else { + return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_ERROR,orderInfo); + } + }else { + return ResponseDTO.wrap(OrderResponseCodeConst.WITHOUT_ORDER); + } + } + + @ApiOperation(value = "更新订单", notes = "更新订单") diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/constant/OrderResponseCodeConst.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/constant/OrderResponseCodeConst.java index 56f341bc..88a32342 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/constant/OrderResponseCodeConst.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/constant/OrderResponseCodeConst.java @@ -20,6 +20,8 @@ public class OrderResponseCodeConst extends ResponseCodeConst { public static final OrderResponseCodeConst WITHOUT_ORDER = new OrderResponseCodeConst(9007, "没有该订单数据！"); + public static final OrderResponseCodeConst GENERATE_ORDER_ERROR = new OrderResponseCodeConst(9008, "该订单数据有误，请联系管理员！"); + public OrderResponseCodeConst(int code, String msg) { super(code, msg); } diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java index 19ad8bbf..ff69b234 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/OrderService.java @@ -162,7 +162,24 @@ public class OrderService { addOrSaveEntity.setDeliveryType(jsonObject.getString("deliveryType")); addOrSaveEntity.setSalesAmount(jsonObject.getString("salesAmount")); addOrSaveEntity.setOrderDate(jsonObject.getString("orderDate")); + addOrSaveEntity.setAddressCityName(jsonObject.getString("addressCityName")); + addOrSaveEntity.setAddressCountyName(jsonObject.getString("addressCountyName")); + addOrSaveEntity.setAddressDetailInfo(jsonObject.getString("addressDetailInfo")); + addOrSaveEntity.setAddressPhoneNumber(jsonObject.getString("addressPhoneNumber")); + addOrSaveEntity.setAddressProvinceName(jsonObject.getString("addressProvinceName")); + addOrSaveEntity.setAddressUserName(jsonObject.getString("addressUserName")); addOrSaveEntity.setPaymentAmount(totalFee); + if (ordersEntity.getCouponCode() != ""&& null != ordersEntity.getCouponCode()) { + //coupon json化 + OrderCouponEntity orderCouponEntity = new OrderCouponEntity(); + orderCouponEntity.setCouponCode(ordersEntity.getCouponCode()); + orderCouponEntity.setCouponName(ordersEntity.getCouponName()); + orderCouponEntity.setCouponId(ordersEntity.getCouponId()); + Map orderCouponParamMap = MapRemoveNullUtil.setConditionMap(orderCouponEntity); + MapRemoveNullUtil.removeNullEntry(orderCouponParamMap); + net.sf.json.JSONObject orderCouponJson = net.sf.json.JSONObject.fromObject(orderCouponParamMap); + addOrSaveEntity.setOrderCoupon(orderCouponJson.toString()); + } addOrSave(addOrSaveEntity); return ResponseDTO.succ(); }else{ @@ -247,4 +264,9 @@ public class OrderService { } return endTotal; } + + public OrderEntity findByOrderId(String orderNo){ + return ordersDao.findByOrderId(orderNo); + } + } From b15b585d4c553e874a1908088edb1061b6d16129 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Wed, 19 Jan 2022 14:46:19 +0800 Subject: [PATCH 2/6] Adding repayOrderWX API --- .../module/system/royalcanin/good/OrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index cd08e592..43bd0cfa 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -180,7 +180,7 @@ public class OrderController { String orderInfo = orderService.query(queryEntity); com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(orderInfo); JSONObject jsonObject = (JSONObject)jsonArray.get(0); - if(jsonObject.getString("status") == "0") { + if(jsonObject.getString("status").equals("0")) { WxPayEntity wxPayEntity = new WxPayEntity(); wxPayEntity.setProduct_id(ordersEntity.getProductCode()); wxPayEntity.setTotal_fee(jsonObject.getString("salesAmount")); From 3293b257345ebb7ae17cc8ab5f86d9fa8b5186f2 Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Wed, 19 Jan 2022 15:16:37 +0800 Subject: [PATCH 3/6] Adding repayOrderWX API --- .../module/system/royalcanin/good/OrderController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java index 43bd0cfa..83877afe 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/OrderController.java @@ -103,7 +103,7 @@ public class OrderController { wxPayEntity.setProduct_id(ordersEntity.getProductCode()); wxPayEntity.setTotal_fee(StringUtil.toString(total_fee)); wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo()); - return ResponseDTO.succData(wxpayService.generateQRCode(wxPayEntity)); + return ResponseDTO.succData(ordersEntity.getOrderNo(),wxpayService.generateQRCode(wxPayEntity)); } return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_FAIL); } From 320c23dde5d66c7867fb85f18645c8d5d747a669 Mon Sep 17 00:00:00 2001 From: summation Date: Wed, 19 Jan 2022 19:08:22 +0800 Subject: [PATCH 4/6] sumt --- rc-busness/assets/pay/fail.png | Bin 0 -> 12262 bytes rc-busness/assets/pay/wx.png | Bin 0 -> 4200 bytes rc-busness/assets/pay/zfb.png | Bin 0 -> 3661 bytes 3 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 rc-busness/assets/pay/fail.png create mode 100644 rc-busness/assets/pay/wx.png create mode 100644 rc-busness/assets/pay/zfb.png diff --git a/rc-busness/assets/pay/fail.png b/rc-busness/assets/pay/fail.png new file mode 100644 index 0000000000000000000000000000000000000000..71821a9b81a294b89db107458d57e11eec7098cc GIT binary patch literal 12262 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 Jt7R>M{}0}}0Z;${ literal 0 HcmV?d00001 diff --git a/rc-busness/assets/pay/wx.png b/rc-busness/assets/pay/wx.png new file mode 100644 index 0000000000000000000000000000000000000000..7316a9d7a3e4c17069e575e72f511572643d9db1 GIT binary patch literal 4200 zcmV-u5SQ6w)K#D9yIMo(xZ8Fn^ML7jgAv0;x(#%ZKhNfw{WSN=w-u1ha zrevA7%$DLiC$#ka|9}7cy?g)rZ#R^T^%Ec#2dOM(3Uv@hD=4L2s`3g#X$9fDl2iPR z(hyPjUe4$qPWZc=sC$%twf#V0%VAPOTY;|6b*=OXPfsu*(P~i-EzUOvVLR zU4-(#5taRgE6S^p1x@Xl$VrDMZvZ*A%ywC=wy$7CtR$Q|F_0x4#f)e<=L%sYLR9{Q z!sNAWH7!vio=o279H432t7h31=>cq)W!Ne#6Q$DS0az+N#73&hw}k7O_omCQN1ro* zrvJ?|(`F+N!Gc_ZEhObqNwc!B1y!z+jf5t?8>wyCW0o(k08QI6ZM@xDvW60NT`m;L zl?+amM|+QwTRN9E9m_^$Rx7Bqp~}Z7eU1?}IU6PN#jA4OrEvKR?RCxdnU0YeKz9=6 zn(MijGWxw!wVljP7~4*Pjrv7oXXrL^CsEDv4br6zkaNAWkWD%5CCXV%x`Ulcdf4$m zI3_P97q`UH(IYK@rq<7zR>17rU~fF>4Dw;2<%EQK<2}C4MXmeI>SP+A()#jB#%yoH z-V~Y@{$ZrUcI%Jx#3v5awKSU1&lEt;jg_TroU|8yjm?bE4?7J&ipz4mqJ80>h>@;_ z06AZS&FL%p55TD~688V}9yV!jOg{Xvj)fgPnfpQFw7SsKz&N`ooylXbcfpfxBb;<_ z#{a`P4KgP0Q#m=t6$=hNKABMh*MOE%%Fn@{<&ZxEKgDBtDyoEUkL(Eg^iDV3738e< z-Y+q_$_zL-PT}p7Fz4i10Mj5V@lgAMJ#7e1^^aCgBu9ODsl{TigoyJ1(3c=%&KQO% z4~A=l-_e?*CP0p@RZA@rd%?^X1vq_J6+b;D#~(aAfA0}9fNIjLCpOn4&*d2R*8pi^ zRh!68RP8a zZpz8$u>~iXX3T&PCgHFeKUxu86zv+xo)RFJ-}@*d^cuafAQZ+;{c$XjSlh91&-)qZ zWym7pJe#FtIg$dufuiFK8L}XNJz5*_1+O&($PuXYSh*#r3l8UpU|Vhp`+`qqp_6G= zcfebRoYLcj@KTX*G|iYMp%RbHi7wjHGL&u9U~a!>6FlWhG-Y!hQ;GWZNK4aGYeJW40yMRuVs-(wHt88=BwT)u!0&sR1b&&JbApQ# zTGrsXg)sKBtmNo0i@;VU>gnyirlvu%VJir>X9H}{(o{0UF%Dz-TEE(N`TKS6b&R4B z$#~UsjzsAq7}hRglm8l?XD+)}TJM>}7+Z?;=}gYZKh&Nh+uE13_omQ;Vui26cKc$! z+yKn;C76y&M*-vv%&uUntx0=e9>alnZMe4SPq04#Yxq+d@SZDi@@M?313xNg{uPUK zUDR>4zNbo>iQOHkei>hCF8FNt4o4KiS4DlHM^ldDuRK#C(o0z7rTJJ%B7LhS;#GsT z=;R7=HF)nq^6Lj$gTf1J4j=FSI7$6wiPP^{jjF|6!}!(sd98IVuj@^uZ2KH9QLMuP zN7%ThBb}kI;((8jq>3ekiuxP^Dl%6|t51BVii4S*r%- zuJ^2f!G0oN0Et!HS{p1r3DEQa67HNeYn5i8a&MTCX{4s{xRz4R21NWsdIpfs1xPZ| zo%cs}23H#zb9@|^9}}kZx8N%TIuXPs%cH)=e`<|2P*Spo^9B$E%QWs1rKIEva@JQ} zDKY6O&Fw|_E*P$}jT9;l%q*Uu7R*y5(%E)eXczgUc{jlAuQ;7>OL;$!y^-<|7&^E( z(fr;JT%t-NoicsTxqNlFcK5m@KyJVHS$w@O=m7K_0Jee8l1T2W-D8hpYsjaX3Ho+aOj>4`$MQ^WdgPFhr_$q~P_{w#miHgLQMwdqY>D^AHZU}B3F zsRg2TkE$$L1o=I%fByv{jacf!1v!LMxSOhKFR`#<_!85oN@n0)CFm0pM}o zH;cOJE6--k@`m1IIpv$eHNhph24twbvhCGpp+NHhR>h~VQjTM-{7O;O7a6y{AN|L> z-MYp;FtcC^l5N(wtyr?K>)-+)=%hv2>YL!|`P9|m`68q2Xz&jZ_=@9w+2$h>pGc!8qLnV*;swo7;S$M@-P_lDM{bKgulR1rg}L zpSe6z6MSbR145V25QQuu5)VddLb@pq_fB^Sj~CvE4?Ra^^ttGTjhlyUQ#h8+ZJrAy zm2QD^X}Y!tfI0*~2LRACGm{3xt^_Ba+g}@OHAA10MkK%d-n-zutim3@G2&}_Y!o>D zs-;+6&kn|Cc>j3oj>c=XPBO%1Parm1A>_b8+7EYW3H-J(dD%hAJuw0uz}14K#4Jwe~flnShLHCcw7;5x`kJn0moBj3TLi zW~!vRkX_bL-GLP|b#NSoDpy5okd_(oOxrShs@-be2!K$FGk%czcwHo*us7M2#^eJO z0wf%t_k?Rh!&4h31t5mH1QXr}=kqG$d{Vj>W&Y}w5cfO$B)5Z5G<+yH59tpj)iCY` z?+$=DZ-5rgCE*uGYJ)pQ(Tdf(&3iYT%iGN)+z@a-13ySV52P{gZdK)XM7n|xYbmXT z7bdeFUhmmlm20*72^||9<1B>}zJ*oh!^&tu;p*OK?QTtP-?`m$22;pwSas7?sy-9# zQ=Zalb8-8tYbocjfAk|p-&9rApO|tKQw!opRZ5@iCkJmoSaVP_4Kk7!0Cl1}^({4a z>lFm6 zas6ObPZ0L|o3ax7Z2SDZh6$`Gfhnhr<5S=a^53;~2ESoyWf;vOgZJ)0^;^h(o@Kzw zW3k@yfpo_t_(B=h!C@5t%vkT2_tos{KRMufB9TVe^AtUSFw#djr7wp2;y0w*4wnHI zqgl`_0f2VnBoiGadQW#N?G>2WA?uO5SV;RoWmf2GZm~|eE>uMO+ z8R++T9RuvdY0v_n=ZJ;U7{K`>Xq%2Hu`BcGJ!{RS3^jjlCA+X7MD<1UL0aXnIH{Ko zq+A2lS0VGXE)#$-@kNnN7I05eR{)r=!c#jtl_PedJqA?@%8)(@DI{@mzOE1G%>y;K zPfL_-!bz%|H-f$^L}@(o2>Ja{)j&-l+^B$r4FA4|vz%3tgQKPqwtl z^h$yCdCYTxt}M=vA|IXflRhXM`aM5J{PX>6l`zXMnywU;*S6J#bPJ1S<(Z*#)O+V! z82O7RFX_^&WKC;b<9CMvG^1fwnUxfXPS!EGp_5dQlK_%r%K_3MGZV~)W=f!X`Z&&! z7oxNDkGYWpq=;88L{~Ynx zw~cm3vR_dqp6G&Lb4q~3KO$Fy+dC9}fn)n1y}3qF`X4gmk*A}XsN=)^c+AX4hx_q7 zsyD;tKB~j43`aguq@3Q`GdZC+yz+k|PP-%gO0dDOrf*WHV{64(R>}63De{C;-g?6J zXs#gf0y(0GPvHf*IK1=CaFiavE!R-{!QF>V#cYV?%R0T2WeYEg_3-^eFVdAYcw3R) za2pusM^W1P+DMv|4UwW&RbZVY?lF{@LOu^fFyOr?FTa6R^)_YdE`%+iI3sPIoZ!6O{`}ukNtspSX1J5VLZ`wiIL688la?rWPQE*AzY`t(M*h!hxwWo zDf}D|uMO`A-jGT7lJ*K3s+rqg^?6F9-{ap-na8b<6s|QWe5KZHLNh351&|oPx!F09 z*@_;-O8T;y0mqDn@@Hj*-<)kSE^B}WC+zT7RarP$gH+POQx%>h!v?}PaVdUl^uoO- zb2{04l$-%H3@9Sqk8tQxqXbnpiVx)#X;Ng@HzySNR-?Ni>5iFmfCd#v=D1nm4G1l- zGpa$QtMni}LQ-)*f33`8zs_}{ZE%dd0W@^d0xS!$*I=+^*n$^iQYIRZ$B$sO?7&9a zkg!nyftt|1Ou;qFHzoiLQwAbf@rhZ+e>2|-52dUYWRx^%+A~--Tweh2ZxpKp&CH|00001E{#7`EDXnNJ7pAI0ND_lF0V}yq=_}C8@ky zy)f;ciO`5Q#$JG=6eWN2-XnGK98_dfyvgnSUP{^zwf$Yq0?#{;Flebg%{G9FE4?#G z%9o)+lkH(GF)C2OEdXdyb*bm$#3+Q1N*bWzHyS69s=f+BH`u|DjWj;;2ejX=crbH& zGBlF_NQ&Z0-!qteF^D8VCmHr*kA9nEGI7BwRm%XCEb)zmp0C2dF;*w*(*Bb6`2%#zieGw;SmDDGK*g1Q7~;Tt z@KC+2OwwKYVq;Ii!xq&%;8|yuC({5GSNI--8vh9cRI|jpV?P)oO_F%LrqunK8U9QG zRJ_FZGoi~5V2TwpM7w<-NjgG-IaQ_ZHSu_j3sA|D^CL;Rwt!GpJYqfRdjyu}g(9X_ zEpQ)*#dl1A*jr_gZ%b!K#hnH;47X@%p7!>y`!{qnXNLey`Rf+vXy>^1G4R$-W4J3O zl2luD)O|amxu{8RhX9pSc>e;M^H5jt+}U%&AiWHu{dlx_qXJY??wtX1ygrqTs+c+5 zg&Cr7&=MfJh*xK}fKD@)FZ6s8IcHRWiYvVTh26P6l?)E-MYQlbC-wG(v(V_1v}#v? zc6|$1lTdPy7}uC;Jrdj-;sP|Uvgr<$l$6v~LMI=BP;=3(F6y5V9yy$Amb7$}pElL$ zoeB{1h9Giw^+NXtp?tQJAQZZGpky&2v3)Q1~DM)yPiQzr_rV|b8tB}iKjzZsbL3d74Da##hgBmYNT7N*JgZ0*I(4o^hooX~Ucidi* z?yoBIyd4G*JXaN@r#SB54mwO2qEO)k2W4l(&0Y)&IO>51BXY364`~`)*M*Bjeq;a4 zx3@O>Y0D9N4mgm8R9BaIO40F}6kTCr(zt!p3Ir{=9O{mkBEpTlP0#xC{X@q<%8GxXk z6tPx=To}ujz~awG3=s6>EiQ69!&R&$AnCoG0s45K))q}OK#?u-BMnH|8CYV@7olcP z8QdZ7+6!|%IvIehj%9$JMxYoCpm(+hXziZM09mDNOMhhgFw|p2QMvC*ry^t4M66Dj z22W;4Qw)2Z-(R7}f9i}1&}yU_>)^>+^RY+?YLy95}}SsJC0tWEge_yR(qSUhMdJN%a?CgABE~Y=amO!i*`-H((}j+2aO$!jLw|Lk2^I>V`MnMgZ6x<(W~qH zbio&wL_!^;E*C+9nqR?QKbjDQD1%snrsXL#5MIg-e4IEUn0}>7{UVZDmaH{jX|!@% zfP7H1R5V;Qctw;{dTT&@UMeQAgXX|YqG#r~+5yyrh`aJLKW#?VkH{cZZ5i93b=c{d zshS~Kx>rLQAD-cCr(y@|H7ef_pd*NvQq{OdB)Y=In_UpcPmeXvhwL(qKrh94HK9IuS{0FSu~jmD=&mJAbwb+w#3m zJCEx~Dd5flT1V~XF$yiXh6~r>ZTE2vRmT7wJ)1i9G6aYLN=C&zPNE;>2%0nAK_jxc z)M3qUF<{>}1aq(L$ffE~vf!A8gFmMI=uJ)N z+&WgJn?|dYnI@Cc1mF1JZa|y%^9v0CV{l0s6W=wbBzbL2RTGaPz$2xf4~IHO^tgI!Djybl{`} z)4`1TEDG;zYj_C^P!_=C?EMPZrM!N^h_Z9C1aZ+!jS@}j0E+?V;+qnpstvF`oQ8Y^ z1Kml-LhRWX2n zK7eX%Iig_`?9JYz@f{2lmmt-U=2H!po`(gUP-3_7~3VbTZgbwwno*cOYBsVDV=1X$gZEZ(C8Vf3bSOrIM?aqWvITI(Py$XaIJa zCw+5cAR!~kQ1roB+Vl~sQM?Z=y)yHxGVIb<@6wD=BDb$FVy^Ln6(c-g18)T=2L42Y zPFt~|JC12|0tGpa+d8U9h86Ak*vFAuaMDap#sMFDu_?n;9Mnl#4nw{9ux|Psix^>uy;LTRrtiGCJ~${Gj#@NJ z0lW1`dt;Pa5ooU68!!^lj@-8sw1&f3OahH@@O=45bDYtRRALw&4n{eidS{!~?zpJk z!6DO`U)g*Qe8&ni#*D>#9&84Sd@x&=I4YLVaoyN`E`j>|!MKIf3zisGNsf66u$X~} zqC;!Zt!{filGy)2ZMVY{HJgZS*nSmc3;Hn< zKirQciW6kMP{EF17^F+NloT@$U!oTECN4Xih`9U<>Dhp5c-Mu_6%C-7_;8&ShT71^ z!0e15V1uxe15gQMhE6w;krEs~ryCKjt?57Yjmi*tRe5MAG9WwIXF zcTLq1_Z-WQBJe`*drM~NExwIFv1dJ9XmXeMQSv5oUlr?7&A7)9MHLOB9pv0-CQmcT zS9j^wfO^lA6${;8$6_chKsSY>a`g}CfjX&(S=9^NYvb*fDS!;4UEcfz9zc63 z9>JdQJ&N&9RF}E`XogqQ00lwv{T$D&F72u6#wVo`F=J#fn6!$85-6(hA%~Z>h}`qd z>_E5agA%HyiNa+My7yb*$&v)M5-ut~-_NPI_<4q#txVQceG%t;+$7y|JLQK3+CVa% z?eM;avgfb5YT;()#WlJ=1hPC&x0Wx=j0x?NkOYMiKqc~e+_8qi6IWZEJhlDh=R$G* z=IviNKTT$yqycK391p`3qNwmZ4EXqD7)pMu+^R|CsbyvEq@EmT<-<0B41!2c<`450 z;biOgAUrbp#hRx8J99wj%Cl8vu#MgE2bLn2GVhJ%yA)O2iCXL&*r|TzmukKz%C%>( z8MRU>D|^OIbVXSkKd7fR`L0!@D8zyall_qb&YvJ5@8hR3R{68spC)R2&2EFeDrREV zqSsGmD(>_VSY)26t9dxV%o9S-$HMbq=<(tv>i}dOB;ycDE_Irs)j<;LbYJtq6^{(G f>#;c#+!FmCum9)GnN&!v00000NkvXXu0mjf&Gz(o literal 0 HcmV?d00001 From e133d3e778caa85560b5c43c5a2ada75abe6b176 Mon Sep 17 00:00:00 2001 From: summation Date: Wed, 19 Jan 2022 19:11:18 +0800 Subject: [PATCH 5/6] sumt --- rc-busness/pages/address/address.vue | 127 ++ rc-busness/pages/index.vue | 1339 +++++++++------- rc-busness/pages/myorder/userrecord.vue | 1403 ++++++++--------- rc-busness/pages/personal/discount.vue | 39 +- rc-busness/pages/personal/integral.vue | 50 +- rc-busness/pages/personal/mypersonal.vue | 140 +- rc-busness/pages/personal/settlement.less | 414 +++++ rc-busness/pages/personal/settlement.vue | 1053 ++++--------- rc-busness/pages/personal/useraddress.vue | 567 +++++-- rc-busness/pages/personal/userpay.vue | 784 +++------ rc-busness/pages/productdetails/producted.vue | 979 ++++++------ .../pages/productdetails/productlist.vue | 1081 ++++++++----- rc-busness/pages/useraddress/openaddress.vue | 1 - rc-busness/pages/userlogin/edit.vue | 490 +++--- rc-busness/pages/userlogin/login.vue | 402 ++--- rc-busness/pages/usersearch/search.vue | 1242 +++++++++------ 16 files changed, 5410 insertions(+), 4701 deletions(-) create mode 100644 rc-busness/pages/address/address.vue create mode 100644 rc-busness/pages/personal/settlement.less diff --git a/rc-busness/pages/address/address.vue b/rc-busness/pages/address/address.vue new file mode 100644 index 00000000..58b6837e --- /dev/null +++ b/rc-busness/pages/address/address.vue @@ -0,0 +1,127 @@ + + + + \ No newline at end of file diff --git a/rc-busness/pages/index.vue b/rc-busness/pages/index.vue index d9273711..a93c17ef 100644 --- a/rc-busness/pages/index.vue +++ b/rc-busness/pages/index.vue @@ -1,19 +1,21 @@ @@ -712,9 +715,11 @@ meta: {title: '首页'}, data(){ return{ + fixedHeader:false, + dataLoaded:true, useraindex:0, usertitle:'明星猫粮', - dogtitle:'明星狗粮', + dogtitle:'明星犬粮', processinformation:[], catshi:[], userindex:0, @@ -734,18 +739,22 @@ userserachlist:[{}], doggan:[], dogtype:[ - { - title: "幼犬", - - }, - { - title: "成犬", - }, - { - title: "老年犬", - }, - - ], + { + title: "幼犬", + }, + { + title: "成犬", + }, + { + title: "老年犬", + }, + { + title: "品种犬", + }, + { + title: "亚健康", + } + ], anchor:'', dogshi:[], catlist:[], @@ -788,54 +797,56 @@ ], 'pc':[ {src:"/images/banner/pc-banner1.png",link:""}, - {src:"/images/banner/pc-banner2.png",link:""} + {src:"/images/banner/pc-banner2.png",link:""}, + {src:"/images/banner/pc-banner3.png",link:""}, + {src:"/images/banner/pc-banner4.png",link:""} ] }, showingBanners:[], + maoganCurIndex:0, + maoshiCurIndex:0, + quanshiCurIndex:0, + quanganCurIndex:0, userdoglist: [ - { - title: "小型犬", - catimage: require("../assets/cat.png"), - }, - { - title: "中型犬", - catimage: require("../assets/four.png"), - }, - { - title: "大型犬", - catimage: require("../assets/one.png"), - }, - - ], - discoun: [ - { - title: "幼猫", - }, - { - title: "成猫", - }, - { - title: "老年猫", - }, - { - title: "品种猫", - - - }, - { - title: "亚健康猫", - - - }, - - ], + { + title: "小型犬", + catimage: "/images/dog/small.png", + }, + { + title: "中型犬", + catimage: "/images/dog/medium.png", + }, + { + title: "大型犬", + catimage: "/images/dog/big.png", + }, + ], + discoun: [ + { + title: "幼猫", + }, + { + title: "成猫", + }, + { + title: "老年猫", + }, + { + title: "品种猫", + + + }, + { + title: "亚健康猫" + }, + ], discountlist: [ { - title: "明星猫粮", - detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', - catimage: require("../assets/star-cat.png"), - price:'￥2' + title: "明星猫粮", + detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', + catimage: require("../assets/star-cat.png"), + price:'￥2' }, { title: "猫湿粮", @@ -851,7 +862,7 @@ catimage: require("../assets/cat.png"), }, { - title: "明星狗粮", + title: "明星犬粮", detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', price:'￥112', catimage: require("../assets/six.png"), @@ -909,64 +920,72 @@ ], catlistvideo: [ { - title: "明星猫粮", + title: "主食级猫湿粮", video:"/images/cat/one.mp4", catimage: "/images/cat/one.jpg", - detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', - price:'¥123.45', + productimage: "/images/cat/star-1.png", + detail:'为10柔软细腻慕斯 适合离乳期幼猫舔食', + price:'¥77', }, { - title: "猫湿粮", - video:"/images/cat/two.mp4", - catimage: "/images/cat/two.jpg", - detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', - price:'¥123.45', + title: "幼猫成长专属", + video:"/images/cat/two.mp4", + catimage: "/images/cat/two.jpg", + productimage: "/images/cat/star-2.png", + detail:'支持幼猫自身保护力 为快速生长提供足够能量', + price:'¥147', }, { - title: "猫干粮", + title: "室内成猫专属", video:"/images/cat/three.mp4", catimage: "/images/cat/three.jpg", - detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', - price:'¥123.45', + productimage: "/images/cat/star-3.png", + detail:'高易消化蛋白 减少粪便量和异味', + price:'¥140', }, { - title: "猫干粮", + title: "英短成猫专属", video:"/images/cat/four.mp4", catimage: "/images/cat/four.jpg", - detail:'为10月龄及以上英国短毛猫成猫量身打造的精准营养', - price:'¥123.45', + productimage: "/images/cat/star-4.png", + detail:'增强肌肉质量 支持骨骼与关节健康', + price:'¥183', }, ], doglistvideo: [ { - title: "明星狗粮", - video:"/images/dog/one.mp4", - catimage: "/images/dog/one.jpg", - detail:'为10月龄及以上成犬量身打造的精准营养', - price:'¥123.45', + title: "主食级狗湿粮", + video:"/images/dog/one.mp4", + catimage: "/images/dog/one.jpg", + productimage: "/images/cat/star-1.png", + detail:'柔软细腻慕斯 适合离乳期幼犬舔食', + price:'¥77', }, { - title: "狗湿粮", - video:"/images/dog/two.mp4", - catimage: "/images/dog/two.jpg", - detail:'为10月龄及以上英国成犬量身打造的精准营养', - price:'¥123.45', + title: "贵宾成犬专属", + video:"/images/dog/two.mp4", + catimage: "/images/dog/two.jpg", + productimage: "/images/cat/star-2.png", + detail:'护肤靓毛 理想体态', + price:'¥241', }, { - title: "狗干粮", - video:"/images/dog/three.mp4", - catimage: "/images/dog/three.jpg", - detail:'为10月龄及以上英国犬成犬量身打造的精准营养', - price:'¥123.45', + title: "小型犬成犬专属", + video:"/images/dog/three.mp4", + catimage: "/images/dog/three.jpg", + productimage: "/images/cat/star-3.png", + detail:'亮泽被毛 呵护牙齿', + price:'¥121', }, - { - title: "狗干粮", - video:"/images/dog/four.mp4", - catimage: "/images/dog/four.jpg", - detail:'为10月龄及以上英国成犬量身打造的精准营养', - price:'¥123.45', + { + title: "离乳期全价奶糕", + video:"/images/dog/four.mp4", + catimage: "/images/dog/four.jpg", + productimage: "/images/cat/star-4.png", + detail:'高易再水合颗粒 帮助增强保护健康成长', + price:'¥88', }, ], @@ -1040,53 +1059,88 @@ // }, ], - swiperOption: { - loop: true, - slidesPerView: 'auto', - centeredSlides: true, - speed:1000, - spaceBetween: 30, - // autoplay: true, - loopAdditionalSlides: 100, - pagination: { - el: '.swiper-pagination', - dynamicBullets: true - }, - navigation: { - nextEl: '.swiper-button-next', - prevEl: '.swiper-button-prev' + headerSwiperOption: { + loop: true, + slidesPerView: 'auto', + centeredSlides: true, + speed:1000, + spaceBetween: 0, + autoplay: true, + pagination: { + el: '#homeBannerSwiperPagnation' + }, + paginationClickable: true, + loopAdditionalSlides: 100, + navigation: { + nextEl: '.swiper-button-next', + prevEl: '.swiper-button-prev' + }, + on: { + slideChange(Swiper) { + }, - on: { - slideChange(Swiper) { - //console.log('onSlideChangeEnd',this); - // vm.ifadroind('','',this.realIndex); - vm.useraindex=this.realIndex; - }, - tap() { - //console.log('onTap', this); - } - // slideChange() { - // console.log('onSlideChangeEnd', this); - // }, - // tap() { - // console.log('onTap', this); - // } - } - }, + tap() { + + } + } + }, + catStarProductswiperOption: { + loop: true, + slidesPerView: 'auto', + centeredSlides: true, + speed:1000, + spaceBetween: 30, + // autoplay: true, + loopAdditionalSlides: 100, + pagination: { + el: '#catStarSwiperPagnation', + }, + navigation: { + nextEl: '.swiper-button-next', + prevEl: '.swiper-button-prev' + }, + on: { + slideChange(Swiper) { + vm.useraindex=this.realIndex; + }, + tap() { + } + } + }, + dogStarProductswiperOption: { + loop: true, + slidesPerView: 'auto', + centeredSlides: true, + speed:1000, + spaceBetween: 30, + // autoplay: true, + loopAdditionalSlides: 100, + pagination: { + el: '#dogStarSwiperPagnation', + }, + navigation: { + nextEl: '.swiper-button-next', + prevEl: '.swiper-button-prev' + }, + on: { + slideChange(Swiper) {}, + tap() {} + } + }, } - }, - components:{ - Myheader, - Myfooter, - unlogin, - // userswiper - }, - created(){ + }, + components:{ + Myheader, + Myfooter, + unlogin, + // userswiper + }, + created(){ vm=this; - - }, - watch:{ -}, + }, + watch:{ + + }, mounted(){ const that = this this.ifAdoid(); @@ -1096,298 +1150,374 @@ } window.addEventListener("scroll", this.handleScroll, true); this.userchufang();//查询处方粮商品信息 + this.catmessage();//查询猫的信息 + this.catclickGan(); + this.catclickShi(); + this.dogmessage();//查询狗的信息 + this.userdogShi(); + this.userdogGan(); }, destroyed () { window.removeEventListener('scroll', this.scrollToTop); }, - methods:{ - ifAdoid(item,index){ - //console.log(index); - this.userindex=index; - var sUserAgent = navigator.userAgent.toLowerCase(); - var bIsIpad = sUserAgent.match(/ipad/i) == "ipad"; - var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os"; - var bIsMidp = sUserAgent.match(/midp/i) == "midp"; - var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4"; - var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb"; - var bIsAndroid = sUserAgent.match(/android/i) == "android"; - var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce"; - var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile"; - - if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) { - //console.log("当前是电脑打开") - this.stypechange=false; - //console.log(this.usertitle) + methods:{ + ifAdoid(item,index){ + //console.log(index); + this.userindex=index; + var sUserAgent = navigator.userAgent.toLowerCase(); + var bIsIpad = sUserAgent.match(/ipad/i) == "ipad"; + var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os"; + var bIsMidp = sUserAgent.match(/midp/i) == "midp"; + var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4"; + var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb"; + var bIsAndroid = sUserAgent.match(/android/i) == "android"; + var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce"; + var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile"; + if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) { + console.log("当前是电脑打开") + this.stypechange=false; + //console.log(this.usertitle) - this.catproduct=true; - this.onemao=false; - this.twomao=false; - this.threemao=false; - this.fourmao=false; - this.fivemao=false; - this.sixmao=false; - this.dogshow=false - this.showingBanners=this.banners.pc; - } - else - { - //console.log("当前是手机打开") - this.showingBanners=this.banners.mobile; - this.stypechange=true; - this.onemao=true; - this.twomao=true; - this.threemao=true; - this.fourmao=true; - this.fivemao=true; - this.dogshow=true; - this.catproduct=true - this.sixmao=true; - - } - }, - - ifadroind(item,index,order){ - //console.log(item,index,order); - - - var sUserAgent = navigator.userAgent.toLowerCase(); - var bIsIpad = sUserAgent.match(/ipad/i) == "ipad"; - var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os"; - var bIsMidp = sUserAgent.match(/midp/i) == "midp"; - var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4"; - var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb"; - var bIsAndroid = sUserAgent.match(/android/i) == "android"; - var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce"; - var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile"; - - if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) { - //console.log("当前是电脑打开啊啊啊") - if(item.title=='明星猫粮'){ - this.catproduct=true; - this.twomao=false; - this.threemao=false; - this.fourmao=false; - this.fivemao=false; - this.dogshow=false; - this.sixmao=false; - - this.onemao=false; - - } - if(item.title=='猫湿粮'){ - this.onemao=true; - this.dogshow=false; - //console.log(this.onemao); - this.twomao=false; - this.threemao=false; - this.fourmao=false; - this.fivemao=false; - this.catproduct=false; - - - - }if(item.title=='猫干粮'){ - this.onemao=false; - this.twomao=true; - this.dogshow=false; - this.threemao=false; - this.fourmao=false; - this.chufang=false; - this.catproduct=false; - } - - if(item.title=='犬干粮'){ - this.onemao=false; - this.twomao=false; - this.threemao=false; - this.fourmao=true; - this.chufang=false; - this.dogshow=false; - this.catproduct=false; - } - - if(item.title=='犬湿粮'){ - this.onemao=false; - this.twomao=false; - this.threemao=true; - this.fourmao=false; - this.chufang=false; - this.catproduct=false; - this.dogshow=false; - } - if(item.title=='处方用粮'){ - this.onemao=false; - this.twomao=false; - this.threemao=false; - this.fourmao=false; - this.fivemao=true; - this.dogshow=false; - this.catproduct=false; - } - if(item.title=='明星狗粮'){ - this.onemao=false; - this.twomao=false; - this.threemao=false; - this.fourmao=false; - this.fivemao=false; - this.dogshow=true; - this.catproduct=false; - } - // this.usertitle=item.title - // this.catlistvideo[order]=item; - // this.catproduct=true; - - }else{ - this.catfood=true; - // this.catproduct=false; - let userindex=index - //console.log(item,index); - let mingxin=document.querySelector('.pageFullScreen'); - let dogtop=document.querySelector('.oc-top'); - //console.log(dogtop); - //console.log(mingxin.offsetTop); - if(item.title=='犬湿粮'||item.title=='犬干粮'||item.title=='处方用粮'){ - userindex=userindex-2 - }else{ - userindex=userindex-1 + this.catproduct=true; + this.onemao=false; + this.twomao=false; + this.threemao=false; + this.fourmao=false; + this.fivemao=false; + this.sixmao=false; + this.dogshow=false + this.showingBanners=this.banners.pc; } - if(item.title=='明星猫粮'){ - mingxin.scrollIntoView(true); - }else{ - let catshiid=document.querySelectorAll('.selectionswitch'); - catshiid[userindex].scrollIntoView(true); - } - if(item.title=='明星狗粮') - dogtop.scrollIntoView(true); - // if(item.title=="猫湿粮"){ - // this.catproduct=false; - // this.catfood=true; - // }else if(item.title=="明星猫粮"){ - // this.catproduct=true; - // this.catfood=false; + else + { + console.log("当前是手机打开") + this.showingBanners=this.banners.mobile; + this.stypechange=true; + this.onemao=true; + this.twomao=true; + this.threemao=true; + this.fourmao=true; + this.fivemao=true; + this.dogshow=true; + this.catproduct=true + this.sixmao=true; - // } - //console.log("当前是手机打开") - } - }, - userdog(item,index){ + } + }, + + ifadroind(item,index,order){ + //console.log(item,index,order); + var sUserAgent = navigator.userAgent.toLowerCase(); + var bIsIpad = sUserAgent.match(/ipad/i) == "ipad"; + var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os"; + var bIsMidp = sUserAgent.match(/midp/i) == "midp"; + var bIsUc7 = sUserAgent.match(/rv:1.2.3.4/i) == "rv:1.2.3.4"; + var bIsUc = sUserAgent.match(/ucweb/i) == "ucweb"; + var bIsAndroid = sUserAgent.match(/android/i) == "android"; + var bIsCE = sUserAgent.match(/windows ce/i) == "windows ce"; + var bIsWM = sUserAgent.match(/windows mobile/i) == "windows mobile"; + + if (!(bIsIpad || bIsIphoneOs || bIsMidp || bIsUc7 || bIsUc || bIsAndroid || bIsCE || bIsWM)) { + //console.log("当前是电脑打开啊啊啊") + if(item.title=='明星猫粮'){ + this.catproduct=true; + this.twomao=false; + this.threemao=false; + this.fourmao=false; + this.fivemao=false; + this.dogshow=false; + this.sixmao=false; + + this.onemao=false; + + } + if(item.title=='猫湿粮'){ + this.onemao=true; + this.dogshow=false; + //console.log(this.onemao); + this.twomao=false; + this.threemao=false; + this.fourmao=false; + this.fivemao=false; + this.catproduct=false; + + + + }if(item.title=='猫干粮'){ + this.onemao=false; + this.twomao=true; + this.dogshow=false; + this.threemao=false; + this.fourmao=false; + this.chufang=false; + this.catproduct=false; + } + + if(item.title=='犬干粮'){ + this.onemao=false; + this.twomao=false; + this.threemao=false; + this.fourmao=true; + this.chufang=false; + this.dogshow=false; + this.catproduct=false; + } + + if(item.title=='犬湿粮'){ + this.onemao=false; + this.twomao=false; + this.threemao=true; + this.fourmao=false; + this.chufang=false; + this.catproduct=false; + this.dogshow=false; + } + if(item.title=='处方用粮'){ + this.onemao=false; + this.twomao=false; + this.threemao=false; + this.fourmao=false; + this.fivemao=true; + this.dogshow=false; + this.catproduct=false; + } + if(item.title=='明星犬粮'){ + this.onemao=false; + this.twomao=false; + this.threemao=false; + this.fourmao=false; + this.fivemao=false; + this.dogshow=true; + this.catproduct=false; + } + // this.usertitle=item.title + // this.catlistvideo[order]=item; + // this.catproduct=true; + + }else{ + this.catfood=true; + // this.catproduct=false; + let userindex=index + //console.log(item,index); + let mingxin=document.querySelector('.pageFullScreen'); + let dogtop=document.querySelector('.oc-top'); + //console.log(dogtop); + //console.log(mingxin.offsetTop); + + let positionIdentifier=document.querySelectorAll('.ts-position-identifier'); + let tmpTitle=''; + let scrollToTop=0; + let _self=this; + let transition = 230; + positionIdentifier.forEach(function(ele,index){ + tmpTitle = ele.getAttribute("data-rel"); + if(item.title==tmpTitle) + { + if(_self.fixedHeader && item.title!='明星猫粮') + { + transition+=130; + } + scrollToTop = _self.heightToTop(positionIdentifier[index]) - transition; + //positionIdentifier[index].scrollIntoView(true); + window.scrollTo({ + top:scrollToTop, + behavior:'smooth' + }) + //document.body.scrollTop = oPos; + } + }) + /* + if(item.title=='犬湿粮'||item.title=='犬干粮'||item.title=='处方用粮'){ + userindex=userindex-2 + }else{ + userindex=userindex-1 + } + if(item.title=='明星猫粮'){ + mingxin.scrollIntoView(true); + }else{ + let catshiid=document.querySelectorAll('.selectionswitch'); + catshiid[userindex].scrollIntoView(true); + } + if(item.title=='明星犬粮') + dogtop.scrollIntoView(true); + // if(item.title=="猫湿粮"){ + // this.catproduct=false; + // this.catfood=true; + // }else if(item.title=="明星猫粮"){ + // this.catproduct=true; + // this.catfood=false; + + // } + //console.log("当前是手机打开") + */ + } + }, + heightToTop(ele){ + //ele为指定跳转到该位置的DOM节点 + let root = document.body; + let height = 0; + do{ + height += ele.offsetTop; + ele = ele.offsetParent; + }while( ele !== root ) + return height; + }, + userdogShi(){ + this.activeIndex5=(this.activeIndex5?this.activeIndex5:0); + let apiDogSize=this.userdoglist[this.activeIndex5].title; + let apiDogFoodType=this.dogtype[this.quanshiCurIndex].title; + this.userstype=1; let petType={ petType:1, - name:index, + categoryName:"皇家犬湿粮", + name:apiDogFoodType, } for(let i =0;i0) - { - this.gotop = true - this.searchBar=false - } - else - { - this.gotop = false; - this.searchBar=true - } - } + let fixedCatbarSeperator = document.getElementById("fixed-catbar-seperator"); + if(!fixedCatbarSeperator) + { + return; + } + let scrolltop = document.documentElement.scrollTop || document.body.scrollTop; + if((scrolltop-fixedCatbarSeperator.offsetTop)>0) + { + this.fixedHeader=false; + this.gotop = true + this.searchBar=false + } + else + { + this.fixedHeader=true; + this.gotop = false; + this.searchBar=true + } + }, + toTop() { + let top = document.documentElement.scrollTop || document.body.scrollTop; + // 实现滚动效果 + const timeTop = setInterval(() => { + document.body.scrollTop = document.documentElement.scrollTop = top -= 400; + if (top <= 0) { + clearInterval(timeTop); + } + }, 10); + }, + async courseId(item) { + this.dataLoaded=false; + let data = await postCourseId(this.productCode,1,this.usermessage.data.id,this.usermessage.data.mobile,item.picFile,item.name,item.basePrice,item.specifications); + if(data){ + this.productlist=data; + this.dataLoaded=true; + } + }, + //请求猫 + async catmessage(stype,dataType) { + this.dataLoaded=false; + let data=[]; + if(stype==undefined||stype==null){ + data = await biaomessage(0,'',1,6); + }else{ + data = await biaomessage(this.userserachlist,'',1,6); + } + if(data){ + let userlist=[]; + //userlist=data.slice(0,6); + if(dataType) + { + if(dataType=='Shi') + this.catshi=data; + else if(dataType=='Gan') + this.catgan=data; + } + else + { + this.catlist=data; + //this.catgan=userlist; + //this.catshi=userlist; + } + this.dataLoaded=true; + } + }, - - - }, - toTop() { - let top = document.documentElement.scrollTop || document.body.scrollTop; - // 实现滚动效果 - const timeTop = setInterval(() => { - document.body.scrollTop = document.documentElement.scrollTop = top -= 400; - if (top <= 0) { - clearInterval(timeTop); - } - }, 10); - }, - async courseId(item) { - let data = await postCourseId(this.productCode,1,this.usermessage.data.id,this.usermessage.data.mobile,item.picFile,item.name,item.basePrice,item.specifications); - if(data){ - this.productlist=data; - } - }, - //请求猫 - async catmessage(stype) { - let data=[]; - if(stype==undefined||stype==null){ - data = await biaomessage(0); - }else{ - data = await biaomessage(this.userserachlist); - } - if(data){ - this.catlist=data; - let userlist=[]; - userlist=data.slice(0,6); - this.catshi=userlist; - this.catgan=userlist; - + //请求犬 + async dogmessage(stype,dataType) { + this.dataLoaded=false; + let data=[]; + if(stype==undefined||stype==null){ + data = await biaomessage(1,'',1,6); + }else{ + data = await biaomessage(this.userserachlist,'',1,6); + } + if(data){ + let userlist=[]; + //userlist=data.slice(0,6); + if(dataType) + { + if(dataType=='Shi') + this.dogshi=data; + else if(dataType=='Gan') + this.doggan=data; + } + else + { + this.doglist=data; + //this.doggan=userlist; + //this.dogshi=userlist; + } + this.dataLoaded=true; + } + }, - } - - }, - - //请求犬 - async dogmessage(stype) { - let data=[]; - if(stype==undefined||stype==null){ - - data = await biaomessage(1); - }else{ - data = await biaomessage(this.userserachlist); - } - if(data){ - let userlist=[]; - userlist=data.slice(0,6); - this.doglist=data; - this.doggan=userlist; - this.dogshi=userlist; - } - }, - - selectproduce(item,index){ + selectproduce(item,index){ if(item.productList[0]==undefined){ item.productlist[0].productCode=0; } @@ -1401,79 +1531,95 @@ productCode:item.productList[0].productCode }, }); - }, + }, - //请求处方量信息数据 - async userchufang() { - let list=[]; - let data = await userque(); - if(data){ - list=data.slice(0,6); - this.processinformation=list; - this.chufanlist=data; - - } - - }, - - //点击请求处方量标签信息数据 - async userquery(item) { - let data = await userquery(item); - if(data){ - this.processinformation=data; - } - - }, - //处方用粮筛选 - userclick(item,index){ - this.userquery(index) - }, - //全价猫湿粮筛选 - catclick(item,index){ - this.userstype=0; - let petType={ - petType:0, - name:index, - } - for(let i =0;i + \ No newline at end of file diff --git a/rc-busness/pages/myorder/userrecord.vue b/rc-busness/pages/myorder/userrecord.vue index 3b1991bb..7c284dfa 100644 --- a/rc-busness/pages/myorder/userrecord.vue +++ b/rc-busness/pages/myorder/userrecord.vue @@ -1,108 +1,101 @@ \ No newline at end of file diff --git a/rc-busness/pages/personal/discount.vue b/rc-busness/pages/personal/discount.vue index abf63464..bc4b7994 100644 --- a/rc-busness/pages/personal/discount.vue +++ b/rc-busness/pages/personal/discount.vue @@ -2,11 +2,10 @@
-
-
+
-
+
- ￥{{ item.couponAmount }} + ￥{{item.couponTypeId=='4'?parseInt(((item.discount) *10))+ '折':item.couponAmount}}
{{ item.couponName }}
- + {{ item.couponName }}
有效期 {{item.validFrom}}至 - {{ item.validTo }} + {{item.validTo}}
@@ -71,6 +70,7 @@ export default { userload: true, pastdue: false, unused: false, + usercolor:{color:'#e1001a'}, usermessage:[], userstates:0, userimage: require("../../assets/image/unused.png"), @@ -196,6 +196,10 @@ export default { if(data){ console.log(data); this.newlist=data.data; + this.newlist.forEach(element=>{ + element.validFrom=element.validFrom.slice(0,10) + element.validTo=element.validTo.slice(0,10) + }) console.log(this.newlist); } @@ -207,21 +211,26 @@ export default { this.pastdue = true; this.userimage = require("../../assets/image/hasused.png"); this.userstates=1 - this.userdraw(this.usermessage.data.mobile,0) + console.log(this.$refs.userleft); + this.usercolor={color:'white'} + + + this.userdraw(this.usermessage.data.mobile,1) } if (this.activeIndex == 0) { this.userload = true; this.pastdue = false; this.userdraw(this.usermessage.data.mobile,0) - + this.usercolor={color:'#e1001a'} this.userstates=0 this.userimage = require("../../assets/image/unused.png"); } if (this.activeIndex == 2) { this.userload = false; this.pastdue = true; - this.userdraw(this.usermessage.data.mobile,0) + this.userdraw(this.usermessage.data.mobile,2) this.userstates=2 + this.usercolor={color:'white'} this.userimage = require("../../assets/image/expired.png"); } console.log(index); @@ -242,6 +251,18 @@ export default { // } // dis_livchat(option); // } + }, + + directives: { + 'color': { + bind: function(el, binding){ + el.style.color = binding.value + }, + inserted: function(el){ + + } + }, + }, mounted() { if(this.usermessage!=='' ||this.usermessage.data!==undefined){ diff --git a/rc-busness/pages/personal/integral.vue b/rc-busness/pages/personal/integral.vue index 50259d92..dd1a63ce 100644 --- a/rc-busness/pages/personal/integral.vue +++ b/rc-busness/pages/personal/integral.vue @@ -1,33 +1,38 @@ \ No newline at end of file diff --git a/rc-busness/pages/personal/useraddress.vue b/rc-busness/pages/personal/useraddress.vue index 74141890..c9a878dc 100644 --- a/rc-busness/pages/personal/useraddress.vue +++ b/rc-busness/pages/personal/useraddress.vue @@ -1,8 +1,8 @@