Merge branch 'master' into stage-4

pages3/polyv/detail.vue

@@ -817,6 +817,9 @@ export default {
 			this.$api.goodsGradeInfo(this.gradeId).then(res => {
 				if (res.data.code == 200) {
 					self.gradeDetail = res.data.data;
+					if(self.needProfileModal){
+						return
+					}
 					if(self.gradeDetail.learningStatus==2){
 						uni.showModal({
 							showCancel:false,