From b6975309f0a24351d8cce32cfb212c84d6528aea Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Thu, 21 Nov 2024 18:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5=E6=88=90=E7=BB=A9=E5=8D=95?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/api.js | 11 +-
manifest.json | 2 +-
pages.json | 8 +
pages/exercises/examSubjiect1/examResultsOne.vue | 62 +++++--
pages/exercises/myStudy/comp/statistics.vue | 8 +-
pages/exercises/myStudy/myStudy.vue | 107 +++++++-----
pages/vip/paymentOrder/paymentOrder.vue | 204 ++++++++++++++++++++++
pages/vip/vipEntry/comp/commentItem.vue | 13 +-
pages/vip/vipEntry/vipEntry.vue | 40 +++--
static/images/jiaofei_wxIphone@2x.png | Bin 0 -> 1909 bytes
static/images/jiaofei_zfbIphone@2x.png | Bin 0 -> 2173 bytes
static/images/jiaofei_zhifu_selectIphone@2x.png | Bin 0 -> 2118 bytes
static/images/jiaofei_zhifu_unselectIphone@2x.png | Bin 0 -> 4555 bytes
13 files changed, 366 insertions(+), 89 deletions(-)
create mode 100644 pages/vip/paymentOrder/paymentOrder.vue
create mode 100644 static/images/jiaofei_wxIphone@2x.png
create mode 100644 static/images/jiaofei_zfbIphone@2x.png
create mode 100644 static/images/jiaofei_zhifu_selectIphone@2x.png
create mode 100644 static/images/jiaofei_zhifu_unselectIphone@2x.png
diff --git a/config/api.js b/config/api.js
index 94d8df2..37f3bca 100644
--- a/config/api.js
+++ b/config/api.js
@@ -55,7 +55,7 @@ export const logOut = (data={}) => http.post('member/auth/logout', data, {custom
// 模拟考试科目1或者4考试首页
export const questionExam = (data) => http.get(`questionExam/exam-${data.stepType}-${data.carType}`, )
// 模拟考试科目1或者4考试成绩单
- export const examTranscript = (data) => http.get(`questionExam/examTranscript-${stepType}-${carType}`, )
+ export const examTranscript = (data) => http.get(`questionExam/examTranscript-${data.stepType}-${data.carType}`, )
// 开始考试
export const startExam = (data) => http.post('questionExam/startExam', data,)
// 交卷，模拟考试保存接口
@@ -71,6 +71,15 @@ export const logOut = (data={}) => http.post('member/auth/logout', data, {custom
// 会员VIP之声
export const memberVoicePage = (data) => http.post(`vip/memberVoicePage`, data,)
+ // 购买会员创建预支付订单
+ export const createPrepaidApi = (data) => http.post(`vip/createPrepaid`, data,)
+ // 查询购买信息状态
+ export const outTradeNApi = (outTradeNo) => http.get(`getPrepaid-${outTradeNo}`, )
+ // 支付渠道的统一【支付】回调
+ export const channelIdApi = (channelId) => http.get(`vip/notify/${channelId}`, )
+ // 购买记录列表
+ export const memberGradePayPage = (data) => http.post(`vip/memberGradePayPage`,data )
+
diff --git a/manifest.json b/manifest.json
index 42caf01..1985857 100644
--- a/manifest.json
+++ b/manifest.json
@@ -75,7 +75,7 @@
"disableHostCheck" : true,
"proxy" : {
"/api" : {
- "target" : "http://192.168.1.202:8081/",
+ "target" : "http://192.168.1.201:8081/",
// "target" : "http://question.ywxcw.cn/",
"changeOrigin" : true,
"secure" : true,
diff --git a/pages.json b/pages.json
index 6d19cc0..c5323af 100644
--- a/pages.json
+++ b/pages.json
@@ -29,6 +29,14 @@
}
},
{
+ "path": "paymentOrder/paymentOrder",
+ "style": {
+ "navigationBarTitleText": "vip",
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom"
+ }
+ },
+ {
"path": "vipQuestions/vipQuestions",
"style": {
"navigationBarTitleText": "VIP常见问题说明",
diff --git a/pages/exercises/examSubjiect1/examResultsOne.vue b/pages/exercises/examSubjiect1/examResultsOne.vue
index 3de5e89..338f3b3 100644
--- a/pages/exercises/examSubjiect1/examResultsOne.vue
+++ b/pages/exercises/examSubjiect1/examResultsOne.vue
@@ -1,7 +1,7 @@
-
+
@@ -9,38 +9,37 @@
- 用户名
+ {{ phone }}
-
-
-
-
+
- 10:22
- 测试时长
+ {{ info.accumulate || '--' }}
+ 累计考试次数
- 10
- 已做题
+ {{ info.pass || '--' }}
+ 合格次数
- 14
- 答错题
+ {{ info.score || '--' }}
+ 平均分数
+
+
-
+
@@ -79,6 +78,10 @@
import gaugeChart from '@/components/columnChart/gaugeChart.vue'
import { ref } from 'vue'
import nodata from '@/components/nodata/nodata.vue'
+ import { examTranscript } from '@/config/api.js'
+ import carStore from '@/store/modules/car.js'
+ import statistics from '../myStudy/comp/statistics.vue'
+ let usecarStore = carStore()
const value = ref(false)
const currentNav = ref(1)
@@ -90,19 +93,40 @@
function changeChart(num) {
currentChart.value = num
}
+ let phone = uni.getStorageSync('loginInfo')?.phone
+ const info = ref({})
+ let chartData = ref({})
+ let listData = ref([])
+ async function examTranscriptFn() {
+ const {data: res} = await examTranscript({stepType: usecarStore.carInfo.stepType, carType: usecarStore.carInfo.carType})
+ info.value = res
+ console.log(res)
+ if(!res.examRecord?.length) return
+ listData.value = res.examRecord
+ chartData.value = {
+ categories: res.examRecord.map(item=>item.formatStartTime),
+ series: [
+ {
+ name: "目标值",
+ data: res.examRecord.map(item=>item.score)
+ }
+ ]
+ }
+ }
+ examTranscriptFn()
\ No newline at end of file
diff --git a/pages/vip/vipEntry/comp/commentItem.vue b/pages/vip/vipEntry/comp/commentItem.vue
index 351e0fe..51c3133 100644
--- a/pages/vip/vipEntry/comp/commentItem.vue
+++ b/pages/vip/vipEntry/comp/commentItem.vue
@@ -2,19 +2,19 @@