fix：修复bug

apps/RealtorEasier/components/detail-components/detail-scroll/detail-scroll.wxml

@@ -53,7 +53,7 @@
                 <text class="label">{{ item.label }}：</text>
                 <text class="value"> <text class="value" wx:if="{{item.name=='unit_price' }}"> $</text>{{ item.value
                     }}</text>
-                <text class="value" wx:if="{{item.name=='bedroomAmount' ||item.name=='bathRoom_num' }}">个</text>
+                <text class="value" wx:if="{{item.name=='bedroomAmount' ||item.name=='showerroomAmount' }}"></text>
                 <text class="value" wx:if="{{item.name=='unit_price' }}">万</text>
                 <text class="value" wx:if="{{item.name=='buildingArea' ||item.name=='floorSpace' }}">平方英尺</text>
             </view>
@@ -101,7 +101,7 @@
                 <!-- <view class="arrow-right fr"></view> -->
             </view>
             <view wx:for="{{house.remarks}}" :key="name">
-                <view class="detail-title ">{{item.title}}</view>
+                <view class="detail-title-mini ">{{item.title}}</view>
                 <view class="detail-text">
                     {{item.text}}
                 </view>

apps/RealtorEasier/components/detail-components/detail-scroll/detail-scroll.wxss

@@ -159,7 +159,7 @@
   margin-bottom: 26rpx;
   font-weight: bold;
 }
-.detail-title {
+.detail-title-mini {
   font-size: 26rpx;
   font-weight: bold;
   color: #111;

apps/RealtorEasier/components/login-pannel/login-pannel.wxml

@@ -3,7 +3,7 @@
   <cover-view class="login-pannel" animation="{{animationData}}">
     <cover-view>授权登录</cover-view>
     <cover-image class="login-logo" src="/image/4Dage/login-logo.png" mode="heightFix"></cover-image>
-    <cover-view class="logo-bottom-tips">四维时代网络科技有限公司申请获取以下权限</cover-view>
+    <cover-view class="logo-bottom-tips">深圳市百润文化传媒有限公司申请获取以下权限</cover-view>
     <cover-view class="tips">·获得您的公开信息（昵称、头像等）</cover-view>
     <button class="login-btn" open-type="getUserInfo" bindtap="bindgetuserinfo">微信授权登录</button>
   </cover-view>

apps/RealtorEasier/pages/agent-detail/agent-detail.wxml

@@ -11,11 +11,11 @@
           <text >{{ agentDetail.type }}</text>
           <view class="agent-icon" bindtap="showWorkCard"></view>
         </view>
-        <view class="organ">{{ agentDetail.store ? agentDetail.store : ''}}</view>
+        <view class="organ">{{ agentDetail.agency_company_name ? agentDetail.agency_company_name : ''}}</view>
       </view>
     </view>
     <view class="rate-w">
-      <view class="rate-top rate-list">
+      <!-- <view class="rate-top rate-list">
         <view class="rate-item">
           <view class="rate">{{ agentDetail.volume_half_year }}</view>
           <view class="rate-title">客户评价总分</view>
@@ -34,6 +34,28 @@
           <view class="rate">{{ agentDetail.deal_average_period}}</view>
           <view class="rate-title">平均成交周期（天）</view>
         </view>
+      </view> -->
+      <view class="new-rate-list">
+        <view class="new-rate-item">
+          <view class="rete-title">从业执照号码：</view>
+          <view class="rete-msg">{{agentDetail.business_id}}</view>
+        </view>
+        <view class="new-rate-item">
+          <view class="rete-title">英文名：</view>
+          <view class="rete-msg">{{agentDetail.e_name}}</view>
+        </view>
+        <view class="new-rate-item">
+          <view class="rete-title">工作语言：</view>
+          <view class="rete-msg">{{agentDetail.language}}</view>
+        </view>
+        <view class="new-rate-item">
+          <view class="rete-title">联系电话：</view>
+          <view class="rete-msg">{{agentDetail.language}}</view>
+        </view>
+        <view class="new-rate-item">
+          <view class="rete-title">邮箱：</view>
+          <view class="rete-msg">{{agentDetail.email}}</view>
+        </view>
       </view>
     </view>
   </view>

apps/RealtorEasier/pages/agent-detail/agent-detail.wxss

@@ -72,9 +72,35 @@ page {
   color: #A3A4A5;
   font-size: 24rpx;
 }
+
 .rate-item {
   position: relative;
 }
+.new-rate-list{
+  /* display: flex;
+  height: 150rpx;
+  text-align: center;
+  align-items: center;
+  color: #A3A4A5;
+  font-size: 24rpx; */
+  margin-top: 32rpx;
+}
+.new-rate-item{
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  line-height: 42rpx;
+  margin-bottom: 12rpx;
+}
+.rete-title{
+  color: #79868F;
+  font-size: 30rpx;
+
+}
+.rete-msg{
+  color: #111111;
+  font-size: 30rpx;
+}
 .rate-item:first-child::after {
   content: '';
   display: block;

apps/RealtorEasier/pages/index/index.js

@@ -44,7 +44,7 @@ Page({
         ],
         fetcherData: {
             page_num: 1,
-            city: '珠海',
+            city: '',
             saleType: 0,
             page_size: 15,
             saleState: 1

apps/RealtorEasier/pages/index/index.wxml

@@ -3,7 +3,7 @@
 
     <view class="search-w-left">
         <text class="cuIcon-search"></text>
-        <input class="search-input" type="text" bindinput="searchHouse"   placeholder="你想住在哪？" bindconfirm="bindconfirm"
+        <input class="search-input" type="text" bindinput="searchHouse"   placeholder="请输入地区街道/房产名称" bindconfirm="bindconfirm"
                confirm-type="search" />
     </view>
     <view class="action" bindtap="CitySelect">

apps/RealtorEasier/pages/web/web.js

@@ -21,7 +21,8 @@ Page({
     url: "",
     pullUrl: [],
     pushUrl: '',
-    live_base_url: "rtmp://120.24.85.77:1935/hls",
+    // live_base_url: "rtmp://120.24.85.77:1935/hls",
+    live_base_url: "rtmp://47.254.126.142:1935/hls",
     socketOpts: {},
     room_id: 'test',
     hasBeLogin: false,

apps/RealtorEasier/utils/login.js

@@ -22,7 +22,7 @@ function wxLogin() {
       fail(err) {
         wx.showModal({
           title: "登录失败",
-          content: "网络异常，请重试",
+          content: "异常，请重试",
         })
         reject(err)
       },
@@ -91,7 +91,7 @@ function getUserProfile() {
       fail(err) {
         wx.showModal({
           title: "登录失败",
-          content: "网络异常，请重试",
+          content: "异常，请重试",
         })
         reject(err)
       },

apps/agent/app.js

@@ -150,7 +150,7 @@ App({
   globalData: {
     token: loadToken() ,
     raw_city: true,
-    city: '珠海', // 默认进入首页的地址
+    city: '', // 默认进入首页的地址
     province: '广东省',
     district: '',
     userinfo: loadUserInfo() || {} ,

apps/agent/components/detail-components/detail-scroll/detail-scroll.wxml

@@ -15,7 +15,7 @@
                 关注
             </button>
             <button class="follow-status" data-action="changeFocusStatus" open-type="getUserInfo"
-                bindtap="bindgetuserinfo" wx:elif="{{ !loginStatus && app_type === 'user' }}">
+                bindgetuserinfo="bindgetuserinfo" wx:elif="{{ !loginStatus && app_type === 'user' }}">
                 <image class="follow-icon" src="/image/4Dage/detail/icon-follow.svg" />
                 关注
             </button>
@@ -53,7 +53,7 @@
                 <text class="label">{{ item.label }}：</text>
                 <text class="value"> <text class="value" wx:if="{{item.name=='unit_price' }}"> $</text>{{ item.value
                     }}</text>
-                <text class="value" wx:if="{{item.name=='bedroomAmount' ||item.name=='bathRoom_num' }}">个</text>
+                <text class="value" wx:if="{{item.name=='bedroomAmount' ||item.name=='showerroomAmount' }}"></text>
                 <text class="value" wx:if="{{item.name=='unit_price' }}">万</text>
                 <text class="value" wx:if="{{item.name=='buildingArea' ||item.name=='floorSpace' }}">平方英尺</text>
             </view>
@@ -101,7 +101,7 @@
                 <!-- <view class="arrow-right fr"></view> -->
             </view>
             <view wx:for="{{house.remarks}}" :key="name">
-                <view class="detail-title ">{{item.title}}</view>
+                <view class="detail-title-mini ">{{item.title}}</view>
                 <view class="detail-text">
                     {{item.text}}
                 </view>

apps/agent/components/detail-components/detail-scroll/detail-scroll.wxss

@@ -159,7 +159,7 @@
   margin-bottom: 26rpx;
   font-weight: bold;
 }
-.detail-title {
+.detail-title-mini {
   font-size: 26rpx;
   font-weight: bold;
   color: #111;

apps/agent/components/login-pannel/login-pannel.wxml

@@ -3,7 +3,7 @@
   <cover-view class="login-pannel" animation="{{animationData}}">
     <cover-view>授权登录</cover-view>
     <cover-image class="login-logo" src="/image/4Dage/login-logo.png" mode="heightFix"></cover-image>
-    <cover-view class="logo-bottom-tips">四维时代网络科技有限公司申请获取以下权限</cover-view>
+    <cover-view class="logo-bottom-tips">深圳市百润文化传媒有限公司申请获取以下权限</cover-view>
     <cover-view class="tips">·获得您的公开信息（昵称、头像等）</cover-view>
     <!-- <button class="login-btn" open-type="getUserInfo" bindgetuserinfo="bindgetuserinfo">微信授权登录</button> -->
     <button class="login-btn" open-type="getUserInfo" bindtap="bindgetuserinfo">微信授权登录</button>

apps/agent/pages/index/index.js

@@ -8,7 +8,7 @@ const panelData={
     'region':[{
         id:'quyu',
         items:[{
-            name:'珠海',
+            name:'',
             id:''
         }]
     },
@@ -133,6 +133,7 @@ Page({
         navbarInitTop: 80,
         seachKey:'',
         currentCity:'珠海市'
+        // currentCity:''
     },
 
     changeListType(e){
@@ -225,11 +226,12 @@ Page({
         console.log(selectObj)
         console.log(selectObj.jushi)
         let tmp = Object.assign(this.data.fetcherData,{
-            district:selectObj.didian.name,
+            // district:selectObj.didian.name,
             price_s:selectObj.jiage?selectObj.jiage.id:'',
             rooms:selectObj.jushi?selectObj.jushi.id:'',
             bathRooms:selectObj.yushi?selectObj.yushi.id:'',
-            city: selectObj.quyu.name.replace('市', '')
+            // city: selectObj.quyu.name.replace('市', '')
+            city: ''
         })
         this.setData({
             fetcherData: tmp

apps/agent/pages/user-info/user-info.wxml

@@ -13,7 +13,7 @@
   </view>
   <view class="item-w">
     <view class="label">所属公司</view>
-    <view class="value">{{ userinfo.store }}</view>
+    <view class="value">{{ userinfo.agency_company_name }}</view>
   </view>
   <view class="item-w">
     <view class="label">手机号</view>

apps/agent/pages/web/web.js

@@ -18,7 +18,8 @@ Page({
     url: "",
     pullUrl: [],
     pushUrl: '',
-    live_base_url: "rtmp://120.24.85.77:1935/hls",
+    // live_base_url: "rtmp://120.24.85.77:1935/hls",
+    live_base_url: "rtmp://47.254.126.142:1935/hls",
     socketOpts: {},
     room_id: 'test1'
   },

apps/agent/utils/login.js

@@ -11,7 +11,7 @@ function wxLogin() {
       fail(err) {
         wx.showModal({
           title: "登录失败",
-          content: "网络异常，请重试",
+          content: "异常，请重试",
         })
         reject(err)
       },
@@ -79,7 +79,7 @@ function getUserProfile() {
       fail(err) {
         wx.showModal({
           title: "登录失败",
-          content: "网络异常，请重试",
+          content: "异常，请重试",
         })
         reject(err)
       },
@@ -169,6 +169,8 @@ export async function loginByUserInfo () {
           UserProfile.userInfo.avatar = UserProfile.userInfo.avatar || UserProfile.userInfo.avatarUrl
           getApp().globalData.userinfo =UserProfile.userInfo
           getApp().globalData.userinfo.agency_user_id =data.agency.agency_user_id
+          getApp().globalData.userinfo.phone = data.agency.phone
+          getApp().globalData.userinfo.agency_company_name = data.agency.agency_company_name
           saveUserInfo(UserProfile.userInfo)
           EventEmitter.emit('login')
           wx.hideLoading()

apps/agent/utils/utils.js

@@ -7,7 +7,7 @@ export function bindInput(event) {
 }
 
 let hasAuth = false
-const subId = 'GApxDrE3tPhysRxHEmGHRn-0mvNJXqtZ4znZ8PJnQ8Q'
+const subId = 'zWTBJFpALA3KR3qx1keYJCzJdVtRjFbxrnOJc_Htn-g'
 export function subcribe() {
   
   return new Promise((resolve, reject) => {