Merge branch 'feature/v1.0.29' of https://jygit.jydev.jianyu360.cn/jianyu/web into feature/v1.0.29

apps/mobile/src/composables/quick-monitor/component/QuickMonitor.vue

@@ -188,7 +188,7 @@ export default {
       const conf = confMap[this.type] || confMap.project
       // 项目监控跳转 - 商机管理跳转单独计算
       if (this.type === 'project' && conf.monitorListLinkBusiness) {
-        if (this.isEntService || this.isNewBusiness) {
+        if (this.isEntService || this.isNewBusiness || this.isBusiness) {
           conf.monitorListLink = conf.monitorListLinkBusiness
         }
       }
@@ -288,7 +288,8 @@ export default {
         if (this.popover) {
           this.showPopoverList(!this.showPopover)
         } else {
-          this.doMonitor()
+          // 点击弹窗，二次确认是否取消监控
+          this.cancelMonitor()
         }
       } else {
         this.doMonitor()

apps/mobile/src/views/article/components/ContentHeader.vue

@@ -16,11 +16,12 @@
       v-html="content.titleHighlighted"
     ></h2>
     <div class="tag-list">
-      <span
+      <a
         class="j-tag-item border gray round"
         v-for="(tag, index) in content.tags"
         :key="index"
-        >{{ tag.label }}</span>
+        :href="tag.link"
+        >{{ tag.label }}</a>
     </div>
     <div class="tag-list">
       <span

data/data-models/modules/article/transform/content.js

@@ -91,7 +91,7 @@ class CommonContentModel extends BaseModel {
 
   tranTags(data) {
     const { baseInfo } = data
-    const defaultURL = 'javascript:volid(0);'
+    const defaultURL = 'javascript:void(0);'
 
     const area = [baseInfo?.area, baseInfo?.city, baseInfo?.district]
       .filter((v) => v)
@@ -103,7 +103,7 @@ class CommonContentModel extends BaseModel {
     }
     if (baseInfo?.subType) {
       typeItem.label = baseInfo.subType
-      typeItem.link = baseInfo?.subTypeUrl
+      typeItem.link = baseInfo?.subTypeUrl || defaultURL
     }
 
     const amountItem = {