Merge branch 'develop/wap' into beta/wap

@@ -34,7 +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>
+<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.1.0.js"></script>
 
 
 {{> cuxiao/yuanxiao/type}}
 {{> cuxiao/yuanxiao/type}}
 {{> cuxiao/yuanxiao/footer}}
 {{> cuxiao/yuanxiao/footer}}

@@ -17,7 +17,9 @@
     </div>
     </div>
     <script type="text/javascript">
     <script type="text/javascript">
         setTimeout(function (){
         setTimeout(function (){
-            location.href = '{{activityUrl}}?openby:yohobuy={"action":"go.h5","params":{"title":"元宵抽签","url":"{{activityUrl}}","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"1"},"param":{"share_id":"1"}}}';
+            location.href = '{{activityUrl}}';
+
+            // location.href = '{{activityUrl}}?openby:yohobuy={"action":"go.h5","params":{"title":"元宵抽签","url":"{{activityUrl}}","share":"\/operations\/api\/v5\/webshare\/getShare","shareparam":{"share_id":"1"},"param":{"share_id":"1"}}}';
         }, 2000);
         }, 2000);
     </script>
     </script>
 {{> cuxiao/yuanxiao/footer}}
 {{> cuxiao/yuanxiao/footer}}

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