dedsudiyu hace 2 meses
padre
commit
8abb6f6678

+ 1 - 1
manifest.json

@@ -54,7 +54,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wxc9180acf05b65dee",
+        "appid" : "wx60e12abd2e79c618",
         "setting" : {
             "urlCheck" : false,
             "minified" : true

+ 8 - 0
pages/api/index.js

@@ -474,6 +474,14 @@ export const examPointsRecordGetMyPointsLogInfo  = (data) => {
         data: {...data}
     })
 };
+//积分信息(新-对接学习考试后的)
+export const creditAppletGetMyPointsLogInfo  = (data) => {
+    return apiResquest({
+        url: `/credit/applet/getMyPointsLogInfo`,
+        method: 'POST',
+        data: {...data}
+    })
+};
 //实验室-列表-获取学院列表下拉列表
 export const systemDeptDropList = (data) => {
 	return apiResquest({

+ 9 - 9
pages/views/pupilPage/pupilMine.vue

@@ -22,7 +22,7 @@
 		<!-- 信用分面板 -->
 		<view class="points-max-box">
 			<view class="points-big-box">
-				<view class="num-p colorA">{{creditScore?creditScore:'-'}}</view>
+				<view class="num-p colorA">{{creditScore!=null?creditScore:'-'}}</view>
 				<view class="img-box">
 					<img :src="imagesUrl('commonality/icon_wd_xyf@1x.png')">
 					<view>信用分</view>
@@ -30,7 +30,7 @@
 			</view>
 			<view class="border-null-p"></view>
 			<view class="points-big-box">
-				<view class="num-p colorB">{{bonusPoints?bonusPoints:'-'}}</view>
+				<view class="num-p colorB">{{bonusPoints!=null?bonusPoints:'-'}}</view>
 				<view class="img-box">
 					<img :src="imagesUrl('commonality/icon_wd_jlf@1x.png')">
 					<view>奖励分</view>
@@ -88,7 +88,7 @@
 		logout,
 		systemUserProfile,
 		studentinfoFacemy,
-		examPointsRecordGetMyPointsLogInfo,
+		creditAppletGetMyPointsLogInfo,
 	} from '@/pages/api/index.js'
 	import {
 		pageRestrictVerify
@@ -122,7 +122,7 @@
 		methods: {
 			initialize(){
 				this.systemUserProfile();
-				//this.examPointsRecordGetMyPointsLogInfo();
+				this.creditAppletGetMyPointsLogInfo();
 			},
 			scanCode() {
 				uni.scanCode({
@@ -201,14 +201,14 @@
 				}
 			},
 			//查询-信用分/奖励分
-			async examPointsRecordGetMyPointsLogInfo() {
+			async creditAppletGetMyPointsLogInfo() {
 				const {
 					data
-				} = await examPointsRecordGetMyPointsLogInfo();
+				} = await creditAppletGetMyPointsLogInfo();
 				if (data.code == 200) {
-					this.bonusPoints = data.data.bonusPoints;
-					this.creditScore = data.data.creditScore;
-					this.userStatus = data.data.userStatus;
+					this.$set(this,'bonusPoints',data.data.bonusPoints);
+					this.$set(this,'creditScore',data.data.creditScore);
+					this.$set(this,'userStatus',data.data.userStatus);
 				}
 			},
 		

+ 8 - 8
pages/views/teacherPage/teacherMine.vue

@@ -19,7 +19,7 @@
 		<!-- 信用分面板 -->
 		<view class="points-max-box">
 			<view class="points-big-box">
-				<view class="num-p colorA">{{creditScore?creditScore:'-'}}</view>
+				<view class="num-p colorA">{{creditScore!=null?creditScore:'-'}}</view>
 				<view class="img-box">
 					<img :src="imagesUrl('commonality/icon_wd_xyf@1x.png')">
 					<view>信用分</view>
@@ -27,7 +27,7 @@
 			</view>
 			<view class="border-null-p"></view>
 			<view class="points-big-box">
-				<view class="num-p colorB">{{bonusPoints?bonusPoints:'-'}}</view>
+				<view class="num-p colorB">{{bonusPoints!=null?bonusPoints:'-'}}</view>
 				<view class="img-box">
 					<img :src="imagesUrl('commonality/icon_wd_jlf@1x.png')">
 					<view>奖励分</view>
@@ -99,7 +99,7 @@
 		logout,
 		systemUserProfile,
 		studentinfoFacemy,
-		examPointsRecordGetMyPointsLogInfo,
+		creditAppletGetMyPointsLogInfo,
 	} from '@/pages/api/index.js'
 
 	import {
@@ -132,7 +132,7 @@
 		methods: {
 			initialize(){
 				this.systemUserProfile();
-				//this.examPointsRecordGetMyPointsLogInfo();
+				this.creditAppletGetMyPointsLogInfo();
 			},
 			scanCode() {
 				uni.scanCode({
@@ -222,13 +222,13 @@
 				}
 			},
 			//查询学生-信用分/奖励分
-			async examPointsRecordGetMyPointsLogInfo() {
+			async creditAppletGetMyPointsLogInfo() {
 				const {
 					data
-				} = await examPointsRecordGetMyPointsLogInfo();
+				} = await creditAppletGetMyPointsLogInfo();
 				if (data.code == 200) {
-					this.bonusPoints = data.data.bonusPoints;
-					this.creditScore = data.data.creditScore;
+					this.$set(this,'bonusPoints',data.data.bonusPoints);
+					this.$set(this,'creditScore',data.data.creditScore);
 				}
 			},
 			

+ 8 - 0
pages_student/api/index.js

@@ -55,6 +55,14 @@ export const exchangePoints  = (data) => {
         data: {...data}
     })
 };
+//扫码兑换调用(新-对接学习考试后的)
+export const creditAppletExchangePoints  = (data) => {
+    return apiResquest({
+        url: `/credit/applet/exchangePoints`,
+        method: 'POST',
+        data: {...data}
+    })
+};
 //违规记录列表
 export const examViolationMyAppList  = (data) => {
     return apiResquest({

+ 4 - 4
pages_student/views/integralManage/codeSuccess.vue

@@ -31,7 +31,7 @@
 
 <script>
 	import {
-		exchangePoints
+		creditAppletExchangePoints
 	} from '@/pages_student/api/index.js'
 	export default {
 		name: "codeSuccess",
@@ -113,13 +113,13 @@
 						content: '确认兑换吗?',
 						success: function(res) {
 							if (res.confirm) {
-								self.exchangePoints();
+								self.creditAppletExchangePoints();
 							}
 						}
 					});
 				}
 			},
-			async exchangePoints() {
+			async creditAppletExchangePoints() {
 				let self = this;
 				let obj = {
 					mid: this.mid,
@@ -129,7 +129,7 @@
 				};
 				const {
 					data
-				} = await exchangePoints(obj)
+				} = await creditAppletExchangePoints(obj)
 				if (data.code == 200) {
 					uni.showToast({
 						title: '兑换成功',