Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

template/admin/src/pages/finance/userExtract/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <Card :bordered="false" dis-hover class="ivu-mb-16">
       <Form
         ref="formValidate"
         :model="formValidate"

template/admin/src/pages/order/invoice/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <Card :bordered="false" dis-hover class="ivu-mt">
+    <Card :bordered="false" dis-hover class="ivu-mb-16">
       <div class="table_box">
         <Form
           ref="orderData"
@@ -68,6 +68,8 @@
           </Row>
         </Form>
       </div>
+    </card>
+    <Card :bordered="false" dis-hover>
       <Tabs v-model="currentTab" @on-click="onClickTab" v-if="tablists" class="mb20">
         <TabPane :label="'全部发票（' + tablists.all + '）'" name=" " />
         <TabPane :label="'待开发票（' + tablists.noOpened + '）'" name="1" />
@@ -349,9 +351,9 @@ export default {
         ],
       },
       grid: {
-        xl: 8,
-        lg: 8,
-        md: 8,
+        xl: 12,
+        lg: 16,
+        md: 24,
         sm: 24,
         xs: 24,
       },

template/admin/src/pages/setting/storeService/speechcraft.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <Row class="ivu-mt box-wrapper">
-      <Col span="3" class="left-wrapper">
+      <Col v-bind="grid1" class="left-wrapper">
         <Menu :theme="theme3" :active-name="sortName" width="auto">
           <MenuGroup>
             <MenuItem
@@ -28,7 +28,7 @@
           </MenuGroup>
         </Menu>
       </Col>
-      <Col span="21" ref="rightBox">
+      <Col v-bind="grid2" ref="rightBox">
         <Card :bordered="false" dis-hover>
           <Row type="flex" class="mb20">
             <Col span="24">
@@ -109,6 +109,20 @@ export default {
   },
   data() {
     return {
+      grid1: {
+        xl: 4,
+        lg: 4,
+        md: 6,
+        sm: 8,
+        xs: 0,
+      },
+      grid2: {
+        xl: 20,
+        lg: 20,
+        md: 18,
+        sm: 16,
+        xs: 24,
+      },
       isChat: true,
       formValidate3: {
         page: 1,
@@ -600,7 +614,7 @@ export default {
 .left-wrapper
     height 904px
     background #fff
-    border-right 1px solid #dcdee2
+    border-right 1px solid #f2f2f2
 .menu-item
     z-index 50
     position: relative;

template/admin/src/pages/user/label/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <Row class="ivu-mt box-wrapper">
-      <Col span="3" class="left-wrapper">
+      <Col v-bind="grid1"  class="left-wrapper">
         <Menu :theme="theme3" :active-name="sortName" width="auto">
           <MenuGroup>
             <MenuItem
@@ -32,10 +32,10 @@
           </MenuGroup>
         </Menu>
       </Col>
-      <Col span="21" ref="rightBox">
+      <Col v-bind="grid2" ref="rightBox">
         <Card :bordered="false" dis-hover>
           <Row type="flex">
-            <Col v-bind="grid">
+            <Col>
               <Button v-auth="['admin-user-label_add']" type="primary" icon="md-add" @click="add">添加标签</Button>
               <Button
                 v-auth="['admin-user-label_add']"
@@ -84,31 +84,40 @@ export default {
   name: 'user_label',
   data() {
     return {
-      grid: {
-        xl: 7,
-        lg: 7,
-        md: 12,
-        sm: 24,
+      grid1: {
+        xl: 4,
+        lg: 4,
+        md: 6,
+        sm: 8,
+        xs: 0,
+      },
+      grid2: {
+        xl: 20,
+        lg: 20,
+        md: 18,
+        sm: 16,
         xs: 24,
       },
+
       loading: false,
       columns1: [
         {
           title: 'ID',
           key: 'id',
           align: 'center',
-          width: 120,
+          width: 80,
+        },
+        {
+          title: '标签名称',
+          key: 'label_name',
+          align: 'left',
         },
         {
           title: '分类名称',
           key: 'cate_name',
           align: 'center',
         },
-        {
-          title: '标签名称',
-          key: 'label_name',
-          align: 'center',
-        },
+
         {
           title: '操作',
           slot: 'action',

template/admin/src/pages/user/list/index.vue

@@ -14,7 +14,7 @@
         <Row :gutter="16">
           <Col span="18">
             <Col span="24">
-              <Col v-bind="grid">
+              <Col span="20">
                 <FormItem label="用户搜索：" label-for="nickname">
                   <Input v-model="userFrom.nickname" placeholder="请输入用户" element-id="nickname" clearable>
                     <Select v-model="field_key" slot="prepend" style="width: 80px">
@@ -536,7 +536,7 @@ export default {
       contentWidth: '98%',
       grid: {
         xl: 8,
-        lg: 8,
+        lg: 12,
         md: 12,
         sm: 24,
         xs: 24,

template/admin/src/styles/style.css

@@ -204,9 +204,12 @@ body {
 }
 
 /*表格公共样式*/
-.ivu-table-header table {
-  border-top: 1px #e8eaec dashed !important;
+.ivu-table-header .ivu-table-cell{
+  color: #999;
+  font-size: 13px;
+  padding: 10px 5px !important;
 }
+
 .ivu-form .ivu-form-item-label,
 .ivu-radio-group-button .ivu-radio-wrapper,
 .ivu-table {
@@ -214,7 +217,7 @@ body {
 }
 
 .ivu-table-cell {
-  padding: 6px 18px !important;
+  padding: 10px 5px !important;
 }
 
 .ivu-table th {
@@ -438,11 +441,9 @@ body {
 /*作用于运费模板组件*/
 .Modals .ivu-table .ivu-table-header table {
   border-top: 0 !important;
+  box-shadow: -2px 2px 6px -2px rgba(0, 0, 0, 0.1) !important;
 }
 
-.ivu-table-cell {
-  padding: 10px 5px !important;
-}
 .ivu-table-cell-with-expand {
   line-height: 31px !important;
 }
@@ -460,8 +461,9 @@ body {
   text-align: center !important;
 }
 .ivu-table-fixed-right {
-  box-shadow: -2px 0 6px -2px rgba(0, 0, 0, 0.1) !important;
-  top: 1px !important;
+  margin-top: 1px;
+  color: #999;
+  box-shadow: -2px 2px 6px -2px rgba(0, 0, 0, 0.1) !important;
 }
 .ivu-table-fixed-right tr:last-child(1) td {
   border-bottom: 0;