فهرست منبع

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

# Conflicts:
#	src/main/resources/templates/index.html
#	target/www-0.0.1-SNAPSHOT.jar
chao 4 سال پیش
والد
کامیت
dfa225771b

+ 1 - 0
src/main/resources/static/css/activity/activityTopic.css

@@ -1,5 +1,6 @@
 a:hover{color:#333}
 .clearfix::after{content:'';display:block;clear:both}
+.mg-bottom{padding-bottom: 6vw;}
 @-webkit-keyframes my-fade-ease{0%{opacity:0}
 100%{opacity:0.8}
 }@keyframes my-fade-ease{0%{opacity:0}

+ 3 - 3
src/main/resources/static/css/index/index_new.h5.css

@@ -368,10 +368,10 @@
     border-radius: 0px 10px 0px 0px;
     margin-top: .5vw;
 }
-.Popup{position: fixed;background: rgba(34,39,46, 0.3);top: 0;left: 0;width: 100%;height: 100%;z-index: 99999;opacity: 0;}
+.Popup{position: fixed;background: rgba(34,39,46, 0.5);top: 0;left: 0;width: 100%;height: 100%;z-index: 99999;opacity: 0;}
 .Popup.show{opacity: 1;}
-.Popup .show_popup{width: 77vw;height: 85vw;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;}
+.Popup .show_popup{width: 97vw;height: 73.6vw;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;}
 .bg_img img{width: 100%;height: 100%;}
-.bg_icon{text-align: right;padding-right: 10vw}
+.bg_icon{text-align: right;position: absolute;right: 10vw;}
 .bg_icon .mIcon{width: 10vw;height: 10vw;display: inline-block;}
 .bg_icon .mIcon:before{width: 10vw;height: 10vw;background-position: -33.3vw -77.3vw;cursor: pointer;}

+ 3 - 3
src/main/resources/static/css/index/index_new.pc.css

@@ -541,10 +541,10 @@ footer{
 }
 /*美博会*/
 .section_page .page_main_text .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;margin-right: 5px;text-align: center;color: #FFFFFF !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);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{position: fixed;background: rgba(34,39,46, 0.5);top: 0;left: 0;width: 100%;height: 100%;z-index: 99999;opacity: 0;}
 .Popup.show{opacity: 1;}
-.Popup .show_popup{width: 408px;height: 346px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;cursor: pointer}
+.Popup .show_popup{width: 655px;height: 460px;position: absolute;top: 0;right: 0;left: 0;bottom: 0;margin: auto;cursor: pointer}
 .bg_img img{width: 100%;height: 100%;}
-.bg_icon{text-align: right}
+.bg_icon{text-align: right;position: absolute;right: 70px; top: 50px;}
 .bg_icon .icon{width: 50px;height: 50px;display: inline-block;}
 .bg_icon .icon:before{width: 50px;height: 50px;background-position: -187px -545px;cursor: pointer;}

+ 1 - 1
src/main/resources/static/js/activity/activityTopic.js

@@ -404,7 +404,7 @@ var activity = new Vue({
                     }
                 });
                 $('img[data-original]').lazyload();
-
+                $('title').html(_that.pageInfo.title);
             })
         },
 

+ 12 - 12
src/main/resources/static/js/index.js

@@ -52,7 +52,7 @@ var homeData = new Vue({
 
         zhuanti:function(){
             this.showflag=false;
-            window.location.href='/product/beautytopic.html';
+            window.location.href='/activity/activityTopic.html?id=306&name=美博会';
             localStorage.setItem('lockTime',Date.now());
             window.localStorage.setItem('isActivityStatus',true);
         },
@@ -334,17 +334,17 @@ var homeData = new Vue({
         $('#advertising').on('click','.close',function () {
             $(this).parents('.item').hide();
         });
-        // var isActivityStatus =  localStorage.getItem('isActivityStatus');
-        // //新加优惠券弹窗
-        // if(isActivityStatus){
-        //     var  lockTime = localStorage.getItem('lockTime');
-        //     var  eTime = this.diffTime(lockTime);
-        //     _this.showflag = eTime;
-        // }else{
-        //     setTimeout(function () {
-        //          _this.showflag = true;
-        //     },1000);
-        // }
+        var isActivityStatus =  localStorage.getItem('isActivityStatus');
+        //新加优惠券弹窗
+        if(isActivityStatus){
+            var  lockTime = localStorage.getItem('lockTime');
+            var  eTime = this.diffTime(lockTime);
+            _this.showflag = eTime;
+        }else{
+            setTimeout(function () {
+                 _this.showflag = true;
+            },1000);
+        }
     }
 });
 

+ 44 - 47
src/main/resources/static/js/user-center/setting/upgrade.js

@@ -92,15 +92,13 @@ var upgradePage = new Vue({
                         if(data.club.mainProduct){
                             _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
                             _self.medicaCampNullList = _self.setNewMainProduct(_self.userMainPros);
-                            console.log(_self.userMainPros)
                         }else{
                             _self.userMainPros = _self.medicaCampNullList;
                         }
-                    }else{
+                    }else if(_self.clubUpgradeUser.firstClubType == 2){
                         if(data.club.mainProduct){
                             _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
                             _self.mentuzCampNullList = _self.setNewMainProduct(_self.userMainPros);
-                            console.log(_self.userMainPros)
                         }else{
                             _self.userMainPros = _self.mentuzCampNullList;
                         }
@@ -123,7 +121,6 @@ var upgradePage = new Vue({
                     }else {
                          _self.clubUpgradeUser.townId = 0
                     }
-
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                 }
@@ -160,61 +157,61 @@ var upgradePage = new Vue({
                     setTimeout(function () {
                     _self.secondtypeflag = false;
                 },2000)
-                return;
+                    return;
                 }
                 if(_self.userMainPros==''){
-                          _self.mproflag = true;
-                         setTimeout(function () {
-                            _self.mproflag = false;
-                        },2000)
-                         return;
-                    }
+                      _self.mproflag = true;
+                     setTimeout(function () {
+                        _self.mproflag = false;
+                    },2000)
+                    return;
+                }
             }
             if(_self.clubUpgradeUser.firstClubType==2){
                 if(_self.userMainPros ==''){
                     _self.userMainProflag = true;
                  setTimeout(function () {
                     _self.userMainProflag = false;
-                },2000)
-                  return;
+                },2000);
+                    return;
                 }
             }
-                if (_self.loginLoading) { return false; }
-                this.$nextTick(function() {
-                    _self.clubUpgradeUser.mainProduct = _self.userMainPros.join("/");
-                var  params= {
-                        userId:_self.clubUpgradeUser.userId,
-                        clubId:_self.clubUpgradeUser.clubId,				//会所Id
-                        name:_self.clubUpgradeUser.name,
-                        linkMan:_self.clubUpgradeUser.linkMan,
-                        shortName:_self.clubUpgradeUser.shortName,
-                        contractEmail:_self.clubUpgradeUser.contractEmail,
-                        provinceId:_self.clubUpgradeUser.provinceId,
-                        cityId:_self.clubUpgradeUser.cityId,
-                        townId:_self.clubUpgradeUser.townId,
-                        address:_self.clubUpgradeUser.address,
-                        socialCreditCode:_self.clubUpgradeUser.socialCreditCode,
-                        businessLicense:_self.clubUpgradeUser.businessLicense,
-                        shopPhoto:_self.clubUpgradeUser.shopPhoto,
-                        firstClubType:Number(_self.clubUpgradeUser.firstClubType), //机构类型分类 医美:0和生美:1
-                        secondClubType:Number(_self.clubUpgradeUser.secondClubType),	//机构类型二级分类 诊所:1,门诊:2,医院:3
-                        department:_self.clubUpgradeUser.department,				//科室
-                        medicalPracticeLicense:_self.clubUpgradeUser.medicalPracticeLicense,//资质图片
-                        mainProduct:_self.clubUpgradeUser.mainProduct,
-                    };
-                    _self.loginLoading = true;
-                    UserApi.ClubUpgrade(params,function (response) {
-                        if(response.code === 0){
-                            CAIMEI.Alert('您的升级申请已提交审核','确定',true,function () {
-                                _self.clubLoginIndex();
-                                _self.loginLoading = false;
-                            });
-                        } else {
-                            CAIMEI.Alert(response.msg,'确定',false);
+            _self.clubUpgradeUser.mainProduct = _self.userMainPros.join("/");
+            if (_self.loginLoading) { return false; }
+            this.$nextTick(function() {
+            var  params= {
+                    userId:_self.clubUpgradeUser.userId,
+                    clubId:_self.clubUpgradeUser.clubId,				//会所Id
+                    name:_self.clubUpgradeUser.name,
+                    linkMan:_self.clubUpgradeUser.linkMan,
+                    shortName:_self.clubUpgradeUser.shortName,
+                    contractEmail:_self.clubUpgradeUser.contractEmail,
+                    provinceId:_self.clubUpgradeUser.provinceId,
+                    cityId:_self.clubUpgradeUser.cityId,
+                    townId:_self.clubUpgradeUser.townId,
+                    address:_self.clubUpgradeUser.address,
+                    socialCreditCode:_self.clubUpgradeUser.socialCreditCode,
+                    businessLicense:_self.clubUpgradeUser.businessLicense,
+                    shopPhoto:_self.clubUpgradeUser.shopPhoto,
+                    firstClubType:Number(_self.clubUpgradeUser.firstClubType), //机构类型分类 医美:0和生美:1
+                    secondClubType:Number(_self.clubUpgradeUser.secondClubType),	//机构类型二级分类 诊所:1,门诊:2,医院:3
+                    department:_self.clubUpgradeUser.department,				//科室
+                    medicalPracticeLicense:_self.clubUpgradeUser.medicalPracticeLicense,//资质图片
+                    mainProduct:_self.clubUpgradeUser.mainProduct,
+                };
+                _self.loginLoading = true;
+                UserApi.ClubUpgrade(params,function (response) {
+                    if(response.code === 0){
+                        CAIMEI.Alert('您的升级申请已提交审核','确定',true,function () {
+                            _self.clubLoginIndex();
                             _self.loginLoading = false;
-                        }
-                    });
+                        });
+                    } else {
+                        CAIMEI.Alert(response.msg,'确定',false);
+                        _self.loginLoading = false;
+                    }
                 });
+            });
         },
         clubLoginIndex:function(){// 跳过升级直接去个人中心
             window.location.href = '/user/dashboard.html';

+ 1 - 1
src/main/resources/templates/activity/activityTopic.html

@@ -14,7 +14,7 @@
   <!-- 引用头部 -->
   <template th:replace="components/header"></template>
 
-  <div id="activity" class="activity" v-cloak>
+  <div id="activity" class="activity" v-cloak :class="isPC ? '' : 'mg-bottom' ">
     <!--  loading  -->
     <div v-if="listLoading" class="loading">
         <img src="/img/base/loading.gif">

+ 4 - 1
src/main/resources/templates/components/head-link.html

@@ -15,4 +15,7 @@
     <link th:href="@{/css/base/base.pc.css(v=${version})}" media="screen and (min-width:768px)" rel="stylesheet" type="text/css">
     <!--百度统计 start-->
     <script th:if="${siteEnv}==2">var _hmt=_hmt||[];(function(){var hm=document.createElement("script");hm.src = "https://hm.baidu.com/hm.js?ccdb07ae255aa2a1d68c7c725a40d99c";var s=document.getElementsByTagName("script")[0];s.parentNode.insertBefore(hm,s);})();</script>
-    <!--百度统计 end-->
+    <!--百度统计 end-->
+    <script th:if="${siteEnv}==2">
+    var isFormal = window.location.href.indexOf('www.caimei365.com') !== -1;if(isFormal){var _czc = _czc || [];_czc.push(["_setAccount", "1279558759"]);}
+    </script>

+ 9 - 6
src/main/resources/templates/index.html

@@ -894,12 +894,15 @@
             </div>
         </div>
         <!--美博会弹窗-->
-<!--        <div class="Popup" v-if="showflag" :class="showflag ? 'show' :'' ">-->
-<!--            <div class="show_popup">-->
-<!--                <div class="bg_icon" @click="closepopup"><i class="icon mIcon"></i></div>-->
-<!--                <div class="bg_img" @click="zhuanti"><img src="/img/Beautyfair/youhui-pc.png" v-if="isPC"><img src="/img/Beautyfair/youhui.h5.png" v-else></div>-->
-<!--            </div>-->
-<!--        </div>-->
+        <div id="meibohui" class="Popup" v-if="showflag" :class="showflag ? 'show' :'' "
+             onclick="_czc.push(['_trackEvent','美博会','点击','用户访问','','meibohui'])">
+            <div class="show_popup">
+                <div class="bg_icon" @click="closepopup"><i class="icon mIcon"></i></div>
+                <div class="bg_img" @click="zhuanti"><img
+                        src="https://static.caimei365.com/app/meibohui/www/activity-pop-pc.png" v-if="isPC"><img
+                        src="https://static.caimei365.com/app/meibohui/www/activity-pop-h5.png" v-else></div>
+            </div>
+        </div>
     </template>
 </div>
 <!-- 引入底部 -->

+ 2 - 2
src/main/resources/templates/user-center/Beautyfair.html

@@ -39,8 +39,8 @@
                         <span v-else>优惠券仅限{{name}}使用</span>
                     </div>
                     <div class="container">
-                        <img src="/img/Beautyfair/coupon.jpg" v-if="isPC"/>
-                        <img src="/img/Beautyfair/coupon.h5.jpg" v-else/>
+                        <img src="https://static.caimei365.com/app/meibohui/www/activity-detail-pc.jpg" v-if="isPC"/>
+                        <img src="https://static.caimei365.com/app/meibohui/www/activity-detail-h5.jpg" v-else/>
                     </div>
                 </div>
             </div>

+ 6 - 6
src/main/resources/templates/user-center/dashboard.html

@@ -101,12 +101,12 @@
                         </div>
                     </div>
                     <!--美博会活动标题-->
-<!--                    <div class=" user-content coupon">-->
-<!--                        <a href="/user/beautyfair.html">-->
-<!--                            <img src="/img/Beautyfair/activty-pc.jpg" class="coupon_img" v-if="isPC"/>-->
-<!--                            <img src="/img/Beautyfair/activty-h5.png" class="coupon_img" v-else>-->
-<!--                        </a>-->
-<!--		            </div>-->
+                    <div class=" user-content coupon">
+                        <a href="/user/beautyfair.html" id="meibohui" onclick="_czc.push(['_trackEvent','美博会','点击','用户访问','','meibohui'])">
+                            <img src="https://static.caimei365.com/app/meibohui/www/activity-in-pc.jpg" class="coupon_img" v-if="isPC"/>
+                            <img src="https://static.caimei365.com/app/meibohui/www/activity-in-h5.jpg" class="coupon_img" v-else>
+                        </a>
+		            </div>
                     <div class="user-content">
                         <div class="title">今日推荐</div>
                         <div class="section">