From f953c7a2c1ed82d4ab0a8d7a4b659c90cc4300eb Mon Sep 17 00:00:00 2001
From: wangxia <779219182@qq.com>
Date: Wed, 1 Nov 2023 16:53:17 +0800
Subject: [PATCH] 1

---
 src/App.vue                                        |  2 +-
 src/assets/one.svg                                 | 52 ++++++++++------------
 src/assets/three.svg                               | 42 ++++++++---------
 src/assets/two.svg                                 | 42 ++++++++---------
 src/components/Login/updatepsw.vue                 | 16 +++----
 src/components/merchantManagement/memberInfo.vue   | 12 +++--
 src/components/screen/largeScreen.vue              | 51 ++++++++++++++-------
 .../usercenter/components/dataStatistics.vue       | 36 ++++++++++++---
 src/style/index.less                               |  3 ++
 src/views/main.vue                                 |  2 +-
 src/views/merchantBack.vue                         |  4 +-
 11 files changed, 148 insertions(+), 114 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index dbc036b..b65ac75 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -8,7 +8,7 @@
 <script>
 import zhCn from "ant-design-vue/lib/locale-provider/zh_CN";
 let sp = document.createElement('script')
-sp.src = '//at.alicdn.com/t/c/font_3135652_5t152xx5xxp.js'
+sp.src = '//at.alicdn.com/t/c/font_3135652_34tw0b78y6p.js'
 document.body.appendChild(sp)
 export default {
   provide() {
diff --git a/src/assets/one.svg b/src/assets/one.svg
index beecd15..5450c9a 100644
--- a/src/assets/one.svg
+++ b/src/assets/one.svg
@@ -1,51 +1,45 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="33px" height="40px" viewBox="0 0 33 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="56px" height="69px" viewBox="0 0 56 69" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>第一名</title>
     <defs>
-        <polygon id="path-1" points="0.000148845517 0.00893073102 32.1684931 0.00893073102 32.1684931 32.1803263 0.000148845517 32.1803263"></polygon>
+        <polygon id="path-1" points="0.000254545455 0.0152727273 55.0123636 0.0152727273 55.0123636 55.0326 0.000254545455 55.0326"></polygon>
         <linearGradient x1="50%" y1="0%" x2="50%" y2="100%" id="linearGradient-3">
             <stop stop-color="#FFE751" offset="0%"></stop>
             <stop stop-color="#FFCA28" offset="100%"></stop>
         </linearGradient>
-        <path d="M16.0845443,26.8200272 C22.0115727,26.8200272 26.8103522,22.0197592 26.8103522,16.0942192 C26.8103522,10.1686792 22.0115727,5.3669228 16.0845443,5.3669228 C10.1590042,5.3669228 5.3587363,10.1686792 5.3587363,16.0942192 C5.3587363,22.0197592 10.1590042,26.8200272 16.0845443,26.8200272 Z" id="path-4"></path>
-        <filter x="-4.7%" y="-4.7%" width="109.3%" height="118.6%" filterUnits="objectBoundingBox" id="filter-5">
+        <path d="M27.5066909,45.8657818 C37.6426909,45.8657818 45.8492364,37.6566909 45.8492364,27.5232364 C45.8492364,17.3897818 37.6426909,9.17814545 27.5066909,9.17814545 C17.3732364,9.17814545 9.16414545,17.3897818 9.16414545,27.5232364 C9.16414545,37.6566909 17.3732364,45.8657818 27.5066909,45.8657818 Z" id="path-4"></path>
+        <filter x="-2.7%" y="-2.7%" width="105.5%" height="110.9%" filterUnits="objectBoundingBox" id="filter-5">
             <feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
             <feColorMatrix values="0 0 0 0 1   0 0 0 0 0.966195517   0 0 0 0 0.917751736  0 0 0 0.5 0" type="matrix" in="shadowOffsetOuter1"></feColorMatrix>
         </filter>
-        <filter x="-7.0%" y="-7.0%" width="114.0%" height="123.3%" filterUnits="objectBoundingBox" id="filter-6">
+        <filter x="-4.1%" y="-4.1%" width="108.2%" height="113.6%" filterUnits="objectBoundingBox" id="filter-6">
             <feOffset dx="0" dy="3" in="SourceAlpha" result="shadowOffsetInner1"></feOffset>
             <feComposite in="shadowOffsetInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
             <feColorMatrix values="0 0 0 0 0.990593112   0 0 0 0 0.621195753   0 0 0 0 0.033281646  0 0 0 1 0" type="matrix" in="shadowInnerInner1"></feColorMatrix>
         </filter>
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="数据大屏备份-6" transform="translate(-120.000000, -247.000000)">
-            <g id="编组-8备份" transform="translate(40.000000, 95.000000)">
-                <g id="编组-19" transform="translate(80.000000, 87.000000)">
-                    <g id="编组-14" transform="translate(0.000000, 60.000000)">
-                        <g id="第一名" transform="translate(0.000000, 5.000000)">
-                            <g id="Page-1">
-                                <polygon id="Fill-1" fill="#FF8E33" points="5.35843861 23.5108936 5.35843861 40 16.0842466 35.4661656 26.811543 40 26.811543 23.5108936"></polygon>
-                                <g id="Group-7">
-                                    <g id="Group-4">
-                                        <mask id="mask-2" fill="white">
-                                            <use xlink:href="#path-1"></use>
-                                        </mask>
-                                        <g id="Clip-3"></g>
-                                        <path d="M0.000148845517,16.0942192 C0.000148845517,21.8381677 3.06487804,27.1504642 8.04227213,30.0246711 C13.0196662,32.8988781 19.1506131,32.8988781 24.1265187,30.0246711 C29.1039128,27.1504642 32.1701304,21.8426331 32.1701304,16.0942192 C32.1701304,7.2096303 24.9689843,0.00848419447 16.0843954,0.00848419447 C7.1998065,0.00848419447 0.000148845517,7.2096303 0.000148845517,16.0942192" id="Fill-2" fill="url(#linearGradient-3)" mask="url(#mask-2)"></path>
-                                    </g>
-                                    <g id="Fill-5">
-                                        <use fill="black" fill-opacity="1" filter="url(#filter-5)" xlink:href="#path-4"></use>
-                                        <use fill="#FFB806" fill-rule="evenodd" xlink:href="#path-4"></use>
-                                        <use fill="black" fill-opacity="1" filter="url(#filter-6)" xlink:href="#path-4"></use>
-                                    </g>
-                                </g>
+        <g id="数据大屏（2023-1028）" transform="translate(-106.000000, -216.000000)">
+            <g id="编组" transform="translate(80.000000, 142.000000)">
+                <g id="第一名" transform="translate(26.000000, 74.000000)">
+                    <g id="Page-1">
+                        <polygon id="Fill-1" fill="#FF8E33" points="9.16363636 40.2067273 9.16363636 68.4052727 27.5061818 60.6518182 45.8512727 68.4052727 45.8512727 40.2067273"></polygon>
+                        <g id="Group-7">
+                            <g id="Group-4">
+                                <mask id="mask-2" fill="white">
+                                    <use xlink:href="#path-1"></use>
+                                </mask>
+                                <g id="Clip-3"></g>
+                                <path d="M0.000254545455,27.5232364 C0.000254545455,37.3461455 5.24134545,46.4308727 13.7533455,51.3461455 C22.2653455,56.2614182 32.7500727,56.2614182 41.2595273,51.3461455 C49.7715273,46.4308727 55.0151636,37.3537818 55.0151636,27.5232364 C55.0151636,12.3294182 42.7002545,0.0145090909 27.5064364,0.0145090909 C12.3126182,0.0145090909 0.000254545455,12.3294182 0.000254545455,27.5232364" id="Fill-2" fill="url(#linearGradient-3)" mask="url(#mask-2)"></path>
+                            </g>
+                            <g id="Fill-5">
+                                <use fill="black" fill-opacity="1" filter="url(#filter-5)" xlink:href="#path-4"></use>
+                                <use fill="#FFB806" fill-rule="evenodd" xlink:href="#path-4"></use>
+                                <use fill="black" fill-opacity="1" filter="url(#filter-6)" xlink:href="#path-4"></use>
                             </g>
-                            <text id="1" font-family="PingFangSC-Semibold, PingFang SC" font-size="20" font-weight="500" line-spacing="30" fill="#FFFFFF">
-                                <tspan x="11.6051873" y="22.0203918">1</tspan>
-                            </text>
                         </g>
                     </g>
+                    <polygon id="1" fill="#FFFFFF" fill-rule="nonzero" points="28.9264 42.4369818 32.6064 12.3969818 28.6064 12.3969818 20.6064 16.4769818 20.0064 21.2369818 27.2464 17.7169818 24.2064 42.4369818"></polygon>
                 </g>
             </g>
         </g>
diff --git a/src/assets/three.svg b/src/assets/three.svg
index b16124b..61e8fcd 100644
--- a/src/assets/three.svg
+++ b/src/assets/three.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="33px" height="40px" viewBox="0 0 33 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="56px" height="69px" viewBox="0 0 56 69" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>第三名</title>
     <defs>
         <linearGradient x1="50%" y1="2.12214616%" x2="50%" y2="120.340088%" id="linearGradient-1">
@@ -10,42 +10,36 @@
             <stop stop-color="#FFD9CC" offset="0%"></stop>
             <stop stop-color="#F3B296" offset="100%"></stop>
         </linearGradient>
-        <path d="M5.3587363,16.0942192 C5.3587363,22.0197592 10.1590042,26.8200272 16.0845443,26.8200272 C22.0115727,26.8200272 26.8103522,22.0197592 26.8103522,16.0942192 C26.8103522,10.1686792 22.0115727,5.3669228 16.0845443,5.3669228 C10.1590042,5.3669228 5.3587363,10.1686792 5.3587363,16.0942192" id="path-3"></path>
-        <filter x="-11.7%" y="-7.0%" width="123.3%" height="128.0%" filterUnits="objectBoundingBox" id="filter-4">
+        <path d="M9.16389091,27.5087273 C9.16389091,37.6421818 17.3729818,45.8512727 27.5064364,45.8512727 C37.6424364,45.8512727 45.8489818,37.6421818 45.8489818,27.5087273 C45.8489818,17.3752727 37.6424364,9.16363636 27.5064364,9.16363636 C17.3729818,9.16363636 9.16389091,17.3752727 9.16389091,27.5087273" id="path-3"></path>
+        <filter x="-6.8%" y="-4.1%" width="113.6%" height="116.4%" filterUnits="objectBoundingBox" id="filter-4">
             <feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
             <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
             <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
         </filter>
-        <filter x="-11.7%" y="-7.0%" width="123.3%" height="128.0%" filterUnits="objectBoundingBox" id="filter-5">
+        <filter x="-6.8%" y="-4.1%" width="113.6%" height="116.4%" filterUnits="objectBoundingBox" id="filter-5">
             <feOffset dx="1" dy="3" in="SourceAlpha" result="shadowOffsetInner1"></feOffset>
             <feComposite in="shadowOffsetInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
             <feColorMatrix values="0 0 0 0 0.879490859   0 0 0 0 0.602851007   0 0 0 0 0.44724109  0 0 0 1 0" type="matrix" in="shadowInnerInner1"></feColorMatrix>
         </filter>
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="数据大屏备份-6" transform="translate(-120.000000, -370.000000)">
-            <g id="编组-8备份" transform="translate(40.000000, 95.000000)">
-                <g id="编组-19" transform="translate(80.000000, 87.000000)">
-                    <g id="编组-16" transform="translate(0.000000, 184.000000)">
-                        <g id="第三名" transform="translate(0.000000, 4.000000)">
-                            <g id="Page-1">
-                                <polygon id="Fill-1" fill="url(#linearGradient-1)" points="5.35843861 23.5108936 5.35843861 40 16.0842466 35.4661656 26.811543 40 26.811543 23.5108936"></polygon>
-                                <g id="Group-7">
-                                    <g id="Group-4" fill="url(#linearGradient-2)">
-                                        <path d="M8.04227213,30.0246711 C13.0196662,32.8988781 19.1506131,32.8988781 24.1265187,30.0246711 C29.1039128,27.1504642 32.1701304,21.8426331 32.1701304,16.0942192 C32.1701304,7.2096303 24.9689843,0.00848419447 16.0843954,0.00848419447 C7.1998065,0.00848419447 0.000148845517,7.2096303 0.000148845517,16.0942192 C0.000148845517,21.8381677 3.06487804,27.1504642 8.04227213,30.0246711 Z" id="Fill-2"></path>
-                                    </g>
-                                    <g id="Fill-5">
-                                        <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-3"></use>
-                                        <use fill="#EFAE89" fill-rule="evenodd" xlink:href="#path-3"></use>
-                                        <use fill="black" fill-opacity="1" filter="url(#filter-5)" xlink:href="#path-3"></use>
-                                    </g>
-                                </g>
+        <g id="数据大屏（2023-1028）" transform="translate(-106.000000, -394.000000)">
+            <g id="编组" transform="translate(80.000000, 142.000000)">
+                <g id="第三名" transform="translate(26.000000, 252.000000)">
+                    <g id="Page-1">
+                        <polygon id="Fill-1" fill="url(#linearGradient-1)" points="9.16338182 40.1922182 9.16338182 68.3907636 27.5059273 60.6373091 45.8510182 68.3907636 45.8510182 40.1922182"></polygon>
+                        <g id="Group-7">
+                            <g id="Group-4" fill="url(#linearGradient-2)">
+                                <path d="M13.7530909,51.3316364 C22.2650909,56.2469091 32.7498182,56.2469091 41.2592727,51.3316364 C49.7712727,46.4163636 55.0149091,37.3392727 55.0149091,27.5087273 C55.0149091,12.3149091 42.7,0 27.5061818,0 C12.3123636,0 0,12.3149091 0,27.5087273 C0,37.3316364 5.24109091,46.4163636 13.7530909,51.3316364 Z" id="Fill-2"></path>
+                            </g>
+                            <g id="Fill-5">
+                                <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-3"></use>
+                                <use fill="#EFAE89" fill-rule="evenodd" xlink:href="#path-3"></use>
+                                <use fill="black" fill-opacity="1" filter="url(#filter-5)" xlink:href="#path-3"></use>
                             </g>
-                            <text id="3" fill-rule="nonzero" font-family="PingFangSC-Semibold, PingFang SC" font-size="20" font-weight="500" line-spacing="30" fill="#FFFFFF">
-                                <tspan x="10.2953467" y="21.9156046">3</tspan>
-                            </text>
                         </g>
                     </g>
+                    <path d="M25.9197455,42.6432727 C29.4930788,42.6432727 32.2197455,42.0366061 34.0997455,40.8232727 C35.9797455,39.6099394 37.0930788,37.6966061 37.4397455,35.0832727 L37.4397455,35.0832727 L37.5597455,33.9632727 C37.6130788,33.3232727 37.6397455,32.8832727 37.6397455,32.6432727 C37.6397455,29.8166061 36.4530788,27.9632727 34.0797455,27.0832727 C36.5330788,26.0699394 37.8930788,24.2966061 38.1597455,21.7632727 L38.1597455,21.7632727 L38.2797455,20.4032727 C38.4930788,17.7899394 37.8464121,15.8366061 36.3397455,14.5432727 C34.8330788,13.2499394 32.2930788,12.6032727 28.7197455,12.6032727 C26.1864121,12.6032727 23.8130788,12.6699394 21.5997455,12.8032727 L21.5997455,12.8032727 L21.0397455,17.2832727 C23.3597455,17.0966061 25.7597455,17.0032727 28.2397455,17.0032727 C30.2664121,17.0032727 31.6730788,17.2632727 32.4597455,17.7832727 C33.2464121,18.3032727 33.6397455,19.0432727 33.6397455,20.0032727 L33.6397455,20.0032727 L33.5997455,20.4832727 L33.4797455,21.7632727 C33.2930788,22.9632727 32.7864121,23.8232727 31.9597455,24.3432727 C31.1330788,24.8632727 29.9597455,25.1366061 28.4397455,25.1632727 L28.4397455,25.1632727 L23.0797455,25.1632727 L22.5597455,29.4432727 L27.9997455,29.4432727 C29.7064121,29.4699394 30.9464121,29.7499394 31.7197455,30.2832727 C32.4930788,30.8166061 32.8797455,31.6832727 32.8797455,32.8832727 C32.8797455,33.1766061 32.8664121,33.4032727 32.8397455,33.5632727 L32.8397455,33.5632727 L32.7197455,34.6832727 C32.5330788,35.9366061 31.9730788,36.8432727 31.0397455,37.4032727 C30.1064121,37.9632727 28.5730788,38.2432727 26.4397455,38.2432727 C25.0264121,38.2432727 23.8464121,38.2099394 22.8997455,38.1432727 C21.9530788,38.0766061 20.6530788,37.9499394 18.9997455,37.7632727 L18.9997455,37.7632727 L18.4397455,42.1632727 C21.2397455,42.4832727 23.7330788,42.6432727 25.9197455,42.6432727 Z" id="3" fill="#FFFFFF" fill-rule="nonzero"></path>
                 </g>
             </g>
         </g>
diff --git a/src/assets/two.svg b/src/assets/two.svg
index 33ee3a4..9afd0f6 100644
--- a/src/assets/two.svg
+++ b/src/assets/two.svg
@@ -1,47 +1,41 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="33px" height="40px" viewBox="0 0 33 40" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="56px" height="69px" viewBox="0 0 56 69" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <title>第二名</title>
     <defs>
         <linearGradient x1="50%" y1="2.35729769%" x2="50%" y2="97.6268967%" id="linearGradient-1">
             <stop stop-color="#F1F3FA" offset="0%"></stop>
             <stop stop-color="#D4D8E2" offset="100%"></stop>
         </linearGradient>
-        <path d="M5.3587363,16.0942192 C5.3587363,22.0197592 10.1590042,26.8200272 16.0845443,26.8200272 C22.0115727,26.8200272 26.8103522,22.0197592 26.8103522,16.0942192 C26.8103522,10.1686792 22.0115727,5.3669228 16.0845443,5.3669228 C10.1590042,5.3669228 5.3587363,10.1686792 5.3587363,16.0942192" id="path-2"></path>
-        <filter x="-11.7%" y="-7.0%" width="123.3%" height="128.0%" filterUnits="objectBoundingBox" id="filter-3">
+        <path d="M9.16414545,27.5232364 C9.16414545,37.6566909 17.3732364,45.8657818 27.5066909,45.8657818 C37.6426909,45.8657818 45.8492364,37.6566909 45.8492364,27.5232364 C45.8492364,17.3897818 37.6426909,9.17814545 27.5066909,9.17814545 C17.3732364,9.17814545 9.16414545,17.3897818 9.16414545,27.5232364" id="path-2"></path>
+        <filter x="-6.8%" y="-4.1%" width="113.6%" height="116.4%" filterUnits="objectBoundingBox" id="filter-3">
             <feOffset dx="0" dy="2" in="SourceAlpha" result="shadowOffsetOuter1"></feOffset>
             <feGaussianBlur stdDeviation="0.5" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
             <feColorMatrix values="0 0 0 0 1   0 0 0 0 1   0 0 0 0 1  0 0 0 0.5 0" type="matrix" in="shadowBlurOuter1"></feColorMatrix>
         </filter>
-        <filter x="-11.7%" y="-7.0%" width="123.3%" height="128.0%" filterUnits="objectBoundingBox" id="filter-4">
+        <filter x="-6.8%" y="-4.1%" width="113.6%" height="116.4%" filterUnits="objectBoundingBox" id="filter-4">
             <feOffset dx="1" dy="3" in="SourceAlpha" result="shadowOffsetInner1"></feOffset>
             <feComposite in="shadowOffsetInner1" in2="SourceAlpha" operator="arithmetic" k2="-1" k3="1" result="shadowInnerInner1"></feComposite>
             <feColorMatrix values="0 0 0 0 0.485065901   0 0 0 0 0.485065901   0 0 0 0 0.485065901  0 0 0 0.332569067 0" type="matrix" in="shadowInnerInner1"></feColorMatrix>
         </filter>
     </defs>
     <g id="页面-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="数据大屏备份-6" transform="translate(-120.000000, -308.000000)">
-            <g id="编组-8备份" transform="translate(40.000000, 95.000000)">
-                <g id="编组-19" transform="translate(80.000000, 87.000000)">
-                    <g id="编组-15" transform="translate(0.000000, 122.000000)">
-                        <g id="第二名" transform="translate(0.000000, 4.000000)">
-                            <g id="Page-1">
-                                <polygon id="Fill-1" fill="#00A0FF" points="5.35843861 23.5108936 5.35843861 40 16.0842466 35.4661656 26.811543 40 26.811543 23.5108936"></polygon>
-                                <g id="Group-7">
-                                    <g id="Group-4" fill="url(#linearGradient-1)">
-                                        <path d="M0.000148845517,16.0942192 C0.000148845517,21.8381677 3.06487804,27.1504642 8.04227213,30.0246711 C13.0196662,32.8988781 19.1506131,32.8988781 24.1265187,30.0246711 C29.1039128,27.1504642 32.1701304,21.8426331 32.1701304,16.0942192 C32.1701304,7.2096303 24.9689843,0.00848419447 16.0843954,0.00848419447 C7.1998065,0.00848419447 0.000148845517,7.2096303 0.000148845517,16.0942192" id="Fill-2"></path>
-                                    </g>
-                                    <g id="Fill-5">
-                                        <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
-                                        <use fill="#C0C5CF" fill-rule="evenodd" xlink:href="#path-2"></use>
-                                        <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-2"></use>
-                                    </g>
-                                </g>
+        <g id="数据大屏（2023-1028）" transform="translate(-106.000000, -305.000000)">
+            <g id="编组" transform="translate(80.000000, 142.000000)">
+                <g id="第二名" transform="translate(26.000000, 163.000000)">
+                    <g id="Page-1">
+                        <polygon id="Fill-1" fill="#00A0FF" points="9.16363636 40.2067273 9.16363636 68.4052727 27.5061818 60.6518182 45.8512727 68.4052727 45.8512727 40.2067273"></polygon>
+                        <g id="Group-7">
+                            <g id="Group-4" fill="url(#linearGradient-1)">
+                                <path d="M0.000254545455,27.5232364 C0.000254545455,37.3461455 5.24134545,46.4308727 13.7533455,51.3461455 C22.2653455,56.2614182 32.7500727,56.2614182 41.2595273,51.3461455 C49.7715273,46.4308727 55.0151636,37.3537818 55.0151636,27.5232364 C55.0151636,12.3294182 42.7002545,0.0145090909 27.5064364,0.0145090909 C12.3126182,0.0145090909 0.000254545455,12.3294182 0.000254545455,27.5232364" id="Fill-2"></path>
+                            </g>
+                            <g id="Fill-5">
+                                <use fill="black" fill-opacity="1" filter="url(#filter-3)" xlink:href="#path-2"></use>
+                                <use fill="#C0C5CF" fill-rule="evenodd" xlink:href="#path-2"></use>
+                                <use fill="black" fill-opacity="1" filter="url(#filter-4)" xlink:href="#path-2"></use>
                             </g>
-                            <text id="2" fill-rule="nonzero" font-family="PingFangSC-Semibold, PingFang SC" font-size="20" font-weight="500" line-spacing="30" fill="#FFFFFF">
-                                <tspan x="10.2953467" y="21.9156046">2</tspan>
-                            </text>
                         </g>
                     </g>
+                    <path d="M35.8864,41.2577818 L36.4064,36.8577818 L23.1664,36.8577818 C23.3530667,35.4977818 23.7530667,34.3511152 24.3664,33.4177818 C24.9797333,32.4844485 25.7330667,31.7244485 26.6264,31.1377818 C27.5197333,30.5511152 28.6464,29.9511152 30.0064,29.3377818 C31.8997333,28.4844485 33.4197333,27.6644485 34.5664,26.8777818 C35.7130667,26.0911152 36.6330667,25.1377818 37.3264,24.0177818 C38.0197333,22.8977818 38.4730667,21.4977818 38.6864,19.8177818 C38.7130667,19.6044485 38.7264,19.2844485 38.7264,18.8577818 C38.7264,16.6444485 37.9730667,14.8177818 36.4664,13.3777818 C34.9597333,11.9377818 32.6597333,11.2177818 29.5664,11.2177818 C27.2997333,11.2177818 24.8864,11.3777818 22.3264,11.6977818 L22.3264,11.6977818 L21.7664,16.2177818 C24.0597333,15.8177818 26.4864,15.6177818 29.0464,15.6177818 C30.8330667,15.6177818 32.1330667,15.9911152 32.9464,16.7377818 C33.7597333,17.4844485 34.0997333,18.5377818 33.9664,19.8977818 C33.8330667,21.0444485 33.5130667,21.9644485 33.0064,22.6577818 C32.4997333,23.3511152 31.8797333,23.9044485 31.1464,24.3177818 C30.4130667,24.7311152 29.2730667,25.2844485 27.7264,25.9777818 C25.4330667,26.9644485 23.4397333,28.3444485 21.7464,30.1177818 C20.0530667,31.8911152 18.9930667,34.1377818 18.5664,36.8577818 L18.5664,36.8577818 L17.9664,41.2577818 L35.8864,41.2577818 Z" id="2" fill="#FFFFFF" fill-rule="nonzero"></path>
                 </g>
             </g>
         </g>
diff --git a/src/components/Login/updatepsw.vue b/src/components/Login/updatepsw.vue
index 58c9e03..40e6996 100644
--- a/src/components/Login/updatepsw.vue
+++ b/src/components/Login/updatepsw.vue
@@ -150,12 +150,12 @@ export default {
     },
     phonehandleSubmit(e) {
       e.preventDefault()
-      this.btnLoading = true
       let params = new FormData()
       this.form1.validateFields(async (err, values) => {
         console.log(err)
         console.log(values)
         if (!err) {
+          this.btnLoading = true
           params.code = values.code
           params.newpassword = values.newpassword
           params.password = values.password
@@ -164,25 +164,23 @@ export default {
           try {
             const { data } = await updatePswApi(params)
             console.log(data)
-            if (data.status !== 200) {
+            if (data.status == 200) {
+              this.$message.success('密码修改成功')
+              this.$router.push('/login')
+            } else {
               this.$message.warning(data.msg)
-              return
             }
 
             // localStorage.setItem("LOGIN_DATA", JSON.stringify(data.data));
             setTimeout(() => {
-              this.$message.success('密码修改成功')
               this.btnLoading = false
-              this.$router.push('/login')
-              this.reload()
+
+              // this.reload()
             }, 2000)
           } catch (err) {
             this.btnLoading = false
             console.log(err)
           }
-        } else {
-          this.btnLoading = false
-          console.log(err)
         }
       })
     },
diff --git a/src/components/merchantManagement/memberInfo.vue b/src/components/merchantManagement/memberInfo.vue
index dd2b21f..c897db1 100644
--- a/src/components/merchantManagement/memberInfo.vue
+++ b/src/components/merchantManagement/memberInfo.vue
@@ -87,7 +87,7 @@
         </div>
       </div>
       <div class="rightContainer mb24">
-        <div class="fsa pb14 bb1 mb24">
+        <div class="fsa pb14 bb1 mb24" :style="{minWidth:858 + 'px !important'}">
           <div class="f16 fw500">{{ selectedKeys[0] == 'all' ? `团队成员（${totalNum}人）`:selectedKeys[0] + `（${subGroupNum}人）` }}</div>
           <!-- <button class="addGroup" @click="addGroupShow = true">添加部门</button> -->
           <a-button class="addmemeber f14" @click="showDetail('add')">
@@ -98,7 +98,8 @@
         <!-- :expanded-row-keys.sync="expandedRowKeys" -->
         <!-- v-if="modalTitle == ''" -->
         <div class>
-          <a-table :columns="columns" :scroll="{x:currWidth,scrollToFirstRowOnChange:false}" :data-source="memberList" :pagination="false" @change="onChange" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle'}" :rowKey="(record) => record.id">
+          <!-- :scroll="{x:currWidth,scrollToFirstRowOnChange:false}"  -->
+          <a-table :columns="columns" :data-source="memberList" :pagination="false" :style="{minWidth:858 + 'px !important'}" @change="onChange" :loading="{spinning: isspinning,tip: '加载中',wrapperClassName: 'spinstyle'}" :rowKey="(record) => record.id">
             <!-- <a slot="index" slot-scope="record, text, index">{{ index + 1 }}</a> -->
             <span slot="nickName" slot-scope="text, record">{{ record.aliasName || record.userName }}</span>
             <div slot="inAgencyStatistics" slot-scope="text, record">
@@ -113,7 +114,7 @@
               <a v-if="loginUserInfo.agencyRoleId != 7263" @click="deleteMemeber(record)">删除</a>
             </div>
           </a-table>
-          <div class="pagecontainer mt16">
+          <div class="pagecontainer mt16 mb16">
             <a-pagination :current="pagination.pageNum" :defaultPageSize="20" :show-total="total => `共${total}条`" :total="pagination.total" @change="onChange" @showSizeChange="onPageChange" size="small" show-size-changer show-quick-jumper />
           </div>
         </div>
@@ -1131,7 +1132,7 @@ export default {
   }
 }
 .contentbody {
-  // overflow: hidden;
+  overflow: hidden;
   display: flex;
   justify-content: space-between;
   padding-left: 0;
@@ -1175,8 +1176,11 @@ export default {
   .rightContainer {
     flex: 1;
     padding-left: 16px;
+    overflow-x: auto;
+    overflow-y: hidden;
     // overflow: hidden;
     position: relative;
+    min-width: 274px ;
     // min-width: 1020px;
     &::before {
       position: absolute;
diff --git a/src/components/screen/largeScreen.vue b/src/components/screen/largeScreen.vue
index afccb0f..e64b51c 100644
--- a/src/components/screen/largeScreen.vue
+++ b/src/components/screen/largeScreen.vue
@@ -28,7 +28,7 @@
                     <div class="tth" style="margin-top:12px !important;position:relative;">
                         <div style="display:table-row;font-weight:500">
                             <div class="ttd tc1 fwb" style="" @click="test">日排名</div>
-                            <div class="ttd tc2 fwb" style="">姓名</div>
+                            <div class="ttd tc2 fwb nameTitle" style="">姓名</div>
                             <!-- <div class="ttd tc7" style=""></div> -->
                             <!-- @click="ani" -->
                             <!-- <div class="ttd">已处理</div> -->
@@ -44,8 +44,8 @@
                         </div>
                     </div>
                     <a-carousel effect="scrollx" ref="welcome" autoplay dotsClass="dotClass" :autoplaySpeed="autoSpeed" :speed="1000" :pauseOnHover="false" v-trigger>
-                        <div v-for="(item1, index1) in array" v-bind:key="index1">
-                            <div v-for="(item, index) in item1" v-bind:key="index" class="">
+                        <div v-for="(item1, index1) in array" v-bind:key="index1" class="swiperPage">
+                            <div v-for="(item, index) in item1" v-bind:key="index" class="swiperItem">
                                 <div class="tth" style="margin-top:48px;position:relative;margin-top: 0 !important;">
                                     <div style="display:table-row;font-weight:500" >
                                         <div class="ttd tc1 tac" style="">
@@ -57,19 +57,22 @@
                                         </div>
                                         <div class="ttd tc2 name" :class="showaliasName_curr == item.aliasName ?'numeAni' : ''" style="">
                                          
-                                         <span style="display:inline-block;height:100%;line-height:70px;vertical-align:middle">
-                                          <img v-if="item.imgSrc" :src="item.imgSrc" alt="">
-                                           <i v-else class="iconfont icon-morentouxiang f56" style="color:transparent"></i>
-                                         </span>
+                                         <!-- <span style="display:inline-block;height:100%;line-height:40px;">
+                                          <img v-if="item.imgSrc" :src="item.imgSrc" alt="" style="vertical-align:middle">
+                                           <i v-else class="iconfont icon-morentouxiang f40" style="color:transparent"></i>
+                                         </span> -->
                                             {{item.aliasName}}
-                                            <span >
-                                              <svg class="svg_icon" style="display:inline-block;line-height:70px;vertical-align:middle" v-if="index == 1" aria-hidden="true">
+                                            <!-- <span class="dn">
+                                              <svg class="svg_icon" style="display:inline-block;line-height:60px;vertical-align:middle" v-if="index == 1" aria-hidden="true">
                                                 <use xlink:href="#icon-zhou1"></use>
                                               </svg>
-                                              <svg class="svg_icon" style="display:inline-block;line-height:70px;vertical-align:middle" v-if="index == 4" aria-hidden="true">
+                                              <svg class="svg_icon" style="display:inline-block;line-height:60px;vertical-align:middle" v-if="index == 4" aria-hidden="true">
                                                 <use xlink:href="#icon-zhou2"></use>
                                               </svg>
-                                            </span>
+                                                <svg class="svg_icon" style="display:inline-block;line-height:60px;vertical-align:middle" v-if="index == 2" aria-hidden="true">
+                                                <use xlink:href="#icon-zhou3"></use>
+                                              </svg>
+                                            </span> -->
                                         </div>
                                         <!-- <div class="ttd tc7"></div> -->
                                         <div class="ttd tc4" style="">{{item.signUps}} | <span :class="daomianStyle == item.aliasName ?'bulingbuling' : ''">{{item.arrived}}</span> | <span :class="tongguoStyle == item.aliasName ?'bulingbuling' : ''">{{item.passed}}</span></span></div>
@@ -183,7 +186,7 @@ export default {
             ruzhiStyle: '',
             array: [],
             isAuto: true,
-            autoSpeed: 100000,
+            autoSpeed: 10000,
             pageSize: 10,
             // pageSize: 5,
 
@@ -727,7 +730,7 @@ div{
 /deep/ .ttd{
 	text-align: center;
 	font-size: 36px;
-  line-height: 70px !important;
+  /* line-height: 60px !important; */
 }
 .lvfz{
 	font-size: 24px;
@@ -805,6 +808,7 @@ div{
 
 .tth {
     width: 100%;
+    height: 60px;
 	padding-right: 0;
 }
 
@@ -819,8 +823,12 @@ div{
     text-align: center;
 }
 .tc2.name {
-  text-align: left !important;
-
+  /* text-align: left !important; */
+  min-width: 200px;
+}
+.tc2.nameTitle {
+  /* text-align: left !important; */
+  min-width: 200px;
 }
 .tc3 {
     width: 15%;
@@ -891,4 +899,17 @@ h4.f24 {
 	content: '';
 	width: 24px;
 }
+.swiperPage{
+  display: flex !important;
+  flex-direction: column;
+  justify-content: start;
+  height: calc(100vh - 250px);
+}
+.swiperItem{
+  flex: 1; 
+  max-height: 70px;
+}
+.lNum{
+  line-height: 1.3 !important;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/userinfo/usercenter/components/dataStatistics.vue b/src/components/userinfo/usercenter/components/dataStatistics.vue
index b6229ba..4e2c414 100644
--- a/src/components/userinfo/usercenter/components/dataStatistics.vue
+++ b/src/components/userinfo/usercenter/components/dataStatistics.vue
@@ -63,7 +63,7 @@
           </a-menu>-->
         </div>
       </div>
-      <div class="rightContainer mb24">
+      <div class="rightContainer mb24" id="rightContainer">
         <div class="navTitle">
           <div class="dateSelect fsa">
             <div class="fsa">
@@ -130,7 +130,9 @@
         <div class="content">
           <!-- :expanded-row-keys.sync="expandedRowKeys" childrenColumnName="users" -->
           <!-- :scroll="{ y: tableHeight }" -->
-          <a-table :columns="columns" :scroll="{x:currWidth}" class="dataTable" :data-source="dataList" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
+          <!-- :style="{width:screenWidth + 'px !important'}" -->
+          <!-- :scroll="{x:currWidth}" -->
+          <a-table :columns="columns" class="dataTable" :data-source="dataList" :style="{minWidth:1250 + 'px !important'}" :pagination="false" @change="onChange" :loading="{ spinning: isspinning, tip: '加载中', wrapperClassName: 'spinstyle', }" :rowKey="(record) => record.index">
             <span slot="custom_objob">
               <span class="fw500">在职人数</span>
             </span>
@@ -213,6 +215,7 @@ export default {
   // 组件状态值
   data() {
     return {
+      screenWidth: 0,
       checked0: false,
       checked1: false,
       checked2: false,
@@ -676,10 +679,29 @@ export default {
    * 如果 root 实例挂载了一个文档内元素，当 mounted 被调用时 vm.el 也在文档内。
    */
   mounted() {
+    let that = this
     console.log(document.documentElement.clientHeight)
     console.log(document.getElementsByClassName('content')[0].offsetTop)
 
     this.tableHeight = document.documentElement.clientHeight - document.getElementsByClassName('content')[0].offsetTop - 160
+    // let tableContent
+    // tableContent = document.querySelector('#rightContainer')
+    // console.dir(tableContent)
+    // console.log(tableContent.scrollWidth)
+    // let width = window.innerWidth
+    // console.log(width)
+    // that.screenWidth = tableContent.scrollWidth - 20
+    // window.onresize = function (e) {
+    //   console.log(e)
+    //   tableContent = document.querySelector('#rightContainer')
+    //   console.dir(tableContent)
+    //   console.log(tableContent.scrollWidth)
+    //   let width = window.innerWidth
+    //   console.log(width)
+    //   that.screenWidth = (tableContent.scrollWidth < 852 ? tableContent.scrollWidth : that.screenWidth)
+    //   console.log(that.screenWidth)
+    //   // setRem(640);
+    // }
   },
   // 组件方法
   methods: {
@@ -1062,6 +1084,7 @@ table {
 }
 .contentbody {
   overflow: hidden;
+  padding-right: 16px;
   display: flex;
   justify-content: space-between;
   padding-left: 0;
@@ -1100,9 +1123,10 @@ table {
   .rightContainer {
     flex: 1;
     padding-left: 16px;
-    overflow: hidden;
+    overflow-x: auto;
     position: relative;
-    // min-width: 1020px;
+    min-width: 274px;
+
     &::before {
       position: absolute;
       content: '';
@@ -1226,10 +1250,12 @@ td:empty:before {
 }
 .navTitle {
   // margin: 16px 0;
+  width: 100%;
   min-width: 856px;
 }
 .content {
   position: relative;
+  min-width: 1250px;
   // overflow: auto;
   // max-height: 700px;
 }
@@ -1248,7 +1274,7 @@ td:empty:before {
   > div {
     text-align: center;
     // font-weight: bold;
-    width: 210px;
+    flex: 1;
     &:last-child {
       // margin-left: 420px;
       > div {
diff --git a/src/style/index.less b/src/style/index.less
index 2a78c0d..f5aefdb 100644
--- a/src/style/index.less
+++ b/src/style/index.less
@@ -431,6 +431,9 @@ i {
 .f36 {
 	font-size: 36px !important;
 }
+// .f40 {
+// 	font-size: 40px !important;
+// }
 .f56{
   font-size: 56px !important;
 }
diff --git a/src/views/main.vue b/src/views/main.vue
index d7137fb..3f4d842 100644
--- a/src/views/main.vue
+++ b/src/views/main.vue
@@ -56,7 +56,7 @@
               <a-dropdown overlayClassName="logindropdown" placement="bottomRight">
                 <div class="mr20">
                   <svg class="svg_icon f16" aria-hidden="true">
-                    <use xlink:href="#icon-tongzhi" />
+                    <use xlink:href="#icon-xiaoxi" />
                   </svg>
                 </div>
                 <div class="loginbox" slot="overlay">
diff --git a/src/views/merchantBack.vue b/src/views/merchantBack.vue
index c7b02cb..8e9468a 100644
--- a/src/views/merchantBack.vue
+++ b/src/views/merchantBack.vue
@@ -16,7 +16,7 @@
           </div>
         </div>
 
-        <a-menu mode="inline" :selectedKeys="[$route.name]" :openKeys.sync="openKeys" @click="handleClick" class style="overflow-y:scroll;height:calc(100vh - 49px);overflow-x:hidden">
+        <a-menu mode="inline" id="leftMenu" :selectedKeys="[$route.name]" :openKeys.sync="openKeys" @click="handleClick" class style="overflow-y:scroll;height:calc(100vh - 49px);overflow-x:hidden">
           <template v-for="(item, index) in roles">
             <a-menu-item :key="item.name" :title="null" v-if="item.path != '' && item.level < 3">
               <router-link :to="{ name: item.name }">
@@ -671,7 +671,7 @@ header.header,
   -webkit-transition: all 0.2s;
   // height: calc(100vh - 64px);
   min-height: calc(100vh - 64px);
-  overflow: auto;
+  overflow: hidden;
   background-color: #f0f2f5;
   transition: all 0.2s;
   // padding: 18px;