Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

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);
 
 -- --------------------------------------------------------
 

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>

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">

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,
         },

template/uni-app/pages/columnGoods/HotNewGoods/index.vue

@@ -27,7 +27,7 @@
 		<!-- #ifndef MP -->
 		<home></home>
 		<!-- #endif -->
-		<pageFooter></pageFooter>
+		<!-- <pageFooter></pageFooter> -->
 	</div>
 </template>
 <script>