From 174fe04ddc4dda78a72159109cf3bde564eee286 Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Wed, 31 Jan 2024 18:19:20 +0800
Subject: [PATCH] 我是小店佣金分享

---
 packageA/pages/distribution/shop/shop.js   |  5 +++--
 packageA/pages/distribution/shop/shop.wxml | 30 ++++++++++++++++--------------
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/packageA/pages/distribution/shop/shop.js b/packageA/pages/distribution/shop/shop.js
index 7383117..02fecd0 100644
--- a/packageA/pages/distribution/shop/shop.js
+++ b/packageA/pages/distribution/shop/shop.js
@@ -33,6 +33,7 @@ Page({
     isAll: true,
     is_no_plus:1,
     default_img: '/miniapp/images/default_g_img.gif',
+    is_distribut:0, //是否是分销
   },
 
   /**
@@ -190,8 +191,8 @@ Page({
     var th = this;
     //更新一下会员的信息
     if (getApp().globalData.user_id) {
-      if (!getApp().globalData.userInfo['is_distribut']) {
-        th.setData({ ishidden_comise: 1 })
+      if (getApp().globalData.userInfo['is_distribut']) {
+        th.setData({ is_distribut: 1 })
       }
       getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
         isShowLoading: false,
diff --git a/packageA/pages/distribution/shop/shop.wxml b/packageA/pages/distribution/shop/shop.wxml
index 469b618..1fa8aac 100644
--- a/packageA/pages/distribution/shop/shop.wxml
+++ b/packageA/pages/distribution/shop/shop.wxml
@@ -207,9 +207,9 @@
 						<!-- 分层金额 -->
 						<!-- <view hidden="{{ishidden_comise}}" class="fs24 c-a">
 							分成金额：
-							<text class="money c-red">{{filter.toFix(item.commission,2)}}</text>
+							<text class="money c-red">{{filter.toFix(item.commission,2)}}</text> 
 						</view> -->
-            <view hidden="{{ishidden_comise}}">
+            <view wx:if="{{is_distribut || (!is_distribut && storeDistribut && storeDistribut.is_commission_displayed==1)}}">
               <view class="fs24 c-a" wx:if="{{item.distribut_level >= 1 && item.new_fir_rate !=0}}">
                 一级分成：
                 <text class="money c-red">{{filter.toFix(item.new_fir_rate,2)}}</text>
@@ -369,18 +369,20 @@
 						分成金额：
 						<text class="money c-red">{{filter.toFix(item.commission,2)}}</text>
 					</view> -->
-					<view class="fs24 c-a" wx:if="{{item.distribut_level >= 1 && item.new_fir_rate !=0}}">
-						一级分成：
-						<text class="money c-red">{{filter.toFix(item.new_fir_rate,2)}}</text>
-					</view>
-					<view class="fs24 c-a" wx:if="{{item.distribut_level >= 2 && item.new_sec_rate !=0}}">
-						二级分成：
-						<text class="money c-red">{{filter.toFix(item.new_sec_rate,2)}}</text>
-					</view>
-					<view class="fs24 c-a" wx:if="{{item.distribut_level >= 3 && item.new_thi_rate !=0}}">
-						三级分成：
-						<text class="money c-red">{{filter.toFix(item.new_thi_rate,2)}}</text>
-					</view>
+          <block wx:if="{{is_distribut || (!is_distribut && storeDistribut && storeDistribut.is_commission_displayed==1)}}">        
+            <view class="fs24 c-a" wx:if="{{item.distribut_level >= 1 && item.new_fir_rate !=0}}">
+              一级分成：
+              <text class="money c-red">{{filter.toFix(item.new_fir_rate,2)}}</text>
+            </view>
+            <view class="fs24 c-a" wx:if="{{item.distribut_level >= 2 && item.new_sec_rate !=0}}">
+              二级分成：
+              <text class="money c-red">{{filter.toFix(item.new_sec_rate,2)}}</text>
+            </view>
+            <view class="fs24 c-a" wx:if="{{item.distribut_level >= 3 && item.new_thi_rate !=0}}">
+              三级分成：
+              <text class="money c-red">{{filter.toFix(item.new_thi_rate,2)}}</text>
+            </view>
+          </block>
 				</view>
 			</view>
 		</view>
--
libgit2 0.21.4