Merge branch 'feature_student' into release/4.9.1.0

# Conflicts:
#	apps/product/models/detail.js
#	config/common.js
#	public/scss/common/_good.css

@@ -13,7 +13,7 @@
                 {{#each data.list}}
                 {{#each data.list}}
                 <div class='s-section'>
                 <div class='s-section'>
                 <a href="javascript:void(0)">
                 <a href="javascript:void(0)">
-                    <img src='{{image src 357 174}}' title="{{title}}">
+                    <img src='{{image src 320 149}}' title="{{title}}">
                 </a>
                 </a>
                 </div>
                 </div>
                 {{/each}}
                 {{/each}}
@@ -24,8 +24,9 @@
         {{#coupons}}
         {{#coupons}}
         <section class='s-section clearfix' data-template-id="{{template_id}}">
         <section class='s-section clearfix' data-template-id="{{template_id}}">
             <h1>领券中心
             <h1>领券中心
-                <a class='more' href="{{link}}">...</a>
+                <a class='more iconfont' href="{{link}}">&#xe618;</a>
             </h1>
             </h1>
+
             <div class='s-coupon-contain'>
             <div class='s-coupon-contain'>
                 <style type="text/css">
                 <style type="text/css">
                     .no-bg{
                     .no-bg{
@@ -76,7 +77,7 @@
         {{/activities}}
         {{/activities}}
 
 
         <section class='s-section  clearfix'>
         <section class='s-section  clearfix'>
-            <h1>学生专享商品<a class="more" href="//search.m.yohobuy.com/?students=1&title=学生专享商品&uid={{uid}}{{#isApp}}&app_version=1{{/isApp}}">...</a></h1>
+            <h1>学生专享商品<a class="more iconfont" href="//search.m.yohobuy.com/?students=1&title=学生专享商品&uid={{uid}}{{#isApp}}&app_version=1{{/isApp}}">&#xe618;</a></h1>
             <div class='goods-list clearfix'>
             <div class='goods-list clearfix'>
             {{#each goods}}
             {{#each goods}}
             <div class="good-info">
             <div class="good-info">

@@ -20,7 +20,7 @@
         </section>
         </section>
     {{/if}}
     {{/if}}
         <section class='s-section  clearfix'>
         <section class='s-section  clearfix'>
-            <h1>学生专享商品<a class="more" href="//search.m.yohobuy.com/?students=1&title=学生专享商品&uid={{uid}}{{#isApp}}&app_version=1{{/isApp}}">...</a></h1>
+            <h1>学生专享商品<a class="more iconfont" href="//search.m.yohobuy.com/?students=1&title=学生专享商品&uid={{uid}}{{#isApp}}&app_version=1{{/isApp}}">&#xe618;</a></h1>
             <div class='goods-list clearfix'>
             <div class='goods-list clearfix'>
             {{#each goods}}
             {{#each goods}}
             <div class="good-info">
             <div class="good-info">

@@ -235,8 +235,9 @@ const _detailDataPkg = (origin, uid, vipLevel, ua) => {
         if (originPrice.yohoCoinNum) {
         if (originPrice.yohoCoinNum) {
             dest.commodityReturn = originPrice.yohoCoinNum;
             dest.commodityReturn = originPrice.yohoCoinNum;
         }
         }
-        //学生有货币
-        if(originPrice.studentCoinNum){
+
+        // 学生有货币
+        if (originPrice.studentCoinNum) {
             dest.studentCoinNum = originPrice.studentCoinNum;
             dest.studentCoinNum = originPrice.studentCoinNum;
         }
         }
     }
     }

@@ -445,6 +445,7 @@ AsideSlider.prototype.init = function() {
         'transform': translate,
         'transform': translate,
         '-webkit-transform': translate,
         '-webkit-transform': translate,
       });
       });
+        me.isFirst=false;
       y = deltaY;
       y = deltaY;
     })
     })
 
 

@@ -134,7 +134,7 @@ function setFormByCookes(item) {
     item.education_degree && $('#s-education-tb').val(item.education_degree);
     item.education_degree && $('#s-education-tb').val(item.education_degree);
     item.enrollment_year && $('#s-year-tb').val(item.enrollment_year);
     item.enrollment_year && $('#s-year-tb').val(item.enrollment_year);
     item.provinceName && $('#s-province-tb').val(item.provinceName);
     item.provinceName && $('#s-province-tb').val(item.provinceName);
-    if (item.procode) {
+    if (item.procode && item.procode !== 'undefined') {
         province.selected().areaCode = item.procode;
         province.selected().areaCode = item.procode;
         province.selected().addresseeName = item.provinceName;
         province.selected().addresseeName = item.provinceName;
     }
     }
@@ -229,7 +229,7 @@ Filter.prototype = {
         var html = [],
         var html = [],
             name;
             name;
 
 
-        if (this.__select__ && this.__title__) {
+        if (this.__select__ && this.__title__ && this.__select__[this.__feild__]) {
             html.push('<h6 class=\'s-title\'>当前地区</h6>');
             html.push('<h6 class=\'s-title\'>当前地区</h6>');
             html.push('<div class=\'s-item close\'>' + this.__select__[this.__feild__] + '</div>');
             html.push('<div class=\'s-item close\'>' + this.__select__[this.__feild__] + '</div>');
         }
         }

@@ -245,7 +245,7 @@
       border-bottom: 1px solid #e0e0e0;
       border-bottom: 1px solid #e0e0e0;
       width: 50%;
       width: 50%;
       /*  padding:30px 0px 30px 40px; */
       /*  padding:30px 0px 30px 40px; */
-      height: 174px;
+      height: 152px;
       background-color: #ffffff;
       background-color: #ffffff;
       display: table;
       display: table;
       float: left;
       float: left;
@@ -397,6 +397,10 @@
     border-bottom: 1px solid #e0e0e0;
     border-bottom: 1px solid #e0e0e0;
     position: relative;
     position: relative;
 
 
+    input::-webkit-input-placeholder{
+        font-family: helvetica, Arial, "黑体";
+        font-weight:lighter;
+    }
     label {
     label {
       width: 174px;
       width: 174px;
       display: inline-block;
       display: inline-block;