liuxiaona 2 years ago
parent
commit
0dac881c78

+ 5 - 0
.idea/workspace.xml

@@ -3,7 +3,12 @@
3 3
   <component name="ChangeListManager">
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
+      <change beforePath="$PROJECT_DIR$/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/index.html" afterDir="false" />
6 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$/qwh5/src/views/quickwordH5.vue" beforeDir="false" afterPath="$PROJECT_DIR$/qwh5/src/views/quickwordH5.vue" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/static/css/app.235cecb475af6681b84185b7f888ee4d.css" beforeDir="false" />
10
+      <change beforePath="$PROJECT_DIR$/static/js/3.90ee79fe8fe98acee2cd.js" beforeDir="false" />
11
+      <change beforePath="$PROJECT_DIR$/static/js/manifest.d3fe544a3058480d69d1.js" beforeDir="false" />
7 12
     </list>
8 13
     <option name="SHOW_DIALOG" value="false" />
9 14
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

+ 1 - 1
index.html

@@ -7,4 +7,4 @@
7 7
         hm.src = "https://hm.baidu.com/hm.js?d61b9e2caf4d46ccda7471b5385e2333";
8 8
         var s = document.getElementsByTagName("script")[0];
9 9
         s.parentNode.insertBefore(hm, s);
10
-      })();</script><link href=./static/css/app.235cecb475af6681b84185b7f888ee4d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.d3fe544a3058480d69d1.js></script><script type=text/javascript src=./static/js/app.9583c062dc0e432e1531.js></script></body></html>
10
+      })();</script><link href=./static/css/app.42435e49292503a92dbf4443ae8db01a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.2f400482a482caaa294b.js></script><script type=text/javascript src=./static/js/app.9583c062dc0e432e1531.js></script></body></html>

+ 25 - 13
project/src/components/customOperate/sideTool/quickWord/quickwordList.vue

@@ -39,21 +39,29 @@
39 39
                         <span v-if="chat.chat_type == 3">视频: </span>
40 40
                       </span>
41 41
                       <span class="text_spill" v-if="chat.chat_type == 5">
42
-                        <el-tooltip class="disinblock" :content="chat.title" :disabled="chat.title&&chat.title.length<20" placement="top">
42
+                        <el-tooltip popper-class="disinblock" :content="chat.title" :disabled="chat.title&&chat.title.length<20" placement="top">
43 43
                           <span>{{chat.title?chat.title:'-'}}</span>
44 44
                         </el-tooltip>
45 45
                       </span>
46 46
 
47 47
                       <span class="text_spill" v-else-if="chat.chat_type == 1">
48
-                         <el-tooltip class="disinblock" :content="chat.content" :disabled="chat.content&&chat.content.length<20" placement="top">
48
+                         <el-tooltip popper-class="disinblock" :content="chat.content" :disabled="chat.content&&chat.content.length<20" placement="top">
49 49
                         <span>{{chat.content?chat.content:'-'}}</span>
50 50
                            </el-tooltip>
51 51
                       </span>
52 52
 
53 53
                       <span class="text_spill" v-else>
54
-                         <el-tooltip class="disinblock" :content="chat.name" :disabled="chat.name&&chat.name.length<20" placement="top">
55
-                          <span>{{chat.name?chat.name:'-'}}</span>
56
-                        </el-tooltip>
54
+                           <span v-if="chat.name">
55
+                           <el-tooltip popper-class="disinblock" :content="chat.name" :disabled="chat.name&&chat.name.length<20" placement="top">
56
+                        <span>{{chat.name}}</span>
57
+                           </el-tooltip>
58
+                      </span>
59
+                      <span v-else-if="chat.title">
60
+                         <el-tooltip popper-class="disinblock" :content="chat.title" :disabled="chat.title&&chat.title.length<20" placement="top">
61
+                        <span>{{chat.title}}</span>
62
+                         </el-tooltip>
63
+                      </span>
64
+                      <span v-else>-</span>
57 65
                       </span>
58 66
 
59 67
                     </div>
@@ -64,14 +72,14 @@
64 72
                     <!--tupian-->
65 73
                     <div class="flex-align-center tMar5" v-if="chat.chat_type == 2">
66 74
                       <img :src="chat.oss_url" alt="" style="width: 40px;margin-right: 8px">
67
-                      <el-tooltip class="disinblock" :content="chat.name" :disabled="chat.name&&chat.name.length<20" placement="top">
75
+                      <el-tooltip popper-class="disinblock" :content="chat.name" :disabled="chat.name&&chat.name.length<20" placement="top">
68 76
                       <span class="text_spill">{{chat.name?chat.name:'-'}}</span>
69 77
                       </el-tooltip>
70 78
                     </div>
71 79
                     <!--shipin-->
72 80
                     <div class="flex-align-center tMar5" v-else-if="chat.chat_type == 3">
73 81
                       <video :src="chat.oss_url" controls="controls" style="width: 80px;height: 80px;margin-right: 8px"></video>
74
-                      <el-tooltip class="disinblock" :content="chat.name" :disabled="chat.name&&chat.name.length<20" placement="top">
82
+                      <el-tooltip popper-class="disinblock" :content="chat.name" :disabled="chat.name&&chat.name.length<20" placement="top">
75 83
                       <span class="text_spill">{{chat.name?chat.name:'-'}}</span>
76 84
                       </el-tooltip>
77 85
                     </div>
@@ -79,29 +87,29 @@
79 87
                     <div class="flex-align-center tMar5" v-else-if="chat.chat_type == 5">
80 88
                       <img :src="chat.imgUrl" alt="" style="width: 40px;margin-right: 8px;flex-shrink: 0">
81 89
                       <div style="width: 100%">
82
-                        <el-tooltip class="disinblock" :content="chat.title" :disabled="chat.title&&chat.title.length<20" placement="top">
90
+                        <el-tooltip popper-class="disinblock" :content="chat.title" :disabled="chat.title&&chat.title.length<20" placement="top">
83 91
                         <div class="text_spill">{{chat.title?chat.title:'-'}}</div>
84 92
                         </el-tooltip>
85
-                        <el-tooltip class="disinblock" :content="chat.desc" :disabled="chat.desc&&chat.desc.length<20" placement="top">
93
+                        <el-tooltip popper-class="disinblock" :content="chat.desc" :disabled="chat.desc&&chat.desc.length<20" placement="top">
86 94
                         <div class="f12 c-999 tMar10 text_spill">{{chat.desc?chat.desc:'-'}}</div>
87 95
                         </el-tooltip>
88 96
                       </div>
89 97
                     </div>
90 98
                     <!--文字-->
91 99
                     <div class="flex-align-center tMar5" v-else-if="chat.chat_type == 1">
92
-                      <el-tooltip class="disinblock" :content="chat.content" :disabled="chat.content&&chat.content.length<20" placement="top">
100
+                      <el-tooltip popper-class="disinblock" :content="chat.content" :disabled="chat.content&&chat.content.length<20" placement="top">
93 101
                       <span class="text_spill">{{chat.content?chat.content:'-'}}</span>
94 102
                       </el-tooltip>
95 103
                     </div>
96 104
                     <div class="flex-align-center tMar5 text_spill" v-else>
97
-                      文件:
105
+                      内容:
98 106
                       <span v-if="chat.name">
99
-                           <el-tooltip class="disinblock" :content="chat.name" :disabled="chat.name&&chat.name.length<20" placement="top">
107
+                           <el-tooltip popper-class="disinblock" :content="chat.name" :disabled="chat.name&&chat.name.length<20" placement="top">
100 108
                         <span>{{chat.name}}</span>
101 109
                            </el-tooltip>
102 110
                       </span>
103 111
                       <span v-else-if="chat.title">
104
-                         <el-tooltip class="disinblock" :content="chat.title" :disabled="chat.title&&chat.title.length<20" placement="top">
112
+                         <el-tooltip popper-class="disinblock" :content="chat.title" :disabled="chat.title&&chat.title.length<20" placement="top">
105 113
                         <span>{{chat.title}}</span>
106 114
                          </el-tooltip>
107 115
                       </span>
@@ -287,6 +295,10 @@ export default {
287 295
       margin-bottom:0
288 296
     }
289 297
   }
298
+  .el-tooltip__popper {
299
+    max-width: 500px;
300
+  }
301
+
290 302
 </style>
291 303
 <style lang="scss" scoped>
292 304
   .span_title{

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


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


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


+ 7 - 2
qwh5/src/views/quickwordH5.vue

@@ -173,7 +173,6 @@
173 173
   </div>
174 174
 </template>
175 175
 <script lang="ts" >
176
-import { useRouter } from 'vue-router'
177 176
 import {ref, reactive, onBeforeMount, getCurrentInstance} from "vue";
178 177
 import { Toast, Search, Tab, Tabs, Collapse, CollapseItem, Empty, Overlay, ActionSheet     } from 'vant';
179 178
 import { getQueryString } from '@/utils/common'
@@ -478,7 +477,13 @@ export default {
478 477
       wx.invoke('sendChatMessage', synthetic_obj, function (res) {
479 478
         if (res.err_msg == 'sendChatMessage:ok') {
480 479
           //发送成功
481
-          console.log('发送成功');
480
+          // console.log('发送成功');
481
+        }else{
482
+          Toast.loading({
483
+            duration:2000,
484
+            message: res.err_msg,
485
+            forbidClick: true,
486
+          });
482 487
         }
483 488
       })
484 489
     }

File diff suppressed because it is too large
+ 0 - 1
static/css/app.235cecb475af6681b84185b7f888ee4d.css


File diff suppressed because it is too large
+ 1 - 0
static/css/app.42435e49292503a92dbf4443ae8db01a.css


File diff suppressed because it is too large
+ 1 - 0
static/js/3.8921a74b4a0a50c9fcff.js


File diff suppressed because it is too large
+ 0 - 1
static/js/3.90ee79fe8fe98acee2cd.js


File diff suppressed because it is too large
+ 1 - 1
static/js/manifest.d3fe544a3058480d69d1.js