合并

src/pages/activity/ActivityList.jsx

@@ -133,7 +133,7 @@ const header = props => {
       render: (x, row) => (
         <>
           <AuthButton name="admin.SignList.get" noRight={null}>
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? '报名记录' : ''}<Icon type="snippets" className={styles.shoppingCart} /></span>
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? '报名记录' : ''}{ (row.isEnlist==1||row.isEnlist==2)  && <Icon type="snippets" className={styles.shoppingCart} />}</span>
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
             {row.activityStatus != 0 && <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>}

src/pages/carouselFigure/carouselFigureList.jsx

@@ -192,7 +192,7 @@ const handleSubmit = (e, props) => {
         <Form.Item>
           {getFieldDecorator('showPosition')(
             <Select style={{ width: '180px' }} placeholder="发布位置">
-              <Option value="mall">商城</Option>
+              <Option value="mall">积分商城</Option>
               <Option value="index">首页</Option>
             </Select>,
           )}

src/pages/carouselFigure/editCarousel.jsx

@@ -102,7 +102,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             value: 'index',
           },
           {
-            label: '商城',
+            label: '积分商城',
             value: 'mall',
           }],
           value: data.showPosition,

src/pages/customer/independentList/index.jsx

@@ -388,12 +388,13 @@ function body (props) {
       title: '类型',
       dataIndex: 'personType',
       key: 'personType',
-      render: (_, record) => <><span>{record.channelName !== null ? '渠道经纪人' : '独立经纪人'}</span></>,
+      render: (_, record) => <><span>{record.personType === 'channel agent' ? '渠道经纪人' : '独立经纪人'}</span></>,
     },
     {
       title: '所属渠道',
       dataIndex: 'channelName',
       key: 'channelName',
+      render: (_, record) => <><span>{record.personType === 'channel agent' ? record.channelName : ''}</span></>,
     },
     {
       title: '操作',

src/pages/system/document/audit.jsx

@@ -48,7 +48,7 @@ function body (props) {
       cancelText: '取消',
       onOk () {
 
-        onVerify(2)
+        onVerify(1)
       }
     });
   }