zc细节调整

src/views/groupProfile/index.vue

@@ -124,7 +124,8 @@
               <el-table :data="tableData" style="width: 100%" :header-cell-style="tableHeaderStyle">
                 <el-table-column :prop="item.val" align="center" :label="item.name" v-for="(item,index) in tableHeadList" :key="'headerName'+index">
                   <template slot-scope="scope">
-                    <span v-html="$formattingText(scope.row[item.val])"></span>
+                    <span v-if="item.val == 'bookName'">{{scope.row[item.val]}}</span>
+                    <span v-else v-html="$formattingText(scope.row[item.val])"></span>
                   </template>
                 </el-table-column>
               </el-table>
@@ -217,7 +218,7 @@
                 </div>
                 <div class="textContent">
                   <div class="title">{{item.name}}</div>
-                  <div class="content">{{item.content}}</div>
+                  <div class="content" v-html="item.content?item.content.trim():''"></div>
                   <div class="other">
                     <span>{{item.releaserTime?item.releaserTime.substring(0,10):''}}</span>
                     <span>【详情】</span>
@@ -390,7 +391,7 @@ export default {
     getYearsNow(){
       getAllYearsAPI().then((res) => {
         if(res.data.code == 0){
-          this.yearList = res.data.data
+          this.yearList = res.data.data.filter((item) => item)
           let arr1 = ['','','']
           this.yearList = arr1.concat(this.yearList).concat(arr1)
           let meanNum = Math.floor(this.yearList.length/2)

src/views/pressCenter/detail.vue

@@ -274,6 +274,11 @@ export default {
           height: auto;
           padding: 30px 50px 20px;
           box-sizing: border-box;
+          font-size: 15px;
+          color: #333333;
+          line-height: 32px;
+          text-indent: 30px;
+          margin-bottom: 8px;
           /deep/p{
             font-size: 15px;
             color: #333333;

src/views/productsWorld/index.vue

@@ -79,11 +79,11 @@
               <div class="swiper-wrapper">
                   <div class="swiper-slide" v-for="(item,index) in digitalDetailList" :key="'cd'+index" @click="toDigitalDetail(item)">
                     <div class="imgBox">
-                      <img src="@/assets/productsWorld/audio.png" alt="" v-if="item.resourceType == '5'">
-                      <img src="@/assets/productsWorld/video.png" alt="" v-if="item.resourceType == '6'">
-                      <img src="@/assets/productsWorld/pic.png" alt="" v-if="item.resourceType == '9'">
-                      <img src="@/assets/productsWorld/pdf.png" alt="" v-if="item.resourceType == '8'">
-                      <img src="@/assets/productsWorld/fj.png" alt="" v-if="item.resourceType == '12'">
+                      <img src="@/assets/productsWorld/pdf.png" alt="" v-if="item.typeView == 'PDF'">
+                      <img src="@/assets/productsWorld/ico-fumeiti-middle.png" alt="" v-else-if="item.typeView == '富媒体'">
+                      <img src="@/assets/productsWorld/kj.png" alt="" v-else-if="item.typeView == '电子课件'">
+                      <img src="@/assets/productsWorld/pdf.png" alt="" v-else-if="item.typeView == '附件'">
+                      <img src="@/assets/productsWorld/fj.png" alt="" v-else>
                     </div>
                     <div class="text">{{item.name}}</div>
                   </div>
@@ -310,8 +310,8 @@
 
     <!-- 兑换码弹窗 -->
     <el-dialog title="图书防伪验证" :visible.sync="convertDialog" width="460px" @close="closeConvert" class="convertDialog" style="margin-top:20vh">
-      <el-form :model="convertForm" ref="convertForm">
-        <el-form-item label="验证码:" prop="conversionDark" label-width="60px">
+      <el-form :model="convertForm" ref="convertForm" :rules="rules">
+        <el-form-item label="验证码:" prop="conversionDark" label-width="70px">
           <el-input v-model="convertForm.conversionDark" style="width:280px"></el-input>
         </el-form-item>
       </el-form>
@@ -381,6 +381,11 @@ export default {
         conversionDark: null,
         phyId:null
       },
+      rules:{
+        conversionDark:[
+          { required: true, message:'请输入验证码' },
+        ]
+      }
       // iframeUrl:'http://www.class.com.cn/baiduMap.html',
     };
   },
@@ -609,19 +614,23 @@ export default {
     },
     //提交兑换码
     dataSubmitConvert() {
-      convertCodeAPI({conversionDark:this.convertForm.conversionDark}).then((res) => {
-        if (res.data.code == 0) {
-          if(res.data.data){
-            this.convertDialog = false
-            confirm.apply(this,[`图书防伪验证成功，确定要跳转到图书资源页面吗？`,"提示","确定","取消"]).then(() => {
-              this.$linkToRsResource('/resource/paperBookDetail?id=' + res.data.data)
-            })
-          }
-        } else {
-          this.$message.error('验证失败');
-          this.convertDialog = false
+      this.$refs['convertForm'].validate((valid) => {
+        if(valid){
+          convertCodeAPI({conversionDark:this.convertForm.conversionDark}).then((res) => {
+            if (res.data.code == 0) {
+              if(res.data.data){
+                this.convertDialog = false
+                confirm.apply(this,[`图书防伪验证成功，确定要跳转到图书资源页面吗？`,"提示","确定","取消"]).then(() => {
+                  this.$linkToRsResource('/resource/paperBookDetail?id=' + res.data.data)
+                })
+              }
+            } else {
+              this.$message.error(res.data.msg);
+              this.convertDialog = false
+            }
+          });
         }
-      });
+      })
     },
     
   },