Sākums Izpētīt Palīdzība
Reģistrēties Pierakstīties
xiuli.gao
/
playlet
Vērot 1
Pievienot zvaigznīti 0
Atdalīts 0
Kods Problēmas 0 Izmaiņu pieprasījumi 0 Revīzijas 1777 Laidieni 0 Vikivietne
Pārlūkot izejas kodu

.

liuxiaona 2 gadi atpakaļ
vecāks
2594cba582
revīzija
e3f1e24d7a
8 mainītis faili ar 55 papildinājumiem un 50 dzēšanām
Apvienotais skats Rādīt salīdzināšanas statistiku
  1. 13 12
      .idea/workspace.xml
  2. 1 1
      qwh5/dist/css/app.25dbf677.css
  3. 1 1
      qwh5/dist/index.html
  4. 1 0
      qwh5/dist/js/app.bc0308bf.js
  5. 0 1
      qwh5/dist/js/app.dc26d31d.js
  6. 1 1
      qwh5/public/index.html
  7. 22 26
      qwh5/src/views/quickwordH5.vue
  8. 16 8
      qwh5/src/views/radarH5.vue

+ 13 - 12
.idea/workspace.xml
Parādīt failu

4 
     <list default="true" id="c03feb23-5590-4b06-ae32-412ba98013a8" name="Default" comment="">
 4 
     <list default="true" id="c03feb23-5590-4b06-ae32-412ba98013a8" name="Default" comment="">
5 
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
 5 
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
6 
       <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
 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 
       <change beforePath="$PROJECT_DIR$/qwh5/src/views/quickwordH5.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/quickwordH5.vue" afterDir="false" />
 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 
     </list>
 21 
     </list>
21 
     <option name="SHOW_DIALOG" value="false" />
 22 
     <option name="SHOW_DIALOG" value="false" />
22 
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
 23 
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
qwh5/dist/css/app.25dbf677.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
qwh5/dist/index.html


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 0
qwh5/dist/js/app.bc0308bf.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 1
qwh5/dist/js/app.dc26d31d.js


+ 1 - 1
qwh5/public/index.html
Parādīt failu

3 
   <head>
 3 
   <head>
4 
     <meta charset="utf-8">
 4 
     <meta charset="utf-8">
5 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 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 
       <script src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
 7 
       <script src="http://res.wx.qq.com/open/js/jweixin-1.2.0.js"></script>
8 
       <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js"></script>
 8 
       <script src="https://open.work.weixin.qq.com/wwopen/js/jwxwork-1.0.0.js"></script>
9 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">
 9 
     <link rel="icon" href="<%= BASE_URL %>favicon.ico">

+ 22 - 26
qwh5/src/views/quickwordH5.vue
Parādīt failu

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

+ 16 - 8
qwh5/src/views/radarH5.vue
Parādīt failu

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