From 80b8b583d421f5ff7dd9c22c80bb08b37bde97fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Wed, 1 Mar 2023 16:46:47 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AE=89=E8=A3=85sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/public/install/crmeb.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/crmeb/public/install/crmeb.sql b/crmeb/public/install/crmeb.sql
index 6d84ca6d8..9a08732f0 100755
--- a/crmeb/public/install/crmeb.sql
+++ b/crmeb/public/install/crmeb.sql
@@ -33520,7 +33520,8 @@ INSERT INTO `eb_system_config` (`id`, `menu_name`, `type`, `input_type`, `config
 (428, 'queue_open', 'radio', 'input', 26, '0=>关闭\n1=>开启', 1, '', 0, 0, '\"0\"', '消息队列', '是否启用消息队列，启用后提升程序运行速度，启用前必须配置Redis缓存，文档地址：https://doc.crmeb.com/single/crmeb_v4/7217', 0, 1),
 (429, 'get_avatar', 'radio', 'input', 7, '0=>关闭\n1=>开启', 1, '', 0, 0, '\"0\"', '强制获取昵称头像', '是否在小程序用户授权之后，弹窗获取用户的昵称和头像', 0, 1),
 (430, 'share_qrcode', 'radio', 'input', 2, '0=>商城\n1=>公众号', 1, '', 0, 0, '\"0\"', '公众号推广码类型', '公众号生成的推广码类型：商城：扫码直接进入商城，公众号：扫码进入公众号后推送商城的链接', 0, 1),
-(431, 'member_brokerage', 'radio', 'input', 73, '1=>开启\n0=>关闭', 1, '', 0, 0, '\"0\"', '购买付费会员返佣', '购买付费会员是否按照设置的佣金比例进行返佣', 98, 1);
+(431, 'member_brokerage', 'radio', 'input', 73, '1=>开启\n0=>关闭', 1, '', 0, 0, '\"0\"', '购买付费会员返佣', '购买付费会员是否按照设置的佣金比例进行返佣', 98, 1),
+(432, 'user_brokerage_type', 'radio', 'input', 73, '0=>按照商品价格返佣\n1=>按照实际支付价格返佣', 1, '', 0, 0, '\"0\"', '返佣类型', '选择返佣类型，按照商品价格返佣（按照商品售价计算返佣金额）以及按照实际支付价格返佣（按照商品的实际支付价格计算返佣 ）', 97, 1);
 
 -- --------------------------------------------------------
 

From b360d8ed92155c0f27fad8830d44c0670f7ad28f Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Wed, 1 Mar 2023 16:52:59 +0800
Subject: [PATCH 2/5] =?UTF-8?q?style:=20=E5=95=86=E5=93=81=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/product/productList/tableExpand.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/admin/src/pages/product/productList/tableExpand.vue b/template/admin/src/pages/product/productList/tableExpand.vue
index 4259f250f..f22816134 100644
--- a/template/admin/src/pages/product/productList/tableExpand.vue
+++ b/template/admin/src/pages/product/productList/tableExpand.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <Row class="expand-row">
-      <Col span="8">
+      <Col span="8" class="mr20">
         <span class="expand-key">商品分类：</span>
         <span class="expand-value">{{ row.cate_name }}</span>
       </Col>

From b0ac0f29bf4d25b5d20185e27738066f38d5009e Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Wed, 1 Mar 2023 16:53:19 +0800
Subject: [PATCH 3/5] =?UTF-8?q?improve:=20=E6=8E=A8=E5=B9=BF=E4=BA=BAicon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/user/list/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/template/admin/src/pages/user/list/index.vue b/template/admin/src/pages/user/list/index.vue
index b514186e1..09694783e 100644
--- a/template/admin/src/pages/user/list/index.vue
+++ b/template/admin/src/pages/user/list/index.vue
@@ -336,7 +336,7 @@
               <img v-lazy="formInline.image" />
             </div>
             <div class="upLoad acea-row row-center-wrapper" v-else>
-              <Icon type="ios-camera-outline" size="26" />
+              <Icon type="md-person" size="26" />
             </div>
           </div>
         </FormItem>
@@ -594,7 +594,7 @@ export default {
           align: 'center',
         },
         {
-          title: 'ID',
+          title: '用户ID',
           key: 'uid',
           width: 80,
         },

From 20547d3ac0e89a7adb6be791b9728f9b2f69dc61 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Wed, 1 Mar 2023 16:53:38 +0800
Subject: [PATCH 4/5] =?UTF-8?q?improve:=20=E5=88=97=E8=A1=A8=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/pages/user/list/handle/userEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/admin/src/pages/user/list/handle/userEdit.vue b/template/admin/src/pages/user/list/handle/userEdit.vue
index bcb14fe88..72103bf09 100644
--- a/template/admin/src/pages/user/list/handle/userEdit.vue
+++ b/template/admin/src/pages/user/list/handle/userEdit.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <Form ref="formItem" :rules="ruleValidate" :model="formItem" :label-width="100" @submit.native.prevent>
-      <FormItem label="编号：" v-if="formItem.uid">
+      <FormItem label="用户ID：" v-if="formItem.uid">
         <Input class="form-sty" disabled v-model="formItem.uid" placeholder="请输入编号" style="width: 80%"></Input>
       </FormItem>
       <FormItem label="真实姓名：" prop="real_name">

From b39daab59f421569a486545fd0fa804e7c6055dd Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Wed, 1 Mar 2023 16:53:55 +0800
Subject: [PATCH 5/5] =?UTF-8?q?improve:=20=E5=AD=90=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=BA=95=E9=83=A8=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/pages/columnGoods/HotNewGoods/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/uni-app/pages/columnGoods/HotNewGoods/index.vue b/template/uni-app/pages/columnGoods/HotNewGoods/index.vue
index 1fef974d4..667bcfa59 100644
--- a/template/uni-app/pages/columnGoods/HotNewGoods/index.vue
+++ b/template/uni-app/pages/columnGoods/HotNewGoods/index.vue
@@ -27,7 +27,7 @@
 		<!-- #ifndef MP -->
 		<home></home>
 		<!-- #endif -->
-		<pageFooter></pageFooter>
+		<!-- <pageFooter></pageFooter> -->
 	</div>
 </template>
 <script>