Merge branches 'master' and 'qcloud' of ssh://10.10.100.21/source/smartschool-platform into dev

frontend/pc-web/app.json

@@ -298,7 +298,7 @@
             "type": "yui"
         },
         "server": {
-            "basePath": "https://school-api.ubtob.com",
+            "basePath": "https://school-api.ydyhz.com",
             "urlPattern": "^\/api\/"
         }
     },
@@ -336,7 +336,7 @@
             "delay": 250
         },
         "server": {
-            "basePath": "https://school-api.ubtob.com",
+            "basePath": "https://school-api.ydyhz.com",
             "urlPattern": "^\/api\/"
         }
     },

frontend/wechat-web/src/configs/api.config.js

@@ -7,10 +7,8 @@ import store from './../redux/store/store'
  * Created by RaoMeng on 2018/11/21
  * Desc: 项目接口
  */
-export const _host = 'https://school-api.ubtob.com'
-// export const _host = 'http://10.1.80.47:9520' //顾群
-// export const _host = 'http://10.1.80.180:9520' //赵耀
-// export const _host = 'http://10.1.80.36:9520'  //陈伟
+export const _host = 'https://school-api.ydyhz.com'
+// export const _host = 'http://10.1.80.36:9520'
 
 export const _baseURL = _host + '/api/school'
 // export const _baseURL = _host

frontend/wechat-web/src/modules/accountBind/BindMenu.jsx

@@ -49,7 +49,7 @@ class BindMenu extends Component {
                 })
                 window.location.href =
                     'https://open.weixin.qq.com/connect/oauth2/authorize?appid=' +
-                    this.paramId + '&redirect_uri=https%3a%2f%2fschool-api.ubtob.com%2fapi%2fschool%2fwxSchool%2fuser%2fuserLogin&response_type=code&scope=snsapi_userinfo&state=' +
+                    this.paramId + '&redirect_uri=https%3a%2f%2fschool-api.ydyhz.com%2fapi%2fschool%2fwxSchool%2fuser%2fuserLogin&response_type=code&scope=snsapi_userinfo&state=' +
                     this.paramId + '&connect_redirect=1#wechat_redirect'
             }