部分样式调整

ybf_admin/src/pages/in/contact/components/history.vue

 <template>
   <div class="main">
-    <div class="title ">
-        <span>同步成员历史</span>
-        <el-button class="button buttondark" size="small" @click="handleCancel">返回</el-button>
+    <div class="titles" style="height:40px;">
+      <span>同步成员历史</span>
+      <el-button class="button buttondark" size="small" @click="handleCancel">返回</el-button>
     </div>
     <div class="lists">
       <el-table
@@ -13,6 +13,7 @@
         tooltip-effect="dark"
         style="width: 100%"
         :header-cell-style="setListsHeadStyle"
+        height="calc(100vh - 300px)"
       >
         <el-table-column label="序号" width="70" type="index" align="center"></el-table-column>
         <el-table-column
@@ -58,6 +59,54 @@ export default {
     return {
       list: {
         main: [
+          {
+            id: "1001",
+            taskName: "2019年男装销售任务",
+            taskType: "拉新",
+            bar: "男装",
+            taskContent: "任务内容任务内容任务内容...",
+            sendDate: "2019/02/08"
+          },
+          {
+            id: "1002",
+            taskName: "2019年男装销售任务",
+            taskType: "拉新",
+            bar: "男装",
+            taskContent: "任务内容任务内容任务内容...",
+            sendDate: "2019/02/08"
+          },
+          {
+            id: "1003",
+            taskName: "2019年男装销售任务",
+            taskType: "拉新",
+            bar: "男装",
+            taskContent: "任务内容任务内容任务内容...",
+            sendDate: "2019/02/08"
+          },
+          {
+            id: "1001",
+            taskName: "2019年男装销售任务",
+            taskType: "拉新",
+            bar: "男装",
+            taskContent: "任务内容任务内容任务内容...",
+            sendDate: "2019/02/08"
+          },
+          {
+            id: "1002",
+            taskName: "2019年男装销售任务",
+            taskType: "拉新",
+            bar: "男装",
+            taskContent: "任务内容任务内容任务内容...",
+            sendDate: "2019/02/08"
+          },
+          {
+            id: "1003",
+            taskName: "2019年男装销售任务",
+            taskType: "拉新",
+            bar: "男装",
+            taskContent: "任务内容任务内容任务内容...",
+            sendDate: "2019/02/08"
+          },
           {
             id: "1001",
             taskName: "2019年男装销售任务",
@@ -141,6 +190,14 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.titles {
+  height: 48px;
+  padding: 12px 0;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom: 1px solid #f8f8f8;
+}
 .btn {
   font-size:14px;
   font-weight:bold;
@@ -156,6 +213,7 @@ export default {
   display: flex;
   flex-direction: column;
   justify-content: flex-start;
+  box-shadow: 0px 2px 4px 0px #ddd;
 }
 .searchs {
   height: 40px;
@@ -177,8 +235,7 @@ export default {
   border: 1px solid #4e59c7;
   box-sizing: border-box;
 }
-.buttonlight:hover {
-}
+
 .buttondark {
   width: 88px;
   height: 32px;
@@ -212,13 +269,5 @@ export default {
   justify-content: flex-end;
   align-items: center;
 }
-.title {
-  height: 48px;
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  color: rgba(56, 56, 56, 1);
-  border-bottom: 1px solid #f8f8f8;
-  margin-bottom: 16px;
-}
+
 </style>

ybf_admin/src/pages/in/contact/counter.vue

@@ -242,6 +242,7 @@ export default {
   flex-direction: column;
   justify-content: flex-start;
   width: 100%;
+  box-shadow: 0px 2px 4px 0px #ddd;
 }
 .searchs {
   height: 40px;
@@ -263,11 +264,10 @@ export default {
   border: 1px solid #4e59c7;
   box-sizing: border-box;
 }
-.buttonlight:hover {
-}
+
 .btn {
   font-size:14px;
-  font-weight:bold;
+  // font-weight:bold;
   color:rgba(102,102,102,1);
 }
 .buttondark {
@@ -293,7 +293,8 @@ export default {
   margin-top: 20px;
 }
 .listButtonRed {
-  color: red;
+  color: #D0021B;
+  // font-weight: bold;
 }
 .pages {
   height: 40px;

ybf_admin/src/pages/in/contact/index.vue

 <template>
   <d2-container class="ct">
     <div class="test">
-      <div class="tac">
+      <!-- <div class="tac"> -->
         <el-menu
           :default-active="index"
           class="el-menu-vertical-demo"
@@ -21,7 +21,7 @@
             <span slot="title">门店管理</span>
           </el-menu-item>
         </el-menu>
-      </div>
+      <!-- </div> -->
     </div>
     <div class="content">
       <mail v-if="index == '1' && isHistoryShow == false"  @isShow="contorlHistoryShow"></mail>
@@ -56,6 +56,7 @@ export default {
     },
     handleMenuChange (index) {
       this.index = index
+      this.isHistoryShow = false
     },
     contorlHistoryShow (val) {
       this.isHistoryShow = val
@@ -89,17 +90,21 @@ export default {
   justify-content: space-between;
   padding: 0 !important;
 }
-.tac {
+/* .tac {
   width: 99%;
   height: 100%;
   box-shadow:0px 2px 4px 0px rgba(221,221,221,1);
-}
-.tac >>> .el-menu {
+} */
+.test >>> .el-menu {
   border-right: none;
 }
-.tac >>> .el-menu-item.is-active{
+.test >>> .el-menu-item.is-active{
   border-left: 2px solid rgba(78,89,199,1);
 }
+.test >>> .el-menu {
+  width: 100%;
+  box-shadow: 0px 2px 4px 0px #ddd;
+} 
 .content {
   flex: 6;
   padding: 16px;

ybf_admin/src/pages/in/contact/mail.vue

@@ -24,18 +24,6 @@
             >
               <span class="custom-tree-node" slot-scope="{ node, data }">
                 <span>{{ node.label }}</span>
-                <!-- <span style="margin-left:20px;">
-                  <d2-icon-svg
-                    name="edit"
-                    class="icon"
-                    @click="() => edit(data)"
-                  />
-                  <d2-icon-svg
-                    name="delete"
-                    class="icon"
-                    @click="() => remove(node, data)"
-                  />
-                </span> -->
                 <span style="margin-left:30px;" class="btn">
                   <el-button type="text" size="mini" @click="() => edit(data)">
                     <i class="el-icon-edit"></i>
@@ -438,7 +426,6 @@ export default {
 .end {
   display: flex;
   align-items: center;
-  border: 1px solid rgba(78, 89, 199, 1);
   width: 100%;
   box-sizing: border-box;
   bottom: 0;
@@ -509,12 +496,9 @@ export default {
   background-color: #fff;
   height: 100%;
   box-sizing: border-box;
+  box-shadow: 0px 2px 4px 0px #ddd;
 }
 
-.right-c,
-.left-c {
-  width: 100%;
-}
 .number {
   font-size: 14px;
   margin-top: 2px;

ybf_admin/src/pages/in/contact/store.vue

@@ -263,6 +263,7 @@ export default {
   flex-direction: column;
   justify-content: flex-start;
   width: 100%;
+  box-shadow: 0px 2px 4px 0px #ddd;
 }
 
 .buttons {
@@ -298,7 +299,8 @@ export default {
   margin-top: 20px;
 }
 .listButtonRed {
-  color: red;
+  color: #D0021B;
+  font-weight: bold;
 }
 .pages {
   height: 40px;

ybf_wx/src/views/active/createActive.vue

@@ -137,7 +137,7 @@
       <van-field
         class="area"
         v-model="message"
-        rows="2"
+        rows="3"
         autosize
         type="textarea"
         placeholder="请输入描述"
@@ -225,8 +225,9 @@ export default {
   background: rgba(248, 248, 248, 1);
   min-height: 100%;
 }
-.van-field__body textarea {
-  background: rgba(248, 248, 248, 1);
+.area >>> .van-field__control {
+  background: #f8f8f8;
+  padding: 12px;
 }
 .des {
   padding: 6px 16px;

ybf_wx/src/views/counter/counterMaintain.vue

@@ -197,7 +197,8 @@ export default {
   width: 100%;
   height: 200px;
   position: relative;
-  background:url(../../../public/img/cswiper.png) repeat;
+  background:url(../../../public/img/cswiper.png)no-repeat;
+  background-size: cover;
 }
 .mb {
   position: absolute;