产品库

src/app/domain/plans.ts

@@ -36,4 +36,6 @@ export class Plans {
   isActiveForProduct?: number;
   isActiveForProduct?: number;
   isActiveForPlan?: number;
   isActiveForPlan?: number;
   isActive?:any;
   isActive?:any;
+  isThirdPartyPurchase?:any;
+  thirdPartyPurchaseUrl?:any;
 }
 }

src/app/my/product/product.component.html

@@ -21,9 +21,15 @@
             <li *ngFor="let rightItem of rightList">
             <li *ngFor="let rightItem of rightList">
               <h5>
               <h5>
                 <span>{{rightItem.tagName}}</span>
                 <span>{{rightItem.tagName}}</span>
-                <span class="iconfont icon-xiangxia"
-                [ngStyle]="{'transform': rightItem.showAll? 'rotate(180deg)' : 'rotate(0)'}"
-                (click)="showAll(rightItem)" *ngIf="rightItem.tagViewQueryInfos && rightItem.tagViewQueryInfos.length>6"></span>
+                <div *ngIf="rightItem.tagViewQueryInfos && rightItem.tagViewQueryInfos.length>6"
+                  (click)="showAll(rightItem)" style="font-size: 12px;"
+                  >
+                  <span>更多</span>
+                  <span class="iconfont icon-xiangxia" style="font-size: 12px;display: inline-block;"
+                  [ngStyle]="{'transform': rightItem.showAll? 'rotate(180deg)' : 'rotate(0)'}"
+                  ></span>
+                </div>
+                
               </h5>
               </h5>
               <div class="optionLists" *ngIf="rightItem.showAll && rightItem.tagViewQueryInfos">
               <div class="optionLists" *ngIf="rightItem.showAll && rightItem.tagViewQueryInfos">
                 <div *ngFor="let optItem of rightItem.tagViewQueryInfos"
                 <div *ngFor="let optItem of rightItem.tagViewQueryInfos"

src/app/my/product/product.component.ts

@@ -189,20 +189,24 @@ export class ProductComponent implements OnInit {
     if(this.productInfo.isActive == 4){
     if(this.productInfo.isActive == 4){
       this.router.navigate(['/productData', product.productId],{queryParams:{planId:product.planId}});
       this.router.navigate(['/productData', product.productId],{queryParams:{planId:product.planId}});
     }else if(this.productInfo.isActive != 4){
     }else if(this.productInfo.isActive != 4){
-      if (this.productInfo.noPlanProduct === true) {
-        window.location.href = `https://${window.location.host}/life/${this.productInfo.productId}`
-      } else {
-        if (this.productInfo.productCategoryId === 1 || this.productInfo.productCategoryId === 4) {
-          window.location.href = `https://${window.location.host}/pdetail/${this.productInfo.planId}`
-        } else if (this.productInfo.productCategoryId === 2) {
-          window.location.href = `https://${window.location.host}/hProductDetail/${this.productInfo.planId}?type=7`
-        } else if (this.productInfo.productCategoryId === 5) {
-          window.location.href = `https://${window.location.host}/hProductDetail/${this.productInfo.planId}?type=9`
-        } else {
-          window.location.href = `https://${window.location.host}/life/${this.productInfo.productId}`
-          this.router.navigate(['/pdetail', this.productInfo.planId]);
-        }
-      }
+        if(this.productInfo.isActive == 1 && this.productInfo.isThirdPartyPurchase==1 && this.productInfo.thirdPartyPurchaseUrl){
+          window.location.href = this.productInfo.thirdPartyPurchaseUrl;
+        }else{
+          if (this.productInfo.noPlanProduct === true) {
+            window.location.href = `https://${window.location.host}/life/${this.productInfo.productId}`
+          } else {
+            if (this.productInfo.productCategoryId === 1 || this.productInfo.productCategoryId === 4) {
+              window.location.href = `https://${window.location.host}/pdetail/${this.productInfo.planId}`
+            } else if (this.productInfo.productCategoryId === 2) {
+              window.location.href = `https://${window.location.host}/hProductDetail/${this.productInfo.planId}?type=7`
+            } else if (this.productInfo.productCategoryId === 5) {
+              window.location.href = `https://${window.location.host}/hProductDetail/${this.productInfo.planId}?type=9`
+            } else {
+              window.location.href = `https://${window.location.host}/life/${this.productInfo.productId}`
+              this.router.navigate(['/pdetail', this.productInfo.planId]);
+            }
+          }
+        }        
     }
     }
   }
   }