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

src/components/GlobalHeader/AvatarDropdown.jsx

@@ -42,10 +42,12 @@ class AvatarDropdown extends React.Component {
   }
 
   render() {
+    console.log(this.props, 'props')
     const {
       currentUser = {
         avatar: '',
         userName: '',
+        miniAppName: '',
       },
       menu,
     } = this.props;
@@ -80,7 +82,8 @@ class AvatarDropdown extends React.Component {
         <HeaderDropdown overlay={menuHeaderDropdown}>
             <span className={`${styles.action} ${styles.account}`}>
               <Avatar size="small" className={styles.avatar} src={currentUser.avatar === null ? currentUser.photo:currentUser.avatar} alt="avatar" />
-              <span className={styles.name}>{currentUser.userName}</span>
+              <span className={styles.name}>{currentUser.loginName}</span>
+              <span className={styles.name}>欢迎登录{currentUser.miniAppName}</span>
             </span>
         </HeaderDropdown>
 

src/pages/carouselFigure/customImg/edit.jsx

@@ -14,9 +14,9 @@ const { TextArea } = Input;
 const { Option } = Select;
 
 let activityVisible = true
+let helpTips = ''
 
 const setExtraData = (data) => {
-    console.log(data, 'data');
     activityVisible = data.imgType === 'index';
   }
 
@@ -36,7 +36,21 @@ const header = props => {
   } = props;
 
   const imgId = props.location.query.imgId
-  const [ data, setData ] = useState({'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图','imgDocument': currentUser.orgName+' 精准获客平台'})
+  const imgType = props.location.query.imgType
+
+  const [ data, setData ] = useState(imgType === 'index' ? 
+  {
+    'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg',
+    'imgType':'index',
+    'imgDesc':'小程序首页分享配图',
+    'imgDocument': currentUser.orgName+' 精准获客平台'
+  } : 
+  {
+    'imgUrl':'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png',
+    'imgType':'indexNews',
+  }
+  )
+
   if(imgId){
     useEffect(() => {
       getData(imgId);
@@ -48,8 +62,10 @@ const header = props => {
         console.log(data)
         if (data.imgType === 'index'){
             activityVisible = true;
+            helpTips = '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：首页分享';
         }else{
             activityVisible = false;
+            helpTips = '建议尺寸：80*80px，比例1:1，格式：jpg，用于：首页资讯logo'
         }
         setData(data)
     })
@@ -62,7 +78,7 @@ const header = props => {
       name: 'imgUrl',
       type: FieldTypes.ImageUploader,
       value: data.imgUrl,
-      help: '建议图片尺寸：750*600px，比例5:4,格式：jpg，用于：首页分享',
+      help: helpTips,
       rules: [
         {required: true, message: '请选择图片'},
       ]
@@ -71,17 +87,21 @@ const header = props => {
       label: '类型',
       name: 'imgType',
       type: FieldTypes.Select,
-      value: 'index',
+      value: data.imgType,
       dict: [{
           label: '首页分享',
           value: 'index',
         },
+        {
+          label: '首页资讯',
+          value: 'indexNews',
+        },
       ],
       rules: [
         { required: true, message: '请选择类型' },
       ],
     },
-    {
+    data.imgType === 'index' && {
       label: '分享文案',
       name: 'imgDocument',
       type: FieldTypes.Text,

src/pages/carouselFigure/customImg/list.jsx

@@ -26,18 +26,22 @@ function header(props) {
         if(data.records.length > 0){
           setData(data.records)
         }else{
-          setData([{'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图'}])
+          setData([
+            {'imgUrl':'https://estateagents.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1574145199853-97feda7895c65be33aa234a7b81b37f.jpg','imgType':'index','imgDesc':'小程序首页分享配图'},
+            {'imgUrl':'http://njcj.oss-cn-shanghai.aliyuncs.com/icon.png','imgType':'indexNews','imgDesc':'首页资讯logo'}
+          ])
         }
         
     })
   }
   
     // 跳转到编辑商品
-  const toEditCustom = (imgId) => () => {
+  const toEditCustom = (imgId, imgType) => () => {
     router.push({
       pathname: '/carouselFigure/customImg/edit',
       query: {
-        imgId
+        imgId,
+        imgType:imgType
       },
     });
   }
@@ -55,7 +59,7 @@ function header(props) {
         <Column title="类型" dataIndex="imgType" key="imgType" 
         render={(text, record) => (
           <span>
-            {record.imgType === 'index' ?'首页分享':'请编辑'}
+            {record.imgType === 'index' ?'首页分享': record.imgType === 'indexNews' ? '首页资讯' : '请编辑'}
           </span>
           )}
         />
@@ -65,7 +69,7 @@ function header(props) {
         key="handle" 
         render={(text, record) => (
           <AuthButton name="admin.custom.put" noRight={null}>
-            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditCustom(record.imgId)}>
+            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditCustom(record.imgId, record.imgType)}>
               编辑<Icon type="form" className={styles.edit} />
             </span>
           </AuthButton>