zm/medicine_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

调整vip规则

Browse Source
This commit is contained in:
liuyuan
2025-03-13 11:28:13 +08:00
parent c7875bae17
commit cd31512ac8
11 changed files with 38 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
manifest.json
View File

@@ -12,8 +12,8 @@
"src" : "图片路径"
}
],
"versionName" : "1.0.58",
"versionCode" : 1058,
"versionName" : "1.0.59",
"versionCode" : 1059,
"app-plus" : {
"nvueCompiler" : "uni-app",
"compatible" : {

7
pages.json
View File

@@ -43,13 +43,6 @@
"enablePullDownRefresh": false
}
},
{
"path": "pages/peanut/mine",
"style": {
"navigationBarTitleText": "我的",
"enablePullDownRefresh": false
}
},
{
"path": "pages/peanut/searchFor",
"style": {

10
pages/bookShop/orderList.vue
View File

@@ -761,16 +761,6 @@
confirmText: '好的',
showCancel: false
})
// if (this.isAndorid) {
// uni.showModal({
// title: "提示",
// showCancel: false,
// content:
// "很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单",
// });
// } else {
// this.iphonepay(payItem);
// }
} else if (payItem.paymentMethod == 4) {
console.log('天医币二次支付')
}

3
pages/component/commonComponents/list.vue
View File

@@ -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) {
border-bottom: none;

39
pages/course/courseDetail.vue
View File

@@ -5,7 +5,7 @@
<z-nav-bar title="课程介绍"></z-nav-bar>
<view class="contentBox commonPageContentBox">
<view v-if="goBuyTitle" class="describe_block">
<view style=" display: flex;">
<view style=" display: flex; align-items: center;">
<uni-icons type="info" size="20" color="#fff"></uni-icons>
<text>{{goBuyTitle}}</text>
</view>
@@ -24,13 +24,20 @@
<view class="flexbox course_title" v-if="course.id">
<text class="courseTitle title">{{ course.title }}</text>
</view>
<view style="color: #b0b0b0; padding: 0 20rpx">
{{
librayList && librayList.length > 0
? `共${librayList.length}个目录`
: ""
}}
</view>
<view class="containerBg" v-if="course.content && course.content != ''">
<view class="prof">
<view style="
position: relative;
display: flex;
align-items: center;
">
position: relative;
display: flex;
align-items: center;
">
<view :class="`${isHideCourseInfo ? 'hidden2' : ''}`"
style="font-size: 30rpx; text-align: justify;" v-html="course.content">
</view>
@@ -236,7 +243,7 @@
<text class="hidden1" style="width: 88%;">{{ item.title }}</text>
<uni-tag
v-if="item.isAudition == 1 && librayList[curIndex].isBuy == 0 && userVip==null"
style="margin-left: 10rpx" :inverted="true" text="试听" size="mini"
style="margin-left: 10rpx;font-size: 20rpx;" :inverted="true" text="试听" size="mini"
type="success" />
<template v-if="librayList[curIndex] && librayList[curIndex].isBuy == 1 || userVip!=null">
<uni-tag v-if="item.isLearned == 0" style="margin-left: 10rpx;"
@@ -249,7 +256,7 @@
<view class="shitingTag" style="position: absolute; right: 20px;">
<u-icon
v-if="librayList[curIndex].type!=0 &&librayList[curIndex].isBuy == 0 && userVip==null && item.isAudition == 0"
name="lock" color="#258feb" size="26"></u-icon>
name="lock" color="#258feb" size="24"></u-icon>
</view>
</view>
@@ -2658,14 +2665,10 @@
line-height: 50rpx;
padding: 10rpx 0;
color: #333;
// background-color: #f0f0f0;
// margin-bottom: 10rpx;
}
::v-deep .prof img {
width: 100px;
height: 100px;
.prof image{
width: 100%;
}
.catalogueTitle {
@@ -2750,10 +2753,9 @@
border: 1rpx solid $themeColor;
background-color: $themeColor;
color: #fff !important;
// 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;
@@ -2856,7 +2858,6 @@
.course_title {
align-items: center;
justify-content: space-between;
background: #fff;
}
.courseTitle {
@@ -2959,7 +2960,7 @@
.textBox {
padding: 20rpx 0;
align-items: center;
justify-content: start;
justify-content: space-between;
width: 100%;
font-size: 28rpx;

32
pages/course/myCourseLearn.vue
View File

@@ -75,7 +75,7 @@
</view>
<view class="tag-view">
<uni-tag @click="goBuy()" text="购买课程" type="warning" size="normal" />
<uni-tag v-if="isAndorid" @click="onPageJump('/pages/mine/vip/index')" size="normal" style="margin-left: 20rpx;" text="开通VIP" type="success" />
<uni-tag @click="onPageJump('/pages/mine/vip/index')" size="normal" style="margin-left: 20rpx;" text="开通VIP" type="success" />
</view>
</view>
</view>
@@ -114,7 +114,6 @@
export default {
data() {
return {
isAndorid: true,
playData: {},
catalogueId: null,
// fixed: false,
@@ -176,13 +175,8 @@
// 隐藏原生的tabbar
uni.hideTabBar();
this.windowWidth = uni.getSystemInfoSync().windowWidth;
// this.pageTitle = e.title
console.log(e, '传入分类id')
this.getUserInfo()
this.courseId = e.id
// this.getCateList(this.courseId)
// this.getSayList()
},
onPullDownRefresh() {
uni.stopPullDownRefresh()
@@ -190,7 +184,6 @@
onPageScroll(e) {
this.scrollTop = e.scrollTop;
if (this.scrollTop > 100) {
// console.log('高度符合');
this.fixed = true
} else {
this.fixed = false
@@ -207,35 +200,14 @@
plus.screen.unlockOrientation();
plus.screen.lockOrientation("portrait-primary");
// #endif
this.getData(this.courseId)
this.getOS()
},
onReachBottom() {
console.log('触底');
// if (this.status != 2) {
// this.pPage++
// this.getSayList()
// }
this.getData(this.courseId)
},
components: {
// musicPlay
emotion,
buyPup
},
//方法
methods: {
// 获得操作系统
getOS() {
let oprateOs = "";
oprateOs = uni.getSystemInfoSync().platform;
// console.log(oprateOs)
if (oprateOs == "android") {
this.isAndorid = true;
} else {
this.isAndorid = false;
}
},
getUserInfo() {
// 用户详情
// if (this.userInfo.id != undefined) {

2
pages/goods/order/index.vue
View File

@@ -750,7 +750,7 @@ export default {
},
],
haveCourse: false, // 结算队列是否有课程类型的商品
isAndorid: null, //操作系统
isAndroid: null, //操作系统
beizhuShow: false, // 是否显示天医币说明？
couponHistoryList: [], // 可用优惠券
showCouponPup: false, // 是否显示优惠券弹窗

11
pages/mine/mine/index.vue
View File

@@ -50,8 +50,7 @@
<view style="
padding: 20rpx; overflow: hidden;
">
<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 class="zhanghu PM_font" style="text-align: left">
@@ -67,7 +66,7 @@
</view>
<view v-else class="vip_null" style=" padding-left: 30rpx;">办理VIP，畅享更多专属权益</view>
</view>
<view class="vip_btn"><button v-if="vipList.length==0">办理</button><button v-else>续费</button></view>
<view class="vip_btn" @click="onPageJump('/pages/mine/vip/index')"><button v-if="vipList.length==0">办理</button><button v-else>续费</button></view>
</view>
</view>
<!-- end -->
@@ -974,11 +973,11 @@
margin-right: 8rpx;
}
.vip_type_item_len{
padding: 0 8rpx;
font-size: 14rpx;
padding: 0 7rpx;
font-size: 13rpx;
line-height: 34rpx;
height: 34rpx;
margin-right: 5rpx;
margin-right: 4rpx;
}
.vip_type_item:last-child{
margin-right: 0;

10
pages/mine/vip/index.vue
View File

@@ -20,9 +20,10 @@
<text class="font_bold">课程价格：</text>
<view class="vip_qx_v">一年<text class="vip_fee line">{{item.originalPrice||0}}</text>元</view>
</view>
<text class="vip_item_btn" v-if="item.state==null" @click="openorderModal(item,0)">去办理</text>
<text class="vip_item_btn" v-else @click="openorderModal(item,0)">去续费</text>
<view v-if="$platform!='ios'">
<text class="vip_item_btn" v-if="item.state==null" @click="openorderModal(item,0)">去办理</text>
<text class="vip_item_btn" v-else @click="openorderModal(item,0)">去续费</text>
</view>
<view class="vip_price" v-if="item.vcbList&&item.vcbList.length>0">
<text class="font_bold" v-if="item.type==1||item.type==2">超级VIP价格：</text>
@@ -116,6 +117,9 @@ export default{
},
//点击购买
openorderModal(item,type) {
if(this.$platform=='ios'){
return false
}
let text = '';
//如果是右侧按钮点击展示
//判断点击类型是vip价格还是延期价格

467
pages/peanut/mine copy.vue
View File

@@ -1,467 +0,0 @@
<template>
<view style="padding: 0 40rpx; font-size: 28upx">
<!-- 公共组件-每个页面必须引入 -->
<public-module></public-module>
<view style="height: 50rpx"></view>
<view class="per_mes">
<image
:src="userMes.avatar"
v-if="userMes.avatar != null"
class="per_mes_img"
></image>
<image
src="../../static/icon/home_icon_1.png"
v-if="userMes.avatar == null"
class="per_mes_img"
></image>
<view>
<text class="name" v-if="userMes.nickname != null">{{
userMes.nickname
}}</text>
<text class="name" v-if="userMes.nickname == null">未设置</text>
<!-- <image v-if="userMes.vip==1" src="../../static/icon/mine_v.png" alt="" class="per_user_img"></image> -->
<text
style="margin-left: 20rpx; font-size: 22rpx; color: #888"
v-if="userMes.tel"
>({{ userMes.tel }})</text
>
<text style="margin-left: 20rpx; font-size: 22rpx; color: #888" v-else
>({{ userMes.email }})</text
>
<!-- <text class="tong">累计读书5本
<span style="margin: 0 20upx;">|</span> 今日读50分钟
</text> -->
</view>
<br clear="both" />
</view>
<!-- <view class="now_vip" v-if="userMes.vip==0">
<text>
<image src="../../static/icon/mine_p.png" style="height: 44rpx;"></image>
开通会员畅享海量内容
</text>
<b class="kt_btn" @click="onPageJump('./opeVip')">开通VIP</b>
</view> -->
<!-- <view class="now_vip" v-if="userMes.vip==1">
<text>
<image src="../../static/icon/mine_v.png"></image>
尊贵的VIP会员
<font style="font-size: 14rpx;margin-left: 20rpx;">{{userMes.vipValidtime}}到期</font>
</text>
<b class="kt_btn" @click="onPageJump('./opeVip')">立即续费</b>
</view> -->
<view class="chong_zhi">
<view class="zhanghu" @click="onPageJump('../user/persCount')">
我的账户
<text style="float: right; line-height: 85rpx"> > </text>
</view>
<view class="chong_list">
<view v-if="iosHide">
<b>{{ userMes.peanutCoin }}</b>
天医币
</view>
<view v-if="iosHide">
<b>{{ userMes.conponsCount }}</b>
优惠券
</view>
<!-- <b class="chong_btn" @click="onPageJump('../sdkDemo/pay')">充 值</b> -->
<b class="chong_btn" v-if="iosHide" @click="onPageJump('./reCharge')"
>充 值</b
>
</view>
</view>
<view class="xiugai">
<view class="nav_list" @click="onPageJump('../bookShop/orderList')">
<text>我的订单</text>
</view>
<!-- <view class="nav_list" @click="onPageJump('../clock/clockList')">
<text>我的打卡</text>
</view> -->
<!-- <view class="nav_list" @click="onPageJump('../listen/home')" v-if="iosHide">
<text>我的听书</text>
</view> -->
<!-- 暂时去掉 -->
<!-- <view class="nav_list" @click="onPageJump('../listen/setListen')" v-if="iosHide">
<text>听书设置</text>
</view> -->
<!-- <view class="nav_list" @click="onPageJump('../peanut/myComments')">
<text>我的评价</text>
</view> -->
<!-- 暂时去掉 -->
<view class="nav_list" @click="onPageJump('../peanut/shopping')">
<text>购物车</text>
</view>
<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookBuy')">
<text>电子书购买记录</text>
</view> -->
<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookRecord')">
<text>阅读记录</text>
</view> -->
<view class="nav_list" @click="onPageJump('../user/persData')">
<text>修改个人资料</text>
</view>
<view class="nav_list" @click="onPageJump('../user/address')">
<text>地址管理</text>
</view>
<!-- <view class="nav_list" @click="onGoing()">
<text>帮助与反馈11111</text>
</view> -->
<!-- <view class="nav_list" @click="newOnShare" v-if="isAndorid"> -->
<view class="nav_list" @click="newOnShare">
<text>分享App</text>
</view>
<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
<text>关于我们</text>
</view>
<view class="nav_list" @click="signShow = true">
<text>退出登录</text>
</view>
<view class="nav_list" @click="logout">
<text>注销帐号</text>
</view>
</view>
<u-modal
:show="signShow"
:content="signContent"
:showCancelButton="true"
@cancel="signShow = false"
@confirm="signOut"
>
</u-modal>
<!-- 分享弹窗 -->
<uni-popup ref="share" type="share" safeArea backgroundColor="#fff">
<uni-popup-share @select="haveSelected"></uni-popup-share>
</uni-popup>
<music-play :playData="playData"></music-play>
<z-navigation></z-navigation>
</view>
</template>
<script>
import musicPlay from "@/components/music.vue";
import $http from "@/config/requestConfig.js";
// import appShare, { closeShare } from '@/uni_modules/zhouWei-APPshare/js_sdk/appShare';
import { mapState, mapMutations } from "vuex";
export default {
data() {
return {
showEbook: false, // 显示电子书相关
userMes: {},
signShow: false,
signContent: "是否要退出登录？",
playData: {},
isAndorid: true,
platform: null, // 设备系统
};
},
//第一次加载
onLoad(e) {
// 隐藏原生的tabbar
uni.hideTabBar();
// #ifdef APP-PLUS
this.getOS();
this.platform = uni.getSystemInfoSync().platform;
// console.log('操纵系统',this.platform)
// #endif
},
computed: {
...mapState(["userInfo"]),
},
//页面显示
onShow() {
// 隐藏原生的tabbar
uni.hideTabBar();
this.getData();
},
components: {
musicPlay,
},
//方法
methods: {
...mapMutations(["setUserInfo"]),
// 获得操作系统
getOS() {
let oprateOs = "";
oprateOs = uni.getSystemInfoSync().platform;
// console.log(oprateOs)
if (oprateOs == "android") {
this.isAndorid = true;
} else {
this.isAndorid = false;
}
},
haveSelected(data) {
console.log(data, " 选择的是");
if (data.index == 0) {
// 分享到好友
uni.share({
provider: "weixin",
scene: "WXSceneSession",
type: 0,
href: this.$apkUrl,
title: "吴门医述",
summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
imageUrl: "static/fengziIcon.jpg",
success: function (res) {
console.log("success:" + JSON.stringify(res));
},
fail: function (err) {
console.log("fail:" + JSON.stringify(err));
},
});
} else if (data.index == 1) {
// 分享到朋友圈
uni.share({
provider: "weixin",
scene: "WXSceneTimeline",
type: 0,
href: this.$apkUrl,
title: "吴门医述",
summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
imageUrl: "static/fengziIcon.jpg",
success: function (res) {
console.log("success:" + JSON.stringify(res));
},
fail: function (err) {
console.log("fail:" + JSON.stringify(err));
},
});
}
},
switchTab(url) {
uni.switchTab({
url: url,
});
},
getData() {
// 获取个人信息
if (this.userInfo.id != undefined) {
this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
this.userMes = res.user;
if (this.userMes.vip == 1) {
this.userMes.vipValidtime = this.userMes.vipValidtime.substring(
0,
this.userMes.vipValidtime.indexOf(" ")
);
}
});
}
},
// 新写分享
newOnShare() {
this.$refs.share.open();
},
// 注销账户
logout() {
let that = this;
uni.showModal({
title: "提示",
content: "确定要注销当前账户吗？",
success: function (res) {
if (res.confirm) {
uni.showModal({
title: "提示",
showCancel: false,
content: `注销申请已提交成功,请联系客服进行后续操作：022-24142321`,
success: function (res1) {
if (res1.confirm) {
that.signOut();
}
},
});
} else if (res.cancel) {
// 取消操作
}
},
});
},
// 跳转
onGoing() {
uni.showToast({
icon: "none",
title: "开发中，敬请期待...",
});
},
onPageJump(url) {
console.log(url, "url");
uni.navigateTo({
url: url,
});
},
// 退出登录
signOut() {
this.signShow = false;
this.setUserInfo({ token: null });
uni.reLaunch({
url: "../user/login",
});
},
},
};
</script>
<style lang="scss" scoped>
@import "@/style/mixin.scss";
.per_mes {
margin: 50rpx 0 50rpx 0;
align-items: center;
.per_mes_img {
width: 120upx;
height: 120upx;
background-color: #fff;
border-radius: 120upx;
margin: 0 30upx 0 0;
float: left;
}
view {
float: left;
margin-top: 20rpx;
.name {
display: inline-block;
font-weight: bold;
font-size: 38upx;
margin-bottom: 10rpx;
}
.tong {
color: #999;
font-size: 25upx;
}
.per_user_img {
display: inline-block;
width: 40upx;
height: 40upx;
margin-left: 10rpx;
vertical-align: super;
}
}
}
.now_vip {
background-color: #fff;
// border-radius: 20upx;
margin: 0 0 30upx 0;
padding: 0 30upx;
height: 120upx;
background-image: linear-gradient(90deg, #feeed6 0%, #f5ce99 100%);
image {
width: 46rpx;
height: 50rpx;
display: inline-block;
vertical-align: text-bottom;
margin: 0 10rpx 0 0;
}
text {
font-size: 30upx;
line-height: 120upx;
color: #977749;
font-weight: bold;
}
.kt_btn {
font-size: 26upx;
display: block;
float: right;
border-radius: 50rpx;
color: #fffbf6;
padding: 12rpx 26rpx;
margin: 33rpx 0 0 0;
background-image: linear-gradient(90deg, #dfa964 0%, #7f5218 100%);
}
}
.chong_zhi {
background-color: #fff;
margin: 0 0 30upx 0;
padding: 0 30upx;
height: 240upx;
.zhanghu {
font-size: 32upx;
line-height: 100upx;
font-weight: bold;
}
.chong_list {
view {
width: 25%;
text-align: center;
display: inline-block;
color: #a3a1a1;
b {
font-size: 45rpx;
display: block;
margin: 0 0 10rpx 0;
color: #76757b;
}
}
.chong_btn {
font-size: 26upx;
display: block;
float: right;
border-radius: 50rpx;
color: #fffbf6;
padding: 12rpx 42rpx;
margin: 20rpx 0 0 0;
background: #815219;
}
}
}
.xiugai {
.nav_list {
background-color: #fff;
padding: 30upx 0 30upx 20upx;
display: flex;
align-items: center;
position: relative;
font-weight: bold;
border-bottom: 1px solid #e5e5e5;
&:active {
background-color: #f5f5f5;
}
text {
color: #333;
margin-left: 10rpx;
}
&::after {
content: "";
position: absolute;
right: 20upx;
top: 50%;
transform: translateY(-50%);
width: 40upx;
height: 40upx;
background-image: url("../../static/icon/icon_right.png");
background-position: center center;
background-repeat: no-repeat;
background-size: cover;
}
}
.nav_list:nth-last-child(1) {
border-bottom: 0;
}
}
</style>

51
pages/peanut/mine.vue
View File

@@ -152,13 +152,6 @@
}}</view>
</view>
</view>
<!-- v-if="iosHide" -->
<!-- <view v-if="iosHide" class="chong_list_item">
<b>{{ userMes.conponsCount }}</b>
优惠券
</view> -->
<!-- <b class="chong_btn" @click="onPageJump('../sdkDemo/pay')">充 值</b> -->
<view
class="chong_list_item"
style="
@@ -179,7 +172,6 @@
</view>
<view
class="chong_zhi boxShadow box_fillet vip_box"
@click="onPageJump('/pages/mine/vip/index')"
>
<view v-if="!userMes.userVip" class="noVip">
<view class="zhanghu PM_font" style="text-align: center">
@@ -215,7 +207,6 @@
:style="item.style"
v-html="item.name"
></view>
<!-- <image :src="curriculumData.explainsImg" mode="widthFix" class="headImage"></image> -->
</swiper-item>
</swiper>
</view>
@@ -254,34 +245,6 @@
<view> </view>
</template>
</common-list>
<!-- <view class="nav_list" @click="onPageJump('../clock/clockList')">
<text>我的打卡</text>
</view> -->
<!-- <view class="nav_list" @click="onPageJump('../listen/home')" v-if="iosHide">
<text>我的听书</text>
</view> -->
<!-- 暂时去掉 -->
<!-- <view class="nav_list" @click="onPageJump('../listen/setListen')" v-if="iosHide">
<text>听书设置</text>
</view> -->
<!-- <view class="nav_list" @click="onPageJump('../peanut/myComments')">
<text>我的评价</text>
</view> -->
<!-- 暂时去掉 -->
<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookBuy')">
<text>电子书购买记录</text>
</view> -->
<!-- <view v-if="showEbook" class="nav_list" @click="onPageJump('../eBook/bookRecord')">
<text>阅读记录</text>
</view> -->
<!-- <view class="nav_list" @click="onGoing()">
<text>帮助与反馈11111</text>
</view> -->
<!-- <view class="nav_list" @click="newOnShare" v-if="isAndorid"> -->
</view>
</view>
</view>
@@ -370,7 +333,6 @@ export default {
signShow: false,
signContent: "是否要退出登录？",
playData: {},
isAndorid: true,
platform: null, // 设备系统
pageList: [
{
@@ -417,9 +379,7 @@ export default {
// 隐藏原生的tabbar
// uni.hideTabBar();
// #ifdef APP-PLUS
this.getOS();
this.platform = uni.getSystemInfoSync().platform;
// console.log('操纵系统',this.platform)
// #endif
},
computed: {
@@ -473,17 +433,6 @@ export default {
break;
}
},
// 获得操作系统
getOS() {
let oprateOs = "";
oprateOs = uni.getSystemInfoSync().platform;
// console.log(oprateOs)
if (oprateOs == "android") {
this.isAndorid = true;
} else {
this.isAndorid = false;
}
},
haveSelected(data) {
console.log(data, " 选择的是");
if (data.index == 0) {