bug fix

package.json

@@ -54,7 +54,6 @@
     "omit.js": "^1.0.2",
     "path-to-regexp": "^3.0.0",
     "qrcode.react": "^0.9.3",
-    "qrcodejs2": "0.0.2",
     "qs": "^6.7.0",
     "react": "^16.8.6",
     "react-amap": "^1.2.8",

src/components/Wangedit/Wangedit.jsx

@@ -43,6 +43,24 @@ class Wangedit extends React.Component {
 
       fetch(apis.image.upload)({data}).then(insert)
     }
+    this.editor.customConfig.menus = [
+      'head',  // 标题
+      'bold',  // 粗体
+      'fontSize',  // 字号
+      'fontName',  // 字体
+      'italic',  // 斜体
+      'underline',  // 下划线
+      'strikeThrough',  // 删除线
+      'foreColor',  // 文字颜色
+      'backColor',  // 背景颜色
+      'list',  // 列表
+      'justify',  // 对齐方式
+      'quote',  // 引用
+      'image',  // 插入图片
+      'undo',  // 撤销
+      'redo'  // 重复
+    ]
+
     this.editor.create()
     this.editor.customConfig.uploadImgShowBase64 = true
     this.editor.txt.html(this.props.value)

src/pages/activity/ActivityList.jsx

@@ -3,7 +3,7 @@ import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagina
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import router from 'umi/router';
 import moment from 'moment';
-import QRCode from 'qrcodejs2'
+// import QRCode from 'qrcodejs2'
 import styles from '../style/GoodsList.less';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'

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

@@ -171,11 +171,11 @@ function AddBuilding(props) {
               <ImageUpload />,
             )}
           </Form.Item>
-          <Form.Item label="海报底图" help="建议图片尺寸：640px*1136px" >
+          {/* <Form.Item label="海报底图" help="建议图片尺寸：640px*1136px" >
             {getFieldDecorator('poster')(
               <ImageUpload />,
             )}
-          </Form.Item>
+          </Form.Item> */}
           <Form.Item label="排序" >
             {getFieldDecorator('orderNo')(<Input />)}
           </Form.Item>

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

@@ -71,6 +71,11 @@ const Poster = props => {
 
   const submitPoster = () => {
     if (buildingId) {
+      if (!imgValue) {
+        message.error('请选择海报图片')
+        return
+      }
+
       if (posterId) {
         request({
           ...apis.activity.updatePoster,
@@ -136,7 +141,7 @@ const Poster = props => {
       </div>
       <div >
         <div style={{ display: 'flex', width: '100%', margin: '60px 0' }}>
-          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}>海报图片</p>
+          <p style={{ minWidth: '200px', color: '#222', textAlign: 'right', margin: '0 30px 0 0' }}><span style={{ color: 'red' }}>*</span> 海报图片</p>
           <ImageUploader value={imgValue} onChange={e => changeImg(e)} />
         </div>
         <div style={{ display: 'flex', alignItems: 'center', width: '100%', marginBottom: '60px' }}>

src/pages/building/list/index.jsx

@@ -31,7 +31,6 @@ function openNotificationWithIcon(type, message) {
 function CartBody(props) {
   const { data } = props
 
-
   function toEdi(record) {
     router.push({
       pathname: '/building/list/add',
@@ -98,11 +97,13 @@ function CartBody(props) {
     });
   }
 
+  const { buildingImg = []} = data
+
   return (
     <Card
       hoverable
       style={{ minWidth: '330px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
-      cover={<img alt="example" src={data.poster} style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
+      cover={<img alt="example" src={(buildingImg[0] || {}).url} style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
       bodyStyle={{ padding: '10px 20px' }}
     >
       <p className={Styles.cardText}>

src/pages/carouselFigure/carouselFigureList.jsx

@@ -185,7 +185,7 @@ const handleSubmit = (e, props) => {
               <Option value="activity">活动</Option>
               <Option value="project">项目</Option>
               <Option value="news">资讯</Option>
-              <Option value="other">其他</Option>
+              {/* <Option value="other">其他</Option> */}
             </Select>,
           )}
         </Form.Item>

src/pages/carouselFigure/editCarousel.jsx

@@ -123,10 +123,10 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
             label: '资讯',
             value: 'news',
           },
-          {
-            label: '其他',
-            value: 'other',
-          },
+          // {
+          //   label: '其他',
+          //   value: 'other',
+          // },
           {
             label: '拼团',
             value: 'group',