Merge branch 'developer' of http://git.caimei365.com/caimei365/caimei365-www into developerA

src/main/java/com/caimei/www/service/page/impl/SinglePageServiceImpl.java

@@ -12,6 +12,7 @@ import org.springframework.http.MediaType;
 import org.springframework.http.ZeroCopyHttpOutputMessage;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 import reactor.core.publisher.Mono;
 
@@ -49,7 +50,11 @@ public class SinglePageServiceImpl implements SinglePageService {
         PageContent pageContent = singlePageDao.getFreePageById(id);
         String mobileContent = singlePageDao.findMobileContent(id);
         if (StringUtils.isEmpty(mobileContent)) {
-            pageContent.setMobileContent(pageContent.getContent());
+            if (!ObjectUtils.isEmpty(pageContent.getContent())) {
+                pageContent.setMobileContent(pageContent.getContent());
+            } else {
+                pageContent.setMobileContent("");
+            }
         } else {
             pageContent.setMobileContent(mobileContent);
         }

src/main/resources/mapper/SinglePageMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.caimei.www.mapper.SinglePageDao">
     <select id="getFreePageById" resultType="com.caimei.www.pojo.page.PageContent">
-        select  a.id, a.type, a.title, a.keywords, a.description, f.content, a.backgroundColour, a.backgroundImage
+        select  a.id, a.type, a.title, a.keywords, a.description, ifnull(f.content,'') as content, a.backgroundColour, a.backgroundImage
         from cm_page a
         left join cm_page_freedom f on a.id=f.pageId
         where a.type=4 and a.enabledStatus=1 and f.type=1

src/main/resources/static/css/help/clubinfo.css

@@ -26,6 +26,9 @@
   .info-main .info-img img{width: 180px;height: 180px;display: block;margin-left: 20px;border: 1px dashed #E2E2E2;}
   .info-button {width: 100%;height: 120px;box-sizing: border-box;background-color: #FFFFFF;padding:35px 40px;float: left;}
   .info-button .btn{width: 300px;height: 50px;background-color: #E15616;line-height:50px;display: block;text-align: center;color: #FFFFFF;font-size:14px;float: left;}
+  .info-main-none{width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;flex-direction: column;}
+  .info-main-none img{ width: 220px;height: 180px;margin-bottom: 20px;}
+  .info-main-none p{ font-size: 14px;color: #999999;line-height: 24px;}
   /*弹窗*/
   .seller-popup{width:100%;height:100%;position:fixed;top:0;left:0;background-color:rgba(0,0,0,.4);z-index: 99999;opacity: 0;}
   .seller-popup.hide{opacity: 0;}
@@ -45,7 +48,6 @@
   .seller-popup .seller-list-cell .seller-list-ri{width: 60px;height: 60px;float: right;box-sizing: border-box;font-size: 16px;color: #FFF;cursor: pointer;padding: 21px;}
   .seller-popup .seller-list-cell .seller-list-ri .new-icon{width: 18px;height: 18px;box-sizing: border-box;display: block;background: url("/img/base/icon-news@2x.png");background-size: cover;float: left;}
   .seller-popup .seller-list-cell .seller-list-ri .new-icon.active{background: url("/img/base/icon-news-active@2x.png");background-size: cover;}
-
  }
 
 /*移动端**/
@@ -75,6 +77,9 @@
   .info-main .info-img img{width: 26vw;height: 26vw;display: block;}
   .info-button {width: 100%;height: 20vw;box-sizing: border-box;background-color: #FFFFFF;padding: 4vw;position: fixed;bottom: 0;left: 0;z-index: 99;}
   .info-button .btn{width: 100%;height: 12vw;background-color: #E15616;line-height: 12vw;display: block;text-align: center;color: #FFFFFF;font-size: 4vw;}
+  .info-main-none{width: 100%;height: 100%;display: flex;align-items: center;justify-content: center;flex-direction: column;padding-top: 20vw;}
+  .info-main-none img{ width: 200px;height: 180px;margin-bottom: 2vw;}
+  .info-main-none p{ font-size: 3.4vw;color: #999999;line-height: 6vw;}
   /*优惠券弹窗*/
   .seller-popup{width:100%;height:100%;position:fixed;bottom:0;left:0;background-color:rgba(0,0,0,.4);z-index: 99999;opacity: 0;}
   .seller-popup.hide{opacity: 0;}

src/main/resources/static/js/help/clubinfo.js

@@ -10,6 +10,7 @@ var InformationPage = new Vue({
         checkedIndex:0,
         saleName:'',// 分配销售人名称
         sellerList:[],
+        isEfficacy:false,
         salesParams:{
             clubId:0,
             spId:0
@@ -74,10 +75,15 @@ var InformationPage = new Vue({
             var _self = this;
             UserApi.userClubRecordLinkage({clubId: _self.clubId}, function (response) {
                 if (response.code === 0) {
-                    _self.saleName = response.data.saleName;
-                    _self.clubInfo = response.data.club;
-                    _self.userClubChoseList()
-                    setBeforeUrl();
+                    if(response.data.lostType === 0){
+                        _self.isEfficacy = false;
+                        _self.saleName = response.data.saleName;
+                        _self.clubInfo = response.data.club;
+                        _self.userClubChoseList()
+                        setBeforeUrl();
+                    }else{
+                        _self.isEfficacy = true;
+                    }
                 } else {
                     console.log('获取机构信息异常')
                 }

src/main/resources/templates/help/clubinfo.html

@@ -18,56 +18,65 @@
 </div>
 <!-- 机构信息 -->
 <div id="informationPage" v-cloak>
-  <div class="info-header clearfix" v-if="clubInfo.ipAddress">
-    <p>注册地：<span>{{ clubInfo.ipAddress }}</span></p>
+  <div class="info-main-none" v-if="isEfficacy">
+    <img src="https://static.caimei365.com/app/img/icon/icon-pnone.png" alt="">
+    <p>页面已失效</p>
+    <p>销售人员请通过小程序查看</p>
   </div>
-  <div class="info-header clearfix" v-if="clubInfo.describe">
-    <p>描述：<span>{{ clubInfo.describe }}</span></p>
-  </div>
-  <div class="info-content clearfix">
-    <div class="info-title">
-      <div class="info-title-left">
-        <p>机构资料：<span>{{ clubInfo.userIdentity === 2 ? '资质机构' : '个人机构' }}</span></p>
-      </div>
-      <div class="info-title-right">
-        <p v-if="clubInfo.spType === 0">待分配销售</p>
-        <p v-else> 已分配销售：{{  saleName }}</p>
-      </div>
+  <template v-else>
+    <div class="info-header clearfix" v-if="clubInfo.ipAddress">
+      <p>注册地：<span>{{ clubInfo.ipAddress }}</span></p>
     </div>
-    <div class="info-main">
-      <div class="info-h1">注册信息</div>
-      <div class="info-p">联系人：<span>{{ clubInfo.linkMan }}</span></div>
-      <div class="info-p">手机号：<span>{{ clubInfo.contractMobile }}</span></div>
+    <div class="info-header clearfix" v-if="clubInfo.describe">
+      <p>描述：<span>{{ clubInfo.describe }}</span></p>
     </div>
-    <div class="info-main" v-if="clubInfo.userIdentity === 2 || (clubInfo.userIdentity === 4 && (clubInfo.status == 1 || clubInfo.status == 92))">
-      <div class="info-h1">升级信息 <span class="info-h1-tag" :class="{
+    <div class="info-content clearfix">
+      <div class="info-main-content" >
+        <div class="info-title">
+          <div class="info-title-left">
+            <p>机构资料：<span>{{ clubInfo.userIdentity === 2 ? '资质机构' : '个人机构' }}</span></p>
+          </div>
+          <div class="info-title-right">
+            <p v-if="clubInfo.spType === 0">待分配销售</p>
+            <p v-else> 已分配销售：{{  saleName }}</p>
+          </div>
+        </div>
+        <div class="info-main">
+          <div class="info-h1">注册信息</div>
+          <div class="info-p">联系人：<span>{{ clubInfo.linkMan }}</span></div>
+          <div class="info-p">手机号：<span>{{ clubInfo.contractMobile }}</span></div>
+        </div>
+        <div class="info-main" v-if="clubInfo.userIdentity === 2 || (clubInfo.userIdentity === 4 && (clubInfo.status == 1 || clubInfo.status == 92))">
+          <div class="info-h1">升级信息 <span class="info-h1-tag" :class="{
 								orange: clubInfo.status == 1,
 								grey: clubInfo.status == 90,
 								warn: clubInfo.status == 92
 							}"> {{ clubInfo.status | statusFilters }} </span></div>
-      <div class="info-p">机构名称：<span>{{ clubInfo.name }}</span></div>
-      <div class="info-p">机构简称：<span>{{ clubInfo.shortName }}</span></div>
-      <div class="info-p">邮箱：<span>{{ clubInfo.contractEmail }}</span></div>
-      <div class="info-p">联系地址：<span>{{ clubInfo.provincialAddress }}{{ clubInfo.address }}</span></div>
-      <div class="info-p">营业执照编号：<span>{{ clubInfo.socialCreditCode }}</span></div>
-      <div class="info-p">营业执照:</div>
-      <div class="info-img"><img :src="clubInfo.businessLicense" alt=""></div>
-      <div class="info-p" v-if="clubInfo.shopPhoto">门头照:</div>
-      <div class="info-img"  v-if="clubInfo.shopPhoto"><img :src="clubInfo.shopPhoto" alt=""></div>
-      <div class="info-p">机构类型：<span>{{ clubInfo.firstClubType | FirstFormat }}</span></div>
-      <div class="info-p" v-if="clubInfo.medicalPracticeLicense">医疗许可证：</div>
-      <div class="info-img" v-if="clubInfo.medicalPracticeLicense"><img :src="clubInfo.medicalPracticeLicense" alt=""></div>
-      <div class="info-p" v-if="clubInfo.secondClubType">科室：<span>{{ clubInfo.secondClubType | TwoFormat}}</span></div>
-      <div class="info-p">主营内容：<span>{{ clubInfo.mainProduct }}</span></div>
-    </div>
-    <div class="info-main" v-if="clubInfo.contractPhone || clubInfo.fax || clubInfo.profile">
-      <div class="info-h1">其他信息</div>
-      <div class="info-p" v-if="clubInfo.contractPhone">固定电话：<span>{{ clubInfo.contractPhone ? clubInfo.contractPhone :'无' }}</span></div>
-      <div class="info-p" v-if="clubInfo.fax">传真：<span>{{ clubInfo.fax ? clubInfo.fax : '无' }}</span></div>
-      <div class="info-p" v-if="clubInfo.profile">公司介绍：<span>{{ clubInfo.profile ? clubInfo.profile : '无' }}</span></div>
+          <div class="info-p">机构名称：<span>{{ clubInfo.name }}</span></div>
+          <div class="info-p">机构简称：<span>{{ clubInfo.shortName }}</span></div>
+          <div class="info-p">邮箱：<span>{{ clubInfo.contractEmail }}</span></div>
+          <div class="info-p">联系地址：<span>{{ clubInfo.provincialAddress }}{{ clubInfo.address }}</span></div>
+          <div class="info-p">营业执照编号：<span>{{ clubInfo.socialCreditCode }}</span></div>
+          <div class="info-p">营业执照:</div>
+          <div class="info-img"><img :src="clubInfo.businessLicense" alt=""></div>
+          <div class="info-p" v-if="clubInfo.shopPhoto">门头照:</div>
+          <div class="info-img"  v-if="clubInfo.shopPhoto"><img :src="clubInfo.shopPhoto" alt=""></div>
+          <div class="info-p">机构类型：<span>{{ clubInfo.firstClubType | FirstFormat }}</span></div>
+          <div class="info-p" v-if="clubInfo.medicalPracticeLicense">医疗许可证：</div>
+          <div class="info-img" v-if="clubInfo.medicalPracticeLicense"><img :src="clubInfo.medicalPracticeLicense" alt=""></div>
+          <div class="info-p" v-if="clubInfo.secondClubType">科室：<span>{{ clubInfo.secondClubType | TwoFormat}}</span></div>
+          <div class="info-p">主营内容：<span>{{ clubInfo.mainProduct }}</span></div>
+        </div>
+        <div class="info-main" v-if="clubInfo.contractPhone || clubInfo.fax || clubInfo.profile">
+          <div class="info-h1">其他信息</div>
+          <div class="info-p" v-if="clubInfo.contractPhone">固定电话：<span>{{ clubInfo.contractPhone ? clubInfo.contractPhone :'无' }}</span></div>
+          <div class="info-p" v-if="clubInfo.fax">传真：<span>{{ clubInfo.fax ? clubInfo.fax : '无' }}</span></div>
+          <div class="info-p" v-if="clubInfo.profile">公司介绍：<span>{{ clubInfo.profile ? clubInfo.profile : '无' }}</span></div>
+        </div>
+      </div>
     </div>
-  </div>
-  <div class="info-button" v-if="clubInfo.spType === 0">
+  </template>
+  <div class="info-button" style="display: none;">
     <a href="javascript:void(0)" class="btn" @click="showPopup">分配销售</a>
   </div>
   <!--优惠券弹窗-->