美博会

src/main/resources/config/dev/application-dev.yml

@@ -53,7 +53,7 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
-  spiServer: https://spi-b.caimei365.com
+  spiServer: http://192.168.2.68:8008
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com
 

src/main/resources/static/css/index/index_new.pc.css

@@ -555,3 +555,46 @@ footer{
         border-radius: 0px 10px 0px 0px;
         margin-top: 2px;
 }
+.Popup{
+				position: fixed;
+				background: rgba(34,39,46, 0.3);
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+				z-index: 99999;
+				opacity: 0;
+			}
+			.Popup.show{
+				opacity: 1;
+			}
+			.special .Popup .show_popup{
+				width: 408px;
+				height: 346px;
+				position: absolute;
+				top: 0;
+				right: 0;
+				left: 0;
+				bottom: 0;
+				margin: auto;
+			}
+			/*.bg_img{*/
+			/*	width: 968px;*/
+			/*	height: 510px;*/
+			/*}*/
+			.bg_img img{
+				width: 100%;
+				height: 100%;
+			}
+			.bg_icon{text-align: right}
+			.bg_icon .icon{
+			    width: 50px;
+				height: 50px;
+				display: inline-block;
+			}
+			.bg_icon .icon:before{
+				width: 50px;
+				height: 50px;
+				background-position: -187px -545px;
+    			cursor: pointer;
+			}

src/main/resources/static/css/product/beautytopic.css

@@ -113,6 +113,7 @@
 				    font-size: 14px;
 				    color: #4a4f58;
 					line-height: 21px;
+					margin-top: 10px;
 			}
 			.special .content .left-box .Beautyfair-page .list a .page_main_text.shop_name{
 				    white-space: normal;
@@ -187,3 +188,139 @@
 						#f83600 100%);
 					border-radius: 0px 10px 0px 0px;
 			}
+			.Beautyfair-page .page_main_price {
+				width: 100%;
+				height: 54px;
+				float: left;
+				box-sizing: border-box;
+				padding: 0 8px;
+			}
+			.Beautyfair-page  .page_main_price .main_price_text {
+				width: 100%;
+				height: 54px;
+				float: left;
+				box-sizing: border-box;
+			}
+			.Beautyfair-page .page_main_price .main_price_unde{
+				width: 100%;
+				height: 31px;
+				line-height: 31px;
+				font-size: 14px;
+				color: #4a4f58;
+				text-align: left;
+				float: left;
+			}
+			.Beautyfair-page .page_main_price .main_price_show{
+				width: 100%;
+				height: 30px;
+				line-height: 30px;
+				font-size: 14px;
+				color: #f94b4b;
+				text-align: left;
+				float: left;
+			}
+			.Beautyfair-page .page_main_price .main_price_show.none{
+				color: #999999;
+				text-decoration: line-through;
+			}
+			.Beautyfair-page .page_main_price .price_text_tag{
+				width: 100%;
+				height: 22px;
+				box-sizing: border-box;
+				float: left;
+				margin-top: 0px;
+			}
+			.Beautyfair-page .page_main_price .price_text_tag .listTag{
+				margin:0;
+				float: left;
+			}
+			.Beautyfair-page .page_main_price .main_price_none{
+				width: 100%;
+				height: 24px;
+				box-sizing: border-box;
+				float: left;
+				margin-top: 2px;
+			}
+			.Beautyfair-page .page_main_price .main_price_none.sec{
+				margin-top: 25px;
+			}
+			.Beautyfair-page .page_main_price .main_price_none .listTag{
+				margin:0;
+			}
+			.Beautyfair-page .page_main_price .price_grade{
+				float: left;
+				margin:0;
+				height: 22px;
+				line-height: 22px;
+				color: #4A4F58;
+				font-style: normal;
+				font-size: 14px;
+			}
+			.Beautyfair-page .page_main_price .price_grade span{
+				display: inline-block;
+				float: left;
+			}
+			.Beautyfair-page .page_main_price .icon:before{
+				width: 67px;
+				height: 22px;
+			}
+			.Beautyfair-page .page_main_price .price_grade_1:before{
+				background-position:0 -714px;
+			}
+			.Beautyfair-page .page_main_price .price_grade_2:before{
+				background-position:0 -744px;
+			}
+			.Beautyfair-page .page_main_price .price_grade_3:before{
+				background-position:0 -774px;
+			}
+			.Beautyfair-page .page_main_price .price_grade_4:before{
+				background-position:0 -804px;
+			}
+			.Beautyfair-page .page_main_price .price_grade_5:before{
+				background-position:0 -834px;
+			}
+			.special .Popup{
+				position: fixed;
+				background: rgba(34,39,46, 0.3);
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+				z-index: 99999;
+				opacity: 0;
+			}
+			.Popup.show{
+				opacity: 1;
+			}
+			.special .Popup .show_popup{
+				width: 968px;
+				height: 510px;
+				position: absolute;
+				top: 0;
+				right: 0;
+				left: 0;
+				bottom: 0;
+				margin: auto;
+			}
+			.bg_img{
+				width: 968px;
+				height: 510px;
+			}
+			.bg_img img{
+				width: 100%;
+				height: 100%;
+			}
+			.bg_icon{text-align: right}
+			.bg_icon .icon{
+			    width: 50px;
+				height: 50px;
+				display: inline-block;
+			}
+			.bg_icon .icon:before{
+				width: 50px;
+				height: 50px;
+				background-position: -187px -545px;
+    			cursor: pointer;
+			}
+
+

src/main/resources/static/js/common/serviceapi/product.service.js

@@ -28,4 +28,10 @@ var ProductApi = {
                 callback(res);
             });
         },
+        GetbeautyProduct:function (params, callback) {//产品仪器商品列表查询
+             Http.AjaxService({ url:'/activity/data', type:'get', data:params, json:true})
+            .then(function(res){
+                callback(res);
+            });
+        },
 };

src/main/resources/static/js/index.js

@@ -14,7 +14,8 @@ var homeData = new Vue({
         supplierImage:'',//供应商banner
         supplierWwwLink:'',//供应商banner 链接
         supplierList:[],//供应商列表
-        topMenuList:[]
+        topMenuList:[],
+        showflag:false,
     },
     filters: {
         statusType:function(value) {
@@ -48,6 +49,11 @@ var homeData = new Vue({
         },
     },
     methods: {
+        closepopup:function(){
+              this.showflag=false;
+              $('.Popup').slideUp(100);
+              window.localStorage.setItem('isNotice',true);
+        },
         GetBanners: function(){
             var _self = this;
             PublicApi.GetHomeBanner({},function(response){
@@ -264,6 +270,15 @@ var homeData = new Vue({
         this.GetHomeFloorData();
     },
     mounted: function() {
+     var isNotice =  window.localStorage.getItem('isNotice');
+        //新加  公告弹窗
+        if(isNotice){
+            this.showflag = false;
+        }else{
+            this.showflag = true;
+            $('.Popup').slideDown(100);
+
+        }
         // this.getAdvertising();
         // 侧边栏滚动判断
         var distance = 0;

src/main/resources/static/js/product/beautytopic.js

@@ -1,6 +1,46 @@
 var beautytopic = new Vue({
     el:'#beautytopic',
     data:{
+         productList:[],
+         Descriptors:[],//描述词
+         List:[
+             {
+                 shopName: '展位图',
+                 prolist: [
+                     {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
+                     {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
+                     {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
+                     {image: 'https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg',name:'北京恩盛众成国际贸易有限公司',num:'21f'},
+                 ],
+             }
+         ],
+         userId:0,
+         image:'',
+         showflag:false,
+    },
+    methods:{
+        gosupplier:function (id) {
+            window.location.href='/supplier/index.html?id='+id
+        },
+        bigImag:function (img) {
+          this.image = img;
+          this.showflag=true;
+        },
+        closepopup:function () {
+             this.showflag=false;
+        }
+    },
+    mounted:function () {
+        var _this = this;
+        if(globalUserData){
+            _this.userId = globalUserData.userId;
+        }
+        ProductApi.GetbeautyProduct({userId:_this.userId},function (res) {
+            if (res.code==0){
+                _this.productList = res.data;
+                console.log(_this.productList)
+            }
+        })
     }
 })
 

src/main/resources/templates/index.html

@@ -893,6 +893,13 @@
                 <a class="item-sideNav" href="javascript:void(0);" v-for="nav in asideNav" :data-id="nav.id" v-text="nav.value" ></a>
             </div>
         </div>
+<!--美博会弹窗-->
+        <div class="Popup" v-if="showflag" :class="showflag?'show':''">
+            <div class="show_popup">
+                <div class="bg_icon" @click="closepopup"><i class="icon"></i></div>
+                <div class="bg_img"><img src="/static/img/Beautyfair/youhui.png"></div>
+            </div>
+        </div>
     </template>
 </div>
 <!-- 引入底部 -->

src/main/resources/templates/product/beautytopic.html

@@ -60,37 +60,17 @@
 								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" /><div class="page_main_text"><p>热玛吉术后修复知多少沙发上</p></div></a>
 							 </div>
 						</div>
-						<div class="Beautyfair-page">
+						<div class="Beautyfair-page" v-for="item in List">
 							<div class="page-title">
-								<h1>展位图</h1>
+								<h1>{{item.shopName}}</h1>
 								<p>这里是展位图描述词</p>
 							</div>
 							 <div class="list Floorplan">
-								 <a href="#" >
-									 <img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" />
+								 <a href="javascript:0;" v-for="pros in item.prolist" @click="bigImag(pros.image)">
+									 <img  :src="pros.image" />
 									 <div class="Booth_text">
-										 <p class="name">北京恩盛众成国际贸易有限公司</p>
-										 <p class="number">展位号：21F</p>
-									 </div>
-								 </a>
-								 <a href="#" ><img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" />
-									<div class="Booth_text">
-										 <p class="name">华熙生物</p>
-										 <p class="number">展位号：21F</p>
-									 </div>
-								 </a>
-								 <a href="#" >
-									 <img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" />
-									 <div class="Booth_text">
-										 <p class="name">北京恩盛众成国际贸易有限公司</p>
-										 <p class="number">展位号：21F</p>
-									 </div>
-								 </a>
-								 <a href="#" >
-									 <img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" />
-									 <div class="Booth_text">
-										 <p class="name">北京恩盛众成国际贸易有限公司</p>
-										 <p class="number">展位号：21F</p>
+										 <p class="name">{{pros.name}}</p>
+										 <p class="number">{{pros.num}}</p>
 									 </div>
 								 </a>
 							 </div>
@@ -98,19 +78,96 @@
 							 	<div class="more" @click="showMorePageFn(page)"> <i class="icon mIcon"></i>查看更多</div>
 							 </div>
 						</div>
-						<div class="Beautyfair-page">
+						<div class="Beautyfair-page" v-for="(item,index) in productList">
 							<div class="page-title">
-								<h1>华熙生物</h1>
+								<h1>{{item.shopName}}</h1>
 									<p>这里是华熙生物描述词</p>
-									<p class="more"> 更多 > </p>
+									<p class="more" @click="gosupplier(item.shopId)"> 更多 > </p>
 							</div>
 							 <div class="list supplier">
-								 <a href="#" >
-									 <img  src="https://img-b.caimei365.com/group1/M00/03/1D/Cmgy61__7xeALuLSAAEzetR0-ac547.jpg" />
+								 <a :href="'/product-'+pros.productID+'.html'" v-for="(pros,index) in item.productSet" >
+									 <img  :src="pros.mainImage" />
 									 <div class="page_main_text shop_name">
 										 <span class="tag">美博会</span>
-										 热玛吉术后修复知多少沙发上热玛吉术后修复知多少沙发上
+										 {{pros.name}}
 									 </div>
+									  <div class="page_main_price"  >
+                                        <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
+                                            <!--正常商品, 二手商品-->
+                                            <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
+                                            <template v-if="pros.productCategory==1">
+                                                <template v-if="pros.price1TextFlag==1">
+                                                    <!--价格未公开-->
+                                                    <div class="main_price_text">
+                                                        <div class="price_text_tag">
+                                                            <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                        </div>
+                                                        <div class="main_price_unde">￥价格未公开</div>
+                                                    </div>
+                                                </template>
+                                                <template v-else>
+                                                    <!--可见价格-->
+                                                    <template v-if="(pros.price1TextFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.shopID==GLOBAL_SHOP_ID)">
+                                                        <div class="main_price_text" v-if="pros.productCategory == 1">
+                                                            <div class="price_text_tag">
+                                                                <p class="listTag" v-if="pros.actStatus==1">
+                                                                    {{pros.promotions.name}}
+                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.retailPrice | NumFormat}}</span>
+                                                                </p>
+                                                            </div>
+                                                            <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
+                                                                ￥{{ (PromotionsFormat(pros.promotions) ? pros.price1 : pros.retailPrice ) | NumFormat  }}
+                                                            </div>
+                                                        </div>
+                                                    </template>
+                                                    <!--仅会员机构可见-->
+                                                    <template v-else-if="pros.price1TextFlag==2 && pros.userIdentity==4">
+                                                        <div class="main_price_text">
+                                                            <div class="price_text_tag">
+                                                                <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                            </div>
+                                                            <div class="main_price_unde">￥会员可见</div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
+                                                        <div class="price_text_tag">
+                                                            <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                        </div>
+                                                        <div class="main_price_none">
+                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.price1Grade"></i></em>
+                                                            <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                        </div>
+                                                    </template>
+                                                </template>
+                                            </template>
+                                            <template v-else>
+                                                <div class="main_price_text" v-if="pros.detailTalkFlag == '2'">
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥价格祥聊</div>
+                                                </div>
+                                                <div class="main_price_text" v-else>
+                                                    <div class="price_text_tag"></div>
+                                                    <div class="main_price_show">￥{{ pros.retailPrice | NumFormat  }}</div>
+                                                </div>
+                                            </template>
+                                        </template>
+                                        <template v-else>
+                                            <template v-if="pros.productCategory == 1">
+                                                <div class="price_text_tag ">
+                                                    <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                </div>
+                                                <div class="main_price_none">
+                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.price1Grade"></i></em>
+                                                    <p class="listTag " v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
+                                                </div>
+                                            </template>
+                                            <template v-else>
+                                                <div class="main_price_none sec">
+                                                    <em class="price_grade"><span>￥</span>登录可见</em>
+                                                </div>
+                                            </template>
+                                        </template>
+                                    </div>
 								 </a>
 							 </div>
 						</div>
@@ -126,10 +183,17 @@
 					</div>
 				</div>
 			</div>
-
+		<!-- 大图弹窗	-->
+			<div class="Popup" v-if="showflag" :class="showflag?'show':''">
+				<div class="show_popup">
+					<div class="bg_icon" @click="closepopup"><i class="icon"></i></div>
+					<div class="bg_img"><img :src="image"></div>
+				</div>
+			</div>
 		</div>
     <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/product/beautytopic.js(v=${version})}"></script>
 </body>