修复bug

src/api/login.js

@@ -43,7 +43,7 @@ export function getInfo() {
 // 退出方法
 export function logout() {
   return request({
-    url: '/auth/logout',
+    url: '/logout',
     method: 'post'
   })
 }

src/store/modules/user.js

@@ -36,7 +36,7 @@ const user = {
     Login({ commit }, userInfo) {
       const loginName = userInfo.loginName.trim()
       const passWord = userInfo.passWord
-      const isRememberMe = true
+      const isRememberMe = userInfo.rememberMe
       return new Promise((resolve, reject) => {
         login(loginName, passWord, isRememberMe).then(res => {
           setToken(res.data)

src/utils/request.js

@@ -108,7 +108,7 @@ service.interceptors.response.use(res => {
     Message({ message: msg, type: 'warning' })
     return Promise.reject('error')
   } else if (code === 403) {
-    MessageBox.confirm('信息已经更改请重新登录', '系统提示', { confirmButtonText: '重新登录', type: 'warning', showCancelButton: false, }).then(() => {
+    MessageBox.confirm('信息已经发生更改请重新登录', '系统提示', { confirmButtonText: '重新登录', type: 'warning', showCancelButton: false, }).then(() => {
       store.dispatch('LogOut').then(() => {
         if (process.env.NODE_ENV == 'production') {
           location.href = '/hcp';

src/views/doctor/physician/index.vue

@@ -57,13 +57,15 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="12">
-            <el-form-item prop="certificate" label="医师资格证">
+            <el-form-item prop="certificate" label="*医师资格证">
+              <label slot="label"><span style="color:red">* </span>医师资格证</label>
               <ImageUpload ref="imgUpload" v-if="open" :imgList="form.certificate" :paramsData="{ dirName: 'hcp' }"
                 :limit="1" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item prop="certificate" label="医师头像">
+            <el-form-item prop="certificate" label="*医师头像">
+              <label slot="label"><span style="color:red">* </span>医师头像</label>
               <ImageUpload ref="avatar" v-if="open" :imgList="form.avatar" :paramsData="{ dirName: 'hcp' }" :limit="1" />
             </el-form-item>
           </el-col>
@@ -201,7 +203,11 @@ export default {
         ],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+          {
+            pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*]).{8,19}$/,
+            message: "用户密码长度必须大于8位数小于20位数且包含大小写字母，数字，特殊字符(!@#$%^&*)",
+            trigger: 'blur'
+          }
         ],
         email: [
           { required: true, message: "邮箱不能为空", trigger: "blur" },

src/views/doctor/therapists/index.vue

@@ -54,7 +54,8 @@
       <el-form ref="form" :model="form" :rules="rules" label-width="110px">
         <el-row>
           <el-col :span="24">
-            <el-form-item prop="certificate" label="资格证">
+            <el-form-item prop="certificate" label="*资格证">
+              <label slot="label"><span style="color:red">* </span>资格证</label>
               <ImageUpload ref="imgUpload" v-if="open" :imgList="form.certificate" :paramsData="{ dirName: 'hcp' }"
                 :limit="1" />
             </el-form-item>
@@ -184,7 +185,11 @@ export default {
         ],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+          {
+            pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*]).{8,19}$/,
+            message: "用户密码长度必须大于8位数小于20位数且包含大小写字母，数字，特殊字符(!@#$%^&*)",
+            trigger: 'blur'
+          }
         ],
         email: [
           { required: true, message: "邮箱不能为空", trigger: "blur" },

src/views/login.vue

@@ -46,8 +46,8 @@ export default {
     return {
       codeUrl: "",
       loginForm: {
-        loginName: "13269791738",
-        passWord: "111111",
+        loginName: "",
+        passWord: "",
         rememberMe: false,
         code: "",
         uuid: ""
@@ -57,7 +57,12 @@ export default {
           { required: true, trigger: "blur", message: "请输入您的账号" }
         ],
         passWord: [
-          { required: true, trigger: "blur", message: "请输入您的密码" }
+          { required: true, trigger: "blur", message: "请输入您的密码" },
+           {
+            pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*]).{8,19}$/,
+            message: "你使用的是弱密码，请修改为强密码后再登录",
+            trigger: 'blur'
+          }
         ],
       },
       loading: false,

src/views/patient/addTwo/index.vue

@@ -145,13 +145,15 @@
     <el-dialog title="支付" :visible.sync="dialogVisible" width="40%" :before-close="handleClose" destroy-on-close :close-on-click-modal="false">
       <div style="margin: 0 auto; text-align: center;">
         <el-radio-group v-model="form.payMethod" @input="payChange">
-          <el-radio v-for="item in dict.type.pay_method" :label="item.value" :key="item.value" border>
+          <!-- <el-radio v-for="item in dict.type.pay_method" :label="item.value" :key="item.value" border>
             <img src="@/assets/images/icon_pay1.png" style="width: 16px; height: 16px; vertical-align: sub;"
               v-if="item.value == '1'" />
             <img src="@/assets/images/icon_pay2.png" style="width: 16px; height: 16px; vertical-align: sub;"
               v-if="item.value == '2'" />
-            {{ item.label }}</el-radio>
-          <!-- <el-radio label="2" border>支付宝</el-radio> -->
+            {{ item.label }}</el-radio> -->
+          <el-radio label="1" key="1" border>
+            <img src="@/assets/images/icon_pay1.png" style="width: 16px; height: 16px; vertical-align: sub;"/>微信
+          </el-radio>
         </el-radio-group>
       </div>
       <div class="code">

src/views/patient/historyList/trainDetatil.vue

@@ -124,7 +124,7 @@ export default {
     // 跳转日报
     gotoRb() {
       let token = getToken()
-      let url = 'https://www.yingyangfly.com/h5-training-daily-dev/'
+      let url = 'https://yaorong.yaorongmedical.com/h5-training-daily/'
       let data = `?userToken=${token}&time=${this.day}&userId=${this.defaultVal.id}`
       window.open(url + data, '_blank')
     },

src/views/patient/list/trainDetatil.vue

@@ -124,7 +124,7 @@ export default {
     gotoRb() {
       let token = getToken()
       console.log(token);
-      let url = 'https://www.yingyangfly.com/h5-training-daily-dev/'
+      let url = 'https://yaorong.yaorongmedical.com/h5-training-daily/'
       let data = `?userToken=${token}&time=${this.day}&userId=${this.defaultVal.id}`
       window.open(url + data, '_blank')
     },

src/views/system/dept/index.vue

@@ -245,7 +245,7 @@
                 <el-form-item label="支付方式">
                   <el-checkbox-group v-model="payForm.type">
                     <el-checkbox label="1">微信支付</el-checkbox>
-                    <el-checkbox label="2">支付宝</el-checkbox>
+                    <!-- <el-checkbox label="2">支付宝</el-checkbox> -->
                   </el-checkbox-group>
                 </el-form-item>
 
@@ -311,7 +311,7 @@
             </div>
 
           </el-form>
-          <el-form :model="payForm.zfb" label-width="110px">
+          <!-- <el-form :model="payForm.zfb" label-width="110px">
 
             <el-row v-if="payForm.type.length != 0">
               <el-col :span="20" v-if="payForm.type.includes('2')">
@@ -362,7 +362,7 @@
                 </div>
               </el-col>
             </el-row>
-          </el-form>
+          </el-form> -->
         </div>
       </div>
       <div slot="footer" class="dialog-footer">

src/views/system/task/index.vue

@@ -108,7 +108,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="机构编码">
-              <el-input v-model.trim="form.orgCode" disabled="true" placeholder="请输入机构编码" />
+              <el-input v-model.trim="form.orgCode" :disabled="isGroupDisabled" placeholder="请输入机构编码" />
             </el-form-item>
           </el-col>
           <el-col :span="24">
@@ -153,6 +153,7 @@
           <el-col :span="12">
             <el-form-item label="是否并发" prop="concurrent">
               <el-radio-group v-model="form.concurrent" size="small">
+                {{dict.type.allow_forbid}}
                 <el-radio
                   v-for="dict in dict.type.allow_forbid"
                   :key="dict.value"
@@ -213,7 +214,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="是否并发：">
-              <el-radio-group v-model="form.concurrent" disabled="true" size="small">
+              <el-radio-group v-model="form.concurrent" :disabled="isGroupDisabled" size="small">
                 <el-radio
                   v-for="dict in dict.type.allow_forbid"
                   :key="dict.value"
@@ -224,7 +225,7 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="执行策略：">
-              <el-radio-group v-model="form.misfirePolicy" disabled="true" size="small">
+              <el-radio-group v-model="form.misfirePolicy" :disabled="isGroupDisabled" size="small">
                 <el-radio
                   v-for="dict in dict.type.job_run_strategy"
                   :key="dict.value"
@@ -301,7 +302,8 @@ export default {
         cronExpression: [
           { required: true, message: "cron执行表达式不能为空", trigger: "blur" }
         ]
-      }
+      },
+      isGroupDisabled: true
     };
   },
   created() {
@@ -332,7 +334,7 @@ export default {
         invokeTarget: undefined,
         cronExpression: undefined,
         id: undefined,
-        misfirePolicy: 1,
+        misfirePolicy: undefined,
         concurrent: 1,
         status: "0"
       };

src/views/system/user/index.vue

@@ -280,7 +280,12 @@ export default {
         ],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
-          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' }
+          {
+            pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*]).{8,19}$/,
+            message: "用户密码长度必须大于8位数小于20位数且包含大小写字母，数字，特殊字符(!@#$%^&*)",
+            trigger: 'blur'
+          }
+
         ],
         email: [
           { required: true, message: "邮箱不能为空", trigger: "blur" },
@@ -436,8 +441,8 @@ export default {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
         closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
+        inputPattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*]).{8,19}$/,
+        inputErrorMessage: "用户密码长度必须大于8位数小于20位数且包含大小写字母，数字，特殊字符(!@#$%^&*)"
       }).then(({ value }) => {
         violentResetPwd(row.id, value).then(response => {
           this.getList();

src/views/system/user/profile/resetPwd.vue

@@ -46,7 +46,11 @@ export default {
         ],
         newPassword: [
           { required: true, message: "新密码不能为空", trigger: "blur" },
-          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" }
+          {
+            pattern: /^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[!@#$%^&*]).{8,19}$/,
+            message: "用户密码长度必须大于8位数小于20位数且包含大小写字母，数字，特殊字符(!@#$%^&*)",
+            trigger: 'blur'
+          }
         ],
         confirmPassword: [
           { required: true, message: "确认密码不能为空", trigger: "blur" },