Merge branch 'feature/storeHome' into 'release/6.1'

Feature/store home



See merge request !928

 'use strict';
 
-const camelCase = global.yoho.camelCase;
 const _ = require('lodash');
 
 class storeHome extends global.yoho.BaseModel {
@@ -46,6 +45,10 @@ class storeHome extends global.yoho.BaseModel {
                 if (result[0].data.babyInfo) {
                     let thisGender = result[0].data.babyInfo.gender;
 
+                    if (!thisGender) {
+                        result[0].data.unknow = true;
+                    }
+
                     result[0].data.gender = (thisGender === '1' ? '男' : '女');
                     result[0].data.otherGender = (thisGender === '1' ? '女' : '男');
                     if (result[0].data.gender === '男') {
@@ -57,7 +60,7 @@ class storeHome extends global.yoho.BaseModel {
                     }
                 }
 
-                result = camelCase(result[0].data);
+                result = result[0].data;
             }
             return result;
         });

@@ -2,14 +2,14 @@
     <div class="coupon-list">
         {{# coupons}}
         <div class="coupon-item">
-            <div class="coupon-title eps">{{couponName}}</div>
+            <div class="coupon-title eps">{{coupon_name}}</div>
             <div class="coupon-main">
                 <div class="left">
-                    <p class="price">{{couponAmount}}</p>
-                    <p class="limit">{{useLimit}}</p>
+                    <p class="price">{{coupon_amount}}</p>
+                    <p class="limit">{{use_limit}}</p>
                 </div>
                 <div class="right">
-                    <p class="date">{{validateDate}}</p>
+                    <p class="date">{{validate_date}}</p>
                     <p class="detail-btn">详细信息
                         <span class="iconfont up">&#xe615;</span>
                         <span class="iconfont down">&#xe616;</span>

@@ -19,6 +19,7 @@
             <span class="iconfont">&#xe604;</span>
             <div class="select-c">
                 <select class="s-title baby-gender modify">
+                    {{#if unknow}}<option disabled selected></option>{{/if}}
                     <option value="{{genderId}}">{{gender}}</option>
                     <option value="{{otherGenderId}}">{{otherGender}}</option>
                 </select>

@@ -5,8 +5,8 @@
     <div class="base-info">
         <div class="left">
             <div class="user">
-                <span class="name">{{nickName}}</span>
-                <span class="vip vip-{{vipLevel}}"></span>
+                <span class="name">{{nick_name}}</span>
+                <span class="vip vip-{{vip_level}}"></span>
             </div>
             <div class="tel">{{mobile}}</div>
         </div>
@@ -23,26 +23,26 @@
     <ul class="info-list">
         <li>
             <div class="left">消费金额</div>
-            <a class="right"{{#if cousumeAmount}} href="//m.yohobuy.com/activity/store-home/history?shopType={{vipType}}"{{/if}}>¥{{cousumeAmount}}
-                {{#if cousumeAmount}}
+            <a class="right"{{#if cousume_amount}} href="//m.yohobuy.com/activity/store-home/history?shopType={{vip_type}}"{{/if}}>¥{{cousume_amount}}
+                {{#if cousume_amount}}
                 <span class="iconfont">&#xe604;</span>
                 {{/if}}
             </a>
         </li>
         <li>
             <div class="left">消费次数</div>
-            <div class="right">{{cousumeNum}}次</div>
+            <div class="right">{{cousume_num}}次</div>
         </li>
         <li>
             <div class="left">我的积分</div>
-            <div class="right">{{creditPoints}}</div>
+            <div class="right">{{credit_points}}</div>
         </li>
     </ul>
     <div class="process-c">
         <div class="process-line">
             <div style="width: {{process}}%;"></div>
         </div>
-        <ul class="level-c" data-vip="{{vipLevel}}">
+        <ul class="level-c" data-vip="{{vip_level}}">
             <li class="disable">
                 <div class="dot"></div>
                 <span class="vip vip-1"></span>
@@ -61,26 +61,26 @@
         </ul>
     </div>
     <ul class="list coupon">
-        <a href="//m.yohobuy.com/activity/store-home/coupon?shopType={{vipType}}">
+        <a href="//m.yohobuy.com/activity/store-home/coupon?shopType={{vip_type}}">
             <li class="list-item">
                 <span class="title">我的优惠券</span>
                 <span class="iconfont">&#xe604;</span>
-                <span class="s-title">{{couponsNum}}</span>
+                <span class="s-title">{{coupons_num}}</span>
             </li>
         </a>
     </ul>
 </div>
-<div class="edit-title hide">编辑资料</div>
-<ul class="list hide">
+<div class="edit-title">编辑资料</div>
+<ul class="list">
     <li class="list-item">
         <span class="title">昵称</span>
         <span class="iconfont">&#xe604;</span>
-        <span class="s-title">{{nickName}}</span>
+        <span class="s-title">{{nick_name}}</span>
     </li>
     <li class="list-item">
         <span class="title">生日</span>
         <span class="iconfont">&#xe604;</span>
-        <span class="s-title">{{birthDay}}</span>
+        <span class="s-title">{{birth_day}}</span>
     </li>
     <li class="list-item">
         <span class="title">性别</span>

@@ -26,7 +26,7 @@ class Photography extends Page {
     }
 
     bindEvents() {
-        if (yoho.isWechat) {
+        if (yoho.isAndroid) {
             this.selector.$modifyInp.on('change', this.modifyInp.bind(this));
         } else {
             this.selector.$noDate.on('change', this.modifyInp.bind(this));

@@ -3,6 +3,11 @@ html {
     background-color: #f0f0f0;
 }
 
+select {
+    -moz-appearance: none;
+    -webkit-appearance: none;
+}
+
 input {
     padding: 0;
 }