Merge remote-tracking branch 'remotes/origin/developer' into developerB

src/main/resources/static/css/account/register.css

@@ -4,13 +4,13 @@ li{list-style:none}
  * PC端
  */
 @media screen and (min-width:768px){
-body{background: #FFF url(/img/account/register.png) no-repeat center 84px;background-attachment: fixed;}
+body{background: #FFF url(/img/account/supplierbg.png) no-repeat center 84px;background-attachment: fixed;}
 footer .footTop{display:none;}
 .registerClub{padding: 20px 0 100px 0;}
 .selectAccount{width:1184px;height:558px;text-align:center;margin:0 auto;}
 .selectAccount .title{height:42px;font-size:32px;line-height:42px;font-weight:bold;color:#22272e;padding-top:102px}
 .selectAccount .cont{margin-top:44px}
-.selectAccount .cont span{display:inline-block;width:168px;margin:0 55px;line-height:42px;color:#3b77ff;font-size:24px;cursor:pointer}
+.selectAccount .cont span{display:inline-block;width:190px;margin:0 55px;line-height:42px;color:#3b77ff;font-size:24px;cursor:pointer}
 .selectAccount .cont img{display:inline-block;width:168px;height:168px;background-color:#c2d8fa;border-radius:84px}
 .signAccount.upgrade {width: 968px;margin: 0 auto;}
 .signAccount .title {height: 42px;font-size: 32px;line-height: 42px;font-weight: normal;color: #22272e;padding: 20px 0;text-align: center;}
@@ -65,7 +65,9 @@ footer .footTop{display:none;}
 .formLine .business input[type="text"] {width: 350px;display: block;float: left;margin-right: 15px;}
 .formLine .business a {display: block;float: left; width: 92px;height: 32px;line-height: 34px;font-size: 14px;color: #e15616;background-color: #ffe6dc;border-radius: 2px;border: solid 1px #e15616;text-align: center;}
 .supplierConfirm{width: 100%;height: 100%;position: fixed;top:0;left:0;z-index: 999;background: rgba(0,0,0,.3);}
-
+.purchase{font-size: 18px;width: 127px;margin: 10px auto 0;text-align: center}
+.b .purchase{color: #FF7A51}
+.tips-text{color: #999999;font-size: 14px;line-height: 20px;}
 
 }
 
@@ -78,9 +80,9 @@ footer{display:none}
 .registerClub{padding: 20px 0;}
 .registerShop{padding: 20px 0;}
 .selectAccount{width:100%;height:90vh;text-align:center;}
-.selectAccount .title{height:6vw;font-size:4.2vw;font-weight:bold;line-height:6vw;color:#22272e;padding-top:36vw}
+.selectAccount .title{height:6vw;font-size:4.2vw;font-weight:bold;line-height:6vw;color:#22272e;padding-top:15vw}
 .selectAccount .cont{margin-top:10vw;}
-.selectAccount .cont span{display:inline-block;width:24.8vw;margin:0 6.7vw;line-height:4.6vw;color:#3b77ff;font-size:3.4vw;cursor:pointer}
+.selectAccount .cont span{display:inline-block;width:100%;margin:3.7vw 0;line-height:4.6vw;color:#3b77ff;font-size:3.4vw;cursor:pointer}
 .selectAccount .cont img{display:inline-block;width:24.8vw;height:24.8vw;background-color:#c2d8fa;border-radius:12.4vw}
 .signAccount .title-tips{margin-bottom: 3.2vm;width: 100%;height:9.6vw;background-image: linear-gradient(270deg,rgba(255,255,255,0.1) 0%,rgba(255,86,11,0.1) 51%,rgba(255,255,255,0.1) 100%);}
 .signAccount .title-tips p{width: 100%;height:9.6vw;font-family: Microsoft YaHei;font-size:3.1vw;font-weight: normal;font-stretch: normal;line-height: 9.6vw;letter-spacing:0;color: #e15616;text-align: center;}
@@ -137,4 +139,7 @@ footer{display:none}
 .subLine .btn-upgrade {cursor: pointer;display: block;width: 93.4vw;height: 11.2vw;line-height: 50px;background-color: #e15616;border-radius: 0.2vw;text-align: center;font-size: 3.4vw;color: #FFF;float: left;margin-bottom: 2.8vw;}
 .subLine .btn-upgrade.none{border: 1px solid #E15616;background-color: #ffe6dc;box-shadow: 0px 3px 6px 0px rgba(249, 75, 75, 0.17);color: #e15616;}
 .subLine .btn-upgrade.disabled{background-color: #999999;}
+.purchase{font-size: 3.8vw;background: #fff;margin: 2.7vw auto;text-align: center}
+.b .purchase{color: #e15616}
+.tips-text{color: #999999;font-size: 3.4vw;}
 }

src/main/resources/static/css/single-page/promotions.css

@@ -3,6 +3,7 @@ li{list-style:none}
 /**
  * PC端
  */
+ .promotions a.noclick{pointer-events:none}
 @media screen and (min-width:768px){
     .promotions{width:100%;background:#FFF;position:relative;margin-top:16px}
     .promotions a{display:block;font-size:20px;}

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

@@ -16,8 +16,8 @@
     <div class="selectAccount">
         <div class="title">请选择注册的账号类型</div>
         <div class="cont">
-            <span class="a"><img src="/img/account/club.png" @click="clickTab(1)">机构</span>
-            <span class="b"><img src="/img/account/supplier.png"  @click="clickTab(2)">供应商</span>
+            <span class="a"><img src="/img/account/clubPC.png" @click="clickTab(1)"> <p class="purchase">采购方(买家)</p><p class="tips-text">医院机构/美容会所/个人买家</p></span>
+            <span class="b"><img src="/img/account/supplierPC.png"  @click="clickTab(2)"><p class="purchase">供应商(卖家)</p><p class="tips-text">仪器/产品/服务供应商</p></span>
         </div>
     </div>
 </div>

src/main/resources/templates/single-page/promotions.html

@@ -13,7 +13,7 @@
 <!-- 二级页面 -->
 <div id="promotionsList">
     <ul class="wrap">
-        <li class="promotions" v-for="item in listData"><a :href="item.link">
+        <li class="promotions" v-for="item in listData"><a :href="item.link" :class="item.status==3?'noclick':''" >
             <img :src="item.image">
             <p v-text="item.title"></p>
             <span v-if="item.status==1" class="time" v-text="''+item.detail">活动时间：活动即将开始</span>