From e3a6a45f5c987cf2afbcbab9055a98c95a3be0b8 Mon Sep 17 00:00:00 2001 From: gongfuxiang <2499232802@qq.com> Date: Fri, 28 Jun 2019 00:01:02 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B0=8F=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/appmini/old/weixin/app.js | 4 +- public/appmini/old/weixin/app.json | 4 +- .../images/goods-detail-video-close.png | Bin 0 -> 4434 bytes .../weixin/images/goods-detail-video-play.png | Bin 0 -> 2543 bytes .../weixin/pages/goods-detail/goods-detail.js | 6 ++- .../pages/goods-detail/goods-detail.wxml | 35 +++++++++++------- .../pages/goods-detail/goods-detail.wxss | 22 +++-------- 7 files changed, 34 insertions(+), 37 deletions(-) create mode 100644 public/appmini/old/weixin/images/goods-detail-video-close.png create mode 100644 public/appmini/old/weixin/images/goods-detail-video-play.png diff --git a/public/appmini/old/weixin/app.js b/public/appmini/old/weixin/app.js index 77a13def1..16a4c6607 100755 --- a/public/appmini/old/weixin/app.js +++ b/public/appmini/old/weixin/app.js @@ -60,8 +60,8 @@ App({ // 请求地址 // request_url: "{{request_url}}", - // request_url: 'http://tp5-dev.com/', - request_url: 'https://test.shopxo.net/', + request_url: 'http://tp5-dev.com/', + //request_url: 'https://test.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/public/appmini/old/weixin/app.json b/public/appmini/old/weixin/app.json index b0990e918..f22cf359e 100755 --- a/public/appmini/old/weixin/app.json +++ b/public/appmini/old/weixin/app.json @@ -1,5 +1,5 @@ { - "pages": ["pages/goods-detail/goods-detail", + "pages": [ "pages/index/index", "pages/goods-category/goods-category", "pages/cart/cart", @@ -8,7 +8,7 @@ "pages/login/login", "pages/paytips/paytips", "pages/goods-search/goods-search", - + "pages/goods-detail/goods-detail", "pages/goods-attribute/goods-attribute", "pages/buy/buy", "pages/user-address/user-address", diff --git a/public/appmini/old/weixin/images/goods-detail-video-close.png b/public/appmini/old/weixin/images/goods-detail-video-close.png new file mode 100644 index 0000000000000000000000000000000000000000..3356ecb57d66da3a2c3faecd265b5dd14e795ee4 GIT binary patch literal 4434 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 Y0<<_$0f1`wVgLXD07*qoM6N<$f)7k+=l}o! literal 0 HcmV?d00001 diff --git a/public/appmini/old/weixin/images/goods-detail-video-play.png b/public/appmini/old/weixin/images/goods-detail-video-play.png new file mode 100644 index 0000000000000000000000000000000000000000..789c398498f5c8012ee18ee5ecb173cbcf23a0aa GIT binary patch literal 2543 zcmVPQ+W?mea#RqgAW%V|f75zP=tHX=Ue?-c=iGO(N7q_^HpYD2+w19;AGqtf$6D(rN~s^{ z=UORsHS?M8l~VY*Q%V8QM`O&VnV(VZ_NIVzUH4RLjYbCq{FJ%?27ulZAOLIP+8hYX zk5cMqrPK|nV2g%77cNi+oqFB`=G%&ccZobKKW4p-GFC$A?*yp z&z#&=3<$mWuS%)ssfTmU{X-Dm8)NX|)h=r-f{7b~6CK--d3^F> zYb|^QfCMixO^`fP(fnnteMyRmnKHc3i(D_01qjLACLH$%_>&Sc&(#>A&!I>SgT|+k z??C_p6Smsyt_G5VL8`dTE$xyJ7%*`BZ?)E(THsgAS}3c4Q1AJJQwEJ8ZuX`M4mRG` zIrly?mRSvDF_4rplu~buG0Bj(c2Cdoeb!o-Fbs4<*D5HBfCyk9`e-tO$^itQLD3|F zn5`*{iNmM&)mk5+;6Q#3I={9ui+azkEU|$bZ4-h%PY@N{7HyU0?)SAOYo()N+V`kP`AIy9@g98HJaWV*W&J|S$MJJq@#IJX&7DgqQ zU-r=Nz!M-5qD9pq05UxL?$k1;O+!E?qjFUK4u^wiqFW)8<$vt%)Y5ewA})W5>tytP z0)%tsWWS3SoFYDi%_VHKthSJY6--J zK!$fj%>nU!vym8+csyxe9|#Egv(t+X1jjvQB@lcR(%k5Ao2>0f`A=q`cw)AWKq3XG zD&}fNl$CmK{Ju%GM9kJPQ9A}QDbLo5u7(!QppY@FCe^}3TgM{b7)Z!}RGnLu8Ay}9 zg_+ZJ^dn;+lhHZNS1p!E^leWeAWiue#*ZB9Bx4{hV4RUA7A+r>81~dX1%Wi97MgyG z&VOLd`RqIFIt%Wt=$(_VUvkm>x@$TuWJF>LKU7uLZyzATo&eBP1X;7quE~UxdO+% z*<=VN+uN5qQuUCki*iaTq?J8axLJ%R^$;2yVi}gd-CfnC&IN&Nu8L7cdouTJ?5|Tb zb7+G9IMXPwk`?3sZyqY8mTKU$(Okl<=tT7FffuAT!(i>erz zD=hJt)YHdp?9W^b)q0C&KE2)(TOT5^j7_Ry1SC24O)|GPxs+GZQj&X?Dx_sqcpWaZ z#QbFLn{@VjmFYkWfi$fOfw?+a2o+i%5}Gn!Wd`FMAbU~82*_j?I%EtEhr`Lz!O#k- zP;Df*9!_G0=G-#_$SzbNh^{6zrw|Zs(N6I}VhYIKR1q5t((fj&Ah-&*>$=dWy|_ve zKz65!5fJgJW^P$Dw{u)kl`yqtY}CKoeSaexn*~=jb3nK)hKi~rka*jzDxeN-;ooYlF+Zx>QiwUhhxFcv31%lz#DK&$;;J$(k-m6~_i@V(Qj^$O zAfys5;=;){rp1P6<(Wpi8u^bD-4P=Sgz6-r-E8oyYB{b}8d>@rk&WMy<%}ed#P+aN zD~i$v+44TFy=V;eL#lL~1d?#@;_XkjY@}M>ont#)5s-xGy7&_!9`PIExx!)~iS18k z?{QwM*Vg);$e#E(22i}6t{4cJF0QJGU!N_M#MxW3{Ol|siBR|~p(J3;PBqO2LQrBS z%$$u<5-=8JG!_9NDBOPV`1Ni!7F*(DD4N11q1?Xr$?*pFy^Dbepx`VfNEZKpGne2L z)5S2*NUMMdpkV$iM)bwE2dqI{aEj?F7+HV_d`j=^_qUP1ko36 zfm(3V=erucIoEesYjJK0f|%Gj@Ux?-B0j|b(8K{*!|hcMj9&_die)(6fZbZXM2&y7 z4+%g)9R;VB`TL#ww>Akz0s=2m>J-!LK!#RN%^(@kxpU6FJ{%4x*KT%oUH4RLjkyGp z!v>1YQ!569{K_>NTcDP~$H4i+IaUdkDTIZOfU}PIh`yuLSPEAZ$Ve?XFdkrH=aP@r zfwVqM8h$?J+SQKAsxYNc0e(WK&T%STH1eJ+`6@t2E$D&I1qa55-T{E{1LfR1=Z*@} zT7MaU(P_@dRba@nQlk(5&jBzz2ckl(U$3$xqZ*KrTGoJ>+u_#SUlqjgpw)qlTZl%! z$Onba{ae$Ri~g2;1oCj0f>cEj{)27`WTYCHk{dE-{=(BmjVt{l8cP5IveZTQIFUS4 z6F@xG08a08opVnDD}yEP#oj{z(D3j>C_irwVf?Vo0r6Xs@4oEqM zrxXMztu-1RX&W>=HomVCQZMZ_%>!BbVtf6&3y{Xh{Ro;Q-1&e002ovPDHLk FV1j@Tu7m&p literal 0 HcmV?d00001 diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js index 25b7e5612..d24bfeffd 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.js +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.js @@ -32,10 +32,11 @@ Page({ show_field_price_text: null, goods_video_is_autoplay: false, + is_use_mobile_detail: 1, }, onLoad(params) { - params['goods_id']=2; + //params['goods_id']=2; this.setData({params: params}); this.init(); }, @@ -85,7 +86,7 @@ Page({ autoplay: (data.goods.photo.length > 1), goods_photo: data.goods.photo, goods_specifications_choose: data.goods.specifications.choose || [], - goods_content_app: data.goods.content_app, + goods_content_app: data.goods.content_app || [], temp_buy_number: data.goods.buy_min_number || 1, goods_favor_text: (data.goods.is_favor == 1) ? '已收藏' : '收藏', goods_favor_icon: '/images/goods-detail-favor-icon-' + data.goods.is_favor+'.png', @@ -100,6 +101,7 @@ Page({ goods_spec_base_images: data.goods.images, show_field_price_text: (data.goods.show_field_price_text == '销售价') ? null : (data.goods.show_field_price_text.replace(/<[^>]+>/g, "") || null), + is_use_mobile_detail: data.is_use_mobile_detail || 0, }); // 不能选择规格处理 diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml index 4ae7799d9..5a885c812 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml @@ -16,13 +16,15 @@ - - - - - 视频 - 关闭 - + + + + + + + + + @@ -53,17 +55,22 @@ --> - + 详情 - - - - {{items}} - - + + + + + + + + {{items}} + + + diff --git a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss index ed6e5a136..2d406b690 100755 --- a/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss +++ b/public/appmini/old/weixin/pages/goods-detail/goods-detail.wxss @@ -233,22 +233,10 @@ .goods-video-submit { position: absolute; left: 30rpx; - top: calc(65vh - 80rpx); + top: calc(65vh - 110rpx); z-index: 2; } -.goods-video-submit text { - height: 56rpx; - line-height: 56rpx !important; - font-size: 24rpx; - padding: 5rpx 20rpx; - border-radius: 6rpx; - background: #fff; -} -.goods-video-play { - border: 1px solid #10a54a; - color: #10a54a; -} -.goods-video-close { - border: 1px solid #eee; - color: #cb5757; -} +.goods-video-submit image { + width: 80rpx; + height: 80rpx; +} \ No newline at end of file -- GitLab