From 54e8df06cdeab0abf704a74c8585a7cfca0e7cca Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 25 Oct 2014 11:57:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1.=E4=BF=AE=E6=94=B9Micros=E7=89=88?=
 =?UTF-8?q?=E5=AD=A6=E6=A0=A1=E5=88=97=E8=A1=A8=E4=B8=8D=E5=8F=AF=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=202.=E4=BF=AE=E6=94=B9=E6=AD=A3?=
 =?UTF-8?q?=E5=BC=8F=E7=89=88=E3=80=81=E6=B5=8B=E8=AF=95=E5=AD=A6=E6=A0=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=AE=BF=E9=97=AE=E7=89=88=E8=B7=A8=E5=9F=9F?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb   |  7 ++++++-
 app/views/school/index.html.erb | 21 ++++++++++++++++++---
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 259fa8cc4..641102bdd 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -14,9 +14,14 @@
 
 <script type="text/javascript">
     function get_options(value) {
+        prefix = '';
+        if(location.href.contains('ros'))
+        {
+            prefix = '/ros'
+        }
         $.ajax({
             type: "POST",
-            url: 'http://<%= Setting.host_user%>/school/get_options/' + encodeURIComponent(value),
+            url: prefix + '/school/get_options/' + encodeURIComponent(value),
             data: 'text',
             success: function (data) {
                 $("#province").val(value);
diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb
index ded1fb161..5580ffc31 100644
--- a/app/views/school/index.html.erb
+++ b/app/views/school/index.html.erb
@@ -2,10 +2,15 @@
 
 <script type="text/javascript">
     $(document).ready(function() {
+        prefix = '';
+        if(location.href.contains('ros'))
+        {
+            prefix = '/ros'
+        }
         $("#province").html("<option value='0' selected = true style='display: none;'></option>");
         $.ajax({
             type :"POST",
-            url :'http://<%= Setting.host_course %>/school/get_province',
+            url :prefix + '/school/get_province',
             data: "send",
             success: function(data, textStatus){
                 $("#province").append(data.text);
@@ -17,9 +22,14 @@
 
 <script type="text/javascript">
     function get_school(value){
+        prefix = '';
+        if(location.href.contains('ros'))
+        {
+            prefix = '/ros'
+        }
         $.ajax({
             type :"POST",
-            url :'http://<%= Setting.host_course %>/school/get_schoollist/'+encodeURIComponent(value),
+            url :prefix + '/school/get_schoollist/'+encodeURIComponent(value),
             data :'text',
             success: function(data){
                 $("#schoollist").html(data);
@@ -44,9 +54,14 @@
             alert("<%= l(:label_search_conditions_not_null) %>");
             return;
         }
+        prefix = '';
+        if(location.href.contains('ros'))
+        {
+            prefix = '/ros'
+        }
         $.ajax({
             type :"POST",
-            url :'http://<%= Setting.host_course %>/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+province,
+            url :prefix + '/school/search_school/?key_word='+encodeURIComponent(value)+'&province='+province,
             data :'text',
             success: function(data){
                 $("#schoollist").html(data);

From 9707049703bcf664e051eda146edf5fc9a8d297a Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Sat, 25 Oct 2014 15:36:26 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9js=E5=88=A4=E6=96=AD?=
 =?UTF-8?q?=E6=8C=87=E5=AE=9A=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=90=AB=E6=9C=89=E6=8C=87=E5=AE=9A=E5=AD=90=E4=B8=B2=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/my/account.html.erb   |  6 +++---
 app/views/school/index.html.erb | 12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index 641102bdd..57eaa93d1 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -14,10 +14,10 @@
 
 <script type="text/javascript">
     function get_options(value) {
-        prefix = '';
-        if(location.href.contains('ros'))
+        var prefix = "";
+        if(location.href.indexOf('ros')>=0)
         {
-            prefix = '/ros'
+            prefix = "/ros"
         }
         $.ajax({
             type: "POST",
diff --git a/app/views/school/index.html.erb b/app/views/school/index.html.erb
index 5580ffc31..aeb7d0943 100644
--- a/app/views/school/index.html.erb
+++ b/app/views/school/index.html.erb
@@ -2,8 +2,8 @@
 
 <script type="text/javascript">
     $(document).ready(function() {
-        prefix = '';
-        if(location.href.contains('ros'))
+        var prefix = '';
+        if(location.href.indexOf('ros') >= 0)
         {
             prefix = '/ros'
         }
@@ -22,8 +22,8 @@
 
 <script type="text/javascript">
     function get_school(value){
-        prefix = '';
-        if(location.href.contains('ros'))
+        var prefix = '';
+        if(location.href.indexOf('ros') >= 0)
         {
             prefix = '/ros'
         }
@@ -54,8 +54,8 @@
             alert("<%= l(:label_search_conditions_not_null) %>");
             return;
         }
-        prefix = '';
-        if(location.href.contains('ros'))
+        var prefix = '';
+        if(location.href.indexOf('ros') >= 0)
         {
             prefix = '/ros'
         }