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

template/admin/src/components/main/components/side-menu/side-menu.vue

@@ -31,7 +31,7 @@
           :open-names="openMenus"
           :accordion="accordion"
           :theme="theme"
-          width="140px"
+          width="145px"
           @on-open-change="openChildNameData"
           @on-select="handleChildSelect"
         >

template/admin/src/components/main/components/tags-nav/tags-nav.less

@@ -12,8 +12,9 @@
 }
 .tags-nav {
   position: relative;
-  border-top: 1px solid #f0f0f0;
-  border-bottom: 1px solid #f0f0f0;
+  margin-top: 4px;
+  // border-top: 1px solid #f0f0f0;
+  // border-bottom: 1px solid #f0f0f0;
   .no-select;
   .size;
   .close-con {
@@ -30,7 +31,7 @@
     position: absolute;
     top: 0px;
     height: 100%;
-    background: #fff;
+    // background: #fff;
     padding-top: 3px;
     z-index: 10;
     button {
@@ -42,17 +43,17 @@
       left: 0px;
     }
     &.right-btn {
-      right: 32px;
-      border-right: 1px solid #f0f0f0;
+      right: 0px;
+      // border-right: 1px solid #f0f0f0;
     }
   }
   .scroll-outer {
     position: absolute;
     left: 28px;
-    right: 61px;
+    right: 21px;
     top: 0;
     bottom: 0;
-    box-shadow: 0px 0 3px 2px rgba(100, 100, 100, 0.1) inset;
+    // box-shadow: 0px 0 3px 2px rgba(100, 100, 100, 0.1) inset;
     .scroll-body {
       height: ~'calc(100% - 1px)';
       display: inline-block;

template/admin/src/components/main/components/tags-nav/tags-nav.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="tags-nav">
-    <div class="close-con">
+    <!-- <div class="close-con">
       <Dropdown transfer @on-click="handleTagsOption" style="margin-top: 7px">
         <Button size="small" type="text">
           <Icon :size="18" type="ios-close-circle-outline" />
@@ -10,7 +10,7 @@
           <DropdownItem name="close-others">关闭其他</DropdownItem>
         </DropdownMenu>
       </Dropdown>
-    </div>
+    </div> -->
     <ul v-show="visible" :style="{ left: contextMenuLeft + 'px', top: contextMenuTop + 'px' }" class="contextmenu">
       <li v-for="(item, key) of menuList" @click="handleTagsOption(key)" :key="key">{{ item }}</li>
     </ul>

template/admin/src/components/main/main.vue

@@ -2,8 +2,8 @@
   <Layout style="height: 100%" class="main">
     <Header class="header-con" v-if="!headMenuNoShow">
       <div class="logo-con">
-        <img v-show="!collapsed" :src="maxLogo" key="max-logo" />
-        <img v-show="collapsed" :src="minLogo" key="min-logo" />
+        <img :src="maxLogo" key="max-logo" />
+        <!-- <img v-show="collapsed" :src="minLogo" key="min-logo" /> -->
       </div>
       <header-bar :collapsed="collapsed" @on-coll-change="handleCollapsedChange">
         <user :message-unread-count="unreadCount" :user-avatar="userAvatar" />

template/admin/src/pages/setting/setSystem/index.vue

@@ -223,5 +223,6 @@ export default {
 
 .fromBox {
   min-height: 600px;
+  margin-top 0px !important ;
 }
 </style>

template/uni-app/pages/admin/statistics/index.vue

@@ -25,7 +25,7 @@
 		</div>
 		<div class="wrapper">
 			<div class="title">
-				{{ time == 'date'?'':title }}{{ this.where.type == 1 ? $t(`营业额（元）`) : $t(`订单量（份）`) }}
+				{{ time == 'date'?'':title }}{{ where.type == 1 ? $t(`营业额（元）`) : $t(`订单量（份）`) }}
 			</div>
 			<div class="money">{{ time_price }}</div>
 			<div class="increase acea-row row-between-wrapper">