Home Explore Help
Register Sign In
tangdehang
/
android-cloud-H5
Watch 1
Star 0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'hotfix/修复清空剪贴板' of Software/android-cloud-H5 into develop

zengzhixiang 2 years ago
parent
4ac5240358 8b66070296
commit
c46be19efb
3 changed files with 2092 additions and 14 deletions
Unified View Show Diff Stats
  1. 20 7
      static/screenAndroid/WXtrialInterface.html
  2. 18 7
      static/screenIos/WXtrialInterface.html
  3. 2054 0
      static/static/lib/qs.js

+ 20 - 7
static/screenAndroid/WXtrialInterface.html
View File 

@@ -42,7 +42,10 @@
 
       rel="stylesheet"
 
       rel="stylesheet"
 
       href="https://cdn.bootcss.com/jquery-weui/1.2.1/css/jquery-weui.min.css"
 
       href="https://cdn.bootcss.com/jquery-weui/1.2.1/css/jquery-weui.min.css"
 
     />
 
     />
 
+    <!-- <link rel="stylesheet" href="../static/lib/swiper/swiper-bundle.min.css" />
 
+    <script src="../static/lib/swiper/swiper-bundle.js"></script> -->
 
     <script src="../static/lib/doT-1.1.3/doT.min.js"></script>
 
     <script src="../static/lib/doT-1.1.3/doT.min.js"></script>
 
+    <script src="../static/lib/qs.js"></script>
 
   </head>
 
   </head>
 
 
 
   <body class="scroll h-player" style="overscroll-behavior: contain">
 
   <body class="scroll h-player" style="overscroll-behavior: contain">
 
@@ -67,7 +70,7 @@
 
       </div>
 
       </div>
 
       <div class="slide-wrapper-content">
 
       <div class="slide-wrapper-content">
 
         {{~ it :item:index }}
 
         {{~ it :item:index }}
 
-        <div class="slide-wrapper">
 
+        <div class="slide-wrapper" data-id="{{= item.id}}">
 
           <div class="slide-scroll animate-slide-start">
 
           <div class="slide-scroll animate-slide-start">
 
             <div
 
             <div
 
               class="slide-content"
 
               class="slide-content"
 
@@ -964,14 +967,24 @@
 
       }
 
       }
 
       // 清空剪贴板
 
       // 清空剪贴板
 
       function handleClear() {
 
       function handleClear() {
 
-        var ids = '';
 
-        cutList.forEach(function (item) {
 
-          ids += 'ids=' + item.id + '&';
 
-        });
 
-        ids = ids.substring(0, ids.lastIndexOf('&'));
 
+        // var ids = '';
 
+        // cutList.forEach(function (item) {
 
+        //   ids += 'ids=' + item.id + '&';
 
+        // });
 
+
 
+        // ids = ids.substring(0, ids.lastIndexOf('&'));
 
+
 
         $.confirm('确定清空剪贴板？', function () {
 
         $.confirm('确定清空剪贴板？', function () {
 
           $.ajax({
 
           $.ajax({
 
-            url: baseUrl + '/api/public/v5/shear/content?' + ids,
 
+            url:
 
+              baseUrl +
 
+              '/api/public/v5/shear/content' +
 
+              Qs.stringify(
 
+                {
 
+                  ids: Array.from($('.slide-wrapper')).map((v) => v.dataset.id),
 
+                },
 
+                { arrayFormat: 'repeat', addQueryPrefix: true },
 
+              ),
 
             headers: {
 
             headers: {
 
               Authorization: token,
 
               Authorization: token,
 
             },
 
             },

+ 18 - 7
static/screenIos/WXtrialInterface.html
View File 

@@ -46,6 +46,7 @@
 
     <!-- <link rel="stylesheet" href="../static/lib/swiper/swiper-bundle.min.css" />
 
     <!-- <link rel="stylesheet" href="../static/lib/swiper/swiper-bundle.min.css" />
 
     <script src="../static/lib/swiper/swiper-bundle.js"></script> -->
 
     <script src="../static/lib/swiper/swiper-bundle.js"></script> -->
 
     <script src="../static/lib/doT-1.1.3/doT.min.js"></script>
 
     <script src="../static/lib/doT-1.1.3/doT.min.js"></script>
 
+    <script src="../static/lib/qs.js"></script>
 
   </head>
 
   </head>
 
 
 
   <body class="scroll h-player" style="overscroll-behavior: contain">
 
   <body class="scroll h-player" style="overscroll-behavior: contain">
 
@@ -70,7 +71,7 @@
 
       </div>
 
       </div>
 
       <div class="slide-wrapper-content">
 
       <div class="slide-wrapper-content">
 
         {{~ it :item:index }}
 
         {{~ it :item:index }}
 
-        <div class="slide-wrapper">
 
+        <div class="slide-wrapper" data-id="{{= item.id}}">
 
           <div class="slide-scroll animate-slide-start">
 
           <div class="slide-scroll animate-slide-start">
 
             <div
 
             <div
 
               class="slide-content"
 
               class="slide-content"
 
@@ -683,14 +684,24 @@
 
       }
 
       }
 
       // 清空剪贴板
 
       // 清空剪贴板
 
       function handleClear() {
 
       function handleClear() {
 
-        var ids = '';
 
-        cutList.forEach(function (item) {
 
-          ids += 'ids=' + item.id + '&';
 
-        });
 
-        ids = ids.substring(0, ids.lastIndexOf('&'));
 
+        // var ids = '';
 
+        // cutList.forEach(function (item) {
 
+        //   ids += 'ids=' + item.id + '&';
 
+        // });
 
+
 
+        // ids = ids.substring(0, ids.lastIndexOf('&'));
 
+
 
         $.confirm('确定清空剪贴板？', function () {
 
         $.confirm('确定清空剪贴板？', function () {
 
           $.ajax({
 
           $.ajax({
 
-            url: baseUrl + '/api/public/v5/shear/content?' + ids,
 
+            url:
 
+              baseUrl +
 
+              '/api/public/v5/shear/content' +
 
+              Qs.stringify(
 
+                {
 
+                  ids: Array.from($('.slide-wrapper')).map((v) => v.dataset.id),
 
+                },
 
+                { arrayFormat: 'repeat', addQueryPrefix: true },
 
+              ),
 
             headers: {
 
             headers: {
 
               Authorization: token,
 
               Authorization: token,
 
             },
 
             },

File diff suppressed because it is too large
+ 2054 - 0
static/static/lib/qs.js