From 7f2f7049e42f8271083acd3721aabe92ac5ac2e2 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Fri, 3 Feb 2023 10:08:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=90=86=E5=95=86?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cms/cms-category/cms-category.component.ts      |  1 -
 .../admin/cms/cms-content/cms-content.component.ts  |  4 +---
 .../integral-rebate/integral-rebate.component.html  |  6 ++++--
 .../order-manage/order-manage-routing.module.ts     |  4 ++--
 src/app/services/cms.service.ts                     | 13 +++++++++++++
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/app/admin/cms/cms-category/cms-category.component.ts b/src/app/admin/cms/cms-category/cms-category.component.ts
index 4333b05..c553822 100644
--- a/src/app/admin/cms/cms-category/cms-category.component.ts
+++ b/src/app/admin/cms/cms-category/cms-category.component.ts
@@ -104,7 +104,6 @@ export class CmsCategoryComponent implements OnInit {
 
   goRequest() {
     this.http.get(this.WEB_SERVE_URL + '/cmsCategory/getCategoryTree').subscribe(data => {
-      console.log(data);
       if (data['return_code'] === '000000') {
         this.nodes = data['return_data'];
         if (this.nodes.length !== 0) {
diff --git a/src/app/admin/cms/cms-content/cms-content.component.ts b/src/app/admin/cms/cms-content/cms-content.component.ts
index f54c81b..d07b877 100644
--- a/src/app/admin/cms/cms-content/cms-content.component.ts
+++ b/src/app/admin/cms/cms-content/cms-content.component.ts
@@ -89,7 +89,6 @@ export class CmsContentComponent implements OnInit {
         whereObject['pageNum'] = this.pageNum;
         whereObject['pageSize'] = this.pageSize;
         this.cms.getListCmsContent(whereObject, data => {
-            console.log(data);
             this.loading = false;
             if (data['return_code'] === '000000') {
                 this.requestData = data['return_data'].list;
@@ -107,7 +106,7 @@ export class CmsContentComponent implements OnInit {
 
     // 查询分类树
     findCategoryTree(roleType) {
-        this.cms.getOwnCategoryTree(roleType, data => {
+        this.cms.getCategoryTree( data => {
             if (data['return_code'] === '000000') {
                 this.nodes = data['return_data'];
                 if (this.nodes.length !== 0) {
@@ -142,7 +141,6 @@ export class CmsContentComponent implements OnInit {
             }
         }
         this.nodes = data;
-        console.log(this.nodes);
     }
 
     // 新增
diff --git a/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html b/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html
index e5217e1..4c1f490 100644
--- a/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html
+++ b/src/app/admin/config-manage/integral-rebate/integral-rebate.component.html
@@ -62,8 +62,9 @@
         <tr>
             <th nzWidth="60px">编号</th>
             <th nzWidth="120px">积分返利比例</th>
+            <th nzWidth="120px">一级分销返利比例</th>
+            <th nzWidth="120px">二级分销返利比例</th>
             <th nzWidth="100px">类型</th>
-<!--            <th nzWidth="100px">产品</th>-->
             <th nzWidth="200px">返利时间范围</th>
             <th nzWidth="120px">创建时间</th>
             <th nzRight nzWidth="80px">操作</th>
@@ -73,8 +74,9 @@
         <tr *ngFor="let data of ajaxTable.data; let i = index">
             <td>{{i + 1}}</td>
             <td>{{data.percentage + "%"}}</td>
+            <td>{{data.firstDistribution + "%"}}</td>
+            <td>{{data.secondDistribution + "%"}}</td>
             <td>{{data.type | integralType}}</td>
-<!--            <td>{{data.type | integralProduct : data.productId}}</td>-->
             <td>{{data.startTime | date: 'yyyy-MM-dd HH:mm'}} - {{data.endTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td nzRight class="table-td-operation">
diff --git a/src/app/admin/order-manage/order-manage-routing.module.ts b/src/app/admin/order-manage/order-manage-routing.module.ts
index 3624604..43756e7 100644
--- a/src/app/admin/order-manage/order-manage-routing.module.ts
+++ b/src/app/admin/order-manage/order-manage-routing.module.ts
@@ -19,8 +19,8 @@ const routes: Routes = [
   { path: 'order-integral-recharge-list', component: OrderIntegralRechargeComponent },
   { path: 'order-refund-list', component: OrderRefundListComponent },
   { path: 'order-kfc-list', component: KfcOrderListComponent},
-  { path: 'order-starbucks--list', component: StarbucksOrderListComponent},
-  { path: 'order-member-charge--list', component: MemberChargeOrderListComponent},
+  { path: 'order-starbucks-list', component: StarbucksOrderListComponent},
+  { path: 'order-member-charge-list', component: MemberChargeOrderListComponent},
   { path: 'mobile-recharge-order-list', component: MobileRechargeOrderListComponent },
   { path: 'pre-order', component: PreOrderComponent },
   { path: 'discount-use-condition-list', component: DiscountUseConditionListComponent },
diff --git a/src/app/services/cms.service.ts b/src/app/services/cms.service.ts
index 4a9aaa0..a130054 100644
--- a/src/app/services/cms.service.ts
+++ b/src/app/services/cms.service.ts
@@ -48,6 +48,19 @@ export class CmsService {
         });
     }
 
+    /**
+     * @Author Sum1Dream
+     * @methodName getCategoryTree
+     * @Description // 获取分类树数据
+     * @Date 16:37 2023/2/1
+     * @Param callBack
+     */
+    public getCategoryTree( callBack) {
+        this.http.get(environment.baseUrl + '/cmsCategory/getCategoryTree').subscribe(data => {
+            callBack(data);
+        });
+    }
+
     /**
      * 新增cms内容
      *