xujing 5 years ago
parent
commit
8182d5bbfd

+ 5
- 5
config/dev.js View File

@@ -3,13 +3,13 @@ module.exports = {
3 3
     NODE_ENV: '"development"'
4 4
   },
5 5
   defineConstants: {
6
-    // HOST: '"https://dev.fangdeal.cn"',//测试
7
-    // WSS_HOST: '"wss://dev.fangdeal.cn"',
8
-    HOST: '"http://192.168.2.42:8080"',
9
-    WSS_HOST: '"ws://192.168.2.42:8080"',
6
+    HOST: '"https://dev.fangdeal.cn"',//测试
7
+    WSS_HOST: '"wss://dev.fangdeal.cn"',
8
+    // HOST: '"http://192.168.2.42:8080"',
9
+    // WSS_HOST: '"ws://192.168.2.42:8080"',
10 10
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
11 11
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
12
-    Version: 'V3.5.21'
12
+    Version: 'V3.5.24'
13 13
   },
14 14
   weapp: {},
15 15
   h5: {}

+ 1
- 1
config/prod.js View File

@@ -9,7 +9,7 @@ module.exports = {
9 9
     // WSS_HOST: '"wss://wx.fangdeal.cn"',
10 10
     OSS_PATH: 'https://njcj.oss-cn-shanghai.aliyuncs.com/',
11 11
     OSS_FAST_PATH: 'https://njcj.oss-accelerate.aliyuncs.com/',
12
-    Version: 'V3.5.21'
12
+    Version: 'V3.5.24'
13 13
   },
14 14
   weapp: {},
15 15
   h5: {}

+ 1
- 1
project.config.json View File

@@ -2,7 +2,7 @@
2 2
 	"miniprogramRoot": "dist/",
3 3
 	"projectname": "mini-chengjiao",
4 4
 	"description": "知与行互动",
5
-	"appid": "wxda1f84b79b3edeb3",
5
+	"appid": "wxd9ee3a9480a4e544",
6 6
 	"setting": {
7 7
 		"urlCheck": false,
8 8
 		"es6": false,

BIN
src/assets/mine/development.png View File


+ 8
- 9
src/pages/person/menus.js View File

@@ -173,14 +173,6 @@ const menus = [
173 173
     },
174 174
   ],
175 175
   [
176
-    // {
177
-    //   name: '成为专业经纪人',
178
-    //   url: '/pages/agent/become/index',
179
-    //   icon: icons.development,
180
-    //   extends: undefined,
181
-    //   userTypes: [CUSTOMER, ESTATE_AGENT],
182
-    //   style: { color: '#888888' },
183
-    // },
184 176
     {
185 177
       name: '成为置业顾问',
186 178
       url: '',
@@ -189,7 +181,14 @@ const menus = [
189 181
       style: { color: '#888888' },
190 182
       userTypes: [CUSTOMER, ESTATE_AGENT],
191 183
     },
192
-
184
+    {
185
+      name: '成为专业经纪人',
186
+      url: '/useless/pages/agent/become/index',
187
+      icon: icons.development,
188
+      extends: undefined,
189
+      userTypes: [CUSTOMER],
190
+      style: { color: '#888888' },
191
+    },
193 192
   ]
194 193
 ]
195 194
 

+ 7
- 0
src/pages/person/personDetail/index.js View File

@@ -72,6 +72,13 @@ export default class personDetail extends Component {
72 72
             <Image src={require('@/assets/person/arrow2.png')} mode="widthFix"></Image>
73 73
           </View>
74 74
         </View>
75
+        <View className='col_box' onClick={this.goEdit.bind(this)}>
76
+          <Text>所属渠道</Text>
77
+          <View className='col_right'>
78
+            <Text>{user.tel ? user.tel : user.phone}</Text>
79
+            <Image src={require('@/assets/person/arrow2.png')} mode="widthFix"></Image>
80
+          </View>
81
+        </View>
75 82
         {/* {
76 83
           (user.personType == ROLE_CODE['CHANNEL_AGENT'] || user.personType == ROLE_CODE['ESTATE_AGENT']) &&
77 84
 

+ 10
- 11
src/useless/pages/agent/become/index.js View File

@@ -29,18 +29,17 @@ export default class Index extends Component {
29 29
   putMessage() {
30 30
     const { recommendAgentCode, channelCode } = this.state
31 31
     const payload = {
32
-      recommendAgentCode: recommendAgentCode,
32
+      // recommendAgentCode: recommendAgentCode,
33 33
       channelCode: channelCode
34 34
     }
35
-    if (payload.channelCode)
35
+    if (payload.channelCode) {
36 36
       registerAgent(payload).then(res => {
37
-        // debugger
38 37
         this.props.dispatchUpdateUserInfoNew(res.personId)
39 38
         Taro.navigateTo({
40 39
           url: '/useless/pages/agent/index'
41 40
         })
42 41
       })
43
-    else {
42
+    } else {
44 43
       console.log('11111')
45 44
       Taro.showToast({
46 45
         title: '请输入渠道码',
@@ -126,7 +125,7 @@ export default class Index extends Component {
126 125
     const { userInfo: { person: { phone } } } = this.props
127 126
     return (
128 127
       <View className='page'>
129
-        <Image src={bannerImg} className='banner' mode='aspectFill'></Image>
128
+        <Image src={bannerImg} className='banner' mode='widthFix'></Image>
130 129
         <View className='become_agent'>
131 130
           {/* <View className='agent_type'>
132 131
             <Text className='agent_title'>经纪人类型</Text>
@@ -136,16 +135,16 @@ export default class Index extends Component {
136 135
               </View>
137 136
             </Picker>
138 137
           </View> */}
139
-          <Input type='number' className='channel_code' placeholder='渠道验证码 (必填)' onInput={this.bindInfo.bind(this)} data-id='channelCode'></Input>
138
+          <Input type='number' className='channel_code' placeholder-style='color:#999' placeholder='请输入渠道验证码 (必填)' onInput={this.bindInfo.bind(this)} data-id='channelCode'></Input>
140 139
 
141
-          <Input type='number' className='input_code' value={recommendAgentCode} placeholder='输入推荐码 (选填)' onInput={this.bindInfo.bind(this)} data-id='recommendAgentCode'></Input>
142
-          {
143
-            phone ? (
140
+          {/* <Input type='number' className='input_code' value={recommendAgentCode} placeholder='输入推荐码 (选填)' onInput={this.bindInfo.bind(this)} data-id='recommendAgentCode'></Input> */}
141
+          {/* {
142
+            phone ? ( */}
144 143
               <Button onClick={this.putMessage} className='become_btn'>立即成为经纪人</Button>
145
-            ) : (
144
+            {/* ) : (
146 145
                 <Button open-type="getPhoneNumber" onGetphonenumber={this.getPhoneNumber} className='become_btn'>立即成为经纪人</Button>
147 146
               )
148
-          }
147
+          } */}
149 148
         </View>
150 149
 
151 150
       </View>

+ 10
- 8
src/useless/pages/agent/become/index.scss View File

@@ -1,3 +1,6 @@
1
+@import "@/styles/mixins.scss";
2
+@import "@/styles/theme.scss";
3
+
1 4
 .page {
2 5
   position: relative;
3 6
   width: 100%;
@@ -33,23 +36,22 @@
33 36
       height: 80px;
34 37
       line-height: 80px;
35 38
       text-align: center;
36
-      border-radius: 20px;
37
-      border: 1px solid #979797;
38
-      font-size: 32px;
39
+      // border-radius: 20px;
40
+      border-bottom: 1px solid #eee;
41
+      font-size: 30px;
39 42
       margin-bottom: 40px;
43
+      text-align: center;
40 44
     }
41 45
     .become_btn {
42 46
       width: 100%;
43
-
44 47
       height: 90px;
45
-      background: #ff4740;
46
-      border-radius: 20px;
48
+      background:  $primary-color;
49
+      border-radius: 12px;
47 50
       color: #fff;
48
-      font-size: 32px;
51
+      font-size: 30px;
49 52
       font-weight: 500;
50 53
       line-height: 90px;
51 54
       text-align: center;
52
-      margin-top: 120px;
53 55
     }
54 56
   }
55 57
 }