fix

package.json

@@ -37,6 +37,7 @@
   "license": "MIT",
   "dependencies": {
     "@babel/runtime": "^7.7.7",
+    "@tarojs/cli": "^3.2.8",
     "@tarojs/components": "3.2.8",
     "@tarojs/react": "3.2.8",
     "@tarojs/runtime": "3.2.8",

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

@@ -14,86 +14,86 @@ const list = [
     name: "全部楼盘",
     id: 1,
     icon: require("@/assets/index-icon9.png"),
-    router: "/pages/index/buildingList/index",
+    router: "/pages/index/buildingList/index"
   },
   {
     name: "品牌地产",
     id: 2,
     icon: require("@/assets/index-icon8.png"),
-    router: "/pages/index/brandList/index",
+    router: "/pages/index/brandList/index"
   },
   {
     name: "近期开盘",
     id: 3,
     icon: require("@/assets/index-icon6.png"),
-    router: `/pages/index/buildingList/index?isRecentOpening=1`,
+    router: `/pages/index/buildingList/index?isRecentOpening=1`
   },
   {
     name: "帮我找房",
     id: 4,
     icon: require("@/assets/index-icon1.png"),
-    router: "/pages/index/helpToFindHouse/index",
+    router: "/pages/index/helpToFindHouse/index"
   },
   {
     name: "增值服务",
     id: 5,
     icon: require("@/assets/index-icon16.png"),
-    router: "/pages/index/addedValueService/index",
+    router: "/pages/index/addedValueService/index"
   },
   {
     name: "地图找房",
     id: 6,
     icon: require("@/assets/index-icon2.png"),
-    router: "/pages/index/findHouseFromMap/index",
+    router: "/pages/index/findHouseFromMap/index"
   },
   {
     name: "活动信息",
     id: 7,
     icon: require("@/assets/index-icon5.png"),
-    router: "/pages/index/activityList/index?type=dymic",
+    router: "/pages/index/activityList/index?type=dymic"
   },
   {
     name: "团房信息",
     id: 8,
     icon: require("@/assets/index-icon12.png"),
-    router: "/pages/index/activityList/index?type=house",
+    router: "/pages/index/activityList/index?type=house"
   },
   {
     name: "特价房",
     id: 9,
     icon: require("@/assets/index-icon11.png"),
-    router: "/pages/index/specialPriceHouse/index",
+    router: "/pages/index/specialPriceHouse/index"
   },
   {
     name: "康养",
     id: 10,
     icon: require("@/assets/index-icon7.png"),
-    miniapp: MINI_KANGYANG,
+    miniapp: MINI_KANGYANG
   },
   {
     name: "文旅商办",
     id: 11,
     icon: require("@/assets/index-icon13.png"),
-    router: `/pages/index/buildingList/index?isCommerce=1`,
+    router: `/pages/index/buildingList/index?isCommerce=1`
   },
   {
     name: "资讯",
     id: 12,
     icon: require("@/assets/index-icon15.png"),
-    router: "/pages/index/newsList/index",
+    router: "/pages/index/newsList/index"
   },
   {
     name: "购房百科",
     id: 13,
     icon: require("@/assets/index-icon4.png"),
-    router: "/pages/index/encyclopediasOfBuyHouse/index",
+    router: "/pages/index/encyclopediasOfBuyHouse/index"
   },
   {
     name: "房贷计算",
     id: 14,
     icon: require("@/assets/index-icon3.png"),
-    router: "/pages/mine/mortgageCalc/index",
-  },
+    router: "/pages/mine/mortgageCalc/index"
+  }
 ];
 
 const brokerList = [
@@ -101,47 +101,62 @@ const brokerList = [
     name: "我要推荐",
     id: 25,
     icon: require("@/assets/index-icon25.png"),
-    router: "/pages/mine/addCustomer/index",
+    router: "/pages/mine/addCustomer/index"
   },
   {
     name: "我的客户",
     id: 23,
     icon: require("@/assets/index-icon23.png"),
-    router: "/pages/mine/myCustomer/index",
+    router: "/pages/mine/myCustomer/index"
   },
   {
     name: "邀请好友",
     id: 26,
     icon: require("@/assets/index-icon26.png"),
-    router: "/subpackages/pages/broker/invitation/index",
+    router: "/subpackages/pages/broker/invitation/index"
   },
   {
     name: "我的钱包",
     id: 24,
     icon: require("@/assets/index-icon24.png"),
-    router: "/subpackages/pages/broker/myWallet/index",
-  },
+    router: "/subpackages/pages/broker/myWallet/index"
+  }
+];
+
+const customerList = [
+  {
+    name: "全民经纪人",
+    id: 25,
+    icon: require("@/assets/index-icon9.png"),
+    router: "/subpackages/pages/broker/toBeBroker/index"
+  }
 ];
 
 export default function Menu() {
   const kangyangRef = useRef();
-  const city = useSelector((state) => state.city);
-
+  const city = useSelector(state => state.city);
+  const person = useSelector(({user})=>user.userInfo?.person)
   const [List, setList] = useState(list);
 
   useEffect(() => {
     // 如果是全民经纪人添加专属菜单
     if (city.curCity.shortname === BROKER_CITY) {
-      setList([...brokerList, ...list]);
-    } else {
+      if(person.personType===ROLE_CODE.BROKER){
+        setList([...brokerList, ...list]);
+      }else if(person.personType===ROLE_CODE.CUSTOMER){
+        setList([...customerList, ...list]);
+      }else{
+        setList(list);
+      }
+      
+    }  else {
       setList(list);
     }
   }, [city.curCity.shortname]);
 
-
   const MenuList = useMemo(() => {
     let Arr = [];
-    List.map((item) => {
+    List.map(item => {
       if (Arr.length) {
         if (Arr[Arr.length - 1].length < 10) {
           Arr[Arr.length - 1].push({ ...item });
@@ -152,10 +167,10 @@ export default function Menu() {
         Arr.push([{ ...item }]);
       }
     });
-    return Arr
+    return Arr;
   }, [List]);
 
-  const MenuClick = (item) => {
+  const MenuClick = item => {
     return () => {
       if (item.router) {
         Taro.navigateTo({ url: item.router });
@@ -170,7 +185,7 @@ export default function Menu() {
 
   useEffect(() => {
     // 获取康养小程序相关
-    getSystemParsm(MINI_KANGYANG).then((res) => {
+    getSystemParsm(MINI_KANGYANG).then(res => {
       if (res && res.paramValue) {
         kangyangRef.current = JSON.parse(res.paramValue);
       }

src/subpackages/pages/broker/agentRule/index.jsx

@@ -9,18 +9,14 @@ const defaultRuleImage =
 export default withLayout(() => {
   const [value, setValue] = useState("");
   useEffect(() => {
-    getbkAgentRule().then((res) => {
+    getbkAgentRule().then(res => {
       setValue(res.content);
     });
   }, []);
 
   return (
-    <ScrollView
-      className="Page broker-page"
-      style={{ height: "100vh" }}
-      scrollY
-    >
-      <Image mode="heightFix" className="img-set" src={defaultRuleImage} />
+    <View className="Page broker-page">
+      <Image  className="img-set" src={defaultRuleImage} />
       <View className="broker-padding">
         <View>
           <Text>邀请奖励说明</Text>
@@ -29,6 +25,6 @@ export default withLayout(() => {
           </View>
         </View>
       </View>
-    </ScrollView>
+    </View>
   );
 });

src/subpackages/pages/broker/agentRule/index.scss

@@ -1,26 +1,39 @@
-.Page.broker-page{
-  .img-set{
-     width: 100vw;
-     display:block;
-    }
-  .broker-padding{
-    background-color: #49A8C1;
+.Page.broker-page {
+  height: 100vh;
+
+  .img-set {
+    width: 100vw;
+    height: 459px;
+    display: block;
+  }
+  .broker-padding {
+    background-color: #49a8c1;
     padding: 6rpx 30rpx 24rpx 30rpx;
-    >view{
+    overflow: hidden;
+    flex-shrink: 0;
+    height: calc(100% - 459px - 30px);
+    > view {
+      height: calc(100% - 120rpx);
       padding: 39rpx 48rpx 80rpx 42rpx;
       font-size: 34rpx;
       border-radius: 40rpx;
-      background-color: #FFF;
-      >text{
+      background-color: #fff;
+      overflow: auto;
+      display: flex;
+      flex-direction: column;
+      overflow: auto;
+      > text {
         font-family: DengXian;
         font-weight: 400;
         color: #333333;
         margin: 60rpx 194rpx 0 201rpx;
       }
-      >view{
+      > view {
         margin-top: 39rpx;
       }
     }
+    > view::-webkit-scrollbar {
+      display: none;
+    }
   }
 }
-

src/subpackages/pages/broker/invitation/poster/index.jsx

@@ -76,7 +76,7 @@ export default (props) => {
       )}
 
       <View style={{ width: "1px", height: "1px",overflow:'hidden' }}>
-        <Canvas type="2d" id="canvas-broker-poster" />
+        <Canvas type="2d" id="canvas-broker-poster" style={{width: '1px',height:'1px'}}/>
       </View>
     </>
   );