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 @@ + + + + + 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 @@

{{agent.agent_count?agent.agent_count:"总客户数"}}(人)

{{ myReferral.team_total }}

-
+

{{agent.agent_order?agent.agent_order:"客户订单"}}({{ $i18n.t("元") }})

{{ myReferral.child_order_money }}

-
+

{{agent.agent_order_count?agent.agent_order_count:"客户总订单"}}({{ $i18n.t("元") }})

{{ myReferral.team_order_money }}

@@ -115,10 +115,10 @@
+ - @@ -212,7 +212,7 @@
-
+
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() {