From 97edff90cef173d65d5e711106ba464036306c0d Mon Sep 17 00:00:00 2001
From: chris <510148846@qq.com>
Date: Wed, 15 May 2024 09:28:40 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B0=83=E8=AF=95=E7=AD=94=E9=A2=98?=
 =?UTF-8?q?=E5=99=A8=E6=8E=A5=E5=8F=A3=E5=8A=9F=E8=83=BD=EF=BC=9B=202?=
 =?UTF-8?q?=E3=80=81=E9=85=8D=E7=BD=AEmainfest.json=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=88=E8=AE=BE=E7=BD=AE=E8=87=AA=E5=AE=9A?=
 =?UTF-8?q?=E4=B9=89=E5=8D=8F=E8=AE=AE=EF=BC=89=EF=BC=8C=E6=96=B9=E4=BE=BF?=
 =?UTF-8?q?=E7=AC=AC=E4=B8=89=E6=96=B9app=E8=B0=83=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/iClicker.js             |  6 +++---
 manifest.json               |  3 ++-
 pages/IClicker/IClicker.vue | 28 ++++++++++++++++++++++++----
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/api/iClicker.js b/api/iClicker.js
index e0ee4b8..5cf0e38 100644
--- a/api/iClicker.js
+++ b/api/iClicker.js
@@ -15,9 +15,9 @@ export function getIClickerData(data, config = {}) {
  * 提交答题器数据
  */
 export function submitIClickerData(data, config = {}) {
+	const { studentanswer, studentid } = data;
 	return request({
-		url: '/api/user.ashx?act=studenticlicker',
-		method: 'POST',
-		data
+		url: `/api/user.ashx?act=subansweringmachine&studentanswer=${studentanswer}&studentid=${studentid}`,
+		method: 'GET'
 	}, config)
 }
diff --git a/manifest.json b/manifest.json
index 2a46ebe..2dd9b0b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -47,7 +47,8 @@
                     "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
                 ],
                 "minSdkVersion" : 21,
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
+                "schemes" : "studypen"
             },
             /* ios打包配置 */
             "ios" : {
diff --git a/pages/IClicker/IClicker.vue b/pages/IClicker/IClicker.vue
index 565b694..64d2281 100644
--- a/pages/IClicker/IClicker.vue
+++ b/pages/IClicker/IClicker.vue
@@ -9,7 +9,7 @@
 		<ch-empty emptyText="暂无答题任务" v-if="!options.length"></ch-empty>
 		<ch-flex class="answer-options" justify="around" items="center" @tap.native="selectOpt" v-else>
 			<block v-for="option in options" :key="option.id">
-				<view class="option" :class="{ 'selected': selectOpts.includes(option.id) }" :data-opt="option">
+				<view class="option" :class="{ 'selected': selectOpts.includes(option.text) }" :data-opt="option">
 					{{ option.text }}
 				</view>
 			</block>
@@ -20,6 +20,7 @@
 <script setup>
 import { getIClickerData, submitIClickerData } from '@/api/iClicker.js'
 import { reactive, toRefs } from 'vue';
+import { useUserStore } from '../../store/user';
 
 const defaultOptions = [
 	{
@@ -40,6 +41,9 @@ const defaultOptions = [
 	},
 ]
 
+const userStore = useUserStore();
+const userId = userStore.userId;
+
 const data = reactive({
 	options: [...defaultOptions],
 	selectOpts: []
@@ -50,9 +54,9 @@ const { options, selectOpts } = toRefs(data);
 function selectOpt (e) {
 	const opt = e.target.dataset.opt || null;
 	if (!opt) return;
-	const index = selectOpts.value.findIndex(id => id == opt.id)
-	selectOpts.value = index == -1 ? [...selectOpts.value, opt.id]
-																	: selectOpts.value.filter(id => id !== opt.id)
+	const index = selectOpts.value.findIndex(text => text == opt.text)
+	selectOpts.value = index == -1 ? [...selectOpts.value, opt.text]
+																	: selectOpts.value.filter(text => text!== opt.text)
 }
 
 function submitAnswer () {
@@ -61,7 +65,23 @@ function submitAnswer () {
 		confirmText: '提交',
 		cancelText: '放弃',
 		success: () => {
+			const params = {
+				studentanswer: selectOpts.value.join(','),
+				studentid: userId
+			}
 			
+			submitIClickerData(params).then(res => {
+				uni.showToast({
+					icon: 'success',
+					title: '已提交'
+				})
+				refresh();
+			}).catch(() => {
+				uni.showToast({
+					icon:'error',
+					title: '提交失败'
+				})
+			})
 		}
 	})
 }