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

src/jfw/modules/app/src/web/templates/weixin/search/tabSearch.html

@@ -578,7 +578,7 @@
                                 <div class="img-empty"></div>
                                 <span>未搜索到符合条件的企业</span>
                             </div>
-                            <div class="up-button" @click="goUpBuyPage" style="min-height: 0.64rem" v-if="showUpTip">升级会员，查看更多搜索结果</div>
+                            <div class="up-button" @click="goUpBuyPage" style="min-height: 0.64rem" v-else-if="showUpTip">升级会员，查看更多搜索结果</div>
                             <div class="ent-more-tip" v-if="false">
                                 <i class="j-icon base-icon icon-up-allow"></i>
                                 <span>上拉查看更多搜索结果</span>

src/web/staticres/common-module/ent-search/ent-search-template.js

@@ -333,7 +333,7 @@ var vEntSearchComponent = new Vue({
       }
     },
     goUpBuyPage () {
-      window.location.href = (utils.isWeiXinBrowser ? '/front' : '/jyapp') + '/vipsubscribe/upgradePage'
+      window.location.href = (utils.isWeiXinBrowser ? '/front' : '/jyapp') + '/vipsubscribe/introducePage'
     },
     getSearchParams () {
       var tempParams = {
@@ -829,7 +829,7 @@ var vMainSearchComponent = new Vue({
       }
     },
     goUpBuyPage () {
-      window.location.href = (utils.isWeiXinBrowser ? '/front' : '/jyapp') + '/vipsubscribe/upgradePage'
+      window.location.href = (utils.isWeiXinBrowser ? '/front' : '/jyapp') + '/vipsubscribe/introducePage'
     },
     getSearchParams () {
       var tempParams = {

src/web/staticres/common-module/keep-tags/keep-tags-template.js

@@ -407,7 +407,7 @@ Vue.component('keep-component', {
       })
     },
     goUpBuyPage () {
-      window.location.href = (utils.isWeiXinBrowser ? '/front' : '/jyapp') + '/vipsubscribe/upgradePage'
+      window.location.href = (utils.isWeiXinBrowser ? '/front' : '/jyapp') + '/vipsubscribe/introducePage'
     },
     togglePopStatus (type) {
       this.showKeepDialog = type

src/web/templates/weixin/search/tabSearch.html

@@ -586,7 +586,7 @@
                                 <div class="img-empty"></div>
                                 <span>未搜索到符合条件的企业</span>
                             </div>
-                            <div class="up-button" @click="goUpBuyPage" style="min-height: 0.64rem" v-if="showUpTip">升级会员，查看更多搜索结果</div>
+                            <div class="up-button" @click="goUpBuyPage" style="min-height: 0.64rem" v-else-if="showUpTip">升级会员，查看更多搜索结果</div>
                             <div class="ent-more-tip" v-if="false">
                                 <i class="j-icon base-icon icon-up-allow"></i>
                                 <span>上拉查看更多搜索结果</span>