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

apps/bigmember_pc/src/components/zhima/Example.vue → apps/bigmember_pc/src/components/zhima/select-example.vue

@@ -48,15 +48,22 @@ export default {
     }
   },
   methods: {
-    getType (type) {
-      const typeList = [null, '项目分析报告', '竞争对手分析报告', '采购单位分析报告']
-      const index = typeList.findIndex(v => type.indexOf(v) !== -1)
+    getType(type) {
+      const typeList = [
+        null,
+        '项目分析报告',
+        '竞争对手分析报告',
+        '采购单位分析报告'
+      ]
+      const index = typeList.findIndex((v) => type.indexOf(v) !== -1)
       return index
     },
     goExample({ url, name }) {
       // window.open(url)
       window.open(
-        `/swordfish/page_big_pc/report/analysis/detail?example=1&type=${this.getType(name)}&name=${this.name}&url=${encodeURIComponent(url)}`,
+        `/swordfish/page_big_pc/report/analysis/detail?example=1&type=${this.getType(
+          name
+        )}&name=${this.name}&url=${encodeURIComponent(url)}`,
         `_blank`
       )
     }
@@ -86,7 +93,7 @@ export default {
 ::v-deep {
   .report-example-popover {
     padding: 0;
-    margin-top: -10px;
+    margin-top: 0;
   }
 }
 </style>

apps/bigmember_pc/src/views/order/components/analysis-report/title.vue

@@ -19,16 +19,17 @@
       </div>
     </div>
     <div>
-      <ReportExample placement="left-end">
-        <el-button slot="reference"  class="header-guide-button" size="small">报告样例</el-button>
+      <ReportExample placement="bottom-end">
+        <el-button slot="reference" class="header-guide-button" size="small"
+          >报告样例</el-button
+        >
       </ReportExample>
-
     </div>
   </div>
 </template>
 
 <script>
-import ReportExample from '@/components/zhima/Example.vue'
+import ReportExample from '@/components/zhima/select-example.vue'
 
 const titleMaps = {
   project: '项目分析报告',

apps/bigmember_pc/src/views/reportDownload/record.vue

@@ -409,7 +409,7 @@
 import Empty from '@/components/common/Empty.vue'
 import { mapGetters } from 'vuex'
 import { getPDFDownloadRecord, getPDFPackBalance } from '@/api/modules'
-import ReportExample from '@/components/zhima/Example.vue'
+import ReportExample from '@/components/zhima/select-example.vue'
 import {
   formatIndustry,
   formatBuyerClass,
@@ -1051,4 +1051,9 @@ $char_color: #1d1d1d;
     }
   }
 }
+::v-deep {
+  .report-example-popover {
+    margin-top: -28px;
+  }
+}
 </style>

apps/mobile/src/components/select-report-example/index.vue

@@ -1,8 +1,13 @@
 <template>
-  <div class='select-report-example-container'>
-    <common-dialog-select v-model='show' :title='title' :list='list' @select='doSelect'>
+  <div class="select-report-example-container">
+    <common-dialog-select
+      v-model="show"
+      :title="title"
+      :list="list"
+      @select="doSelect"
+    >
     </common-dialog-select>
-    <div class='select-report-example-slot' @click='doShow(true)'>
+    <div class="select-report-example-slot" @click="doShow(true)">
       <slot></slot>
     </div>
   </div>
@@ -13,36 +18,56 @@ import CommonDialogSelect from '@/ui/dialog-select/select.vue'
 import { ajaxGetReportExample } from '@/api/modules'
 export default {
   name: 'select-report-example',
+  props: {
+    name: {
+      type: String,
+      default: ''
+    }
+  },
   components: {
-    CommonDialogSelect,
+    CommonDialogSelect
   },
-  data () {
+  data() {
     return {
       show: false,
       title: '请选择报告样例类型',
       list: []
     }
   },
-  mounted () {
+  mounted() {
     this.doInit()
+    console.log(this.name)
   },
   methods: {
-    async doInit () {
+    async doInit() {
       const { error_code: code, data } = await ajaxGetReportExample()
       if (code === 0 && data) {
         this.list = data
       }
     },
-    doSelect (item) {
-      console.log('item', item)
+    doSelect(item) {
       this.goExample(item)
     },
-    doShow (type) {
-      this.show = type
+    doShow(type) {
+      if (this.name && this.list.length) {
+        const item = this.list.find((v) => v.name.includes(this.name))
+        if (item) {
+          this.doSelect(item)
+        } else {
+          this.show = type
+        }
+      } else {
+        this.show = type
+      }
     },
-    getType (type) {
-      const typeList = [null, '项目分析报告', '竞争对手分析报告', '采购单位分析报告']
-      const index = typeList.findIndex(v => type.indexOf(v) !== -1)
+    getType(type) {
+      const typeList = [
+        null,
+        '项目分析报告',
+        '竞争对手分析报告',
+        '采购单位分析报告'
+      ]
+      const index = typeList.findIndex((v) => type.indexOf(v) !== -1)
       return index
     },
     goExample({ url, name }) {
@@ -60,6 +85,4 @@ export default {
 }
 </script>
 
-<style scoped lang='scss'>
-
-</style>
+<style scoped lang="scss"></style>

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

@@ -291,6 +291,16 @@ export default {
 </style>
 <style lang="scss">
 .rival-dialog {
+  display: flex;
+  flex-direction: column;
+  max-height: 80%;
+  top: 50%;
+  .van-dialog__content {
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    overflow: hidden;
+  }
   .dialog-header {
     padding: 24px 16px 14px;
   }
@@ -300,7 +310,9 @@ export default {
     color: #171826;
   }
   .dialog-content {
+    flex: 1;
     padding: 0 16px 24px;
+    overflow-y: scroll;
   }
   .ent-list {
     padding: 16px 0;

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

@@ -15,7 +15,7 @@
         content-tip-text="项目报告文件将以邮件的形式发送至您的邮箱"
         :before-close="beforeEmailDialogClose"
       />
-      <span>下载项目报告</span>
+      <span>项目进度报告</span>
     </template>
   </TabActionItem>
 </template>

apps/mobile/src/views/create-order/components/analysis-report/HeaderAdsense.vue

@@ -1,8 +1,11 @@
 <template>
   <div class="header-show-group flex flex-(col items-center)">
-    <img class="jy-zhima-logo" src="@/assets/image/reportanalysis/jy-zhima-logo.png" />
+    <img
+      class="jy-zhima-logo"
+      src="@/assets/image/reportanalysis/jy-zhima-logo.png"
+    />
     <div class="ex-name">{{ name }}</div>
-    <select-report-example>
+    <select-report-example :name="reportType">
       <van-button class="ex-button">报告样例</van-button>
     </select-report-example>
   </div>
@@ -13,9 +16,9 @@ import { mixinHeader } from '@/utils/mixins/header'
 import SelectReportExample from '@/components/select-report-example/index.vue'
 
 const titleMaps = {
-  'project': '项目分析报告',
-  'unit': '采购单位分析报告',
-  'competitor': '竞争对手分析报告',
+  project: '项目分析报告',
+  unit: '采购单位分析报告',
+  competitor: '竞争对手分析报告'
 }
 
 export default {
@@ -26,27 +29,30 @@ export default {
   },
   mixins: [mixinHeader],
   computed: {
-    name () {
+    name() {
       return this.$route.query.name || '芝麻信用共建分析报告'
+    },
+    reportType() {
+      return titleMaps[this.$route.params.type]
     }
   },
   data() {
     return {
       pageLayoutConf: {
-        title: '购买' + (titleMaps[this.$route.params.type] || '芝麻信用共建分析报告'),
-      },
+        title:
+          '购买' +
+          (titleMaps[this.$route.params.type] || '芝麻信用共建分析报告')
+      }
     }
   },
-  methods: {
-  }
+  methods: {}
 }
 </script>
 <style lang="scss" scoped>
 .header-show-group {
-  background: linear-gradient(269.56deg, #F2FFFE 0.07%, #FBFFFF 100%);
+  background: linear-gradient(269.56deg, #f2fffe 0.07%, #fbffff 100%);
   padding: 12px 0;
 
-
   .jy-zhima-logo {
     width: 235px;
     height: 24px;
@@ -55,7 +61,7 @@ export default {
   .ex-name {
     font-size: 15px;
     line-height: 22px;
-    color: #5F5E64;
+    color: #5f5e64;
     margin: 10px 16px;
   }
   .ex-button {
@@ -63,8 +69,8 @@ export default {
     height: 22px;
     font-size: 12px;
     line-height: 22px;
-    color: #2ABED1;
-    border: 1px solid #2ABED1;
+    color: #2abed1;
+    border: 1px solid #2abed1;
     border-radius: 4px;
   }
 }