Merge branch 'master' of http://101.37.147.115:3000/bocaigroup/daotian_pc

src/components/userinfo/usercenter/components/dataStatistics.vue

@@ -379,17 +379,24 @@ export default {
           // scopedSlots: { customRender: 'userName' },
           customRender: (text, row, index) => {
             let sex
-            switch (row.sex) {
-              case 0:
-                sex = '男女不限'
-              case 1:
-                sex = '男'
-              case 2:
-                sex = '女'
+			if(row.sex == '1'){
+				sex ='男'
+			}else if(row.sex == '2'){
+				sex = '女'
+			}else{
+				sex = "未知"
+			}
+            // switch (row.sex) {
+            //   case 0:
+            //     sex = '男女不限'
+            //   case 1:
+            //     sex = '男'
+            //   case 2:
+            //     sex = '女'
 
-              default:
-                break
-            }
+            //   default:
+            //     break
+            // }
             return text.trim() + '/' + (sex ? sex + '/' : '') + (row.age ? row.age + '/' : '') + (row.nation ? row.nation : '')
           },
         },
@@ -809,6 +816,10 @@ export default {
 </script>
 
 <style scoped lang="less">
+	table {
+	    font-size: 14px;
+	}
+	
 .dataStatisticsContainer {
   height: 100%;
 
@@ -855,7 +866,22 @@ export default {
   }
 }
 
+/deep/ .ant-table-thead > tr > th, /deep/ .ant-table-tbody > tr > td {
+   padding: 12px 8px !important;
+	}
+
+
+/deep/ .ant-table.ant-table-fixed-header .ant-table-scroll .ant-table-header{
+		overflow: auto !important;
+		margin-bottom: -20px !important;
+		    padding-bottom: 20px !important;
+	}
+
 /deep/ .ant-table {
+	table{
+		font-size: 14px;
+		
+	}
   .ant-table-pagination.ant-pagination {
     float: unset;
     text-align: center;
@@ -867,9 +893,9 @@ export default {
       }
     }
     .ant-table-row-cell-break-word {
-      text-align: right;
+      // text-align: right;
       font-weight: bold;
-      padding-right: 0;
+      // padding-right: 0;
     }
   }
   .ant-table-body::-webkit-scrollbar {
@@ -880,7 +906,7 @@ export default {
   }
 }
 .navTitle {
-  margin: 16px 0;
+  // margin: 16px 0;
 }
 .content {
   position: relative;
@@ -901,7 +927,7 @@ export default {
   // padding-right: 10px;
   > div {
     text-align: center;
-    font-weight: bold;
+    // font-weight: bold;
     width: 210px;
     &:last-child {
       // margin-left: 420px;
@@ -942,14 +968,14 @@ export default {
   /deep/.ant-table-body {
     .ant-table-thead {
       .ant-table-row-cell-break-word {
-        padding: 16px 8px 16px 16px;
+        padding:12px 8px;
         // text-align: center;
       }
     }
     .ant-table-tbody {
       > tr > td {
         font-size: 14px;
-        padding: 16px 8px 16px 16px;
+        padding:12px 8px;
         // height: 20px;
         // display: inline-block;
         // padding: 0px 16px;
@@ -965,7 +991,11 @@ export default {
     }
   }
 }
+
+
 .dataTable {
+
+	
   /deep/.ant-table-tbody {
     > tr > td {
       font-size: 14px;
@@ -981,8 +1011,8 @@ export default {
     }
     .ant-table-row-cell-break-word {
       // height: 54px;
-      text-align: right;
-      padding-right: 26px !important;
+      // text-align: right;
+      // padding-right: 26px !important;
       overflow: hidden;
       .ant-table-row-spaced {
         display: none !important;

src/views/merchantBack.vue

@@ -4,11 +4,11 @@
       <div class="topmenu" style="display: flex;justify-content: space-between;background-color: #fff; box-shadow: 1px 1px 2px #e8e8e8; position: fixed; top: 0; z-index: 100">
         <div style>
           <div class="logo" style="box-shadow: none; min-width: 160px; max-width: 160px; margin-left: -8px">
-            <div @click.stop="clearOpenkey" style="cursor: pointer; border-right: 1px solid transparent">
+            <div @click.stop="clearOpenkey" style="cursor: pointer; border-right: 1px solid #eee;">
               <router-link to="/main">
-                <img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/adminLogo.svg" alt />
+                <img src="https://matripe-cms.oss-cn-beijing.aliyuncs.com/1shoudan/daotianLogo.svg" alt />
                 <!-- <router-link :to="{name:'home'}"><img src="http://matripeweb.oss-cn-hangzhou.aliyuncs.com/antd/adminLogo.svg" alt=""> -->
-                <h1>稻田商家控制台</h1>
+                <h1>商家控制台</h1>
                 <!-- style="position: relative;top: -1px;" -->
               </router-link>
             </div>