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

src/pages/activity/groupActivity/detailActivity.jsx

@@ -153,7 +153,7 @@ const BasicForm = props => {
           <img src={detailData.bannerListImg} height="125px" width="375px" />
         </Form.Item>
         <Form.Item label="活动时间">
-          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD')} —— ${moment(detailData.endDate).format('YYYY-MM-DD')}`}</span>
+          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(detailData.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
         </Form.Item>
         <Form.Item label="成团人数">
             <span>{detailData.groupBuyPeople}</span>
@@ -171,7 +171,6 @@ const BasicForm = props => {
           <AuthButton name="admin.SignList.get" noRight={null}>
           {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, detailData.groupActivityId)}><Button>拼团记录</Button></span>}
           </AuthButton>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, detailData)}>{<Button>下载二维码</Button>}</span>}
           <Button onClick={() => cancelPage()}>
             取消
           </Button>

src/pages/activity/helpActivity/detailActivity.jsx

@@ -160,14 +160,14 @@ const BasicForm = props => {
         <Form.Item label="助力封面图2">
           <img src={detailData.bannerListImg} height="125px" width="375px" />
         </Form.Item>
-        <Form.Item label="助力邀请次数">
+        <Form.Item label="助力邀请人数">
           <span>{detailData.personNum}</span>
         </Form.Item>
-        <Form.Item label="助力发起次数">
+        <Form.Item label="助力次数">
           <span>{detailData.helpNum === 0 ? '不限' : detailData.helpNum}</span>
         </Form.Item>
         <Form.Item label="活动时间">
-          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD')} —— ${moment(detailData.endDate).format('YYYY-MM-DD')}`}</span>
+          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(detailData.endDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
         </Form.Item>
         <Form.Item label="活动说明">
           <img src={detailData.activityInstructions} height="300px" width="375px" />
@@ -179,7 +179,6 @@ const BasicForm = props => {
           <AuthButton name="admin.SignList.get" noRight={null}>
           {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, detailData.helpActivityId)}><Button>助力记录</Button></span>}
           </AuthButton>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, detailData)}>{<Button>下载二维码</Button>}</span>}
           <Button onClick={() => cancelPage()}>
             取消
           </Button>

src/pages/building/list/add/components/base.jsx

@@ -441,7 +441,7 @@ function AddBuilding(props) {
               <ImageUpload />,
             )}
           </Form.Item> */}
-          <Form.Item label="排序" >
+          <Form.Item label="排序" help="数值越大，楼盘在列表页中展示越靠前">
             {getFieldDecorator('orderNo')(<Input />)}
           </Form.Item>
           {/* <Form.Item label="优惠信息" >

src/pages/carouselFigure/carouselFigureList.jsx

@@ -59,13 +59,14 @@ const toEditCarouse = (contentId) => () => {
       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: '发布位置',
@@ -145,12 +146,13 @@ const deleteCarouse = (contentId) => () =>{
   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: 'banner' })
@@ -161,12 +163,13 @@ const deleteCarouse = (contentId) => () =>{
           },
         });
       }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: 'banner' })