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

src/assets/css/list/list.less

+.store-con{
+    background: #FFFFFF;
+    border-radius: 4px;
+    border: 1px solid #E5EBF6;
+    padding:20px;
+    .search-btn{
+        cursor: pointer;
+        width: 76px;
+        height: 36px;
+        line-height: 36px;
+        background: #1969F9;
+        border-radius: 2px;
+        font-size: 14px;
+        color:#fff;
+        text-align: center;
+        &:hover{
+            background: #0050E0;
+        }
+    }
+    .btn-nav{
+        .update{
+            width: 66px;
+            height: 26px;
+            line-height: 26px;
+            text-align: center;
+            background: #FF870D;
+            border: 1px solid #FF870D;
+            border-radius: 2px;
+            color:#fff;
+            font-size: 14px;
+            cursor: pointer;
+            i{margin-left: 3px;}
+        }
+        .dcg{
+            width: 66px;
+            height: 26px;
+            border-radius: 2px;
+            text-align: center;
+            line-height: 26px;
+            border: 1px solid #1969F9;
+            color:#1969F9;
+            margin-left: 10px;
+            font-size: 14px;
+            &:hover{
+                background: #F1F8FF;
+                cursor: pointer;
+            }
+        }
+    }
+    
+}
\ No newline at end of file

src/assets/css/list/list.min.css

+.store-con{background:#FFFFFF;border-radius:4px;border:1px solid #E5EBF6;padding:20px}.store-con .search-btn{cursor:pointer;width:76px;height:36px;line-height:36px;background:#1969F9;border-radius:2px;font-size:14px;color:#fff;text-align:center}.store-con .search-btn:hover{background:#0050E0}.store-con .btn-nav .update{width:66px;height:26px;line-height:26px;text-align:center;background:#FF870D;border:1px solid #FF870D;border-radius:2px;color:#fff;font-size:14px;cursor:pointer}.store-con .btn-nav .update i{margin-left:3px}.store-con .btn-nav .dcg{width:66px;height:26px;border-radius:2px;text-align:center;line-height:26px;border:1px solid #1969F9;color:#1969F9;margin-left:10px;font-size:14px}.store-con .btn-nav .dcg:hover{background:#F1F8FF;cursor:pointer}
\ No newline at end of file

src/assets/css/public/common.less

@@ -14,6 +14,7 @@ html, body {
   font-style: normal;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  font-size: 14px;
 }
 
 body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, fieldset, legend, input, textarea, p, blockquote, th, td, hr, button, article, aside, details, figcaption, figure, footer, header, menu, nav, section {
@@ -169,22 +170,46 @@ body {
   background: #F1F4FA;
 }
 
-/**element-ui 样式重写**/
-.el-message--info {
-  min-width: auto !important;
-  border: 0px !important;
-  background: rgba(0, 0, 0, 0.4) !important;
-
-  .el-icon-info {
-    display: none;
+/**页面盒子**/ /**element-ui 样式重写**/
+.pagex {
+  padding: 20px;
+  .el-input__inner{
+    height: 38px;
+    border-radius: 2px;
+    border: 1px solid #BEC9DF;
+    font-size: 14px;
+    &:focus{
+      border: 1px solid #387FFF;
+    }
   }
-
-  .el-message__content {
-    color: #fff !important;
+  .el-form-item__label{
+    color:#666;
+  }
+  .el-range-editor.el-input__inner{width:257px}
+  .el-select .el-input.is-focus .el-input__inner,.el-range-editor.is-active, .el-range-editor.is-active:hover{
+    border-color: #387FFF;
+   }
+   .el-select{
+     width:100px;
+   }
+   .el-form--inline .el-form-item{
+     margin-right: 30px;
+   }
+  .el-message--info {
+    min-width: auto !important;
+    border: 0px !important;
+    background: rgba(0, 0, 0, 0.4) !important;
+  
+    .el-icon-info {
+      display: none;
+    }
+  
+    .el-message__content {
+      color: #fff !important;
+    }
   }
 }
 
-/**页面盒子**/
-.pagex {
-  padding: 20px;
-}
\ No newline at end of file
+
+
+

src/assets/css/public/common.min.css

-html {
-  -webkit-text-size-adjust: 100%;
-  -ms-text-size-adjust: 100%;
-}
-html * {
-  outline: 0;
-  -webkit-text-size-adjust: none !important;
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0) !important;
-}
-html,
-body {
-  font-family: PingFangSC-Regular, PingFang SC, 'Microsoft Yahei', sans-serif;
-  font-style: normal;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-body,
-div,
-dl,
-dt,
-dd,
-ul,
-ol,
-li,
-h1,
-h2,
-h3,
-h4,
-h5,
-h6,
-pre,
-code,
-form,
-fieldset,
-legend,
-input,
-textarea,
-p,
-blockquote,
-th,
-td,
-hr,
-button,
-article,
-aside,
-details,
-figcaption,
-figure,
-footer,
-header,
-menu,
-nav,
-section {
-  margin: 0;
-  padding: 0;
-}
-button,
-input,
-select,
-textarea {
-  font-size: 100%;
-  border: none;
-  -webkit-appearance: none;
-}
-input[type=button],
-input[type=file],
-input[type=submit] {
-  cursor: pointer;
-}
-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-}
-ol,
-ul,
-dl {
-  list-style: none;
-}
-h1,
-h2,
-h3,
-h4,
-h5,
-h6 {
-  font-size: 100%;
-  font-weight: 500;
-}
-em,
-b,
-i {
-  font-style: normal;
-}
-a {
-  text-decoration: none;
-}
-img {
-  border: none;
-}
-.clr {
-  *zoom: 1;
-  clear: both;
-}
-.clr:after {
-  content: ".";
-  clear: both;
-  height: 0;
-  visibility: hidden;
-  display: block;
-}
-.fl {
-  float: left;
-  _display: inline;
-}
-.fr {
-  float: right;
-  _display: inline;
-}
-.va-t {
-  vertical-align: top;
-}
-.va-m {
-  vertical-align: middle;
-}
-.va-b {
-  vertical-align: bottom;
-}
-.lineBlock {
-  display: inline-block;
-  *display: inline;
-  zoom: 1;
-  letter-spacing: normal;
-  word-spacing: normal;
-}
-.lbBox {
-  font-size: 0 !important;
-  *word-spacing: -1px !important;
-}
-.emptys {
-  margin-left: -1px;
-  width: 1px;
-  height: 100%;
-  font-size: 0;
-  vertical-align: middle;
-}
-.boxsiz {
-  -webkit-box-sizing: border-box;
-  box-sizing: border-box;
-}
-.column {
-  display: flex;
-  flex-direction: column;
-}
-.row {
-  display: flex;
-  flex-direction: row;
-}
-/* 两侧对齐 */
-.bothSide {
-  justify-content: space-between;
-}
-/* 平均分布 */
-.avarage {
-  justify-content: space-around;
-}
-/* 水平居中 */
-.rowCenter {
-  justify-content: center;
-}
-/* 垂直居中 */
-.verCenter {
-  align-items: center;
-}
-.boxFlex {
-  -webkit-box-flex: 1;
-  -moz-box-flex: 1;
-  -webkit-flex: 1;
-  -ms-flex: 1;
-  flex: 1;
-}
-html,
-body {
-  width: 100%;
-  height: 100%;
-  -webkit-overflow-scrolling: touch;
-}
-body {
-  overflow-x: hidden;
-  background: #F1F4FA;
-}
-/**element-ui 样式重写**/
-.el-message--info {
-  min-width: auto !important;
-  border: 0px !important;
-  background: rgba(0, 0, 0, 0.4) !important;
-}
-.el-message--info .el-icon-info {
-  display: none;
-}
-.el-message--info .el-message__content {
-  color: #fff !important;
-}
-/**页面盒子**/
-.pagex {
-  padding: 20px;
-}
-/*# sourceMappingURL=common.min.css.map */
\ No newline at end of file
+html{-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%}html *{outline:0;-webkit-text-size-adjust:none !important;-webkit-tap-highlight-color:rgba(0,0,0,0) !important}html,body{font-family:PingFangSC-Regular,PingFang SC,'Microsoft Yahei',sans-serif;font-style:normal;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-size:14px}body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td,hr,button,article,aside,details,figcaption,figure,footer,header,menu,nav,section{margin:0;padding:0}button,input,select,textarea{font-size:100%;border:none;-webkit-appearance:none}input[type=button],input[type=file],input[type=submit]{cursor:pointer}table{border-collapse:collapse;border-spacing:0}ol,ul,dl{list-style:none}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:500}em,b,i{font-style:normal}a{text-decoration:none}img{border:none}.clr{*zoom:1;clear:both}.clr:after{content:".";clear:both;height:0;visibility:hidden;display:block}.fl{float:left;_display:inline}.fr{float:right;_display:inline}.va-t{vertical-align:top}.va-m{vertical-align:middle}.va-b{vertical-align:bottom}.lineBlock{display:inline-block;*display:inline;zoom:1;letter-spacing:normal;word-spacing:normal}.lbBox{font-size:0 !important;*word-spacing:-1px !important}.emptys{margin-left:-1px;width:1px;height:100%;font-size:0;vertical-align:middle}.boxsiz{-webkit-box-sizing:border-box;box-sizing:border-box}.column{display:flex;flex-direction:column}.row{display:flex;flex-direction:row}.bothSide{justify-content:space-between}.avarage{justify-content:space-around}.rowCenter{justify-content:center}.verCenter{align-items:center}.boxFlex{-webkit-box-flex:1;-moz-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}html,body{width:100%;height:100%;-webkit-overflow-scrolling:touch}body{overflow-x:hidden;background:#F1F4FA}.pagex{padding:20px}.pagex .el-input__inner{height:38px;border-radius:2px;border:1px solid #BEC9DF;font-size:14px}.pagex .el-input__inner:focus{border:1px solid #387FFF}.pagex .el-form-item__label{color:#666}.pagex .el-range-editor.el-input__inner{width:257px}.pagex .el-select .el-input.is-focus .el-input__inner,.pagex .el-range-editor.is-active,.pagex .el-range-editor.is-active:hover{border-color:#387FFF}.pagex .el-select{width:100px}.pagex .el-form--inline .el-form-item{margin-right:30px}.pagex .el-message--info{min-width:auto !important;border:0px !important;background:rgba(0,0,0,0.4) !important}.pagex .el-message--info .el-icon-info{display:none}.pagex .el-message--info .el-message__content{color:#fff !important}
\ No newline at end of file

src/components/menu.vue

@@ -157,6 +157,13 @@
         if(tab_arr){
           this.tabs=JSON.parse(tab_arr);
         }
+        let app_ = document.getElementById('app');
+        this.collapse=false
+        if (this.collapse) {
+          app_.setAttribute('style', 'padding-left:62px');
+        } else {
+          app_.setAttribute('style', 'padding-left:226px');
+        }
       }
     },
     mounted() {
@@ -490,7 +497,9 @@
       overflow: auto;
       height: 100%;
       background: #fff;
-
+      .el-icon-arrow-down:before {
+        content: "\e790";
+       }
       .zankai {
         height: 26px;
         font-size: 18px;

src/views/Store/list.vue

 <template>
-    <div class="list pagex">
-        我是库存列表
-        <Menu/>
+  <div class="store pagex">
+    <div class="store-con">
+      <el-form :inline="true" :model="formInline" class="demo-form-inline">
+        <el-form-item label="型号">
+          <el-input v-model="formInline.goods_name" placeholder="请输入型号"></el-input>
+        </el-form-item>
+        <el-form-item label="品牌">
+          <el-select v-model="formInline.brand" placeholder="请选择">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-select v-model="formInline.status" placeholder="请选择">
+            <el-option label="区域一" value="shanghai"></el-option>
+            <el-option label="区域二" value="beijing"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="更新日期">
+          <el-date-picker v-model="formInline.date" type="daterange" range-separator="至" start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+
+        </el-form-item>
+        <el-form-item>
+          <div @click="onSubmit" class="search-btn">搜索</div>
+        </el-form-item>
+
+      </el-form>
+      <div class="btn-nav clr">
+        <div class="fl">
+          <el-dropdown @command="handleCommand">
+            <div class="update">修改&nbsp;|<i class="el-icon-arrow-down"></i></div>
+            <el-dropdown-menu slot="dropdown">
+              <el-dropdown-item command="1">修改库存</el-dropdown-item>
+              <el-dropdown-item command="2">修改交期</el-dropdown-item>
+            </el-dropdown-menu>
+          </el-dropdown>
+        </div>
+
+
+        <div class="fl dcg">导出</div>
+        <div class="fl dcg">上架</div>
+        <div class="fl dcg">下架</div>
+      </div>
     </div>
+    <Menu />
+  </div>
 
 </template>
 <script>
@@ -10,15 +54,33 @@
   import Menu from "@/components/menu.vue";
   import Tool from '../../tool'
   import {
+    Form,
+    FormItem,
+    Select,
+    Option,
+    Input,
+    DatePicker,
     Button,
-    Message 
+    Icon,
+    Dropdown,
+    DropdownMenu,
+    DropdownItem,
+    Message
   } from 'element-ui'
-  Vue.use(Button)
+  Vue.use(Button).use(Form).use(Select).use(Option).use(Input).use(FormItem).use(DatePicker).use(Icon).use(Dropdown).use(DropdownMenu).use(DropdownItem)
   export default {
     name: "list",
 
     data() {
-      return {};
+      return {
+        formInline: {
+          goods_name: '',
+          status: '',
+          brand: '',
+          date: ''
+        }
+
+      };
     },
     watch: {},
     created() {
@@ -27,11 +89,12 @@
     computed: {},
     methods: {
       ceshi() {
-          //this.$message.error('上传头像图片只能是 JPG 格式!');
         Message('这是一条消息提示');
         this.$http('get', "/getJoke1", {
-          page: 1, count: 2, type: 'video'
-        })
+            page: 1,
+            count: 2,
+            type: 'video'
+          })
           .then(res => {
             console.log(res)
           })
@@ -39,6 +102,12 @@
             console.log(err.message);
           })
 
+      },
+      handleCommand(command){
+          console.log(command)
+      },
+      onSubmit() {
+        console.log('submit!');
       }
     },
     components: {
@@ -47,5 +116,5 @@
   };
 </script>
 <style scoped>
-    /* @import "../../assets/css/index/index.min.css"; */
+  @import "../../assets/css/list/list.min.css";
 </style>
\ No newline at end of file