liuxiaona 2 years ago
parent
commit
e3f1e24d7a

+ 13 - 12
.idea/workspace.xml

@@ -4,19 +4,20 @@
4 4
     <list default="true" id="c03feb23-5590-4b06-ae32-412ba98013a8" name="Default" comment="">
5 5
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 6
       <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
7
-      <change beforePath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/quickWord/quickwordList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/customOperate/sideTool/quickWord/quickwordList.vue" afterDir="false" />
8
-      <change beforePath="$PROJECT_DIR$/project/src/components/smartRadar/radarList.vue" beforeDir="false" afterPath="$PROJECT_DIR$/project/src/components/smartRadar/radarList.vue" afterDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/app.25dbf677.css" beforeDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/chunk-vendors.31ed7038.css" beforeDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/css/userPortrait.8e0d5f52.css" beforeDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/favicon.ico" beforeDir="false" />
11
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/img/dpNoData.572b0f6d.png" beforeDir="false" />
12
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/img/info_err.7976f107.png" beforeDir="false" />
13
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/index.html" beforeDir="false" />
14
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/app.dc26d31d.js" beforeDir="false" />
15
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/chunk-vendors.bf0633c3.js" beforeDir="false" />
16
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/demo.7b3ab333.js" beforeDir="false" />
17
+      <change beforePath="$PROJECT_DIR$/qwh5/dist/js/userPortrait.8927e58c.js" beforeDir="false" />
18
+      <change beforePath="$PROJECT_DIR$/qwh5/public/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/public/index.html" afterDir="false" />
9 19
       <change beforePath="$PROJECT_DIR$/qwh5/src/views/quickwordH5.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/quickwordH5.vue" afterDir="false" />
10
-      <change beforePath="$PROJECT_DIR$/static/css/app.9be19273ee67d22d88697a509977da86.css" beforeDir="false" />
11
-      <change beforePath="$PROJECT_DIR$/static/js/25.b04f91b0468556bd5458.js" beforeDir="false" />
12
-      <change beforePath="$PROJECT_DIR$/static/js/26.673a2e42dcf50056c461.js" beforeDir="false" />
13
-      <change beforePath="$PROJECT_DIR$/static/js/27.f778a4ac1f7cf8e80810.js" beforeDir="false" />
14
-      <change beforePath="$PROJECT_DIR$/static/js/28.60dbc6e134b55e29d018.js" beforeDir="false" />
15
-      <change beforePath="$PROJECT_DIR$/static/js/29.4cb3a5d6da8b260ca628.js" beforeDir="false" />
16
-      <change beforePath="$PROJECT_DIR$/static/js/3.34b2a41936a7091bcdea.js" beforeDir="false" />
17
-      <change beforePath="$PROJECT_DIR$/static/js/30.a2fffa4d0f38893743c3.js" beforeDir="false" />
18
-      <change beforePath="$PROJECT_DIR$/static/js/app.b9e01a9bef5f80658ce7.js" beforeDir="false" />
19
-      <change beforePath="$PROJECT_DIR$/static/js/manifest.a8e9d163095b97b3e3fd.js" beforeDir="false" />
20
+      <change beforePath="$PROJECT_DIR$/qwh5/src/views/radarH5.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/radarH5.vue" afterDir="false" />
20 21
     </list>
21 22
     <option name="SHOW_DIALOG" value="false" />
22 23
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

File diff suppressed because it is too large
+ 1 - 1
qwh5/dist/css/app.25dbf677.css


File diff suppressed because it is too large
+ 1 - 1
qwh5/dist/index.html


File diff suppressed because it is too large
+ 1 - 0
qwh5/dist/js/app.bc0308bf.js


File diff suppressed because it is too large
+ 0 - 1
qwh5/dist/js/app.dc26d31d.js


+ 1 - 1
qwh5/public/index.html

@@ -3,7 +3,7 @@
3 3
   <head>
4 4
     <meta charset="utf-8">
5 5
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
6
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
6
+      <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no">
7 7
       <script src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
8 8
       <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js"></script>
9 9
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">

+ 22 - 26
qwh5/src/views/quickwordH5.vue

@@ -247,16 +247,16 @@ export default {
247 247
         user_nick.remark = data.remark
248 248
       }).catch(err => {
249 249
         Toast.loading({
250
-          duration:0,
250
+          duration:2000,
251 251
           message: err,
252 252
           forbidClick: true,
253 253
         });
254 254
       })
255 255
     }
256
-    const campaignNameBlur=(e)=>{
256
+    const campaignNameBlur=(e)=>{//获取光标位置
257 257
       pointerIndex.value = e.srcElement.selectionStart
258 258
     }
259
-    const appendCon = (type)=>{
259
+    const appendCon = (type)=>{//将昵称添加到指定位置
260 260
       let con = actionedit_obj.actioneditCon
261 261
       if(type==1){
262 262
         actionedit_obj.actioneditCon = con.slice(0,pointerIndex.value) + ' ' + user_nick.name + ' ' + con.slice(pointerIndex.value)
@@ -276,13 +276,11 @@ export default {
276 276
 
277 277
     onBeforeMount(() => {//组件挂载之前
278 278
       if(getQueryString('againJump')){
279
-        // alert(`${'have_againJump'+window.location.href}`)
280 279
         configInfo.corpid = getQueryString('corpid')
281 280
         getRadarGrouplist()
282 281
         wx_getuserinfo()
283 282
         getWxConfig(()=>{get_external_userid()});
284 283
       }else{//获取code
285
-        // alert(`${'no_againJump'+window.location.href}`)
286 284
         overshow.value = true;
287 285
         getWxConfig('',(authInfo)=>{url_pin(authInfo) });
288 286
       }
@@ -303,17 +301,14 @@ export default {
303 301
                 configInfo.external_userid  = res.userId ; //返回当前外部联系人userId
304 302
             }else {
305 303
                 Toast.loading({
306
-                    duration:0,
304
+                    duration:2000,
307 305
                     message: '当前外部联系人userId获取错误',
308 306
                     forbidClick: true,
309 307
                 });
310 308
             }
311 309
         });
312 310
     }
313
-    function wx_getuserinfo(){
314
-        //获取user_id
315
-      // alert(`${'corpid_wx_getuserinfo:'+configInfo.corpid}`);
316
-      // alert(`${'code:'+getQueryString('code')}`);
311
+    function wx_getuserinfo(){ //获取user_id
317 312
       (proxy as any).$axios.get("/api/oauth2/userInfo", {
318 313
         corpid:configInfo.corpid,
319 314
         code:getQueryString('code'),
@@ -323,14 +318,14 @@ export default {
323 318
           configInfo.user_id = data.user_id;
324 319
         }else{
325 320
           Toast.loading({
326
-            duration:0,
321
+            duration:2000,
327 322
             message: res.err,
328 323
             forbidClick: true,
329 324
           });
330 325
         }
331 326
       }).catch( err => {
332 327
         Toast.loading({
333
-          duration:0,
328
+          duration:2000,
334 329
           message: err,
335 330
           forbidClick: true,
336 331
         });
@@ -338,7 +333,6 @@ export default {
338 333
     }
339 334
 
340 335
     const getRadarGrouplist=()=>{
341
-      // alert(`${'corpid_getRadarGrouplist:'+configInfo.corpid}`);
342 336
       overshow.value = true;
343 337
       (proxy as any).$axios.get("/api/h5/chatMenuPage/groupList", {
344 338
         corpid: configInfo.corpid,
@@ -356,7 +350,7 @@ export default {
356 350
 
357 351
         }else{
358 352
           Toast.loading({
359
-            duration:0,
353
+            duration:2000,
360 354
             message: res.err,
361 355
             forbidClick: true,
362 356
           });
@@ -364,14 +358,21 @@ export default {
364 358
       }).catch(err => {
365 359
         overshow.value = false;
366 360
         Toast.loading({
367
-          duration:0,
361
+          duration:2000,
368 362
           message: err,
369 363
           forbidClick: true,
370 364
         });
371 365
       })
372 366
     }
373 367
     const getRadarlist=(group_id)=>{
374
-      // alert(`${'corpid_getRadarlist:'+configInfo.corpid}`);
368
+      if(!group_id){
369
+        Toast.loading({
370
+          duration:2000,
371
+          message: '暂无数据',
372
+          forbidClick: true,
373
+        });
374
+        return
375
+      }
375 376
       overshow.value = true;
376 377
       (proxy as any).$axios.get("/api/h5/chatMenuPage/list", {
377 378
         corpid: configInfo.corpid,
@@ -390,10 +391,9 @@ export default {
390 391
                 })
391 392
             })
392 393
           radarlist.value = data.data
393
-            console.log(radarlist.value);
394 394
         }else{
395 395
           Toast.loading({
396
-            duration:0,
396
+            duration:2000,
397 397
             message: res.err,
398 398
             forbidClick: true,
399 399
           });
@@ -401,7 +401,7 @@ export default {
401 401
       }).catch(err => {
402 402
         overshow.value = false;
403 403
         Toast.loading({
404
-          duration:0,
404
+          duration:2000,
405 405
           message: err,
406 406
           forbidClick: true,
407 407
         });
@@ -425,8 +425,6 @@ export default {
425 425
         }
426 426
     }
427 427
     const getmesBody=(rule_id,msg_id,editCon)=>{
428
-      // alert(`${'corpid_getmesBody:'+configInfo.corpid}`);
429
-      // alert(`${'user_id_getmesBody:'+configInfo.user_id}`);
430 428
       overshow.value = true;
431 429
       (proxy as any).$axios.get("/api/h5/chatMenuPage/chatMessage", {
432 430
         corpid: configInfo.corpid,
@@ -444,7 +442,7 @@ export default {
444 442
         }else{
445 443
             overshow.value = false;
446 444
           Toast.loading({
447
-            duration:0,
445
+            duration:2000,
448 446
             message: '失败了,请联系管理员',
449 447
             forbidClick: true,
450 448
           });
@@ -452,7 +450,7 @@ export default {
452 450
       }).catch(err => {
453 451
         overshow.value = false;
454 452
         Toast.loading({
455
-          duration:0,
453
+          duration:2000,
456 454
           message: err,
457 455
           forbidClick: true,
458 456
         });
@@ -481,9 +479,7 @@ export default {
481 479
         let enterChat_obj={enterChat: true}
482 480
         let synthetic_obj = {...enterChat_obj,...sendMes.value}
483 481
       wx.invoke('sendChatMessage', synthetic_obj, function (res) {
484
-        if (res.err_msg == 'sendChatMessage:ok') {
485
-          //发送成功
486
-          // console.log('发送成功');
482
+        if (res.err_msg == 'sendChatMessage:ok') {  //发送成功
487 483
         }else if(res.err_msg == 'sendChatMessage:fail_unexpect err'){
488 484
           Toast.loading({
489 485
             duration:2000,

+ 16 - 8
qwh5/src/views/radarH5.vue

@@ -152,14 +152,14 @@ export default {
152 152
           // getmesBody(radar_id)
153 153
         } else {
154 154
           Toast.loading({
155
-            duration: 0,
155
+            duration:2000,
156 156
             message: res.err,
157 157
             forbidClick: true,
158 158
           });
159 159
         }
160 160
       }).catch(err => {
161 161
         Toast.loading({
162
-          duration: 0,
162
+          duration:2000,
163 163
           message: err,
164 164
           forbidClick: true,
165 165
         });
@@ -185,7 +185,7 @@ export default {
185 185
 
186 186
         } else {
187 187
           Toast.loading({
188
-            duration: 0,
188
+            duration:2000,
189 189
             message: res.err,
190 190
             forbidClick: true,
191 191
           });
@@ -193,7 +193,7 @@ export default {
193 193
       }).catch(err => {
194 194
         overshow.value = false;
195 195
         Toast.loading({
196
-          duration: 0,
196
+          duration:2000,
197 197
           message: err,
198 198
           forbidClick: true,
199 199
         });
@@ -201,6 +201,14 @@ export default {
201 201
     }
202 202
     const getRadarlist = (group_id) => {
203 203
       // alert(`${'corpid_getRadarlist:'+configInfo.corpid}`);
204
+      if(!group_id){
205
+        Toast.loading({
206
+          duration:2000,
207
+          message: '暂无数据',
208
+          forbidClick: true,
209
+        });
210
+        return
211
+      }
204 212
       overshow.value = true;
205 213
       (proxy as any).$axios.get("/api/h5/radarPage/list", {
206 214
         corpid: configInfo.corpid,
@@ -216,7 +224,7 @@ export default {
216 224
           radarlist.value = data.data
217 225
         } else {
218 226
           Toast.loading({
219
-            duration: 0,
227
+            duration:2000,
220 228
             message: res.err,
221 229
             forbidClick: true,
222 230
           });
@@ -224,7 +232,7 @@ export default {
224 232
       }).catch(err => {
225 233
         overshow.value = false;
226 234
         Toast.loading({
227
-          duration: 0,
235
+          duration:2000,
228 236
           message: err,
229 237
           forbidClick: true,
230 238
         });
@@ -271,7 +279,7 @@ export default {
271 279
           sendRadar()
272 280
         } else {
273 281
           Toast.loading({
274
-            duration: 0,
282
+            duration:2000,
275 283
             message: '失败了,请联系管理员',
276 284
             forbidClick: true,
277 285
           });
@@ -279,7 +287,7 @@ export default {
279 287
       }).catch(err => {
280 288
         overshow.value = false;
281 289
         Toast.loading({
282
-          duration: 0,
290
+          duration:2000,
283 291
           message: err,
284 292
           forbidClick: true,
285 293
         });