Merge branch 'dev2.10.5.2' of ssh://192.168.3.207:10022/qmx/jy into dev2.10.5.2

src/jfw/modules/app/src/web/staticres/jyapp/js/common.js

@@ -303,6 +303,14 @@ var JyObjMessage = new Object();
 $(function(){
 	if (mySysIsIos()){
 		window.JyObj = {
+			//
+			openActivityPage:function(url,rectype,openid){
+				JyObjMessage["url"]=url;
+				JyObjMessage["rectype"]=rectype;
+				JyObjMessage["openid"]=openid;
+		       	window.webkit.messageHandlers.hiddenBottom.postMessage(JyObjMessage);
+				JyObj.clearMessage();
+			},
 			//清除 JyObjMessage
 			clearMessage:function(){
 				JyObjMessage = new Object();

src/web/templates/course/weixin/applyInvoice.html

@@ -178,7 +178,7 @@
     </div>
 	<script src="{{Msg "seo" "cdn"}}/wx_course/js/jquery.min.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_course/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/local/mapJSON.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/wx_course/js/mapJSON.js"></script>
     <script src="{{Msg "seo" "cdn"}}/wx_course/js/drawabill.js?v={{Msg "seo" "version"}}"></script>
 	<script type="text/javascript">
 		$(function(){

src/web/templates/pc/dataExport_sieve.html

@@ -762,7 +762,7 @@
 <script type="text/javascript">
 (function(undefined) {}).call('object' === typeof window && window || 'object' === typeof self && self || 'object' === typeof global && global || {});
 </script>
-<script src="{{Msg "seo" "cdn"}}/jyapp/local/mapJSON.js"></script>
+<script src="{{Msg "seo" "cdn"}}/dataExport/js/mapJSON.js"></script>
 <script src="{{Msg "seo" "cdn"}}/dataExport/js/conditions_order.js?v={{Msg "seo" "version"}}5"></script>
 </body>
 <script type="text/javascript">

src/web/templates/weixin/dataExport/dataExport_area.html

@@ -422,7 +422,7 @@
 	</div>
 
 	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-		<script src="{{Msg "seo" "cdn"}}/jyapp/local/mapJSON.js"></script>
+		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/mapJSON.js"></script>
 		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 		<script>
 			initShare({{.T.signature}},{{.T.openid}},2,"jy_wxmyorder",{{.T.nickname}},{{.T.avatar}});

src/web/templates/weixin/vipsubscribe/change_area.html

@@ -398,7 +398,7 @@
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-<script src="/jyapp/local/mapJSON.js"></script>
+<script src="/vipsubscribe/js/mapJSON.js"></script>
 <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/UpgradePrice.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/change_area.js?v={{Msg "seo" "version"}}"></script>

src/web/templates/weixin/vipsubscribe/choose_area.html

@@ -382,7 +382,7 @@
     </div>
 </div>
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-<script src="/jyapp/local/mapJSON.js"></script>
+<script src="/vipsubscribe/js/mapJSON.js"></script>
 <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script>
     var AreaChoose = {

src/web/templates/weixin/vipsubscribe/choose_area_upgrade.html

@@ -394,7 +394,7 @@
         </div>
     </div>
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
-    <script src="{{Msg "seo" "cdn"}}/jyapp/local/mapJSON.js"></script>
+    <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/mapJSON.js"></script>
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
     <script src="{{Msg "seo" "cdn"}}/vipsubscribe/js/updateArea.js?v={{Msg "seo" "version"}}18"></script>
 	{{include "/common/baiducc.html"}}

src/web/templates/weixin/vipsubscribe/edit_city_new.html

@@ -387,7 +387,7 @@
 <script src="/vipsubscribe/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}"></script>
-<script src="/jyapp/local/mapJSON.js"></script>
+<script src="/vipsubscribe/js/mapJSON.js"></script>
 <script src="/vipsubscribe/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="/vipsubscribe/js/editArea.js?v={{Msg "seo" "version"}}"></script>
 {{include "/common/weixinNotShare.html"}}