Commit 0020f49a by wenyang

支持免费学习视频(免费学习视频不需要购买)

parent b39eca74
...@@ -13,7 +13,8 @@ ...@@ -13,7 +13,8 @@
</view> </view>
<view class="dataBox" v-if="dataList"> <view class="dataBox" v-if="dataList">
<strong>{{dataList.coursePrice}}</strong> <strong>{{dataList.coursePrice}}</strong>
<text>{{dataList.salesNumber}}人购买</text> <strong v-if="dataList.coursePrice == 0">免费学习</strong>
<text v-if="dataList.coursePrice != 0">{{dataList.salesNumber}}人购买</text>
</view> </view>
<view class="tagListBox" v-if="tagList || fileLecturerId"> <view class="tagListBox" v-if="tagList || fileLecturerId">
<template v-if="tagList"> <template v-if="tagList">
......
...@@ -65,7 +65,8 @@ ...@@ -65,7 +65,8 @@
"entitlements" : { "entitlements" : {
"com.apple.developer.associated-domains" : [ "applinks:mcffp.anjibao.cn", "applinks:mapp.cffp.org.cn" ] "com.apple.developer.associated-domains" : [ "applinks:mcffp.anjibao.cn", "applinks:mapp.cffp.org.cn" ]
} }
} },
"idfa" : false
}, },
/* SDK配置 */ /* SDK配置 */
"sdkConfigs" : { "sdkConfigs" : {
...@@ -150,25 +151,27 @@ ...@@ -150,25 +151,27 @@
"appid" : "wx53a601e27aaf7897", "appid" : "wx53a601e27aaf7897",
"setting" : { "setting" : {
"urlCheck" : false, "urlCheck" : false,
"es6" : true, "es6" : false,
"postcss" : true, "postcss" : false,
"minified" : true "minified" : false
}, },
"usingComponents" : true, "usingComponents" : true,
"permission" : { "permission" : {}
"scope.userLocation" : {
"desc" : "开发"
}
}
}, },
"mp-alipay" : { "mp-alipay" : {
"usingComponents" : true "usingComponents" : true
}, },
"mp-baidu" : { "mp-baidu" : {
"usingComponents" : true "usingComponents" : true,
"setting" : {
"urlCheck" : false
}
}, },
"mp-toutiao" : { "mp-toutiao" : {
"usingComponents" : true "usingComponents" : true,
"setting" : {
"urlCheck" : false
}
}, },
"uniStatistics" : { "uniStatistics" : {
"enable" : false "enable" : false
...@@ -203,7 +206,12 @@ ...@@ -203,7 +206,12 @@
} }
}, },
"_spaceID" : "mp-68e17e23-e517-4839-8210-27480303cc51", "_spaceID" : "mp-68e17e23-e517-4839-8210-27480303cc51",
"versionName" : "1.0" "versionName" : "1.0",
"mp-qq" : {
"setting" : {
"urlCheck" : false
}
}
} }
// "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ] // "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
/* ios打包配置 */ /* ios打包配置 */
......
...@@ -49,9 +49,10 @@ ...@@ -49,9 +49,10 @@
</view> </view>
<view class="dataBox"> <view class="dataBox">
<strong v-if="courseInfo.status==1">{{courseInfo.coursePrice}}</strong> <strong v-if="courseInfo.status==1">{{courseInfo.coursePrice}}</strong>
<strong v-if="courseInfo.status==1 && courseInfo.coursePrice == 0">免费学习</strong>
<text v-if="courseInfo.status==2" style="color: #F15A1F;margin-right: 20rpx;"><i <text v-if="courseInfo.status==2" style="color: #F15A1F;margin-right: 20rpx;"><i
class="iconfont icon-yifukuan"></i>已购</text> class="iconfont icon-yifukuan"></i>已购</text>
<text>{{courseInfo.salesNumber}}人购买</text> <text v-if="courseInfo.coursePrice != 0">{{courseInfo.salesNumber}}人购买</text>
</view> </view>
...@@ -114,7 +115,7 @@ ...@@ -114,7 +115,7 @@
<view v-html="lecturerInfo?.lecturerIntroduce" class="lecturerText richTextContent"></view> <view v-html="lecturerInfo?.lecturerIntroduce" class="lecturerText richTextContent"></view>
</view> </view>
<!-- 购买按钮 --> <!-- 购买按钮 -->
<view class="buyBox" @click="saveOrder()" v-if="courseInfo.status == 1"> <view class="buyBox" @click="saveOrder()" v-if="courseInfo.status == 1 && courseInfo.coursePrice != 0">
<text>{{loginType=='visitor' ? '登录/注册' : '购买'}}</text> <text>{{loginType=='visitor' ? '登录/注册' : '购买'}}</text>
</view> </view>
...@@ -457,10 +458,12 @@ ...@@ -457,10 +458,12 @@
packFileId: this.courseInfo.packFileId packFileId: this.courseInfo.packFileId
}).then(res => { }).then(res => {
if (res['success']) { if (res['success']) {
if(res['data'] && res['data']['data']){
this.relatedCoursesLists = res['data']['data']['relatedCourseList']; this.relatedCoursesLists = res['data']['data']['relatedCourseList'];
this.nonRequiredCount = res['data']['data']['nonRequiredCount']; this.nonRequiredCount = res['data']['data']['nonRequiredCount'];
this.requiredCount = res['data']['data']['requiredCount']; this.requiredCount = res['data']['data']['requiredCount'];
} }
}
}) })
}, },
// 秒转时分秒格式 // 秒转时分秒格式
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment