Merge branch 'main' of http://git.ycjcjy.com/marketing/miniapp into main

config/prod.js

@@ -10,7 +10,7 @@ module.exports = {
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
     ICON_FONT: '"https://yz-websit.oss-cn-hangzhou.aliyuncs.com/xlk/css/iconfont.ttf"',
-    Version: '"V0.0.40-20210811"'
+    Version: '"V0.0.42-20210812"'
   },
   mini: {},
   h5: {

src/actions/news.js

@@ -25,8 +25,8 @@ export const dispatchNewsList = payload => createAction({
  * 资讯详情
  * @param {*} id 
  */
-export const dispatchNewsDetail = id => createAction({
-  url: `${API_NEWS_LIST}/${id}`,
-  type: NEWS_DETAIL,
-  payload
-})
+// export const dispatchNewsDetail = id => createAction({
+//   url: `${API_NEWS_LIST}/${id}`,
+//   type: NEWS_DETAIL,
+//   payload
+// })

src/pages/index/brandList/index.jsx

@@ -13,8 +13,10 @@ export default withLayout((props) => {
   const [list, setList] = useState({});
 
   useEffect(() => {
-    initData()
-  }, [])
+    if (city?.id) {
+      initData()
+    }
+  }, [city?.id])
 
   function initData () {
     queryBrandList({ cityId: city?.id }).then((res) => {

src/pages/index/components/Menu/index.jsx

@@ -21,7 +21,7 @@ export default function Menu () {
     { name: '特价房', id: 9, icon: require('@/assets/index-icon11.png'), router: '/pages/index/specialPriceHouse/index' },
     { name: '康养', id: 10, icon: require('@/assets/index-icon7.png'), miniapp: MINI_KANGYANG },
     { name: '文旅商办', id: 11, icon: require('@/assets/index-icon13.png'), router: `/pages/index/buildingList/index?isCommerce=1` },
-    // { name: '新闻资讯', id: 12, icon: require('@/assets/index-icon15.png'), router: '/pages/index/newsList/index' },
+    { name: '资讯', id: 12, icon: require('@/assets/index-icon15.png'), router: '/pages/index/newsList/index' },
     { name: '购房百科', id: 13, icon: require('@/assets/index-icon4.png'), router: '/pages/index/encyclopediasOfBuyHouse/index' },
     { name: '房贷计算', id: 14, icon: require('@/assets/index-icon3.png'), router: '/pages/mine/mortgageCalc/index' }
   ]

src/pages/index/newsList/index.config.js

@@ -1,3 +1,3 @@
 export default {
-  navigationBarTitleText: '新闻资讯'
+  navigationBarTitleText: '资讯'
 }

src/pages/mine/tabData.js

@@ -16,7 +16,7 @@ const MineMenuList = {
     [
       { name: '成为驻场管理', icon: require('@/assets/mine-icon8.png'), router: '/pages/mine/toBeManager/index' },
       { name: '成为置业顾问', icon: require('@/assets/mine-icon4.png'), router: 'propertyConsultant' },
-      { name: '成为专业经纪人', icon: require('@/assets/mine-icon2.png'), router: '/pages/mine/toBeAgent/index' }
+      { name: '成为合伙人', icon: require('@/assets/mine-icon2.png'), router: '/pages/mine/toBeAgent/index' }
     ]
   ],
   Broker: [ // 经纪人

src/routes.js

@@ -206,7 +206,7 @@ const routes = [
     type: 'building',
   },
   {
-    name: '新闻资讯',
+    name: '资讯',
     page: 'pages/index/newsList/index',
     pkg: 'main',
     type: 'news',
@@ -279,7 +279,7 @@ const routes = [
     // auth: ['phone'],
   },
   {
-    name: '成为经纪人',
+    name: '成为合伙人',
     page: 'pages/mine/toBeAgent/index',
     pkg: 'main',
     type: 'mine',

src/services/common.js

@@ -97,7 +97,7 @@ export const queryMessageTPL = type =>
  * 获取品牌房企列表
  * @param {*}
  */
-export const queryBrandList = (params) => fetch({ url: API_BRAND_LIST, params });
+export const queryBrandList = (payload) => fetch({ url: API_BRAND_LIST, payload });
 
 /**
  * 获取品牌房企列表