Merge branch 'dev4.6.3.2' of http://192.168.3.207:8080/qmx/jy into dev4.6.3.2

src/jfw/active/21yearEndReport.go

@@ -43,7 +43,12 @@ func init() {
 //YearEndReport 21年，年终报告
 type YearEndReport struct {
 	*xweb.Action
-	yearEndReportPage xweb.Mapper `xweb:"/active/yearEndReport"` //21年终报告wx页面
+	yearEndReportPage   xweb.Mapper `xweb:"/active/yearEndReport"`       //21年终报告wx页面
+	yearEndReportResult xweb.Mapper `xweb:"/active/yearEndReportResult"` //21年终报告wx结果页面
+}
+
+func (this *YearEndReport) YearEndReportResult() error {
+	return this.Render("/active/yearEndReport/result.html")
 }
 
 func (this *YearEndReport) YearEndReportPage() error {

src/jfw/modules/app/src/app/active/21yearEndReport.go

@@ -34,7 +34,12 @@ func init() {
 //YearEndReport 21年，年终报告
 type YearEndReport struct {
 	*xweb.Action
-	yearEndReportPage xweb.Mapper `xweb:"/jyapp/active/yearEndReport"` //21年终报告app页面
+	yearEndReportPage   xweb.Mapper `xweb:"/jyapp/active/yearEndReport"`       //21年终报告app页面
+	yearEndReportResult xweb.Mapper `xweb:"/jyapp/active/yearEndReportResult"` //21年终报告app结果页面
+}
+
+func (this *YearEndReport) YearEndReportResult() error {
+	return this.Render("/active/yearEndReport/result.html")
 }
 
 func (this *YearEndReport) YearEndReportPage() error {

src/jfw/modules/app/src/web/templates/active/yearEndReport/index.html

@@ -50,15 +50,15 @@
                 <div class="slide-inner">
                     <div class="report-page page-1">
                         <div class="user-info-group">
-                            <img animate-name="up" animate-delay="600" class="jy-user-img" :src="pageInfo.user_head" alt="">
-                            <p animate-name="up" animate-delay="600" class="jy-user-name">Hi~<span>${pageInfo.user_name}</span></p>
+                            <img v-show="pageInfo.user_head" @error="pageInfo.user_head = '/images/auto.png'" animate-name="up" animate-delay="600" class="jy-user-img" :src="pageInfo.user_head" alt="">
+                            <p animate-name="up" animate-delay="600" class="jy-user-name">Hi~<span v-show="pageInfo.user_name">${pageInfo.user_name}</span></p>
                             <p animate-name="up" animate-delay="200" class="tip-info">
                                 <span class="text-hello">欢迎来到你的...</span>
                                 <span>2021剑鱼之旅</span>
                             </p>
                             <div class="read_pact" animate-name="up" animate-delay="800">
                                 <input @change="changeReadPact" v-model="readPact" type="checkbox" id="read" name="read_pact" value="read_pact">
-                                <label for="read">同意剑鱼统计我的使用数据，</label><a href="">查看授权协议</a>
+                                <label for="read">同意剑鱼统计我的使用数据，</label><a href="/jyapp/free/staticPage/privacy_rules.html">查看授权协议</a>
                             </div>
                         </div>
                         <div animate-name="up" animate-delay="500" class="go-report">
@@ -78,10 +78,10 @@
                 <div class="slide-inner">
                     <div class="report-page page-2">
                         <div class="meet">
-                            <p animate-name="up" animate-delay="200" class="hello">醉纸鸢，你好呀！</p>
+                            <p animate-name="up" animate-delay="200" class="hello">${pageInfo.user_name}，你好呀！</p>
                             <p animate-name="up" animate-delay="400" style="margin-top: 0.32rem; margin-left: 1.54rem;">
                                 <span class="text">还记得</span>
-                                <span class="time">2019年3月27日</span>
+                                <span class="time">${pageInfo.registration_time}</span>
                                 <span class="text">吗？</span>
                             </p>
                             <div class="star-two">
@@ -110,7 +110,7 @@
                         <div class="usage-days">
                             <div class="today">今天</div>
                             <div class="text">是我们一起同行的</div>
-                            <div class="days">第732天</div>
+                            <div class="days">第${pageInfo.total_days}天</div>
                         </div>
                         <div class="star-three">
                             <img class="swiper-lazy" data-src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/P3/star-three.png" alt="">
@@ -139,7 +139,7 @@
                                 <div class="jin">近一年</div>
                                 <div class="day">
                                     <div class="ty">你登录了</div>
-                                    <div class="days">279天</div>
+                                    <div class="days">${pageInfo.login_days}天</div>
                                     <div class="ty">剑鱼标讯</div>
                                 </div>
                             </div>
@@ -154,7 +154,7 @@
                             </div>
                             <div class="text-2">
                                 <div class="night">
-                                    <div class="big-day">有138天</div>
+                                    <div class="big-day">有${pageInfo.active_days}天</div>
                                     <div class="ty">的深夜</div>
                                 </div>
                                 <div class="ty" style="margin-left: 2.52rem;">仍在使用剑鱼标讯</div>
@@ -207,7 +207,7 @@
                         <div class="message">
                             <div class="year">近一年</div>
                             <div class="you">你一共浏览了</div>
-                            <div class="num">73699条</div>
+                            <div class="num">${pageInfo.view_total}条</div>
                             <div class="xiangmu">项目信息</div>
                             <div class="ball-six"><img class="swiper-lazy" data-src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/P6/ball-six.png" alt=""></div>
                             <div class="group-six"><img class="swiper-lazy" data-src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/P6/group-six.png" alt=""></div>
@@ -245,7 +245,7 @@
                         <div class="sum">
                             <div class="year">近一年</div>
                             <div class="you">你搜索了</div>
-                            <div class="num">3654次</div>
+                            <div class="num">${pageInfo.search_total}次</div>
                             <div class="xd-seven"><img class="swiper-lazy" data-src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/P7/xd-seven.png" alt=""></div>
                             <div class="text-bottom">求索力让你的成功触手可及</div>
                             <div class="btn-next">
@@ -260,7 +260,7 @@
                     <div class="report-page page-8">
                         <div class="friend">
                             <div class="year">近一年</div>
-                            <div class="num">765个</div>
+                            <div class="num">${pageInfo.follow_total}个</div>
                             <div class="you">企业成为你的新朋友</div>
                             <div class="ball-eight"><img class="swiper-lazy" data-src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/P8/ball-eight.png" alt=""></div>
                             <div class="xd-eight"><img class="swiper-lazy" data-src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/P8/xd-eight.png" alt=""></div>
@@ -282,7 +282,7 @@
                         <div class="mouth">
                             <div class="year">
                                 <p class="nian" style="display: contents">近一年，</p>
-                                <span class="yue" style="color: #70EEFF;">7月</span>
+                                <span class="yue" style="color: #70EEFF;">${pageInfo.active_month}月</span>
                             </div>
                             <div class="you">是你最繁忙的时候</div>
                             <div><img class="swiper-lazy" data-src="" alt=""></div>
@@ -292,7 +292,7 @@
                                 <div class="text">追梦的你，满怀热忱</div>
                             </div>
                             <div class="banner-yue">
-                                <div class="banner-yue-one">7</div>
+                                <div class="banner-yue-one">${pageInfo.active_month}</div>
                                 <div class="banner-yue-two">月</div>
                             </div>
                             <div class="ball-nine"><img class="swiper-lazy" data-src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/P9/ball-nine.png" alt=""></div>
@@ -321,7 +321,7 @@
                             </div>
                             <p class="year">近一年</p>
                             <div class="you">你关注的行业累计发布了</div>
-                            <span class="num">3698条</span>
+                            <span class="num">${pageInfo.industry_total}条</span>
                             <div class="gonggao">项目公告</div>
                             <div class="text-bottom">
                                 <div class="text">即使受到疫情的影响</div>
@@ -381,8 +381,8 @@
                                 <div class="text-1" style="margin-top: 0.16rem;">跌宕且绮丽的2021已结束</div>
                                 <div class="text-3">凛冬散尽，星河长明</div>
                                 <div class="text-1" style="margin-top: 1.04rem;">为你生成2021年度角色报告</div>
-                                <div class="btn">
-                                    <div class="sc">生成报告</div>
+                                <div animate-name="up" animate-delay="500" class="btn">
+                                    <div class="go-button" @click="goResult">生成报告</div>
                                 </div>
                                 <div class="xd-twelve">
                                     <img class="swiper-lazy" data-src="{{Cdns .Host "seo" "cdn"|SafeUrl}}/common-module/yearEndReport/images/P12/xd-twelve.png" alt="">
@@ -526,7 +526,7 @@
 <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 
 <!--S-提前需要预加载的资源-->
-<link rel="prefetch" as="html" href="./result.html"/>
+<link rel="prefetch" as="html" href="./yearEndReportResult"/>
 <link rel="prefetch" as="script" href="https://cdn-common.jianyu360.com/cdn/lib/html2canvas/1.1.2/dist/html2canvas.min.js"/>
 <!--E-提前需要预加载的资源-->
 <script>
@@ -686,13 +686,59 @@
             }
         },
         created: function () {
-
+            this.getPageInfo()
         },
         mounted: function () {
             initPlayMusic()
             initSwiper.bind(this)()
         },
         methods: {
+            goResult: function () {
+              location.href = './yearEndReportResult'
+            },
+            getPageInfo: function () {
+                var _this = this
+                $.ajax({
+                    url: '/publicapply/active/yearEndReport',
+                    type: 'GET',
+                    success: function (res) {
+                        console.log(res)
+                    },
+                    error: function () {
+                        var res = {
+                            "error_code": 0,
+                            "error_msg": "",
+                            "data": {
+                                "user_name": "微信",
+                                "user_head": "/upload/2021/03/26/2021032609182610879.jpg",
+                                "registration_time": 1462779190,
+                                "login_days": 108,
+                                "active_days": 11,
+                                "view_total": 175,
+                                "search_total": 67,
+                                "follow_total": 17,
+                                "active_month": 11,
+                                "industry_total": 680708,
+                                "exp_list": [
+                                    "大会员",
+                                    "超级订阅"
+                                ],
+                                "focus_project": [
+                                    "计算机",
+                                    "信息技术"
+                                ],
+                                "total_days": 2076,
+                                "is_new": false,
+                                "result": 7,
+                                "share_link": "https://web-wky.jydev.jianyu360.com/active/yearEndReport?from=share"
+                            }
+                        }
+                        if (res && res.error_msg === '' && res.data) {
+                            _this.pageInfo = res.data
+                        }
+                    }
+                })
+            },
             changeReadPact: function () {
                 if (this.$swiper.activeIndex === 0 && this.readPact) {
                     return

src/web/staticres/common-module/yearEndReport/css/index.css

@@ -1362,22 +1362,10 @@ margin-top: 0.43rem;
   text-align: center;
   width: 4.56rem;
   height: 0.96rem;
-  background: linear-gradient(180deg, #FFFFFF 0%, #57FFF5 100%);
-  box-shadow: 0rem 0.08rem 0.32rem 0.02rem rgba(8, 31, 38, 0.08);
-  opacity: 1;
   border-radius: 0.48rem;
   margin-top: 0.2rem;
 }
-.page-12 .sc{
-  background: linear-gradient(180deg, #57FFF5 0%, #FFFFFF 100%);
-  box-shadow: 0px 0.08rem 0.32rem 1px rgba(8, 31, 38, 0.08);
-  font-size: 0.4rem;
-  line-height: 0.96rem;
-  font-weight: bold;
-  color: #10616B;
-  letter-spacing: 0.06rem;
-  border-radius: 0.48rem;
-}
+
 .page-12 .sm-star-twelve{
     position: absolute;
     top: 4.06rem;
@@ -1393,6 +1381,7 @@ margin-top: 0.43rem;
   position: absolute;
   bottom: 0rem;
   left: 0rem;
+  z-index: -1;
 }
 .page-12 .xd-twelve img{
   width: 100%;
@@ -1519,7 +1508,7 @@ margin: 0;
   width: 9.14rem;
 
   z-index: -1;
-  
+
 }
 .page-new-0  .fish-zero img{
   width: 100%;
@@ -1667,9 +1656,9 @@ margin-top: 0.32rem;
   height: 1.4rem;
   background: #171826;
   border-radius: 0.16rem 0.16rem 0.16rem 0.16rem;
-  opacity: 0.3;  
+  opacity: 0.3;
   margin-left: 1.58rem;
-  margin-top: 0.72rem;  
+  margin-top: 0.72rem;
 }
 .page-10-kong .text-zg div{
   font-size: 0.24rem;
@@ -1795,7 +1784,7 @@ margin-top: 2.56rem;
   width: 4.56rem;
   height: 0.96rem;
   background: linear-gradient(180deg, #57FFF5 0%, #FFFFFF 100%);
-  opacity: 1; 
+  opacity: 1;
   font-size: 0.4rem;
   font-family: PingFang SC-Bold, PingFang SC;
   font-weight: bold;

src/web/templates/active/yearEndReport/index.html

@@ -50,15 +50,15 @@
                 <div class="slide-inner">
                     <div class="report-page page-1">
                         <div class="user-info-group">
-                            <img animate-name="up" animate-delay="600" class="jy-user-img" :src="pageInfo.user_head" alt="">
-                            <p animate-name="up" animate-delay="600" class="jy-user-name">Hi~<span>${pageInfo.user_name}</span></p>
+                            <img v-show="pageInfo.user_head" @error="pageInfo.user_head = '/images/auto.png'" animate-name="up" animate-delay="600" class="jy-user-img" :src="pageInfo.user_head" alt="">
+                            <p animate-name="up" animate-delay="600" class="jy-user-name">Hi~<span v-show="pageInfo.user_name">${pageInfo.user_name}</span></p>
                             <p animate-name="up" animate-delay="200" class="tip-info">
                                 <span class="text-hello">欢迎来到你的...</span>
                                 <span>2021剑鱼之旅</span>
                             </p>
                             <div class="read_pact" animate-name="up" animate-delay="800">
                                 <input @change="changeReadPact" v-model="readPact" type="checkbox" id="read" name="read_pact" value="read_pact">
-                                <label for="read">同意剑鱼统计我的使用数据，</label><a href="">查看授权协议</a>
+                                <label for="read">同意剑鱼统计我的使用数据，</label><a href="/front/staticPage/privacy_rules.html">查看授权协议</a>
                             </div>
                         </div>
                         <div animate-name="up" animate-delay="500" class="go-report">
@@ -78,10 +78,10 @@
                 <div class="slide-inner">
                     <div class="report-page page-2">
                         <div class="meet">
-                            <p animate-name="up" animate-delay="200" class="hello">醉纸鸢，你好呀！</p>
+                            <p animate-name="up" animate-delay="200" class="hello">${pageInfo.user_name}，你好呀！</p>
                             <p animate-name="up" animate-delay="400" style="margin-top: 0.32rem; margin-left: 1.54rem;">
                                 <span class="text">还记得</span>
-                                <span class="time">2019年3月27日</span>
+                                <span class="time">${pageInfo.registration_time}</span>
                                 <span class="text">吗？</span>
                             </p>
                             <div class="star-two">
@@ -110,7 +110,7 @@
                         <div class="usage-days">
                             <div class="today">今天</div>
                             <div class="text">是我们一起同行的</div>
-                            <div class="days">第732天</div>
+                            <div class="days">第${pageInfo.total_days}天</div>
                         </div>
                         <div class="star-three">
                             <img class="swiper-lazy" data-src="{{Msg "seo" "cdn"}}/common-module/yearEndReport/images/P3/star-three.png" alt="">
@@ -139,7 +139,7 @@
                                 <div class="jin">近一年</div>
                                 <div class="day">
                                     <div class="ty">你登录了</div>
-                                    <div class="days">279天</div>
+                                    <div class="days">${pageInfo.login_days}天</div>
                                     <div class="ty">剑鱼标讯</div>
                                 </div>
                             </div>
@@ -154,7 +154,7 @@
                             </div>
                             <div class="text-2">
                                 <div class="night">
-                                    <div class="big-day">有138天</div>
+                                    <div class="big-day">有${pageInfo.active_days}天</div>
                                     <div class="ty">的深夜</div>
                                 </div>
                                 <div class="ty" style="margin-left: 2.52rem;">仍在使用剑鱼标讯</div>
@@ -207,7 +207,7 @@
                         <div class="message">
                             <div class="year">近一年</div>
                             <div class="you">你一共浏览了</div>
-                            <div class="num">73699条</div>
+                            <div class="num">${pageInfo.view_total}条</div>
                             <div class="xiangmu">项目信息</div>
                             <div class="ball-six"><img class="swiper-lazy" data-src="{{Msg "seo" "cdn"}}/common-module/yearEndReport/images/P6/ball-six.png" alt=""></div>
                             <div class="group-six"><img class="swiper-lazy" data-src="{{Msg "seo" "cdn"}}/common-module/yearEndReport/images/P6/group-six.png" alt=""></div>
@@ -245,7 +245,7 @@
                         <div class="sum">
                             <div class="year">近一年</div>
                             <div class="you">你搜索了</div>
-                            <div class="num">3654次</div>
+                            <div class="num">${pageInfo.search_total}次</div>
                             <div class="xd-seven"><img class="swiper-lazy" data-src="{{Msg "seo" "cdn"}}/common-module/yearEndReport/images/P7/xd-seven.png" alt=""></div>
                             <div class="text-bottom">求索力让你的成功触手可及</div>
                             <div class="btn-next">
@@ -260,7 +260,7 @@
                     <div class="report-page page-8">
                         <div class="friend">
                             <div class="year">近一年</div>
-                            <div class="num">765个</div>
+                            <div class="num">${pageInfo.follow_total}个</div>
                             <div class="you">企业成为你的新朋友</div>
                             <div class="ball-eight"><img class="swiper-lazy" data-src="{{Msg "seo" "cdn"}}/common-module/yearEndReport/images/P8/ball-eight.png" alt=""></div>
                             <div class="xd-eight"><img class="swiper-lazy" data-src="{{Msg "seo" "cdn"}}/common-module/yearEndReport/images/P8/xd-eight.png" alt=""></div>
@@ -282,7 +282,7 @@
                         <div class="mouth">
                             <div class="year">
                                 <p class="nian" style="display: contents">近一年，</p>
-                                <span class="yue" style="color: #70EEFF;">7月</span>
+                                <span class="yue" style="color: #70EEFF;">${pageInfo.active_month}月</span>
                             </div>
                             <div class="you">是你最繁忙的时候</div>
                             <div><img class="swiper-lazy" data-src="" alt=""></div>
@@ -292,7 +292,7 @@
                                 <div class="text">追梦的你，满怀热忱</div>
                             </div>
                             <div class="banner-yue">
-                                <div class="banner-yue-one">7</div>
+                                <div class="banner-yue-one">${pageInfo.active_month}</div>
                                 <div class="banner-yue-two">月</div>
                             </div>
                             <div class="ball-nine"><img class="swiper-lazy" data-src="{{Msg "seo" "cdn"}}/common-module/yearEndReport/images/P9/ball-nine.png" alt=""></div>
@@ -321,7 +321,7 @@
                             </div>
                             <p class="year">近一年</p>
                             <div class="you">你关注的行业累计发布了</div>
-                            <span class="num">3698条</span>
+                            <span class="num">${pageInfo.industry_total}条</span>
                             <div class="gonggao">项目公告</div>
                             <div class="text-bottom">
                                 <div class="text">即使受到疫情的影响</div>
@@ -381,8 +381,8 @@
                                 <div class="text-1" style="margin-top: 0.16rem;">跌宕且绮丽的2021已结束</div>
                                 <div class="text-3">凛冬散尽，星河长明</div>
                                 <div class="text-1" style="margin-top: 1.04rem;">为你生成2021年度角色报告</div>
-                                <div class="btn">
-                                    <div class="sc">生成报告</div>
+                                <div animate-name="up" animate-delay="500" class="btn">
+                                    <div class="go-button" @click="goResult">生成报告</div>
                                 </div>
                                 <div class="xd-twelve">
                                     <img class="swiper-lazy" data-src="{{Msg "seo" "cdn"}}/common-module/yearEndReport/images/P12/xd-twelve.png" alt="">
@@ -526,11 +526,13 @@
 <script src="https://cdn-common.jianyu360.com/cdn/lib/jquery/3.6.0/jquery.min.js"></script>
 
 <!--S-提前需要预加载的资源-->
-<link rel="prefetch" as="html" href="./result.html"/>
+<link rel="prefetch" as="html" href="./yearEndReportResult"/>
 <link rel="prefetch" as="script" href="https://cdn-common.jianyu360.com/cdn/lib/html2canvas/1.1.2/dist/html2canvas.min.js"/>
 <!--E-提前需要预加载的资源-->
 <script>
 
+
+
     function initSwiper() {
         var interleaveOffset = 0.5; //视差比值
 
@@ -686,13 +688,61 @@
             }
         },
         created: function () {
-
+            this.readPact = false
+            this.getPageInfo()
         },
         mounted: function () {
+            this.readPact = false
             initPlayMusic()
             initSwiper.bind(this)()
         },
         methods: {
+            goResult: function () {
+              location.href = './yearEndReportResult'
+            },
+            getPageInfo: function () {
+                var _this = this
+                $.ajax({
+                    url: '/publicapply/active/yearEndReport',
+                    type: 'GET',
+                    success: function (res) {
+                        console.log(res)
+                    },
+                    error: function () {
+                        var res = {
+                            "error_code": 0,
+                            "error_msg": "",
+                            "data": {
+                                "user_name": "微信",
+                                "user_head": "/upload/2021/03/26/2021032609182610879.jpg",
+                                "registration_time": 1462779190,
+                                "login_days": 108,
+                                "active_days": 11,
+                                "view_total": 175,
+                                "search_total": 67,
+                                "follow_total": 17,
+                                "active_month": 11,
+                                "industry_total": 680708,
+                                "exp_list": [
+                                    "大会员",
+                                    "超级订阅"
+                                ],
+                                "focus_project": [
+                                    "计算机",
+                                    "信息技术"
+                                ],
+                                "total_days": 2076,
+                                "is_new": false,
+                                "result": 7,
+                                "share_link": "https://web-wky.jydev.jianyu360.com/active/yearEndReport?from=share"
+                            }
+                        }
+                        if (res && res.error_msg === '' && res.data) {
+                            _this.pageInfo = res.data
+                        }
+                    }
+                })
+            },
             changeReadPact: function () {
                 if (this.$swiper.activeIndex === 0 && this.readPact) {
                     return