Merge branch 'feature/wap/yuanxiao' into develop/wap

@@ -34,5 +34,7 @@
 <input type="hidden" id="shareDesc" value="{{shareDesc}}">
 <input type="hidden" id="shareDesc" value="{{shareDesc}}">
 <input type="hidden" id="shareImg" value="{{shareImg}}">
 <input type="hidden" id="shareImg" value="{{shareImg}}">
 <input type="hidden" id="shareLink" value="{{shareUrl}}">
 <input type="hidden" id="shareLink" value="{{shareUrl}}">
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
+
 {{> cuxiao/yuanxiao/type}}
 {{> cuxiao/yuanxiao/type}}
 {{> cuxiao/yuanxiao/footer}}
 {{> cuxiao/yuanxiao/footer}}

@@ -7,7 +7,7 @@
             正在分析你的<br>潮流运势<br>… …
             正在分析你的<br>潮流运势<br>… …
         </div>
         </div>
 
 
-        <div class="loading animated infinite rotateIn">
+        <div class="loading">
         </div>
         </div>
         <div class="hat">
         <div class="hat">
         </div>
         </div>
@@ -17,7 +17,7 @@
     </div>
     </div>
     <script type="text/javascript">
     <script type="text/javascript">
         setTimeout(function (){
         setTimeout(function (){
-            location.href = "/cuxiao/yuanxiao/result";
+            location.href = "/cuxiao/yuanxiao/result?share_id=1";
         }, 2000);
         }, 2000);
     </script>
     </script>
 {{> cuxiao/yuanxiao/footer}}
 {{> cuxiao/yuanxiao/footer}}

@@ -2,5 +2,4 @@
 {{#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.6';
-    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.6';
+    // const STATIC_FILE = 'http://localhost:2222/assets/1.0.8';
+    const STATIC_FILE = 'http://cdn.yoho.cn/huodong/2016yuanxiao/1.0.8';
     const ENCRYPT_KEY = 'iamgtskkwhoareyou';
     const ENCRYPT_KEY = 'iamgtskkwhoareyou';
 
 
     /**
     /**