weichaochao 5 lat temu
rodzic
commit
50ee72cc6b

+ 6
- 18
src/pages/activity/liveActivity/add/index.jsx Wyświetl plik

70
           })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
70
           })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
71
         </Form.Item>
71
         </Form.Item>
72
         <Form.Item label="所属楼盘">
72
         <Form.Item label="所属楼盘">
73
-          {getFieldDecorator('buildingId', {
74
-            rules: [{ required: true, message: ' 请输入所属楼盘' }],
75
-          })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
73
+          {getFieldDecorator('buildingId')(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
76
         </Form.Item>
74
         </Form.Item>
77
         <Form.Item label="直播活动标题">
75
         <Form.Item label="直播活动标题">
78
           {getFieldDecorator('liveActivityTitle', {
76
           {getFieldDecorator('liveActivityTitle', {
87
                     message: '请选择直播开始时间',
85
                     message: '请选择直播开始时间',
88
                   },
86
                   },
89
                 ],
87
                 ],
90
-              })(<DatePicker style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
88
+              })(<DatePicker placeholder="预计开始时间"style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
91
         </Form.Item>
89
         </Form.Item>
92
         <Form.Item label="直播结束时间">
90
         <Form.Item label="直播结束时间">
93
           {getFieldDecorator('liveEndDate', {
91
           {getFieldDecorator('liveEndDate', {
97
                     message: '请选择直播结束时间',
95
                     message: '请选择直播结束时间',
98
                   },
96
                   },
99
                 ],
97
                 ],
100
-              })(<DatePicker disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
98
+              })(<DatePicker placeholder="预计结束时间" disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
101
         </Form.Item>
99
         </Form.Item>
102
-        {/* <Form.Item label="直播时间">
103
-            {getFieldDecorator('liveTime', {
104
-              rules: [
105
-                {
106
-                  required: true,
107
-                  message: '请选择直播时间',
108
-                },
109
-              ],
110
-            })(<RangePicker style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
111
-        </Form.Item> */}
112
         <Form.Item label="直播小程序">
100
         <Form.Item label="直播小程序">
113
           {getFieldDecorator('liveApp', {
101
           {getFieldDecorator('liveApp', {
114
               rules: [{ required: true, message: '请选择直播小程序' }],
102
               rules: [{ required: true, message: '请选择直播小程序' }],
123
         <Form.Item label="房间参数">
111
         <Form.Item label="房间参数">
124
           {getFieldDecorator('liveRoomParam', {
112
           {getFieldDecorator('liveRoomParam', {
125
             rules: [{ required: true, message: '请输入房间参数' }],
113
             rules: [{ required: true, message: '请输入房间参数' }],
126
-          })(<Input maxLength={1000} placeholder="请下载文档查看如何获取" style={{width:'680px'}}/>)}<a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E7%9B%B4%E6%92%AD%E6%88%BF%E9%97%B4%E5%8F%B7%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B(1).docx" style={{ color: 'blue' }}> 不知道怎么填?查看说明</a>
114
+          })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}<a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E7%9B%B4%E6%92%AD%E6%88%BF%E9%97%B4%E5%8F%B7%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B(1).docx" style={{ color: 'blue' }}> 不知道怎么填?查看说明</a>
127
         </Form.Item>
115
         </Form.Item>
128
         <Form.Item label="封面图1" help="建议尺寸:750px*420px,比例16:9,格式:jpg,用于:活动列表">
116
         <Form.Item label="封面图1" help="建议尺寸:750px*420px,比例16:9,格式:jpg,用于:活动列表">
129
               {getFieldDecorator('listImg', {
117
               {getFieldDecorator('listImg', {
132
                 <ImageUpload />,
120
                 <ImageUpload />,
133
               )}
121
               )}
134
         </Form.Item>  
122
         </Form.Item>  
135
-        <Form.Item label="封面图2" help="建议尺寸:750*250,比例3:1,格式:jpg,用于:项目详情页">
123
+        <Form.Item label="封面图2" help="建议尺寸:750*250px,比例3:1,格式:jpg,用于:项目详情页">
136
               {getFieldDecorator('detailImg', {
124
               {getFieldDecorator('detailImg', {
137
                   rules: [{ required: true, message: '请上传封面图2' }],
125
                   rules: [{ required: true, message: '请上传封面图2' }],
138
               })(
126
               })(
144
                   rules: [{ required: true, message: '请上传详情图' }],
132
                   rules: [{ required: true, message: '请上传详情图' }],
145
               })(
133
               })(
146
                 <ImageUpload />,
134
                 <ImageUpload />,
147
-              )}<a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E7%9B%B4%E6%92%AD%E6%88%BF%E9%97%B4%E5%8F%B7%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B(1).docx" style={{ color: 'blue' }}> 查看详情图示例</a>
135
+              )}
148
         </Form.Item>      
136
         </Form.Item>      
149
         <Form.Item label="权重">
137
         <Form.Item label="权重">
150
               {getFieldDecorator('weight', {
138
               {getFieldDecorator('weight', {

+ 10
- 18
src/pages/activity/liveActivity/edit/components/base.jsx Wyświetl plik

59
   function handleSubmit (e) {
59
   function handleSubmit (e) {
60
     e.preventDefault();
60
     e.preventDefault();
61
     props.form.validateFields((err, values) => {
61
     props.form.validateFields((err, values) => {
62
+      console.log(values, 'values');
62
       if (!err){
63
       if (!err){
63
         let {liveTime, ...submitValue} = values
64
         let {liveTime, ...submitValue} = values
64
-        if (submitValue.status == '已发布'){
65
+        if (submitValue.status == '已发布' || submitValue.status == '1'){
65
           submitValue.status = 1
66
           submitValue.status = 1
66
         }else{
67
         }else{
67
           submitValue.status = 0
68
           submitValue.status = 0
70
           message.info("直播结束时间大于开始时间")
71
           message.info("直播结束时间大于开始时间")
71
           return;
72
           return;
72
         }
73
         }
74
+        submitValue.liveStartDate = moment(submitValue.liveStartDate._d).format('YYYY-MM-DD HH:mm:ss')
75
+        submitValue.liveEndDate = moment(submitValue.liveEndDate._d).format('YYYY-MM-DD HH:mm:ss')
73
         console.log(submitValue)
76
         console.log(submitValue)
74
         request({ ...apis.taliveActivity.updateTaLiveActivity, urlData: {id: liveActivityId},data: submitValue, }).then((data) => {
77
         request({ ...apis.taliveActivity.updateTaLiveActivity, urlData: {id: liveActivityId},data: submitValue, }).then((data) => {
75
           message.info("保存成功")
78
           message.info("保存成功")
95
         <Form.Item label="所属楼盘">
98
         <Form.Item label="所属楼盘">
96
           {getFieldDecorator('buildingId', {
99
           {getFieldDecorator('buildingId', {
97
             initialValue: liveActivityData.buildingId,
100
             initialValue: liveActivityData.buildingId,
98
-            rules: [{ required: true, message: ' 请输入所属楼盘' }],
99
           })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
101
           })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
100
         </Form.Item>
102
         </Form.Item>
101
         <Form.Item label="直播活动标题">
103
         <Form.Item label="直播活动标题">
112
                     message: '请选择直播开始时间',
114
                     message: '请选择直播开始时间',
113
                   },
115
                   },
114
                 ],
116
                 ],
115
-              })(<DatePicker style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
117
+              })(<DatePicker placeholder="预计开始时间" style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
116
         </Form.Item>
118
         </Form.Item>
117
         <Form.Item label="直播结束时间">
119
         <Form.Item label="直播结束时间">
118
           {getFieldDecorator('liveEndDate', { initialValue : liveActivityData.liveEndDate ? moment(liveActivityData.liveEndDate, 'YYYY-MM-DD HH:mm:ss') : null,
120
           {getFieldDecorator('liveEndDate', { initialValue : liveActivityData.liveEndDate ? moment(liveActivityData.liveEndDate, 'YYYY-MM-DD HH:mm:ss') : null,
122
                     message: '请选择直播结束时间',
124
                     message: '请选择直播结束时间',
123
                   },
125
                   },
124
                 ],
126
                 ],
125
-              })(<DatePicker disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
127
+              })(<DatePicker placeholder="预计结束时间" disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
126
         </Form.Item>
128
         </Form.Item>
127
-        {/* <Form.Item label="直播时间">
128
-            {getFieldDecorator('liveTime', { initialValue : liveActivityData.liveStartDate ? moment(liveActivityData.liveStartDate, 'YYYY-MM-DD HH:mm:ss') : null,
129
-              rules: [
130
-                {
131
-                  required: true,
132
-                  message: '请选择直播时间',
133
-                },
134
-              ],
135
-            })(<RangePicker style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
136
-        </Form.Item> */}
137
         <Form.Item label="直播小程序">
129
         <Form.Item label="直播小程序">
138
           {getFieldDecorator('liveApp', {
130
           {getFieldDecorator('liveApp', {
139
               initialValue: liveActivityData.liveApp,
131
               initialValue: liveActivityData.liveApp,
150
           {getFieldDecorator('liveRoomParam', {
142
           {getFieldDecorator('liveRoomParam', {
151
             initialValue: liveActivityData.liveRoomParam,
143
             initialValue: liveActivityData.liveRoomParam,
152
             rules: [{ required: true, message: '请输入房间参数' }],
144
             rules: [{ required: true, message: '请输入房间参数' }],
153
-          })(<Input maxLength={1000} placeholder="请下载文档查看如何获取" style={{width:'680px'}}/>)}<a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E7%9B%B4%E6%92%AD%E6%88%BF%E9%97%B4%E5%8F%B7%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B(1).docx" style={{ color: 'blue' }}> 不知道怎么填?查看说明</a>
145
+          })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}<a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E7%9B%B4%E6%92%AD%E6%88%BF%E9%97%B4%E5%8F%B7%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B(1).docx" style={{ color: 'blue' }}> 不知道怎么填?查看说明</a>
154
         </Form.Item>
146
         </Form.Item>
155
         <Form.Item label="封面图1" help="建议尺寸:750px*420px,比例16:9,格式:jpg,用于:活动列表">
147
         <Form.Item label="封面图1" help="建议尺寸:750px*420px,比例16:9,格式:jpg,用于:活动列表">
156
               {getFieldDecorator('listImg', {
148
               {getFieldDecorator('listImg', {
160
                 <ImageUpload />,
152
                 <ImageUpload />,
161
               )}
153
               )}
162
         </Form.Item>  
154
         </Form.Item>  
163
-        <Form.Item label="封面图2" help="建议尺寸:750*250,比例3:1,格式:jpg,用于:项目详情页">
155
+        <Form.Item label="封面图2" help="建议尺寸:750*250px,比例3:1,格式:jpg,用于:项目详情页">
164
               {getFieldDecorator('detailImg', {
156
               {getFieldDecorator('detailImg', {
165
                   initialValue: liveActivityData.detailImg,
157
                   initialValue: liveActivityData.detailImg,
166
                   rules: [{ required: true, message: '请上传封面图2' }],
158
                   rules: [{ required: true, message: '请上传封面图2' }],
173
                   initialValue: liveActivityData.detailTypeImg,
165
                   initialValue: liveActivityData.detailTypeImg,
174
                   rules: [{ required: true, message: '请上传详情图' }],
166
                   rules: [{ required: true, message: '请上传详情图' }],
175
               })(
167
               })(
176
-                <ImageUpload />,
177
-              )}<a href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E7%9B%B4%E6%92%AD%E6%88%BF%E9%97%B4%E5%8F%B7%E8%8E%B7%E5%8F%96%E6%95%99%E7%A8%8B(1).docx" style={{ color: 'blue' }}> 查看详情图示例</a>
168
+                <ImageUpload style={{width:'300px',height:'600px'}}/>,
169
+              )}
178
         </Form.Item>      
170
         </Form.Item>      
179
         <Form.Item label="权重">
171
         <Form.Item label="权重">
180
               {getFieldDecorator('weight', {
172
               {getFieldDecorator('weight', {

+ 1
- 0
src/pages/activity/liveActivity/edit/components/shareRecord.jsx Wyświetl plik

140
             </Button>
140
             </Button>
141
         </Form.Item>
141
         </Form.Item>
142
       </Form>
142
       </Form>
143
+      <span>共筛选出{data.total}条记录</span>
143
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
144
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
144
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
145
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
145
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
146
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>

+ 1
- 0
src/pages/activity/liveActivity/edit/components/visitRecord.jsx Wyświetl plik

142
             </Button>
142
             </Button>
143
         </Form.Item>
143
         </Form.Item>
144
       </Form>
144
       </Form>
145
+      <span>共筛选出{data.total}条记录</span>
145
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
146
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
146
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
147
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
147
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
148
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>

+ 1
- 1
src/pages/activity/liveActivity/edit/index.jsx Wyświetl plik

64
         <Radio.Button value="poster">海报设置</Radio.Button>
64
         <Radio.Button value="poster">海报设置</Radio.Button>
65
         <Radio.Button value="share">分享设置</Radio.Button>
65
         <Radio.Button value="share">分享设置</Radio.Button>
66
         <Radio.Button value="shareRecord">分享记录</Radio.Button>
66
         <Radio.Button value="shareRecord">分享记录</Radio.Button>
67
-        <Radio.Button value="visitRecord">访问记录</Radio.Button>
67
+        <Radio.Button value="visitRecord">访问访问记录</Radio.Button>
68
       </Radio.Group>
68
       </Radio.Group>
69
       <div style={{ marginTop: '20px' }}>
69
       <div style={{ marginTop: '20px' }}>
70
         { (tab === 'base' && <Base liveActivityId={{ liveId }} onSuccess={e => buildingOnSuccess(e)}/>)} 
70
         { (tab === 'base' && <Base liveActivityId={{ liveId }} onSuccess={e => buildingOnSuccess(e)}/>)} 

+ 18
- 7
src/pages/activity/liveActivity/list/index.jsx Wyświetl plik

67
       openNotificationWithIcon('error', '请先选择需要删除的直播活动')
67
       openNotificationWithIcon('error', '请先选择需要删除的直播活动')
68
       return
68
       return
69
     }
69
     }
70
-    request({ ...apis.taliveActivity.deleteTaLiveActivity, data: liveIdList, }).then((data) => {
71
-      message.info("操作成功")
72
-      getList({ pageNum: 1, pageSize: 10 });
73
-    }).catch((err) => {
74
-      // message.info(err.msg)
75
-    })
70
+    Modal.confirm({
71
+      title: '确定删除直播活动吗',
72
+      okText: '确定',
73
+      cancelText: '取消',
74
+      onOk () {
75
+        request({ ...apis.taliveActivity.deleteTaLiveActivity, data: liveIdList, }).then((data) => {
76
+          message.info("操作成功")
77
+          getList({ pageNum: 1, pageSize: 10 });
78
+        }).catch((err) => {
79
+          // message.info(err.msg)
80
+        })
81
+      },
82
+    });
83
+
84
+    
76
   }
85
   }
77
 
86
 
78
   /**
87
   /**
261
             </Button>
270
             </Button>
262
         </Form.Item>
271
         </Form.Item>
263
       </Form>
272
       </Form>
273
+      
264
       <AuthButton name="admin.live.add.post" noRight={null}>
274
       <AuthButton name="admin.live.add.post" noRight={null}>
265
         <Button type="danger" className={styles.addBtn} onClick={toAddLive()}>新增</Button>
275
         <Button type="danger" className={styles.addBtn} onClick={toAddLive()}>新增</Button>
266
       </AuthButton>
276
       </AuthButton>
267
       <AuthButton name="admin.live.del" noRight={null}>
277
       <AuthButton name="admin.live.del" noRight={null}>
268
         <Button type="primary" className={styles.addBtn} onClick={toDelLiveActivity()} style={{marginLeft:'30px'}}>删除</Button>
278
         <Button type="primary" className={styles.addBtn} onClick={toDelLiveActivity()} style={{marginLeft:'30px'}}>删除</Button>
269
-      </AuthButton>
279
+      </AuthButton><br/>
280
+      <span>共筛选出{data.total}条记录</span>
270
       <Table rowSelection={rowSelection}
281
       <Table rowSelection={rowSelection}
271
        dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
282
        dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
272
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
283
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

+ 15
- 7
src/pages/house/list/index.jsx Wyświetl plik

67
       openNotificationWithIcon('error', '请先选择需要删除的批次')
67
       openNotificationWithIcon('error', '请先选择需要删除的批次')
68
       return
68
       return
69
     }
69
     }
70
-    console.log(houseIdList,'houseIdListhouseIdList');
71
-    request({ ...apis.house.deleteTaSalesBatch, data: houseIdList, }).then((data) => {
72
-      message.info("操作成功")
73
-      getList({ pageNum: 1, pageSize: 10 });
74
-    }).catch((err) => {
75
-      // message.info(err.msg)
76
-    })
70
+
71
+    Modal.confirm({
72
+      title: '确定删除批次信息吗',
73
+      okText: '确定',
74
+      cancelText: '取消',
75
+      onOk () {
76
+        console.log(houseIdList,'houseIdListhouseIdList');
77
+        request({ ...apis.house.deleteTaSalesBatch, data: houseIdList, }).then((data) => {
78
+          message.info("操作成功")
79
+          getList({ pageNum: 1, pageSize: 10 });
80
+        }).catch((err) => {
81
+          // message.info(err.msg)
82
+        })
83
+      },
84
+    });
77
   }
85
   }
78
 
86
 
79
   const newQrcode = row => {
87
   const newQrcode = row => {