Merge branch 'ldx' into dev

src/assets/css/index.css

@@ -190,8 +190,12 @@ div{
 .el-dialog{
   border-radius: 10px;
 }
+.el-dialog__header {
+  border-bottom: 1px solid #edf0ff;
+}
 .el-dialog__title{
   font-size: 16px;
+  font-weight: 700;
   color: #1d1e20;
   border-left: 4px solid #0367f6;
   padding-left: 8px;

src/components/cropper.vue

@@ -54,17 +54,8 @@
           </div>
         </div>
         <el-row class="footerBtn" align="center">
-<<<<<<< HEAD
-          <el-button type="primary" class="form_t" size="small" @click="cut('blob')">确&nbsp;&nbsp;认</el-button>
           <el-button type="primary" class="form_c" size="small" @click="handleClose">取&nbsp;&nbsp;消</el-button>
-=======
-          <el-button type="primary" size="small" round @click="cut('blob')"
-            >确认</el-button
-          >
-          <el-button type="primary" size="small" round @click="handleClose"
-            >取消</el-button
-          >
->>>>>>> xym
+          <el-button type="primary" class="form_t" size="small" @click="cut('blob')">确&nbsp;&nbsp;认</el-button>
         </el-row>
       </div>
     </el-dialog>

src/pages/user/user_info.vue

@@ -10,19 +10,20 @@
         <el-tab-pane label="业务系统详情" name="1"></el-tab-pane>
       </el-tabs>
       <el-form ref="form" :model="form">
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>账号：</p>
           <el-input v-model="form.accountNo"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item info_item_right_btn">
           <p>密码：</p>
           <el-input v-model="form.password"></el-input>
+          <el-button class="option_btn" @click="changePassword">修改密码</el-button>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>昵称：</p>
           <el-input v-model="form.nickname"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>头像：</p>
           <upload-file
             :multiple="false"
@@ -33,27 +34,59 @@
             @getNewList="getNewList"
           ></upload-file>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>联系人：</p>
           <el-input v-model="form.contactPerson"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>手机号：</p>
           <el-input v-model="form.phone"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>邮箱：</p>
           <el-input v-model="form.email"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item">
           <p>组织机构：</p>
           <el-input v-model="form.organization"></el-input>
         </el-form-item>
-        <el-form-item>
+        <el-form-item class="info_item info_item_right_btn">
           <p>当前角色：</p>
           <el-input v-model="form.role"></el-input>
+          <el-button class="option_btn" @click="upLevel">升级为开发者</el-button>
         </el-form-item>
       </el-form>
+      <div class="btn_footer">
+        <el-button class="previous" @click="previous">取消</el-button>
+        <el-button class="registe" @click="registe">修改</el-button>
+      </div>
+      <el-dialog
+        title="修改密码"
+        :visible.sync="diaPassWord"
+        width="440px"
+        :modal-append-to-body="false"
+      >
+        <div class="change_psw">
+          <el-form ref="form" :model="form">
+            <el-form-item class="dia_item">
+              <p>旧密码：</p>
+              <el-input v-model="form.accountNo"></el-input>
+            </el-form-item>
+            <el-form-item class="dia_item">
+              <p>新密码：</p>
+              <el-input v-model="form.password"></el-input>
+            </el-form-item>
+            <el-form-item class="dia_item">
+              <p>请再次输入密码：</p>
+              <el-input v-model="form.nickname"></el-input>
+            </el-form-item>
+          </el-form>
+        </div>
+        <div class="dia_btn_footer">
+          <el-button class="previous" @click="cancelChangePwd">取消</el-button>
+          <el-button class="registe" @click="submitChangePwd">修改</el-button>
+        </div>
+      </el-dialog>
     </block-radius>
   </div>
 </template>
@@ -78,21 +111,102 @@ export default {
       organization: "",
       role: ""
     },
-    imgList: []
+    imgList: [],
+    diaPassWord: false
   }),
   mounted() {
-    this.imgList.push("https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg")
+    this.imgList.push(
+      "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
+    );
   },
   methods: {
     changeTab() {},
     getNewList(val) {
       console.log(val);
+    },
+    previous() {},
+    registe() {},
+    changePassword() {
+      this.diaPassWord = true;
+    },
+    cancelChangePwd() {
+      this.diaPassWord = false;
+    },
+    submitChangePwd() {},
+    upLevel() {
+      this.diaPassWord = true;
     }
   }
 };
 </script>
 <style scoped>
 .info_block {
-  margin: 0 20px;
+  margin: 0 20px 20px;
+  position: relative;
+}
+.btn_footer {
+  display: flex;
+  justify-content: flex-end;
+  margin: 40px 20px 10px;
+}
+.previous {
+  width: 100px;
+  background-color: #c3caf8;
+  color: #0f2683;
+}
+.registe {
+  width: 100px;
+  background-color: #0f2683;
+  color: #f8f9fd;
+}
+.option_btn {
+  width: 124px;
+  background-color: #495feb;
+  border-radius: 8px;
+  color: #f8f9fd;
+}
+.info_item {
+  width: 70%;
+  min-width: 600px;
+  max-width: 1200px;
+  margin-bottom: 12px;
+}
+.info_item p {
+  padding-left: 15px;
+  color: #242c43;
+}
+.change_psw {
+  text-align: left;
+}
+.dia_item {
+  width: 100%;
+  margin-bottom: 12px;
+}
+.dia_item p {
+  padding-left: 15px;
+  color: #242c43;
+}
+.dia_btn_footer {
+  display: flex;
+  justify-content: flex-end;
+  margin: 20px 0 0;
+}
+</style>
+<style>
+.info_item_right_btn .el-input {
+  width: calc(100% - 140px);
+  margin-right: 10px;
+}
+.info_block .el-dialog__wrapper {
+  padding-left: 180px;
+}
+.info_block .v-modal {
+  position: absolute;
+  border-radius: 8px;
+  width: 100%;
+  height: 100%;
+}
+.info_block .el-dialog__body {
+  padding: 15px 20px 20px;
 }
 </style>
\ No newline at end of file

src/request/http.js

@@ -18,12 +18,7 @@ const tip = msg => {
  * 登录用 bg-login ，具体链接晚几天加
  */
 const toLogin = () => {
-    router.replace({
-        path: '/login',
-        query: {
-            redirect: router.currentRoute.fullPath
-        }
-    });
+    window.location.href = "/login?redirect=" + router.currentRoute.fullPath
 }
 
 /**