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

config/routes.js

@@ -521,6 +521,24 @@ export default [
               },
             ],
           },
+          // {
+          //   path: '/miniapp',
+          //   name: '小程序管理',
+          //   component: '../layouts/BlankLayout',
+          //   routes: [
+          //     {
+          //       path: '/miniapp/menuList',
+          //       name: '首页菜单管理',
+          //       component: './miniapp/menuList',
+          //     },
+          //     {
+          //       path: '/miniapp/editIcons',
+          //       name: '首页菜单编辑',
+          //       hideInMenu: true,
+          //       component: './miniapp/editIcons',
+          //     },
+          //   ],
+          // },
           {
             component: './404',
           },

src/components/SelectButton/MiniappIconSelect.jsx

@@ -0,0 +1,64 @@
+import React, { useState, useEffect, useRef } from 'react';
+import { Select } from 'antd';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { Option } = Select;
+
+function usePrevious(props) {
+  const ref = useRef();
+  useEffect(() => {
+    ref.current = props;
+  });
+  return ref.current;
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const MiniappIconSelect = props => {
+  const [data, setData] = useState([])
+  const [value, setValue] = useState([])
+  useEffect(() => {
+    getMiniappIconSelect();
+  }, [props.value])
+
+
+  const getMiniappIconSelect = e => {
+    request({ ...apis.icon.minippIconList, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+        setData(data)
+        checkValue(data)
+        // 默认选中第一个
+    })
+  }
+
+
+  const checkValue = (data) => {
+    if (props.value) {
+      const tempData = data.filter(f => f.iconCode == props.value)
+      const va = (tempData.length > 0) ? props.value : ''
+      props.onChange(va)
+
+    }
+  }
+
+  return (
+      <Select
+      showSearch
+      value={props.value}
+      style={{ width: '300px' }}
+      placeholder="请选择功能"
+      onChange={props.onChange}
+      filterOption={(input, option) =>
+        option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+      }>
+          {data.map(icon => (
+            <Option key={icon.iconCode} value={icon.iconCode}>{icon.iconName}</Option>
+          ))}
+      </Select>
+  )
+}
+export default MiniappIconSelect

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

@@ -45,7 +45,7 @@ function AddBuilding(props) {
 
   const [poi, setPoi] = useState([])
   const [videoImage, setVideoImage] = useState(false)
-  const [priceTypeList, setPriceTypeList] = useState([])
+  const [typeState, setTypeState] = useState("rich")
 
   // 存放所以 buildingData 基础信息
   const [buildingData, setBuildingData] = useState({})
@@ -87,8 +87,7 @@ function AddBuilding(props) {
       // if (res.openingDate !== null) {
       //   res.openingDate = moment(res.openingDate)
       // }
-      //构造下拉框
-      setPriceTypeList(res.buildingProjectType)
+      setTypeState(res.highlightsType)
       if (res.receivedDate !== null) {
         res.receivedDate = moment(res.receivedDate)
       }
@@ -280,6 +279,11 @@ function AddBuilding(props) {
     })
   }
 
+  function highlightsTypeChange(e) {
+    console.log(e.target.value,"ee")
+    setTypeState(e.target.value)
+  }
+
   function setFormMapScopeValue(key, pois) {
     const poiArray = pois.map(p => ({
         address: p.address,
@@ -310,12 +314,6 @@ function AddBuilding(props) {
     return newPoi
   }
 
-  //组装项目类型
-  function getBuildingProjectTypeList(e) {
-    console.log(e,"项目类型------")
-    setPriceTypeList(e)
-  }
-
   function setFormMapScopeTagValue(keyType, item) {
     const tag = item.data.map(t => ({ tagName: t.name, delete: true, automatic: true }))
     switch (keyType) {
@@ -369,16 +367,11 @@ function AddBuilding(props) {
           <Form.Item label="项目类型">
             {getFieldDecorator('buildingProjectType', {
               rules: [{ required: true, message: '请选择项目类型' }],
-            })(<BudildingProjectType onChange={e => getBuildingProjectTypeList(e)}/>)}
+            })(<BudildingProjectType />)}
           </Form.Item>
-          <Form.Item label="列表展示均价" >
+          <Form.Item label="列表展示均价" help="项目列表展示价格，示例：约10000元/㎡、约1000万元/套起">
             {/* {getFieldDecorator('price')(<Input type="number" style={{ width: '210px' }}/>)}元/m² */}
-            {getFieldDecorator('buildingTypeId')(
-              <Select placeholder="请选择项目类型的价格">
-                    {
-                      priceTypeList.map((item, _) => <Option value={item.buildingTypeId}>{item.buildingTypeName}</Option>)
-                    }
-              </Select>)}
+            {getFieldDecorator('price')(<Input />)}
           </Form.Item>
           <Form.Item label="开盘时间" >
             {getFieldDecorator('openingDate')(<Input placeholder="预计xxxx年xx月开盘" maxLength = "15"/>)}
@@ -587,11 +580,27 @@ function AddBuilding(props) {
               <ImageUpload />,
             )}
           </Form.Item>*/}
-          <Form.Item label="项目亮点" >
+          <Form.Item label="亮点封面" help="建议尺寸690*230px，用于项目详情-项目亮点封面图">
+            {getFieldDecorator('highlightsCover')(
+              <ImageUpload />,
+            )}
+          </Form.Item>
+          <Form.Item label="亮点类型">
+            {getFieldDecorator('highlightsType')(
+            <Radio.Group onChange={e => highlightsTypeChange(e)}>
+              <Radio value="rich">自定义</Radio>
+              <Radio value="link">公众号链接</Radio>
+            </Radio.Group>,
+            )}
+          </Form.Item>
+          {typeState === 'link' && <Form.Item label="公众号链接" help="只能填写同一主体公众号的文章链接">
+            {getFieldDecorator('highlightsLink')(<Input placeholder="请输入公众号链接" />)}
+          </Form.Item>}
+          {typeState === 'rich' && <Form.Item label="亮点内容" >
             {getFieldDecorator('highlights')(
               <Wangedit />,
             )}
-          </Form.Item> 
+          </Form.Item> }
           <Form.Item style={{ width: '400px', margin: 'auto', display: 'flex', justifyContent: 'space-between' }}>
             <Button type="primary" htmlType="submit">
                 确定

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

@@ -187,7 +187,7 @@ class ModalPanoramaImage extends React.Component {
             onCancel={e => this.handleCancel(e)}
           >
             <Form {...formItemLayout} onSubmit={e => this.handleSubmit(e)}>
-              <Form.Item label="全景类型">
+              <Form.Item label="全景类型" help="全景图展示位置: 项目详情Banner,户型介绍">
                 {getFieldDecorator('panoramaType', {
                   rules: [
                     {

src/pages/miniapp/editIcons.jsx

@@ -0,0 +1,96 @@
+import React, { useState, useEffect } from 'react';
+import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Select, Form, Alert } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import channels from '../channel/channelList.less';
+import MiniappIconSelect from '../../components/SelectButton/MiniappIconSelect'
+import XForm, { FieldTypes } from '../../components/XForm';
+import Wangedit from '../../components/Wangedit/Wangedit'
+import router from 'umi/router';
+import apis from '../../services/apis';
+import request from '../../utils/request'
+
+const { TextArea } = Input;
+const { Option } = Select;
+
+const header = props => {
+  const goodsId = props.location.query.goodsId
+  const [ goodsData, setGoodsData ] = useState({})
+  if(goodsId){
+    useEffect(() => {
+      getGoodsData(goodsId);
+    },[])
+
+  // 查询列表
+  const getGoodsData = (goodsId) => {
+    request({ ...apis.integralMall.taGoods, urlData: { id: goodsId },}).then((data) => {
+        console.log(data)
+        setGoodsData(data)
+    })
+  }
+  }
+
+  const fields = [
+    {
+      label: '请选择首页功能',
+      name: 'iconCode',
+      render: <MiniappIconSelect />,
+      value: goodsData.iconCode,
+      rules: [
+        {required: true, message: '请选择所属项目'},
+      ]
+    },
+    {
+      label: '功能名称',
+      name: 'iconName',
+      type: FieldTypes.Text,
+      value: goodsData.iconName ,
+      help: '不填就使用默认名称',
+    },
+    {
+      label: '权重',
+      name: 'sort',
+      type: FieldTypes.Number,
+      render: <Input type="number" style={{ width: 80}} />,
+      value: goodsData.sort,
+      rules: [
+        { required: true, message: '请输入权重' },
+      ],
+      help: '数字越大越靠前',
+    },
+  ]
+
+  const handleSubmit = values => {
+    if (values.inventory > values.totalNum) {
+      message.error('商品剩余数量不能大于商品总数量')
+      return
+  }
+
+    if (goodsId) {
+      values.goodsId = goodsId
+      request({ ...apis.integralMall.updateTaGoods, data: values,}).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+      }else{
+      request({ ...apis.integralMall.addTaGoods, data: values,}).then((data) => {
+        cancelPage()
+      }).catch((err) => {
+        message.info(err.msg || err.message)
+      })
+      }
+  }
+
+  const cancelPage = () => {
+    router.push({
+      pathname: '/integralMall/GoodsList',
+    });
+  }
+
+  return (
+    <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+  )
+}
+
+const WrappedNormalLoginForm = Form.create({ name: 'header' })(header);
+export default WrappedNormalLoginForm

src/pages/miniapp/menuList.jsx

@@ -0,0 +1,220 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal,Breadcrumb } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../style/GoodsList.less';
+import router from 'umi/router';
+import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
+import request from '../../utils/request'
+import AuthButton from '@/components/AuthButton';
+
+const { Option } = Select;
+
+
+function header(props) {
+  // 获取初始化数据
+  const [ data, setData ] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  },[])
+
+  // 查询列表
+  const getList = (params) => {
+    request({ ...apis.integralMall.getTaGoods, params: { ...params },}).then((data) => {
+        console.log(data)
+        setData(data)
+    })
+  }
+  
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  const changePageNum = (pageNumber) => {
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        getList({ pageNumber: pageNumber, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  function handleReset() {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 });
+  }
+
+  // 跳转到编辑商品
+  const toEditIcons = (goodsId) => () => {
+    router.push({
+      pathname: '/miniapp/editIcons',
+      query: {
+        goodsId
+      },
+    });
+  }
+
+  
+  const changeGoodsStatus = (row) => () => {
+    const title = row.status === 1 ? '商品在小程序端隐藏，后台可继续编辑重新发布?':'商品会重新显示在小程序端?'
+
+    Modal.confirm({
+      title: title,
+      okText: '确认',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.integralMall.changeTaGoods, data: { ...row },}).then((data) => {
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10, ...props.form.getFieldsValue() });
+        })
+      }
+    });
+  }
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+  const columns = [
+    {
+      title: '商品图片',
+      dataIndex: 'imgUrl',
+      key: 'imgUrl',
+      align: 'center',
+      render: (text, record) => <img src={record.imgUrl} className={styles.touxiang} />,
+    },
+    {
+      title: '商品名称',
+      dataIndex: 'goodsName',
+      key: 'goodsName',
+      align: 'center',
+
+    },
+    {
+      title: '所属积分',
+      dataIndex: 'pointPrice',
+      key: 'pointPrice',
+      align: 'center',
+    },
+    {
+      title: '总数量',
+      dataIndex: 'totalNum',
+      key: 'totalNum',
+      align: 'center',
+    },
+    {
+      title: '已兑换数量',
+      dataIndex: 'exchanged',
+      key: 'exchanged',
+      align: 'center',
+      render: (x,row) => <><span>{row.totalNum - row.inventory}</span></>
+    },
+    {
+      title: '剩余数量',
+      dataIndex: 'inventory',
+      key: 'inventory',
+      align: 'center',
+    },
+    {
+      title: '状态',
+      dataIndex: 'status',
+      key: 'status',
+      align: 'center',
+      render: (status)=> <><span>{status == 1 ? '已上架' : '已下架'}</span></>
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (x, row) => (
+        <>
+          <AuthButton name="admin.taGoods.change.put" noRight={null}>
+            <span style={{ color: '#EF273A', marginRight: '20px',cursor: 'pointer' }} onClick={changeGoodsStatus(row)}>
+              {row.status == 1 ? '下架' : '上架'}
+              {<Icon type="shopping-cart" className={styles.shoppingCart} />}
+            </span>
+          </AuthButton>
+          <AuthButton name="admin.taGoods.put" noRight={null}>
+            <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={toEditIcons(row.goodsId)}>
+              编辑<Icon type="form" className={styles.edit} />
+            </span>
+          </AuthButton>
+        </>
+      ),
+    },
+  ];
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('goodsName')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="商品名称"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('status')(
+            <Select style={{ width: '180px' }} placeholder="状态">
+              <Option value="1">已上架</Option>
+              <Option value="0">已下架</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('buildingId')(
+            <BuildSelect />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('priceLesser')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="价格小"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('priceGreater')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="价格大"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+            <AuthButton name="admin.taGoods.search" noRight={null}>
+              <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                搜索
+              </Button>
+            </AuthButton>
+            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+              重置
+            </Button>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.taGoods.add.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEditIcons()}>新增</Button>
+      </AuthButton>
+      <Table rowKey="goodsList" dataSource={data.records} columns={columns} pagination={false} />
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/news/list/editNewsList.jsx

@@ -110,6 +110,7 @@ const Basic = (props) => {
       type: FieldTypes.Text,
       hidden: () => !urlVisible,
       value: dynamicData.newsDetail,
+      help: "只能填写同一主体公众号的文章链接",
       rules: [
         {required: true, message: '请输入公众号链接'},
       ]

src/services/apis.js

@@ -1070,6 +1070,13 @@ export default {
     action: 'admin.panorama.id.delete',
   }
  },
+ icon: {
+  minippIconList: {
+    url: `${prefix}/taMiniappIcon`,
+    method: 'GET',
+    action: 'admin.taMiniappIcon.get',
+  },
+ },
  amap: { // 高德地图
    webService: { // Web服务Api ---- 周边搜索
      url: `${amapPrefix}/place/around`,