From ce6373143aeda7aa9e5a1d39cef5df30ff40a434 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 24 May 2024 14:29:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7=20-=20=E5=A2=9E=E5=8A=A0=E9=97=B4=E6=8E=A8?=
 =?UTF-8?q?=E8=AE=A2=E5=8D=95=E5=92=8C=E9=97=B4=E6=8E=A8=E4=BA=BA=E6=95=B0?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/member/tool/my_relationship_v2.vue  | 54 ++++++++++++-------
 yunshop-front-master/vue.config.js            |  2 +-
 2 files changed, 37 insertions(+), 19 deletions(-)

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 efb4a3c..6c40c7d 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
@@ -85,23 +85,33 @@
               <p style="font-weight: 700; font-size: 15px; line-height: 1.35rem;">{{item.team_bought_total}}</p>
             </div>
           </template>
-
           <div class="innerbox-li" @click="gotoList('first')">
-            <p>{{agent.agent_num?agent.agent_num:"客户数量"}}（人）</p>
+            <p>{{agent.agent_num?agent.agent_num:"直推客户数量"}}(人)</p>
             <p style="font-weight: 700; font-size: 15px; line-height: 1.35rem;">{{ myReferral.child_total }}</p>
           </div>
-          <div class="innerbox-li" @click="gotoList('all')">
-            <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" @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>{{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">
+            <p>间推客户数(人)</p>
+            <p style="font-weight: 700; font-size: 15px; line-height: 1.35rem;">{{ myReferral.indirect_total }}</p>
+          </div>
+          <div class="innerbox-li">
+            <p>间推客户订单({{ $i18n.t("元") }})</p>
+            <p style="font-weight: 700; font-size: 15px; line-height: 1.35rem;">{{ myReferral.indirect_order_money }}</p>
+          </div>
+          <div class="innerbox-li" @click="gotoList('all')">
+            <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" @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>{{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>
+
+
+
           <!--<div class="innerbox-li">
             <p>{{agent.agent_goods_num?agent.agent_goods_num:"客户总支付商品数量"}}</p>
             <p style="font-weight: 700; font-size: 15px; line-height: 1.35rem;">{{ myReferral.team_goods_total }}</p>
@@ -555,9 +565,13 @@ export default my_relationship_v2_controller;
           overflow-x: auto;
           text-align: left;
           padding: 1rem 0.875rem 0.25rem 0.875rem;
-          // padding: 5px;
           border-radius: 0.625rem;
-          display: flex;
+          display: inline-flex;
+          flex-direction: row;
+          flex-wrap: wrap;
+          align-content: center;
+          justify-content: space-between;
+          align-items: center;
 
           p {
             height: 1.35rem;
@@ -566,15 +580,19 @@ export default my_relationship_v2_controller;
           }
 
           .innerbox-li {
-            display: flex;
-            flex-direction: column;
-            height: 5rem;
+            width: calc((100% - 10px) / 2);
+            margin-bottom: 10px;
+            padding: 10px;
+            border-radius: 5px;
+            //display: flex;
+            //flex-direction: column;
+            //height: 5rem;
             box-shadow: #ccc 0 0 5px;
-            padding: 0.625rem;
-            flex-shrink: 0;
-            background: url('../../../assets/images/person@2x.png');
-            background-position: bottom right;
-            background-repeat: no-repeat;
+            //padding: 0.625rem;
+            //flex-shrink: 0;
+            //background: url('../../../assets/images/person@2x.png');
+            //background-position: bottom right;
+            //background-repeat: no-repeat;
             background-size: 3rem;
           }
         }
diff --git a/yunshop-front-master/vue.config.js b/yunshop-front-master/vue.config.js
index 47acee7..d4de255 100644
--- a/yunshop-front-master/vue.config.js
+++ b/yunshop-front-master/vue.config.js
@@ -112,7 +112,7 @@ module.exports = {
     },
     proxy: {
       "/addons/yun_shop/api.php": {
-        target: "https://shuizhi.test.cdlfjy.com/", //目标接口域名bztang.cdlfjy.com  testbzt.cdlfjy.com
+        target: "https://shuizhi.test.cdlfjy.com/", //目标接口域名
         changeOrigin: true, //是否跨域
         secure: false
         // pathRewrite: {