From 62b92c7cf4478f8965ef80b6e2d565a45861aeb1 Mon Sep 17 00:00:00 2001
From: peaceshi <peaceshi@outlook.com>
Date: Mon, 2 Nov 2020 18:54:22 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B7=B4=E5=B7=B4=E6=89=98=E6=96=AF?=
 =?UTF-8?q?=E5=BF=AB=E9=80=9F=E5=8F=8D=E9=A6=88=E7=B3=BB=E7=BB=9F=E9=9B=8F?=
 =?UTF-8?q?=E5=BD=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yuanshenditu/css/index.css | 13 +++++++++++++
 Yuanshenditu/index.html    | 26 ++++++++++++++++++++++++++
 Yuanshenditu/js/index.js   | 22 ++++++++++++++++++++--
 3 files changed, 59 insertions(+), 2 deletions(-)
diff --git a/Yuanshenditu/css/index.css b/Yuanshenditu/css/index.css
index c5c0a901..11669900 100644
--- a/Yuanshenditu/css/index.css
+++ b/Yuanshenditu/css/index.css
@@ -633,6 +633,19 @@ body,
     cursor: pointer;
 }
 
+.issue-table
+{
+    z-index: 9997;
+    position: fixed;
+    top: 20%;
+    left: 2%;
+    width: 350px;
+    height: 200px;
+    border-radius: 14px;
+    background: #F0E9E2;
+    padding: 14px;
+}
+
 .myPopClose {
     position: absolute !important;
     right: 20px !important;
diff --git a/Yuanshenditu/index.html b/Yuanshenditu/index.html
index 0a8d373d..1f59a34b 100644
--- a/Yuanshenditu/index.html
+++ b/Yuanshenditu/index.html
@@ -29,6 +29,28 @@
 
 <body>
 	<iframe src="/Beta/Save/pop.html" class="savePop"></iframe>
+	<div class="issue-table">
+		<h1 class="issue-table-title">巴巴托斯快速反馈系统 V1.0</h1>
+		<p>你要反馈的问题是：</p>
+		<h2 class="issue-name" id="issue-name">指定点位</h2>
+		<label for="issue-select-type">选择出现的问题：</label>
+		<select name="问题类别" id="issue-select-type">
+			<option id="issue-select-type-null" value="">--选择问题类别--</option>
+			<option value="宝箱">宝箱</option>
+			<option value="神瞳">神瞳</option>
+			<option value="其他采集物">其他采集物</option>
+		</select>
+		<p>
+			<input type="checkbox" id="issue-cbox1" value="checkbox_1">
+			<label for="cbox1">点位问题（位置错误、不存在此点位）</label>
+		</p>
+		<p>
+			<input type="checkbox" id="issue-cbox2" value="checkbox_2">
+			<label for="cbox2">图片问题（图片缺失、图片错误）</label>
+		</p>
+		<button class="issue-btn-confirm">确认提交</button>
+		<button class="issue-btn-cancel">取消提交</button>
+	</div>
 	<div id='map'></div>
 	<div class="danjixiazai"></div>
 	<!-- 筛选器 -->
@@ -385,6 +407,10 @@
 	<script>
 		$(".area-list-li-containor").hide();
 		$(".area-list-containor").show();
+		$(".issue-table").hide();
+		$(".issue-btn-cancel").click(function () {
+			$(".issue-table").hide();
+		});
 		//筛选函数
 		var i_type = "ALL";
 		var area_idx = "MD";
diff --git a/Yuanshenditu/js/index.js b/Yuanshenditu/js/index.js
index 3ed447c2..d2d8916d 100644
--- a/Yuanshenditu/js/index.js
+++ b/Yuanshenditu/js/index.js
@@ -337,8 +337,26 @@ function closePop() {
 }
 
 function openIssue() {
-	alert("clicked openIssue");
-	createIssue("issueName", "issueContent", "null")
+	//alert("clicked openIssue");
+	$(".issue-table").show();
+	var issueName = $(".myPopName").text()
+	var issueLabel = null;
+	$(".issue-name").text(issueName);
+	$(".issue-btn-confirm").click(function () {	
+		if($("input[type='checkbox']").is(':checked')&&(!$("#issue-select-type-null").is(":checked"))){
+			//TODO: 这么写是错的。进入if-else地狱。先对付用。
+			if ($('#issue-cbox1').prop('checked') && $('#issue-cbox2').prop('checked')) {
+				issueLabel = "点位错误,图片错误"
+			} else if ($('#issue-cbox1').prop('checked')) {
+				issueLabel = "点位错误"
+			}else {
+				issueLabel = "图片错误"
+			}
+			createIssue(issueName, "巴巴托斯快速反馈系统 V1.0", issueLabel)
+		}else{
+			alert("你必须选择正确的选项才能提交");
+		}
+	});
 }
 
 //定义分类的数组，分别对应 物品层，物品Json名，物品icon类型，新增时在对应数组后增加对象即可
-- 
Gitee


From 4e8d4b27df29afe3b6ba68e01ef095f950ab85e5 Mon Sep 17 00:00:00 2001
From: peaceshi <peaceshi@outlook.com>
Date: Mon, 2 Nov 2020 18:55:48 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=9B=E5=BB=BAissue=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E8=AE=BF=E9=97=AE=E9=A1=B9=E7=9B=AE=E4=B8=8D=E8=B5=B0=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=99=A8=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Yuanshenditu/js/gitFunctions.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Yuanshenditu/js/gitFunctions.js b/Yuanshenditu/js/gitFunctions.js
index a21c14e7..81fe68ea 100644
--- a/Yuanshenditu/js/gitFunctions.js
+++ b/Yuanshenditu/js/gitFunctions.js
@@ -757,12 +757,20 @@ function deleteFile(number) {
  * @param issueLabels {string | string[]} issue的标签逗号隔开 如 "宝箱,错点"
  */
 function createIssue(issueName, issueContent, issueLabels) {
-  var url = "/database/file/createIssue";
+  // var url = "/database/file/createIssue";
+  // var data = {
+  //   access_token: tokenPara,
+  //   issueName: issueName,
+  //   issueContent: issueContent,
+  //   issueLabels: issueLabels,
+  // };
+  var url = "https://gitee.com/api/v5/repos/SecondLAB_peaceshi/issues";
   var data = {
     access_token: tokenPara,
-    issueName: issueName,
-    issueContent: issueContent,
-    issueLabels: issueLabels,
+    repo:"yuan-shen-map",
+    title: issueName,
+    body: issueContent,
+    labels: issueLabels,
   };
   var success = function (res) {
     if (res === "login") {
-- 
Gitee

