Merge branch 'ldx' into dev

src/App.vue

 <template>
   <div id="app">
-    <bd-menu v-if="this.$route.path != '/login'" class="outmenu"></bd-menu>
+    <bd-menu class="outmenu"></bd-menu>
     <router-view />
   </div>
 </template>

src/components/cropper.vue

 <template>
-  <div class="add_img">
-    <div class="add_pic">
-      <i class="el-icon-plus add_icon"></i>
-      <input
-        type="file"
-        id="uploads"
-        class="up_input"
-        accept="image/png, image/jpeg, image/gif, image/jpg"
-        @change="uploadImg($event,1)"
-      />
+  <div class="img_crop">
+    <div v-for="(item, index) in fileArray" :key="'img' + index" class="list_img">
+      <div class="list_img_back">
+        <i class="el-icon-refresh-right img_replace"></i>
+        <input
+          type="file"
+          class="up_input"
+          accept="image/png, image/jpeg, image/gif, image/jpg"
+          @change="uploadImg($event,1)"
+        />
+      </div>
+      <el-image class="list_img_item" :src="item.url" :fit="fit"></el-image>
+    </div>
+    <div class="add_img" v-if="fileArray.length <= max - 1">
+      <div class="add_pic">
+        <i class="el-icon-plus add_icon"></i>
+        <input
+          type="file"
+          class="up_input"
+          accept="image/png, image/jpeg, image/gif, image/jpg"
+          @change="uploadImg($event,1)"
+        />
+      </div>
     </div>
     <!-- 弹出层-裁剪 -->
     <el-dialog
@@ -41,8 +54,8 @@
           </div>
         </div>
         <el-row class="footerBtn" align="center">
-          <el-button type="primary" size="small" round @click="cut('blob')">确认</el-button>
-          <el-button type="primary" size="small" round @click="handleClose">取消</el-button>
+          <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-row>
       </div>
     </el-dialog>
@@ -55,6 +68,22 @@ export default {
   components: {
     VueCropper
   },
+  props: {
+    fileArray: {
+      type: Array,
+      default: () => {
+        [];
+      }
+    },
+    fit: {
+      type: String,
+      default: ""
+    },
+    max: {
+      type: Number,
+      default: 1
+    }
+  },
   data() {
     return {
       dialogVisible: false,
@@ -186,6 +215,41 @@ export default {
   justify-content: center;
   margin-top: 15px;
 }
+.list_img {
+  width: 140px;
+  height: 140px;
+  border-radius: 5px;
+  overflow: hidden;
+  margin-left: 10px;
+  position: relative;
+  cursor: pointer;
+}
+.list_img_back {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  background-color: #000;
+  z-index: 1;
+  opacity: 0;
+}
+.list_img:hover .list_img_back {
+  opacity: 0.5;
+}
+.list_img_item {
+  width: 100%;
+  height: 100%;
+}
+.img_replace {
+  position: absolute;
+  top: calc((100% - 34px) / 2);
+  left: calc((100% - 34px) / 2);
+  color: #fff;
+  font-size: 34px;
+}
+.img_crop {
+  display: flex;
+  align-items: center;
+}
 </style>
 <style>
 .cropper_dia .el-dialog {

src/components/upload_file.vue

 <template>
   <div>
-    <div class="img_crop" v-if="type == 'cropper'">
-      <div v-for="(item, index) in fileArray" :key="'img' + index" class="list_img">
-        <div v-if="!readOnly" @click="deleteImg(item, index)" class="list_img_back">
-          <i class="el-icon-delete img_del"></i>
-        </div>
-        <el-image class="list_img_item" :src="item.url" :fit="fit"></el-image>
-      </div>
-      <cropper v-if="fileArray.length <= max - 1" @getNewUrl="getNewUrl"></cropper>
+    <div v-if="type == 'cropper'">
+      <cropper :max="max" :readOnly="readOnly" :fileArray="fileArray" :fit="fit"></cropper>
     </div>
     <div v-else>
       <el-upload
@@ -168,13 +162,9 @@ export default {
       this.$emit("getNewList", this.fileArray);
     },
     getNewUrl(val) {
-      this.fileArray.push({ name: val, url: val });
+      this.fileArray = { name: val, url: val };
       this.$emit("getNewList", this.fileArray);
       console.log(this.fileArray);
-    },
-    deleteImg(item, index) {
-      this.fileArray.splice(index, 1);
-      this.$emit("getNewList", this.fileArray);
     }
   }
 };
@@ -183,41 +173,4 @@ export default {
 .hide .el-upload--picture-card {
   display: none;
 }
-</style>
-<style scoped>
-.list_img {
-  width: 140px;
-  height: 140px;
-  border-radius: 5px;
-  overflow: hidden;
-  margin-left: 10px;
-  position: relative;
-  cursor: pointer;
-}
-.list_img_back {
-  position: absolute;
-  width: 100%;
-  height: 100%;
-  background-color: #000;
-  z-index: 1;
-  opacity: 0;
-}
-.list_img:hover .list_img_back {
-  opacity: 0.5;
-}
-.list_img_item {
-  width: 100%;
-  height: 100%;
-}
-.img_crop {
-  display: flex;
-  align-items: center;
-}
-.img_del {
-  position: absolute;
-  top: calc((100% - 24px) / 2);
-  left: calc((100% - 24px) / 2);
-  color: #fff;
-  font-size: 24px;
-}
 </style>
\ No newline at end of file

src/pages/example/example_upload.vue

@@ -12,7 +12,7 @@
     <h3>带有裁剪功能的图片上传</h3>
     <upload-file
       :multiple="false"
-      :max="4"
+      :max="1"
       type="cropper"
       :readOnly="false"
       :list="imgList"
@@ -48,7 +48,6 @@ export default {
     return {
       imgList: [],
       imgList1: [
-        "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg",
         "https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg"
       ]
     };

src/pages/user/user_info.vue

@@ -9,23 +9,84 @@
         <el-tab-pane label="个人信息详情" name="0"></el-tab-pane>
         <el-tab-pane label="业务系统详情" name="1"></el-tab-pane>
       </el-tabs>
+      <el-form ref="form" :model="form">
+        <el-form-item>
+          <p>账号：</p>
+          <el-input v-model="form.accountNo"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <p>密码：</p>
+          <el-input v-model="form.password"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <p>昵称：</p>
+          <el-input v-model="form.nickname"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <p>头像：</p>
+          <upload-file
+            :multiple="false"
+            :max="1"
+            type="cropper"
+            :readOnly="false"
+            :list="imgList"
+            @getNewList="getNewList"
+          ></upload-file>
+        </el-form-item>
+        <el-form-item>
+          <p>联系人：</p>
+          <el-input v-model="form.contactPerson"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <p>手机号：</p>
+          <el-input v-model="form.phone"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <p>邮箱：</p>
+          <el-input v-model="form.email"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <p>组织机构：</p>
+          <el-input v-model="form.organization"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <p>当前角色：</p>
+          <el-input v-model="form.role"></el-input>
+        </el-form-item>
+      </el-form>
     </block-radius>
   </div>
 </template>
 
 <script>
 import BlockRadius from "@/components/block-radius";
+import UploadFile from "@/components/upload_file";
 export default {
   components: {
-    BlockRadius
+    BlockRadius,
+    UploadFile
   },
   data: () => ({
-    activeName: "0"
+    activeName: "0",
+    form: {
+      accountNo: "",
+      password: "",
+      nickname: "",
+      contactPerson: "",
+      phone: "",
+      email: "",
+      organization: "",
+      role: ""
+    },
+    imgList: []
   }),
-  mounted() {},
+  mounted() {
+    this.imgList.push("https://fuss10.elemecdn.com/e/5d/4a731a90594a4af544c0c25941171jpeg.jpeg")
+  },
   methods: {
-    changeTab() {
-
+    changeTab() {},
+    getNewList(val) {
+      console.log(val);
     }
   }
 };

src/request/api.js

@@ -2,10 +2,12 @@ import workbench from '@/request/api/workbench';
 import serviceShop from '@/request/api/service_shop';
 import user from '@/request/api/user';
 import authority from '@/request/api/authority';
+import general from '@/request/api/general';
 
 export default {
     workbench,
     serviceShop,
     user,
-    authority
+    authority,
+    general
 }
\ No newline at end of file

src/request/api/general.js

+import axios from '@/request/http'; // 导入http中创建的axios实例
+import qs from 'qs'; // 根据需求是否导入qs模块
+
+const general = {
+    // general api
+
+}
+
+export default general;

src/request/http.js

@@ -15,6 +15,7 @@ const tip = msg => {
 /** 
  * 跳转登录页
  * 携带当前页面路由，以期在登录页面完成登录后返回当前页面
+ * 登录用 bg-login ，具体链接晚几天加
  */
 const toLogin = () => {
     router.replace({

src/router/index.js

@@ -16,11 +16,6 @@ export default new Router({
       path: "/",
       redirect: "/index",
     },
-    {
-      path: "/login", // 登录注册
-      name: "login",
-      component: () => import("@/pages/login"),
-    },
     {
       path: "/index",
       name: "index",