feat: -

Author: chaosi-zju

internal/app/handler/problem.go

@@ -197,8 +197,13 @@ func GetProblemByID(c *gin.Context) {
 func FinishProblem(c *gin.Context) {
 	userId, err := util.GetUserIdFromContext(c)
 	if err != nil {
-		util.ResponseError(c, 500, err.Error())
-		return
+		id, err := strconv.Atoi(c.Query("userid"))
+		if err == nil && id > 0 {
+			userId = uint(id)
+		} else {
+			util.ResponseError(c, 500, err.Error())
+			return
+		}
 	}
 
 	problemId, err := strconv.Atoi(c.Query("problem_id"))

wx/pages/problem/problem.js

@@ -1,9 +1,10 @@
 // pages/problem.js
 const app = getApp()
+const util = require('../../utils/util.js')
 
 Page({
   data: {
-    userid: app.globalData.userid,
+    userid: 0,
     idx: 0,
     markmode: 0, // choose markdown plugin: 0.wemark; 1.towxml 
     article: {},
@@ -19,13 +20,16 @@ Page({
     if (this.data.markmode != 0) {
       content = app.towxml(content, 'markdown', {})
     }
-    this.setData({
-      article: content
-    })
+    this.setData({article: content})
+    this.setData({userid: app.globalData.userid})
   },
   finishProblem() {
-    this.setData({
-      finished: !this.data.finished
+    let p = app.globalData.problems[this.data.idx]
+    let url = '/api/user/problem/finish?problem_id=' + p.ID + '&userid=' + app.globalData.userid
+    util.request(wx, url, 'GET', {}, function (result) {
+      this.setData({
+        finished: true
+      })
     })
   },
   preProblem() {

wx/pages/problem/problem.wxss

@@ -6,27 +6,32 @@
 }
 
 .bottom{
-  margin: 20rpx;
+  margin: 30rpx 10rpx;
   height: 80rpx;
+  font-weight: 100;
   display: flex;
   flex-direction: row;
 }
 
-.pre-text{
+.pre-btn{
   width: 33%;
+  color: rgb(60, 60, 60);
 }
 
-.next-text{
+.next-btn{
   width: 33%;
+  color: rgb(60, 60, 60);
 }
 
 .finish-btn{
   width: 33%;
-  background-color: rgb(241, 118, 93);
+  color: rgb(60, 60, 60);
+  background-color: rgb(223, 104, 80);
+  vertical-align: middle;
   text-align: center;
 }
 
 .finish-btn[disabled] {
-  background: #414d5c;
-  border-color: #78899c;
+  background: #4e5358;
+  border-color: #484b4e;
 }

wx/utils/util.js

@@ -1,5 +1,5 @@
-// const host = 'https://sslapi.chaosi-zju.com'
-const host = 'http://127.0.0.1:5001'
+const host = 'https://sslapi.chaosi-zju.com'
+// const host = 'http://127.0.0.1:5001'
 
 const request = function (wx, path, method, data, func, noloading) {
   if (noloading == null || !noloading) {
@@ -21,7 +21,11 @@ const request = function (wx, path, method, data, func, noloading) {
         var result = res.data.data;
         func(result);
       } else {
-        toast(wx, '服务器有问题，数据返回有误', 500)
+        if(res.data.message !== '') {
+          toast(wx, res.data.message, 800)
+        }else{
+          toast(wx, '服务器有问题，数据返回有误', 800)
+        }
       }
     },
     fail: function () {