Merge remote-tracking branch 'origin/release/v4.7.57' into release/v4.7.57

src/jfw/modules/app/src/web/staticres/jyapp/me/js/phone_bind.js

@@ -386,7 +386,7 @@ var vm = new Vue({
                             _this.afterSetPhoneSuccess()
                         }
                     } else if (state == 2) {
-                        location.replace('/jyapp/frontPage/userMerge/free/index?token=' + _this.token)
+                        location.replace('/jyapp/frontPage/userMerge/free/index?from=bindPhone&token=' + _this.token)
                     }
                 })
             } else {

src/jfw/modules/app/src/web/templates/frontRouter/userMerge/free/confirm.html

@@ -96,6 +96,8 @@
             data: {
                 neverRemind: false, // 不再提醒
                 checkedColor: '#2CB7CA',
+                // from默认为'', 值为bindPhone时表示从手机号绑定页面/jyapp/account/phone/bind?mode=mergeBind过来的
+                from: '',
                 token: '',
                 userName:{
                     wx:'',
@@ -118,6 +120,10 @@
             },
             created () {
                 this.token = utils.getParam('token')
+                var from = utils.getParam('from')
+                if (from) {
+                    this.from = from
+                }
                 this.getInfo()
             },
             methods: {
@@ -237,7 +243,16 @@
                     this.confirmRequest(this.successCallback)
                 },
                 successCallback: function () {
-                    history.go(-2)
+                    if (this.from === 'bindPhone') {
+                        // 清空缓存，并回首页
+                        sessionStorage.clear()
+                        JyObj.backUrl('H')
+                        JyObj.refreshAppointTab('subscribe', 1)
+                        JyObj.refreshAppointTab('box', 1)
+                        JyObj.refreshAppointTab('me', 1)
+                    } else {
+                        history.go(-2)
+                    }
                 },
                 noticeHandle: function(){
                     var html = '<p>合并须知：</p><p>1.账号合并为手机号和微信号进行合并绑定，两个账号内功能、剑鱼币、优惠券等均可合并。</p><p>2.账号信息将根据您选择的账号进行保留，未被选择的账号信息将被舍弃，请慎重选择。</p><p>3.账号合并后，您使用微信或手机号进行登录，将看到并使用相同的功能设置，共同使用账号内的功能、剑鱼币、优惠券等。</p><p>4.如您选择确认合并，则默认为您已阅读并同意此须知。</p>'

src/jfw/modules/app/src/web/templates/frontRouter/userMerge/free/index.html

@@ -68,6 +68,8 @@
             delimiters: ['${', '}'],
             el: '#merge-prompt',
             data: {
+                // from默认为'', 值为bindPhone时表示从手机号绑定页面/jyapp/account/phone/bind?mode=mergeBind过来的
+                from: '',
                 token: '',
                 userName:{
                     wx:'',
@@ -114,6 +116,10 @@
             },
             created () {
                 this.token = utils.getParam('token')
+                var from = utils.getParam('from')
+                if (from) {
+                    this.from = from
+                }
                 this.getInfo()
             },
             methods: {
@@ -176,9 +182,9 @@
                     }
                 },
                 nextStep: function () {
-                    var url = './confirm'
+                    var url = `./confirm?from=${this.from}`
                     if (this.token) {
-                        url = './confirm?token=' + this.token
+                        url = `./confirm?token=${this.token}&from=${this.from}`
                     }
                     location.href = url
                 },

src/web/templates/frontRouter/pc/brand/free/index.html

@@ -389,7 +389,7 @@
         <p class="name">服务热线</p>
         <img src="{{Msg "seo" "cdn"}}/brand/img/kefuQR.png?v={{Msg "seo" "version"}}" alt="" class="qr">
         <p class="phone">400-108-6670</p>
-        <p class="desc">8:50-18:00</p>
+        <p class="desc">工作日：9:00-17:40</p>
       </div>
       <div class="item">
         <p class="tit">市场合作</p>