From 6fd50e7995f573c0ef154745186af72d62fdb482 Mon Sep 17 00:00:00 2001 From: liudan <18634735655@163.com> Date: Tue, 29 Aug 2023 20:50:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- api/user.js | 8 ++++- pages.json | 6 ++++ pages/recharge/index.vue | 68 +++++++++++++++++++++++++++++++------- pages/user/index.vue | 9 +++-- pages/webview/webview.vue | 37 +++++++++++++++++++++ static/xieyi.png | Bin 0 -> 3898 bytes static/yinsi.png | Bin 0 -> 4468 bytes 7 files changed, 112 insertions(+), 16 deletions(-) create mode 100644 pages/webview/webview.vue create mode 100644 static/xieyi.png create mode 100644 static/yinsi.png diff --git a/api/user.js b/api/user.js index ebaf173..b173159 100644 --- a/api/user.js +++ b/api/user.js @@ -4,7 +4,8 @@ import request from '@/utils/request' const api = { userInfo: 'user/info', assets: 'user/assets', - bindMobile: 'user/bindMobile' + bindMobile: 'user/bindMobile', + artical:'article/detail' } // 当前登录的用户信息 @@ -26,3 +27,8 @@ export const assets = (param, option) => { export const bindMobile = (data, option) => { return request.post(api.bindMobile, data, option) } +//获取用户协议和隐私政策 +export const getArticle = (data, option) => { + return request.get(api.artical, data, option) +} + diff --git a/pages.json b/pages.json index 22b69f9..c4858aa 100644 --- a/pages.json +++ b/pages.json @@ -232,6 +232,12 @@ "navigationBarTitleText" : "申请售后" } }, + { + "path" : "pages/webview/webview", + "style" : { + "navigationBarTitleText" : "" + } + }, { "path" : "pages/recharge/index", "style" : {} diff --git a/pages/recharge/index.vue b/pages/recharge/index.vue index 24020fd..0a00a29 100644 --- a/pages/recharge/index.vue +++ b/pages/recharge/index.vue @@ -1,18 +1,18 @@ @@ -80,6 +85,12 @@ selectedPlanId: 0, // 自定义金额 inputValue: '', + remark:'牛肉', + btnList:[ + {name:'牦牛肉礼盒',value:0}, + {name:'藏羊肉礼盒',value:1}, + ], + activeIndex:0 } }, @@ -127,13 +138,26 @@ // 按钮禁用 app.disabled = true // 提交到后端 - cdkeyApi.submit({ cdkey:app.inputValue }) + cdkeyApi.submit({ cdkey:app.inputValue,remark:app.remark }) .then(result => { - app.$toast(result.message), + console.log(result) + // app.$toast('兑换成功') + // app.$toast(result.message), app.getPageData() - }) - .finally(() => app.disabled = false) + app.$refs.uToast.show({ + title: '兑换成功' + }) + }).finally(() => app.disabled = false) }, + getPrizeItem(item){ + + this.activeIndex = item.value; + if(item.value==0){ + this.remark = '牛肉' + }else{ + this.remark = '羊肉' + } + } } } @@ -179,7 +203,7 @@ } .recharge-panel { - margin-top: 60rpx; + padding-top: 100rpx; padding: 0 60rpx; } @@ -265,4 +289,24 @@ color: #888; } } + .btnContainer{ + display: flex; + align-items: center; + .btnItem{ + flex:1; + border:1px solid #eaeaea; + background-color: #ffffff; + color:#000000; + font-size: 28rpx; + border-radius:10rpx; + padding:20rpx 0; + text-align: center; + margin:0 10rpx; + } + .active{ + background-color: #17C161; + border:1px solid #17C161; + color:#ffffff; + } + } diff --git a/pages/user/index.vue b/pages/user/index.vue index 037c10f..21de71c 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -173,7 +173,10 @@ { id: 'contact', name: '在线客服', icon: '/static/m5.png', type: 'button', openType: 'contact' }, // { id: 'points', name: '我的积分', icon: 'jifen', type: 'link', url: 'pages/points/log' }, { id: 'refund', name: '退换/售后', icon: '/static/m6.png', type: 'link', url: 'pages/refund/index', count: 0 }, - { id: 'recharge', name: '卡密兑换', icon: '/static/kami.png', type: 'link', url: 'pages/recharge/index' } + { id: 'recharge', name: '卡密兑换', icon: '/static/kami.png', type: 'link', url: 'pages/recharge/index' }, + //隐私政策 + { id: 'recharge', name: '用户协议', icon: '/static/xieyi.png', type: 'link', url: 'pages/webview/webview?articleId=10001' }, + { id: 'recharge', name: '隐私政策', icon: '/static/yinsi.png', type: 'link', url: 'pages/webview/webview?articleId=10002' } ] export default { @@ -211,9 +214,8 @@ onShow(options) { this.onRefreshPage() }, - methods: { - + // 刷新页面 onRefreshPage() { // 更新购物车角标 @@ -654,6 +656,7 @@ display: flex; justify-content: center; margin-top: 60rpx; + padding-bottom: 60rpx; .logout-btn { width: 50%; diff --git a/pages/webview/webview.vue b/pages/webview/webview.vue new file mode 100644 index 0000000..5294e17 --- /dev/null +++ b/pages/webview/webview.vue @@ -0,0 +1,37 @@ + + + + + \ No newline at end of file diff --git a/static/xieyi.png b/static/xieyi.png new file mode 100644 index 0000000000000000000000000000000000000000..6513e31fd49184996d121c4fc0b44c014dd07cef GIT binary patch literal 3898 zcmbtXcT`hLx1R(eO(06U^w1&*2-1`y1Pqq|kt$t!QQ8G1Ak_pE1r+HBNUw$}T`56n z!UaKk6DcAc6ht8i_#NN-|66aZch=go&#d2`GkgDL&zafLMg}^}j69400A^hr)&$Z$ ze}w)N)K*wlWnGg!hMSz@p)#Hq3KesG2zJi z?CS{Jz(z;Vs%JX&Uxlm#3Wav;$tF9>(XuTex{6#p`m@<7Pe#!#QE;lNGlww~CK|JT zH~yRU32x&6@xVb3HTszme=e}=S@68`C`{a`B zP?)V5^JhDbTYe~Bp4i@s)>EZTZA>ID=lsuQ7wYaGw|?ZDl9iXI>d<-m6^oXU%2k#h zyq&W4?B-THtct%G8F)4In%Xe2f@@>)JgVdBj%zz1q}s%>NH@Ghd7e48yED1?!0u5! z6V9?tCu(rt`t5mk8HEl-mDV9#&G|Z0H&%04bo;>^c8?OleC0g$d6Wn9@_f3&ao={t zy_8Fj+b#8O?dH^0AWF7BQYUQ1I!p2No}>qkN5<&jy7)xA&4_|>ZM?T2PYNyl8QozI z4Wd)+RA>dOtC~aKIN%nzQELz}|5o@u(xYmyW~)ucX(mqT3rq`(XDxECsTA~AGa9r5 z!yeyD-Ta(*uByI-7r|>TbLLMj?131cG`-(M7 zUMtThZsc;23ay+f4Bj6;J8MUW3UbsU7^aGGC7TqMXqHRcUD81Ux!(b6aF+{ZANbes zccM#v&H7D&!kY|RbRQUdJ_a>^9PdHPG|rK!j36rLz5d`N0!58{V?+ka&qoN0ym}M? zRTwhv(Z1W7Hf$l_mkSwjH{rvhf?lh^7_K}=PgI_P{y-m>t!L|QVu%q>t!yfJ+Q&PbcN+ecBdU3;a^Qz%q`oI?kY zf}0VdtY@@$N^s(jT=EiW@z09gcTL6Y<1#^%PKSym`8;WK{m{axqhCb!<17LV%HU~HbN;_@m+dWc%Qn3zpY6(s#_}ApbfEi}y}iASn3I9m zFyzYL!(p1P@Wh*O4;MY7*B)+5rZ>~PN_XvzkEwbLQPV{xSeZ_d`ZdqShCRnp##|+Q z(!M*pD^**+pOBUTi{om^r9-eDJKXxEgl}Vd+GozWD_tyJ-gwFdZr|kmH)R#>@-;f- z=qlQzY0NfCV4!A6^h-CNFD;7Ybl${S0$lE{D8pw#wxJ?Df5u~>EM4`2r414rxa~mS znwrZS-x~kqI1{H{Ww~(-rCiaf=NL1|GNmnZ2@QnuQ8A0}MG2L9V_F0YD62{jruSed zr7;C-%$%~e zHUd38+LO3p7V3Qfki4bOGDk#Fek&qF(*-!YxkTcxmwJ-wVe^cn7x>AGf+M7*Emr0+ zi&LF8QSR4uS(YC|sc0Z(f8PLf=1w-5OaalauD-rrqVz6IY!xPJvDyRf{rD5>u8Cw; zaIvVaTde`~+VBVn@TN3)q4S-StzA^at|e(mPA^Y_y~>y(`wRl}GyB!M z9Okq;xYQSQ7e=kKT}^+R?Tme)!4M=oWh*5~{aHz;W3xom?i!ewCd?n}FiY_X3g$p2 z3y{eRkIQcC-7*~1iY$#_1)^`}_HO=*6XmlMn~Q_Lho!iU_M~T-Ny!(;RFd&u8oF3X z6<5y0@3mfXzqcxnIkb1gMEBUbu!F@`cOK;XkpBUN*Oj+uAGco?$`3Bt)FPOrip_1f zSd0&L_?AC=gxSQ`y1Xp6zWx~?&A#yMLUu%z#lxp!RtH{x8?uHwP;D{{N^Qws#s9uY z15EJeN-ElYHx1Ad0g}q!Q#56pgWf$QAE~a#wgd;!(?&m;;G~3h@9h!pWxF0BFi-UD z?zM}@wCQW59N*y;nohQAqWO!I+*Z{s@-tA&tL4)_Z18xNm<4^c6)y498~*44!%;~p z90dwXy6jqme14s^!CH`FNXSF8!L|BR0L24i=r{=GynQ%@Z$C1s zI+tgx(2#*W$@4drM$n;}U_#Tk+#4c?Q|rP1o=FnPqap=0d&cgscZppYsu6n(C=rnj z7WYBQ?n@+pNzLiXLxAMd)cd9Sdwza$s2;O>PAK@7LdWq0j0EC`L2nTsH@B67YDmu) ze6q&-Z)}wU+%e+_48V~|o02Q5tE=s^&0PEva?LI1n(|eXjF)W7v7IfIrWXJlQwJM% zr+S^J@sw)NV_4+E7v3svh|&v4$>rKr7VeMe2A`3(t%0Gw<7r4O(of$vB9+2n5Dgzr zVDVJf8nU7N4Z11AdqVlbVS+uCFMNb#e=4s3&2`Vq}RwjGOG!O&odx-2E1ZprJpXb}L%FjjDabbIvk zL-yBY^&jG!73KWJ_6KV;_p{sI7QgLo}oMiEKq_5++;cS3a;A$Mh(J&Ftf98)fp zEu#y$yW?t6G0Fe|DP7;iBmfLW*(^;_fq?3oK#C{=1v;PE)|;Gz0CUd4XN7>4bWl@f zzD^4P|1MG!*`aCe1IF~SAi&Z}%{~#11dDx@)?_x)Wq>=m&L%lxVVFT=U8GdWWvkWt z^xy9a87an58W&xyYIN((z#=^gUuWze_3gP1EMbS>w(DXR3o&Fo%dY_)IuzvvGWxJi zk&~OWn#4m|9T~TD0r`d=kk~jUz@pU2ka)*xpF$lLLh|1XW8uPg5-A3Us&W_DJu=!P zFbXMgFU7=3l4~qCbY&c$(&y>I034%GVXoK?1z{3#}an2J(F# z(qi_anJ|0qo>FpP=$s-LDygXM0oa^TNE*6@X^>$ikWBMDK8@MaW&Xb!dNanW#ZfLG zUk`m$uPlZCqj-DXoNa93tzjD+a&mP}E>0d=|HYldbs2uh`(vBs+ovFB)$Ht#i)fG_ zpV+510H7$|ZIrbUAYjiY{T=t81P=`R@$656pGbedOaovjfvT#LVTg#KHdle009yag zKgR4;AmFgE|MO`;OA2hE9O~0Sd**j)P$snDk#Q3i#5D-`e><@}bUEhFQ6eBA_i#EQ zyl7axf$=+BEHdA}H6W~LS= zu}(^juAdS033YLCF)pij;bkE97bAPN(%|^U68Bx#88a(7Q7(t=it+Y&&a;%B22_ua zJxr)cu`f|_)53|$=R$<#i&Gvvpy04M1WmqCha2G~4{kZ9ifPDaQ&9|Amm@aqZT{-! zg)jclN}O8@DwlN1W07W5)5Mx~5_~ey`yRa?t{R<#O*Q6-TQ?`$RK@DWvWP8S)!rqp zoV2}qL|O2-0Siirv_~#;rOn9DhO1qXMXimFjtYD(A|!kW!ZfWSij8s!P%*cbDD02| zRefd|=wJz37%*unq_-4|3&BpVBfUTfz`&Y}vCXTf~@{ zh`x~}3fYYqOGw_Q-+TT3eE)f$>w2DZUH9kQ=RD6j=Q+zAZEU2+$9;es0KiAk#}gq+ z|9f+CK+n=^Wmyn``4RQbg0dd;8~`Xq0{+aE+cry?d?gZk0iC@T+C7GOa6@6CJ|W6f zO4G=cCKs?eJ=_yFZpF&#lQjL2aFwXx&!WiO@W&J>8~HKHr>2ob0#=hM)}|DS+6 z*)S6WFDYu(g~$TEq$g=@VKL;aSCO=|EkQN`e!;wdi^;R=__b5mQ)>9WZ>I9xXenxF z+E(-N?!a2rvyY9UV0hW}v#2dc=jIm|(5|Z1+{cw!J%TtcxM1nJ*?E)EHpW7Md@tGg z61$FFY`rf-hvq(}g}J_vaeiu`f{L3gG{fQlV0&4*OLA|GV13tZWwFnfjV?6Pnv{?oUaJiL^BmndeYx&V|F9< z-bfMxwSMU;)1EEcA)m+^<2=GM$k&Xop2pt@%9#J2Y_-5i9%vZcrG6>eKFSRH5B2w)A0>;JYr%j_Z=c^!LIzQLqI4;_)M%0FFa< zN!kcQG{R~(L)|N6Y;|>Y`=rM}iBgQiX*JztgzJ}sdGTtj$%TQ^&@g-Z?-Vy0l7#2i zZy6tNXQV2#KI5w^E>sBMr%bW8mTzi?RbSZ2&HxFVunLX0`^3bSGRM6P%XEbkk$I(H!9cdcbNqmE3ztmvIZCyh z7twp?HRc_=#d@&g*`y6rJ4mjjk!JYj{t!_u{ z{JBy_nBQY~qb>fBe$rHgb91D!`0tsOaMw}|k@G7=Y>2Gd$isV!E%Fl9K8;s9EP$#L z$#eAeN@@)CmlVn@Sf`cg@P~P-ff66sP}kj>nKgb$bcUEDSuW1YAz&^$py&ysC&Q@8 zZ=R6L3XLym9B|YzZvAsF-=I)KxNk>(jYV+0G-Ucr^o>WS2PEGQF7fPu*odj!=*w3&(rx9zq2_bgaqzM5{d?ID&2%9_&CmNBE>T zMNT`6JmmuvEDnA6H`Y1AG{xz#d+}`bfCib4l-L&dqv8xykC8mb8iSXfT-Mn-hrMn| zOtU>fD|vI~{yF>9beTM6z-vb1E!uvUXX?7TEyQ7aJq~cg0PMFmtn3{~m58*9_1y|o zT5$Q?`;_Q|rMCFa-nf`q?83jR?f}Q-BLoM(9tqDBZ?IAR+2rM7<_bcF+8-R6zGwO5iqx|SQ0S#D4pz<&UBbwFeqAViB;JU z9kAigOAe3N-74mr4z(RAy2F+*M>%tMWTbng==w+7e*l7XWtSLGi^TL0%~acaVxCTI zC;E~*#Hp9f@;Z2hTz$<5xdS0a_&>w;t=ZPeU)tHOoW*xWBueb<#TV834Qb8Ji<1I^dC5&dzDU$=i242g@2{hv48+U9 z*5Hw|$wor()1eUc3u($aT`@M*bgJ#Z&$EuP;l%z07!HnXUuVy;DbCMmWvbGwzK6O3 zA!SS%&z~?c!-tdB92+>{hUpQN4NVZ$x*TH~HenGZ-G) zl=TQC+;mA`iz}D=;tnaQGg?c`pYu^;xuEZAy2es`UwO16NC-~)Y_s0nBbUYg*nfJ< zeR751vv`m22J-0ax2_?Y_)ZC70SUN-1se*_&PAADZ<%GyD2~4=6(b6><+=^KOpm@$ z@~M)7I1)0*v*Awnu~^-VnJrVNz$a_<1H)wf>l0OV0oQ@#CETLgaA3=bnZR>%qpmQw zdB08<{YLBea16*T9QMvV42X)3YnMeHtd{20G#AOlc%*He#8*G0EPL!&M?v9{EGGzu zvU;yj-&5(E8#a!NfqslTl$>sTSB{eTJg23o(Q~$ozDs`kkuWw*RioEcYr#GAGc8 z8B9P+$<3UP`&T%4eGgAbW8>7jBl0g@b&epUIE8jE7DX`ApieXV;=3sEM5rUvzc`0D z&%*o95ejZk?>-bbth4v=#koh5vk}zVxO#vw(=jX#+X%sh37M z-OYgkOTQD3>h0TD8VP#+VHEN}K*ea&yC2LSb8drhQt|>14sd26E$;sK;57r68%P!N)TEBK4s4Iz}wRM=e59{}JH*0n_<6J&RQTCup zJMx#&uXOzb_EvFJi@CTX^VX|_BM8zxE_%`Ck+}EU|IN|y)?6_E>|`M^jYZ~iaF&3z zXJ-uz1A{v}DXM9<#4Gyg|4br}8sUSs&*Aln{_3-Rev~) z+~WgWB2e?Cj@`yTl^mHsCGM5=OM#I};Z>JDiiE4kYbx)dSjAks-h2(iA)ACNg9HE?uair$)c*?@dsA^tz+sxnhjN#e+Mr z@@X}|g-+9oPohx-`)7Sj+oAdk>yP#gQO`BVUzbunsZ+3%oV01 z2Ui$}R{E02D!-=bdZ%52D<{iNAF-`+ z{(wYA-B~#~9ZiElNsiu!a4(&~w~t8&=LNKM!`*Lt?ubmbD6@2bH6}muOW@K)T71~$ zJE&e_+YsnwfOiq@v%puEeW!XgG%O4C3FG}gimSPXzAD;vFtpuamGoqY_zFsS6lxTb{*v9WDrj&QJygP!O>FS@_IF0LNivSldS+fY=g( zb>)I|A)IV<@euI8FF}@unvlTGjk>t3qme5j11VpHzcd$51v*}uD?TW7ECNix68f62 z*1GmQOKubIyzJbp(_NW4xrQ>Zgdiva2BT-&jFXtH@$8Na_Cqwca8A&#ib45Eyvgh4 z8&Ag~N!7gc+0&DOZ1Z2@dTM#Rh^~Jbt}pnVpR#*G$Vg~bj;c<6Ss22%1{H_GCY$AP z^6Y(uIZ=l?O{ANOyeT{RGr^lzJ~OT&O*Dk&{MyzJl^QH9=GCtHycf9sq_B&rc-R+zAUbHInIp$lLd2=@|x{P zg=QSmucDf0G!n8{^l>X&BQ`-WQ9K}Z3k_LFs`6&I79Z}Pzim?uBTNOAxgg)F5_c4< zD@pB4+p>3LT-$sO{$oJ_RG(EW`-l?*yE+FIhq47Wumbec^Pf9R7tc#^Ezz#pWvEO) z2?&8<6xdWXG&V=`^70B6B#~a}CM3#XM&+VYKnNRzQELXULZc&=3nJZ;bru#D!F^** zp#o-)VbBW}om5NQ05@W*W%Cx<3^OjiNz6 z@pv39JvZt4MIAGsVKprweQteZLe(dHDPpuAiOHcLG`J7a%`L=Un_SB`?&uAN5&IO< zklCQjp(adJo`imPUj>@&AZ4qRKlxxvkMvs&)l@6_HU5C3b3u!w;P(n{*HRy`#Df>F zY&EM)7lg|WcI5LNmZpv?aQ$?1Wc2>}Pv?(I&ks^#IUO5ApP(^*{q6j{k5KEh5WgVf z9h6wKQ)P!H2t{dZYUX^4TkJ~hW@Qkr|HRiW#-`@<8n+|EI<8hZ! zQWsx;7N1;Yw;YK7G&2UHP$6vh8-{Hr1=|ef6AK;MvB!H%7;KEX~Pc0B8QRVOAsoB^hX$RUS>} zkqeFIFfAvMbD?b9z+LT!^Zb@04cp5iN94#KQTD#ceVk0Mv2L>$<$@>V6q*<`#gPLA z`|?`zc=)%7c6TU24_4h5vVj&y@%n4ofB_7Z?-l?C#U1q@6a z7v*)l0!Zy?0qu(=0QjbGKTweaI0wclhrp|Vq4l@9{2