1002884655 3 vuotta sitten
vanhempi
commit
92e0c5ee0e
3 muutettua tiedostoa jossa 43 lisäystä ja 40 poistoa
  1. 2
    2
      config/dev.js
  2. 16
    14
      src/pages/chat/chatDetail/index.jsx
  3. 25
    24
      src/pages/mine/addCustomer/index.jsx

+ 2
- 2
config/dev.js Näytä tiedosto

@@ -3,8 +3,8 @@ module.exports = {
3 3
     NODE_ENV: '"development"'
4 4
   },
5 5
   defineConstants: {
6
-    // HOST: '"https://xlk.njyz.tech"',
7
-    HOST: '"http://127.0.0.1:8081"',
6
+    HOST: '"https://xlk.njyz.tech"',
7
+    // HOST: '"http://127.0.0.1:8081"',
8 8
     WSS_HOST: '"ws://127.0.0.1:8081"',
9 9
     OSS_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',
10 10
     OSS_FAST_PATH: '"https://xlk-assets.oss-accelerate.aliyuncs.com/"',

+ 16
- 14
src/pages/chat/chatDetail/index.jsx Näytä tiedosto

@@ -154,15 +154,16 @@ export default withLayout((props) => {
154 154
                                   <view className='Message Left'>
155 155
                                     <text>{item.message}</text>
156 156
                                   </view>
157
-
158
-                                  // 图片消息
159
-                                  // <view className='Message Left Img'>
160
-                                  //   <view>
161
-                                  //     <Image mode='scaleToFill' src={receiver.avatarurl}></Image>
162
-                                  //   </view>
163
-                                  // </view>
164 157
                                 )
165 158
                               }
159
+                              { /* 图片消息 */
160
+                                item.messageType === im.MESSAGETYPE.IMAGE &&
161
+                                <view className='Message Left Img'>
162
+                                  <view>
163
+                                    <Image mode='scaleToFill' src={item.message}></Image>
164
+                                  </view>
165
+                                </view>
166
+                              }
166 167
                               { /* 如果是卡片 */
167 168
                                 item.messageType === im.MESSAGETYPE.CARD && (
168 169
                                   <Card person={receiver} onLeavePhone={leavePhone} />
@@ -178,15 +179,16 @@ export default withLayout((props) => {
178 179
                                   <view className='Message Right'>
179 180
                                     <text>{item.message}</text>
180 181
                                   </view>
181
-
182
-                                  // 图片消息
183
-                                  // <view className='Message Right Img'>
184
-                                  //   <view>
185
-                                  //     <Image mode='scaleToFill' src={receiver.avatarurl}></Image>
186
-                                  //   </view>
187
-                                  // </view>
188 182
                                 )
189 183
                               }
184
+                              { /* 图片消息 */
185
+                                item.messageType === im.MESSAGETYPE.IMAGE &&
186
+                                <view className='Message Right Img'>
187
+                                  <view>
188
+                                    <Image mode='scaleToFill' src={item.message}></Image>
189
+                                  </view>
190
+                                </view>
191
+                              }
190 192
                             </view>
191 193
                             <view className='Icon'>
192 194
                               <Image mode='scaleToFill' src={person.avatarurl}></Image>

+ 25
- 24
src/pages/mine/addCustomer/index.jsx Näytä tiedosto

@@ -56,12 +56,12 @@ export default withLayout((props) => {
56 56
         url = API_CHANNEL_REPORT
57 57
       }
58 58
       let params = {}
59
-      if(type === 'consultant') {
59
+      if (type === 'consultant') {
60 60
         params = { name: FormData.name, phone: FormData.phone, sex: SexId }
61 61
       } else {
62 62
         params = { ...FormData, sex: SexId, intention: BuildingId, realtyConsultant: CardId }
63 63
       }
64
-      if(type === 'estateAgent') {
64
+      if (type === 'estateAgent') {
65 65
         params.channelCustomerId = PersonId
66 66
         params.channelId = user.userInfo.person.channelId
67 67
         params.buildingId = BuildingId
@@ -144,11 +144,11 @@ export default withLayout((props) => {
144 144
       Taro.showToast({ title: '请填写正确的客户电话', icon: 'none' })
145 145
       return false
146 146
     }
147
-    if (BuildingId === null && type !== 'consultant') {
147
+    if (BuildingId === null) {
148 148
       Taro.showToast({ title: '请选择客户的意向楼盘', icon: 'none' })
149 149
       return false
150 150
     }
151
-    if (CardId === null && type !== 'consultant') {
151
+    if (CardId === null) {
152 152
       Taro.showToast({ title: '请选择内场接待', icon: 'none' })
153 153
       return false
154 154
     }
@@ -187,29 +187,30 @@ export default withLayout((props) => {
187 187
             <text className='iconfont icon-jiantoudown'></text>
188 188
           </view>
189 189
 
190
+
191
+          <text>意向楼盘</text>
192
+          <view className='FormLine flex-h'>
193
+            <view className='flex-item'>
194
+              <Picker range-key='name' onChange={PickerChange} value={0} range={BuildingList}>
195
+                <text>{BuildingName || '请选择'}</text>
196
+              </Picker>
197
+            </view>
198
+          </view>
199
+
200
+          <text>内场接待(选填)</text>
201
+          <view className='FormLine flex-h'>
202
+            <view className='flex-item'>
203
+              <Picker range-key='name' onChange={CardPickerChange} value={0} range={CardList}>
204
+                <text>{CardName || '请选择'}</text>
205
+              </Picker>
206
+            </view>
207
+            <Image mode='heightFix' src={defaultSpecialImage}></Image>
208
+            <text>选择</text>
209
+          </view>
210
+
190 211
           {
191 212
             type !== 'consultant' &&
192 213
             <Block>
193
-              <text>意向楼盘</text>
194
-              <view className='FormLine flex-h'>
195
-                <view className='flex-item'>
196
-                  <Picker range-key='name' onChange={PickerChange} value={0} range={BuildingList}>
197
-                    <text>{BuildingName || '请选择'}</text>
198
-                  </Picker>
199
-                </view>
200
-              </view>
201
-
202
-              <text>内场接待(选填)</text>
203
-              <view className='FormLine flex-h'>
204
-                <view className='flex-item'>
205
-                  <Picker range-key='name' onChange={CardPickerChange} value={0} range={CardList}>
206
-                    <text>{CardName || '请选择'}</text>
207
-                  </Picker>
208
-                </view>
209
-                <Image mode='heightFix' src={defaultSpecialImage}></Image>
210
-                <text>选择</text>
211
-              </view>
212
-
213 214
               <text>备注</text>
214 215
               <view className='FormLine flex-h'>
215 216
                 <view className='flex-item'>