From d2ae467f3c5dc31ecd6183b554735afc33ad90db Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Mon, 22 Apr 2024 17:39:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=20-=20=E6=94=AF=E6=8C=81=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E7=9B=B4=E6=8E=A8=E5=AE=A2=E6=88=B7=E8=AE=A2=E5=8D=95&?=
 =?UTF-8?q?=E5=9B=A2=E9=98=9F=E5=AE=A2=E6=88=B7=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yunshop-front-master/src/router/index.js      |  10 +
 .../member/tool/my_relationship_order.vue     | 196 ++++++++++++++++++
 .../views/member/tool/my_relationship_v2.vue  |   8 +-
 .../tool/my_relationship_v2_controller.js     |  14 +-
 4 files changed, 218 insertions(+), 10 deletions(-)
 create mode 100644 yunshop-front-master/src/views/member/tool/my_relationship_order.vue

diff --git a/yunshop-front-master/src/router/index.js b/yunshop-front-master/src/router/index.js
index 9e20c6b..635832e 100644
--- a/yunshop-front-master/src/router/index.js
+++ b/yunshop-front-master/src/router/index.js
@@ -408,6 +408,7 @@ const MyRelationship = r => require(["../views/member/tool/my_relationship_v2"],
 const MyRelationshipAmount = r => require(["../views/member/tool/my_relationship_amount"], r);
 const MyRelationshipDetail = r => require(["../views/member/tool/my_relationship_detail"], r);
 const MyRelationshipDetailV2 = r => require(["../views/member/tool/my_relationship_detail_v2"], r);
+const MyRelationshipOrder = r => require(["../views/member/tool/my_relationship_order"], r);
 const OfflineSearch = r => require(["../views/member/tool/search"], r);
 const MyEvaluation = r => require(["../views/comment/myEvaluation"], r);
 const Comment = r => require(["../views/member/tool/comment"], r);
@@ -2595,6 +2596,15 @@ const routes = [
       foot: true
     }
   },
+  {
+    path: "/member/myrelationship_v2/order",
+    component: MyRelationshipOrder,
+    name: "MyRelationshipOrder",
+    meta: {
+      title: "会员概况",
+      foot: true
+    }
+  },
   {
     path: "/member/offlineSearch",
     component: OfflineSearch,
diff --git a/yunshop-front-master/src/views/member/tool/my_relationship_order.vue b/yunshop-front-master/src/views/member/tool/my_relationship_order.vue
new file mode 100644
index 0000000..b5cb3cd
--- /dev/null
+++ b/yunshop-front-master/src/views/member/tool/my_relationship_order.vue
@@ -0,0 +1,196 @@
+<template>
+  <div class="main-content">
+    <!--顶部标题-->
+    <c-title :hide="false" :text="pageTitle"></c-title>
+    <!--客户直推下级信息-->
+    <div class="list-content">
+      <div class="list" v-if="Object.values(list).length > 0">
+        <div class="order-box" v-for="(item, index) in list" :key="index">
+          <!--订单号-->
+          <div class="order-sn">
+            <div class="left">订单号：{{ item.order_sn || ''}}</div>
+            <div class="right">{{ item.status_name || ''}}</div>
+          </div>
+          <!--商品信息-->
+          <div class="goods-list" v-for="(goodItem,goodIndex) in item.has_many_order_goods" :key="goodIndex">
+            <img class="logo" :src="goodItem.thumb" />
+            <div class="info">
+              <div class="title">{{ goodItem.title || '' }}</div>
+              <div class="buy-num">×{{ goodItem.total }}</div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <van-empty v-else description="暂无订单~" />
+    </div>
+  </div>
+</template>
+
+<script>
+import { scrollMixin } from "@/utils/mixin";
+
+export default {
+  mixins: [scrollMixin],
+  data() {
+    return {
+      pageTitle: '会员订单',
+      orderType: 'agent_order',
+      // 分页信息
+      list: [],
+      isLoadMore: true,
+      page: 1,
+      total_page: 0,
+
+
+    };
+  },
+  created(){},
+  activated() {
+    // 获取信息
+    this.orderType = this.$route.query.order_type;
+    this.getOrderList();
+    // 设置页面标题
+    this.setPageTitle();
+  },
+  methods: {
+    // 设置页面标题
+    setPageTitle() {
+      let lang = window.localStorage.getItem("mailLanguage");
+      let agent = JSON.parse(lang).agent ? JSON.parse(lang).agent : {};
+      if(this.orderType === 'agent_order') this.pageTitle = agent.agent_order ? agent.agent_order : "客户订单";
+      else this.pageTitle = agent.agent_order_count ? agent.agent_order_count : "客户总订单";
+
+      this.fun.setWXTitle(this.pageTitle);
+    },
+    // 我的推荐
+    getOrderList() {
+      let _this = this;
+      let params = {
+        page: _this.page,
+        order_type: _this.orderType
+      };
+      $http.get('member.member.getOrderList', params, "加载中...").then(function (response) {
+        if (response.result == 1) {
+          _this.isLoadMore = true;
+          let data = response.data;
+          if (parseInt(data.current_page) === 1) {
+            _this.total_page = data.last_page;
+            _this.list = data.data;
+          } else {
+            if (Object.values(data.data).length > 0) _this.list = Object.values(_this.list).concat(Object.values(data.data));
+          }
+        } else {
+          _this.isLoadMore = false; // 防止多次请求分页数据
+          _this.list = [];
+          console.log('错误：', error);
+        }
+      }, function (error) {
+        console.log('失败：', error);
+      });
+    },
+    // 分页获取数据
+    getMoreData() {
+      let _this = this;
+      if (!_this.isLoadMore) return;
+      _this.isLoadMore = false; // 防止多次请求分页数据
+      if (_this.page >= _this.total_page) {
+        return;
+      } else {
+        _this.page += 1;
+        _this.getOrderList();
+      }
+    },
+
+
+  },
+  components: {}
+};
+</script>
+
+<style lang="scss" scoped>
+.main-content {
+  width: 100vw !important;
+  min-height: calc(100vh - 40px);
+  background: #f6f6f6;
+  padding: 15px;
+
+  .list-content {
+    background-color: #fff;
+    border-radius: 10px;
+    overflow: hidden;
+
+    .list {
+      padding: 0 10px;
+
+      .order-box {
+        width: 100%;
+        padding: 10px 0;
+        border-top: 1px solid #f6f6f6;
+
+        .order-sn {
+          width: 100%;
+          height: 45px;
+          line-height: 45px;
+          display: inline-flex;
+          flex-direction: row;
+          flex-wrap: nowrap;
+          justify-content: space-between;
+          align-items: center;
+
+          .left {
+            height: 45px;
+            line-height: 45px;
+            color: #666;
+          }
+
+          .right {
+            height: 45px;
+            line-height: 45px;
+            color: #f15353;
+          }
+        }
+
+        .goods-list {
+          width: 100%;
+          display: inline-flex;
+          flex-direction: row;
+          flex-wrap: nowrap;
+          justify-content: flex-start;
+          align-items: center;
+
+          .logo {
+            width: 90px !important;
+            height: 90px !important;
+          }
+
+          .info {
+            width: calc(100% - 90px) !important;
+            height: 90px !important;
+            padding-left: 10px;
+
+            .title {
+              overflow: hidden;
+              text-overflow: ellipsis;
+              display: -webkit-box;
+              -webkit-box-orient: vertical;
+              -webkit-line-clamp: 2;
+              font-size: 14px;
+              text-align: left;
+              color: #333;
+              height: 60px;
+            }
+
+            .buy-num {
+              text-align: left;
+              color: #888;
+              font-size: 12px;
+              height: 30px;
+              line-height: 30px;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/yunshop-front-master/src/views/member/tool/my_relationship_v2.vue b/yunshop-front-master/src/views/member/tool/my_relationship_v2.vue
index 3460478..efb4a3c 100644
--- a/yunshop-front-master/src/views/member/tool/my_relationship_v2.vue
+++ b/yunshop-front-master/src/views/member/tool/my_relationship_v2.vue
@@ -94,11 +94,11 @@
             <p>{{agent.agent_count?agent.agent_count:"总客户数"}}（人）</p>
             <p style="font-weight: 700; font-size: 15px; line-height: 1.35rem;">{{ myReferral.team_total }}</p>
           </div>
-          <div class="innerbox-li">
+          <div class="innerbox-li" @click.stop="$router.push(fun.getUrl('MyRelationshipOrder',{ order_type: 'agent_order'},{ order_type: 'agent_order'}))">
             <p>{{agent.agent_order?agent.agent_order:"客户订单"}}（{{ $i18n.t("元") }}）</p>
             <p style="font-weight: 700; font-size: 15px; line-height: 1.35rem;">{{ myReferral.child_order_money }}</p>
           </div>
-          <div class="innerbox-li">
+          <div class="innerbox-li" @click.stop="$router.push(fun.getUrl('MyRelationshipOrder',{ order_type: 'agent_order_count'},{ order_type: 'agent_order_count'}))">
             <p>{{agent.agent_order_count?agent.agent_order_count:"客户总订单"}}（{{ $i18n.t("元") }}）</p>
             <p style="font-weight: 700; font-size: 15px; line-height: 1.35rem;">{{ myReferral.team_order_money }}</p>
           </div>
@@ -115,10 +115,10 @@
 
       <div class="info_list">
         <van-tabs v-model="activeName" @click="handleClick">
+          <van-tab name="all" :title="labelValue0" v-if="level0 && level0.is_show"></van-tab>
           <van-tab name="first" :title="labelValue1" v-if="level1 && level1.is_show"></van-tab>
           <van-tab name="second" :title="labelValue2" v-if="level2 && level2.is_show"></van-tab>
           <van-tab name="third" :title="labelValue3" v-if="level3 && level3.is_show"></van-tab>
-          <van-tab name="all" :title="labelValue0" v-if="level0 && level0.is_show"></van-tab>
         </van-tabs>
         <!-- <mt-tab-container v-model="activeName"> -->
         <!--<el-tabs v-model="activeName" @tab-click="handleClick">-->
@@ -212,7 +212,7 @@
                 <i class="iconfont icon-sousuo1" style="color: #ccc;" @click="search"></i>
               </div>
             </div>
-            <div class="list" v-for="(item, index) in new_content" :key="index">
+            <div class="list" v-for="(item, index) in new_content" :key="index" @click.stop="$router.push(fun.getUrl('MyRelationshipDetailV2',{uid:item.id}))">
               <div class="list_top" @click="gotoMemberDetail(item.id)">
                 <div class="header_left">
                   <div class="img">
diff --git a/yunshop-front-master/src/views/member/tool/my_relationship_v2_controller.js b/yunshop-front-master/src/views/member/tool/my_relationship_v2_controller.js
index f3f1c80..ca2e5a0 100644
--- a/yunshop-front-master/src/views/member/tool/my_relationship_v2_controller.js
+++ b/yunshop-front-master/src/views/member/tool/my_relationship_v2_controller.js
@@ -246,6 +246,14 @@ export default {
       that.level2 = data.level2;
       that.level3 = data.level3;
 
+
+      if (!that.fun.isTextEmpty(that.level0) && that.level0.is_show) {
+        that.activeName = "all";
+        currentTabIndex = "-1";
+        that.setDataByTabIndex();//获取数据
+        return;
+      }
+
       if (!that.fun.isTextEmpty(that.level1) && that.level1.is_show) {
         that.activeName = "first";
         currentTabIndex = "0";
@@ -267,12 +275,6 @@ export default {
         return;
       }
 
-      if (!that.fun.isTextEmpty(that.level0) && that.level0.is_show) {
-        that.activeName = "all";
-        currentTabIndex = "-1";
-        that.setDataByTabIndex();//获取数据
-        return;
-      }
     },
 
     openPop() {