fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by xuqi
Commit e58045227bd46dfea36203c892d3bd2b31fdb21b 2 parents 77084a15 0caeafc4

Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

Inline Side-by-side
Showing 8 changed files with 33 additions and 32 deletions
@@ -21,7 +21,7 @@ use LibModels\Wap\Product\SearchData; @@ -21,7 +21,7 @@ use LibModels\Wap\Product\SearchData;
21 class PlusstarData 21 class PlusstarData
22 { 22 {
23 23
24 - const URI_BRANDLIST = 'guang/api/v1/plustar/getlist'; 24 + const URI_BRANDLIST = 'guang/api/v3/plustar/getlist';
25 const URI_BRANDINFO_PLUSSTAR = 'guang/service/v3/plustar/'; // 'guang/service/v3/plustar/' 25 const URI_BRANDINFO_PLUSSTAR = 'guang/service/v3/plustar/'; // 'guang/service/v3/plustar/'
26 const URI_BRANDINFO_FAVORITE = 'shops/service/v1/favorite/'; 26 const URI_BRANDINFO_FAVORITE = 'shops/service/v1/favorite/';
27 const URI_BRANDINFO_ARTICLE = 'guang/service/v1/article/'; 27 const URI_BRANDINFO_ARTICLE = 'guang/service/v1/article/';
@@ -45,19 +45,20 @@ class PlusstarData @@ -45,19 +45,20 @@ class PlusstarData
45 45
46 // 公共的参数 46 // 公共的参数
47 $param = Yohobuy::param(); 47 $param = Yohobuy::param();
48 - $param['brand_type'] = '1';  
49 $param['gender'] = $gender; 48 $param['gender'] = $gender;
50 $param['yh_channel'] = $channel; 49 $param['yh_channel'] = $channel;
51 50
52 // 构建推荐的品牌参数及调用接口的URL 51 // 构建推荐的品牌参数及调用接口的URL
53 $build = $param; 52 $build = $param;
54 - $build['is_recommend'] = '1'; 53 + $build['brand_type'] = '4';
  54 + //$build['is_recommend'] = '1';
55 $build['client_secret'] = Sign::getSign($build); 55 $build['client_secret'] = Sign::getSign($build);
56 $urlList['recom'] = Yohobuy::httpBuildQuery($url, $build); 56 $urlList['recom'] = Yohobuy::httpBuildQuery($url, $build);
57 57
58 // 构建所有的品牌参数及调用接口的URL 58 // 构建所有的品牌参数及调用接口的URL
59 $build = $param; 59 $build = $param;
60 - $build['is_recommend'] = '0'; 60 + $build['brand_type'] = '1';
  61 + //$build['is_recommend'] = '0';
61 $build['client_secret'] = Sign::getSign($build); 62 $build['client_secret'] = Sign::getSign($build);
62 $urlList['all'] = Yohobuy::httpBuildQuery($url, $build); 63 $urlList['all'] = Yohobuy::httpBuildQuery($url, $build);
63 64
@@ -101,6 +101,9 @@ $addressForm.on('submit', function() { @@ -101,6 +101,9 @@ $addressForm.on('submit', function() {
101 }); 101 });
102 102
103 $submit.on('touchend', function() { 103 $submit.on('touchend', function() {
  104 + if (security.hasDangerInput(false)) {
  105 + return false;
  106 + }
104 $input.blur(); 107 $input.blur();
105 $addressForm.submit(); 108 $addressForm.submit();
106 return false; 109 return false;
@@ -6,12 +6,9 @@ @@ -6,12 +6,9 @@
6 6
7 var $ = require('jquery'), 7 var $ = require('jquery'),
8 tip = require('../plugin/tip'), 8 tip = require('../plugin/tip'),
9 - security = require('../plugin/security'),  
10 loading = require('../plugin/loading'); 9 loading = require('../plugin/loading');
11 10
12 var $action = $('.action'), 11 var $action = $('.action'),
13 - $addressForm = $('.edit-address'),  
14 - $submit = $('.submit'),  
15 $addAddress = $('.add-address'), 12 $addAddress = $('.add-address'),
16 $footer = $('#yoho-footer'), 13 $footer = $('#yoho-footer'),
17 $confim = $('.confim-mask'), 14 $confim = $('.confim-mask'),
@@ -24,12 +21,13 @@ $pageWrap.first().css('min-height', function() { @@ -24,12 +21,13 @@ $pageWrap.first().css('min-height', function() {
24 }); 21 });
25 window.rePosFooter(); 22 window.rePosFooter();
26 23
27 -$confim.on('touchend', '.cancel', function() { 24 +$confim.on('touchend', '.cancel', function(e) {
28 deleteId = null; 25 deleteId = null;
29 - $confim.hide(); 26 + $confim.fadeOut();
  27 + return false;
30 }).on('touchend', '.confim', function() { 28 }).on('touchend', '.confim', function() {
31 loading.showLoadingMask(); 29 loading.showLoadingMask();
32 - $confim.hide(); 30 + $confim.fadeOut();
33 $.ajax({ 31 $.ajax({
34 method: 'POST', 32 method: 'POST',
35 url: '/home/delAddress', 33 url: '/home/delAddress',
@@ -52,6 +50,7 @@ $confim.on('touchend', '.cancel', function() { @@ -52,6 +50,7 @@ $confim.on('touchend', '.cancel', function() {
52 }).always(function() { 50 }).always(function() {
53 deleteId = null; 51 deleteId = null;
54 }); 52 });
  53 + return false;
55 }); 54 });
56 55
57 56
@@ -69,17 +68,5 @@ $addAddress.on('touchend', function() { @@ -69,17 +68,5 @@ $addAddress.on('touchend', function() {
69 // 删除 68 // 删除
70 $action.on('touchend', '.del', function() { 69 $action.on('touchend', '.del', function() {
71 deleteId = $(this).data('id'); 70 deleteId = $(this).data('id');
72 - $confim.show();  
73 -});  
74 -  
75 -$submit.on('touchend', function() {  
76 - if (security.hasDangerInput(false)) {  
77 - return false;  
78 - }  
79 - $addressForm.submit();  
80 - return false;  
81 -}).on('touchstart', function() {  
82 - $(this).addClass('highlight');  
83 -}).on('touchend touchcancel', function() {  
84 - $(this).removeClass('highlight'); 71 + $confim.fadeIn();
85 }); 72 });
@@ -114,11 +114,13 @@ $page.on('touchstart', '.del-icon', function() { @@ -114,11 +114,13 @@ $page.on('touchstart', '.del-icon', function() {
114 }); 114 });
115 setTimeout(function() { 115 setTimeout(function() {
116 window.history.go(0); 116 window.history.go(0);
117 - }, 2500); 117 + }, 1200);
118 } 118 }
119 }, 119 },
120 complete: function() { 120 complete: function() {
121 - dialog.hideDialog(); //隐藏dialog 121 + setTimeout(function() {
  122 + dialog.hideDialog();
  123 + }, 1500);
122 } 124 }
123 }); 125 });
124 }); 126 });
@@ -53,8 +53,8 @@ @@ -53,8 +53,8 @@
53 display: block; 53 display: block;
54 position: relative; 54 position: relative;
55 i{ 55 i{
56 - width:80rem / $pxConvertRem;  
57 - height: 30rem / $pxConvertRem; 56 + width:72rem / $pxConvertRem;
  57 + height: 32rem / $pxConvertRem;
58 overflow: hidden; 58 overflow: hidden;
59 display: block; 59 display: block;
60 position: absolute; 60 position: absolute;
@@ -13,21 +13,28 @@ @@ -13,21 +13,28 @@
13 .basic-info { 13 .basic-info {
14 padding-top: 30rem / $pxConvertRem; 14 padding-top: 30rem / $pxConvertRem;
15 padding-bottom: 25rem / $pxConvertRem; 15 padding-bottom: 25rem / $pxConvertRem;
  16 + p{
  17 + width: 100%;
  18 + height: auto;
  19 + overflow: hidden;
  20 + display: block;
  21 + }
  22 + span{
  23 + float: left;
  24 + overflow: hidden;
  25 + }
16 .user-name { 26 .user-name {
17 max-width: 240rem / $pxConvertRem; 27 max-width: 240rem / $pxConvertRem;
18 text-overflow:ellipsis; 28 text-overflow:ellipsis;
19 white-space:nowrap; 29 white-space:nowrap;
20 font-size: 25rem / $pxConvertRem; 30 font-size: 25rem / $pxConvertRem;
21 margin-right: 0.5rem; 31 margin-right: 0.5rem;
22 - display: inline-block;  
23 - overflow: hidden;  
24 } 32 }
25 33
26 .vip-icon { 34 .vip-icon {
27 - display: inline-block;  
28 width: pxToRem(72px); 35 width: pxToRem(72px);
29 height: pxToRem(32px); 36 height: pxToRem(32px);
30 - vertical-align: sub; 37 + line-height: 36rem / $pxConvertRem;
31 } 38 }
32 39
33 .vip-3 { 40 .vip-3 {
@@ -30,7 +30,7 @@ class HomeController extends AbstractAction @@ -30,7 +30,7 @@ class HomeController extends AbstractAction
30 { 30 {
31 $uid = $this->getUid($useSession); 31 $uid = $this->getUid($useSession);
32 if (!$uid) { 32 if (!$uid) {
33 - $this->go(Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', '/')))); 33 + $this->go(Helpers::url('/signin.html', array('refer' => $this->server('HTTP_REFERER', SITE_MAIN))));
34 } 34 }
35 } 35 }
36 36
@@ -806,6 +806,7 @@ class HomeController extends AbstractAction @@ -806,6 +806,7 @@ class HomeController extends AbstractAction
806 ), 806 ),
807 ), 807 ),
808 'orderCode' => $orderCode, 808 'orderCode' => $orderCode,
  809 + 'hasWxShare' => strpos($this->_request->server('HTTP_USER_AGENT', ''), 'MicroMessenger') !== false
809 )); 810 ));
810 } 811 }
811 812