From e2979b0ce23d2d2634a7ac68bc33cea83ca06116 Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Mon, 24 Aug 2020 23:39:14 +0800
Subject: [PATCH] =?UTF-8?q?1.9.1=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common.php                        | 11 ++++-
 application/index/controller/Common.php       | 11 ++++-
 .../index/view/default/public/footer.html     | 48 ++++++++++---------
 .../index/view/default/public/header.html     | 36 +++++++-------
 application/service/AdminRoleService.php      |  7 +++
 application/service/AdminService.php          |  3 +-
 application/service/BrandService.php          |  7 +++
 application/service/UserService.php           |  9 +++-
 config/shopxo.php                             |  3 ++
 .../distribution/introduce/introduce.axml     |  4 +-
 .../distribution/introduce/introduce.swan     |  4 +-
 .../distribution/introduce/introduce.ttml     |  4 +-
 .../distribution/introduce/introduce.wxml     |  4 +-
 13 files changed, 101 insertions(+), 50 deletions(-)

diff --git a/application/common.php b/application/common.php
index a137a7a48..6bc6c422c 100755
--- a/application/common.php
+++ b/application/common.php
@@ -2077,7 +2077,16 @@ function ParamsChecked($data, $params)
                 $temp = db($v['checked_data'])->where([$v['key_name']=>$data[$v['key_name']]])->find();
                 if(!empty($temp))
                 {
-                    return $v['error_msg'];
+                    // 是否需要排除当前操作数据
+                    if(isset($v['checked_key']))
+                    {
+                        if(empty($data[$v['checked_key']]) || (isset($temp[$v['checked_key']]) && $temp[$v['checked_key']] != $data[$v['checked_key']]))
+                        {
+                            return str_replace('{$var}', $data[$v['key_name']], $v['error_msg']);
+                        }
+                    } else {
+                        return $v['error_msg'];
+                    }
                 }
                 break;
         }
diff --git a/application/index/controller/Common.php b/application/index/controller/Common.php
index 838407ab3..8a14903b9 100755
--- a/application/index/controller/Common.php
+++ b/application/index/controller/Common.php
@@ -328,9 +328,18 @@ class Common extends Controller
         $this->assign('is_header', 1);
         $this->assign('is_footer', 1);
 
-        // 图片host地址
+        // 附件host地址
         $this->assign('attachment_host', config('shopxo.attachment_host'));
 
+        // css/js引入host地址
+        $this->assign('public_host', config('shopxo.public_host'));
+
+        // 当前url地址
+        $this->assign('my_url', __MY_URL__);
+
+        // 当前http类型
+        $this->assign('my_http', __MY_HTTP__);
+
         // seo
         $this->assign('home_seo_site_title', MyC('home_seo_site_title'));
         $this->assign('home_seo_site_keywords', MyC('home_seo_site_keywords'));
diff --git a/application/index/view/default/public/footer.html b/application/index/view/default/public/footer.html
index b98323979..a20377bae 100755
--- a/application/index/view/default/public/footer.html
+++ b/application/index/view/default/public/footer.html
@@ -24,42 +24,42 @@
 </html>
 
 <!-- 类库 -->
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/jquery/jquery-2.1.0.js?v={{:MyC('home_static_cache_version')}}"></script>
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/assets/js/amazeui.min.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/jquery/jquery-2.1.0.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/assets/js/amazeui.min.js?v={{:MyC('home_static_cache_version')}}"></script>
 
 <!-- 图片放大镜 -->
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/imagezoom/jquery.imagezoom.min.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/imagezoom/jquery.imagezoom.min.js?v={{:MyC('home_static_cache_version')}}"></script>
 
 <!-- echarts 图表 -->
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/echarts/echarts.min.js?v={{:MyC('home_static_cache_version')}}"></script>
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/echarts/macarons.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/echarts/echarts.min.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/echarts/macarons.js?v={{:MyC('home_static_cache_version')}}"></script>
 
 <!-- amazeui插件 -->
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/amazeui-switch/amazeui.switch.min.js?v={{:MyC('home_static_cache_version')}}"></script>
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/amazeui-chosen/amazeui.chosen.min.js?v={{:MyC('home_static_cache_version')}}"></script>
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/amazeui-dialog/amazeui.dialog.js?v={{:MyC('home_static_cache_version')}}"></script>
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/amazeui-tagsinput/amazeui.tagsinput.min.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/amazeui-switch/amazeui.switch.min.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/amazeui-chosen/amazeui.chosen.min.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/amazeui-dialog/amazeui.dialog.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/amazeui-tagsinput/amazeui.tagsinput.min.js?v={{:MyC('home_static_cache_version')}}"></script>
 
 <!-- 图像裁剪插件 -->
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/cropper/cropper.min.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/cropper/cropper.min.js?v={{:MyC('home_static_cache_version')}}"></script>
 
 <!-- 复制插件 -->
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/clipboard/clipboard.min.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/clipboard/clipboard.min.js?v={{:MyC('home_static_cache_version')}}"></script>
 
 <!-- ueditor 编辑器 -->
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/ueditor/ueditor.config.js?v={{:MyC('home_static_cache_version')}}"></script>
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/ueditor/ueditor.all.js?v={{:MyC('home_static_cache_version')}}"></script>
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/ueditor/lang/zh-cn/zh-cn.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/ueditor/ueditor.config.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/ueditor/ueditor.all.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/ueditor/lang/zh-cn/zh-cn.js?v={{:MyC('home_static_cache_version')}}"></script>
 
 <!-- 颜色选择器 -->
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/colorpicker/jquery.colorpicker.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/colorpicker/jquery.colorpicker.js?v={{:MyC('home_static_cache_version')}}"></script>
 
 <!-- 日期组件 -->
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/My97DatePicker/WdatePicker.js"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/lib/My97DatePicker/WdatePicker.js"></script>
 
 <!-- baidu map -->
 {{if isset($is_load_baidu_map_api) and $is_load_baidu_map_api eq 1}}
-    <script type="text/javascript" src="{{$Think.__MY_HTTP__}}://api.map.baidu.com/api?v=2.0&ak={{:MyC('common_baidu_map_ak')}}"></script>
+    <script type="text/javascript" src="{{$my_http}}://api.map.baidu.com/api?v=2.0&ak={{:MyC('common_baidu_map_ak')}}"></script>
 {{/if}}
 
 <!-- 隐藏编辑器初始化 -->
@@ -78,17 +78,17 @@
 </script>
 
 <!-- 项目公共 -->
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/common/js/common.js?v={{:MyC('home_static_cache_version')}}"></script>
-<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/index/{{$default_theme}}/js/common.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/common/js/common.js?v={{:MyC('home_static_cache_version')}}"></script>
+<script type='text/javascript' src="{{$public_host}}static/index/{{$default_theme}}/js/common.js?v={{:MyC('home_static_cache_version')}}"></script>
 
 <!-- 应用插件公共js -->
 {{if !empty($plugins_js)}}
-    <script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$plugins_js}}?v={{:MyC('home_static_cache_version')}}"></script>
+    <script type='text/javascript' src="{{$public_host}}static/{{$plugins_js}}?v={{:MyC('home_static_cache_version')}}"></script>
 {{/if}}
 
 <!-- 当前控制器js -->
 {{if !empty($module_js)}}
-	<script type='text/javascript' src="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$module_js}}?v={{:MyC('home_static_cache_version')}}"></script>
+	<script type='text/javascript' src="{{$public_host}}static/{{$module_js}}?v={{:MyC('home_static_cache_version')}}"></script>
 {{/if}}
 
 <!-- 底部信息 --> 
@@ -107,7 +107,11 @@
         {{elseif is_array($hook) /}}
             {{foreach $hook as $hook_js}}
                 {{if !empty($hook_js) and is_string($hook_js)}}
-                    <script type='text/javascript' src="{{$hook_js}}?v={{:MyC('home_static_cache_version')}}"></script>
+                    {{if substr($hook_js, 0, 4) eq 'http'}}
+                        <script type='text/javascript' src="{{$hook_js}}?v={{:MyC('home_static_cache_version')}}"></script>
+                    {{else /}}
+                        <script type='text/javascript' src="{{$public_host}}{{$hook_js}}?v={{:MyC('home_static_cache_version')}}"></script>
+                    {{/if}}
                 {{/if}}
             {{/foreach}}
         {{/if}}
diff --git a/application/index/view/default/public/header.html b/application/index/view/default/public/header.html
index e63e3724a..cc5345c04 100755
--- a/application/index/view/default/public/header.html
+++ b/application/index/view/default/public/header.html
@@ -5,11 +5,11 @@
 	<title>{{$home_seo_site_title}}</title>
 	<meta name="keywords" content="{{$home_seo_site_keywords}}" />
 	<meta name="description" content="{{$home_seo_site_description}}" />
-	<meta name="generator" content="{{$Think.__MY_URL__}}" />
+	<meta name="generator" content="{{$my_url}}" />
 	<meta name="application-name" content="{{$home_seo_site_title}}" />
 	<meta name="msapplication-tooltip" content="{{$home_seo_site_title}}" />
-	<meta name="msapplication-starturl" content="{{$Think.__MY_URL__}}" />
-	<link rel="shortcut icon" type="image/x-icon" href="{{$Think.__MY_PUBLIC_URL__}}favicon.ico" />
+	<meta name="msapplication-starturl" content="{{$my_url}}" />
+	<link rel="shortcut icon" type="image/x-icon" href="{{$public_host}}favicon.ico" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1, maximum-scale=1">
 
 	<meta name="apple-mobile-web-app-capable" content="yes">
@@ -17,19 +17,19 @@
     <link rel="apple-touch-icon" href="{{:AttachmentPathViewHandle(MyC('home_site_desktop_icon'))}}">
     <link rel="apple-touch-icon-precomposed" href="{{:AttachmentPathViewHandle(MyC('home_site_desktop_icon'))}}">
     
-	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/assets/css/amazeui.css?v={{:MyC('home_static_cache_version')}}" />
-	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/amazeui-switch/amazeui.switch.css?v={{:MyC('home_static_cache_version')}}" />
-	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/amazeui-chosen/amazeui.chosen.css?v={{:MyC('home_static_cache_version')}}" />
-	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/cropper/cropper.min.css?v={{:MyC('home_static_cache_version')}}" />
-    <link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/common/lib/amazeui-tagsinput/amazeui.tagsinput.css?v={{:MyC('home_static_cache_version')}}" />
+	<link rel="stylesheet" type="text/css" href="{{$public_host}}static/common/lib/assets/css/amazeui.css?v={{:MyC('home_static_cache_version')}}" />
+	<link rel="stylesheet" type="text/css" href="{{$public_host}}static/common/lib/amazeui-switch/amazeui.switch.css?v={{:MyC('home_static_cache_version')}}" />
+	<link rel="stylesheet" type="text/css" href="{{$public_host}}static/common/lib/amazeui-chosen/amazeui.chosen.css?v={{:MyC('home_static_cache_version')}}" />
+	<link rel="stylesheet" type="text/css" href="{{$public_host}}static/common/lib/cropper/cropper.min.css?v={{:MyC('home_static_cache_version')}}" />
+    <link rel="stylesheet" type="text/css" href="{{$public_host}}static/common/lib/amazeui-tagsinput/amazeui.tagsinput.css?v={{:MyC('home_static_cache_version')}}" />
 	
-	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/common/css/common.css?v={{:MyC('home_static_cache_version')}}" />
-	<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/index/{{$default_theme}}/css/common.css?v={{:MyC('home_static_cache_version')}}" />
+	<link rel="stylesheet" type="text/css" href="{{$public_host}}static/common/css/common.css?v={{:MyC('home_static_cache_version')}}" />
+	<link rel="stylesheet" type="text/css" href="{{$public_host}}static/index/{{$default_theme}}/css/common.css?v={{:MyC('home_static_cache_version')}}" />
     {{if !empty($plugins_css)}}
-        <link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$plugins_css}}?v={{:MyC('home_static_cache_version')}}" />
+        <link rel="stylesheet" type="text/css" href="{{$public_host}}static/{{$plugins_css}}?v={{:MyC('home_static_cache_version')}}" />
     {{/if}}
 	{{if !empty($module_css)}}
-		<link rel="stylesheet" type="text/css" href="{{$Think.__MY_ROOT_PUBLIC__}}static/{{$module_css}}?v={{:MyC('home_static_cache_version')}}" />
+		<link rel="stylesheet" type="text/css" href="{{$public_host}}static/{{$module_css}}?v={{:MyC('home_static_cache_version')}}" />
 	{{/if}}
 
 	<!-- css钩子 -->
@@ -40,7 +40,11 @@
             {{elseif is_array($hook) /}}
                 {{foreach $hook as $hook_css}}
                     {{if !empty($hook_css) and is_string($hook_css)}}
-                        <link rel="stylesheet" type="text/css" href="{{$hook_css}}?v={{:MyC('home_static_cache_version')}}" />
+                        {{if substr($hook_css, 0, 4) eq 'http'}}
+                            <link rel="stylesheet" type="text/css" href="{{$hook_css}}?v={{:MyC('home_static_cache_version')}}" />
+                        {{else /}}
+                            <link rel="stylesheet" type="text/css" href="{{$public_host}}{{$hook_css}}?v={{:MyC('home_static_cache_version')}}" />
+                        {{/if}}
                     {{/if}}
                 {{/foreach}}
             {{/if}}
@@ -48,9 +52,9 @@
     {{/if}}
 
 	<script type="text/javascript">
-		var __root__ = '{{$Think.__MY_ROOT_PUBLIC__}}';
-		var __my_url__ = '{{$Think.__MY_URL__}}';
-		var __public__ = '{{$Think.__MY_ROOT_PUBLIC__}}';
+		var __root__ = '{{$public_host}}';
+		var __my_url__ = '{{$my_url}}';
+		var __public__ = '{{$public_host}}';
 		var __default_theme__ = '{{$default_theme}}';
 		var __modal_login_url__ = '{{:Url("index/user/modallogininfo")}}';
 		var __attachment_host__ = '{{$attachment_host}}';
diff --git a/application/service/AdminRoleService.php b/application/service/AdminRoleService.php
index de371e134..66d1dd14d 100644
--- a/application/service/AdminRoleService.php
+++ b/application/service/AdminRoleService.php
@@ -188,6 +188,13 @@ class AdminRoleService
                 'checked_data'      => '2,8',
                 'error_msg'         => '角色名称格式 2~8 个字符之间',
             ],
+            [
+                'checked_type'      => 'unique',
+                'key_name'          => 'name',
+                'checked_data'      => 'Role',
+                'checked_key'       => 'id',
+                'error_msg'         => '角色已存在[{$var}]',
+            ],
         ];
         $ret = ParamsChecked($params, $p);
         if($ret !== true)
diff --git a/application/service/AdminService.php b/application/service/AdminService.php
index 471a26236..887a33f7a 100755
--- a/application/service/AdminService.php
+++ b/application/service/AdminService.php
@@ -174,7 +174,8 @@ class AdminService
                 'checked_type'      => 'unique',
                 'key_name'          => 'username',
                 'checked_data'      => 'Admin',
-                'error_msg'         => '用户名已存在',
+                'checked_key'       => 'id',
+                'error_msg'         => '管理员已存在[{$var}]',
             ],
             [
                 'checked_type'      => 'fun',
diff --git a/application/service/BrandService.php b/application/service/BrandService.php
index 693ff2351..bd793ec92 100755
--- a/application/service/BrandService.php
+++ b/application/service/BrandService.php
@@ -196,6 +196,13 @@ class BrandService
                 'checked_data'      => '2,30',
                 'error_msg'         => '名称格式 2~30 个字符',
             ],
+            [
+                'checked_type'      => 'unique',
+                'key_name'          => 'name',
+                'checked_data'      => 'Brand',
+                'checked_key'       => 'id',
+                'error_msg'         => '品牌已存在[{$var}]',
+            ],
             [
                 'checked_type'      => 'empty',
                 'key_name'          => 'brand_category_id',
diff --git a/application/service/UserService.php b/application/service/UserService.php
index 433663c62..58d67163a 100755
--- a/application/service/UserService.php
+++ b/application/service/UserService.php
@@ -196,7 +196,7 @@ class UserService
             [
                 'checked_type'      => 'empty',
                 'key_name'          => 'admin',
-                'error_msg'         => '用户信息有误',
+                'error_msg'         => '管理员信息有误',
             ],
             [
                 'checked_type'      => 'length',
@@ -205,6 +205,13 @@ class UserService
                 'is_checked'        => 1,
                 'error_msg'         => '用户名格式最多 30 个字符之间',
             ],
+            [
+                'checked_type'      => 'unique',
+                'key_name'          => 'username',
+                'checked_data'      => 'User',
+                'checked_key'       => 'id',
+                'error_msg'         => '用户已存在[{$var}]',
+            ],
             [
                 'checked_type'      => 'length',
                 'key_name'          => 'nickname',
diff --git a/config/shopxo.php b/config/shopxo.php
index db63b474a..65b84440c 100755
--- a/config/shopxo.php
+++ b/config/shopxo.php
@@ -60,6 +60,9 @@ return [
     // 附件host、最后不要带/斜杠结尾, 数据库图片地址以/static/...开头
     'attachment_host'                       => defined('__MY_PUBLIC_URL__') ? substr(__MY_PUBLIC_URL__, 0, -1) : '',
 
+    // css/js引入host地址
+    'public_host'                           => __MY_PUBLIC_URL__,
+
     // 应用商店地址
     'store_url'                             => 'https://store.shopxo.net/',
     'store_payment_url'                     => 'https://store.shopxo.net/payment.html',
diff --git a/sourcecode/alipay/pages/plugins/distribution/introduce/introduce.axml b/sourcecode/alipay/pages/plugins/distribution/introduce/introduce.axml
index 23e16bb01..b756fea39 100644
--- a/sourcecode/alipay/pages/plugins/distribution/introduce/introduce.axml
+++ b/sourcecode/alipay/pages/plugins/distribution/introduce/introduce.axml
@@ -14,8 +14,8 @@
           <view class="title fl">返佣比例</view>
           <view class="content cr-888 fl br-l">
             <view>一级 {{item.level_rate_one}}%</view>
-            <view>二级 {{item.level_rate_two}}%</view>
-            <view>三级 {{item.level_rate_three}}%</view>
+            <view a:if="{{data_base.level == undefined || data_base.level > 0}}">二级 {{item.level_rate_two}}%</view>
+            <view a:if="{{data_base.level == undefined || data_base.level > 1}}">三级 {{item.level_rate_three}}%</view>
           </view>
         </view>
         <view class="item br-b oh">
diff --git a/sourcecode/baidu/pages/plugins/distribution/introduce/introduce.swan b/sourcecode/baidu/pages/plugins/distribution/introduce/introduce.swan
index 98d328859..d1c2d7d9a 100644
--- a/sourcecode/baidu/pages/plugins/distribution/introduce/introduce.swan
+++ b/sourcecode/baidu/pages/plugins/distribution/introduce/introduce.swan
@@ -14,8 +14,8 @@
           <view class="title fl">返佣比例</view>
           <view class="content cr-888 fl br-l">
             <view>一级 {{item.level_rate_one}}%</view>
-            <view>二级 {{item.level_rate_two}}%</view>
-            <view>三级 {{item.level_rate_three}}%</view>
+            <view s-if="data_base.level == undefined || data_base.level > 0">二级 {{item.level_rate_two}}%</view>
+            <view s-if="data_base.level == undefined || data_base.level > 1">三级 {{item.level_rate_three}}%</view>
           </view>
         </view>
         <view class="item br-b oh">
diff --git a/sourcecode/toutiao/pages/plugins/distribution/introduce/introduce.ttml b/sourcecode/toutiao/pages/plugins/distribution/introduce/introduce.ttml
index f8441d922..f1b420391 100644
--- a/sourcecode/toutiao/pages/plugins/distribution/introduce/introduce.ttml
+++ b/sourcecode/toutiao/pages/plugins/distribution/introduce/introduce.ttml
@@ -14,8 +14,8 @@
           <view class="title fl">返佣比例</view>
           <view class="content cr-888 fl br-l">
             <view>一级 {{item.level_rate_one}}%</view>
-            <view>二级 {{item.level_rate_two}}%</view>
-            <view>三级 {{item.level_rate_three}}%</view>
+            <view tt:if="{{data_base.level == undefined || data_base.level > 0}}">二级 {{item.level_rate_two}}%</view>
+            <view tt:if="{{data_base.level == undefined || data_base.level > 1}}">三级 {{item.level_rate_three}}%</view>
           </view>
         </view>
         <view class="item br-b oh">
diff --git a/sourcecode/weixin/pages/plugins/distribution/introduce/introduce.wxml b/sourcecode/weixin/pages/plugins/distribution/introduce/introduce.wxml
index 685d15e83..d36bf1d46 100644
--- a/sourcecode/weixin/pages/plugins/distribution/introduce/introduce.wxml
+++ b/sourcecode/weixin/pages/plugins/distribution/introduce/introduce.wxml
@@ -14,8 +14,8 @@
           <view class="title fl">返佣比例</view>
           <view class="content cr-888 fl br-l">
             <view>一级 {{item.level_rate_one}}%</view>
-            <view>二级 {{item.level_rate_two}}%</view>
-            <view>三级 {{item.level_rate_three}}%</view>
+            <view wx:if="{{data_base.level == undefined || data_base.level > 0}}">二级 {{item.level_rate_two}}%</view>
+            <view wx:if="{{data_base.level == undefined || data_base.level > 1}}">三级 {{item.level_rate_three}}%</view>
           </view>
         </view>
         <view class="item br-b oh">
-- 
GitLab