Merge branch 'master' into feature/v4.9.5

src/jfw/modules/app/src/web/templates/me/account/phone_change.html

@@ -88,6 +88,7 @@
     <script src=//cdn-common.jianyu360.com/cdn/lib/vant/2.12.24/lib/vant.min.js></script>
     <script src=//cdn-common.jianyu360.com/cdn/lib/zepto/1.2.0/zepto.min.js></script>
     {{include "/big-member/commonjs.html"}}
+    <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/common.js?v={{Msg "seo" "version"}}'></script>
     <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/me/js/phone_bind.js?v={{Msg "seo" "version"}}'></script>
     {{include "/common/baiducc.html"}}
 </body>

src/web/staticres/common-module/vipsubscribe/css/vip-subscribe-set-template.css

@@ -747,3 +747,35 @@
     font-weight: 400;
     line-height: 26px;
 }
+.vip-body .keywords .item-l .icon-bangzhu {
+  color: #2cb7ca;
+  font-size: 0.36rem;
+}
+.oldUserTips .keywordContent{
+  width: 6.06rem;
+  position: absolute;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%,-50%);
+  /* background-color: #fff; */
+}
+.oldUserTips .keywordContent img{
+  width: 100%;
+  display: block;
+  
+}
+.oldUserTips .keywordContent .keywordBtn{
+  width: 4.78rem;
+  height: 0.8rem;
+  border-radius: 0.4rem;
+  background-color: #2ABED1;
+  color: #fff;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  font-size: 0.36rem;
+  position: absolute;
+  bottom: 0.56rem;
+  left: 50%;
+  transform: translateX(-50%);
+}

src/web/staticres/common-module/vipsubscribe/js/vip-subscribe-set-template.js

@@ -63,6 +63,7 @@ var subScribeTemplate = `
           <span class="item-l">
             <span class="leading jy-icon-keywords"></span>
             <span class="item-label">关键词</span>
+            <i class="iconfont icon-bangzhu" @click.stop.prevent=" keywordTip = true"></i>
           </span>
           <span class="item-r">
             <span class="item-r-text keywords-text ellipsis">请设置关键词</span>
@@ -213,6 +214,13 @@ var subScribeTemplate = `
         </div>
     </div>
   </div>
+  <!-- 关键词说明弹窗 -->
+  <div class="oldUserTips" v-show="keywordTip">
+    <div class = "keywordContent">
+    <img src="/common-module/vipsubscribe/image/keyword-tip.png" />
+    <div class="keywordBtn" @click="keywordTip = false">我知道了</div>
+    </div>
+  </div>
   <van-overlay class-name="step-overlay" :show="false" @click="activity.blink = ''" />
   <van-popup 
    v-if="vSwitch !== 'f'"
@@ -353,6 +361,7 @@ var subComponent = {
       infoTypeData: [], // 信息类型选择列表
       conf: {}, // 信息类型数据
       noAreaFreeType: false, // 免费用户未设置地区时显示弹窗
+      keywordTip:false,// 关键词弹窗
       backTipShowCount: 0, // 离开页面展示弹窗次数
       UserSubscribe: {}, // 免费用户数据
       activityActive: false,