调整vip规则
This commit is contained in:
liuyuan
@@ -6,12 +6,14 @@
|
||||
"request" : 3000
|
||||
},
|
||||
"transformPx" : false,
|
||||
"icons": [{
|
||||
"icons" : [
|
||||
{
|
||||
"sizes" : "分辨率，192x192",
|
||||
"src" : "图片路径"
|
||||
}],
|
||||
"versionName": "1.0.29",
|
||||
"versionCode": 1029,
|
||||
}
|
||||
],
|
||||
"versionName" : "1.0.30",
|
||||
"versionCode" : 1030,
|
||||
"app-plus" : {
|
||||
"nvueCompiler" : "weex",
|
||||
"compatible" : {
|
||||
@@ -268,3 +270,4 @@
|
||||
}
|
||||
}
|
||||
// 小程序特有相关
|
||||
|
||||
|
||||
@@ -101,14 +101,13 @@ export default {
|
||||
<style lang="scss" scoped>
|
||||
.list_item {
|
||||
width: 100%;
|
||||
padding: 20rpx 30rpx;
|
||||
padding: 20rpx;
|
||||
font-size: 30rpx;
|
||||
box-sizing: border-box;
|
||||
border-bottom: 1rpx solid #e0e0e0;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
// position: relative;
|
||||
}
|
||||
|
||||
.list_item :last-child(1) {
|
||||
@@ -122,9 +121,6 @@ export default {
|
||||
.rightArrow {
|
||||
width: 40rpx;
|
||||
height: 40rpx;
|
||||
// position: absolute;
|
||||
// right: 30rpx;
|
||||
// top: 20rpx;
|
||||
}
|
||||
|
||||
.scroll-Y {
|
||||
|
||||
@@ -127,14 +127,6 @@
|
||||
</view>
|
||||
</template>
|
||||
<template slot="detail_vipRecord" slot-scope="slotProps"> <vip-record v-if="currentCateIndex == 1"></vip-record>
|
||||
|
||||
|
||||
<!-- <rich-text
|
||||
:nodes="slotProps.dataList | formatRichText"
|
||||
@click.stop="showPreview"
|
||||
:data-nodes="slotProps.dataList"
|
||||
></rich-text> -->
|
||||
|
||||
</template>
|
||||
</common-anchor-link>
|
||||
</view>
|
||||
|
||||
@@ -24,8 +24,8 @@
|
||||
}"
|
||||
>
|
||||
<template slot="otherContent" slot-scope="slotProps">
|
||||
<view v-if="goBuyTitle && isAndorid" class="describe_block">
|
||||
<view style="display: flex">
|
||||
<view v-if="goBuyTitle" class="describe_block">
|
||||
<view style="display: flex; align-items: center;">
|
||||
<uni-icons type="info" size="20" color="#fff"></uni-icons>
|
||||
<text>{{ goBuyTitle }}</text>
|
||||
</view>
|
||||
@@ -40,7 +40,7 @@
|
||||
|
||||
<view
|
||||
v-if="curriculumData.image"
|
||||
:style="isAndorid ? 'padding-top:80rpx;' : ''"
|
||||
style="padding-top:80rpx;"
|
||||
>
|
||||
<image
|
||||
style="width: 100%"
|
||||
@@ -68,9 +68,7 @@
|
||||
<view class="course_info_box">
|
||||
<view class="course_info">
|
||||
<view class="flexbox course_title" v-if="curriculumData.id">
|
||||
<text class="courseTitle title">{{
|
||||
curriculumData.title
|
||||
}}</text>
|
||||
<text class="courseTitle title">{{curriculumData.title}}</text>
|
||||
</view>
|
||||
<view style="color: #b0b0b0; padding: 0 20rpx">
|
||||
{{
|
||||
@@ -84,16 +82,26 @@
|
||||
v-if="curriculumData.content && curriculumData.content != ''"
|
||||
>
|
||||
<view class="prof">
|
||||
<view
|
||||
style="padding: 0 20rpx"
|
||||
@click="isHideCourseInfo = !isHideCourseInfo"
|
||||
>
|
||||
<view style="
|
||||
position: relative;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
">
|
||||
<view
|
||||
:class="`${isHideCourseInfo ? 'hidden2' : ''}`"
|
||||
style="width: calc(100% - 50rpx)"
|
||||
style="font-size: 30rpx; text-align: justify;"
|
||||
v-html="curriculumData.content"
|
||||
>
|
||||
</view>
|
||||
<text @click="isHideCourseInfo = !isHideCourseInfo" style="
|
||||
position: absolute;
|
||||
background-color: #f2f8ff; padding: 4rpx ;
|
||||
bottom: 0;
|
||||
right: 0;
|
||||
color: #838588;
|
||||
">
|
||||
{{ isHideCourseInfo ? "展开" : "收起" }}
|
||||
</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@@ -107,9 +115,7 @@
|
||||
<view class="top">
|
||||
<view class="line"></view>
|
||||
<view class="left">
|
||||
<text style="font-weight: blod" class="catalogue_title">{{
|
||||
slotProps.data.title
|
||||
}}</text>
|
||||
<text style="font-weight: blod" class="catalogue_title">{{slotProps.data.title }}</text>
|
||||
</view>
|
||||
<view class="not_purchased">
|
||||
<view class="spot"></view>
|
||||
@@ -205,7 +211,7 @@
|
||||
"
|
||||
name="lock"
|
||||
color="#258feb"
|
||||
size="26"
|
||||
size="24"
|
||||
></u-icon>
|
||||
</view>
|
||||
</template>
|
||||
@@ -320,7 +326,7 @@ export default {
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
isHideCourseInfo: true,
|
||||
isHideCourseInfo: false,
|
||||
courseList: [],
|
||||
showGoBuy: true,
|
||||
protocolShow: false,
|
||||
@@ -403,7 +409,6 @@ export default {
|
||||
goodsList: "sociology/product/getProductListForCourse",
|
||||
startStudyForMF: "sociology/course/startStudyForMF",
|
||||
},
|
||||
isAndorid: true,
|
||||
userVip: null, //是否有vip
|
||||
textList: [], //转化文字集合
|
||||
};
|
||||
@@ -413,7 +418,6 @@ export default {
|
||||
this.getUserInfo();
|
||||
//是否是vip
|
||||
this.getCourseByVip();
|
||||
this.getOS();
|
||||
},
|
||||
onHide() {
|
||||
this.selectGoodsData = {};
|
||||
@@ -436,18 +440,6 @@ export default {
|
||||
});
|
||||
},
|
||||
methods: {
|
||||
//获得操作系统
|
||||
getOS() {
|
||||
let oprateOs = "";
|
||||
oprateOs = uni.getSystemInfoSync().platform;
|
||||
this.oprateOsName = uni.getSystemInfoSync().platform;
|
||||
console.log("oprateOs", oprateOs);
|
||||
if (oprateOs == "android") {
|
||||
this.isAndorid = true;
|
||||
} else {
|
||||
this.isAndorid = false;
|
||||
}
|
||||
},
|
||||
//点击顶部按钮
|
||||
handleClickGetVip() {
|
||||
uni.navigateTo({
|
||||
@@ -966,18 +958,13 @@ export default {
|
||||
border: 1rpx solid $themeColor;
|
||||
background-color: $themeColor;
|
||||
color: $themeColor;
|
||||
// width: 100%;
|
||||
float: right;
|
||||
padding: 4rpx 14rpx;
|
||||
font-size: 24rpx;
|
||||
padding: 4rpx 10rpx;
|
||||
font-size: 20rpx;
|
||||
font-weight: 500;
|
||||
line-height: 30rpx;
|
||||
border-radius: 10rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
// margin-top: 20rpx;
|
||||
// display: flex;
|
||||
// align-items: center;
|
||||
}
|
||||
|
||||
.fdButtonBoxRed {
|
||||
@@ -1167,7 +1154,10 @@ export default {
|
||||
// .common_curriculum_list{
|
||||
|
||||
// }
|
||||
|
||||
.hidden2 {
|
||||
line-height: 50rpx;
|
||||
height: 100rpx;
|
||||
}
|
||||
.goods_box {
|
||||
padding: 40rpx 20rpx;
|
||||
padding-bottom: 150rpx;
|
||||
@@ -1517,7 +1507,6 @@ export default {
|
||||
.course_title {
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
background: #fff;
|
||||
}
|
||||
|
||||
.catalogueTitle {
|
||||
@@ -1583,21 +1572,19 @@ export default {
|
||||
line-height: 50rpx;
|
||||
padding: 10rpx 0;
|
||||
color: #333;
|
||||
// background-color: #f0f0f0;
|
||||
// margin-bottom: 10rpx;
|
||||
}
|
||||
.prof image{
|
||||
width: 100%;
|
||||
}
|
||||
.containerBg {
|
||||
padding: 0 20rpx;
|
||||
padding-bottom: 40rpx;
|
||||
}
|
||||
|
||||
.containerBg1 {
|
||||
border-top: 1px solid #fff;
|
||||
margin-top: -4rpx;
|
||||
// background: rgb(243, 250, 243);
|
||||
// position: relative;
|
||||
z-index: 1;
|
||||
// padding: 40rpx 0;
|
||||
|
||||
border-radius: 30rpx 30rpx 0 0;
|
||||
// background-color: #fff;
|
||||
// overflow: hidden;
|
||||
}
|
||||
|
||||
.courseTitle {
|
||||
|
||||
@@ -349,7 +349,6 @@ export default {
|
||||
...mapMutations(["setUserInfo"]),
|
||||
|
||||
async getAdvertisement() {
|
||||
console.log("11111111111111111111 at line 233:", 11111111111111111111);
|
||||
await this.$http
|
||||
.request({
|
||||
url: "common/mainAd/getMainAd",
|
||||
@@ -358,7 +357,6 @@ export default {
|
||||
type: 2,
|
||||
},
|
||||
header: {
|
||||
//默认 无 说明：请求头
|
||||
"Content-Type": "application/json",
|
||||
},
|
||||
})
|
||||
@@ -388,12 +386,6 @@ export default {
|
||||
});
|
||||
},
|
||||
goNotice(index) {
|
||||
console.log("at line 297:", this.noticeList[index]);
|
||||
// var mynavData = JSON.stringify({
|
||||
// ...this.noticeList[index],
|
||||
// navTitle: this.noticeList[index].title,
|
||||
// title: this.noticeList[index].title,
|
||||
// }); // 这里转换成 字符串
|
||||
uni.navigateTo({
|
||||
url: `/pages/homePage/index/noticeDetail?id=${this.noticeList[index].id}`,
|
||||
});
|
||||
|
||||
@@ -108,10 +108,7 @@
|
||||
"
|
||||
>
|
||||
<template>
|
||||
<view
|
||||
class="chong_zhi boxShadow box_fillet vip_box"
|
||||
@click="onPageJump('/pages/mine/vip/index')"
|
||||
>
|
||||
<view class="chong_zhi boxShadow box_fillet vip_box">
|
||||
<view class="noVip">
|
||||
<view style="display: flex; align-items: center">
|
||||
<view
|
||||
@@ -149,7 +146,7 @@
|
||||
>办理VIP，畅享更多专属权益</view
|
||||
>
|
||||
</view>
|
||||
<view class="vip_btn"
|
||||
<view class="vip_btn" @click="onPageJump('/pages/mine/vip/index')"
|
||||
><button v-if="vipList.length == 0">办理</button
|
||||
><button v-else>续费</button></view
|
||||
>
|
||||
|
||||
Reference in New Issue
Block a user