Merge branch 'master' of http://114.215.101.231:8099/dingling/A6079080424317 into lihongjuan

+/.git
+/.idea

 // var baseurl = 'http://kindapp.w.bronet.cn/api/';//测试地址
 // var baseurl = 'http://kindapp.w.bronet.cn/api/';//测试地址
 var baseurl='http://wx.cijievip.com/api/' //正式地址
 var baseurl='http://wx.cijievip.com/api/' //正式地址
-var imgurl = 'http://kindapp.w.bronet.cn/';
+var imgurl = 'http://wx.cijievip.com/';
 var debug=true;
 var debug=true;
 // var baseurl = 'http://192.168.1.3/api/';//本地测试
 // var baseurl = 'http://192.168.1.3/api/';//本地测试
 var mobileReg = /^1(3[0-9]|4[57]|5[0-35-9]|7[0135678]|8[0-9])\d{8}$/; //手机正则
 var mobileReg = /^1(3[0-9]|4[57]|5[0-35-9]|7[0135678]|8[0-9])\d{8}$/; //手机正则
@@ -359,7 +359,7 @@ function getRequest(type, url, params, header) {
         }).then(function (res) {
         }).then(function (res) {
             // alert(JSON.stringify(res))
             // alert(JSON.stringify(res))
             if (res.data.code == 502) {
             if (res.data.code == 502) {
-                // openView('login_index', 'login/login_index', '登录', 'login_index', false, false, false)
+                openView('login_index', 'login/login_index', '登录', 'login_index', false, false, false)
             } else {
             } else {
                 resolve(res)
                 resolve(res)
             }
             }
@@ -425,3 +425,16 @@ function getUrlParam(name) {
     if (r != null) return unescape(r[2]);
     if (r != null) return unescape(r[2]);
     return null; //返回参数值
     return null; //返回参数值
 }
 }
+
+/**
+ * 跳转url转义
+ * @param str
+ * @returns {void|string|XML}
+ */
+function escape2Html(str) {
+    var arrEntities = {'lt': '<', 'gt': '>', 'nbsp': ' ', 'amp': '&', 'quot': '"'};
+    return str.replace(/&(lt|gt|nbsp|amp|quot);/ig, function (all, t) {
+        return arrEntities[t];
+    });
+}
+

@@ -102,7 +102,7 @@
                     pageParam: {
                     pageParam: {
                         id: id,
                         id: id,
                         cid: app.id,
                         cid: app.id,
-                        url: url,
+                        url:escape2Html(url),
                         name: care_name
                         name: care_name
                     }
                     }
                 })
                 })

@@ -75,6 +75,7 @@
             url: '',
             url: '',
         },
         },
         created: function () {
         created: function () {
+
             apiready = function () {
             apiready = function () {
                 app.name = api.pageParam.name;
                 app.name = api.pageParam.name;
                 app.url = api.pageParam.url;
                 app.url = api.pageParam.url;