Browse Source

quick yangshi h5 pointer

liuxiaona 2 years ago
parent
commit
2594cba582

+ 17 - 1
.idea/workspace.xml

@@ -1,7 +1,23 @@
1 1
 <?xml version="1.0" encoding="UTF-8"?>
2 2
 <project version="4">
3 3
   <component name="ChangeListManager">
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" />
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" />
9
+      <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
+    </list>
5 21
     <option name="SHOW_DIALOG" value="false" />
6 22
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
7 23
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />

+ 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.9be19273ee67d22d88697a509977da86.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.a8e9d163095b97b3e3fd.js></script><script type=text/javascript src=./static/js/app.b9e01a9bef5f80658ce7.js></script></body></html>
10
+      })();</script><link href=./static/css/app.b4e20efb36c5f2a2e5ad8e54b4e6e65e.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=./static/js/manifest.afc5bbe4c31a883a1891.js></script><script type=text/javascript src=./static/js/app.cccb353c51af441e4954.js></script></body></html>

+ 7 - 4
project/src/components/customOperate/sideTool/quickWord/quickwordList.vue

@@ -310,10 +310,10 @@ export default {
310 310
     font-weight: 600;
311 311
   }
312 312
   .tHead{
313
-    border:1px solid #ddd;
313
+    border:1px solid #ebeef5;
314 314
     border-bottom: none;
315 315
     div{
316
-      background-color: #f6f6f6 ;
316
+      background-color: #fbfbfb ;
317 317
       font-size:14px;
318 318
       display:inline-block;
319 319
       font-weight:600;
@@ -327,12 +327,15 @@ export default {
327 327
   .tBody{
328 328
     height: calc(100vh - 60px - 62px - 20px - 10px - 50px - 50px);
329 329
     overflow-y: auto;
330
+    &::-webkit-scrollbar{
331
+      width: 0;
332
+    }
330 333
     .body_item{
331 334
       display: flex;
332 335
       align-items: center;
333 336
       cursor: move;
334 337
       padding:5px 0;
335
-      border:1px solid #ddd;
338
+      border:1px solid #ebeef5;
336 339
       border-bottom:none;
337 340
       .body_cell{
338 341
         font-size:13px;
@@ -350,7 +353,7 @@ export default {
350 353
     }
351 354
   }
352 355
   .borderBottomline{
353
-    border-bottom:1px solid #ddd!important;
356
+    border-bottom:1px solid #ebeef5!important;
354 357
   }
355 358
   .c-00B38A {
356 359
     color: #00B38A!important;

+ 7 - 4
project/src/components/smartRadar/radarList.vue

@@ -209,10 +209,10 @@ export default {
209 209
     font-weight: 600;
210 210
   }
211 211
   .tHead{
212
-    border:1px solid #ddd;
212
+    border:1px solid #ebeef5;
213 213
     border-bottom: none;
214 214
     div{
215
-      background-color: #f6f6f6 ;
215
+      background-color: #fbfbfb ;
216 216
       font-size:14px;
217 217
       display:inline-block;
218 218
       font-weight:600;
@@ -226,12 +226,15 @@ export default {
226 226
   .tBody{
227 227
     height: calc(100vh - 60px - 62px - 20px - 10px - 50px - 50px);
228 228
     overflow-y: auto;
229
+    &::-webkit-scrollbar{
230
+      width: 0;
231
+    }
229 232
     .body_item{
230 233
       display: flex;
231 234
       align-items: center;
232 235
       cursor: move;
233 236
       padding:20px 0;
234
-      border:1px solid #ddd;
237
+      border:1px solid #ebeef5;
235 238
       border-bottom:none;
236 239
       .body_cell{
237 240
         font-size:13px;
@@ -242,7 +245,7 @@ export default {
242 245
     }
243 246
   }
244 247
   .borderBottomline{
245
-    border-bottom:1px solid #ddd!important;
248
+    border-bottom:1px solid #ebeef5!important;
246 249
   }
247 250
   .c-00B38A {
248 251
     color: #00B38A!important;

File diff suppressed because it is too large
+ 1 - 1
qwh5/dist/css/app.acff8a9e.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.ef458e8b.js


+ 10 - 3
qwh5/src/views/quickwordH5.vue

@@ -159,6 +159,7 @@
159 159
           <van-cell-group inset>
160 160
           <van-field
161 161
                   v-model="actionedit_obj.actioneditCon"
162
+                  @blur="campaignNameBlur"
162 163
                   rows="5"
163 164
                   type="textarea"
164 165
                   maxlength="2000"
@@ -202,6 +203,7 @@ export default {
202 203
     const actionShow = ref(false);
203 204
     const overshow = ref(false);
204 205
     const finished = ref(true);
206
+    const pointerIndex = ref();
205 207
     const activeName = ref();
206 208
     const key_word = ref('');
207 209
     const active = ref(0);
@@ -251,11 +253,15 @@ export default {
251 253
         });
252 254
       })
253 255
     }
256
+    const campaignNameBlur=(e)=>{
257
+      pointerIndex.value = e.srcElement.selectionStart
258
+    }
254 259
     const appendCon = (type)=>{
260
+      let con = actionedit_obj.actioneditCon
255 261
       if(type==1){
256
-        actionedit_obj.actioneditCon+= ' ' + user_nick.name + ' '
262
+        actionedit_obj.actioneditCon = con.slice(0,pointerIndex.value) + ' ' + user_nick.name + ' ' + con.slice(pointerIndex.value)
257 263
       }else if(type==2){
258
-        actionedit_obj.actioneditCon+= ' ' + user_nick.remark + ' '
264
+        actionedit_obj.actioneditCon = con.slice(0,pointerIndex.value) + ' ' + user_nick.remark + ' ' + con.slice(pointerIndex.value)
259 265
       }
260 266
     }
261 267
     const switchGroup = (val) => val&&getRadarlist(val);
@@ -526,7 +532,8 @@ export default {
526 532
       send,
527 533
       editBoxShow,
528 534
       editSend_Btn,
529
-      appendCon
535
+      appendCon,
536
+      campaignNameBlur
530 537
 
531 538
     };
532 539
   }

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


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


File diff suppressed because it is too large
+ 1 - 1
static/js/26.673a2e42dcf50056c461.js


File diff suppressed because it is too large
+ 1 - 1
static/js/27.f778a4ac1f7cf8e80810.js


File diff suppressed because it is too large
+ 1 - 1
static/js/28.60dbc6e134b55e29d018.js


File diff suppressed because it is too large
+ 1 - 1
static/js/29.4cb3a5d6da8b260ca628.js


File diff suppressed because it is too large
+ 1 - 1
static/js/30.a2fffa4d0f38893743c3.js


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


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


File diff suppressed because it is too large
+ 1 - 1
static/js/25.b04f91b0468556bd5458.js


File diff suppressed because it is too large
+ 1 - 1
static/js/app.b9e01a9bef5f80658ce7.js


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


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