Merge branch 'liuxin' into develop

src/pages/regiester2.vue

@@ -195,8 +195,10 @@ export default {
           .toString()
           .toUpperCase()
         let params = {
+          master: {
             phone: vm.phone_number,
             password: md5passwprd,
+          },
         }
         hlsHttp.post(url, params).then(function (res) {
           if (res.result === 'S') {
@@ -204,6 +206,8 @@ export default {
             setTimeout(function () {
               vm.$router.push('login')
             }, 100)
+          } else {
+            hlsPopup.showLongCenter(res.message)
           }
         })
       }