Authored by Lynnic

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

@@ -3,6 +3,7 @@ var $ = require('jquery'), @@ -3,6 +3,7 @@ var $ = require('jquery'),
3 var employ; 3 var employ;
4 4
5 window.rePosFooter(); 5 window.rePosFooter();
  6 +$('.yoho-footer').css('border-top', '1px solid #e0e0e0');
6 $('.employ span').each(function(index) { 7 $('.employ span').each(function(index) {
7 employ = new Hammer($('.employ span')[index]); 8 employ = new Hammer($('.employ span')[index]);
8 employ.on('tap', function(e) { 9 employ.on('tap', function(e) {
@@ -19,6 +19,14 @@ @@ -19,6 +19,14 @@
19 font-weight: bold; 19 font-weight: bold;
20 } 20 }
21 21
  22 + .name {
  23 + display: inline-block;
  24 + max-width: pxToRem(380px);
  25 + overflow: hidden;
  26 + text-overflow: ellipsis;
  27 + white-space: nowrap;
  28 + }
  29 +
22 .tel { 30 .tel {
23 float: right; 31 float: right;
24 } 32 }
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 <input type="hidden" name="id" value=""> 3 <input type="hidden" name="id" value="">
4 <label class="username"> 4 <label class="username">
5 收件人姓名 5 收件人姓名
6 - <input type="text" name="consignee" value=""> 6 + <input type="text" name="consignee" maxlength="20" value="">
7 </label> 7 </label>
8 <label class="mobile"> 8 <label class="mobile">
9 手机号码 9 手机号码
@@ -17,7 +17,7 @@ @@ -17,7 +17,7 @@
17 </label> 17 </label>
18 <label class="address"> 18 <label class="address">
19 详细地址 19 详细地址
20 - <textarea name="address"></textarea> 20 + <textarea name="address" maxlength="100"></textarea>
21 </label> 21 </label>
22 22
23 </form> 23 </form>