From 2f2e6241f7519156ebd76f9cf5562015cfec2fab Mon Sep 17 00:00:00 2001
From: gongfuxiang <fuxiang.gong@qq.com>
Date: Tue, 7 Dec 2021 23:19:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=94=80=E6=96=B0=E5=A2=9E=E4=B8=8A?=
 =?UTF-8?q?=E7=BA=A7=E7=94=A8=E6=88=B7=E3=80=81=E9=98=B6=E6=A2=AF=E8=BF=94?=
 =?UTF-8?q?=E4=BD=A3=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       |  2 +-
 .../extraction-order/extraction-order.css     |  7 +++-
 pages/plugins/distribution/user/user.css      | 17 +++++++-
 pages/plugins/distribution/user/user.vue      | 39 +++++++++++++------
 4 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/App.vue b/App.vue
index f6ec30e3..92583297 100644
--- a/App.vue
+++ b/App.vue
@@ -44,7 +44,7 @@
                 application_title: "ShopXO",
                 application_describe: "ShopXO开源商城、MIT协议、可商用、可二次开发、满足99%电商运营需求",
                 // 版本号
-                version: "v2.2.2",
+                version: "v2.2.3",
                 // 货币价格符号
                 currency_symbol: "￥",
                 // 主题类型        主题颜色
diff --git a/pages/plugins/distribution/extraction-order/extraction-order.css b/pages/plugins/distribution/extraction-order/extraction-order.css
index 165c491f..a9a32e0d 100644
--- a/pages/plugins/distribution/extraction-order/extraction-order.css
+++ b/pages/plugins/distribution/extraction-order/extraction-order.css
@@ -11,10 +11,13 @@
 .search-drag {
     width: 35px;
     height: 35px;
-    line-height: 44px;
+    line-height: 48px;
     background: hsla(0, 0%, 0%, 0.01);
     margin-top: calc(100vh - 260rpx);
     margin-left: calc(50% - 17px);
     box-shadow: 0px 3rpx 16rpx rgba(0, 0, 0, 0.2);
-    padding: 5px;
+    padding: 5px;
+    /* #ifdef H5 */
+    line-height: 26px;
+    /* #endif */
 }
\ No newline at end of file
diff --git a/pages/plugins/distribution/user/user.css b/pages/plugins/distribution/user/user.css
index 68078e4d..5302b272 100644
--- a/pages/plugins/distribution/user/user.css
+++ b/pages/plugins/distribution/user/user.css
@@ -2,7 +2,7 @@
 * 头部
 */
 .head-box {
-    background-color: #ff6a80;
+    background-color: #e91e63;
 }
 .head-item {
     width: 260rpx;
@@ -26,6 +26,21 @@
 .head-base .head-base-submit {
     right: 20rpx;
     bottom: 20rpx;
+}
+
+/**
+ * 上级用户
+ */
+.superior .superior-title {
+    padding: 22rpx 20rpx;
+    background-color: #9c27b0;
+}
+.superior .superior-content {
+    width: calc(100% - 200rpx);
+}
+.superior .superior-content image {
+    width: 40rpx !important;
+    height: 40rpx !important;
 }
 
 /*
diff --git a/pages/plugins/distribution/user/user.vue b/pages/plugins/distribution/user/user.vue
index f3c05c74..f4c67131 100644
--- a/pages/plugins/distribution/user/user.vue
+++ b/pages/plugins/distribution/user/user.vue
@@ -22,8 +22,17 @@
                         </block>
                     </view>
                 </view>
-            </view>
-            
+            </view>
+            
+            <!-- 上级用户 -->
+            <view v-if="(superior || null) != null" class="superior bg-white border-radius-main margin-horizontal-main margin-bottom-main oh">
+                <view class="superior-title cr-white fw-b va-m fl">上级用户</view>
+                <view class="superior-content fl padding-main single-text">
+                    <image :src="superior.avatar" mode="aspectFit" class="circle va-m"></image>
+                    <text class="cr-gray va-m margin-left-sm">{{superior.user_name_view}}</text>
+                </view>
+            </view>
+
             <!-- 会员中心通知 -->
             <view v-if="(user_level || null) != null && (data_base.user_center_notice || null) != null && data_base.user_center_notice.length > 0" class="padding-horizontal-main padding-bottom-main">
                 <view class="notice-content">
@@ -41,13 +50,19 @@
                         </navigator>
                     </view>
                 </block>
-            </view>
-
-            <!-- 不符合分销条件描述 -->
-            <view v-if="(data_base.non_conformity_desc || null) != null && data_base.non_conformity_desc.length > 0" class="padding-horizontal-main padding-bottom-main">
-                <view class="notice-content-blue">
-                    <view v-for="(item, index) in data_base.non_conformity_desc" :key="index" class="item">{{item}}</view>
-                </view>
+            </view>
+            
+            <!-- 不符合分销条件描述 -->
+            <view v-if="(user_level || null) == null && (data_base.non_conformity_desc || null) != null && data_base.non_conformity_desc.length > 0" class="padding-horizontal-main padding-bottom-main">
+                <view class="notice-content-blue">
+                    <view v-for="(item, index) in data_base.non_conformity_desc" :key="index" class="item">{{item}}</view>
+                </view>
+            </view>
+            
+            <!-- 阶梯返佣提示 -->
+            <view v-if="(profit_ladder || null) != null" class="padding-horizontal-main padding-bottom-main">
+                <text class="cr-blue">{{profit_ladder.msg}}</text>
+                <navigator url="/pages/plugins/distribution/poster/poster" hover-class="none" class="bg-green cr-white dis-inline-block round padding-top-xs padding-bottom-xs padding-horizontal-main">去推广</navigator>
             </view>
         </view>
         <view v-else>
@@ -69,7 +84,8 @@
                 data_base: null,
                 user_level: null,
                 extraction: null,
-                superior: null,
+                superior: null,
+                profit_ladder: null,
                 nav_list: [],
                 avatar: app.globalData.data.default_user_head_src,
                 nickname: "用户名"
@@ -145,7 +161,8 @@
                                 data_base: data.base || null,
                                 user_level:  data.user_level || null,
                                 extraction: data.extraction || null,
-                                superior: data.superior || null,
+                                superior: data.superior || null,
+                                profit_ladder: data.profit_ladder || null,
                                 nav_list: data.nav_list || [],
                                 data_list_loding_msg: '',
                                 data_list_loding_status: 0,