tijiao

2025-04-15 14:46:03 +08:00
parent 85edeae7db
commit 0ea678deec
16 changed files with 2250 additions and 2623 deletions
--- a/components/buyPupFudu.vue
+++ b/components/buyPupFudu.vue
@@ -0,0 +1,202 @@
+<template>
+	<view>
+		<u-popup key="1" :show="pricespop" :round="10" @close="closePup">
+			<view class="proListPrice" v-if="proPriceList.length > 0">
+				<view class="title">
+					请选择
+				</view>
+				<view class="list">
+					<view :class="['item',curProId == index ? 'active' : '']"
+						v-for="(item,index) in proPriceList" :key="index" @click="choosePrice(item,index)">
+						{{item.productName}} - ￥{{item.price}}
+					</view>
+				</view>
+				<view class="tbn flexbox" style="padding-bottom: 20px;">
+					<view class="saveBtnss buybtn flexbox" @click="oprate('buy')">
+						<u-icon name="bag" color="#fff" size="28"></u-icon>
+						<text>立即购买</text>
+					</view>
+					<!-- <view class="saveBtnss gouwuche flexbox" @click="oprate('gouwuche')">
+						<uni-icons type="cart" size="28" style="color: #666;"></uni-icons>
+						<text>加入购物车</text>
+					</view> -->
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"buyPup",
+		props:['proPriceList'],
+		data() {
+			return {
+				pricespop:true,
+				curProId:null,
+				curPro:{}
+			};
+		},methods:{
+			closePup() {
+				this.pricespop = false
+				this.$emit('closePup')
+				
+			},
+			choosePrice(item,index) {
+				console.log(index, 'choosePrice')
+				this.curProId = index
+				this.curPro = item
+			},
+			oprate(val){
+				if(this.curProId==null){
+					uni.showToast({
+						title:'请选择您的课程',
+						icon:'none'
+					})
+					return
+				}
+				if(val=='buy'){
+					console.log('直接购买');
+					this.$emit('oprate',{name:val,item:this.curPro,index:this.curProId})
+				}else if(val == 'gouwuche'){
+					console.log('加入购物车');
+					this.$emit('oprate',{name:val,item:this.curPro,index:this.curProId})
+				}
+				this.closePup()
+			}
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import '@/style/mixin.scss';
+	.flexbox {
+		display: flex;
+	}
+	.saveBtn {
+		align-items: center;
+		justify-content: center;
+		height: 80rpx;
+		background-color: #00d8df;
+		// width: 46%;
+		overflow: hidden;
+		border-radius: 30rpx;
+	
+		text {
+			padding-left: 10rpx;
+			font-size: 28rpx;
+			color: #fff;
+		}
+	}
+	
+	.vipBtn {
+		@include theme("vipbtnbg");
+		border-radius: 100rpx;
+		justify-content: center;
+		width: 150px;
+		color: #fff;
+		margin: 10rpx auto;
+	}
+	
+	.buyBox {
+		// position: fixed;
+		// z-index: 2;
+		// bottom: 100rpx;
+		// left: 0;
+		@include pleft_right(4px);
+		// @include mshadow(10px, 1);
+		padding: 20rpx 10rpx;
+		width: 100%;
+		font-size: 28rpx;
+		flex-wrap: wrap;
+		background-image: linear-gradient(60deg, #e0e9f6 0%,#ece6fa 30%,#d7e8f0 60%, #fff 100%);
+		// background: rgba(255, 255, 255, 0.9);
+	
+		.item {
+			width: 100%;
+			text-align: center; line-height: 70rpx !important;
+	
+		}
+	
+		.tbn {
+			align-items: center;
+		}
+	
+		.buybtn {
+			color: #fff;
+		}
+	}
+	.proListPrice {
+		text-align: center;
+
+		.title {
+			font-size: 28rpx;
+			margin: 10px 0;
+		}
+
+		.list {
+			padding: 0 10px;
+			padding-bottom: 20rpx;
+
+			.item {
+				font-size: 26rpx;
+				color: #333;
+				margin-bottom: 10rpx;
+				padding-top:20rpx ;
+				padding-bottom:20rpx ;
+				line-height:40rpx;
+				border-radius: 50rpx;
+				border: 1px solid #eee;
+			}
+
+			.item.active {
+				color: $themeColor;
+				border: 1px solid $themeColor;
+			}
+
+			.item:last-child {
+				// border-bottom: none
+			}
+		}
+
+		.tbn {
+			justify-content: center;
+		}
+
+		.buybtn { padding: 0 20rpx;
+			background-color: #00d8df;
+			margin: 0;
+			margin-right: 20rpx;
+
+			text {
+				color: #fff;
+			}
+		}
+
+		.saveBtnss {
+			align-items: center;
+			justify-content: center;
+			height: 80rpx;
+
+			// width: 46%;
+			overflow: hidden;
+			border-radius: 50rpx;
+
+			text {
+				padding-left: 10rpx;
+				font-size: 28rpx;
+
+			}
+		}
+
+		.gouwuche {
+			border: 1px solid #666;
+			padding-right: 20rpx;
+
+			text {
+				// color: #fff;
+			}
+		}
+	}
+</style>
--- a/manifest.json
+++ b/manifest.json
@@ -1,61 +1,59 @@
 {
-    "name" : "吴门医述",
-    "appid" : "__UNI__C7475A8",
-    "description" : "吴门医述",
-    "networkTimeout" : {
-        "request" : 15000
+	"name": "吴门医述",
+	"appid": "__UNI__C7475A8",
+	"description": "吴门医述",
+	"networkTimeout": {
+		"request": 15000
 	},
-    "transformPx" : false,
-    "icons" : [
-        {
-            "sizes" : "分辨率，192x192",
-            "src" : "图片路径"
-        }
-    ],
-    "versionName" : "2.0.04",
-    "versionCode" : 2004,
-    "app-plus" : {
-        "nvueCompiler" : "uni-app",
-        "compatible" : {
-            "ignoreVersion" : true
+	"transformPx": false,
+	"icons": [{
+		"sizes": "分辨率，192x192",
+		"src": "图片路径"
+	}],
+	"versionName": "2.0.05",
+	"versionCode": 2005,
+	"app-plus": {
+		"nvueCompiler": "uni-app",
+		"compatible": {
+			"ignoreVersion": true
 		},
-        "screenOrientation" : [
+		"screenOrientation": [
 			"portrait-primary",
 			"portrait-secondary",
 			"landscape-primary",
 			"landscape-secondary"
 		],
-        "privacy" : {
-            "prompt" : "template",
-            "template" : {
-                "title" : "用户协议和隐私政策",
-                "message" : "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href='https://wumen.taihumed.com/agreement.html'>《用户协议》</a>和<a href='https://wumen.taihumed.com/privacy.html'>《隐私协议》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
-                "buttonAccept" : "同意",
-                "buttonRefuse" : "暂不同意"
+		"privacy": {
+			"prompt": "template",
+			"template": {
+				"title": "用户协议和隐私政策",
+				"message": "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href='https://wumen.taihumed.com/agreement.html'>《用户协议》</a>和<a href='https://wumen.taihumed.com/privacy.html'>《隐私协议》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+				"buttonAccept": "同意",
+				"buttonRefuse": "暂不同意"
 			}
 		},
-        "modules" : {
-            "Payment" : {},
-            "Share" : {},
-            "Camera" : {},
-            "OAuth" : {},
-            "VideoPlayer" : {}
+		"modules": {
+			"Payment": {},
+			"Share": {},
+			"Camera": {},
+			"OAuth": {},
+			"VideoPlayer": {}
 		},
-        "distribute" : {
-            "apple" : {
-                "devices" : "universal"
+		"distribute": {
+			"apple": {
+				"devices": "universal"
 			},
 			// "UIBackgroundModes" : [ "audio" ]
-            "android" : {
-                "permissionPhoneState" : {
-                    "request" : "none",
-                    "prompt" : "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
+			"android": {
+				"permissionPhoneState": {
+					"request": "none",
+					"prompt": "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
 				},
-                "permissionExternalStorage" : {
-                    "request" : "none",
-                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+				"permissionExternalStorage": {
+					"request": "none",
+					"prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
 				},
-                "permissions" : [
+				"permissions": [
 					"<uses-feature android:name=\"android.hardware.camera\"/>",
 					"<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
 					"<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
@@ -82,192 +80,191 @@
 					"<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
 					"<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
 				],
-                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ],
-                "minSdkVersion" : 21,
-                "targetSdkVersion" : 30,
-                "schemes" : "medicine"
+				"abiFilters": ["armeabi-v7a", "arm64-v8a", "x86"],
+				"minSdkVersion": 21,
+				"targetSdkVersion": 30,
+				"schemes": "medicine"
 			},
-            "sdkConfigs" : {
-                "ad" : {},
-                "maps" : {},
-                "share" : {
-                    "weixin" : {
-                        "appid" : "wx6b17b40171dea988",
-                        "UniversalLinks" : "https://verification.nuttyreading.com/uni-universallinks/__UNI__C7475A8/"
+			"sdkConfigs": {
+				"ad": {},
+				"maps": {},
+				"share": {
+					"weixin": {
+						"appid": "wx6b17b40171dea988",
+						"UniversalLinks": "https://verification.nuttyreading.com/uni-universallinks/__UNI__C7475A8/"
 					}
 				},
-                "payment" : {
-                    "alipay" : {
-                        "__platform__" : [ "ios", "android" ]
+				"payment": {
+					"alipay": {
+						"__platform__": ["ios", "android"]
 					},
-                    "appleiap" : {},
-                    "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx6b17b40171dea988",
-                        "UniversalLinks" : "https://verification.nuttyreading.com/uni-universallinks/__UNI__C7475A8/"
+					"appleiap": {},
+					"weixin": {
+						"__platform__": ["ios", "android"],
+						"appid": "wx6b17b40171dea988",
+						"UniversalLinks": "https://verification.nuttyreading.com/uni-universallinks/__UNI__C7475A8/"
 					}
 				},
-                "oauth" : {},
-                "push" : {}
+				"oauth": {},
+				"push": {}
 			},
-            "splashscreen" : {
-                "iosStyle" : "common",
-                "androidStyle" : "default",
-                "useOriginalMsgbox" : true
+			"splashscreen": {
+				"iosStyle": "common",
+				"androidStyle": "default",
+				"useOriginalMsgbox": true
 			},
-            "ios" : {
-                "dSYMs" : false,
+			"ios": {
+				"dSYMs": false,
 				// "UIBackgroundModes" : [ "audio" ], // 背景播放音乐
-                "capabilities" : {
-                    "entitlements" : {
-                        "com.apple.developer.associated-domains" : [ "applinks:verification.nuttyreading.com" ]
+				"capabilities": {
+					"entitlements": {
+						"com.apple.developer.associated-domains": ["applinks:verification.nuttyreading.com"]
 					}
 				},
-                "idfa" : false,
-                "urltypes" : "medicine",
-                "urlschemewhitelist" : "nuttyreading,zmzm",
-                "privacyDescription" : {
-                    "NSPhotoLibraryUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用",
-                    "NSCameraUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用",
-                    "NSPhotoLibraryAddUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用"
+				"idfa": false,
+				"urltypes": "medicine",
+				"urlschemewhitelist": "nuttyreading,zmzm",
+				"privacyDescription": {
+					"NSPhotoLibraryUsageDescription": "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用",
+					"NSCameraUsageDescription": "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用",
+					"NSPhotoLibraryAddUsageDescription": "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用"
 				}
 			},
-            "icons" : {
-                "android" : {
-                    "hdpi" : "unpackage/res/icons/72x72.png",
-                    "xhdpi" : "unpackage/res/icons/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+			"icons": {
+				"android": {
+					"hdpi": "unpackage/res/icons/72x72.png",
+					"xhdpi": "unpackage/res/icons/96x96.png",
+					"xxhdpi": "unpackage/res/icons/144x144.png",
+					"xxxhdpi": "unpackage/res/icons/192x192.png"
 				},
-                "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
-                    "ipad" : {
-                        "app" : "unpackage/res/icons/76x76.png",
-                        "app@2x" : "unpackage/res/icons/152x152.png",
-                        "notification" : "unpackage/res/icons/20x20.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons/167x167.png",
-                        "settings" : "unpackage/res/icons/29x29.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "spotlight" : "unpackage/res/icons/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+				"ios": {
+					"appstore": "unpackage/res/icons/1024x1024.png",
+					"ipad": {
+						"app": "unpackage/res/icons/76x76.png",
+						"app@2x": "unpackage/res/icons/152x152.png",
+						"notification": "unpackage/res/icons/20x20.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"proapp@2x": "unpackage/res/icons/167x167.png",
+						"settings": "unpackage/res/icons/29x29.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"spotlight": "unpackage/res/icons/40x40.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png"
 					},
-                    "iphone" : {
-                        "app@2x" : "unpackage/res/icons/120x120.png",
-                        "app@3x" : "unpackage/res/icons/180x180.png",
-                        "notification@2x" : "unpackage/res/icons/40x40.png",
-                        "notification@3x" : "unpackage/res/icons/60x60.png",
-                        "settings@2x" : "unpackage/res/icons/58x58.png",
-                        "settings@3x" : "unpackage/res/icons/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+					"iphone": {
+						"app@2x": "unpackage/res/icons/120x120.png",
+						"app@3x": "unpackage/res/icons/180x180.png",
+						"notification@2x": "unpackage/res/icons/40x40.png",
+						"notification@3x": "unpackage/res/icons/60x60.png",
+						"settings@2x": "unpackage/res/icons/58x58.png",
+						"settings@3x": "unpackage/res/icons/87x87.png",
+						"spotlight@2x": "unpackage/res/icons/80x80.png",
+						"spotlight@3x": "unpackage/res/icons/120x120.png"
 					}
 				}
 			}
 		},
-        "compilerVersion" : 3,
-        "nvueLaunchMode" : "fast",
-        "splashscreen" : {
-            "alwaysShowBeforeRender" : false
+		"compilerVersion": 3,
+		"nvueLaunchMode": "fast",
+		"splashscreen": {
+			"alwaysShowBeforeRender": false
 		},
-        "nativePlugins" : {},
-        "uniStatistics" : {
-            "enable" : true
+		"nativePlugins": {},
+		"uniStatistics": {
+			"enable": true
 		},
-        "safearea" : {
+		"safearea": {
 			//安全区域配置，仅iOS平台生效  
-            "bottom" : {
+			"bottom": {
 				// 底部安全区域配置  
-                "offset" : "none" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none"  
+				"offset": "none" // 底部安全区域偏移，"none"表示不空出安全区域，"auto"自动计算空出安全区域，默认值为"none"  
 			}
 		}
 	},
 	// 5+App特有相关
-    "quickapp" : {},
+	"quickapp": {},
 	// 快应用特有相关
-    "mp-weixin" : {
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : true,
-            "postcss" : true,
-            "minified" : true
+	"mp-weixin": {
+		"setting": {
+			"urlCheck": false,
+			"es6": true,
+			"postcss": true,
+			"minified": true
 		},
-        "usingComponents" : true,
-        "appid" : "wxd3ba52b7661b36be",
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+		"usingComponents": true,
+		"appid": "wxd3ba52b7661b36be",
+		"permission": {
+			"scope.userLocation": {
+				"desc": "你的位置信息将用于小程序位置接口的效果展示"
 			}
 		},
-        "uniStatistics" : {
-            "enable" : true
+		"uniStatistics": {
+			"enable": true
 		}
 	},
-    "h5" : {
-        "template" : "template.h5.html",
-        "router" : {
-            "mode" : "hash",
-            "base" : "/uniappDemo/"
+	"h5": {
+		"template": "template.h5.html",
+		"router": {
+			"mode": "hash",
+			"base": "/uniappDemo/"
 		},
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
+		"optimization": {
+			"treeShaking": {
+				"enable": true
 			}
 		},
-        "uniStatistics" : {
-            "enable" : true
+		"uniStatistics": {
+			"enable": true
 		}
 	},
-    "_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274",
-    "uniStatistics" : {
-        "version" : "2",
-        "enable" : true
+	"_spaceID": "mp-3614b80b-2d75-4462-a481-4998f8187274",
+	"uniStatistics": {
+		"version": "2",
+		"enable": true
 	},
-    "mp-alipay" : {
-        "uniStatistics" : {
-            "enable" : true
+	"mp-alipay": {
+		"uniStatistics": {
+			"enable": true
 		}
 	},
-    "mp-baidu" : {
-        "uniStatistics" : {
-            "enable" : true
+	"mp-baidu": {
+		"uniStatistics": {
+			"enable": true
 		}
 	},
-    "mp-jd" : {
-        "uniStatistics" : {
-            "enable" : true
+	"mp-jd": {
+		"uniStatistics": {
+			"enable": true
 		}
 	},
-    "mp-kuaishou" : {
-        "uniStatistics" : {
-            "enable" : true
+	"mp-kuaishou": {
+		"uniStatistics": {
+			"enable": true
 		}
 	},
-    "mp-lark" : {
-        "uniStatistics" : {
-            "enable" : true
+	"mp-lark": {
+		"uniStatistics": {
+			"enable": true
 		}
 	},
-    "mp-qq" : {
-        "uniStatistics" : {
-            "enable" : true
+	"mp-qq": {
+		"uniStatistics": {
+			"enable": true
 		}
 	},
-    "mp-toutiao" : {
-        "uniStatistics" : {
-            "enable" : true
+	"mp-toutiao": {
+		"uniStatistics": {
+			"enable": true
 		}
 	},
-    "quickapp-webview-huawei" : {
-        "uniStatistics" : {
-            "enable" : true
+	"quickapp-webview-huawei": {
+		"uniStatistics": {
+			"enable": true
 		}
 	},
-    "quickapp-webview-union" : {
-        "uniStatistics" : {
-            "enable" : true
+	"quickapp-webview-union": {
+		"uniStatistics": {
+			"enable": true
 		}
 	}
 }
 // 小程序特有相关
-
--- a/pages/bookShop/orderLCont.vue
+++ b/pages/bookShop/orderLCont.vue
@@ -237,6 +237,35 @@
          </view>

          <view class="order_item" style="">
+            <view
+              class="orderReal"
+              v-if="orderContet.orderStatus != 0"
+              style="margin-bottom: 20rpx"
+            >
+              <span style="color: #666; margin-right: 10rpx; float: left"
+                >实付款 :
+              </span>
+              <b v-if="orderContet.orderType == 'point'" style="color: #dd3c0c"
+                >￥ {{ orderContet.bookBuyConfigEntity.realMoney }}</b
+              >
+              <b style="color: #dd3c0c" v-else>
+                <template v-if="orderContet.realMoney > 0">
+                  ￥{{ orderContet.realMoney }}
+                </template>
+                <text
+                  style="margin: 0 4rpx"
+                  v-if="
+                    orderContet.realMoney > 0 && orderContet.jfDeduction > 0
+                  "
+                >
+                  +
+                </text>
+
+                <text v-if="orderContet.jfDeduction > 0"
+                  >{{ orderContet.jfDeduction }} 积分</text
+                ></b
+              >
+            </view>
            <view class="orderallpri">
              <span style="color: #666; margin-right: 10rpx; float: left"
                >商品总价 :
@@ -302,18 +331,6 @@
                >￥ {{ orderContet.jfDeduction }}</span
              >
            </view>
-
-            <view class="orderReal" v-if="orderContet.orderStatus != 0">
-              <span style="color: #666; margin-right: 10rpx; float: left"
-                >实付款 :
-              </span>
-              <b v-if="orderContet.orderType == 'point'" style="color: #dd3c0c"
-                >￥ {{ orderContet.bookBuyConfigEntity.realMoney }}</b
-              >
-              <b style="color: #dd3c0c"
-                ><span>￥</span>{{ orderContet.realMoney }}</b
-              >
-            </view>
          </view>
          <view class="order_item">
            <view class="orderYunf">
@@ -343,7 +360,9 @@
            <view
              class="orderReal"
              v-if="
-                orderContet.orderStatus >= 1 && orderContet.orderStatus != 5&& orderContet.paymentDate
+                orderContet.orderStatus >= 1 &&
+                orderContet.orderStatus != 5 &&
+                orderContet.paymentDate
              "
            >
              <span style="color: #666; margin-right: 10rpx; float: left"
@@ -353,12 +372,7 @@
                orderContet.paymentDate
              }}</text>
            </view>
-            <view
-              class="orderReal"
-              v-if="
-                orderContet.paymentMethod
-              "
-            >
+            <view class="orderReal" v-if="orderContet.paymentMethod">
              <span style="color: #666; margin-right: 10rpx; float: left"
                >付款方式 :
              </span>
@@ -372,20 +386,27 @@
                <span style="color: #666" v-if="orderContet.paymentMethod == 3"
                  >苹果支付</span
                >
-                <span style="color: #666" v-if="orderContet.paymentMethod == 4"
+                <span style="color: #666" v-if="orderContet.paymentMethod == 4">
+                  <template
+                    v-if="
+                      orderContet.orderType == 'point' &&
+                      orderContet.bookBuyConfigEntity.realMoney > 0
+                    "
+                  >
+                    天医币支付<text v-if="orderContet.jfDeduction > 0"
+                      >&nbsp;+ 积分抵扣</text
                    >
-                  
-                  <template v-if="orderContet.orderType == 'point'&&orderContet.bookBuyConfigEntity.realMoney>0">
-天医币支付<text v-if="orderContet.jfDeduction>0">&nbsp;+ 积分抵扣</text>
                  </template>
                  <template v-else-if="orderContet.realMoney">
-                    天医币支付 <text v-if="orderContet.jfDeduction>0">&nbsp;+ 积分抵扣</text>
+                    天医币支付
+                    <text v-if="orderContet.jfDeduction > 0"
+                      >&nbsp;+ 积分抵扣</text
+                    >
                  </template>
-                 <template v-else-if="orderContet.jfDeduction>0">
-积分抵扣
+                  <template v-else-if="orderContet.jfDeduction > 0">
+                    积分抵扣
                  </template>
-                  </span
-                ></text
+                </span></text
              >
            </view>
          </view>
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
--- a/pages/course/courseDetail.vue
+++ b/pages/course/courseDetail.vue
@@ -207,7 +207,7 @@
 									<!-- 实际购买课程到期时间 -->
 									<text style="line-height: 50rpx;">课程有效期截止到：{{librayList[curIndex].endTime}} </text>
 									<!-- 自己买的可以续费 -->
-									<text class="xufeiBtn" @click="handleClickGetGoodsList(librayList[curIndex])">续费</text>								
+									<text class="xufeiBtn" @click="goNewPay(librayList[curIndex])">续费</text>								
 								</template>
 							</view>
 						</view>
--- a/pages/course/myCourse.vue
+++ b/pages/course/myCourse.vue
@@ -135,7 +135,7 @@
 		<!-- 评论弹出 -->
 		<public-module></public-module>
 		<tree-list ref="treeList" v-if="treeListVisible" @clickCourseInfo="clickCourseInfo"></tree-list>
-		<buy-pup v-if="pricespop" :proPriceList="proPriceList" @closePup="closePup" @oprate="oprate"></buy-pup>
+		<buy-pup-fudu v-if="pricespop" :proPriceList="proPriceList" @closePup="closePup" @oprate="oprate"></buy-pup-fudu>
 		<z-navigation></z-navigation>
 		<!-- <music-play :playData="playData"></music-play> -->
 	</view>
@@ -144,7 +144,7 @@

 <script>
 	// import musicPlay from '@/components/music.vue'
-	import buyPup from '@/components/buyPup.vue'
+	import buyPupFudu from '@/components/buyPupFudu.vue'
 	import treeList from '@/components/tagTree.vue'
 	import commentsList from '@/components/commentsList.vue'
 	import emojiList1 from '../../bkhumor-emojiplus/emoji/biaoqin.js'
@@ -276,7 +276,7 @@
 			// musicPlay
 			emotion,
 			treeList,
-			buyPup
+			buyPupFudu
 			// commentsList

 		},
@@ -285,7 +285,7 @@
 			oprate(data){
 				console.log(data,'得到的内容')
 				if(data.name == 'buy'){
-					this.buy(data.item)
+					this.buy(data.item,data.index)
 				}else if(data.name == 'gouwuche'){
 					this.addCart(data.item)
 				}
@@ -412,7 +412,7 @@
 				}
 			},
 			// 直接购买
-			buy(val){
+			buy(val,index){
 				var mynavData = JSON.stringify({
 			        goods: [
 			          {
@@ -423,7 +423,8 @@
 			            goodsType: val.goodsType,
 			          },
 			        ],
-			
+			isFudu: true,
+					fuduId: val.catalogueId,
 			        navTitle: val.productName,
 			        title: val.productName,
 			        typeId: 0,
@@ -730,10 +731,10 @@
 			xufei(val){
 				// console.log('去续费,获取商品列表')				
 					$http.request({
-							url: "sociology/product/getProductListForCourse",
+							url: "common/courseRelearn/relearnShopProductList",
 							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
 							data: {
-								"id": val.catalogueId
+								"catalogueId": val.catalogueId
 							},
 							header: { //默认 无 说明：请求头
 								'Content-Type': 'application/json'
@@ -742,7 +743,7 @@
 						.then(res => {
 							if (res.code == 0) {
 								if (res.productList.length > 0) {
-									this.proPriceList = res.productList
+									this.proPriceList = res.productList.map((e)=>{return {...e,catalogueId:val.catalogueId}})
 									// this.curProId = this.proPriceList[0].productId
 									this.pricespop = true
 								} else {
--- a/pages/goods/order/index.vue
+++ b/pages/goods/order/index.vue
@@ -74,7 +74,7 @@
          </image>
          <image
            v-else
-            src="/static/nobg1.jpg"
+            src="/static/nobg1.jpg"    class="goods_item_img"
            mode="widthFix"
            @click="goDetail(item.productId)"
          ></image>
@@ -468,12 +468,21 @@
        <!-- leftSlot -->
        <template slot="leftSlot" slot-scope="slotProps">
          <view class="price_box order_bottom_box"
-            ><text class="number">共{{ number }}件</text>
+            >
            <text class="price"
              >合计:

              <text class="total"
-                >￥{{ Number(actualPayment).toFixed(2) }}</text
+                >
+                <template v-if="actualPayment>0">
+                  ￥{{ Number(actualPayment).toFixed(2) }}
+                </template>
+                 <text style="margin: 0 4rpx;" v-if="actualPayment>0&&jfNumber>0">
+                  +
+                 </text>
+                
+                <text v-if="jfNumber>0">{{ jfNumber }} 积分</text>
+                </text
              >
            </text>
          </view>
@@ -716,7 +725,7 @@ export default {
      },
      customButton: [
        {
-          width: "340rpx",
+          width: "200rpx",
          text: "立即支付",
          backgroundColor: "linear-gradient(90deg,  #3C77BE 0%,#258feb 100%)",
          color: "#fff",
--- a/pages/hufen/hufen.vue
+++ b/pages/hufen/hufen.vue
--- a/pages/mine/mine/index.vue
+++ b/pages/mine/mine/index.vue
@@ -203,11 +203,11 @@
 						url: "/pages/certificate/certificate",
 						type: "pageJump",
 					},
-					// {
-					// 	name: "我的湖分",
-					// 	url: "/pages/hufen/hufen",
-					// 	type: "pageJump",
-					// },
+					{
+						name: "我的湖分",
+						url: "/pages/hufen/hufen",
+						type: "pageJump",
+					},
 					{
 						name: "个人资料",
 						url: "/pages/mine/userInfo/persData",
--- a/pages/mine/vip/order.vue
+++ b/pages/mine/vip/order.vue
@@ -190,11 +190,18 @@
          <view class="price_box order_bottom_box">
            <text class="price"
              >合计：
-              <text class="total"
-                >￥{{ dataInfo.lastFee - jfNumber }}
-                <text v-if="jfNumber > 0" style="margin-left: 10rpx"
-                  >+ {{ jfNumber }}积分</text
+              <text class="total">
+                <template v-if="dataInfo.lastFee - jfNumber > 0">
+                  ￥{{ dataInfo.lastFee - jfNumber }}
+                </template>
+                <text
+                  style="margin: 0 4rpx"
+                  v-if="dataInfo.lastFee - jfNumber > 0 && jfNumber > 0"
                >
+                  +
+                </text>
+
+                <text v-if="jfNumber > 0">{{ jfNumber }} 积分</text>
              </text>
            </text>
          </view>
@@ -723,7 +730,7 @@ export default {
      this.dataInfo.lastFee = item.rebateFee;
      this.dataInfo.id = item.id;
      if (this.initData.user && this.initData.user.jf) {
-		this.jfNumber=0
+        this.jfNumber = 0;
        var totalMoney = this.dataInfo.lastFee;
        if (this.initData.user.jf >= totalMoney) {
          const integerPart = Math.floor(totalMoney);
@@ -732,7 +739,6 @@ export default {
        } else {
          this.jfNumberMax = this.initData.user.jf; // 设置 jfNumberMax
        }
-
      }
      this.$forceUpdate();
    },
--- a/pages/mine/wallet/jf/index.vue
+++ b/pages/mine/wallet/jf/index.vue
@@ -33,9 +33,9 @@
              label="orderType"
            >
              <template slot="labelSlot" slot-scope="slotProps">
-                <view class="label_content AC_List">
+                <view class="label_content AC_List" @click="slotProps.row.relationId?goClick(slotProps.row.relationId):''">
                  <view class="left">
-                    <view class="title">{{ slotProps.row.orderType }}</view>
+                    <view class="title"><view class="AC_time">{{ slotProps.row.createTime }} </view></view>
                  </view>
                  <view
                    :class="`right ${
@@ -43,13 +43,14 @@
                    }`"
                  >
                    <text v-if="slotProps.row.changeAmount > 0">+</text>
-                    <text>{{ slotProps.row.changeAmount }}</text> </view
+                    <text>{{ slotProps.row.changeAmount }}</text> 
+                    </view
                  ><view class="AC_mark" v-if="slotProps.row.remark">{{
                    slotProps.row.remark
                  }}</view
-                  ><view class="AC_time">{{ slotProps.row.createTime }} </view>
+                  >
                </view>
-                <text  class="order" style="font-size: 12px;" v-if="slotProps.row.relationId" @click="goClick(slotProps.row.relationId)">订单详情</text>
+                <!-- <text  class="order" style="font-size: 12px;" v-if="slotProps.row.relationId" @click="goClick(slotProps.row.relationId)">订单详情</text> -->
              </template>
            </common-list>
          </view>
@@ -409,7 +410,7 @@ export default {
      overflow: hidden;

      .left {
-        width: calc(100% - 120rpx) !important;
+        width: calc(100% - 200rpx) !important;
        font-weight: 700;
        float: left;
        color: #333;
@@ -441,15 +442,18 @@ export default {
      }

      .AC_mark {
+        width: 100%;
        font-size: 28rpx;
        margin-top: 10rpx;
        margin-bottom: 15rpx;
        // white-space: nowrap;
        color: #343434;
        float: left;
+        overflow: hidden;
      }

      .AC_time {
+        // width: 100%;
        color: #909090;
        font-size: 28rpx;
      }
--- a/unpackage/dist/build/app-plus/app-service.js
+++ b/unpackage/dist/build/app-plus/app-service.js
--- a/unpackage/dist/build/app-plus/app-view.js
+++ b/unpackage/dist/build/app-plus/app-view.js
--- a/unpackage/dist/build/app-plus/manifest.json
+++ b/unpackage/dist/build/app-plus/manifest.json
--- a/unpackage/release/wumen20250414200401.wgt
+++ b/unpackage/release/wumen20250414200401.wgt
--- a/unpackage/release/wumen20250415200501.wgt
+++ b/unpackage/release/wumen20250415200501.wgt