Browse Source

修改研究报告缩略图为cover,补充入会链接跳转

littleblue55 15 hours ago
parent
commit
326e14d731

+ 3 - 4
pages.json

@@ -14,7 +14,6 @@
 		{
 			"path": "pages/login/login",
 			"style": {
-				"navigationStyle": "custom",
 				"navigationBarTitleText": "",
 				"enablePullDownRefresh": false,
 				"app-plus": {
@@ -412,7 +411,7 @@
 		},
 		{
 			"path" : "pages/swiperDetail/swiperDetail",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText": "内容详情",
 				"enablePullDownRefresh": false,
@@ -423,7 +422,7 @@
 		},
 		{
 			"path" : "pages/joinClub/joinClub",
-			"style" : 
+			"style" :
 			{
 				"navigationBarTitleText": "会员入会",
 				"enablePullDownRefresh": false,
@@ -462,4 +461,4 @@
 		]
 	},
 	"uniIdRouter": {}
-}
+}

+ 14 - 3
pages/goOnEdu/course/courseDetail/courseOrder.vue

@@ -75,7 +75,7 @@
 			</view>
 		</view>
 		<view class="course-form" style="background: none;" v-if="!isMember && course.viewMode === '2'">
-			<view class="course-form-item">
+			<view class="course-form-item" @click="toJoin">
 				<text class="text-red" style="font-weight: bold;">个人会员或单位会员免费,点击现在入会></text>
 			</view>
 		</view>
@@ -105,6 +105,10 @@
 		payCourse
 	} from "@/api/edu.js"
 	import {
+		msgError,
+		msgSuccess
+	} from "@/utils/common.js"
+	import {
 		useAuthStore
 	} from '@/store/authStore'
 	const authStore = useAuthStore();
@@ -161,7 +165,9 @@
 					signType: params.signType,
 					timeStamp: params.timeStamp,
 					success(res){
-						msgSuccess("支付成功")
+						uni.navigateTo({
+							url:"/pages/goOnEdu/course/courseDetail/coursePay?id="+ courseId.value
+						})
 					},
 					fail(res){
 						msgError("支付失败")
@@ -191,7 +197,12 @@
 		// const result = `${year}年${month}月${day}日(星期${dayOfWeek})`
 		return `${year}年${month}月${day}日(星期${dayOfWeek})`
 	}
-
+	const toJoin = () =>{
+		uni.navigateTo({
+			url: '/pages/joinClub/joinClub'
+		})
+	}
+	
 	// 初始化
 	function init(id) {
 		loadCourseDetail(id).then(res => {

+ 14 - 1
pages/goOnEdu/course/courseDetail/coursePay.vue

@@ -5,7 +5,7 @@
 			<text class="pay-text">支付成功</text>
 			<button class="play-btn" @click="toWatch">点击观看</button>
 		</view>
-		<view class="pay-member">
+		<view class="pay-member" v-if="!isMember" @click="toJoin">
 			<text>个人会员或单位会员免费,点击现在入会></text>
 		</view>
 	</view>
@@ -16,6 +16,19 @@
 	import { onLoad } from '@dcloudio/uni-app'
 	import configService from '@/utils/baseurl.js'
 	const FILE_URL = configService.FILE_URL;
+	import {
+		useAuthStore
+	} from '@/store/authStore'
+	const authStore = useAuthStore();
+	const isMember = computed(() => {
+		authStore.loadUserInfo()
+		return authStore.userInfo.isMember == '0' ? false : true
+	})
+	const toJoin = () =>{
+		uni.navigateTo({
+			url: '/pages/joinClub/joinClub'
+		})
+	}
 	const courseId = ref("");
 	const toWatch = () => {
 		// uni.redirectTo({

+ 1 - 1
pages/index/index.vue

@@ -44,7 +44,7 @@
 					<view v-if="reportList.length!=0">
 						<view v-for="(data,index) in reportList" :key="index" class="u-body-item u-flex u-p-t-0 "
 							style="align-items: inherit;" @click="toReport(data.id, data.title)">
-							<image :src="data.imgUrl" mode="aspectFill"></image>
+							<image :src="data.cover" mode="aspectFill"></image>
 							<view class="u-body-item-content">
 								<view class="item-content">
 									<text class="item-content-title text-ellipsis">{{data.title}}</text>

+ 1 - 1
pages/researchReport/reportList/reportList.vue

@@ -24,7 +24,7 @@
 		<view class="list-box">
 			<view class="list-item-box" v-for="item in list" :key="item.id" @click="onClickReport(item)">
 				<view class="image-box">
-					<image :src="item.imgUrl" mode="aspectFill"></image>
+					<image :src="item.cover" mode="aspectFill"></image>
 				</view>
 				<view class="info-box">
 					<view class="title">