Merge branch 'dev_1.1.7' of https://git.yishihui.com/DeNet/de-net into dev_1.1.7

src/view/iframe/publish/components/nft-setting.vue

@@ -41,7 +41,7 @@
 </template>
 
 <script setup>
-import { ref, onBeforeMount, onMounted, defineEmits } from "vue";
+import { ref, onBeforeMount, onMounted, defineEmits, defineExpose } from "vue";
 import { ElMessage } from 'element-plus'
 import { listPossessNftProject } from "@/http/nft.js";
 import { throttle } from "@/uilts/help";
@@ -120,6 +120,11 @@ onBeforeMount(() => {
 onMounted(() => {
     emits('change', '');
 })
+
+
+defineExpose({
+  nftList
+})
 </script>
 
 <style scoped lang="scss">
@@ -179,4 +184,4 @@ onMounted(() => {
 .ant-radio-group {
     display: block;
 }
-</style>
+</style>

src/view/iframe/publish/tool-box/child/preview.vue

@@ -123,6 +123,10 @@ const props = defineProps({
     certNftProjectId: {
         type: String,
         default: ''
+    },
+    hasNft: {
+        type: Boolean,
+        default: false
     }
 })
 
@@ -251,7 +255,8 @@ const submitPublish = () => {
         objectType: Report.objectType.confirmButton
     }, {
       'type': Report.bizType.ToolBox,
-      'post-editor-url': convertUrl
+      'post-editor-url': convertUrl,
+      'has-nft': props.hasNft
     })
 
     postPublish(data).then((res) => {

src/view/iframe/publish/tool-box/index.vue

@@ -7,8 +7,9 @@
             :showCom="showCom"
             :defaultLinkTitle="pageData.defaultLinkTitle"
             :certNftProjectId="certNftProjectId"
+            :hasNft="hasNft"
             @publishFinish="publishFinish">
-            <nft-setting @change="changeSetting"></nft-setting>
+            <nft-setting ref="nftSettingDom" @change="changeSetting"></nft-setting>
         </preview>
     </div>
 </template>
@@ -43,12 +44,14 @@ watch(
     (newVal) => {
         showCom.value = newVal;
         if(newVal == 'PREVIEW') {
+          hasNft.value = nftSettingDom.value && nftSettingDom.value.nftList.length > 0;
           Report.reportLog({
               pageSource: Report.pageSource.previewPage,
               businessType: Report.businessType.pageView,
           }, {
             'type': Report.bizType.ToolBox,
-            'post-editor-url': previewData.convertUrl
+            'post-editor-url': previewData.convertUrl,
+            'has-nft': hasNft.value
           })
         }
     },
@@ -71,6 +74,9 @@ let screenshotWebsiteData = reactive({
     status: '',
 });
 
+let nftSettingDom = ref(null);
+let hasNft = ref(false);
+
 const changeShowCom = (params) => {
     showCom.value = 'PREVIEW';
     previewData.convertUrl = params.convertUrl;