Merge remote-tracking branch 'origin/dev' into dev

common/config.js

@@ -1,7 +1,7 @@
-// const REAUEST_ROOTPATH = "https://hdyjy.jiangongtong.cn/";
+const REAUEST_ROOTPATH = "https://www.lbgjtoa.com/";
- // const REAUEST_ROOTPATH = "http://127.0.0.1:8083/";
+ const ROOTPATH = "https://www.lbgjtoa.com/";
-  const REAUEST_ROOTPATH = "http://192.168.130.109:8083/";
+  // const REAUEST_ROOTPATH = "http://192.168.130.109:8083/";
-  const ROOTPATH = "http://192.168.130.109:8083/";
+  // const ROOTPATH = "http://192.168.130.109:8083/";
 //手绘图项目名称
 const HANDDRAWNNAME = "";
 module.exports = {
@@ -132,6 +132,7 @@ module.exports = {
 	loginApp:REAUEST_ROOTPATH + "/mobile/weixin/loginApp"  ,// app登录
 	registerUserApp:REAUEST_ROOTPATH + "/mobile/weixin/registerUserApp"  ,//app注册
 	getScenicListByGuids:REAUEST_ROOTPATH + "/mobile/scenic/getScenicListByGuids"  ,//获取热门景点列表
+	getScenicListByGuidss:REAUEST_ROOTPATH + "/mobile/messageInfo/getRecommendedAttractions.do"  ,//获取热门景点列表
 	deleteUserApp:REAUEST_ROOTPATH + "/mobile/weixin/deleteUserApp"  ,//注销账号
 
 
@@ -143,4 +144,9 @@ appletsAppointmentDocumentsDetails:REAUEST_ROOTPATH + "/appletsAppointment/apple
 appletsCancelAppointment:REAUEST_ROOTPATH + "/appletsAppointment/appletsCancelAppointment" ,//预约取消
 
 
+
+
+getUserInformation:REAUEST_ROOTPATH + "/mobile/wx/getUserInformation" ,//用户登录信息
+
+
 }