Merge branch 'feature/wap/yuanxiao' of git.dev.yoho.cn:web/yohobuy into feature/wap/yuanxiao

@@ -12,13 +12,16 @@
                 <div class="title">
                 <div class="title">
                     昵称
                     昵称
                 </div>
                 </div>
-                <input type="text" name="nick" placeholder="请输入您帅气的名字!" value="" maxlength="5">
+                <input type="text" name="nick" placeholder="请输入您帅气的名字!" value="" maxlength="20">
             </div>
             </div>
             <div class="user-info birthday">
             <div class="user-info birthday">
                 <div class="title">
                 <div class="title">
                     生日
                     生日
                 </div>
                 </div>
-                <input type="date" name="birthday" value="{{birthday}}" min="1900-01-01" max="2016-01-01">
+                <div class="birthday-div">
+                    <span>{{birthday}}</span>
+                    <input class="birthday-input" type="date" name="birthday" value="{{birthday}}" min="1900-01-01" max="2016-02-29">
+                </div>
             </div>
             </div>
             <div class="gender">
             <div class="gender">
                 <div class="title">
                 <div class="title">
@@ -44,7 +47,9 @@
             <div class="modal">
             <div class="modal">
                 <div class="icon close"></div>
                 <div class="icon close"></div>
                 <div class="text">
                 <div class="text">
-                    你还没有<br>完善信息哦
+                    请输入您
+                    <br>
+                    帅气的名字!
                 </div>
                 </div>
                 <div class="btn close">
                 <div class="btn close">
                     现在就完善
                     现在就完善

@@ -18,10 +18,21 @@
         </div>
         </div>
 
 
         <div class="footer">
         <div class="footer">
+            {{#if needShare}}
             <div class="share">
             <div class="share">
                 分享2016年潮流运势
                 分享2016年潮流运势
             </div>
             </div>
+            {{/if}}
+        </div>
+
+        <div class="mask hide">
+            <div class="share-icon">
+            </div>
         </div>
         </div>
     </div>
     </div>
+<input type="hidden" id="shareTitle" value="{{shareTitle}}">
+<input type="hidden" id="shareDesc" value="{{shareDesc}}">
+<input type="hidden" id="shareImg" value="{{shareImg}}">
+<input type="hidden" id="shareLink" value="{{shareUrl}}">
 {{> cuxiao/yuanxiao/type}}
 {{> cuxiao/yuanxiao/type}}
 {{> cuxiao/yuanxiao/footer}}
 {{> cuxiao/yuanxiao/footer}}

@@ -2,4 +2,5 @@
 {{#staticJS}}
 {{#staticJS}}
 <script type="text/javascript" src="{{../staticFile}}/js/{{.}}"></script>
 <script type="text/javascript" src="{{../staticFile}}/js/{{.}}"></script>
 {{/staticJS}}
 {{/staticJS}}
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 </body>
 </body>

@@ -9,8 +9,8 @@ use Plugin\Helpers;
  */
  */
 class YuanxiaoController extends HuodongAction
 class YuanxiaoController extends HuodongAction
 {
 {
-    // const STATIC_FILE = 'http://localhost:2222/assets/1.0.2';
-    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.2';
+    // const STATIC_FILE = 'http://localhost:2222/assets/1.0.5';
+    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.5';
     const ENCRYPT_KEY = 'iamgtskkwhoareyou';
     const ENCRYPT_KEY = 'iamgtskkwhoareyou';
 
 
     /**
     /**