feats

config/dev.js

@@ -13,6 +13,8 @@ module.exports = {
     // WSS_HOST: '"wss://lt.pawoma.cn"',
     // HOST: '"http://127.0.0.1:8080"',
     // WSS_HOST: '"ws://127.0.0.1:8080"',
+    OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
+    OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
     Version: 'V3.5.11'
   },
   weapp: {},

config/prod.js

@@ -9,6 +9,8 @@ module.exports = {
     WSS_HOST: '"wss://dev.pawoma.cn"',
     // HOST: '"https://lt.pawoma.cn"',
     // WSS_HOST: '"wss://lt.pawoma.cn"',
+    OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
+    OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
     Version: 'V3.5.12'
   },
   weapp: {},

src/pages/project/NavIcons/icons.js

@@ -0,0 +1,111 @@
+import { ROLE_CODE } from '@/constants/user'
+
+export default [
+  {
+    iconCode: 'integralMall',
+    iconName: '赚积分',
+    iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811839725-mall-icon.png',
+    tab: '/pages/shop/index',
+    default: true,
+  },
+  {
+    iconCode: 'refercustomers',
+    iconName: '推荐客户',
+    page: ({ city, personType }) => {
+      if (personType !== ROLE_CODE['CONSULTANT']) return false;
+
+      return `/useless/pages/agent/recommend/index?type=index&cityId=${city}`
+    },
+    iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811691300-recommend-icon.png',
+    default: true,
+  },
+  {
+    iconCode: 'buyingEncyclopedia',
+    iconName: '购房须知',
+    iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811865979-encyclopedia-icon.png',
+    page: '/pages/policy/index?from=mine',
+    default: true,
+  },
+  {
+    iconCode: 'findRoom',
+    iconName: '选好房',
+    page: '/pages/project/map/index',
+    iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811880140-map-icon.png',
+    default: true,
+  },
+  {
+    iconCode: 'Highlyrecommented',
+    iconName: '重点推荐',
+    page: '/pages/project/highlyRecommented',
+  },
+  {
+    iconCode: 'MortgageCalculator',
+    iconName: '算房贷',
+    page: '/pages/toolKit/index',
+  },
+  {
+    iconCode: 'PropertyListing',
+    iconName: '楼盘列表',
+    page: '/pages/project/list/index',
+  },
+  {
+    iconCode: 'EventInformation',
+    iconName: '活动资讯',
+    tab: '/pages/activity/activity',
+  },
+  {
+    iconCode: 'Popularactivities',
+    iconName: '参加活动',
+    tab: '/pages/activity/activity',
+  },
+  {
+    iconCode: 'LatestInformation',
+    iconName: '最新资讯',
+    tab: '/pages/activity/activity',
+  },
+  {
+    iconCode: 'Myclient',
+    iconName: '我的客户',
+    page: '/useless/pages/agent/client/index',
+  },
+  {
+    iconCode: 'MyActivities',
+    iconName: '我的活动',
+    page: '/pages/activity/myActivity?from=mine',
+  },
+  {
+    iconCode: 'Myhelp',
+    iconName: '我的助力',
+    page: '/pages/activity/assistancePage',
+  },
+  {
+    iconCode: 'Mygroup',
+    iconName: '我的拼团',
+    page: '/pages/activity/assemblePage',
+  },
+  {
+    iconCode: 'MyFavorites',
+    iconName: '我的收藏',
+    page: '/pages/person/favorite/index',
+  },
+  {
+    iconCode: 'MyInformation',
+    iconName: '我的资料',
+    page: '/useless/pages/person/profile/index',
+  },
+  {
+    iconCode: 'Mymessage',
+    iconName: '我的消息',
+    page: '/pages/im/list/index',
+  },
+  {
+    iconCode: 'Exchangerecords',
+    iconName: '兑换记录',
+    page: '/useless/pages/shop/record/index',
+  },
+  {
+    iconCode: 'Feedback',
+    iconName: '意见反馈',
+    page: '/useless/pages/person/feedback/index',
+  },
+]

src/pages/project/NavIcons/index.js

@@ -0,0 +1,56 @@
+import { isFunction, isEmpty } from '@/utils/tools'
+import allIcons from './icons'
+import './index.scss'
+
+const defaultIcons = allIcons.filter(x => x.default)
+
+export default function (props) {
+  const iconList = props.iconList && props.iconList.length ? props.iconList : defaultIcons
+  const showIcons = iconList.map((icon) => {
+    const defIcon = allIcons.filter(x => icon.iconCode === x.iconCode)[0]
+
+    if (!defIcon) return false;
+
+    const navIcon = {
+      ...defIcon,
+      ...icon,
+    }
+
+    if (isEmpty(navIcon.page) && isEmpty(navIcon.tab)) return false;
+
+    if (isFunction(navIcon.page)) {
+      const pg = navIcon.page(props)
+      if (!pg) return false;
+
+      return { ...navIcon, page: pg }
+    }
+
+    return navIcon
+  }).filter(Boolean)
+
+  const naviTo = (icon) => {
+    const { page, tab } = icon || {}
+
+    if (tab) {
+      Taro.switchTab({ url: tab })
+    } else {
+      Taro.navigateTo({ url: page })
+    }
+  }
+
+  return (
+    <View className="navicons" style={showIcons.length == 3 ? "padding:0 8%" : ""}>
+        {showIcons.map((item) => (
+            <View onClick={() => naviTo(item)} className="nav-item" key={item.iconCode}>
+                <Image className="icon" src={item.iconUrl} ></Image>
+                <View className="nav-text">
+                  <Text>{item.iconName}</Text>
+                  { item.iconCode== 'refercustomers' && 
+                    <Image style="width:30rpx;height:30rpx;margin-left:4rpx" src={require('@/assets/award.png')} ></Image>
+                  }
+                </View>
+            </View>
+        ))}
+    </View>
+  )
+}

src/pages/project/NavIcons/index.scss

@@ -0,0 +1,26 @@
+.navicons {
+  width:690px;
+  height:188px;
+  background:#fff;
+  box-shadow:0px 4px 12px 0px rgba(0,0,0,0.12);
+  border-radius:12px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  margin: -64px auto 0 auto;
+  position: relative;
+  .nav-item{
+    text-align: center;
+    width: 25%;
+    .icon{
+      width:84px;
+      height:84px;
+    }
+    .nav-text{
+      display: flex;
+      align-items: center;
+      justify-content: center;
+      
+    }
+  }
+}

src/pages/project/icons.js

@@ -1,144 +0,0 @@
-import { ROLE_CODE } from '@/constants/user'
-
-const icons = {
-    shop: require('@/assets/index/mall-icon.png'),
-    encyclopedia: require('@/assets/index/encyclopedia-icon.png'),
-    recommend: require('@/assets/index/recommend-icon.png'),
-    map: require('@/assets/index/map-icon.png'),
-    calculator: require('@/assets/index/calculator-icon.png'),
-    Highlyrecommented: require('@/assets/index/recommend.png'),
-}
-
-const DRIFT = ROLE_CODE['DRIFT']
-const CUSTOMER = ROLE_CODE['CUSTOMER']
-const CONSULTANT = ROLE_CODE['CONSULTANT']
-// const ESTATE_AGENT = ROLE_CODE['ESTATE_AGENT']
-// const CHANNEL_AGENT = ROLE_CODE['CHANNEL_AGENT']
-
-const menus = [
-
-    {
-        name: '赚积分',
-        url: '/pages/shop/index',
-        icon: icons.shop,
-        switchTab: true,
-        iconCode: 'integralMall',
-    },
-    {
-        name: '购房须知',
-        url: '/pages/policy/index?from=mine',
-        icon: icons.encyclopedia,
-        iconCode: 'buyingEncyclopedia'
-    },
-    {
-        name: '推荐客户',
-        url: '/useless/pages/agent/recommend/index?type=index&cityId=',
-        icon: icons.recommend,
-        iconCode: 'refercustomers',
-        city: true,
-    },
-    {
-        name: '选好房',
-        url: '/pages/project/map/index',
-        icon: icons.map,
-        iconCode: 'findRoom'
-    },
-    {
-        name: '重点推荐',
-        url: '/pages/project/highlyRecommented',
-        icon: icons.Highlyrecommented,
-        iconCode: 'Highlyrecommented'
-    },
-    {
-        name: '算房贷',
-        url: '/pages/toolKit/index',
-        icon: icons.calculator,
-        iconCode: 'MortgageCalculator'
-    },
-
-    {
-        name: '楼盘列表',
-        url: '/pages/project/list/index',
-        icon: icons.buildingList,
-        iconCode: 'PropertyListing'
-    },
-    {
-        name: '活动资讯',
-        url: '/pages/activity/activity',
-        icon: icons.calculator,
-        iconCode: 'EventInformation',
-        switchTab: true,
-    },
-    {
-        name: '参加活动',
-        url: '/pages/activity/activity',
-        icon: icons.activity,
-        iconCode: 'Popularactivities',
-        switchTab: true,
-    },
-    {
-        name: '最新资讯',
-        url: '/pages/activity/activity',
-        icon: icons.news,
-        iconCode: 'LatestInformation',
-        switchTab: true,
-    },
-    {
-        name: '我的客户',
-        url: '/useless/pages/agent/client/index',
-        icon: icons.myGuest,
-        iconCode: 'Myclient',
-    },
-    {
-        name: '我的活动',
-        url: '/pages/activity/myActivity?from=mine',
-        icon: icons.activities,
-        iconCode: 'MyActivities'
-    },
-    {
-        name: '我的助力',
-        url: '/pages/activity/assistancePage',
-        icon: icons.help,
-        iconCode: 'Myhelp'
-    },
-    {
-        name: '我的拼团',
-        url: '/pages/activity/assemblePage',
-        icon: icons.group,
-        iconCode: 'Mygroup'
-    },
-    {
-        name: '我的收藏',
-        url: '/pages/person/favorite/index',
-        icon: icons.collection,
-        iconCode: 'MyFavorites'
-    },
-    {
-        name: '我的资料',
-        url: '/useless/pages/person/profile/index',
-        icon: icons.profile,
-        iconCode: 'MyInformation'
-    },
-    {
-        name: '我的消息',
-        url: '/pages/im/list/index',
-        icon: icons.chatList,
-        iconCode: 'Mymessage'
-    },
-    {
-        name: '兑换记录',
-        url: '/useless/pages/shop/record/index',
-        icon: icons.exchange,
-        iconCode: 'Exchangerecords'
-    },
-    {
-        name: '意见反馈',
-        url: '/useless/pages/person/feedback/index',
-        icon: icons.feedback,
-        iconCode: 'Feedback'
-    },
-
-
-]
-
-export { icons, menus }

src/pages/project/index.js

@@ -5,29 +5,17 @@ import Banner from './banner'
 import Newsbanner from './newsbanner'
 import Activity from './activity'
 import BannerTwo from './swiper'
-// import ActivityItem from '../activity/item'
 import ready from '@/utils/ready'
-import { getLocationCity } from '@/services/map'
-import { queryBanners, savePoint, updatePoint, queryExtContents, queryIndexIcons } from '@/services/common'
+import { savePoint, updatePoint, queryExtContents, queryIndexIcons } from '@/services/common'
 import { queryHelpGroup } from '@/services/news'
 import { getIndexShare } from '@/services/user'
-// import { queryActivityList } from '@/services/activity'
 import { dispatchCitySelected } from '@/actions/city'
-import { ROLE_CODE, DECREASE_UNREADNUM } from '@/constants/user'
 import { SET_SCREEN_SHOWED } from '@/constants/project'
 import { getStore, connect } from '@tarojs/redux'
 import * as actions from '@/actions/project'
 import { transferImage } from '@/utils/tools'
 import Notice from '@/components/Notice'
-import { menus } from './icons'
-import Menus from '@/components/indexMenus'
-
-const bgImg = "https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1578724562550-background.png"
-// import { getIndexPreloadData } from '@/utils/preload'
-// import Authorize from '@/components/authorize'
-// import * as noticeType from '@/constants/common.js'
-
-// const { miniProgram: { appId } } = wx.getAccountInfoSync();
+import NavIcons from './NavIcons'
 
 @connect(
   state => ({ ...state.project, ...state.city, ...state.user, system: state.system }),
@@ -57,7 +45,7 @@ export default class Index extends Component {
     propagandaBanner: [],
     newsShow: false,
     city: null,
-    menusList: [],
+    iconList: [],
   }
 
   componentWillMount() {
@@ -87,58 +75,9 @@ export default class Index extends Component {
   }
 
   getIndexIcons() {
-
     queryIndexIcons().then(res => {
-      if (res.length) {
-        const Arr = [];
-
-        res.forEach(item => {
-          menus.forEach(menu => {
-            if (menu.iconCode == item.iconCode) {
-              Arr.push(menu);
-            }
-          })
-        })
-        const { userInfo: { person: { personType } } } = this.props
-        this.setState({
-          menusList: personType == ROLE_CODE['CONSULTANT'] ? Arr.filter(item => item.iconCode != 'refercustomers') : Arr
-        })
-      } else {
-        const iconList = [
-          {
-            iconCode: 'integralMall',
-            iconName: '赚积分',
-            iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811839725-mall-icon.png'
-          },
-          {
-            iconCode: 'refercustomers',
-            iconName: '推荐客户',
-            iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811691300-recommend-icon.png',
-          },
-          {
-            iconCode: 'buyingEncyclopedia',
-            iconName: '购房须知',
-            iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811865979-encyclopedia-icon.png'
-          },
-          {
-            iconCode: 'findRoom',
-            iconName: '选好房',
-            iconUrl: 'https://njcj.oss-cn-shanghai.aliyuncs.com/miniapp/upload/images/1580811880140-map-icon.png',
-
-          },
-        ]
-        const newArr = [];
-        iconList.forEach(item => {
-          menus.forEach(menu => {
-            if (menu.iconCode == item.iconCode) {
-              newArr.push(menu);
-            }
-          })
-        })
-        const { userInfo: { person: { personType } } } = this.props
-        this.setState({
-          menusList: personType == ROLE_CODE['CONSULTANT'] ? newArr.filter(item => item.iconCode != 'refercustomers') : newArr
-        })
+      if (res && res.length) {
+        this.setState({ iconList: res })
       }
     })
   }
@@ -179,57 +118,6 @@ export default class Index extends Component {
     recordId && updatePoint(recordId)
   }
 
-  // getLocation() {
-  //   Taro.getLocation().then(location => {
-  //     Taro.setStorageSync('lat', location.latitude)
-  //     Taro.setStorageSync('lon', location.longitude)
-
-  //     const payload = { location: `${location.longitude},${location.latitude}` }
-
-  //     getLocationCity(payload).then(res => {
-  //       if (!res || !res.id) {
-  //         Taro.showToast({
-  //           title: '未查询到当前城市信息, 请手动选择',
-  //           icon: 'none',
-  //           duration: 3000,
-  //         })
-  //       } else {
-  //         this.setState({ city: res })
-  //         this.loadData({ curCity: res })
-  //         this.updateCity(res)
-  //       }
-  //     }).catch(err => {
-  //       console.error(err)
-
-  //       Taro.showToast({
-  //         title: '服务错误, 请手动选择城市',
-  //         icon: 'none',
-  //         duration: 3000,
-  //       })
-  //     })
-  //   }).catch(err => {
-  //     if (err.errMsg === 'getLocation:fail auth deny') {
-  //       Taro.showModal({
-  //         content: '请同意授权您的定位功能',
-  //         showCancel: false,
-  //         duration: 3000,
-  //       })
-  //     } else {
-  //       Taro.showToast({
-  //         title: `定位失败, 请手动选择城市: ${err.errMsg}`,
-  //         icon: 'none',
-  //         duration: 3000,
-  //       })
-  //     }
-
-  //     console.error(err)
-  //   })
-  // }
-
-  // updateCity(payload) {
-  //   this.props.dispatchCitySelected(payload)
-  // }
-
   loadData(props = {}) {
     this.loadHelpGroupList(props)
     this.loadList(props)
@@ -606,10 +494,9 @@ export default class Index extends Component {
     })
   }
   render() {
-    const { curCity } = this.props
-    const { achieve, helpGroupList, propagandaBanner, newsShow, menusList } = this.state
-    const { userInfo: { person: { personType, phone } } } = this.props
-    const { unReadNum, userInfo: { person } } = this.props
+    const { achieve, helpGroupList, propagandaBanner, newsShow, iconList } = this.state
+    const { curCity, unReadNum, userInfo: { person } } = this.props
+
     return (
       <Block>
         {this.state.loaded && (
@@ -653,7 +540,7 @@ export default class Index extends Component {
                 </View>
               </View>
               {/* 菜单栏 */}
-              <Menus menusList={menusList}></Menus>
+              <NavIcons city={curCity} person={person} iconList={iconList} ></NavIcons>
               {/* <View style={propagandaBanner.length > 0 ? "border-bottom:20rpx solid #f5f5f5" : ''}> */}
               <View style={(newsShow || propagandaBanner.length > 0) ? "border-bottom:20rpx solid #f5f5f5" : ''}>
                 {/* 展示位轮播图 */}

src/utils/tools.js

@@ -27,6 +27,14 @@ export function isEmpty(o) {
   return false
 }
 
+/**
+ * 是否函数
+ * @param {*} f 
+ */
+export function isFunction(f) {
+  return typeof f === 'function'
+}
+
 /**
  * 是否分享场景(含扫码)
  * @param {*} scene 
@@ -68,6 +76,9 @@ export function mergeNotNull(a, b) {
   return res
 }
 
+const ossPath = OSS_PATH
+const ossFastPath = OSS_FAST_PATH
+
 /**
  * 
  * @param {*} img 
@@ -76,8 +87,8 @@ export function mergeNotNull(a, b) {
 export function getThumbnail(img, quality) {
   if (!img) return img
 
-  if (img.indexOf('https://njcj.oss-cn-shanghai.aliyuncs.com') === 0) {
-    return `${img.replace('oss-cn-shanghai', 'oss-accelerate')}?x-oss-process=style/compress${quality || 30}`
+  if (img.indexOf(ossPath) === 0 || img.indexOf(ossFastPath) === 0) {
+    return `${img.replace(ossPath, ossFastPath)}?x-oss-process=style/compress${quality || 30}`
   }
 
   return img
@@ -87,8 +98,8 @@ export function getThumbnail(img, quality) {
 export function resizeImage(img, size) {
   if (!img) return img
 
-  if (img.indexOf('https://njcj.oss-cn-shanghai.aliyuncs.com') === 0) {
-    return `${img.replace('oss-cn-shanghai', 'oss-accelerate')}?x-oss-process=style/resize${size || 750}`
+  if (img.indexOf(ossPath) === 0 || img.indexOf(ossFastPath) === 0) {
+    return `${img.replace(ossPath, ossFastPath)}?x-oss-process=style/resize${size || 750}`
   }
 
   return img
@@ -101,13 +112,13 @@ export function resizeImage(img, size) {
 export function transferImage(img) {
   if (!img) return img
 
-  if (img.indexOf('https://njcj.oss-cn-shanghai.aliyuncs.com') === 0) {
+  if (img.indexOf(ossPath) === 0 || img.indexOf(ossFastPath) === 0) {
     if (store.getState().system.systemInfo.platform !== 'ios') {
       // ios 暂时不支持 webp
-      return `${img.replace('oss-cn-shanghai', 'oss-accelerate')}?x-oss-process=style/transwebp`
+      return `${img.replace(ossPath, ossFastPath)}?x-oss-process=style/transwebp`
     }
 
-    return `${img.replace('oss-cn-shanghai', 'oss-accelerate')}?x-oss-process=image/resize,m_lfit,w_750/quality,Q_80`
+    return `${img.replace(ossPath, ossFastPath)}?x-oss-process=image/resize,m_lfit,w_750/quality,Q_80`
   }
 
   return img
@@ -198,7 +209,7 @@ export function getDownloadURL(url, type) {
     case 'avatar':
       return url.replace('https://wx.qlogo.cn/', `${HOST}/qlogo/`);
     case 'alioss':
-      return url.replace('https://njcj.oss-cn-shanghai.aliyuncs.com/', `${HOST}/alioss/`).replace('https://estateagents.oss-accelerate.aliyuncs.com/', `${HOST}/alioss/`);
+      return url.replace(ossPath, `${HOST}/alioss/`).replace(ossFastPath, `${HOST}/alioss/`);
     default:
       return url;
   }