首页 发现 帮助
登录
louisian
/
contract
1
0
派生 0
文件 工单管理 0 合并请求 0 Wiki
浏览代码

修复显示bug

louyu 7 年之前
父节点
ccb8d4dbb7
当前提交
6a05667759
共有 9 个文件被更改，包括 29 次插入 和 29 次删除
合并视图 显示文件统计
  1. 8 8
      config/index.js
  2. 1 1
      index.html
  3. 3 3
      src/assets/css/my/rewrite.css
  4. 2 3
      src/components/contactBlock.vue
  5. 1 5
      src/views/addContact.vue
  6. 3 2
      src/views/contact.vue
  7. 4 1
      src/views/contract.vue
  8. 3 3
      src/views/drawSign.vue
  9. 4 3
      src/views/my.vue

+ 8 - 8
config/index.js
查看文件 

@@ -72,13 +72,13 @@ module.exports = {
 
     // `npm run build --report`
 
     // `npm run build --report`
 
     // Set to `true` or `false` to always turn it on or off
 
     // Set to `true` or `false` to always turn it on or off
 
     bundleAnalyzerReport: process.env.npm_config_report
 
     bundleAnalyzerReport: process.env.npm_config_report
 
-  }
 
-  // module: {
 
-  //       loaders: [{ test:   /\.css$/,
 
-  //               loader: "style-loader!css-loader!postcss-loader"}]
 
-  //   },
 
-  // postcss: function () {
 
-  //       return [autoprefixer];
 
-  //   }
 
+  },
 
+  module: {
 
+        loaders: [{ test:   /\.css$/,
 
+                loader: "style-loader!css-loader!postcss-loader"}]
 
+    },
 
+  postcss: function () {
 
+        return [autoprefixer];
 
+    }
 
 
 
 }
 
 }

+ 1 - 1
index.html
查看文件 

@@ -5,7 +5,7 @@
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=0,maximum-scale=1.0">
 
     <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=0,maximum-scale=1.0">
 
     <title>合同</title>
 
     <title>合同</title>
 
       <link rel="stylesheet" href="//at.alicdn.com/t/font_587947_4e7wxdmocu3anhfr.css">
 
       <link rel="stylesheet" href="//at.alicdn.com/t/font_587947_4e7wxdmocu3anhfr.css">
 
-    <script src="http://192.168.20.5:8081/target/target-script-min.js#anonymous"></script>
 
+    <!--<script src="http://192.168.20.5:8081/target/target-script-min.js#anonymous"></script>-->
 
     <script src="http://g.tbcdn.cn/mtb/lib-flexible/0.3.4/??flexible_css.js,flexible.js"></script>
 
     <script src="http://g.tbcdn.cn/mtb/lib-flexible/0.3.4/??flexible_css.js,flexible.js"></script>
 
   </head>
 
   </head>
 
   <body>
 
   <body>

+ 3 - 3
src/assets/css/my/rewrite.css
查看文件 

@@ -9,10 +9,10 @@
 
   border: 0;
 
   border: 0;
 
 }
 
 }
 
 .button-img-rewrite{
 
 .button-img-rewrite{
 
-  width: 2.4rem !important;
 
-  height: 2.8rem !important;
 
+  width: 3rem !important;
 
+  height: 3rem !important;
 
   /*border:1px solid #090;*/
 
   /*border:1px solid #090;*/
 
-  padding-top: 0.6rem;
 
+  padding-top: 0rem !important;
 
   /*padding: 0.6rem auto 0;*/
 
   /*padding: 0.6rem auto 0;*/
 
   /*margin: 0 auto;*/
 
   /*margin: 0 auto;*/
 
 }
 
 }

+ 2 - 3
src/components/contactBlock.vue
查看文件 

@@ -20,11 +20,10 @@
 
 
 
 <style scoped>
 
 <style scoped>
 
   .contact-container{
 
   .contact-container{
 
-    width: 100%;
 
+    width: 9.2rem;
 
     height: 1.7rem;
 
     height: 1.7rem;
 
     background-color: white;
 
     background-color: white;
 
-    box-shadow: 0rem 0rem 0.3rem 0.1rem
 
-    rgba(96, 192, 255, 0.35);
 
+    box-shadow: 5px 5px 3px 1px rgba(96, 192, 255, 0.35);
 
     border-radius: 0.1rem;
 
     border-radius: 0.1rem;
 
     margin-top: 0.4rem;
 
     margin-top: 0.4rem;

+ 1 - 5
src/views/addContact.vue
查看文件 

@@ -40,11 +40,7 @@
 
 </script>
 
 </script>
 
 
 
 <style scoped>
 
 <style scoped>
 
-  .title{
 
-    color:white;
 
-    font-size: 0.5rem;
 
-    margin-top: 0.6rem;
 
-  }
 
+
 
   .main .input-container{
 
   .main .input-container{
 
     background-color: white;
 
     background-color: white;
 
     border: 1px  white solid;
 
     border: 1px  white solid;

+ 3 - 2
src/views/contact.vue
查看文件 

@@ -75,7 +75,7 @@
 
 <style scoped>
 
 <style scoped>
 
   .inner-container{
 
   .inner-container{
 
     /*position: relative;*/
 
     /*position: relative;*/
 
-    margin: 0 0.4rem;
 
+
 
   }
 
   }
 
 
 
   .add-contact{
 
   .add-contact{
 
@@ -93,7 +93,8 @@
 
 
 
   }
 
   }
 
   .contact-list{
 
   .contact-list{
 
-    margin-top: 2.2rem;
 
+    margin: 2.2rem  0  0 0.4rem;
 
+    /*margin-top: 2.2rem;*/
 
     padding-bottom: 5px;
 
     padding-bottom: 5px;
 
   }
 
   }
 
 </style>
 
 </style>

+ 4 - 1
src/views/contract.vue
查看文件 

@@ -69,7 +69,7 @@
 
     display: inline-block;
 
     display: inline-block;
 
     background: url('../../static/contract/search.png') 0 0 no-repeat ;
 
     background: url('../../static/contract/search.png') 0 0 no-repeat ;
 
     background-size: cover;
 
     background-size: cover;
 
-    top: 0.18rem;
 
+    top: 0.2rem;
 
     left: 0.4rem;
 
     left: 0.4rem;
 
     width: 0.625rem;
 
     width: 0.625rem;
 
     height: 0.625rem;
 
     height: 0.625rem;
 
@@ -85,6 +85,9 @@
 
     color: #fff;
 
     color: #fff;
 
 
 
   }
 
   }
 
+  .search-input::placeholder{
 
+    color: white;
 
+  }
 
  .navbar{
 
  .navbar{
 
    margin: 0.4rem 0.4rem 0;
 
    margin: 0.4rem 0.4rem 0;
 
  }
 
  }

+ 3 - 3
src/views/drawSign.vue
查看文件 

@@ -167,13 +167,13 @@
 
       beginPath (e) {
 
       beginPath (e) {
 
         const canvas = document.querySelector('#canvas')
 
         const canvas = document.querySelector('#canvas')
 
         if (e.target !== canvas) {
 
         if (e.target !== canvas) {
 
-          console.log('beginPath')
 
+          // console.log('beginPath')
 
           this.context.beginPath()
 
           this.context.beginPath()
 
         }
 
         }
 
       },
 
       },
 
       // mouseup
 
       // mouseup
 
       canvasUp (e) {
 
       canvasUp (e) {
 
-        console.log('canvasUp')
 
+        // console.log('canvasUp')
 
         const preData = this.context.getImageData(0, 0, 600, 400)
 
         const preData = this.context.getImageData(0, 0, 600, 400)
 
         if (!this.nextDrawAry.length) {
 
         if (!this.nextDrawAry.length) {
 
           // 当前绘图表面进栈
 
           // 当前绘图表面进栈
 
@@ -188,7 +188,7 @@
 
       },
 
       },
 
       // mousedown
 
       // mousedown
 
       canvasDown (e) {
 
       canvasDown (e) {
 
-        console.log('canvasDown')
 
+        // console.log('canvasDown')
 
         this.canvasMoveUse = true
 
         this.canvasMoveUse = true
 
         // client是基于整个页面的坐标
 
         // client是基于整个页面的坐标
 
         // offset是cavas距离顶部以及左边的距离
 
         // offset是cavas距离顶部以及左边的距离

+ 4 - 3
src/views/my.vue
查看文件 

@@ -1,7 +1,7 @@
 
 <template>
 
 <template>
 
   <div class="main">
 
   <div class="main">
 
       <div class="user-info">
 
       <div class="user-info">
 
-            <img class="profile" :src="user.userImg||require('../../static/contact/myavt.png')">
 
+          <img class="profile" :src="user.userImg||require('../../static/contact/myavt.png')">
 
         <div class="user-info-container">
 
         <div class="user-info-container">
 
           <div class="user-info-inner-container">
 
           <div class="user-info-inner-container">
 
             <p class="username">{{user.username}}</p>
 
             <p class="username">{{user.username}}</p>
 
@@ -95,10 +95,11 @@
 
     height: 100%;
 
     height: 100%;
 
     display: flex;
 
     display: flex;
 
     flex-direction: column;
 
     flex-direction: column;
 
-    padding: 1px 0.4rem;
 
+    padding: 0.5rem 0.4rem;
 
     justify-content: space-around;
 
     justify-content: space-around;
 
   }
 
   }
 
   .user-info{
 
   .user-info{
 
+    position: relative;
 
     /*margin-top: 1rem;*/
 
     /*margin-top: 1rem;*/
 
   }
 
   }
 
   .profile{
 
   .profile{
 
@@ -108,7 +109,7 @@
 
     height: 1.9rem;
 
     height: 1.9rem;
 
     border-radius: 1.9rem;
 
     border-radius: 1.9rem;
 
     border: 2px white solid;
 
     border: 2px white solid;
 
-    top:0.5rem;
 
+    top:0rem;
 
     left: 50%;
 
     left: 50%;
 
     transform: translateX(-50%);
 
     transform: translateX(-50%);
 
   }
 
   }