Merge branch 'master' of https://gitee.com/he2802/saas_applet

pages2/learn/my_learn.vue

@@ -143,7 +143,7 @@ export default {
 				this.$navTo.togo(`/pages2/learn/details?goodsId=${v.goodsId}&gradeId=${v.gradeId}`);
 			}
 			if (int === 5) {
-				this.$navTo.togo('/pages2/course/detail?id=' + v.goodsId);
+				this.$navTo.togo(`/pages2/wd/course?id=${v.goodsId}&gid=${v.gradeId}`);
 			}
 		},
 		getInfos() {

pages2/msg/detail.vue

@@ -171,7 +171,7 @@ export default {
 		getInfo() {
 			this.$api.getappinformUserId(this.id).then(res => {
 				if (res.data.code === 200) {
-					if (res.data.data.receiptStatus === 1 && (res.data.data.remindId === 2 || res.data.data.remindId === 4 ||res.data.data.remindId === 24 || res.data.data.remindId === 23)) {
+					if (res.data.data.receiptStatus === 1 && (res.data.data.remindId === 2 || res.data.data.remindId === 4 ||res.data.data.remindId === 24)) {
 						this.$api.getbaseprofiletpgetInfo({ goodsId: res.data.data.goodsId }).then(k => {
 							if ((k.data.data.status === 3 && k.data.data.changeStatus === 2) || k.data.data.status === 2 || k.data.data.status === 1) {
 								this.statusGO = false;
@@ -210,6 +210,7 @@ export default {
 				case 19:
 				case 21:
 				case 22:
+				case 23:
 				arsty = '立刻学习';
 					break;
 				case 2: