From df3b9ffd46f669f07a26d7d5342877bc8ee7cd7e Mon Sep 17 00:00:00 2001 From: devil Date: Mon, 20 Apr 2020 13:58:42 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/service/BuyService.php | 2 +- application/service/GoodsCommentsService.php | 1 - public/static/common/css/common.css | 4 +- .../2020/02/01/1580558516351420.png | Bin .../app_nav/2020/04/19/1587304154495133.png | Bin 0 -> 1352 bytes .../common/2019/01/14/1547448748316693.png | Bin .../pages/goods-category/goods-category.js | 13 ++- .../pages/goods-detail/goods-detail.acss | 6 +- .../alipay/pages/goods-search/goods-search.js | 12 +++ sourcecode/alipay/pages/index/index.js | 4 +- .../pages/goods-category/goods-category.js | 11 +++ .../baidu/pages/goods-detail/goods-detail.css | 6 +- .../baidu/pages/goods-search/goods-search.js | 11 +++ sourcecode/baidu/pages/index/index.js | 4 +- .../qq/pages/goods-category/goods-category.js | 13 ++- .../qq/pages/goods-detail/goods-detail.qss | 6 +- .../qq/pages/goods-search/goods-search.js | 12 +++ sourcecode/qq/pages/index/index.js | 4 +- .../pages/goods-category/goods-category.js | 13 ++- .../pages/goods-detail/goods-detail.ttss | 6 +- .../pages/goods-search/goods-search.js | 12 +++ sourcecode/toutiao/pages/index/index.js | 4 +- sourcecode/weixin/app.js | 2 +- ...status-icon.png => detail-status-icon.png} | Bin .../{time-icon.png => detail-time-icon.png} | Bin .../{player-icon.png => nav-player-icon.png} | Bin ...are-icon.png => nav-share-friend-icon.png} | Bin .../nav-share-poster-icon.png | Bin 0 -> 2230 bytes .../pages/goods-category/goods-category.js | 13 ++- .../pages/goods-detail/goods-detail.wxss | 6 +- .../weixin/pages/goods-search/goods-search.js | 11 +++ sourcecode/weixin/pages/index/index.js | 4 +- .../plugins/weixinliveplayer/detail/detail.js | 78 +++++++----------- .../weixinliveplayer/detail/detail.wxml | 18 ++-- .../weixinliveplayer/detail/detail.wxss | 26 ++++-- .../plugins/weixinliveplayer/index/index.js | 10 +-- 36 files changed, 215 insertions(+), 97 deletions(-) mode change 100644 => 100755 public/static/upload/images/app_center_nav/2020/02/01/1580558516351420.png create mode 100644 public/static/upload/images/app_nav/2020/04/19/1587304154495133.png mode change 100644 => 100755 public/static/upload/images/common/2019/01/14/1547448748316693.png rename sourcecode/weixin/images/plugins/weixinliveplayer/{status-icon.png => detail-status-icon.png} (100%) rename sourcecode/weixin/images/plugins/weixinliveplayer/{time-icon.png => detail-time-icon.png} (100%) rename sourcecode/weixin/images/plugins/weixinliveplayer/{player-icon.png => nav-player-icon.png} (100%) rename sourcecode/weixin/images/plugins/weixinliveplayer/{share-icon.png => nav-share-friend-icon.png} (100%) create mode 100644 sourcecode/weixin/images/plugins/weixinliveplayer/nav-share-poster-icon.png diff --git a/application/service/BuyService.php b/application/service/BuyService.php index 19c5e331b..7e2831a6b 100755 --- a/application/service/BuyService.php +++ b/application/service/BuyService.php @@ -208,7 +208,7 @@ class BuyService $where['c.user_id'] = $params['user']['id']; $field = 'c.*, g.inventory_unit, g.is_shelves, g.is_delete_time, g.buy_min_number, g.buy_max_number, g.model'; - $data = Db::name('Cart')->alias('c')->join(['__GOODS__'=>'g'], 'g.id=c.goods_id')->where($where)->field($field)->order('c.id desc')->select(); + $data = Db::name('Cart')->alias('c')->leftJoin(['__GOODS__'=>'g'], 'g.id=c.goods_id')->where($where)->field($field)->order('c.id desc')->select(); // 数据处理 if(!empty($data)) diff --git a/application/service/GoodsCommentsService.php b/application/service/GoodsCommentsService.php index ec7326f6e..9f8aca181 100644 --- a/application/service/GoodsCommentsService.php +++ b/application/service/GoodsCommentsService.php @@ -276,7 +276,6 @@ class GoodsCommentsService $v['upd_time_date'] = empty($v['upd_time']) ? null : date('Y-m-d', $v['upd_time']); } } - //print_r($data); return DataReturn('处理成功', 0, $data); } diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css index 037293581..9b2d396d7 100755 --- a/public/static/common/css/common.css +++ b/public/static/common/css/common.css @@ -276,8 +276,10 @@ button.colorpicker-submit:active { -webkit-box-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.15); box-shadow: inset 0 3px 5px rgba(255, 255, 255, 0.15); } +button.colorpicker-submit { + padding-right: 10px; +} button.colorpicker-submit img { - margin-right: 7px; width: 14px; height: 14px; float: right; diff --git a/public/static/upload/images/app_center_nav/2020/02/01/1580558516351420.png b/public/static/upload/images/app_center_nav/2020/02/01/1580558516351420.png old mode 100644 new mode 100755 diff --git a/public/static/upload/images/app_nav/2020/04/19/1587304154495133.png b/public/static/upload/images/app_nav/2020/04/19/1587304154495133.png new file mode 100644 index 0000000000000000000000000000000000000000..33983889019d68007186de6e68cb806f6fba9c92 GIT binary patch literal 1352 zcmV-O1-JT%P)8Uw$&fC*FbNY83n48E%u`7zL1ZZz zX%vZQkrG6ZmU1YC{>TziE9eJ_NVC(Op!t(VznntDLaEG)2rtT_x{&bgV)iEM%{nZ9SK>zWKgyzk4y?nzhy}h(schNF)-8L?V$$Boc{4BK1V=7~Ad(lt<-A+EZz~ zJOkScfO)`7;GEzYRmbnZc3_93mqG_?DYWe^z}(PD)PO-rmxm0HDYWf_z~qp@YsPj- zvqL#QEA67~75u+M2AE}gaVY1hJ=*pcz?4uyYs^=YE)C&$h|spr2YyMh{SMe1B8e_B ziS+t2O45no(QWrRom+wjuaFkMv#$f66K!v>{jKfqZTC0ZMzrB4{J-3z*d7fm2bKXN zPitCb8%e8Ei(#ZVwwD2)0FUx-k((@n_Ih;WG#W2*4**x>n2v!cblcdTMe>-K)y{oU z=z`duN+R%r;oKjE&cXIL{wZ|Bu4z%|3~ZlEBJOhF!UDIP0KNqJ(i-EaBL&+_fX{$6 z6chOoNuydB#2!7A=Yh)#+HRDzw1{Es(L*UB@&IsAQIVmGLfam1dt$fZ50hQMbV+k0 z9c$;tt_a;&P&fj7ZTlnJw{|0sHW&o%lytqM{iS#eG1>AT|4TCbZ?ZkMj2H#;Sd@{+ z=^SaiVi)zfJIx7nr$^tOaeXnc*Y=`{^7y$$+i~DANtZ}^p^RX4D~98Mmu+vcU9|EK zmn@;*2Bt}RqRe1*6S~PQG|N~1PHOFAIwHsF5XryTPo zB*n64c2U(v=q8e01ZDtl<(OU!Y_WYq_^djoc0vP4IxOi9;9ekas5PO2lscxCLbu7O zZYNNLTFyt?o&fX%^K(oO0egZcR06f@(YEgc_L491HejBlL*cXPoZ9s0#@xngAaBa_ z7_g>_&EsWK8=-;Szy&!ruaJm*G<-VcQYWEXiF^QfT+-I6k|~=y37y3=BqIOT?L<1E z&O(1cBJj>`CsGEr8+8DG0xKoW2rP0|Cwnf$8fG_yKH8#f0GJ_ZZ3TH`)r2X)JGS4m zeO+0>x*>Fb%C#SXrHy6$&nwDfbWZ!t!27mew>`eoV3iBq7@FM!>?9F*9m!sajTNU- z^hM_`;E3(@w$Cmtdg$#2b)m)YY{jp(SGDk2tL+B8%t)Z$_7Ar2Zs*1*^ic9vc>u-& zui8FXv|vV|hq4~Hl49RfP9`asJMs!<6gmY-pGsN?%qBSjA&;3PdkHg%LbpIt^F#cF zK#^f*UsgjDx&V?klRQoyr1c9|CQ;~uNIE5H9f{y;Ne)&iOcc6JBpsKu5|{=Qe#weL z4--k>G(N4E4z!vlAA~4$$4J^QX&x|#^o8PQA$_VaYl3}hhNE6(QpWYRp1n;Z4FCg; zjr2DHe*uRjy$R_Dql^Il0MaH<_6#S9nlhQ8Gk7O~^CX=tJ6P6HKOX{DmmRDJ_*l|a zAslBtqc?>J)&r~z$%_H~kS0T1#30000< KMNUMnLSTXysB*jj literal 0 HcmV?d00001 diff --git a/public/static/upload/images/common/2019/01/14/1547448748316693.png b/public/static/upload/images/common/2019/01/14/1547448748316693.png old mode 100644 new mode 100755 diff --git a/sourcecode/alipay/pages/goods-category/goods-category.js b/sourcecode/alipay/pages/goods-category/goods-category.js index 444732325..67b932395 100755 --- a/sourcecode/alipay/pages/goods-category/goods-category.js +++ b/sourcecode/alipay/pages/goods-category/goods-category.js @@ -85,5 +85,16 @@ Page({ // 事件 category_event(e) { my.navigateTo({url: '/pages/goods-search/goods-search?category_id='+e.target.dataset.value}); - } + }, + + // 自定义分享 + onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; + return { + title: app.data.application_title, + desc: app.data.application_describe, + path: '/pages/goods-category/goods-category?referrer=' + user_id + }; + }, }); \ No newline at end of file diff --git a/sourcecode/alipay/pages/goods-detail/goods-detail.acss b/sourcecode/alipay/pages/goods-detail/goods-detail.acss index caf8c02ad..696651d16 100644 --- a/sourcecode/alipay/pages/goods-detail/goods-detail.acss +++ b/sourcecode/alipay/pages/goods-detail/goods-detail.acss @@ -1,5 +1,5 @@ .goods-photo .swiper-item { - height: 65vh !important; + height: 55vh !important; display: block; } @@ -243,12 +243,12 @@ } .goods-video video { width: 100%; - height: 65vh; + height: 55vh; } .goods-video-submit { position: absolute; left: 30rpx; - top: calc(65vh - 110rpx); + top: calc(55vh - 110rpx); z-index: 2; } .goods-video-submit image { diff --git a/sourcecode/alipay/pages/goods-search/goods-search.js b/sourcecode/alipay/pages/goods-search/goods-search.js index 4f552f636..e4ce1914a 100755 --- a/sourcecode/alipay/pages/goods-search/goods-search.js +++ b/sourcecode/alipay/pages/goods-search/goods-search.js @@ -189,4 +189,16 @@ Page({ }); this.get_data_list(1); }, + + // 自定义分享 + onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; + return { + title: app.data.application_title, + desc: app.data.application_describe, + path: '/pages/goods-search/goods-search?referrer=' + user_id + }; + }, + }); diff --git a/sourcecode/alipay/pages/index/index.js b/sourcecode/alipay/pages/index/index.js index e9fcc80c6..5b630cbe6 100644 --- a/sourcecode/alipay/pages/index/index.js +++ b/sourcecode/alipay/pages/index/index.js @@ -199,10 +199,12 @@ Page({ // 自定义分享 onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; return { title: app.data.application_title, desc: app.data.application_describe, - path: '/pages/index/index?share=index' + path: '/pages/index/index?referrer=' + user_id }; }, diff --git a/sourcecode/baidu/pages/goods-category/goods-category.js b/sourcecode/baidu/pages/goods-category/goods-category.js index f0f6134fc..c91a4d3e0 100755 --- a/sourcecode/baidu/pages/goods-category/goods-category.js +++ b/sourcecode/baidu/pages/goods-category/goods-category.js @@ -101,4 +101,15 @@ Page({ }); }, + // 自定义分享 + onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; + return { + title: app.data.application_title, + desc: app.data.application_describe, + path: '/pages/goods-category/goods-category?referrer=' + user_id + }; + }, + }); \ No newline at end of file diff --git a/sourcecode/baidu/pages/goods-detail/goods-detail.css b/sourcecode/baidu/pages/goods-detail/goods-detail.css index dbdc6b2a1..2fe584e10 100755 --- a/sourcecode/baidu/pages/goods-detail/goods-detail.css +++ b/sourcecode/baidu/pages/goods-detail/goods-detail.css @@ -1,5 +1,5 @@ .goods-photo .swiper-item, swiper { - height: 65vh !important; + height: 55vh !important; display: block; } @@ -241,12 +241,12 @@ } .goods-video video { width: 100%; - height: 65vh; + height: 55vh; } .goods-video-submit { position: absolute; left: 30rpx; - top: calc(65vh - 110rpx); + top: calc(55vh - 110rpx); z-index: 2; } .goods-video-submit image, .cover-goods-video-close { diff --git a/sourcecode/baidu/pages/goods-search/goods-search.js b/sourcecode/baidu/pages/goods-search/goods-search.js index 3188630af..fed031166 100755 --- a/sourcecode/baidu/pages/goods-search/goods-search.js +++ b/sourcecode/baidu/pages/goods-search/goods-search.js @@ -201,4 +201,15 @@ Page({ }); }, + // 自定义分享 + onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; + return { + title: app.data.application_title, + desc: app.data.application_describe, + path: '/pages/goods-search/goods-search?referrer=' + user_id + }; + }, + }); \ No newline at end of file diff --git a/sourcecode/baidu/pages/index/index.js b/sourcecode/baidu/pages/index/index.js index d4a888622..4f8fdb220 100755 --- a/sourcecode/baidu/pages/index/index.js +++ b/sourcecode/baidu/pages/index/index.js @@ -186,10 +186,12 @@ Page({ // 自定义分享 onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; return { title: app.data.application_title, desc: app.data.application_describe, - path: '/pages/index/index?share=index' + path: '/pages/index/index?referrer=' + user_id }; }, diff --git a/sourcecode/qq/pages/goods-category/goods-category.js b/sourcecode/qq/pages/goods-category/goods-category.js index 9977db5d5..47e16d8b6 100755 --- a/sourcecode/qq/pages/goods-category/goods-category.js +++ b/sourcecode/qq/pages/goods-category/goods-category.js @@ -88,5 +88,16 @@ Page({ // 事件 category_event(e) { qq.navigateTo({ url: '/pages/goods-search/goods-search?category_id=' + e.currentTarget.dataset.value}); - } + }, + + // 自定义分享 + onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; + return { + title: app.data.application_title, + desc: app.data.application_describe, + path: '/pages/goods-category/goods-category?referrer=' + user_id + }; + }, }); \ No newline at end of file diff --git a/sourcecode/qq/pages/goods-detail/goods-detail.qss b/sourcecode/qq/pages/goods-detail/goods-detail.qss index c8fc2dc29..bc32fdb03 100755 --- a/sourcecode/qq/pages/goods-detail/goods-detail.qss +++ b/sourcecode/qq/pages/goods-detail/goods-detail.qss @@ -1,5 +1,5 @@ .goods-photo .swiper-item, swiper { - height: 65vh !important; + height: 55vh !important; display: block; } @@ -242,12 +242,12 @@ } .goods-video video { width: 100%; - height: 65vh; + height: 55vh; } .goods-video-submit { position: absolute; left: 30rpx; - top: calc(65vh - 110rpx); + top: calc(55vh - 110rpx); z-index: 2; } .goods-video-submit image { diff --git a/sourcecode/qq/pages/goods-search/goods-search.js b/sourcecode/qq/pages/goods-search/goods-search.js index 19b3499f0..f633b80a3 100755 --- a/sourcecode/qq/pages/goods-search/goods-search.js +++ b/sourcecode/qq/pages/goods-search/goods-search.js @@ -190,4 +190,16 @@ Page({ }); this.get_data_list(1); }, + + // 自定义分享 + onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; + return { + title: app.data.application_title, + desc: app.data.application_describe, + path: '/pages/goods-search/goods-search?referrer=' + user_id + }; + }, + }); diff --git a/sourcecode/qq/pages/index/index.js b/sourcecode/qq/pages/index/index.js index f8d417717..c1c361b86 100755 --- a/sourcecode/qq/pages/index/index.js +++ b/sourcecode/qq/pages/index/index.js @@ -183,10 +183,12 @@ Page({ // 自定义分享 onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; return { title: app.data.application_title, desc: app.data.application_describe, - path: '/pages/index/index?share=index' + path: '/pages/index/index?referrer=' + user_id }; }, diff --git a/sourcecode/toutiao/pages/goods-category/goods-category.js b/sourcecode/toutiao/pages/goods-category/goods-category.js index afb39ddc5..e66573fde 100755 --- a/sourcecode/toutiao/pages/goods-category/goods-category.js +++ b/sourcecode/toutiao/pages/goods-category/goods-category.js @@ -88,5 +88,16 @@ Page({ // 事件 category_event(e) { tt.navigateTo({ url: '/pages/goods-search/goods-search?category_id=' + e.currentTarget.dataset.value}); - } + }, + + // 自定义分享 + onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; + return { + title: app.data.application_title, + desc: app.data.application_describe, + path: '/pages/goods-category/goods-category?referrer=' + user_id + }; + }, }); \ No newline at end of file diff --git a/sourcecode/toutiao/pages/goods-detail/goods-detail.ttss b/sourcecode/toutiao/pages/goods-detail/goods-detail.ttss index c8fc2dc29..bc32fdb03 100755 --- a/sourcecode/toutiao/pages/goods-detail/goods-detail.ttss +++ b/sourcecode/toutiao/pages/goods-detail/goods-detail.ttss @@ -1,5 +1,5 @@ .goods-photo .swiper-item, swiper { - height: 65vh !important; + height: 55vh !important; display: block; } @@ -242,12 +242,12 @@ } .goods-video video { width: 100%; - height: 65vh; + height: 55vh; } .goods-video-submit { position: absolute; left: 30rpx; - top: calc(65vh - 110rpx); + top: calc(55vh - 110rpx); z-index: 2; } .goods-video-submit image { diff --git a/sourcecode/toutiao/pages/goods-search/goods-search.js b/sourcecode/toutiao/pages/goods-search/goods-search.js index cc3a41aac..d232fd55f 100755 --- a/sourcecode/toutiao/pages/goods-search/goods-search.js +++ b/sourcecode/toutiao/pages/goods-search/goods-search.js @@ -190,4 +190,16 @@ Page({ }); this.get_data_list(1); }, + + // 自定义分享 + onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; + return { + title: app.data.application_title, + desc: app.data.application_describe, + path: '/pages/goods-search/goods-search?referrer=' + user_id + }; + }, + }); diff --git a/sourcecode/toutiao/pages/index/index.js b/sourcecode/toutiao/pages/index/index.js index 9fbb4152b..923508e06 100755 --- a/sourcecode/toutiao/pages/index/index.js +++ b/sourcecode/toutiao/pages/index/index.js @@ -184,10 +184,12 @@ Page({ // 自定义分享 onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; return { title: app.data.application_title, desc: app.data.application_describe, - path: '/pages/index/index?share=index' + path: '/pages/index/index?referrer=' + user_id }; }, diff --git a/sourcecode/weixin/app.js b/sourcecode/weixin/app.js index 949d3408a..18842b7f0 100755 --- a/sourcecode/weixin/app.js +++ b/sourcecode/weixin/app.js @@ -68,7 +68,7 @@ App({ // 请求地址 request_url: "{{request_url}}", request_url: 'http://shopxo.com/', - // request_url: 'https://dev.shopxo.net/', + request_url: 'https://dev.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/sourcecode/weixin/images/plugins/weixinliveplayer/status-icon.png b/sourcecode/weixin/images/plugins/weixinliveplayer/detail-status-icon.png similarity index 100% rename from sourcecode/weixin/images/plugins/weixinliveplayer/status-icon.png rename to sourcecode/weixin/images/plugins/weixinliveplayer/detail-status-icon.png diff --git a/sourcecode/weixin/images/plugins/weixinliveplayer/time-icon.png b/sourcecode/weixin/images/plugins/weixinliveplayer/detail-time-icon.png similarity index 100% rename from sourcecode/weixin/images/plugins/weixinliveplayer/time-icon.png rename to sourcecode/weixin/images/plugins/weixinliveplayer/detail-time-icon.png diff --git a/sourcecode/weixin/images/plugins/weixinliveplayer/player-icon.png b/sourcecode/weixin/images/plugins/weixinliveplayer/nav-player-icon.png similarity index 100% rename from sourcecode/weixin/images/plugins/weixinliveplayer/player-icon.png rename to sourcecode/weixin/images/plugins/weixinliveplayer/nav-player-icon.png diff --git a/sourcecode/weixin/images/plugins/weixinliveplayer/share-icon.png b/sourcecode/weixin/images/plugins/weixinliveplayer/nav-share-friend-icon.png similarity index 100% rename from sourcecode/weixin/images/plugins/weixinliveplayer/share-icon.png rename to sourcecode/weixin/images/plugins/weixinliveplayer/nav-share-friend-icon.png diff --git a/sourcecode/weixin/images/plugins/weixinliveplayer/nav-share-poster-icon.png b/sourcecode/weixin/images/plugins/weixinliveplayer/nav-share-poster-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f6be44f6631158dea12b22047f61e2b843e0543e GIT binary patch literal 2230 zcmV;n2ub&eP)-J?**GEcq`;eqB`Ysb! zq)!PolbXU!LKMwtP+cDphK#@YAL~4G-se5%IeYJOUTfx=JNJFpUTgi%e$L)|t+iib z0Y%cr0A32lA`;MoA44qyWS1n{TE=cfRE;15avyC7nxqlzSh?Ev6y0aTXV3E*)gKjnZV9S7jBF@gh71Ahm= zdH_C6@|#0!7XwS$7Qp8Lyf6Y-PV%&XJ_*3VLjsGjP2jELXIB9D7|EZM*e?Q>wAAlc zi^Dxho*&Ss1K6)5sK%H!VE_7|fIchNem1bAqXDd%;b>=)Ukm870W8Z6Dgn4wIiI9o zsbon8mgINndxr?F~0moKzYpT)E+n(gN0{Sul z@5vl*^%P+1{gI^i_Fm})mh@r(KkK#BuCOi18ztG#8UXLiw37;Kvk#K=t}#<)0!w-_ zfIAv1ai6`m-`7F=l`!<%GmPW_+wAou-#W{FAMlrApUsG|Rdp+pH^&3?g61tPMRI{{ z^Kz2Ab{X#kmb3)G#VJuG>TE&s7D;~ByqCT)VO$BY%^pG02cUV<3M}avu_AAp5LBwl zzW}_6zgzL*l|tH19gz|W?0h601nEf$ke|Fz-}bh zN^-vZ4FJz?u`v|*GLpMD?al#?g#A~U!I!FgZ}&{!CFxZG?E*nlh61lg(rd>=rh)5> zq!glL+`}aAj?>(g0K8z7btz>>NSO&gMYr~;Pc zne_}0kw3)VdczPSZDV`B(p3r?947!++2MaPl6Ta={(hf1Akar+PpuY)v1JDEWHFL- z41kZ$@V%Jini}|60EZU_`WOJ$jeRa&5a|GZH_5NY%=XpUtadQTQ)=Mpmpmu%UB@bt zcR6hV-h*V7x=K32_3DIxk0*Ip4ScEJzl1^4Dow{nlXT}{beRI)o8&nG`w;*qCOUN6 zX0ICfn&<^3j;+*|k~}XQ9|>R^lH24MNY!lsA3*YR;qw3hpG~#lvpUH|HSkrLwWfVY zRz+}0e)qiw+(7az8381#2JqD+y$ajsJ^;RuY~X*2ReUvYPVIPqlI|+l@gV??568U) zw9Eh}>XO`A`DFO)>U#8<{|d=nYT(pf&pAZn@ilO>{V`8IFaNbHSl%-sxCo?tg2Vw z8Sl@PBzGzdX6CRsS9=?J(g6D_Nv^JeeGTE^4r9lXtWGdJU#TldzH2~0twSaGCV^-6 zX#;Inxpgyn_)XlwXxcrAr1v_*I(uq3ACCLJ@>Z)>K?8d>>XvCjAYC)NMa=ATN^La8{et9+{QoBKhohtKpI0kd zz`7NglH0nJvReQ(j0Q0K%9T8kg za!CNYLg8wmp|8t{IO^igX~&d{>*MHj)pAnslJq?Du*bVp>Y2VNitf!aY>xe6-R51dw$8&70Q|kc`gtUmwgB6ddrF>Z zcMn~3_cr53`~O2G=l(hGaP3)AX;1iElFK@PZT@%O1xVf&MR!BDwO7V`2=|hlv+%Xe zu=}<*7kI5op)-JO(tEw3-AHrM-O$tRl>*nDLne2}YK^XU*qgl@;yH3A$$fi(ZO^?c zUv0WGitdJfW{#so-5W{HyJ^q`{PLLPy5*7L;|!AfB>>x&yN52Sxu@i#qbn}!r#MN} z`DYX)Zkg7fb>*Q>>=S*UI+-N`+veQ?eUBt39fp2ls?~m4q)B_Fcr{h zk}C^=ZR)1zUi@CtUQS>#fZh4nV7lAiHa-bBpkD&O?{wF`c>>8p2LRiRvn*eOSSP8O zz0G2O0Kn${cBDL@WZ(w0yA)fs82=2(!v_M}?DYZtXGy*~H7j#+dvqDeAEv-sCkr^B zy^6YII^Bz^Ncq5K2@Cj*vaNFF&7 zu~4a%^|=4FLo`sY9p@;1ONa407*qoM6N<$ Eg3#7RQ~&?~ literal 0 HcmV?d00001 diff --git a/sourcecode/weixin/pages/goods-category/goods-category.js b/sourcecode/weixin/pages/goods-category/goods-category.js index 0ac0bd6fd..9e1f446f0 100755 --- a/sourcecode/weixin/pages/goods-category/goods-category.js +++ b/sourcecode/weixin/pages/goods-category/goods-category.js @@ -87,5 +87,16 @@ Page({ // 事件 category_event(e) { wx.navigateTo({ url: '/pages/goods-search/goods-search?category_id=' + e.currentTarget.dataset.value}); - } + }, + + // 自定义分享 + onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; + return { + title: app.data.application_title, + desc: app.data.application_describe, + path: '/pages/goods-category/goods-category?referrer=' + user_id + }; + }, }); \ No newline at end of file diff --git a/sourcecode/weixin/pages/goods-detail/goods-detail.wxss b/sourcecode/weixin/pages/goods-detail/goods-detail.wxss index f643621f2..6e4bc26ba 100755 --- a/sourcecode/weixin/pages/goods-detail/goods-detail.wxss +++ b/sourcecode/weixin/pages/goods-detail/goods-detail.wxss @@ -1,5 +1,5 @@ .goods-photo .swiper-item, swiper { - height: 65vh !important; + height: 55vh !important; display: block; } @@ -241,12 +241,12 @@ } .goods-video video { width: 100%; - height: 65vh; + height: 55vh; } .goods-video-submit { position: absolute; left: 30rpx; - top: calc(65vh - 110rpx); + top: calc(55vh - 110rpx); z-index: 2; } .goods-video-submit image { diff --git a/sourcecode/weixin/pages/goods-search/goods-search.js b/sourcecode/weixin/pages/goods-search/goods-search.js index cd1f41693..18d656af5 100755 --- a/sourcecode/weixin/pages/goods-search/goods-search.js +++ b/sourcecode/weixin/pages/goods-search/goods-search.js @@ -190,4 +190,15 @@ Page({ }); this.get_data_list(1); }, + + // 自定义分享 + onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; + return { + title: app.data.application_title, + desc: app.data.application_describe, + path: '/pages/goods-search/goods-search?referrer=' + user_id + }; + }, }); diff --git a/sourcecode/weixin/pages/index/index.js b/sourcecode/weixin/pages/index/index.js index 0e44705f9..7d0243cb8 100755 --- a/sourcecode/weixin/pages/index/index.js +++ b/sourcecode/weixin/pages/index/index.js @@ -184,10 +184,12 @@ Page({ // 自定义分享 onShareAppMessage() { + var user = app.get_user_cache_info() || null; + var user_id = (user != null && (user.id || null) != null) ? user.id : 0; return { title: app.data.application_title, desc: app.data.application_describe, - path: '/pages/index/index?share=index' + path: '/pages/index/index?referrer=' + user_id }; }, diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.js b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.js index 79c6654b8..fffe4bfae 100644 --- a/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.js +++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.js @@ -88,71 +88,55 @@ Page({ // 进入直播 player_event(e) { - if ((this.data.detail || null) != null) - { - if (this.data.detail.status == 1 || this.data.detail.status == 2) { - var room_id = this.data.detail.id - var params = encodeURIComponent(JSON.stringify({type: 'detail'})); - wx.navigateTo({ - url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${this.data.detail.id}&custom_params=${params}` - }); - } - } else { - app.showToast('数据有误'); + if (this.data.detail.status == 1 || this.data.detail.status == 2) { + var room_id = this.data.detail.id + var params = encodeURIComponent(JSON.stringify({type: 'detail'})); + wx.navigateTo({ + url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${this.data.detail.id}&custom_params=${params}` + }); } }, // 海报分享 - share_event() { - var user = app.get_user_info(this, 'poster_event'); - if (user != false) { - // 用户未绑定用户则转到登录页面 - if (app.user_is_need_login(user)) { - wx.navigateTo({ - url: "/pages/login/login?event_callback=poster_event" - }); - return false; - } else { - wx.showLoading({ title: '生成中...' }); - wx.request({ - url: app.get_request_url('poster', 'index', 'weixinliveplayer'), - method: 'POST', - data: { "id": this.data.detail.id }, - dataType: 'json', - success: (res) => { - wx.hideLoading(); - if (res.data.code == 0) { - wx.previewImage({ - current: res.data.data, - urls: [res.data.data] - }); - } else { - app.showToast(res.data.msg); - } - }, - fail: () => { - wx.hideLoading(); - app.showToast("服务器请求出错"); - } - }); + share_poster_event() { + wx.showLoading({ title: '生成中...' }); + wx.request({ + url: app.get_request_url('poster', 'index', 'weixinliveplayer'), + method: 'POST', + data: { "id": this.data.detail.id }, + dataType: 'json', + success: (res) => { + wx.hideLoading(); + if (res.data.code == 0) { + wx.previewImage({ + current: res.data.data, + urls: [res.data.data] + }); + } else { + app.showToast(res.data.msg); + } + }, + fail: () => { + wx.hideLoading(); + app.showToast("服务器请求出错"); } - } + }); }, // 自定义分享 onShareAppMessage() { var user = app.get_user_cache_info() || null; var user_id = (user != null && (user.id || null) != null) ? user.id : 0; - if ((this.data.detail || null) == null) + if ((this.data.detail || null) != null) { var did = this.data.detail.id; var name = this.data.detail.name; } else { var did = 0; - var name = ''; + var name = app.data.application_title; } return { - title: app.data.application_title + name, + title: name, desc: app.data.application_describe, path: '/pages/plugins/weixinliveplayer/detail/detail?id=' + did + '&referrer=' + user_id }; diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxml b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxml index c7ed7ce7b..32c7fe140 100644 --- a/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxml +++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxml @@ -8,12 +8,12 @@ - + 直播状态 {{detail.status_name}} - + 开播时间 {{detail.start_time}} @@ -24,13 +24,17 @@ - - + diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxss b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxss index dadd7c0b1..0d14afb46 100644 --- a/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxss +++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/detail/detail.wxss @@ -16,7 +16,7 @@ padding: 15rpx 10rpx 0 10rpx; } .base .item { - line-height: 50rpx; + line-height: 38rpx; padding: 20rpx 0; } .base .item .item-icon { @@ -40,6 +40,9 @@ .base .item-time { line-height: 75rpx; } +.base .item-time .item-icon { + margin-top: 20rpx; +} .base .item-time .time { line-height: 38rpx; } @@ -61,22 +64,29 @@ height: 100rpx; } .nav button { - width: 50%; height: 100% !important; border-radius: 0; font-size: 32rpx; line-height: 100rpx; + color: #fff; } .nav button image { - width: 40rpx; - height: 40rpx !important; + width: 32rpx; + height: 32rpx !important; vertical-align: middle; margin-right: 10rpx; } +.nav button.share-friend-submit, +.nav button.share-poster-submit { + width: 30%; +} +.nav button.share-friend-submit { + background: #1bad18; +} +.nav button.share-poster-submit { + background: #6367f0; +} .nav button.player-submit { + width: 40%; background: #d2364c; - color: #fff; -} -.nav button.disabled { - background: #ffc5cd; } \ No newline at end of file diff --git a/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.js b/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.js index c7785b7db..19be20074 100644 --- a/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.js +++ b/sourcecode/weixin/pages/plugins/weixinliveplayer/index/index.js @@ -10,15 +10,10 @@ Page({ banner_list: [], }, - onLoad(params) { - // 启动参数处理 - params = app.launch_params_handle(params); - + onShow() { this.init(); }, - onShow() {}, - init() { // 获取数据 this.get_data_list(); @@ -89,8 +84,9 @@ Page({ onShareAppMessage() { var user = app.get_user_cache_info() || null; var user_id = (user != null && (user.id || null) != null) ? user.id : 0; + var name = ((this.data.data_base || null) != null && (this.data.data_base.application_name || null) != null) ? this.data.data_base.application_name : app.data.application_title; return { - title: app.data.application_title, + title: name, desc: app.data.application_describe, path: '/pages/plugins/weixinliveplayer/index/index?referrer=' + user_id }; -- GitLab