Merge branch 'developer' into developerA

src/main/resources/static/css/base/floor.css

@@ -141,7 +141,7 @@
 .page_main_li.ad_01 img{width:100%;height:100%}
 .section_right{padding:3.2vw}
 .box{white-space:nowrap;overflow-x:auto}
-.section_right .section_right_item{display:inline-block;width:42.2vw;height:61.6vw;background:#fff;margin-right:2.4vw;flex-shrink:0;vertical-align: top;display: none;}
+.section_right .section_right_item{display:inline-block;width:42.2vw;height:61.6vw;background:#fff;margin-right:2.4vw;flex-shrink:0;vertical-align: top;}
 .section_right .section_right_item>a{width: 100%;height: 100%;display: block;border-radius: 2px;}
 .section_right .section_right_item>a img{width: 100%;height: 100%;display: block;border-radius: 2px;}
 .section_right .section_right_ite.none{display: none;}

src/main/resources/static/js/account/login.js

@@ -47,7 +47,7 @@ var loginPage = new Vue({
         stautsfalse:false,
         infofalse:false,
         isSlideFinishState:true,
-        loginTabs:0,
+        loginTabs:1,
         mobilCount:0,
         mobileCodeText:'获取验证码',
         mobilTime:null,

src/main/resources/static/js/user-center/member/memberPage.js

@@ -15,8 +15,8 @@ var serviceList = [
     {
         name: '免运费',
         subTitle: '下单全包邮',
-        pcIcon:'/img/member/pc-cm-svip-icon8.png',
-        h5Icon:'/img/member/h5-cm-svip-icon8.png'
+        pcIcon:'/img/member/pc-cm-svip-icon9.png',
+        h5Icon:'/img/member/h5-cm-svip-icon9.png'
     },
     {
         name: '采美豆翻倍',

src/main/resources/templates/account/login.html

@@ -25,8 +25,8 @@
             </div>
             <form v-show="!qrCodeLogin">
                 <div class="formLine-tabs">
-                    <a class="tabs-item" :class="{ current: loginTabs === 0 }" href="javascript:void(0);" @click="handleTabsClick(0)">密码登录</a>
                     <a class="tabs-item" :class="{ current: loginTabs === 1 }" href="javascript:void(0);" @click="handleTabsClick(1)">验证码登录</a>
+                    <a class="tabs-item" :class="{ current: loginTabs === 0 }" href="javascript:void(0);" @click="handleTabsClick(0)">密码登录</a>
                 </div>
                 <template v-if="loginTabs === 0">
                     <div class="formLine">