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

更新版本提交

Browse Source
This commit is contained in:
liuyuan
2025-04-01 14:26:08 +08:00
parent 3e591df7a6
commit 8f89d802ac
265 changed files with 34137 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -85,10 +85,7 @@
border-radius: 100rpx;
line-height: 70rpx;
text-align: center;
margin-left: 20rpx;
background: linear-gradient(90deg, rgb(254, 96, 53), rgb(239, 18, 36));
color: rgb(255, 255, 255);
}

10
pages/component/commonComponents/selectGoods.vue
View File

@@ -14,11 +14,11 @@
<view :class="`common_radius_box goods_box popup_content`">
<view class="title title_box">
<view class="title_price" v-if="selectGoodsData.isVipPrice==1&&selectGoodsData.vipPrice!=null&&selectGoodsData.vipPrice!=0">
<view class="title_price" v-if="$platform=='android'&&selectGoodsData.isVipPrice==1&&selectGoodsData.vipPrice!=null&&selectGoodsData.vipPrice!=0">
￥{{selectGoodsData.vipPrice}}
<text style=" font-weight: normal; padding-left: 15rpx; font-size: 26rpx;">VIP到手价</text>
</view>
<view class="title_price" v-else-if="selectGoodsData.activityPrice&&selectGoodsData.activityPrice>0">
<view class="title_price" v-else-if="$platform=='android'&&selectGoodsData.activityPrice&&selectGoodsData.activityPrice>0">
￥{{selectGoodsData.activityPrice}}
<text style=" font-weight: normal; padding-left: 15rpx; font-size: 26rpx; color: #999;">活动价</text>
</view>
@@ -68,18 +68,18 @@
<view :class="`goods_info `">
<view class="name">{{ slotProps.row.productName }}</view>
<view class="price">
<view class="goods_price" v-if="slotProps.row.isVipPrice==1&&slotProps.row.vipPrice!=null&&slotProps.row.vipPrice!=0">
<view class="goods_price" v-if="$platform=='android'&&slotProps.row.isVipPrice==1&&slotProps.row.vipPrice!=null&&slotProps.row.vipPrice!=0">
￥{{slotProps.row.vipPrice}}
<text class="line_text">￥{{slotProps.row.price}}</text>
</view>
<view class="goods_price" v-else-if="slotProps.row.activityPrice&&slotProps.row.activityPrice>0">
<view class="goods_price" v-else-if="$platform=='android'&&slotProps.row.activityPrice&&slotProps.row.activityPrice>0">
￥{{slotProps.row.activityPrice}}
<text class="line_text">￥{{slotProps.row.price}}</text>
</view>
<text v-else>
￥{{slotProps.row.price}}
</text>
<text class="goods_text" v-if="slotProps.row.isVipPrice==1&&slotProps.row.vipPrice!=null&&slotProps.row.vipPrice!=0">
<text class="goods_text" v-if="$platform=='android'&&slotProps.row.isVipPrice==1&&slotProps.row.vipPrice!=null&&slotProps.row.vipPrice!=0">
VIP优惠
</text>
</view>

15
pages/curriculum/list/index.vue
View File

@@ -9,12 +9,13 @@
</view>
</z-nav-bar>
<view class="cateList">
<view class="labels_block" v-if="labelsList.length>0" :style="`top: ${45 + statusBarHeight}px;`">
<view class="labels_item"
<view class="labels_block" v-if="id!=75&&labelsList.length>0">
<!-- <view class="labels_block" v-if="labelsList.length>0" :style="`top: ${45 + statusBarHeight}px;`"> -->
<view class="labels_item"
:style="{ width: labelsList.length > 0 ? `${100 / labelsList.length}%` : '100%' }"
v-for="(tabData,tabIndex) in labelsList" :key="tabIndex"
:class="activeTab==tabIndex?'active_tab':''" @click.stop="clickTab(tabData,tabIndex)">
{{tabData.title}} <text class="line-item"></text>
{{tabData.title}}<text class="line-item"></text>
</view>
</view>
<view class="children_block" v-if="childrenList.length>0">
@@ -53,7 +54,7 @@
<text v-if="statusNull" class="text_null">暂无数据</text>
</view>
<view class="xlcp_block" :class="XL_id==78?'xlcp_block_2':''" v-if="statusXLCP">
<view class="xlcp_block" :class="XL_id==78?'xlcp_block_2':''" v-if="statusXLCP" style=" margin-top: 0;">
<view class="form_block" v-if="XL_id==77">
<view class="form_item" v-for="(item,index) in formList" :key="index">
<text class="form_title">{{item.title}}</text>
@@ -288,7 +289,11 @@ export default {
})
.then(res => {
if (res.code == 0) {
this.formList = res.formList;
if(this.$platform=='android'){
this.formList = res.formList;
}else{
this.formList = res.formList.slice(0,2);
}
}
}).catch(e => {

2
pages/goods/index.vue
View File

@@ -14,7 +14,7 @@
<view class="curriulum_title_box">
<view v-if="this.options.isMiaosha == 1" class="miaosha_box">
<view class="price_box"
v-if="curriculumData.isVipPrice==1&&curriculumData.vipPrice!=null&&curriculumData.vipPrice!=0
v-if="$platform=='android'&&curriculumData.isVipPrice==1&&curriculumData.vipPrice!=null&&curriculumData.vipPrice!=0
||curriculumData.activityPrice && curriculumData.activityPrice > 0">
<view class="price_left">
<template v-if="curriculumData.isVipPrice==1&&curriculumData.vipPrice!=null&&curriculumData.vipPrice!=0">

61
pages/goods/order.vue
View File

@@ -27,19 +27,19 @@
<view class="order_top common_radius_box color_shandow goods_box">
<view class="curriulum_title_box goods_item" style=" position: relative;" v-for="(v, i) in goodsDataList">
<text class="goods_item_vip" v-if="v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">VIP优惠</text>
<text class="goods_item_vip" v-if="$platform=='android'&&v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">VIP优惠</text>
<image class="goods_item_img" :src="v.productImages" mode="aspectFit">
</image>
<view class="normal_box">
<view class="normal_box_top">
<view class="curriulum_title">{{ v.productName }} </view>
<view class="price_box">
<view class="vip_price" v-if="v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">
<view class="vip_price" v-if="$platform=='android'&&v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">
<text class="vip_price_jg">￥{{ v.vipPrice }}</text>
<text class="vip_price_text">VIP到手价</text>
<text class="vip_price_line">￥{{ v.price }}</text>
</view>
<text class="price" v-else-if="v.activityPrice&&v.activityPrice>0">
<text class="price" v-else-if="$platform=='android'&&v.activityPrice&&v.activityPrice>0">
<text class="vip_price_jg">￥{{ v.activityPrice }}</text>
<text class="vip_price_text">活动价</text>
<text class="vip_price_line">￥{{ v.price }}</text>
@@ -88,12 +88,18 @@
</image>
<u-icon v-if="v.icon" name="map-fill" color="#018F89" size="20"
style="display: inline-block"></u-icon>
<text :class="v.type==5||v.type==6?'type_text_red':''">{{ v.text }}</text>
<template v-if="v.type == 3">
<text style="color: #aaa; margin-left: 10rpx">
(全部积分：{{ initData.user.jf }})</text>
</template>
<template v-else-if="v.type == 5">
<text class="type_text_red">活动立减</text>
</template>
<template v-else-if="v.type == 6">
<text class="type_text_red">VIP专享立减</text>
</template>
<text v-else>{{ v.text }}</text>
</view>
<view class="right">
<template v-if="v.type == 1"> ￥{{ totalPrice }}</template>
@@ -104,9 +110,12 @@
<template v-if="v.type == 3">
<text style="color: #fe6035"> -￥{{ jfNumberShow }}</text>
</template>
<template v-if="v.type == 5||v.type == 6">
<template v-if="v.type == 5">
<text class="type_text_red">-￥{{districtAmount}}</text>
</template>
<template v-if="v.type == 6">
<text class="type_text_red">-￥{{vipPrice}}</text>
</template>
</view>
</view>
@@ -374,6 +383,7 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
}, ],
//立减金额
districtAmount: 0,
vipPrice: 0,
orderNumber: 1, //商品数量
};
},
@@ -466,11 +476,11 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
if (res.code == 0) {
this.goodsDataList = res.shopProductList;
//请求VIP还是活动的逻辑
if(this.goodsDataList[0].isVipPrice==1&&
if(this.$platform=='android'&&this.goodsDataList[0].isVipPrice==1&&
this.goodsDataList[0].vipPrice!=null&&
this.goodsDataList[0].vipPrice!=0){
await this.getVipDiscountAmount();
}else if(this.goodsDataList[0].activityPrice&&
}else if(this.$platform=='android'&&this.goodsDataList[0].activityPrice&&
this.goodsDataList[0].activityPrice>0){
await this.getDistrictAmount();
}else{
@@ -500,7 +510,7 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
})
.then(async (res) => {
if (res.code == 0) {
this.districtAmount = res.discountAmount;
this.vipPrice = res.discountAmount;
await this.initPrepareOrder();
}
});
@@ -548,7 +558,7 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
this.jfNumberShow = this.jfNumber.toFixed(2);
}
this.actualPayment = this.totalPrice - this.jfNumber -this.districtAmount + this.freightNum;
this.actualPayment = this.totalPrice - this.jfNumber - this.vipPrice - this.districtAmount + this.freightNum;
if (this.actualPayment == 0) {
this.isDefaultCurrency = true;
@@ -586,22 +596,19 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
type: 2,
},
];
//如果是vip
if(this.goodsDataList[0].activityPrice&&this.goodsDataList[0].activityPrice>0){
//如果是活动
if(this.$platform=='android'&&this.goodsDataList[0].activityPrice&&this.goodsDataList[0].activityPrice>0&&!this.goodsDataList[0].vipPrice>0){
this.priceBreakdownList.push({
text: "活动立减",
imgUrl: "",
type: 5,
})
}
//如果是vip
if(this.goodsDataList[0].isVipPrice==1&&this.goodsDataList[0].vipPrice!=null&&this.goodsDataList[0].vipPrice!=0){
if(this.$platform=='android'&&this.goodsDataList[0].isVipPrice==1&&this.goodsDataList[0].vipPrice!=null&&this.goodsDataList[0].vipPrice!=0){
this.priceBreakdownList.push({
text: "VIP专享立减",
imgUrl: "",
type: 6,
})
}
var data = {
uid: this.userInfo.id,
productList: this.goodsDataList.map((e) => {
@@ -746,22 +753,22 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
if (!this.isShowAddress) {
if (this.initData.user.jf >= that.totalPrice) {
this.jfNumber = that.totalPrice - that.districtAmount;
this.jfNumberMax = that.totalPrice - that.districtAmount;
this.jfNumber = that.totalPrice - that.vipPrice - that.districtAmount;
this.jfNumberMax = that.totalPrice - that.vipPrice - that.districtAmount;
} else {
this.jfNumber = this.initData.user.jf;
this.jfNumberMax = this.initData.user.jf;
}
if (that.jfNumber == 0 || that.jfNumber == null) {
that.jfNumberShow = "0.00";
that.actualPayment = that.totalPrice - that.districtAmount;
that.actualPayment = that.totalPrice;
} else {
that.jfNumberShow = that.jfNumber.toFixed(2);
that.actualPayment = that.totalPrice - that.jfNumber;
}
that.actualPayment = that.actualPayment + that.freightNum - that.districtAmount;
that.actualPayment = that.actualPayment + that.freightNum - that.vipPrice- that.districtAmount;
} else {
that.actualPayment = that.totalPrice + that.freightNum - that.districtAmount;
that.actualPayment = that.totalPrice + that.freightNum - that.vipPrice - that.districtAmount;
}
if (this.actualPayment == 0 && !this.isShowAddress) {
@@ -849,11 +856,11 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
appName: "xlkj",
come: "3", //3心灵空间
}
if(this.goodsDataList[0].isVipPrice==1&&
if(this.$platform=='android'&&this.goodsDataList[0].isVipPrice==1&&
this.goodsDataList[0].vipPrice!=null&&
this.goodsDataList[0].vipPrice!=0){
data.vipDiscountAmount = this.districtAmount; //vip
}else if(this.goodsDataList[0].activityPrice&&
data.vipDiscountAmount = this.vipPrice; //vip
}else if(this.$platform=='android'&&this.goodsDataList[0].activityPrice&&
this.goodsDataList[0].activityPrice>0){
data.districtMoney = this.districtAmount; //活动
}
@@ -1369,14 +1376,14 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
right: 20rpx;
.number {
font-size: 28rpx;
font-size: 26rpx;
margin-right: 15rpx;
margin-top: 5rpx;
}
.price {
.total {
font-size: 38rpx;
font-size: 34rpx;
color: red;
}
}

9
pages/home/index.vue
View File

@@ -42,7 +42,8 @@
<view class="cate_item_border">
<image :src="item.icon"></image>
</view>
<view class="cate_item_name">{{ item.title }}</view>
<view class="cate_item_name" v-if="$platform!='android'&&index==2">心身健康科学</view>
<view class="cate_item_name" v-else>{{ item.title }}</view>
</view>
</view>
</scroll-view>
@@ -130,7 +131,7 @@ export default {
// imgUrl: require("@/static/icon/home_bg2.png")
// },
// {
// name: "VIP情况",
// name: "VIP办理",
// url: "/pages/vip/index",
// imgUrl: require("@/static/icon/home_bg3.png")
// },
@@ -158,7 +159,7 @@ export default {
imgUrl: require("@/static/icon/home_bg2.png")
},
{
name: "VIP情况",
name: "VIP办理",
url: "/pages/vip/index",
imgUrl: require("@/static/icon/home_bg3.png")
},
@@ -495,7 +496,7 @@ export default {
.cate_item_name {
margin-top: 15rpx;
font-size: 26rpx;
font-size: 24rpx;
line-height: 34rpx;
text-align: center;
color: #fff;

2
pages/my/aboutUs.vue
View File

@@ -4,7 +4,7 @@
<view class="APPinfo">
<image src="@/static/logo.png" mode="" style="height: 150rpx; width: 150rpx; margin: 0 auto;"></image><br/>
<p>版本信息：{{versionName}},{{versionCode}}</p>
<p v-if="versionCode">版本信息：{{versionName}},{{versionCode}}</p>
</view>
<view class="telInfo">

2
pages/vip/index.vue
View File

@@ -1,6 +1,6 @@
<template>
<view class="commonPageBox">
<z-nav-bar title="VIP情况"></z-nav-bar>
<z-nav-bar title="VIP办理"></z-nav-bar>
<view class="vip_block">
<view class="vip_item"
:class="[item.type==1||item.type==2?'vip_item_special':'',

13
pages/visitor/detail.vue
View File

@@ -220,8 +220,17 @@
},
//登录
toLogin(){
uni.navigateTo({
url: '/pages/user/login'
uni.showModal({
title: '提示',
content: '为了方便您后期用不同的设备查阅订购的记录，请先完成登录或注册。',
confirmText: '确认',
success(res){
if (res.confirm) {
uni.navigateTo({
url: '/pages/user/login'
})
}
}
})
}
}

58
pages/visitor/goods.vue
View File

@@ -12,20 +12,10 @@
<view class="goods_box">
<view class="curriulum_title_box">
<view v-if="this.options.isMiaosha == 1" class="miaosha_box">
<view class="miaosha_box">
<view class="price_box">
<view class="price_left">
<template v-if="
curriculumData.activityPrice &&
curriculumData.activityPrice > 0
">
<text class="aui-text-danger price">
￥{{ curriculumData.activityPrice }}
</text>
<text class="price original_price">原价：￥{{ curriculumData.price }}
</text>
</template>
<template v-else>
<template>
<text class="aui-text-danger price">
￥{{ curriculumData.price }}
</text>
@@ -34,42 +24,11 @@
<view class="price original_price sales_number">已售 {{ curriculumData.sumSales }}件
</view>
</view>
<view class="xianshimaiosha_box">
<text class="xianshimaiosha">秒杀商品</text>
</view>
</view>
<view class="curriulum_title">{{ curriculumData.productName }}
</view>
</view>
<view v-else class="normal_box">
<view class="price_box">
<template v-if="
curriculumData.activityPrice &&
curriculumData.activityPrice > 0
">
<text class="aui-text-danger price">
￥{{ curriculumData.activityPrice }}
</text>
<text class="price original_price">原价：￥{{ curriculumData.price }}
</text>
</template>
<template v-else>
<text class="aui-text-danger price">
￥{{ curriculumData.price }}
</text>
</template>
<text class="price original_price sales_number" style="float: right">已售
{{ curriculumData.sumSales }}件
</text>
</view>
<view class="curriulum_title" style="margin-top: 40rpx">{{ curriculumData.productName }}
</view>
</view>
<view class="price_box"> </view>
</view>
</view>
@@ -248,8 +207,17 @@
});
},
toLogin(){
uni.navigateTo({
url: '/pages/user/login'
uni.showModal({
title: '提示',
content: '为了方便您后期用不同的设备查阅订购的记录，请先完成登录或注册。',
confirmText: '确认',
success(res){
if (res.confirm) {
uni.navigateTo({
url: '/pages/user/login'
})
}
}
})
}
},

20
pages/visitor/index.vue
View File

@@ -9,7 +9,8 @@
<view class="cate_item_border">
<image :src="item.icon"></image>
</view>
<view class="cate_item_name">{{ item.title }}</view>
<view class="cate_item_name" v-if="$platform!='android'&&index==2">心身健康科学</view>
<view class="cate_item_name" v-else>{{ item.title }}</view>
</view>
</view>
</scroll-view>
@@ -152,6 +153,21 @@ export default {
},
//课程列表
handleClickCate(item){
if(item.title=='心理测评'){
uni.showModal({
title: '提示',
content: '为了方便您正常查阅心理测评，请先完成登录或注册。',
confirmText: '确认',
success(res){
if (res.confirm) {
uni.navigateTo({
url: '/pages/user/login'
})
}
}
})
return
}
uni.navigateTo({
url: `/pages/visitor/list?title=${item.title}&id=${item.id}`,
});
@@ -265,7 +281,7 @@ export default {
.cate_item_name {
margin-top: 15rpx;
font-size: 26rpx;
font-size: 24rpx;
line-height: 34rpx;
text-align: center;
color: #fff;

13
pages/visitor/list.vue
View File

@@ -76,8 +76,17 @@ export default {
});
},
toLogin(){
uni.navigateTo({
url: '/pages/user/login'
uni.showModal({
title: '提示',
content: '为了方便您后期用不同的设备查阅订购的记录，请先完成登录或注册。',
confirmText: '确认',
success(res){
if (res.confirm) {
uni.navigateTo({
url: '/pages/user/login'
})
}
}
})
}
}

2
pages/wallet/recharge.vue
View File

@@ -279,7 +279,7 @@ export default {
});
const that = this;
let IAPOrders = [];
IAPOrders.push('Z' + that.stepsCj.priceTypeId);
IAPOrders.push('s' + that.stepsCj.priceTypeId);
// 新建订单
uni.showLoading({
title: "正在创建订单",