Эх сурвалжийг харах

Merge branch 'dev/v1.0.94_yf' of jianyu/web into feature/v1.0.94

yangfeng 4 сар өмнө
parent
commit
839f4db17d

+ 11 - 7
apps/mobile/src/components/footer-tabbar/index.vue

@@ -173,14 +173,18 @@ export default {
       this.setActiveIcon(key)
       this.$emit('change', item)
       if (!this.isLogin) {
-        if (item.key === 'subscribe') {
-          // TODO 跳转到订阅引导页
-          location.replace('/jyapp/freesubscribe/')
-        } else if (item.key === 'box') {
-          // TODO 跳转到工作台引导页
-          location.replace('/jyapp/workbench/')
-        } else {
+        if (this.$env.platform === 'app') {
           callChangeTab(item.key, this.$router)
+        } else {
+          if (item.key === 'subscribe') {
+            // TODO 跳转到订阅引导页
+            location.replace('/jyapp/freesubscribe/')
+          } else if (item.key === 'box') {
+            // TODO 跳转到工作台引导页
+            location.replace('/jyapp/workbench/')
+          } else {
+            callChangeTab(item.key, this.$router)
+          }
         }
       } else {
         if (item.key === 'message') {

+ 18 - 10
apps/mobile/src/views/ai-search/index.vue

@@ -35,7 +35,7 @@ const rightAction = ref({
 })
 
 const canShowDoBackHome = ref(true)
-function doBackHome () {
+function doBackHome() {
   trickClick(`退出页面-首页`)
   return openAppOrWxPage(LINKS.首页, {
     query: {
@@ -47,7 +47,7 @@ function doBackHome () {
 
 function doBack() {
   trickClick(`退出页面`)
-  if (history.length === 1) {
+  if (history.length === 1 && that.$env.platform === 'wx') {
     if (needBindPhone.value) {
       checkBindPhone(true)
     } else {
@@ -597,7 +597,7 @@ function doSelectQuestionType(item) {
   })
 }
 
-function fixSwipeResize () {
+function fixSwipeResize() {
   that.$nextTick(() => {
     if (promptEle.value) {
       promptEle.value.resize()
@@ -891,7 +891,7 @@ function echoPageState() {
   }
 }
 
-function triggerFocus () {
+function triggerFocus() {
   questionInputEl.value.focus()
   that.$nextTick(() => {
     questionInputEl.value.focus()
@@ -947,7 +947,12 @@ init()
         </div>
       </div>
       <div>
-        <span v-if='canShowDoBackHome' class="back-icon" style='margin-right: 2px;padding-right: 6px;' @click='doBackHome'>
+        <span
+          v-if="canShowDoBackHome"
+          class="back-icon"
+          style="margin-right: 2px; padding-right: 6px"
+          @click="doBackHome"
+        >
           <i class="iconfont icon-nav_un_home" />
         </span>
         <Popover
@@ -959,14 +964,17 @@ init()
           @select="onSelectRightAction"
         >
           <template #reference>
-          <span class="right-icon">
-            <i class="iconfont icon-gengduo-shuxiang" />
-          </span>
+            <span class="right-icon">
+              <i class="iconfont icon-gengduo-shuxiang" />
+            </span>
           </template>
         </Popover>
-        <div class='bind-phone-popup' v-if="needBindPhone" @click="checkBindPhone"></div>
+        <div
+          class="bind-phone-popup"
+          v-if="needBindPhone"
+          @click="checkBindPhone"
+        ></div>
       </div>
-
     </div>
 
     <div class="ai-search--content j-main" ref="contentEl">

+ 0 - 15
apps/mobile/src/views/article/components/ContentAbstract.vue

@@ -37,7 +37,6 @@
               'highlight-text underline clickable': summaryMap.buyer?.link
             }"
             @click="goToBuyerPortrait(summaryMap.buyer, 'link')"
-            v-bound-phone="bindPhoneGoToBuyerPortrait(summaryMap.buyer, 'link')"
           >
             {{ summaryMap.buyer?.value }}
           </span>
@@ -137,7 +136,6 @@
               'free-view': summaryMap.buyer?.isFreeView
             }"
             @click="goToBuyerPortrait(summaryMap.buyer, 'link')"
-            v-bound-phone="bindPhoneGoToBuyerPortrait(summaryMap.buyer, 'link')"
           >
             {{ summaryMap.buyer?.value }}
           </span>
@@ -176,9 +174,6 @@
               v-if="summaryMap.buyer?.link && summaryMap.buyerContactInfo?.tel"
               class="abstract-line-value-action more-tel clickable"
               @click="goToBuyerPortrait(summaryMap.buyer, 'tel')"
-              v-bound-phone="
-                bindPhoneGoToBuyerPortrait(summaryMap.buyer, 'tel')
-              "
             >
               <span class="a-l-v-a-text">更多联系人</span>
               <van-icon name="arrow" />
@@ -530,16 +525,6 @@ export default {
           from: encodeURIComponent(location.href)
         }
       })
-    },
-    bindPhoneGoToBuyerPortrait(item, anchor) {
-      return {
-        props: {
-          name: `标讯详情页-采购单位点击查看`
-        },
-        next: () => {
-          this.goToBuyerPortrait(item, anchor)
-        }
-      }
     }
   }
 }

+ 11 - 14
apps/mobile/src/views/article/content.vue

@@ -682,22 +682,19 @@ export default {
           name: '标讯详情页-采购联系人/联系电话'
         },
         next: () => {
-          goToFreeViewPage()
+          this.beforeLeavePage()
+          let source = 'peugeot_view_infor'
+          if (this.toBCustom) {
+            source = `${this.$env.platform}_sunlight_viewdetails`
+          }
+          openAppOrWxPage(LINKS.留资, {
+            query: {
+              source,
+              infoid: this.content.id
+            }
+          })
         }
       })
-      function goToFreeViewPage() {
-        this.beforeLeavePage()
-        let source = 'peugeot_view_infor'
-        if (this.toBCustom) {
-          source = `${this.$env.platform}_sunlight_viewdetails`
-        }
-        openAppOrWxPage(LINKS.留资, {
-          query: {
-            source,
-            infoid: this.content.id
-          }
-        })
-      }
     },
     beforeLeavePage() {
       this.saveStateToStorage()

+ 0 - 1
apps/mobile/src/views/search/result/sun/index.vue

@@ -134,7 +134,6 @@
                 <span
                   class="buyer-item link-clickable"
                   @click.stop="toToBuyerProfile(item.text)"
-                  v-bound-phone="bindPhoneToBuyerProfile(item.text)"
                   >{{ item.text }}</span
                 >
               </template>