登录注册

package-lock.json

@@ -2070,6 +2070,11 @@
       "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
       "dev": true
     },
+    "balajs": {
+      "version": "0.1.9",
+      "resolved": "https://registry.npm.taobao.org/balajs/download/balajs-0.1.9.tgz",
+      "integrity": "sha1-4D0eb7iNU8waJZGnv+xw0eUtjwA="
+    },
     "balanced-match": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
@@ -4381,6 +4386,11 @@
       "integrity": "sha512-tyGr+wh2c/JYBVMeflKpZ3ricwtBPyVBMtRNxYGObl7TP5bAeupgz4VZnBzQSFleZViXYTws1yZtKKFQYZyiYw==",
       "dev": true
     },
+    "element-closest": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npm.taobao.org/element-closest/download/element-closest-2.0.2.tgz",
+      "integrity": "sha1-cqdAoQdFM4LijfnOXbtajfD5Zuw="
+    },
     "element-ui": {
       "version": "2.13.0",
       "resolved": "https://registry.npmjs.org/element-ui/-/element-ui-2.13.0.tgz",
@@ -16468,6 +16478,21 @@
       "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==",
       "dev": true
     },
+    "weui": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npm.taobao.org/weui/download/weui-2.3.0.tgz",
+      "integrity": "sha1-tqAoDFShBy6sywXracLav6AAz2Q="
+    },
+    "weui.js": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npm.taobao.org/weui.js/download/weui.js-1.2.1.tgz",
+      "integrity": "sha1-8EA6Z2V9zodqJvba0fJ/F4s2onI=",
+      "requires": {
+        "balajs": "^0.1.9",
+        "element-closest": "^2.0.1",
+        "object-assign": "^4.1.0"
+      }
+    },
     "whatwg-encoding": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.4.tgz",

package.json

@@ -33,7 +33,9 @@
     "vue-pickers": "^1.1.5",
     "vue-router": "^3.0.1",
     "vuex": "^3.0.1",
-    "vux": "^2.9.4"
+    "vux": "^2.9.4",
+    "weui": "^2.3.0",
+    "weui.js": "^1.2.1"
   },
   "devDependencies": {
     "autoprefixer": "^7.1.2",

src/App.vue

@@ -31,7 +31,9 @@ export default {
       document.body.scrollTop = 0;
       document.documentElement.scrollTop = 0;
     }
-  }
+  },created(){
+    console.log("111111")
+  },
 };
 </script>
 

src/api/login.js

@@ -11,3 +11,79 @@ export function loginByPwd(mobile, password) {
     params: params
   })
 }
+
+export function isLogin() {
+  return request({
+    url: '/m/api/islogin',
+    method: 'get',
+  })
+}
+
+
+
+export function getCodeInit() {
+  return request({
+    url: '/m/api/code',
+    method: 'get',
+  })
+}
+
+
+export function getVerifyCode(params) {
+  return request({
+    url: '/m/api/getcode',
+    method: 'get',
+    params:params,
+  })
+}
+
+
+export function loginByCode(params) {
+  return request({
+    url: '/m/api/login/cs',
+    method: 'post',
+    params:params,
+  })
+}
+
+
+
+export function forgetPassWord(params) {
+  return request({
+    url: '/m/api/password/commit',
+    method: 'post',
+    params:params,
+  })
+}
+
+
+export function register(params) {
+  return request({
+    url: '/m/api/register/commit',
+    method: 'post',
+    params:params,
+  })
+}
+
+export function setName(params) {
+  return request({
+    url: '/m/api/register/setname',
+    method: 'post',
+    params:params,
+  })
+}
+
+
+
+
+export function login() {
+  return request({
+    url: '/m/api/register/login',
+    method: 'post',
+  })
+}
+
+
+
+
+

src/api/patient/patient.js

@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function getBloodDialysisPatient(params) {
   return request({
-    url: '/api/patient/getbloodDialysisPatient',
+    url: '/m/api/patient/getbloodDialysisPatient',
     method: 'get',
     params: params
   })

src/pages/home/forgetPassword/index.vue

@@ -0,0 +1,463 @@
+<template>
+  <div class="page_noPassword">
+    <div class="nopasswordTitle">
+      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <span class="titleName">忘记密码</span>
+    </div>
+    <div class="forgetmyInput">
+      <el-form ref="forgetForm" :model="forgetForm" :rules="rules">
+        <el-form-item required prop="phone">
+          <div class="phoneLine">
+            <i class="el-icon-mobile mobile"></i>
+            <el-input
+              class="phoneInput"
+              placeholder="请输入手机号码"
+              v-model="forgetForm.phone"
+              v-on:input="watchNum"
+              maxlength="11"
+              @input="change(forgetForm.phone)"
+            ></el-input>
+          </div>
+        </el-form-item>
+        <el-form-item required prop="code">
+          <div class="code">
+            <i class="iconfont icon-dunpai dunpai"></i>
+            <el-input
+              v-model="forgetForm.code"
+              placeholder="请输入验证码"
+              v-on:input="watchNum"
+            ></el-input>
+            <div class="getCode" @click="getVerifyCode()">{{code_btn_title}}</div>
+
+          </div>
+        </el-form-item>
+        <el-form-item>
+          <div class="phoneLine">
+            <i class="el-icon-lock lock"></i>
+            <el-input
+              class="phoneInput"
+              v-model="psd"
+              placeholder="请输入密码"
+              show-password
+              clearable
+            ></el-input>
+          </div>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="logintwo" @click="modifyAndLogin()">登录</div>
+    <div class="problem">
+      遇到问题？点击
+      <span @click="contact = true">联系客服</span>
+    </div>
+
+    <!-- 弹窗 联系客服 -->
+    <el-dialog
+      title="客服电话"
+      :visible.sync="contact"
+      width="19.1875rem"
+      top="12.5rem"
+      center
+      class="myDialog"
+    >
+      <span class="telephone">0755-86526342</span>
+      <span slot="footer" class="dialog-footer">
+        <span @click="contact = false">取消</span>
+        <span>|</span>
+        <span type="primary" @click="callPhone()">拨打</span>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// import { getCode, NextStep } from "@/api/login/login";
+import {
+  getCodeInit,getVerifyCode,forgetPassWord
+} from '@/api/login'
+import { checkMobile } from "@/utils/tools";
+import { hex_md5 } from "@/utils/md5";
+
+export default {
+  data() {
+    var checkMobileRule = (rule, value, callback) => {
+      if (!checkMobile(value)) {
+        callback(new Error("请填写正确的手机号"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      phone: "",
+      code: "",
+      psd: "",
+      contact: false,
+      count_downing: false,
+      count_down: 0,
+      aespass:"",
+      forgetForm: {
+        phone: "",
+        code: ""
+      },
+      rules: {
+        phone: [
+          { required: true, message: "手机号码不能为空" },
+          { validator: checkMobileRule }
+        ],
+        code: [{ required: true, message: "验证码不能为空" }]
+      },
+      loginshow: false,
+      loginshowtwo: true,
+      codeshow: false,
+      codeshowtwo: true
+    };
+  },
+  created(){
+    this.GetCodeInit()
+  },
+  methods: {
+    modifyAndLogin(){
+      if (this.forgetForm.phone.trim().length == 0) {
+        this.$toast({
+          message:"手机号码不能为空!"
+        });
+        return
+      }
+      if (!checkMobile(this.forgetForm.phone)) {
+        this.$toast({
+          message:"请填写正确的手机号码!"
+        });
+        return
+      }
+      if (this.forgetForm.code.trim().length == 0) {
+        this.$toast({
+          message:"验证码不能为空!"
+        });
+        return
+      }
+
+      let params = {
+        mobile: this.forgetForm.phone,
+        code: this.forgetForm.code,
+        password: hex_md5(this.psd),
+      }
+      forgetPassWord(params).then(response => {
+        if (response.data.state === 1) {
+          var user = response.data.data.user;
+          var admin = response.data.data.admin;
+          var org = response.data.data.org;
+          var subscibe = response.data.data.subscibe;
+          var config_list = response.data.data.config_list;
+          var template_info = response.data.data.template_info;
+          var filed_list = response.data.data.filed_list;
+
+          this.$store.dispatch("InitUserInfo", {
+            admin:admin,
+            user: user,
+            org: org,
+            subscibe: subscibe,
+            template_info: template_info,
+            filed_list: filed_list
+          });
+          this.$store.dispatch("SetConfigList", config_list);
+          this.$router.replace("/myIndex")
+
+          }
+      })
+    },
+    GetCodeInit(){
+      getCodeInit().then(response => {
+        if (response.data.state === 1) {
+          this.aespass = response.data.data.aespass
+
+        }
+      })
+    },
+    getVerifyCode() {
+      if (this.forgetForm.phone.length == 0) {
+        this.$toast({
+          message:"手机号码不能为空!"
+        });
+        return
+      }
+      if (!checkMobile(this.forgetForm.phone)) {
+        this.$toast({
+          message:"请填写正确的手机号码!"
+        });
+        return
+      }
+
+      if (!this.count_downing) {
+        let parms = {
+          phone: this.forgetForm.phone,
+          aespass: this.aespass,
+        }
+        getVerifyCode(parms).then(response => {
+          if (response.data.state === 1) {
+            this.count_downing = true;
+            this.count_down = 61;
+            this.countDown();
+          }
+        })
+      }
+    },
+
+    callPhone() {
+      window.location.href = "tel://075586526342";
+    },
+    countDown: function() {
+      this.count_down = this.count_down - 1;
+      if (this.count_down === 0) {
+        this.count_downing = false;
+        return;
+      }
+      var t = this;
+      setTimeout(() => {
+        this.countDown();
+      }, 1000);
+    },
+    watchNum() {
+      if (this.forgetForm.phone.length === 11) {
+        this.codeshow = true;
+        this.codeshowtwo = false;
+      } else {
+        this.codeshow = false;
+        this.codeshowtwo = true;
+      }
+
+      if (this.forgetForm.phone === "" || this.forgetForm.code === "") {
+        this.loginshow = false;
+        this.loginshowtwo = true;
+      } else {
+        this.loginshow = true;
+        this.loginshowtwo = false;
+      }
+    },
+    change(value) {
+      this.forgetForm.phone = value.replace(/[^0-9]+/g, "");
+    }
+  },
+  computed: {
+    code_btn_title: function() {
+      if (this.count_down == 0) {
+        return "获取验证码";
+      } else {
+        return "重新发送(" + this.count_down + ")";
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page_noPassword {
+  overflow: hidden;
+  height: 100%;
+  .nopasswordTitle {
+    height: 3.125rem;
+    line-height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    margin-left: 1.25rem;
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 6.625rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .forgetmyInput {
+    margin-top: 4rem;
+    .phoneLine {
+      width: 84%;
+      margin: 0 auto;
+      display: flex;
+      border-bottom: 1px solid #e6e6e6;
+      .mobile {
+        float: left;
+        color: #acacac;
+        font-size: 1.5rem;
+        margin-left: 0.375rem;
+        line-height: 3.375rem;
+        width: 1.5rem;
+      }
+      .phoneInput {
+        width: 95%;
+      }
+    }
+
+    .lock {
+      float: left;
+      color: #acacac;
+      font-size: 1.5rem;
+      margin-left: 0.375rem;
+      line-height: 3.375rem;
+      width: 1.5rem;
+    }
+    .code {
+      line-height: 3.375rem;
+      width: 84%;
+      height: 3.375rem;
+      margin: 0 auto;
+      border-bottom: 1px solid #e6e6e6;
+      display: flex;
+      align-items: center;
+
+      .dunpai {
+        float: left;
+        color: #acacac;
+        font-size: 1.5rem;
+        margin-left: 0.375rem;
+      }
+      .el-input {
+        float: left;
+        width: 10.6rem;
+        border: none;
+        padding: 0;
+      }
+      .el-input__inner {
+        padding: 0;
+        padding-left: 0.75rem;
+      }
+      .getCode {
+        // float: left;
+        width: 5.75rem;
+        height: 2rem;
+        line-height: 2rem;
+        text-align: center;
+        color: #fff;
+        background: #338afb;
+        border-radius: 1.4375rem;
+        font-size: 0.8125rem;
+      }
+      .getCodetwo {
+        width: 5.75rem;
+        height: 2rem;
+        // line-height: 2rem;
+        text-align: center;
+        color: #fff;
+        background: #e5e5e5;
+        border-radius: 1.4375rem;
+        font-size: 0.8125rem;
+      }
+
+      .el-button--primary {
+        border-color: transparent;
+      }
+    }
+  }
+  .login {
+    width: 19.25rem;
+    height: 2.875rem;
+    background: linear-gradient(
+      -90deg,
+      rgba(129, 159, 246, 1),
+      rgba(81, 119, 238, 1),
+      rgba(75, 102, 234, 1)
+    );
+    border-radius: 1.4375rem;
+    margin: 0 auto;
+    line-height: 2.875rem;
+    text-align: center;
+    color: #fff;
+    margin-top: 2.875rem;
+  }
+  .problem {
+    width: 84%;
+    font-size: 0.8125rem;
+    margin: 15rem auto 0;
+    text-align: center;
+    span {
+      color: #338afb;
+    }
+  }
+}
+
+.el-form-item__error {
+  margin-left: 2.5rem;
+}
+
+.logintwo {
+  width: 19.25rem;
+  height: 2.875rem;
+  background: #e5e5e5;
+  border-radius: 1.4375rem;
+  margin: 0 auto;
+  line-height: 2.875rem;
+  text-align: center;
+  color: #fff;
+  margin-top: 2.875rem;
+}
+.el-button--medium {
+  padding: 0;
+}
+</style>
+<style lang="scss">
+.forgetmyInput {
+  .el-form-item {
+    margin-bottom: 0;
+  }
+  .el-input {
+    display: flex;
+    align-items: center;
+    margin: 0 auto;
+    color: rgba(155, 155, 155, 1);
+    padding-left: 0.75rem;
+    box-sizing: border-box;
+    height: 3.375rem;
+    line-height: 3.375rem;
+  }
+  .el-input__inner {
+    border: none;
+    font-size: 1rem;
+    padding-left: 0;
+  }
+  .el-input__prefix {
+    font-size: 1.5rem;
+    color: #acacac;
+  }
+
+  .phoneLine {
+    .el-input__clear {
+      margin-right: 0.625rem;
+    }
+    .el-input__icon {
+      line-height: 3.375rem;
+      font-size: 1.5rem;
+    }
+  }
+}
+.myDialog {
+  line-height: 50%;
+  height: 100%;
+  .el-dialog {
+    border-radius: 10px;
+  }
+  .el-dialog__title {
+    color: #000000;
+  }
+  .telephone {
+    width: 12.5rem;
+    height: 1.125rem;
+    font-size: 1.5rem;
+    font-weight: 500;
+    color: #338afb;
+    margin-left: 2.5rem;
+  }
+  .dialog-footer {
+    > span:nth-of-type(1) {
+      color: #9b9b9b;
+    }
+    > span:nth-of-type(2) {
+      padding: 0 3.125rem;
+      color: #e6e6e6;
+    }
+    > span:nth-of-type(3) {
+      color: #000000;
+    }
+  }
+}
+</style>

src/pages/home/login.vue

@@ -1,127 +1,147 @@
 <template>
-  <div class="container">
-    <div class="newLogin">
-      <div class="login">
-        <div>
-          <img src="../../assets/login/newImg.png" alt style="width: 100%;" />
-        </div>
-        <div class="logo">
-          <img src="../../assets/login/newLogo.png" alt />
-        </div>
-        <div class="reg">
-          <div class="form">
-            <ul>
-              <li>
-                <span class="iconfont">&#xe78b;</span>
-                <input
-                  placeholder="请输入手机号"
-                  type="tel"
-                  class="tel"
-                  v-model="form.mobile"
-                />
-              </li>
-              <li>
-                <span class="iconfont">&#xe6c0;</span>
-                <input
-                  placeholder="请输入密码"
-                  type="password"
-                  class="tel"
-                  v-model="form.pwd"
-                />
-              </li>
-            </ul>
-          </div>
-          <!-- <router-link to="/product"> -->
-          <div class="remember">
-            <el-checkbox v-model="checked">记住密码</el-checkbox>
-          </div>
-          <!-- <button
-            class="loginBtn"
-            @click="loginAction"
-            :class="loginDisable ? 'disableLoginBtn' : ''"
-            :disabled="loginDisable"
-          >
-            登录
-          </button>-->
-          <button
-            class="loginBtn"
-            @click="submitForm"
-            :class="loginDisable ? 'disableLoginBtn' : ''"
-            :disabled="loginDisable"
-          >
-            登录
-          </button>
-
-          <!-- <router-link to="/forgetPassword">
-            <div class="newForget">忘记密码</div>
-          </router-link>-->
-          <!-- </router-link> -->
-          <!-- <div class="forget">
-          <a href="">免密码登录</a>
-          <a href="">忘记密码？</a>
-          </div>-->
-        </div>
-        <div class="agree">
-          <el-checkbox v-model="agreement">我已阅读并同意</el-checkbox>
-          <span class="agreeText" @click="agree()">《隐私服务协议》</span>
-          <span class="agreeText" @click="agree1()">《用户协议》</span>
-        </div>
+  <div class="page_login">
+    <div class="loginTop">
+      <img src="../../assets/images/loginLogo.png" alt />
+    </div>
+    <div class="loginBottom">
+      <div class="ipts">
+        <el-form ref="LoginForm" :model="LoginForm" :rules="rules">
+          <el-form-item required prop="tel">
+            <el-input
+              placeholder="请输入手机号码"
+              prefix-icon="el-icon-mobile"
+              v-model="LoginForm.tel"
+              clearable
+              v-on:input="watchNum"
+              maxlength="11"
+              @input="change(LoginForm.tel)"
+            ></el-input>
+          </el-form-item>
+          <el-form-item>
+            <el-input
+              placeholder="请输入密码"
+              prefix-icon="el-icon-lock"
+              v-model="LoginForm.psd"
+              show-password
+              clearable
+              v-on:input="watchNum"
+            ></el-input>
+          </el-form-item>
+        </el-form>
+      </div>
+      <p class="forget" @click="toForgetPassword()">忘记密码?</p>
+      <div class="login" @click="submitForm()" v-show="loginshow">登录</div>
+      <div class="login3" v-show="loginshowtwo">登录</div>
+      <div class="login2">
+        <p @click="noPassword()">免密码登录</p>
+        <p class="register" @click="ToRegister()">快速注册</p>
       </div>
     </div>
+    <div class="agreeBox">
+      <van-checkbox v-model="checked" shape="square"
+      >我已阅读并同意</van-checkbox
+      ><span class="newColor" @click="agree()">《隐私服务协议》</span
+    ><span class="newColor" @click="agree1()">《用户协议》</span>
+    </div>
   </div>
 </template>
 
+
+
+
 <script>
 import { loginByPwd } from "@/api/login";
 import { hex_md5 } from "@/utils/md5";
-import { getLoginInfoCache, cacheLoginInfo } from "@/utils/admin_info_cache";
 import { Toast } from "vant";
+import { checkMobile } from "@/utils/tools";
 
 export default {
   name: "Home",
   data() {
+    var checkMobileRule = (rule, value, callback) => {
+      if (!checkMobile(value)) {
+        callback(new Error("请填写正确的手机号"));
+      } else {
+        callback();
+      }
+    };
     return {
+      checked: true,
+      tel: "",
+      psd: "",
+      LoginForm: {
+        tel: "",
+        psd: ""
+      },
+      loginshow: false,
+      loginshowtwo: true,
+      rules: {
+        tel: [
+          { required: true, message: "手机号码不能为空" },
+          { validator: checkMobileRule }
+        ]
+      },
       form: {
         mobile: "",
         pwd: ""
       },
-      checked: false,
       agreement: true
     };
   },
-  computed: {
-    loginDisable() {
-      // return false
-      return this.form.mobile.length == 0 || this.form.pwd.length == 0;
-    }
-  },
+
   created() {
-    var loginInfo = getLoginInfoCache();
-    this.form.mobile = loginInfo.mobile;
-    this.form.pwd = loginInfo.password;
-  },
-  mounted() {
-    this.getCookie();
   },
+
   methods: {
-    loginAction: function() {
-      loginByPwd(this.form.mobile, hex_md5(this.form.pwd)).then(rs => {
-        var resp = rs.data;
+    ToRegister() {
+      this.$router.push("/register");
+    },
+    toForgetPassword() {
+      this.$router.push("/forget");
+    },
+    noPassword() {
+      this.$router.push("/nopassword");
+    },
+    change(val) {
+      this.LoginForm.tel = val.replace(/[^0-9]+/g, "");
+    },
+    watchNum() {
+      if (this.LoginForm.tel === "" || this.LoginForm.psd === "") {
+        this.loginshow = false;
+        this.loginshowtwo = true;
+      } else {
+        this.loginshow = true;
+        this.loginshowtwo = false;
+      }
+      if (this.LoginForm.psd.length < 6) {
+        this.loginshow = false;
+        this.loginshowtwo = true;
+      }
+      if (this.LoginForm.psd.length > 6) {
+        this.loginshow = true;
+        this.loginshowtwo = false;
+      }
+    },
+
 
-        if (resp.state == 1) {
-          cacheLoginInfo(this.form.mobile, this.form.pwd);
-          console.log(resp);
+    submitForm() {
+      loginByPwd(this.LoginForm.tel, hex_md5(this.LoginForm.psd)).then(rs => {
+        var resp = rs.data;
+        if (this.agreement != true) {
+          Toast("请同意隐私服务协议");
+        }
 
+        if (resp.state == 1 && this.agreement == true) {
           var user = resp.data.user;
+          var admin = resp.data.admin;
           var org = resp.data.org;
           var subscibe = resp.data.subscibe;
           var config_list = resp.data.config_list;
           var template_info = resp.data.template_info;
           var filed_list = resp.data.filed_list;
-          console.log(resp.data.filed_list);
-          console.log(filed_list);
 
           this.$store.dispatch("InitUserInfo", {
+            admin:admin,
             user: user,
             org: org,
             subscibe: subscibe,
@@ -129,315 +149,137 @@ export default {
             filed_list: filed_list
           });
           this.$store.dispatch("SetConfigList", config_list);
-
-          // this.$router.push({path: "/product"})
-          this.$router.push({ path: "/main" });
+          this.$router.replace({ path: "/myIndex" });
         } else {
           this.$toast({
             message: resp.msg
           });
         }
       });
-    },
-    to: function() {
-      this.$router.push({ path: "/privacy" });
-    },
-    submitForm() {
-      this.$router.push({ path: "/myIndex" });
-    },
-    // submitForm() {
-    //   const self = this;
-    //   //判断复选框是否被勾选 勾选则调用配置cookie方法
-    //   if (self.checked == true) {
-    //     console.log("checked == true");
-    //     //传入账号名，密码，和保存天数3个参数
-    //     self.setCookie(self.form.mobile, self.form.pwd, 7);
-    //   } else {
-    //     console.log("清空Cookie");
-    //     //清空Cookie
-    //     self.clearCookie();
-    //   }
-    //
-    //   //与后端请求代码，本功能不需要与后台交互所以省略
-    //
-    //   loginByPwd(this.form.mobile, hex_md5(this.form.pwd)).then(rs => {
-    //     var resp = rs.data;
-    //     if (this.agreement != true) {
-    //       Toast("请同意隐私服务协议");
-    //     }
-    //
-    //     if (resp.state == 1 && this.agreement == true) {
-    //       cacheLoginInfo(this.form.mobile, this.form.pwd);
-    //       console.log(resp);
-    //
-    //       var user = resp.data.user;
-    //       var org = resp.data.org;
-    //       var subscibe = resp.data.subscibe;
-    //       var config_list = resp.data.config_list;
-    //       var template_info = resp.data.template_info;
-    //       var filed_list = resp.data.filed_list;
-    //       console.log(resp.data.filed_list);
-    //       console.log(filed_list);
-    //
-    //       this.$store.dispatch("InitUserInfo", {
-    //         user: user,
-    //         org: org,
-    //         subscibe: subscibe,
-    //         template_info: template_info,
-    //         filed_list: filed_list
-    //       });
-    //       this.$store.dispatch("SetConfigList", config_list);
-    //
-    //       // this.$router.push({path: "/product"})
-    //       this.$router.push({ path: "/main" });
-    //     } else {
-    //       this.$toast({
-    //         message: resp.msg
-    //       });
-    //     }
-    //   });
-    //   console.log("登陆成功");
-    // },
-    // 设置cookie
-    setCookie(c_name, c_pwd, exdays) {
-      var exdate = new Date(); // 获取时间
-      exdate.setTime(exdate.getTime() + 24 * 60 * 60 * 1000 * exdays); // 保存的天数
-      // 字符串拼接cookie
-      window.document.cookie =
-        "userName" + "=" + c_name + ";path=/;expires=" + exdate.toGMTString();
-      window.document.cookie =
-        "userPwd" + "=" + c_pwd + ";path=/;expires=" + exdate.toGMTString();
-    },
-    getCookie: function() {
-      this.$nextTick(() => {
-        if (this.form.pwd != "") {
-          this.checked = true;
-        }
-      });
-      if (document.cookie.length > 0) {
-        var arr = document.cookie.split("; "); // 这里显示的格式需要切割一下自己可输出看下
-        for (var i = 0; i < arr.length; i++) {
-          var arr2 = arr[i].split("="); // 再次切割
-          // 判断查找相对应的值
-          if (arr2[0] == "userName") {
-            this.form.mobile = arr2[1]; // 保存到保存数据的地方
-          } else if (arr2[0] == "userPwd") {
-            this.form.pwd = arr2[1];
-          }
-        }
-      }
-    },
-    // 清除cookie
-    clearCookie: function() {
-      this.setCookie("", "", -1); // 修改2值都为空，天数为负1天就好了
-    },
-    agree() {
+    }, agree() {
       this.$router.push({ path: "/privacy" });
     },
     agree1() {
       this.$router.push({ path: "/userAgreement" });
     }
+
   }
 };
 </script>
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-.container {
-  // background: $white-bg;
-  background: #fff;
-  @include box-sizing;
-  position: fixed;
-  width: 100%;
-  height: 100%;
-  display: flex;
-  justify-content: space-between;
-
-  .newLogin {
-    width: 100%;
+<style lang="scss" scoped>
+  .page_login {
+    overflow: hidden;
     height: 100%;
-    margin: auto;
-    // box-shadow: 0px 2px 25px 0px rgba(37, 143, 252, 0.1);
-    background: #fff;
+  .loginTop {
+    width: 100%;
+  img {
+    width: 7.75rem;
+    height: 2.5rem;
+    border: none;
+    margin: 6.25rem auto 3.75rem;
+    display: block;
+  }
+  }
+  .loginBottom {
+    width: 23.4375rem;
+    padding-top: 1rem;
+    box-sizing: border-box;
+  }
+  .forget {
+    font-size: 0.8125rem;
+    color: #1a8cff;
+    margin: 0.5625rem 0 1.5rem 17.4375rem;
+  }
+  .agreeBox {
+    width: 82%;
+    display: flex;
+    align-items: center;
+    font-size: 0.8125rem;
+    margin: 3.75rem auto 0;
+
+  .newColor {
+    color: #338afb;
+  }
   }
   .login {
-    // @include box-shadow;
-    @include text-align;
-    @include display-flex;
-    @include align-items-center;
-    // @include justify-content-center;
-    @include flex-direction;
-    height: 100%;
-    overflow-y: auto;
-    .logo {
-      // padding: 3rem 0 2.5rem;
-      padding: 0 0 0.5rem;
-      img {
-        width: 44%;
-        height: auto;
-        display: inline-block;
-      }
-    }
-    .reg {
-      width: 9.3rem;
-      .welcome {
-        text-align: left;
-        font-size: 0.55rem;
-        font-weight: 400;
-        color: rgba(37, 143, 252, 1);
-        margin-bottom: 0.5rem;
-        // line-height: 14px;
-      }
-      .newForget {
-        text-align: right;
-        font-size: 0.45rem;
-        font-weight: 400;
-        color: rgba(37, 143, 252, 1);
-        margin-top: 0.3rem;
-      }
-      .form {
-        border: 1px $border-color solid;
-        border-radius: 4px;
-        li {
-          border-bottom: 1px $border-color solid;
-          @include align-items-center;
-          @include text-align;
-          @include display-flex;
-          @include box-sizing;
-          .tel {
-            padding: 0.4rem 0;
-            width: 90%;
-            border: none;
-            outline: none;
-            font-size: 0.6rem;
-          }
-          .mint-cell {
-            width: 100%;
-          }
-          &:last-child {
-            border: none;
-          }
-          .iconfont {
-            color: $main-color;
-            font-size: 0.6rem;
-            margin: 0 0.46rem;
-          }
-        }
-      }
-      .forget {
-        text-align: left;
-        padding: 0.45rem 1rem;
-        a {
-          float: left;
-          font-size: 0.28rem;
-          color: $main-color;
-          &:nth-child(2) {
-            color: #999999;
-            float: right;
-          }
-          &:active {
-            background: $white-bg;
-          }
-        }
-      }
-      .loginBtn {
-        width: 100%;
-        height: 1.4rem;
-        line-height: 1.4rem;
-        background: $main-color;
-        color: #fff;
-        font-size: 0.6rem;
-        @include text-align;
-        border-radius: 4px;
-        margin: 1rem 0 0 0;
-      }
-      .disableLoginBtn {
-        background: lightgray;
-      }
-    }
+    width: 19.25rem;
+    height: 2.875rem;
+    background: #338afb;
+    border-radius: 1.4375rem;
+    margin: 0 auto;
+    line-height: 2.875rem;
+    color: #fff;
+    text-align: center;
   }
-  .remember {
+  .login2 {
+    margin-top: 1.75rem;
+    font-size: 0.8125rem;
+    color: rgba(81, 119, 238, 1);
+  > p:first-child {
     float: left;
+    margin-left: 3rem;
+  }
+  .register {
+    margin-left: 17.4375rem;
+    color: #1a8cff;
+  }
+  }
+  .login3 {
+    width: 19.25rem;
+    height: 2.875rem;
+    background: #e5e5e5;
+    border-radius: 1.4375rem;
+    margin: 0 auto;
+    line-height: 2.875rem;
+    color: #fff;
+    text-align: center;
   }
-  .agreeText {
-    color: #409eff;
-    font-size: 14px;
   }
-}
-</style>
 
-<style lang="scss">
-.remember {
-  .el-checkbox__inner {
-    @media only screen and (min-width: 415px) and (max-width: 767px) {
-      width: 20px;
-      height: 20px;
-    }
-    @media only screen and (min-width: 768px) {
-      width: 20px;
-      height: 20px;
-    }
+  .el-form-item__error {
+    margin-left: 2.5rem;
+  }
+  .el-button--medium {
+    padding: 0;
   }
-  .el-checkbox__inner::after {
-    @media only screen and (min-width: 415px) and (max-width: 767px) {
-      left: 7px;
-      height: 12px;
-      width: 4px;
-    }
 
-    @media only screen and (min-width: 768px) {
-      left: 7px;
-      height: 12px;
-      width: 4px;
-    }
+  .el-message {
+    min-width: 20rem;
   }
-  .el-checkbox__label {
-    @media only screen and (min-width: 415px) and (max-width: 767px) {
-      font-size: 0.45rem;
-    }
-    @media only screen and (min-width: 768px) {
-      font-size: 0.45rem;
-    }
+</style>
+<style lang="scss">
+  .loginBottom {
+  .el-form-item {
+    margin-bottom: 0;
   }
-}
-.agree {
-  .el-checkbox__inner {
-    @media only screen and (min-width: 415px) and (max-width: 767px) {
-      width: 20px;
-      height: 20px;
-    }
-    @media only screen and (min-width: 768px) {
-      width: 20px;
-      height: 20px;
-    }
+  .ipts {
+  .el-icon-circle-close {
+    margin-right: 0.625rem;
   }
-  .el-checkbox__inner::after {
-    @media only screen and (min-width: 415px) and (max-width: 767px) {
-      left: 7px;
-      height: 12px;
-      width: 4px;
-    }
-
-    @media only screen and (min-width: 768px) {
-      left: 7px;
-      height: 12px;
-      width: 4px;
-    }
+  .el-input {
+    display: block;
+    margin: 0 auto;
+    width: 19.0625rem;
+    border-bottom: 1px solid #e6e6e6;
+    color: rgba(155, 155, 155, 1);
+    padding-left: 0.75rem;
+    box-sizing: border-box;
+    height: 3.375rem;
+    line-height: 3.375rem;
+    font-size: 1rem;
+  }
+  .el-input__inner {
+    border: none;
+    font-size: 1rem;
+  }
+  .el-input__prefix {
+    font-size: 1.5rem;
+  }
+  .el-input__icon {
+    font-size: 1.5rem;
+    line-height: 3.375rem;
   }
-  .el-checkbox__label {
-    @media only screen and (min-width: 415px) and (max-width: 767px) {
-      font-size: 0.45rem;
-    }
-    @media only screen and (min-width: 768px) {
-      font-size: 0.45rem;
-    }
   }
-  .agreeText {
-    @media only screen and (min-width: 415px) and (max-width: 767px) {
-      font-size: 0.45rem;
-    }
-    @media only screen and (min-width: 768px) {
-      font-size: 0.45rem;
-    }
   }
-}
 </style>

src/pages/home/noJoinedGroup/index.vue

@@ -0,0 +1,134 @@
+<template>
+  <div class="page_noJoinedGroup">
+    <div class="noJoinedGroupTitle">
+      <i class="iconfont icon-zuojiantou jiantou"></i>
+    </div>
+    <div class="noJoinedGroupTxt">
+      你已经被邀请加入以下医院/组织/团队
+    </div>
+    <div class="nojoinBox">
+      <div class="nojoinImgBox">
+        <img class="nojoinImg" src="../../../assets/images/nojoin.png" alt="" />
+        <p class="nojoinTxt">为了更好的体验酷医云系统</p>
+        <p class="nojoinTxt">请先创建你的医院/组织/团队</p>
+      </div>
+    </div>
+    <div class="know" @click="goCreateOrg()">创建</div>
+    <div class="wantCreate" @click="goHome()">我已了解，进入酷医云 ></div>
+  </div>
+</template>
+<script>
+  import {login} from '@/api/login';
+
+  export default {
+    data() {
+      return {
+      };
+    },
+    methods: {
+      goCreateOrg(){
+        this.$router.push("/createorg")
+      },goHome(){
+        login().then(response => {
+          if (response.data.state === 1) {
+            var user = response.data.data.user;
+            var admin = response.data.data.admin;
+            var org = response.data.data.org;
+            var subscibe = response.data.data.subscibe;
+            var config_list = response.data.data.config_list;
+            var template_info = response.data.data.template_info;
+            var filed_list = response.data.data.filed_list;
+            this.$store.dispatch("InitUserInfo", {
+              admin:admin,
+              user: user,
+              org: org,
+              subscibe: subscibe,
+              template_info: template_info,
+              filed_list: filed_list
+            });
+            this.$store.dispatch("SetConfigList", config_list);
+            this.$router.replace("/myIndex")
+          }else{
+            this.$toast({
+              message:response.data.msg
+            });
+          }
+        })
+      }
+    },
+  };
+</script>
+
+
+<style lang="scss" scoped>
+.page_noJoinedGroup {
+  height: 100%;
+  overflow: hidden;
+  .noJoinedGroupTitle {
+    height: 3.125rem;
+    line-height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    margin-left: 1rem;
+    font-size: 1.5rem;
+    font-weight: 600;
+  }
+  .noJoinedGroupTxt {
+    font-size: 1.0625rem;
+    font-family: PingFangSC;
+    font-weight: bold;
+    color: rgba(0, 0, 0, 1);
+    line-height: 0.9375rem;
+  }
+  .noJoinedGroupTxt {
+    padding: 1.25rem;
+    font-size: 17px;
+    font-family: PingFangSC;
+    font-weight: bold;
+    color: rgba(0, 0, 0, 1);
+    line-height: 15px;
+  }
+  .nojoinBox {
+    width: 21.125rem;
+    height: 22.75rem;
+    background: rgba(255, 255, 255, 1);
+    box-shadow: 0px 1px 15px 0px rgba(91, 91, 91, 0.3);
+    border-radius: 3px;
+    margin: 0 auto;
+    .nojoinImgBox {
+      width: 10.5rem;
+      margin: 0 auto;
+      padding-top: 3rem;
+    }
+    .nojoinImg {
+      width: 10.5rem;
+      height: 10.5rem;
+    }
+    .nojoinTxt {
+      font-size: 0.8125rem;
+      text-align: center;
+      color: #338afb;
+      line-height: 1.125rem;
+    }
+  }
+  .know {
+    width: 19.25rem;
+    height: 2.875rem;
+    line-height: 2.875rem;
+    background: rgba(51, 138, 251, 1);
+    box-shadow: 0px 1px 12px 0px rgba(51, 138, 251, 1);
+    border-radius: 23px;
+    color: #fff;
+    text-align: center;
+    margin: 1.875rem auto 1.625rem;
+  }
+  .wantCreate {
+    text-align: center;
+    text-decoration: underline;
+    color: #338afb;
+    font-size: 0.8125rem;
+  }
+}
+</style>

src/pages/home/noPassword/index.vue

@@ -0,0 +1,465 @@
+<template>
+  <div class="page_noPassword">
+    <div class="nopasswordTitle">
+      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <span class="titleName">免密码登录</span>
+    </div>
+    <div class="myInput">
+      <el-form ref="NoPassForm" :model="NoPassForm" :rules="rules">
+        <el-form-item required prop="phone">
+          <div class="phoneLine">
+            <i class="el-icon-mobile mobile"></i>
+            <el-input
+              class="phoneInput"
+              placeholder="请输入手机号码"
+              v-model="NoPassForm.phone"
+              v-on:input="watchNum"
+              :maxlength="11"
+              @input="change(NoPassForm.phone)"
+            ></el-input>
+          </div>
+        </el-form-item>
+        <el-form-item required prop="code">
+          <div class="code">
+            <i class="iconfont icon-dunpai dunpai"></i>
+            <el-input
+              class="yzm"
+              v-model="NoPassForm.code"
+              placeholder="请输入验证码"
+              v-on:input="watchNum"
+            ></el-input>
+            <div>
+              <div class="getCode" @click="getVerifyCode()">{{code_btn_title}}</div>
+            </div>
+
+          </div>
+        </el-form-item>
+      </el-form>
+    </div>
+    <div class="login" @click="NoPassToLogin('NoPassForm')" v-show="loginshow">
+      登录
+    </div>
+    <div class="logintwo" v-show="loginshowtwo">登录</div>
+    <div class="agreeBox">
+      <van-checkbox v-model="checked" shape="square"
+        >我已阅读并同意</van-checkbox
+      ><span class="newColor" @click="agree()">《隐私服务协议》</span
+      ><span class="newColor" @click="agree1()">《用户协议》</span>
+    </div>
+    <div class="problem">
+      遇到问题？点击
+      <span @click="contact = true">联系客服</span>
+    </div>
+
+    <!-- 弹窗 联系客服 -->
+    <el-dialog
+      title="客服电话"
+      :visible.sync="contact"
+      width="19.1875rem"
+      top="12.5rem"
+      center
+      class="myDialog"
+    >
+      <span class="telephone">0755-86526342</span>
+      <span slot="footer" class="dialog-footer">
+        <span @click="contact = false">取消</span>
+        <span>|</span>
+        <span type="primary" @click="callPhone()">拨打</span>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { checkMobile } from "@/utils/tools";
+import {
+  getCodeInit,getVerifyCode,loginByCode
+} from '@/api/login'
+export default {
+  data() {
+    var checkMobileRule = (rule, value, callback) => {
+      if (!checkMobile(value)) {
+        callback(new Error("请填写正确的手机号"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      checked: true,
+      phone: "",
+      code: "",
+      contact: false,
+      aespass: "",
+      NoPassForm: {
+        phone: "",
+        code: ""
+      },
+      rules: {
+        phone: [
+          { required: true, message: "手机号码不能为空" },
+          { validator: checkMobileRule }
+        ],
+        code: [{ required: true, message: "验证码不能为空" }]
+      },
+      loginshow: false,
+      loginshowtwo: true,
+      count_downing: false,
+      count_down: 0,
+      codeshow: false,
+      codeshowtwo: true
+    };
+  },
+  created(){
+    this.GetCodeInit()
+  },
+  methods: {
+    GetCodeInit(){
+      getCodeInit().then(response => {
+        if (response.data.state === 1) {
+          this.aespass = response.data.data.aespass
+
+        }
+      })
+    },
+    getVerifyCode() {
+      if (this.NoPassForm.phone.length == 0) {
+        this.$toast({
+          message:"手机号码不能为空!"
+        });
+        return
+      }
+      if (!checkMobile(this.NoPassForm.phone)) {
+        this.$toast({
+          message:"请填写正确的手机号码!"
+        });
+        return
+      }
+
+
+
+      if (!this.count_downing) {
+        let parms = {
+          phone: this.NoPassForm.phone,
+          aespass: this.aespass,
+        }
+        getVerifyCode(parms).then(response => {
+          if (response.data.state === 1) {
+            this.count_downing = true;
+            this.count_down = 61;
+            this.countDown();
+          }
+        })
+      }
+    },
+    countDown: function() {
+      this.count_down = this.count_down - 1;
+      if (this.count_down == 0) {
+        this.count_downing = false;
+        return;
+      }
+      var t = this;
+      setTimeout(() => {
+        this.countDown();
+      }, 1000);
+    },
+
+    callPhone() {
+      window.location.href = "tel://075586526342";
+    },
+    NoPassToLogin(formName) {
+
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          if (this.NoPassForm.phone.length == 0) {
+            this.$toast({
+              message:"手机号码不能为空!"
+            });
+            return
+          }
+          if (!checkMobile(this.NoPassForm.phone)) {
+            this.$toast({
+              message:"请填写正确的手机号码!"
+            });
+            return
+          }
+          if (this.NoPassForm.code.length == 0) {
+            this.$toast({
+              message:"验证码不能为空!"
+            });
+            return
+          }
+
+
+          let params = {
+            mobile: this.NoPassForm.phone,
+            code: this.NoPassForm.code
+          }
+          loginByCode(params).then(
+            response => {
+              if (response.data.state === 1) {
+                var user = response.data.data.user;
+                var admin = response.data.data.admin;
+                var org = response.data.data.org;
+                var subscibe = response.data.data.subscibe;
+                var config_list = response.data.data.config_list;
+                var template_info = response.data.data.template_info;
+                var filed_list = response.data.data.filed_list;
+
+                this.$store.dispatch("InitUserInfo", {
+                  admin:admin,
+                  user: user,
+                  org: org,
+                  subscibe: subscibe,
+                  template_info: template_info,
+                  filed_list: filed_list
+                });
+                this.$store.dispatch("SetConfigList", config_list);
+                this.$router.replace("/myIndex")
+              } else {
+                this.$toast({
+                  message: resp.data.msg
+                });
+              }
+            }
+          );
+        }
+      });
+    },
+    watchNum() {
+      if (this.NoPassForm.phone.length === 11) {
+        this.codeshow = true;
+        this.codeshowtwo = false;
+      } else {
+        this.codeshowtwo = true;
+        this.codeshow = false;
+      }
+
+      if (this.NoPassForm.phone === "" || this.NoPassForm.code === "") {
+        this.loginshow = false;
+        this.loginshowtwo = true;
+      } else {
+        this.loginshow = true;
+        this.loginshowtwo = false;
+      }
+    },
+    change(val) {
+      this.NoPassForm.phone = val.replace(/[^0-9]+/g, "");
+    },agree() {
+      this.$router.push({ path: "/privacy" });
+    },
+    agree1() {
+      this.$router.push({ path: "/userAgreement" });
+    }
+  },
+  computed: {
+    code_btn_title: function() {
+      if (this.count_down == 0) {
+        return "获取验证码";
+      } else {
+        return "重新发送(" + this.count_down + ")";
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page_noPassword {
+  overflow: hidden;
+  height: 100%;
+  .nopasswordTitle {
+    height: 3.125rem;
+    line-height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    margin-left: 1.25rem;
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 6.625rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .myInput {
+    margin-top: 4rem;
+    .phoneLine {
+      width: 84%;
+      margin: 0 auto;
+      border-bottom: 1px solid #e6e6e6;
+      display: flex;
+      .phoneInput {
+        width: 95%;
+      }
+      .mobile {
+        float: left;
+        color: #acacac;
+        font-size: 1.5rem;
+        margin-left: 0.375rem;
+        line-height: 3.375rem;
+        width: 1.5rem;
+      }
+    }
+    .code {
+      line-height: 3.375rem;
+      width: 84%;
+      height: 3.375rem;
+      margin: 0 auto;
+      border-bottom: 1px solid #e6e6e6;
+      display: flex;
+      align-items: center;
+      .dunpai {
+        float: left;
+        color: #acacac;
+        font-size: 1.5rem;
+        margin-left: 0.375rem;
+      }
+      .el-input {
+        float: left;
+        width: 10.6rem;
+        border: none;
+        padding: 0;
+      }
+      .el-input__inner {
+        padding: 0;
+        padding-left: 0.75rem;
+      }
+      .getCode {
+        float: right;
+        width: 5.75rem;
+        height: 2rem;
+        line-height: 2rem;
+        text-align: center;
+        color: #fff;
+        background: #338afb;
+        border-radius: 1.4375rem;
+        font-size: 0.8125rem;
+      }
+      .getCodetwo {
+        // float: left;
+        width: 5.75rem;
+        height: 2rem;
+        // line-height: 2rem;
+        text-align: center;
+        color: #fff;
+        background: #e5e5e5;
+        border-radius: 1.4375rem;
+        font-size: 0.8125rem;
+      }
+      .el-button--primary {
+        border-color: transparent;
+      }
+    }
+  }
+  .login {
+    width: 84%;
+    height: 2.875rem;
+    background: #338afb;
+    border-radius: 1.4375rem;
+    margin: 0 auto;
+    line-height: 2.875rem;
+    text-align: center;
+    color: #fff;
+    margin-top: 2.875rem;
+  }
+  .problem {
+    width: 84%;
+    font-size: 0.8125rem;
+    margin: 16.75rem auto 0;
+    text-align: center;
+    span {
+      color: #338afb;
+    }
+  }
+  .agreeBox {
+    width: 82%;
+    display: flex;
+    align-items: center;
+    font-size: 0.8125rem;
+    margin: 1.25rem auto 0;
+    .newColor {
+      color: #338afb;
+    }
+  }
+}
+
+.el-form-item__error {
+  margin-left: 2.5rem;
+}
+
+.logintwo {
+  width: 19.25rem;
+  height: 2.875rem;
+  background: #e5e5e5;
+  border-radius: 1.4375rem;
+  margin: 0 auto;
+  line-height: 2.875rem;
+  text-align: center;
+  color: #fff;
+  margin-top: 2.875rem;
+}
+
+.el-message {
+  min-width: 20rem;
+}
+</style>
+<style lang="scss">
+.myInput {
+  .el-form-item {
+    margin-bottom: 0;
+  }
+  .el-input {
+    display: block;
+    margin: 0 auto;
+    // width: 19.0625rem;
+
+    color: rgba(155, 155, 155, 1);
+    padding-left: 0.75rem;
+    box-sizing: border-box;
+    height: 3.375rem;
+    line-height: 3.375rem;
+  }
+  .el-input__inner {
+    border: none;
+    font-size: 1rem;
+    padding-left: 0;
+  }
+  .el-input__prefix {
+    font-size: 1.5rem;
+    color: #acacac;
+    line-height: 3.375rem;
+  }
+}
+.myDialog {
+  line-height: 50%;
+  height: 100%;
+  .el-dialog {
+    border-radius: 10px;
+  }
+  .el-dialog__title {
+    color: #000000;
+  }
+  .telephone {
+    width: 12.5rem;
+    height: 1.125rem;
+    font-size: 1.5rem;
+    font-weight: 500;
+    color: #338afb;
+    margin-left: 2.5rem;
+  }
+  .dialog-footer {
+    > span:nth-of-type(1) {
+      color: #9b9b9b;
+    }
+    > span:nth-of-type(2) {
+      padding: 0 3.125rem;
+      color: #e6e6e6;
+    }
+    > span:nth-of-type(3) {
+      color: #000000;
+    }
+  }
+}
+</style>

src/pages/home/register/name.vue

@@ -0,0 +1,115 @@
+<template>
+  <div class="page_getName">
+    <div class="getNameTitle">
+      <i class="iconfont icon-zuojiantou jiantou"></i>
+    </div>
+    <div class="getNameBox">
+      <div class="welcome">你好，欢迎使用酷医云</div>
+      <div class="tips">接下来请完善信息，以便获取更精准的服务</div>
+      <div class="problemBox">
+        <span style="color:#F44746">*</span>
+        <span class="problem">请问你的姓名是？</span>
+      </div>
+      <div class="inputBox">
+        <van-field v-model="name" placeholder="请输入用户名"/>
+      </div>
+      <div class="next" @click="setName()">下一步</div>
+    </div>
+  </div>
+</template>
+
+<script>
+  import {setName} from '@/api/login';
+
+  export default {
+    data() {
+      return {
+        name: '',
+      };
+    },
+    methods: {
+        setName(){
+          if(this.name.trim().length == 0){
+            this.$message.error("名字不能为空!");
+            return
+          }
+          let params = {
+            name : this.name
+          }
+          setName(params).then(
+            response => {
+              if (response.data.state === 1) {
+                this.$router.replace("/join")
+              } else {
+                this.$message.error(response.data.msg);
+              }
+            }
+          );
+        }
+
+
+    },
+  };
+</script>
+
+
+<style lang="scss" scoped>
+  .page_getName {
+    height: 100%;
+    overflow: hidden;
+
+  .getNameTitle {
+    height: 3.125rem;
+    line-height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+
+  .jiantou {
+    margin-left: 1rem;
+    font-size: 1.5rem;
+    font-weight: 600;
+  }
+
+  .getNameBox {
+    padding: 1rem 2rem 0;
+  }
+
+  .welcome {
+    font-weight: bold;
+    font-size: 1.125rem;
+    color: #000;
+  }
+
+  .problemBox {
+    margin-top: 2.625rem;
+  }
+
+  .tips {
+    font-size: 0.75rem;
+    margin-top: 0.875rem;
+  }
+
+  .problem {
+    font-size: 0.75rem;
+  }
+
+  .inputBox {
+    border-bottom: 1px solid #e8e8e8;
+    margin-top: 1.25rem;
+  }
+
+  .next {
+    width: 100%;
+    height: 2.875rem;
+    background: rgba(51, 138, 251, 1);
+    box-shadow: 0px 1px 12px 0px rgba(51, 138, 251, 1);
+    border-radius: 23px;
+    text-align: center;
+    line-height: 2.875rem;
+    color: #fff;
+    margin-top: 3.125rem;
+  }
+
+  }
+</style>

src/pages/home/register/register.vue

@@ -0,0 +1,483 @@
+<template>
+  <div class="page_register">
+    <div class="registerTitle">
+      <i class="iconfont icon-zuojiantou jiantou"></i>
+      <span class="titleName">注册</span>
+    </div>
+    <div class="registermyInput">
+      <el-form ref="registerForm" :model="registerForm" :rules="rules">
+        <el-form-item required prop="phone">
+          <div class="phoneLine">
+            <i class="el-icon-mobile mobile"></i>
+            <el-input
+              placeholder="请输入手机号码"
+              v-model="registerForm.phone"
+              v-on:input="watchNum"
+              maxlength="11"
+              @input="change(registerForm.phone)"
+            ></el-input>
+          </div>
+        </el-form-item>
+        <el-form-item required prop="code">
+          <div class="code">
+            <i class="iconfont icon-dunpai dunpai"></i>
+            <el-input
+              v-model="registerForm.code"
+              placeholder="请输入验证码"
+              v-on:input="watchNum"
+            ></el-input>
+            <div class="getCode" @click="getVerifyCode()">{{code_btn_title}}</div>
+            <!-- <el-button class="getCode" :type="count_downing ? 'info' : 'primary'" :disabled="count_downing" @click="getCodeAction" v-show="codeshow">{{ code_btn_title }}</el-button>
+            <el-button class="getCodetwo" :type="count_downing ? 'info' : 'primary'" :disabled="count_downing" v-show="codeshowtwo">{{ code_btn_title }}</el-button>-->
+          </div>
+        </el-form-item>
+        <el-form-item required prop="password">
+          <div class="phoneLine">
+            <i class="el-icon-lock lock"></i>
+            <el-input
+              v-model="registerForm.password"
+              show-password
+              clearable
+              placeholder="请输入密码"
+            ></el-input>
+          </div>
+        </el-form-item>
+      </el-form>
+      <!-- <el-input placeholder="请输入手机号码" prefix-icon="el-icon-mobile" v-model="phone"></el-input>
+
+      <div class="code">
+        <i class="iconfont icon-dunpai dunpai"></i>
+        <el-input v-model="code" placeholder="请输入验证码"></el-input>
+        <div class="getCode">获取验证码</div>
+      </div>
+      <el-input placeholder="请输入密码" prefix-icon="el-icon-lock" v-model="psd" show-password></el-input>-->
+    </div>
+    <div
+      class="login"
+      @click="submitModifyPwdAction('registerForm')"
+      v-show="loginshow"
+    >
+      下一步
+    </div>
+    <div class="logintwo" v-show="loginshowtwo">下一步</div>
+    <div class="agreeBox">
+      <van-checkbox v-model="checked" shape="square"
+        >我已阅读并同意</van-checkbox
+      ><span class="newColor">《隐私服务协议》</span
+      ><span class="newColor">《用户协议》</span>
+    </div>
+    <div class="problem">
+      遇到问题？点击
+      <span @click="contact = true">联系客服</span>
+    </div>
+
+    <!-- 弹窗 -->
+    <el-dialog
+      title="客服电话"
+      :visible.sync="contact"
+      width="19.1875rem"
+      top="12.5rem"
+      center
+      class="myDialog"
+    >
+      <span class="telephone">0755-86526342</span>
+      <span slot="footer" class="dialog-footer">
+        <span @click="contact = false">取消</span>
+        <span>|</span>
+        <span type="primary" @click="callPhone()">拨打</span>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { checkMobile, checkPassWordTwo } from "@/utils/tools";
+import {getCodeInit,getVerifyCode,register} from '@/api/login';
+import { hex_md5 } from "@/utils/md5";
+
+export default {
+  data() {
+    var checkMobileRule = (rule, value, callback) => {
+      if (!checkMobile(value)) {
+        callback(new Error("请填写正确的手机号"));
+      } else {
+        callback();
+      }
+    };
+    var checkPasswordRule = (rule, value, callback) => {
+      if (!checkPassWordTwo(value)) {
+        callback(new Error("密码长度不能小于6位数"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      checked: true,
+      phone: "",
+      code: "",
+      psd: "",
+      contact: false,
+      count_downing: false,
+      count_down: 0,
+      modify_pwd_loading: false,
+      registerForm: {
+        phone: "",
+        code: "",
+        password: ""
+      },
+      rules: {
+        phone: [
+          { required: true, message: "手机号码不能为空" },
+          { validator: checkMobileRule }
+        ],
+        code: [{ required: true, message: "验证码不能为空" }],
+        password: [
+          { required: true, message: "密码不能为空" },
+          { validator: checkPasswordRule }
+        ]
+      },
+      loginshow: true,
+      loginshowtwo: false,
+      codeshow: false,
+      codeshowtwo: true,
+      aespass:"",
+    };
+  },
+  created(){
+    this.GetCodeInit()
+  },
+  methods: {
+    GetCodeInit(){
+      getCodeInit().then(response => {
+        if (response.data.state === 1) {
+          this.aespass = response.data.data.aespass
+
+        }
+      })
+    },
+    getVerifyCode() {
+      if (this.registerForm.phone.length == 0) {
+        this.$toast({
+          message:"手机号码不能为空!"
+        });
+        return
+      }
+      if (!checkMobile(this.registerForm.phone)) {
+        this.$toast({
+          message:"请填写正确的手机号码!"
+        });
+        return
+      }
+
+      if (!this.count_downing) {
+        let parms = {
+          phone: this.registerForm.phone,
+          aespass: this.aespass,
+        }
+        getVerifyCode(parms).then(response => {
+          if (response.data.state === 1) {
+            this.count_downing = true;
+            this.count_down = 61;
+            this.countDown();
+          }
+        })
+      }
+    },
+
+    countDown: function() {
+      this.count_down = this.count_down - 1;
+      if (this.count_down == 0) {
+        this.count_downing = false;
+        return;
+      }
+      var t = this;
+      setTimeout(() => {
+        this.countDown();
+      }, 1000);
+    },
+    watchNum() {
+      if (this.registerForm.phone.length === 11) {
+        this.codeshow = true;
+        this.codeshowtwo = false;
+      } else {
+        this.codeshow = false;
+        this.codeshowtwo = true;
+      }
+      if (this.registerForm.phone === "" || this.registerForm.code === "") {
+        this.loginshow = false;
+        this.loginshowtwo = true;
+      } else {
+        this.loginshow = true;
+        this.loginshowtwo = false;
+      }
+    },
+    submitModifyPwdAction(formName) {
+      this.$refs[formName].validate(valid => {
+        if (valid) {
+          let params = {
+            mobile: this.registerForm.phone,
+            password: hex_md5(this.psd),
+            code: this.registerForm.code,
+          }
+          register(params).then(response => {
+            if (response.data.state === 1) {
+              this.$router.push("/setname")
+            } else {
+              this.$toast({
+                message: response.data.msg
+              });
+            }
+          });
+        }
+      });
+    },
+
+    callPhone() {
+      window.location.href = "tel://075586526342";
+    },
+    // 不能输入中文和字母
+    change(val) {
+      console.log("val", val);
+      this.registerForm.phone = val.replace(/[^0-9]+/g, "");
+    }
+  },
+  computed: {
+    code_btn_title: function() {
+      if (this.count_down === 0) {
+        return "获取验证码";
+      } else {
+        return "重新发送(" + this.count_down + ")";
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.page_register {
+  overflow: hidden;
+  height: 100%;
+  .registerTitle {
+    height: 3.125rem;
+    line-height: 3.125rem;
+    display: flex;
+    align-items: center;
+  }
+  .jiantou {
+    margin-left: 1.25rem;
+    font-size: 1.5rem;
+    font-weight: 600;
+    margin-right: 8rem;
+  }
+  .titleName {
+    font-size: 1.125rem;
+    font-weight: 600;
+  }
+  .registermyInput {
+    margin-top: 4rem;
+    .phoneLine {
+      width: 84%;
+      margin: 0 auto;
+      display: flex;
+      border-bottom: 1px solid #e6e6e6;
+      .mobile {
+        float: left;
+        color: #acacac;
+        font-size: 1.5rem;
+        margin-left: 0.375rem;
+        line-height: 3.375rem;
+        width: 1.5rem;
+      }
+      .phoneInput {
+        width: 95%;
+      }
+    }
+    .lock {
+      float: left;
+      color: #acacac;
+      font-size: 1.5rem;
+      margin-left: 0.375rem;
+      line-height: 3.375rem;
+      width: 1.5rem;
+    }
+    .code {
+      line-height: 3.375rem;
+      width: 84%;
+      height: 3.375rem;
+      margin: 0 auto;
+      border-bottom: 1px solid #e6e6e6;
+      display: flex;
+      align-items: center;
+
+      .dunpai {
+        float: left;
+        color: #acacac;
+        font-size: 1.5rem;
+        margin-left: 0.375rem;
+      }
+      .el-input {
+        float: left;
+        width: 10.6rem;
+        border: none;
+        padding: 0;
+      }
+      .el-input__inner {
+        padding: 0;
+        padding-left: 0.75rem;
+      }
+      .getCode {
+        // float: left;
+        width: 5.75rem;
+        height: 2rem;
+        line-height: 2rem;
+        text-align: center;
+        color: #fff;
+        background: #338afb;
+        border-radius: 1.4375rem;
+        font-size: 0.8125rem;
+        // margin-top: 0.9375rem;
+      }
+
+      .getCodetwo {
+        width: 5.75rem;
+        height: 2rem;
+        // line-height: 2rem;
+        text-align: center;
+        color: #fff;
+        background: #e5e5e5;
+        border-radius: 1.4375rem;
+        font-size: 0.8125rem;
+      }
+
+      .el-button--primary {
+        border-color: transparent;
+      }
+    }
+  }
+  .login {
+    width: 84%;
+    height: 2.875rem;
+    background: #338afb;
+    border-radius: 1.4375rem;
+    margin: 0 auto;
+    line-height: 2.875rem;
+    text-align: center;
+    color: #fff;
+    margin-top: 2.875rem;
+  }
+  .logintwo {
+    width: 84%;
+    height: 2.875rem;
+    background: #e5e5e5;
+    border-radius: 1.4375rem;
+    margin: 0 auto;
+    line-height: 2.875rem;
+    text-align: center;
+    color: #fff;
+    margin-top: 2.875rem;
+  }
+  .problem {
+    width: 84%;
+    font-size: 0.8125rem;
+    margin: 13rem auto 0;
+    text-align: center;
+    span {
+      color: #338afb;
+    }
+  }
+  .agreeBox {
+    width: 82%;
+    display: flex;
+    align-items: center;
+    font-size: 0.8125rem;
+    margin: 1.25rem auto 0;
+    .newColor {
+      color: #338afb;
+    }
+  }
+}
+
+.el-form-item__error {
+  margin-left: 2.5rem;
+}
+.el-button--medium {
+  padding: 0;
+}
+
+.el-message {
+  min-width: 20rem;
+}
+</style>
+
+<style lang="scss">
+.registermyInput {
+  .el-form-item {
+    margin-bottom: 0;
+  }
+  .el-input {
+    display: flex;
+    align-items: center;
+    margin: 0 auto;
+    color: rgba(155, 155, 155, 1);
+    padding-left: 0.75rem;
+    box-sizing: border-box;
+    height: 3.375rem;
+    line-height: 3.375rem;
+  }
+  .el-input__inner {
+    border: none;
+    font-size: 1rem;
+    padding-left: 0;
+  }
+  .el-input__prefix {
+    font-size: 1.5rem;
+    color: #acacac;
+  }
+
+  .phoneLine {
+    .el-input__clear {
+      margin-right: 0.625rem;
+    }
+    .el-input__icon {
+      line-height: 3.375rem;
+      font-size: 1.5rem;
+    }
+  }
+}
+.myDialog {
+  line-height: 50%;
+  height: 100%;
+  .el-dialog {
+    border-radius: 10px;
+  }
+  .el-dialog__title {
+    color: #000000;
+  }
+  .telephone {
+    width: 12.5rem;
+    height: 1.125rem;
+    font-size: 1.5rem;
+    font-weight: 500;
+    color: #338afb;
+    margin-left: 2.5rem;
+  }
+  .dialog-footer {
+    //   display: flex;
+    //   justify-content: space-around;
+    //   align-items: center;
+    > span:nth-of-type(1) {
+      color: #9b9b9b;
+    }
+    > span:nth-of-type(2) {
+      // width: 0.125rem;
+      // height: 1.75rem;
+      // line-height: 1.75rem;
+      padding: 0 3.125rem;
+      color: #e6e6e6;
+    }
+    > span:nth-of-type(3) {
+      color: #000000;
+    }
+  }
+}
+</style>

src/pages/home/verifyToken.vue

@@ -0,0 +1,47 @@
+<template>
+  <div>
+    <h2 style="text-align:center;">加载中...</h2>
+  </div>
+</template>
+
+<script>
+  import {
+    isLogin,
+  } from '@/api/login'
+
+  export default {
+    name: "verifyToken",
+    created() {
+      isLogin().then(response => {
+        if (response.data.state === 1) {
+          var data = response.data.data
+          if(data.isLogin){ //登录
+            var admin = data.admin;
+            var user = data.user;
+            var org = data.org;
+            var subscibe = data.subscibe;
+            var config_list = data.config_list;
+            var template_info = data.template_info;
+            var filed_list = data.filed_list;
+            this.$store.dispatch("InitUserInfo", {
+              admin:admin,
+              user: user,
+              org: org,
+              subscibe: subscibe,
+              template_info: template_info,
+              filed_list: filed_list
+            });
+            this.$store.dispatch("SetConfigList", config_list);
+            this.$router.replace("/myIndex")
+          }else{ //未登录
+            this.$router.replace("/login")
+          }
+        }
+      })
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

src/pages/homeIndex/index.vue

@@ -138,6 +138,8 @@
       toPatients(){
         this.$router.push({path:"/patients"})
       }
+    },created(){
+      console.log(this.$store.getters.user.user)
     }
   };
 </script>

src/permission.js

@@ -1,13 +1,14 @@
 import router from "./router";
 import store from "./store";
+import  isLogin  from "@/api/login";
 
-const loginWhiteList = ["/", "/privacy", "/forgetPassword", "/userAgreement","/myIndex","/patients","/addPatints"]; // 登录验证白名单
+const loginWhiteList = ["/", "/login", "/privacy", "/forgetPassword", "/userAgreement","/myIndex","/patients","/addPatints","/nopassword","/forget","/register","/setname",'/join','/createorg']; // 登录验证白名单
 
 router.beforeEach((to, from, next) => {
   // 线上注释
   //   next()
   //   return
-
+  console.log(store.getters.user.user.id)
   if (store.getters.user.user.id == 0) {
     if (loginWhiteList.indexOf(to.path) !== -1) {
       next();

src/router/index.js

@@ -7,8 +7,43 @@ export default new Router({
   routes: [{
       path: '/',
       name: 'Home',
+      component: () => import('@/pages/home/verifyToken')
+    },
+    {
+      path: '/login',
+      name: 'Home',
       component: () => import('@/pages/home/login')
     },
+    {
+      path: '/nopassword',
+      name: 'Home',
+      component: () => import('@/pages/home/noPassword')
+    },
+    {
+      path: '/setname',
+      name: 'Home',
+      component: () => import('@/pages/home/register/name')
+    },
+    {
+      path: '/register',
+      name: 'Home',
+      component: () => import('@/pages/home/register/register')
+    },
+    {
+      path: '/join',
+      name: 'Home',
+      component: () => import('@/pages/home/noJoinedGroup')
+    },
+    {
+      path: '/forget',
+      name: 'Home',
+      component: () => import('@/pages/home/forgetPassword')
+    },
+    {
+      path: '/createorg',
+      name: 'Home',
+      component: () => import('@/pages/home/createOrg')
+    },
     // 首页
     {
       path: '/myIndex',

src/store/user/user.js

@@ -1,4 +1,8 @@
 
+import {
+  isLogin,
+} from '@/api/login'
+
 const user = {
   state: {
 
@@ -16,6 +20,7 @@ const user = {
       user_type: 0,
       user_title: 0
     },
+    admin:null,
     org: {
       id: 0,
       org_short_name: '',
@@ -49,36 +54,64 @@ const user = {
   },
 
   mutations: {
+    SET_ADMIN: (state, payload) => {
+      state.admin = payload.admin
+    },
     SET_FILEDS: (state, payload) => {
       state.fileds = payload.fileds
-      console.log(payload.fileds)
-      console.log(state.fileds)
     },
     SET_USER: (state, user) => {
-      state.user.id = user.id
-      state.user.mobile = user.mobile
-      state.user.avatar = user.avatar
-      state.user.user_name = user.user_name
-      state.user.intro = user.intro
-      state.user.user_type = user.user_type
-      state.user.user_title = user.user_title
+      if(user == null){
+        state.user.id = 0
+        state.user.mobile = ''
+        state.user.avatar = ''
+        state.user.user_name = ''
+        state.user.intro = ''
+        state.user.user_type = 0
+        state.user.user_title = ''
+      }else{
+        state.user.id = user.id
+        state.user.mobile = user.mobile
+        state.user.avatar = user.avatar
+        state.user.user_name = user.user_name
+        state.user.intro = user.intro
+        state.user.user_type = user.user_type
+        state.user.user_title = user.user_title
+
+      }
+
+
     },
     SET_ORG: (state, org) => {
-      state.org.id = org.id
-      state.org.org_short_name = org.org_short_name
-      state.org.org_name = org.org_name
-      state.org.org_intro = org.org_intro
-      state.org.org_logo = org.org_logo
-      state.org.address = org.address
-      state.org.province = org.province
-      state.org.city = org.city
-      state.org.district = org.district
+      if(org == null){
+        state.org.id = 0
+        state.org.org_short_name = ''
+        state.org.org_name = ''
+        state.org.org_intro =''
+        state.org.org_logo = ''
+        state.org.address = ''
+        state.org.province = 0
+        state.org.city = 0
+        state.org.district = 0
+
+      }else{
+        state.org.id = org.id
+        state.org.org_short_name = org.org_short_name
+        state.org.org_name = org.org_name
+        state.org.org_intro = org.org_intro
+        state.org.org_logo = org.org_logo
+        state.org.address = org.address
+        state.org.province = org.province
+        state.org.city = org.city
+        state.org.district = org.district
+      }
+
     },
     SET_SUBSCIBE: (state, subscibe) => {
-      state.subscibe.id = subscibe.id
-      state.subscibe.period_start = subscibe.period_start
-      state.subscibe.period_end = subscibe.period_end
-      state.subscibe.state = subscibe.state
+      // state.subscibe.id = subscibe.id
+      // state.subscibe.period_start = subscibe.period_start
+      // state.subscibe.period_end = subscibe.period_end
+      // state.subscibe.state = subscibe.state
     },
     SET_ROLE_TYPE: (state, type) => {
       state.role_type = type
@@ -91,9 +124,19 @@ const user = {
     },
     // eslint-disable-next-line camelcase
     SET_TEMPLATE: (state, template_info) => {
-      state.template_info.id = template_info.id
-      state.template_info.org_id = template_info.org_id
-      state.template_info.template_id = template_info.template_id
+      if(template_info == null){
+
+        state.template_info.id = 0
+        state.template_info.org_id = 0
+        state.template_info.template_id = 0
+
+      }else{
+
+        state.template_info.id = template_info.id
+        state.template_info.org_id = template_info.org_id
+        state.template_info.template_id = template_info.template_id
+
+      }
     },
     SET_REQUESTSCHEDUALS: (state, requestScheduals) => {
       state.requestScheduals = requestScheduals
@@ -114,12 +157,10 @@ const user = {
       var user = userInfo.user
       var org = userInfo.org
       var subscibe = userInfo.subscibe
-      // eslint-disable-next-line camelcase
       var template_info = userInfo.template_info
+      var admin = userInfo.admin
 
       var fileds = userInfo.filed_list
-      console.log(userInfo.filed_list)
-      console.log(fileds)
 
       commit('SET_USER', user)
       commit('SET_ORG', org)
@@ -128,6 +169,9 @@ const user = {
       commit('SET_FILEDS', {
         fileds
       })
+      commit('SET_ADMIN', {
+        admin
+      })
     },
     SwitchRoleTypeToDoctor ({commit}) {
       commit('SET_ROLE_TYPE', 1)

src/utils/tools.js

@@ -169,3 +169,10 @@ export function checkMobile(mobile) {
   }
   return true
 }
+
+export function checkPassWordTwo(password) {
+  if (!(/^[0-9A-Za-z]{6,}$/.test(password))) {
+    return false
+  }
+  return true
+}