fix: 解决冲突

apps/bigmember_pc/src/api/modules/public.js

@@ -165,13 +165,14 @@ export function getZhiMaFilterData() {
   })
 }
 
-<<<<<<< HEAD
 // 是否订阅（标讯搜索）
 export function getIsSubscribe() {
   return request({
     url: '/publicapply/subscribe/isSub',
     method: 'post'
-=======
+  })
+}
+
 // 功能引导(阳光直采)
 export function showFunctionGuide(data) {
   data = qs.stringify(data)
@@ -179,6 +180,5 @@ export function showFunctionGuide(data) {
     url: '/publicapply/userbase/tipInfo',
     method: 'POST',
     data
->>>>>>> main
   })
 }

apps/mobile/src/views/article/content.vue

@@ -123,11 +123,7 @@
               />
             </van-tab>
           </van-tabs>
-<<<<<<< HEAD
-          <template v-if="!canRead">
-=======
           <template v-if="!canReadConf.show">
->>>>>>> main
             <FreeUserAdvancedMask
               v-if="content.isNiJian || content.isCaigouyixiang"
               :type="content.isNiJian ? 'nijian' : 'caigouyixiang'"
@@ -407,7 +403,10 @@ export default {
       return this.expandModel.recommendCustomers?.isPower
     },
     getContentAdID() {
-<<<<<<< HEAD
+      const sun = this.IsSunPublishContent ? '-sun' : ''
+      return (this.$envs.inWX ? 'jy' : 'jyapp') + `${sun}-wxcontent-bottom`
+    },
+    getContentAdID() {
       return (this.$envs.inWX ? 'jy' : 'jyapp') + '-wxcontent-bottom'
     },
     // 是否展示绑定手机号弹窗
@@ -418,10 +417,6 @@ export default {
     // 从baseInfo获取是否绑定手机号（P607新增）
     isBindPhone() {
       return this.bindPhone
-=======
-      const sun = this.IsSunPublishContent ? '-sun' : ''
-      return (this.$envs.inWX ? 'jy' : 'jyapp') + `${sun}-wxcontent-bottom`
->>>>>>> main
     }
   },
   async created() {