From 648a993d14782203ddf6d7ef7329e51e9791d30d Mon Sep 17 00:00:00 2001
From: liuyuan <582976274@qq.com>
Date: Wed, 9 Apr 2025 10:25:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=A1=B9=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                                 |  5 +-
 .../commonComponents/selectGoods.vue          | 20 +++----
 pages/curriculum/list/index.vue               |  7 ++-
 pages/detail/orderLCont.vue                   |  4 +-
 pages/goods/index.vue                         |  8 +--
 pages/goods/order.vue                         | 58 +++++++++----------
 pages/home/index.vue                          |  2 +-
 pages/my/index.vue                            |  2 +-
 pages/my/set.vue                              |  1 +
 pages/wallet/recharge.vue                     |  2 +
 10 files changed, 59 insertions(+), 50 deletions(-)

diff --git a/manifest.json b/manifest.json
index c6e594c..3b9be0f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "心灵空间",
     "appid" : "__UNI__BBBDFD2",
     "description" : "心灵空间",
-    "versionName" : "1.0.01",
-    "versionCode" : 1001,
+    "versionName" : "1.0.11",
+    "versionCode" : 1011,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -71,6 +71,7 @@
                     }
                 },
                 "idfa" : false,
+                "plistcmds" : [ "Delete :NSUserTrackingUsageDescription" ],
                 "privacyDescription" : {
                     "NSPhotoLibraryUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片功能的正常使用",
                     "NSPhotoLibraryAddUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片功能的正常使用",
diff --git a/pages/component/commonComponents/selectGoods.vue b/pages/component/commonComponents/selectGoods.vue
index ad8cc2a..d834414 100644
--- a/pages/component/commonComponents/selectGoods.vue
+++ b/pages/component/commonComponents/selectGoods.vue
@@ -14,15 +14,15 @@
 
 			<view :class="`common_radius_box  goods_box popup_content`">
 				<view class="title title_box">
-					<view class="title_price" v-if="$platform=='android'&&selectGoodsData.isVipPrice==1&&selectGoodsData.vipPrice!=null&&selectGoodsData.vipPrice!=0">
+					<!-- <view class="title_price" v-if="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="$platform=='android'&&selectGoodsData.activityPrice&&selectGoodsData.activityPrice>0">
+					<view class="title_price" v-else-if="selectGoodsData.activityPrice&&selectGoodsData.activityPrice>0">
 						￥{{selectGoodsData.activityPrice}}
 						<text style=" font-weight: normal; padding-left: 15rpx; font-size: 26rpx; color: #999;">活动价</text>
-					</view>
-					<text class="title_price" v-else>
+					</view> -->
+					<text class="title_price">
 						￥{{selectGoodsData.price}}
 					</text>
 					<u-icon
@@ -68,20 +68,20 @@
 					  <view :class="`goods_info `">
 						<view class="name">{{ slotProps.row.productName }}</view>
 						<view class="price">
-							<view class="goods_price" v-if="$platform=='android'&&slotProps.row.isVipPrice==1&&slotProps.row.vipPrice!=null&&slotProps.row.vipPrice!=0">
+							<!-- <view class="goods_price" v-if="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="$platform=='android'&&slotProps.row.activityPrice&&slotProps.row.activityPrice>0">
+							<view class="goods_price" v-else-if="slotProps.row.activityPrice&&slotProps.row.activityPrice>0">
 								￥{{slotProps.row.activityPrice}}
 								<text class="line_text">￥{{slotProps.row.price}}</text>
-							</view>
-							<text v-else>
+							</view> -->
+							<text>
 								￥{{slotProps.row.price}}
 							</text>
-							<text class="goods_text" v-if="$platform=='android'&&slotProps.row.isVipPrice==1&&slotProps.row.vipPrice!=null&&slotProps.row.vipPrice!=0">
+							<!-- <text class="goods_text" v-if="slotProps.row.isVipPrice==1&&slotProps.row.vipPrice!=null&&slotProps.row.vipPrice!=0">
 								VIP优惠
-							</text>
+							</text> -->
 						</view>
 					  </view>
 					</view>
diff --git a/pages/curriculum/list/index.vue b/pages/curriculum/list/index.vue
index 5e08769..f80af38 100644
--- a/pages/curriculum/list/index.vue
+++ b/pages/curriculum/list/index.vue
@@ -125,8 +125,13 @@ export default {
 	onLoad(options) {
 		//清除缓存
 		uni.removeStorageSync('fixed');
+		//针对身心医学的判断
+		if(options.title=='心身医学'&&this.$platform!='android'){
+			this.title = '心身健康科学'
+		}else{
+			this.title = options.title;
+		}
 		
-		this.title = options.title;
 		this.id = options.id;
 		//如果是心理评测
 		if(this.id==75){
diff --git a/pages/detail/orderLCont.vue b/pages/detail/orderLCont.vue
index 6a68f62..b82632d 100644
--- a/pages/detail/orderLCont.vue
+++ b/pages/detail/orderLCont.vue
@@ -153,7 +153,7 @@
               </span>
               <span>￥</span>{{ orderContet.shippingMoney }}
             </view>
-			<view class="orderReal" v-if="orderContet.orderType == 'order'&&orderContet.vipDiscountAmount&&orderContet.vipDiscountAmount>0">
+			<!-- <view class="orderReal" v-if="orderContet.orderType == 'order'&&orderContet.vipDiscountAmount&&orderContet.vipDiscountAmount>0">
 			  <span style="color: red; margin-right: 10rpx; float: left;">VIP专享立减 :
 			  </span>
 			  <span style=" color: red;">-￥{{orderContet.vipDiscountAmount}}</span>
@@ -162,7 +162,7 @@
 			  <span style="color: red; margin-right: 10rpx; float: left;">活动立减 :
 			  </span>
 			  <span style=" color: red;">-￥{{orderContet.districtMoney}}</span>
-			</view>
+			</view> -->
             <view class="orderReal" v-if="orderContet.orderType == 'order'">
               <span style="color: #666; margin-right: 10rpx; float: left">积分 :
               </span>
diff --git a/pages/goods/index.vue b/pages/goods/index.vue
index 243de7e..73d36d0 100644
--- a/pages/goods/index.vue
+++ b/pages/goods/index.vue
@@ -13,8 +13,8 @@
 			<view class="goods_box">
 				<view class="curriulum_title_box">
 					<view v-if="this.options.isMiaosha == 1" class="miaosha_box">
-						<view class="price_box"
-							v-if="$platform=='android'&&curriculumData.isVipPrice==1&&curriculumData.vipPrice!=null&&curriculumData.vipPrice!=0
+						<!-- <view class="price_box"
+							v-if="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">
@@ -44,8 +44,8 @@
 								</text>
 								<text class="xianshimaiosha" v-else-if="curriculumData.activityPrice && curriculumData.activityPrice > 0">活动立减</text>
 							</view>
-						</view>
-						<view class="putong" v-else>
+						</view> -->
+						<view class="putong">
 							<template>
 								<text class="aui-text-danger price">
 									￥{{ curriculumData.price }}
diff --git a/pages/goods/order.vue b/pages/goods/order.vue
index db83d91..c51de70 100644
--- a/pages/goods/order.vue
+++ b/pages/goods/order.vue
@@ -27,24 +27,24 @@
 
 			<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="$platform=='android'&&v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">VIP优惠</text>
+					<!-- <text class="goods_item_vip" v-if="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="$platform=='android'&&v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">
+								<!-- <view class="vip_price" v-if="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="$platform=='android'&&v.activityPrice&&v.activityPrice>0">
+								<text class="price" v-else-if="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>
-								</text>
-								<text v-else>￥{{ v.price }}</text>
+								</text> -->
+								<text>￥{{ v.price }}</text>
 								
 								<view>
 									x 1
@@ -92,13 +92,13 @@
 								<text style="color: #aaa; margin-left: 10rpx">
 									(全部积分：{{ initData.user.jf }})</text>
 							</template>
-							<template v-else-if="v.type == 5">
+							<!-- <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>
+							</template> -->
 							<text v-else>{{ v.text }}</text>
 						</view>
 						<view class="right">
@@ -110,12 +110,12 @@
 							<template v-if="v.type == 3">
 								<text style="color: #fe6035"> -￥{{ jfNumberShow }}</text>
 							</template>
-							<template v-if="v.type == 5">
+							<!-- <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>
+							</template> -->
 						</view>
 					</view>
 
@@ -476,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.$platform=='android'&&this.goodsDataList[0].isVipPrice==1&&
+						if(this.goodsDataList[0].isVipPrice==1&&
 						   this.goodsDataList[0].vipPrice!=null&&
 						   this.goodsDataList[0].vipPrice!=0){
 							await this.getVipDiscountAmount();
-						}else if(this.$platform=='android'&&this.goodsDataList[0].activityPrice&&
+						}else if(this.goodsDataList[0].activityPrice&&
 						  this.goodsDataList[0].activityPrice>0){
 							await this.getDistrictAmount();
 						}else{
@@ -558,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.vipPrice - this.districtAmount + this.freightNum;
+					this.actualPayment = this.totalPrice - this.jfNumber + this.freightNum;
 
 					if (this.actualPayment == 0) {
 						this.isDefaultCurrency = true;
@@ -597,17 +597,17 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
 					},
 				];
 				//如果是活动
-				if(this.$platform=='android'&&this.goodsDataList[0].activityPrice&&this.goodsDataList[0].activityPrice>0&&!this.goodsDataList[0].vipPrice>0){
-					this.priceBreakdownList.push({
-						type: 5,
-					})
-				}
-				//如果是vip
-				if(this.$platform=='android'&&this.goodsDataList[0].isVipPrice==1&&this.goodsDataList[0].vipPrice!=null&&this.goodsDataList[0].vipPrice!=0){
-					this.priceBreakdownList.push({
-						type: 6,
-					})
-				}
+				// if(this.goodsDataList[0].activityPrice&&this.goodsDataList[0].activityPrice>0&&!this.goodsDataList[0].vipPrice>0){
+				// 	this.priceBreakdownList.push({
+				// 		type: 5,
+				// 	})
+				// }
+				// //如果是vip
+				// if(this.goodsDataList[0].isVipPrice==1&&this.goodsDataList[0].vipPrice!=null&&this.goodsDataList[0].vipPrice!=0){
+				// 	this.priceBreakdownList.push({
+				// 		type: 6,
+				// 	})
+				// }
 				
 				var data = {
 					uid: this.userInfo.id,
@@ -753,8 +753,8 @@ 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.vipPrice - that.districtAmount;
-						this.jfNumberMax = that.totalPrice - that.vipPrice - that.districtAmount;
+						this.jfNumber = that.totalPrice;
+						this.jfNumberMax = that.totalPrice;
 					} else {
 						this.jfNumber = this.initData.user.jf;
 						this.jfNumberMax = this.initData.user.jf;
@@ -766,9 +766,9 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
 						that.jfNumberShow = that.jfNumber.toFixed(2);
 						that.actualPayment = that.totalPrice - that.jfNumber;
 					}
-					that.actualPayment = that.actualPayment + that.freightNum - that.vipPrice- that.districtAmount;
+					that.actualPayment = that.actualPayment + that.freightNum;
 				} else {
-					that.actualPayment = that.totalPrice + that.freightNum - that.vipPrice - that.districtAmount;
+					that.actualPayment = that.totalPrice + that.freightNum;
 				}
 
 				if (this.actualPayment == 0 && !this.isShowAddress) {
@@ -856,11 +856,11 @@ import parse from "../../uni_modules/uview-ui/libs/config/props/parse";
 						appName: "xlkj",
 						come: "3",  //3心灵空间
 					}
-					if(this.$platform=='android'&&this.goodsDataList[0].isVipPrice==1&&
+					if(this.goodsDataList[0].isVipPrice==1&&
 					   this.goodsDataList[0].vipPrice!=null&&
 					   this.goodsDataList[0].vipPrice!=0){
 						  data.vipDiscountAmount = this.vipPrice;  //vip
-					}else if(this.$platform=='android'&&this.goodsDataList[0].activityPrice&&
+					}else if(this.goodsDataList[0].activityPrice&&
 						  this.goodsDataList[0].activityPrice>0){
 						data.districtMoney = this.districtAmount;  //活动
 					}
diff --git a/pages/home/index.vue b/pages/home/index.vue
index b9449ac..18a7414 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -66,7 +66,7 @@
 						<view class="miaosha_list">
 							<view class="miaosha_item" @click="goGoodsDetail(v)"
 								v-for="(v, i) in seckillLst">
-								<text class="miaosha_youhui" v-if="$platform=='android'&&v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">VIP优惠</text>
+								<!-- <text class="miaosha_youhui" v-if="$platform=='android'&&v.isVipPrice==1&&v.vipPrice!=null&&v.vipPrice!=0">VIP优惠</text> -->
 								<image class="book_image" :src="v.productImages" mode="aspectFit"></image>
 								<view class="book_name">{{ v.productName }}</view>
 							</view>
diff --git a/pages/my/index.vue b/pages/my/index.vue
index 9da0791..8b6983d 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -23,7 +23,7 @@
 				</view>
 				<view class="userInfoBox">
 					<view class="name">{{ userMes.nickname ? userMes.nickname : "未设置" }}</view>
-					<view class="phone" v-if="userMes.tel">手机号：({{ userMes.tel }})</view>
+					<!-- <view class="phone" v-if="userMes.tel">手机号：({{ userMes.tel }})</view> -->
 					<view class="vip_type" v-if="$platform=='android'&&textList.length>0">
 						<view class="vip_type_item" v-for="(item,index) in textList" :key="index">
 							{{item}}<image src="@/static/icon/chao_vip.png"></image>
diff --git a/pages/my/set.vue b/pages/my/set.vue
index 0a06bc1..a140aa4 100644
--- a/pages/my/set.vue
+++ b/pages/my/set.vue
@@ -197,6 +197,7 @@ export default {
 	async getNewVersion(){
 		// #ifdef APP-PLUS
 		var info = await updata();
+		console.log('info',JSON.stringify(info))
 		if(info.result.code == 0){
 			uni.showToast({
 				title:info.result.message,
diff --git a/pages/wallet/recharge.vue b/pages/wallet/recharge.vue
index 7ddfda8..a9c15de 100644
--- a/pages/wallet/recharge.vue
+++ b/pages/wallet/recharge.vue
@@ -323,6 +323,8 @@ export default {
 				productId: result.payment.productid.slice(1), // 产品id
 				orderId: result.payment.username, // 系统订单号
 				receiptData: result.transactionReceipt, // 苹果返回收据
+				//sandBox: true, //测试数据
+				//body: that.stepsCj.priceTypeId // 充值类型id
 			};
 			$http
 				.request({