alter

screenAndroid/WXtrialInterface.html

@@ -396,6 +396,8 @@
 
 		form.clientType = parameters['clientType'];
 		form.diskName = parameters['diskName'];
+		form.id = parameters['id'];
+		form.userCardId = parameters['userCardId'];
 
 		if (form.clientType == 1) {
 			form.cardIp = parameters['cardIp'];
@@ -414,9 +416,11 @@
 			form.id = parameters['id'];
 			form.ip = parameters['ip'];
 			form.userCardId = parameters['userCardId'];
-		} else {
-			form.id = parameters['id'];
-			form.userCardId = parameters['userCardId'];
+		}
+		function array_unique(arr) {
+			return arr.filter(function (e, i) {
+				return arr.indexOf(e) === i;
+			})
 		}
 		var cutList = [];
 		function showShearPlate() {
@@ -432,9 +436,9 @@
 				success: function (res) {
 					if (res.status === 0) {
 						if (res.data.length) {
-							cutList = res.data
+							cutList = array_unique(res.data)
 							var str = '<div class="title">剪贴板<div onclick="handleClear()" class="btn-clear">清空</div></div><div class="slide-wrapper-content">'
-							res.data.forEach(function (item) {
+							cutList.forEach(function (item) {
 								str += "<div class='slide-wrapper'><div class='slide-scroll animate-slide-start'><div class='slide-content'><div onclick='handleCopy(\"" + item.content + "\")'>" + item.content + "</div></div><div class='slide-content-button'><button onclick='handleDelete(" + item.id + ")'>删除</button></div></div></div>"
 							})
 							str += '</div>'
@@ -482,7 +486,7 @@
 				url: baseUrl + "/api/wsi/v1/config/cut",
 				data: JSON.stringify({
 					str: content,
-					sn: form.sn
+					userCardId: form.userCardId
 				}),
 				headers: {
 					'Authorization': form.id  //id

screenIos/WXtrialInterface.html

@@ -228,7 +228,8 @@
 		})
 		var parameters = GetRequest();
 		form.clientType = parameters['clientType'];
-		form.diskName = parameters['clientType'];
+		form.userCardId = parameters['userCardId'];
+		form.id = parameters['id'];
 
 		if (form.clientType == 1) {
 			form.cardIp = parameters['cardIp'];
@@ -243,15 +244,8 @@
 			$('.leftmains').hide()
 			$('.bottommains').hide()
 			$('#btnMuted').hide()
-
-			form.id = parameters['id'];
 			form.ip = parameters['ip'];
-			form.userCardId = parameters['userCardId'];
-		} else {
-			form.id = parameters['id'];
-			form.userCardId = parameters['userCardId'];
 		}
-
 		var orientation = 0; //0 竖屏，1横屏
 
 		// document.body.addEventListener('touchmove', function (e) {
@@ -259,7 +253,11 @@
 		// }, {
 		// 	passive: false
 		// })
-
+		function array_unique(arr) {
+			return arr.filter(function (e, i) {
+				return arr.indexOf(e) === i;
+			})
+		}
 		var cutList = [];
 		function showShearPlate() {
 			$('.box-shear-plate').empty();
@@ -274,9 +272,9 @@
 				success: function (res) {
 					if (res.status === 0) {
 						if (res.data.length) {
-							cutList = res.data
+							cutList = array_unique(res.data)
 							var str = '<div class="title">剪贴板<div onclick="handleClear()" class="btn-clear">清空</div></div><div class="slide-wrapper-content">'
-							res.data.forEach(function (item) {
+							cutList.forEach(function (item) {
 								str += "<div class='slide-wrapper'><div class='slide-scroll animate-slide-start'><div class='slide-content'><div onclick='handleCopy(\"" + item.content + "\")'>" + item.content + "</div></div><div class='slide-content-button'><button onclick='handleDelete(" + item.id + ")'>删除</button></div></div></div>"
 							})
 							str += '</div>'
@@ -324,7 +322,7 @@
 				url: baseUrl + "/api/wsi/v1/config/cut",
 				data: JSON.stringify({
 					str: content,
-					sn: form.sn
+					userCardId: form.userCardId
 				}),
 				headers: {
 					'Authorization': form.id  //id