Merge branch 'master' of http://119.23.72.7/xiaokang/cloudSystem

src/assets/css/font/demo_index.html

@@ -55,6 +55,12 @@
           <ul class="icon_lists dib-box">
           
             <li class="dib">
+              <span class="icon iconfont">&#xe659;</span>
+                <div class="name">upload</div>
+                <div class="code-name">&amp;#xe659;</div>
+              </li>
+          
+            <li class="dib">
               <span class="icon iconfont">&#xe658;</span>
                 <div class="name">pdf</div>
                 <div class="code-name">&amp;#xe658;</div>
@@ -186,9 +192,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1621221730032') format('woff2'),
-       url('iconfont.woff?t=1621221730032') format('woff'),
-       url('iconfont.ttf?t=1621221730032') format('truetype');
+  src: url('iconfont.woff2?t=1621239665352') format('woff2'),
+       url('iconfont.woff?t=1621239665352') format('woff'),
+       url('iconfont.ttf?t=1621239665352') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -215,6 +221,15 @@
         <ul class="icon_lists dib-box">
           
           <li class="dib">
+            <span class="icon iconfont iconupload"></span>
+            <div class="name">
+              upload
+            </div>
+            <div class="code-name">.iconupload
+            </div>
+          </li>
+          
+          <li class="dib">
             <span class="icon iconfont iconpdf"></span>
             <div class="name">
               pdf
@@ -414,6 +429,14 @@
           
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#iconupload"></use>
+                </svg>
+                <div class="name">upload</div>
+                <div class="code-name">#iconupload</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#iconpdf"></use>
                 </svg>
                 <div class="name">pdf</div>

src/assets/css/font/iconfont.css

 @font-face {
   font-family: "iconfont"; /* Project id 2537242 */
-  src: url('iconfont.woff2?t=1621221730032') format('woff2'),
-       url('iconfont.woff?t=1621221730032') format('woff'),
-       url('iconfont.ttf?t=1621221730032') format('truetype');
+  src: url('iconfont.woff2?t=1621239665352') format('woff2'),
+       url('iconfont.woff?t=1621239665352') format('woff'),
+       url('iconfont.ttf?t=1621239665352') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.iconupload:before {
+  content: "\e659";
+}
+
 .iconpdf:before {
   content: "\e658";
 }

src/assets/css/font/iconfont.json

@@ -6,6 +6,13 @@
   "description": "猎芯云芯系统前端",
   "glyphs": [
     {
+      "icon_id": "21649397",
+      "name": "upload",
+      "font_class": "upload",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
       "icon_id": "21637635",
       "name": "pdf",
       "font_class": "pdf",

src/assets/css/info/message.less

+.messagexk{
+
+    .message-box{
+        background: #fff;
+        padding:20px;
+        height:calc(100vh - 136px);
+        .h3{
+            font-size: 16px;
+            color:#333;
+            font-weight: bold;
+            position: relative;
+            &::before{
+                content:"";
+                width:3px;
+                height:100%;
+                background:#1969F9;
+                position: absolute;
+                left:-20px;
+                top:0px;
+            }
+        }
+        .el-form{
+            float:left;
+            .el-form-item__label{color:#333;}
+            .el-input{width:280px;color:#333;}
+            padding-top: 35px;
+            .el-input.is-disabled .el-input__inner{
+                background: #F1F4FA;
+                border:1px solid #F1F4FA;
+                color:#333;
+            }
+            .submits{
+                margin-top: 26px;
+                cursor: pointer;
+                width: 76px;
+                height: 37px;
+                line-height: 37px;
+                background: #1969F9;
+                border-radius: 2px;
+                font-size: 14px;
+                color:#fff;
+                text-align: center;
+                &:hover{
+                    background: #0050E0;
+                }
+            }
+        }
+    }
+
+}
\ No newline at end of file

src/assets/css/info/message.min.css

+.messagexk .message-box{background:#fff;padding:20px;height:calc(100vh - 136px)}.messagexk .message-box .h3{font-size:16px;color:#333;font-weight:bold;position:relative}.messagexk .message-box .h3::before{content:"";width:3px;height:100%;background:#1969F9;position:absolute;left:-20px;top:0px}.messagexk .message-box .el-form{float:left;padding-top:35px}.messagexk .message-box .el-form .el-form-item__label{color:#333}.messagexk .message-box .el-form .el-input{width:280px;color:#333}.messagexk .message-box .el-form .el-input.is-disabled .el-input__inner{background:#F1F4FA;border:1px solid #F1F4FA;color:#333}.messagexk .message-box .el-form .submits{margin-top:26px;cursor:pointer;width:76px;height:37px;line-height:37px;background:#1969F9;border-radius:2px;font-size:14px;color:#fff;text-align:center}.messagexk .message-box .el-form .submits:hover{background:#0050E0}
\ No newline at end of file

src/views/Info/message.vue

 <template>
-    <div class="message-page">
-        <Menu/>
-        <el-form :model="ruleForm"  ref="ruleForm" label-width="100px">
+    <div class="messagexk pagex">
+        <div class="message-box">
+           <div class="h3">基本信息</div>
+             <el-form :model="form"  label-width="90px">
+              <el-form-item label="公司名称">
+                <el-input v-model="form.keyword" placeholder="" disabled></el-input>
+              </el-form-item>
+              <el-form-item label="联系人">
+                <el-input v-model="form.keyword"></el-input>
+              </el-form-item>
+              <el-form-item label="联系人电话">
+                <el-input v-model="form.keyword" disabled></el-input>
+              </el-form-item>
+              <el-form-item label="邮箱">
+                <el-input v-model="form.keyword"></el-input>
+              </el-form-item>
+              <el-form-item >
+                 <div class="submits">确认</div>
+              </el-form-item>
 
       </el-form>
         </div>
+        <Menu/>
+    </div>
 </template>
 <script>
   import Vue from 'vue';
   import Menu from "@/components/menu.vue";
 
   import {
-    Button,
+    Form,
+    FormItem,
+    Input,
     Message 
   } from 'element-ui'
-  Vue.use(Button)
+  Vue.use(Form).use(FormItem).use(Input)
   export default {
     name: "message",
 
     data() {
-      return {};
+      return {
+        form:{
+          keyword:""
+        }
+      };
     },
     watch: {},
     created() {
@@ -35,5 +59,5 @@
   };
 </script>
 <style scoped>
-    /* @import "../../assets/css/index/index.min.css"; */
+    @import "../../assets/css/info/message.min.css";
 </style>
\ No newline at end of file