产品库图片替换

040fea99 · sunchao · a9f2ea9b · 040fea99 · 040fea99 · 040fea99
Commit 040fea99 authored Jul 28, 2021 by sunchao
17 changed files
--- a/src/app/my/file-list/file-list.component.scss
+++ b/src/app/my/file-list/file-list.component.scss
@@ -15,7 +15,7 @@
      -webkit-overflow-scrolling: touch;
      ul li{
        border-bottom: 1px solid #dcdcdc;
-        padding: 4px 20px;
+        padding: 12px 20px;
        position: relative;
        .icon-xiazai {
          font-size: 22px;

--- a/src/app/my/my-center-home/my-center-home.component.ts
+++ b/src/app/my/my-center-home/my-center-home.component.ts
@@ -92,9 +92,9 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
          { no: 4, subtitle: '线上投保', icon: 'online', path: `https://${window.location.host}/index?source=dyd`, routerLink: '' ,showSubMenu:true},
          { no: 13, subtitle: '我的商机', icon: 'line', path: '', routerLink: 'business',showSubMenu:true },
          { no: 9, subtitle: '执业证书', icon: 'card', path: `https://${window.location.host}/brokerQry/#/brokerDetail/${this.lifeCustomerInfo.practitionerId}?source=0`, routerLink: '',showSubMenu:true },
-          { no: 17, subtitle: '产品库', icon: 'product', path: '', routerLink: 'product' ,showSubMenu:true},
          { no: 7, subtitle: '文章分享', icon: 'article', path: '', routerLink: 'article/null' ,showSubMenu:true},
          { no: 3, subtitle: '产品海报', icon: 'poster_p', path: '/salesDetail', routerLink: 'material',showSubMenu:true },
+          { no: 17, subtitle: '产品库', icon: 'product', path: '', routerLink: 'product' ,showSubMenu:true},
        ],
        isShow: true
      },
@@ -122,7 +122,7 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
          { no: 24, subtitle: '目标设置', icon: 'set', path: '', routerLink: 'target',showSubMenu:true },
          { no: 11, subtitle: '文件下载', icon: 'download', path: 'https://www.ydinsurance.cn/?page_id=13957', routerLink: 'fileUpload',showSubMenu:true },
          { no: 25, subtitle: '', icon: 'default', path: '', routerLink: '' ,showSubMenu:true},
-          // { no: 26, subtitle: '', icon: 'default', path: '', routerLink: '' ,showSubMenu:true}
+          { no: 26, subtitle: '', icon: 'default', path: '', routerLink: '' ,showSubMenu:!this.isShowSalay}
        ],
        isShow: true

--- a/src/app/my/product-data/product-data.component.html
+++ b/src/app/my/product-data/product-data.component.html
@@ -2,11 +2,14 @@
  <div class="productPoster">
    <h3>产品海报</h3>
    <div>
-      <ul>
+      <ul *ngIf="posterUrl">
-        <li (click)="jumpToMaterial()">
+        <li (click)="jumpToMaterial()" >
-          <img [src]="posterUrl" class="img-responsive">
+          <img [src]="posterUrl" class="img-responsive" alt="海报">
        </li>  
      </ul>
+      <div *ngIf="!posterUrl" style="text-align: center;">
+        抱歉，当前产品暂无海报
+      </div>
    </div>
  </div>
  <div style="width: calc(100% + 30px); height: 8px;background: #f6f6f6;margin-left: -15px;"></div>
@@ -16,7 +19,7 @@
      <ul>
        <li *ngFor="let productDataMenuItem of productDataMenuLists" (click)="jumpToDetail(productDataMenuItem)">
          <div>
-            <img src="./assets/images/productData/{{productDataMenuItem['displayImage']}}" alt="">
+            <img src="./assets/images/productData/{{productDataMenuItem['displayImage']}}" style="width: auto;">
          </div>
          <div>{{productDataMenuItem.categoryName}}</div>
        </li>

--- a/src/app/my/product-data/product-data.component.scss
+++ b/src/app/my/product-data/product-data.component.scss
@@ -3,8 +3,8 @@
  h3{
    color: #444;
    font-size: 18px;
-    font-weight: 400;
+    font-weight: bold;
-    margin: 15px 0;
+    margin: 15px 0 25px 0;
  }
  .productPoster{
    padding-bottom: 18px;
@@ -33,13 +33,13 @@
        max-width: 25%;
        text-align: center;
        min-width: 25%;
-        margin-bottom: 15px;
+        margin-bottom: 30px;
        display: flex;
        flex-direction: column;
        align-items: center;
        >div:first-child{
-          width:35px;
+          width:40px;
-          height: 35px;
+          height: 40px;
        }
      }
    }

--- a/src/app/my/product-data/product-data.component.ts
+++ b/src/app/my/product-data/product-data.component.ts
@@ -32,7 +32,9 @@ export class ProductDataComponent implements OnInit {
        this.posterInfo = res['data']['categoryInfos'].filter((item)=>{
          return item.categoryId == 22;
        });
+        if(this.posterInfo[0] && this.posterInfo[0]['fileInfos']){
          this.posterUrl = this.posterInfo[0]['fileInfos']['0']['ossFilePath'];
+        }
      }else{
        const toast = ToastService.show(`${res['message']}`, 0);
        setTimeout(() => {

--- a/src/app/my/product/product.component.html
+++ b/src/app/my/product/product.component.html
@@ -23,14 +23,14 @@
                <span>{{rightItem.tagName}}</span>
                <span class="iconfont icon-xiangxia"
                [ngStyle]="{'transform': rightItem.showAll? 'rotate(180deg)' : 'rotate(0)'}"
-                (click)="showAll(rightItem)" *ngIf="rightItem.tagViewQueryInfos.length>6"></span>
+                (click)="showAll(rightItem)" *ngIf="rightItem.tagViewQueryInfos && rightItem.tagViewQueryInfos.length>6"></span>
              </h5>
-              <div class="optionLists" *ngIf="rightItem.showAll">
+              <div class="optionLists" *ngIf="rightItem.showAll && rightItem.tagViewQueryInfos">
                <div *ngFor="let optItem of rightItem.tagViewQueryInfos"
                (click)="switchCategory(2,optItem)" [ngClass]="{selected:optItem.selected == true}"
                >{{optItem.tagName}}</div>
              </div>
-              <div class="optionLists" *ngIf="!rightItem.showAll">
+              <div class="optionLists" *ngIf="!rightItem.showAll && rightItem.tagViewQueryInfos">
                <div *ngFor="let optItem of rightItem.tagViewQueryInfos.slice(0,6)"
                (click)="switchCategory(2,optItem)" [ngClass]="{selected:optItem.selected == true}"
                >{{optItem.tagName}}</div>
@@ -65,8 +65,11 @@
                  </div>
                </div>
                <div class="priceContent">
+                  <div>
                    <span>￥</span><strong>{{productInfoItem.price | number:'1.0-0'}}</strong><span>元起 | 每人每年</span>
                  </div>
+                  <span class="iconfont icon-ar-r"></span>
+                </div>
              </div>
            </div>

--- a/src/app/my/product/product.component.scss
+++ b/src/app/my/product/product.component.scss
@@ -192,6 +192,10 @@
            .insuranceRulesContent {
            }
            .priceContent {
+              display: flex;
+              justify-content: space-between;
+              align-items: baseline;
+              padding-right: 10px;
              strong {
                color: #F16A5D;
                font-size: 20px;

--- a/src/app/my/product/product.component.ts
+++ b/src/app/my/product/product.component.ts
@@ -52,6 +52,7 @@ export class ProductComponent implements OnInit {
    }else if(type==2){
      item.selected = !item.selected;
      for(let i=0;i<this.rightList.length;i++){
+        if(this.rightList[i]['tagViewQueryInfos']){
          for(let j=0;j<this.rightList[i]['tagViewQueryInfos'].length;j++){
            if(this.rightList[i]['tagViewQueryInfos'][j]['selected'] == true){
               this.rightIds.push(this.rightList[i]['tagViewQueryInfos'][j]['id'])
@@ -64,6 +65,8 @@ export class ProductComponent implements OnInit {
           }
         }
        }
+      }
      this.rightIds =  Array.from(new Set(this.rightIds))
    }
  }
@@ -86,6 +89,7 @@ export class ProductComponent implements OnInit {
          this.rightList = res['data']['tagViewQueryInfos'];
          if(this.rightIds.length >0){
            for(let i=0;i<this.rightList.length;i++){
+              if(this.rightList[i]['tagViewQueryInfos']){
                for(let j=0;j<this.rightList[i]['tagViewQueryInfos'].length;j++){
                  for(let m=0;m<this.rightIds.length;m++){
                    if(this.rightIds[m] == this.rightList[i]['tagViewQueryInfos'][j]['id']){
@@ -96,6 +100,7 @@ export class ProductComponent implements OnInit {
              }
            }
          }
+        }
      this.topAndright = this.rightList.concat(this.topList)
      }
    })
@@ -121,6 +126,7 @@ export class ProductComponent implements OnInit {
    this.rightTagIds=[];
    if(this.rightIds.length){
      for(let i=0;i<this.topAndright.length;i++){
+        if(this.topAndright[i]['tagViewQueryInfos']){
          for(let j=0;j<this.topAndright[i]['tagViewQueryInfos'].length;j++){
            for(let m=0;m<this.rightIds.length;m++){
              if(this.rightIds[m] == this.topAndright[i]['tagViewQueryInfos'][j]['id']){
@@ -130,6 +136,7 @@ export class ProductComponent implements OnInit {
          }
        }
      }
+    }
    let tagIds = this.tagIds.concat(this.rightTagIds)
    this.myService.queryProductBox({tagIds:tagIds}).subscribe((res)=>{
      if(res['success']){
@@ -155,6 +162,7 @@ export class ProductComponent implements OnInit {
  //重置
  restart(){
    for(let i=0;i<this.rightList.length;i++){
+      if(this.rightList[i]['tagViewQueryInfos']){
        for(let j=0;j<this.rightList[i]['tagViewQueryInfos'].length;j++){
          this.rightList[i]['tagViewQueryInfos'][j]['selected'] = false;
          for(let m=0;m<this.rightIds.length;m++){
@@ -165,6 +173,7 @@ export class ProductComponent implements OnInit {
        }
      }
    }
+  }
  //确定搜索
  confirm(){

--- a/src/assets/images/productData/comIntro.png
+++ b/src/assets/images/productData/comIntro.png
--- a/src/assets/images/productData/commission.png
+++ b/src/assets/images/productData/commission.png
--- a/src/assets/images/productData/e-insure.png
+++ b/src/assets/images/productData/e-insure.png
--- a/src/assets/images/productData/feature.png
+++ b/src/assets/images/productData/feature.png
--- a/src/assets/images/productData/item.png
+++ b/src/assets/images/productData/item.png
--- a/src/assets/images/productData/markting.png
+++ b/src/assets/images/productData/markting.png
--- a/src/assets/images/productData/notice.png
+++ b/src/assets/images/productData/notice.png
--- a/src/assets/images/productData/other.png
+++ b/src/assets/images/productData/other.png
--- a/src/assets/images/productData/priceRate.png
+++ b/src/assets/images/productData/priceRate.png