Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/pages/carouselFigure/advertisingList.jsx

       dataIndex: 'buildingName',
       key: 'buildingName',
       align: 'center',
+      render: (buildingName) => <span>{ buildingName === null ? '无' : buildingName }</span>
     },
     {
       title: '关联内容类型',
       dataIndex: 'contentType',
       key: 'contentType',
       align: 'center',
-      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : '' }</span>
+      render: (contentType) => <span>{ contentType === 'project' ? '项目' : contentType === 'activity' ? '活动' : contentType === 'news' ? '资讯' : contentType === 'other' ? '其他' : contentType === 'help' ? '助力' : contentType === 'group' ? '拼团' : contentType === 'h5' ? 'H5活动' : '无' }</span>
     },
     // {
     //   title: '发布位置',
   const changeStatus = (row) => () => {
       console.log(row)
       if(row.status === 0) {
-        row.status = 1
+        
         Modal.confirm({
           title: '确认发布此数据?',
           okText: '确定',
           cancelText: '取消',
           onOk() {
+            row.status = 1
               request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
           },
         });
       }else if(row.status === 1){
-        row.status = 0
+        
         Modal.confirm({
           title: '停用后不会再显示在小程序端',
           okText: '确定',
           cancelText: '取消',
           onOk() {
+            row.status = 0
               request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
               <Option value="help">助力</Option>
               <Option value="group">拼团</Option>
               <Option value="h5">H5</Option>
-              <Option value="">无</Option>
+              <Option value="nothing">无</Option>
             </Select>,
           )}
         </Form.Item>

src/pages/carouselFigure/carouselFigureList.jsx

               <Option value="help">助力</Option>
               <Option value="group">拼团</Option>
               <Option value="h5">H5</Option>
-              <Option value="">无</Option>
+              <Option value="nothing">无</Option>
               {/* <Option value="other">其他</Option> */}
             </Select>,
           )}