diff --git a/components/guide-pages/guide-pages.vue b/components/guide-pages/guide-pages.vue
index 0a06c28..d7ac27c 100644
--- a/components/guide-pages/guide-pages.vue
+++ b/components/guide-pages/guide-pages.vue
@@ -45,6 +45,8 @@
 				let systemInfo = uni.getSystemInfoSync();
 				this.screenHeight = systemInfo.screenHeight;
 				this.show = true;
+			}else{
+				
 			}
 		},
 		methods: {
diff --git a/config/baseUrl.js b/config/baseUrl.js
index 3355af6..c261b81 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -5,8 +5,8 @@ if (process.env.NODE_ENV === 'development') {
 	// baseUrl = "http://localhost:7001/";
 	// socketUrl = "ws://localhost:6001/";
 	// baseUrl = "https://twin-ui.com/demo/";
-	// baseUrl = "https://testapi.nuttyreading.com/";      // 线上测试环境
-		 baseUrl = "https://api.nuttyreading.com/";   // 线上正式
+	baseUrl = "https://testapi.nuttyreading.com/";      // 线上测试环境
+		//  baseUrl = "https://api.nuttyreading.com/";   // 线上正式
 		// baseUrl = "http://192.168.110.100:9200/pb/";    //  开发用电脑
 	// baseUrl = "http://59.110.212.44:9200/pb/";
 	// baseUrl = "http://192.168.110.100:9100/pb/";    //  开发用电脑
diff --git a/config/requestConfig.js b/config/requestConfig.js
index 5d19a7d..57862e2 100644
--- a/config/requestConfig.js
+++ b/config/requestConfig.js
@@ -293,9 +293,10 @@ $http.dataFactory = async function(res) {
 				errMsg: "【request】" + (httpData.info || httpData.msg),
 				data: res.data
 			});
-		} else { //其他错误提示   
+		} else { //其他错误提示  
+			console.log(httpData, '其他')
 			console.log(httpData.info || httpData.msg)
-			if (res.isPrompt && res.data.loadAnimate != 'none') {	
+			if (res.isPrompt && res.data.loadAnimate != 'none') {
 				uni.showToast({
 					title: httpData.info || httpData.msg,
 					icon: "none",
@@ -334,4 +335,4 @@ $http.requestError = function(e) {
 		// });
 	}
 }
-export default $http;
+export default $http;
\ No newline at end of file
diff --git a/manifest.json b/manifest.json
index fd52163..74e1565 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,256 +1,254 @@
 {
-    "name" : "疯子读书",
-    "appid" : "__UNI__9788EB5",
-    "description" : "疯子读书",
-    "networkTimeout" : {
-        "request" : 3000
-    },
-    "transformPx" : false,
-    "icons" : [
-        {
-            "sizes" : "分辨率，192x192",
-            "src" : "图片路径"
-        }
-    ],
-    "versionName" : "1.2.43",
-    "versionCode" : 1243,
-    "app-plus" : {
-        "compatible" : {
-            "ignoreVersion" : true
-        },
-        "privacy" : {
-            "prompt" : "template",
-            "template" : {
-                "title" : "用户协议和隐私政策",
-                "message" : "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href='https://main.nuttyreading.com/agreement.html'>《用户协议》</a>和<a href='https://main.nuttyreading.com/privacy.html'>《隐私协议》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
-                "buttonAccept" : "同意",
-                "buttonRefuse" : "暂不同意"
-            }
-        },
-        "modules" : {
-            "Payment" : {},
-            "OAuth" : {},
-            "Share" : {},
-            "Camera" : {},
-            "VideoPlayer" : {}
-        },
-        "distribute" : {
-            "apple" : {
-                "devices" : "universal"
-            },
-            // "UIBackgroundModes" : [ "audio" ]
-            "android" : {
-                "permissionPhoneState" : {
-                    "request" : "none",
-                    "prompt" : "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
-                },
-                "permissionExternalStorage" : {
-                    "request" : "none",
-                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
-                },
-                "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\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
-                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
-                    "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
-                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
-                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
-                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
-                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
-                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
-                    "<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
-                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
-                    "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
-                    "<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
-                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
-                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
-                    "<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" : "nuttyreading"
-            },
-            "sdkConfigs" : {
-                "ad" : {},
-                "maps" : {},
-                "share" : {
-                    "weixin" : {
-                        "appid" : "wx47134a8f15083734",
-                        "UniversalLinks" : "https://verification.nuttyreading.com/uni-universallinks/__UNI__9788EB5/"
-                    }
-                },
-                "payment" : {
-                    "alipay" : {
-                        "__platform__" : [ "ios", "android" ]
-                    },
-                    "appleiap" : {},
-                    "weixin" : {
-                        "__platform__" : [ "ios", "android" ],
-                        "appid" : "wx47134a8f15083734",
-                        "UniversalLinks" : "https://verification.nuttyreading.com/uni-universallinks/__UNI__9788EB5/"
-                    }
-                }
-            },
-            "splashscreen" : {
-                "iosStyle" : "common",
-                "androidStyle" : "default",
-                "useOriginalMsgbox" : true
-            },
-            "ios" : {
-                "dSYMs" : false,
-                // "UIBackgroundModes" : [ "audio" ], // 背景播放音乐
-                "capabilities" : {
-                    "entitlements" : {
-                        "com.apple.developer.associated-domains" : [ "applinks:verification.nuttyreading.com" ]
-                    }
-                },
-                "idfa" : false,
-                "urltypes" : "nuttyreading",
-                "urlschemewhitelist" : "everhealth",
-                "privacyDescription" : {
-                    "NSPhotoLibraryUsageDescription" : "为了给您提供修改头像的功能",
-                    "NSCameraUsageDescription" : "为了给您提供修改头像的功能"
-                }
-            },
-            "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"
-                    },
-                    "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
-        },
-        "nativePlugins" : {},
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    // 5+App特有相关
-    "quickapp" : {},
-    // 快应用特有相关
-    "mp-weixin" : {
-        "setting" : {
-            "urlCheck" : false,
-            "es6" : true,
-            "postcss" : true,
-            "minified" : true
-        },
-        "usingComponents" : true,
-        "appid" : "wxd3ba52b7661b36be",
-        "permission" : {
-            "scope.userLocation" : {
-                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
-            }
-        },
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "h5" : {
-        "template" : "template.h5.html",
-        "router" : {
-            "mode" : "hash",
-            "base" : "/uniappDemo/"
-        },
-        "optimization" : {
-            "treeShaking" : {
-                "enable" : true
-            }
-        },
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "_spaceID" : "mp-3614b80b-2d75-4462-a481-4998f8187274",
-    "uniStatistics" : {
-        "version" : "2",
-        "enable" : true
-    },
-    "mp-alipay" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "mp-baidu" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "mp-jd" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "mp-kuaishou" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "mp-lark" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "mp-qq" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "mp-toutiao" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "quickapp-webview-huawei" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    },
-    "quickapp-webview-union" : {
-        "uniStatistics" : {
-            "enable" : true
-        }
-    }
+	"name": "疯子读书",
+	"appid": "__UNI__9788EB5",
+	"description": "疯子读书",
+	"networkTimeout": {
+		"request": 3000
+	},
+	"transformPx": false,
+	"icons": [{
+		"sizes": "分辨率，192x192",
+		"src": "图片路径"
+	}],
+	"versionName": "1.2.43",
+	"versionCode": 1243,
+	"app-plus": {
+		"compatible": {
+			"ignoreVersion": true
+		},
+		"privacy": {
+			"prompt": "template",
+			"template": {
+				"title": "用户协议和隐私政策",
+				"message": "请你务必审慎阅读、充分理解“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　你可阅读<a href='https://main.nuttyreading.com/agreement.html'>《用户协议》</a>和<a href='https://main.nuttyreading.com/privacy.html'>《隐私协议》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+				"buttonAccept": "同意",
+				"buttonRefuse": "暂不同意"
+			}
+		},
+		"modules": {
+			"Payment": {},
+			"Share": {},
+			"Camera": {},
+			"VideoPlayer": {},
+			"OAuth": {}
+		},
+		"distribute": {
+			"apple": {
+				"devices": "universal"
+			},
+			// "UIBackgroundModes" : [ "audio" ]
+			"android": {
+				"permissionPhoneState": {
+					"request": "none",
+					"prompt": "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
+				},
+				"permissionExternalStorage": {
+					"request": "none",
+					"prompt": "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+				},
+				"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\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+					"<uses-permission android:name=\"android.permission.CAMERA\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+					"<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+					"<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+					"<uses-permission android:name=\"android.permission.INTERNET\"/>",
+					"<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+					"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+					"<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+					"<uses-permission android:name=\"android.permission.RECEIVE_BOOT_COMPLETED\"/>",
+					"<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+					"<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+					"<uses-permission android:name=\"android.permission.SYSTEM_ALERT_WINDOW\"/>",
+					"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+					"<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+					"<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": "nuttyreading"
+			},
+			"sdkConfigs": {
+				"ad": {},
+				"maps": {},
+				"share": {
+					"weixin": {
+						"appid": "wx47134a8f15083734",
+						"UniversalLinks": "https://verification.nuttyreading.com/uni-universallinks/__UNI__9788EB5/"
+					}
+				},
+				"payment": {
+					"alipay": {
+						"__platform__": ["ios", "android"]
+					},
+					"appleiap": {},
+					"weixin": {
+						"__platform__": ["ios", "android"],
+						"appid": "wx47134a8f15083734",
+						"UniversalLinks": "https://verification.nuttyreading.com/uni-universallinks/__UNI__9788EB5/"
+					}
+				},
+				"oauth": {}
+			},
+			"splashscreen": {
+				"iosStyle": "common",
+				"androidStyle": "default",
+				"useOriginalMsgbox": true
+			},
+			"ios": {
+				"dSYMs": false,
+				// "UIBackgroundModes" : [ "audio" ], // 背景播放音乐
+				"capabilities": {
+					"entitlements": {
+						"com.apple.developer.associated-domains": ["applinks:verification.nuttyreading.com"]
+					}
+				},
+				"idfa": false,
+				"urltypes": "nuttyreading",
+				"urlschemewhitelist": "everhealth",
+				"privacyDescription": {
+					"NSPhotoLibraryUsageDescription": "为了给您提供修改头像的功能",
+					"NSCameraUsageDescription": "为了给您提供修改头像的功能"
+				}
+			},
+			"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"
+					},
+					"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
+		},
+		"nativePlugins": {},
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	// 5+App特有相关
+	"quickapp": {},
+	// 快应用特有相关
+	"mp-weixin": {
+		"setting": {
+			"urlCheck": false,
+			"es6": true,
+			"postcss": true,
+			"minified": true
+		},
+		"usingComponents": true,
+		"appid": "wxd3ba52b7661b36be",
+		"permission": {
+			"scope.userLocation": {
+				"desc": "你的位置信息将用于小程序位置接口的效果展示"
+			}
+		},
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"h5": {
+		"template": "template.h5.html",
+		"router": {
+			"mode": "hash",
+			"base": "/uniappDemo/"
+		},
+		"optimization": {
+			"treeShaking": {
+				"enable": true
+			}
+		},
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"_spaceID": "mp-3614b80b-2d75-4462-a481-4998f8187274",
+	"uniStatistics": {
+		"version": "2",
+		"enable": true
+	},
+	"mp-alipay": {
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"mp-baidu": {
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"mp-jd": {
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"mp-kuaishou": {
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"mp-lark": {
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"mp-qq": {
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"mp-toutiao": {
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"quickapp-webview-huawei": {
+		"uniStatistics": {
+			"enable": true
+		}
+	},
+	"quickapp-webview-union": {
+		"uniStatistics": {
+			"enable": true
+		}
+	}
 }
-// 小程序特有相关
-
+// 小程序特有相关
\ No newline at end of file
diff --git a/pages/acupoint/acupoint.vue b/pages/acupoint/acupoint.vue
index fb7de70..54e46cf 100644
--- a/pages/acupoint/acupoint.vue
+++ b/pages/acupoint/acupoint.vue
@@ -37,6 +37,8 @@
 				</u-grid>
 			</view>
 			<view class="titleList">
+
+				
 				<u-grid :col="3" v-if="titleList.length > 0">
 					<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)">
 						<view :class="['titleItem']">{{item.title}}</view>
@@ -110,20 +112,20 @@
 			},
 			// 穴位详情
 			gotoDetail(item) {
-				// if (this.curOneCateIndex == 0 && this.userMes.pointPower== 0) {
-				// 	let that = this
-				// 	uni.showModal({
-				// 		content: '购买 手模 或 脚模 后方可使用此功能',
-				// 		confirmText: '好的',
-				// 		showCancel: false,
-				// 		success: function(res) {
-				// 			if (res.confirm) {
-				// 				// console.log('用户点击确定');								
-				// 			}
-				// 		}
-				// 	})
-				// 	return
-				// }
+				 if (this.curOneCateIndex == 0 && this.userMes.pointPower== 0) {
+				 	let that = this
+				 	uni.showModal({
+				 		content: '购买 手模 或 脚模 后方可使用此功能',
+				 		confirmText: '好的',
+				 		showCancel: false,
+				 		success: function(res) {
+				 			if (res.confirm) {
+				 				// console.log('用户点击确定');								
+				 			}
+				 		}
+				 	})
+				 	return
+				 }
 				uni.navigateTo({
 					url: "./acupointDetail?id=" + item.id
 				})
diff --git a/pages/bookShop/commodityDetail.vue b/pages/bookShop/commodityDetail.vue
index 6c93415..dd47699 100644
--- a/pages/bookShop/commodityDetail.vue
+++ b/pages/bookShop/commodityDetail.vue
@@ -7,7 +7,7 @@
 		<view class="swiperBox">
 			<swiper :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000"
 				style="width: 100%;height: 100%;">
-				<swiper-item v-for="(item,index) in swiperlist" :key="index" style="width: 100%;height: 100%;">
+				<swiper-item v-for="(item, index) in swiperlist" :key="index" style="width: 100%;height: 100%;">
 					<image :src="item" mode="aspectFit" style="width: 100%;height: 100%;" @click="previewImage(item)">
 					</image>
 				</swiper-item>
@@ -15,18 +15,18 @@
 		</view>
 		<view class="commodityContent">
 			<view class="commodityPrice" v-if="productInfo.activityPrice && productInfo.activityPrice > 0">
-				<span style="font-size: 28rpx;">￥</span><em>{{productInfo.activityPrice}}</em>
-				<span class="oldPrice ">原价<span
-						style="font-size: 20rpx;padding-left:10rpx;">￥</span>{{productInfo.price}}</span>
+				<span style="font-size: 28rpx;">￥</span><em>{{ productInfo.activityPrice }}</em>
+				<span class="oldPrice ">原价<span style="font-size: 20rpx;padding-left:10rpx;">￥</span>{{
+				productInfo.price }}</span>
 			</view>
 			<view class="commodityPrice" v-else>
-				<span style="font-size: 28rpx;">￥</span><em>{{productInfo.price}}</em>
+				<span style="font-size: 28rpx;">￥</span><em>{{ productInfo.price }}</em>
 			</view>
 			<view class="commodityyName">
-				{{productInfo.productName}}
-				<span v-if="productInfo.productStock==0" style="color: #aaa;font-size:26rpx;">（无货）</span>
-				<view><text class="SoldNumber">已售<span
-							style="padding-left:10rpx;">{{productInfo.sumSales}}</span>件</text></view>
+				{{ productInfo.productName }}
+				<span v-if="productInfo.productStock == 0" style="color: #aaa;font-size:26rpx;">（无货）</span>
+				<view><text class="SoldNumber">已售<span style="padding-left:10rpx;">{{ productInfo.sumSales
+							}}</span>件</text></view>
 			</view>
 			<view class="pingjia" v-if="linkProducts && linkProducts.length > 0 && linkProducts[0]">
 				<view class="">
@@ -36,14 +36,14 @@
 				<!-- 商品包含 -->
 				<view v-if="linkProducts && linkProducts.length > 0 && linkProducts[0]">
 					<view class="spbh" v-for="(item, index) in linkProducts" :key="item.id">
-						<view class="flexbox aligncenter" @click="previewProduct(item,index)">
+						<view class="flexbox aligncenter" @click="previewProduct(item, index)">
 							<view class="spbhimg">
 								<image :src="item.productImages" mode="aspectFit"></image>
 							</view>
-							<text class="username nowrap ">{{item.productName}}</text>
-							<text class="price"
-								v-if="item.activityPrice && item.activityPrice > 0">￥{{item.activityPrice}}</text>
-							<text class="price" v-else>￥{{item.price}}</text>
+							<text class="username nowrap ">{{ item.productName }}</text>
+							<text class="price" v-if="item.activityPrice && item.activityPrice > 0">￥{{
+				item.activityPrice }}</text>
+							<text class="price" v-else>￥{{ item.price }}</text>
 						</view>
 					</view>
 				</view>
@@ -54,66 +54,133 @@
 
 			<view class="contentButton">
 				<u-tabs :scrollable="false" :list="contentButtonList" @click="contentButtonClick" :activeStyle="{
-						color: '#303133',
-						fontWeight: 'bold',
-						fontSize: '28rpx'
-					}" :inactiveStyle="{
-						color: '#606266',
-						fontSize: '28rpx'
-					}"></u-tabs>
+				color: '#303133',
+				fontWeight: 'bold',
+				fontSize: '28rpx'
+			}" :inactiveStyle="{
+				color: '#606266',
+				fontSize: '28rpx'
+			}"></u-tabs>
 			</view>
 			<!-- 详情 + 评价1 -->
 			<view v-if="contentShow == 0">
-				<view class="pingjia">
-					<!-- <h4></h4> -->
-					<view class="" v-if="listenList.length > 0 && listenList[0]&&iosHide" style="margin:0rpx 0rpx 30rpx;">
-						<view class="">
-							<view style="font-weight: 700;margin-bottom: 30rpx;color:#71d5a1;">赠送听书权益</view>
-						</view>
-						<view class="item flexbox aligncenter" v-for="item in listenList" :key="item.id"
-							style="padding-bottom:10rpx;">
+				<view class="pingjia quanyi_box" v-if="listenList.length > 0 && listenList[0] && iosHide"
+					style="margin:0rpx 0rpx 30rpx;">
+					<!-- <view class=""> -->
+					<view class="quanyi_title" style="">赠送权益</view>
+					<!-- </view> -->
+					<view class="quanyi">
+
+						<view class="item " v-for="item in listenList" :key="item.id" style="padding-bottom:10rpx; ">
 							<view class="spbhimg" @click="previewImage(item.images)">
 								<image :src="item.images" mode="aspectFit"></image>
 							</view>
-							<text style="padding-right: 10rpx;">{{item.name}}</text>
-							<u-icon v-if="item.canListen == true" name="volume" color="#71d5a1" size="24"
-								@click="goToListen(item.id)"></u-icon>
-							<u-icon v-else name="volume" color="#71d5a1" size="24"
-								@click="goToListenNone(item.id)"></u-icon>
+							<view class="quanyi_book" style="padding-left: 20rpx;">
+								<view class="quanyi_book_name"
+									style="padding-right: 10rpx;box-sizing: border-box;line-height: 40rpx;margin-bottom: 10rpx;">
+									{{
+				item.name }}</view>
+
+								<view class="qunyi_bottom ">
+
+
+
+									<view class="quanyi_item " v-for="(v, i) in qunyiList"
+										@click="handleClickQuanyi(v, i, item)" style="font-weight: 700;color:#71d5a1;">
+										<view style="width: 100%;display: flex;
+	align-items: center;">
+
+
+											<template v-if="v.iconType == 'uni'">
+												<uni-icons :type="v.icon" color="#71d5a1" :size="v.iconSize"
+													style="display: inline-block;margin-right: 10rpx;"></uni-icons>
+
+
+
+											</template>
+
+											<template v-else>
+												<u-icon :name="v.icon" color="#71d5a1" :size="v.iconSize"
+													style="display: inline-block;margin-right: 10rpx;"></u-icon>
+											</template>
+											{{ v.name }}
+
+										</view>
+
+										<view>
+											<template v-if="v.type == 'tingshu'">
+												222
+											</template>
+										</view>
+									</view>
+
+
+
+									<!-- <view class="quanyi_item "
+										@click="item.canListen == true ? goToListen(item.id) : goToListenNone(item.id)"
+										style="font-weight: 700;color:#71d5a1;"><uni-icons type="sound" color="#71d5a1"
+											size="22" style="display: inline-block;margin-right: 10rpx;"></uni-icons>听书
+									</view>
+									<view class="quanyi_item "
+										@click="item.canListen == true ? goToListen(item.id) : goToListenNone(item.id)"
+										style="font-weight: 700;color:#71d5a1;"><uni-icons type="chat" color="#71d5a1"
+											size="20" style="display: inline-block;margin-right: 10rpx;"></uni-icons>书评
+									</view>
+
+									<view class="quanyi_item " style="font-weight: 700;color:#71d5a1;"><u-icon
+											name="file-text" color="#71d5a1" size="22"
+											style="display: inline-block;margin-right: 10rpx;"></u-icon>讲书</view>
+									<view class="quanyi_item " style="font-weight: 700;color:#71d5a1;"><u-icon
+											name="order" color="#71d5a1" size="22"
+											style="display: inline-block;margin-right: 10rpx;"></u-icon>医案</view> -->
+								</view>
+								<!-- <u-icon v-if="item.canListen == true" name="volume" color="#71d5a1" size="20"
+									@click=""></u-icon>
+								<u-icon v-else name="volume" color="#71d5a1" size="20"
+									@click="goToListenNone(item.id)"></u-icon> -->
+							</view>
+
 						</view>
 					</view>
+
+
+
+				</view>
+				<view class="pingjia">
+					<!-- <h4></h4> -->
+
 					<view class="">
 						<view style="font-weight: 700;margin:0rpx 0rpx 30rpx;">商品详情</view>
 					</view>
 					<view class="bookInfo">
 						<u-row customStyle="margin-bottom: 10px">
-							<u-col><span>书名：{{productInfo.productName}}</span></u-col>
+							<u-col><span>书名：{{ productInfo.productName }}</span></u-col>
 						</u-row>
 						<u-row customStyle="margin-bottom: 10px">
-							<u-col v-if="productInfo.author"><span>作者：{{productInfo.author}}</span></u-col>
+							<u-col v-if="productInfo.author"><span>作者：{{ productInfo.author }}</span></u-col>
 						</u-row>
 						<u-row customStyle="margin-bottom: 10px">
-							<u-col span="12"
-								v-if="productInfo.publisher"><span>出版社：{{productInfo.publisher}}</span></u-col>
+							<u-col span="12" v-if="productInfo.publisher"><span>出版社：{{ productInfo.publisher
+									}}</span></u-col>
 						</u-row>
 						<u-row customStyle="margin-bottom: 10px">
-							<u-col span="12"
-								v-if="productInfo.pubDate"><span>出版时间：{{ productInfo.pubDate | formatDate }}</span></u-col>
+							<u-col span="12" v-if="productInfo.pubDate"><span>出版时间：{{ productInfo.pubDate | formatDate
+									}}</span></u-col>
 						</u-row>
 						<u-row customStyle="margin-bottom: 10px">
-							<u-col span="6" v-if="productInfo.format"><span>开本：{{productInfo.format}}</span></u-col>
-							<u-col span="6" v-if="productInfo.pageNum"><span>页数：{{productInfo.pageNum}}</span></u-col>
+							<u-col span="6" v-if="productInfo.format"><span>开本：{{ productInfo.format }}</span></u-col>
+							<u-col span="6" v-if="productInfo.pageNum"><span>页数：{{ productInfo.pageNum }}</span></u-col>
 						</u-row>
 						<u-row customStyle="margin-bottom: 10px">
-							<u-col span="6"
-								v-if="productInfo.quality"><span>内文用纸材质：{{productInfo.quality}}</span></u-col>
+							<u-col span="6" v-if="productInfo.quality"><span>内文用纸材质：{{ productInfo.quality
+									}}</span></u-col>
 						</u-row>
 					</view>
 					<!-- <view class="commodityIntroduce" v-html="productInfo.productDetails"> -->
 					<view class="commodityIntroduce">
 						<view v-if="productInfo.productDetails">
 							<rich-text v-if="productInfo.productDetails" class="xiangqing" @itemclick="showImg"
-								:nodes="productInfo.productDetails|formatRichText"></rich-text>
+								:nodes="productInfo.productDetails | formatRichText"></rich-text>
 						</view>
 					</view>
 				</view>
@@ -123,7 +190,8 @@
 			</view>
 			<view class="pingjia" v-else>
 				<view class="">
-					<view style="font-weight: 700;margin-bottom: 30rpx;">评价({{commentsList?commentsList.length:0}})
+					<view style="font-weight: 700;margin-bottom: 30rpx;">评价({{ commentsList ? commentsList.length : 0
+						}})
 					</view>
 					<!-- <view class="icon-del rotate"></view> -->
 				</view>
@@ -133,25 +201,25 @@
 						<view class="flexbox aligncenter">
 							<view class="touxiang">
 								<image :src="item.avatar" mode="aspectFit"></image>
-								<text class="username nowrap ">{{item.name}}</text>
+								<text class="username nowrap ">{{ item.name }}</text>
 							</view>
 							<view class="mb30" style="padding: 6rpx 0rpx 0rpx 20rpx;">
-								<span :class="['star',item.starlevel >= 1 ? 'starLight':'starGray']"></span>
-								<span :class="['star',item.starlevel >= 2 ? 'starLight':'starGray']"></span>
-								<span :class="['star',item.starlevel >= 3 ? 'starLight':'starGray']"></span>
-								<span :class="['star',item.starlevel >= 4 ? 'starLight':'starGray']"></span>
-								<span :class="['star',item.starlevel >= 5 ? 'starLight':'starGray']"></span>
+								<span :class="['star', item.starlevel >= 1 ? 'starLight' : 'starGray']"></span>
+								<span :class="['star', item.starlevel >= 2 ? 'starLight' : 'starGray']"></span>
+								<span :class="['star', item.starlevel >= 3 ? 'starLight' : 'starGray']"></span>
+								<span :class="['star', item.starlevel >= 4 ? 'starLight' : 'starGray']"></span>
+								<span :class="['star', item.starlevel >= 5 ? 'starLight' : 'starGray']"></span>
 							</view>
 						</view>
 						<view class="contentBox">
 							<div class="pjimgs flexbox">
-								<view class="item" v-for="(item1,index) in item.images">
+								<view class="item" v-for="(item1, index) in item.images">
 									<image v-if="item1.length > 10" @click="previewImage(item1)" :src="item1"
 										mode="aspectFill" style="width:100%; height: 50px;"></image>
 								</view>
 							</div>
 							<view class="content" v-html="item.phtml"></view>
-							<text class="time">{{item.createdate}}</text>
+							<text class="time">{{ item.createdate }}</text>
 						</view>
 						<!-- 显示追平 -->
 						<view class="zhuiping item" v-if="item.zphtml != ''" style="padding-left: 60rpx;">
@@ -159,7 +227,7 @@
 							<view class="flexbox">
 								<view class="contentBox">
 									<view class="content" v-html="item.zphtml"></view>
-									<text class="time">{{item.followUpdate}}</text>
+									<text class="time">{{ item.followUpdate }}</text>
 								</view>
 							</view>
 						</view>
@@ -185,16 +253,16 @@
 								<text>查看详情</text>
 							</view>
 						</view>
-						<view :class="['spbh', linkCur == index ? 'cur' :'']" v-for="(item, index) in linkProducts"
+						<view :class="['spbh', linkCur == index ? 'cur' : '']" v-for="(item, index) in linkProducts"
 							:key="item.id">
-							<view class="flexbox aligncenter" @click="previewProduct(item,index)">
+							<view class="flexbox aligncenter" @click="previewProduct(item, index)">
 								<view class="spbhimg">
 									<image :src="item.productImages" mode="aspectFit"></image>
 								</view>
-								<text class="username nowrap ">{{item.productName}}</text>
-								<text class="price"
-									v-if="item.activityPrice && item.activityPrice > 0">￥{{item.activityPrice}}</text>
-								<text class="price" v-else>￥{{item.price}}</text>
+								<text class="username nowrap ">{{ item.productName }}</text>
+								<text class="price" v-if="item.activityPrice && item.activityPrice > 0">￥{{
+				item.activityPrice }}</text>
+								<text class="price" v-else>￥{{ item.price }}</text>
 							</view>
 						</view>
 					</view>
@@ -209,480 +277,300 @@
 	</view>
 </template>
 <script>
-	import musicPlay from '@/components/music.vue'
-	import emojiList1 from '../../bkhumor-emojiplus/emoji/biaoqin.js'
-	import $http from '@/config/requestConfig.js';
-	import {
-		mapState
-	} from 'vuex';
-	import loginVue from '../user/login.vue';
-	export default {
-		data() {
-			return {
-				linkimg: '', // 选中的关联商品图片
-				playData: {},
-				contentShow: 0,
-				options: [{
-					icon: 'cart',
-					text: '购物车'
-				}],
-				buttonGroup: [{
-						text: '加入购物车',
-						backgroundColor: 'linear-gradient(90deg, #FFCD1E, #FF8A18)',
-						color: '#fff'
-					},
-					{
-						text: '立即购买',
-						backgroundColor: 'linear-gradient(90deg, #FE6035, #EF1224)',
-						color: '#fff'
+import musicPlay from '@/components/music.vue'
+import emojiList1 from '../../bkhumor-emojiplus/emoji/biaoqin.js'
+import $http from '@/config/requestConfig.js';
+import {
+	mapState
+} from 'vuex';
+import loginVue from '../user/login.vue';
+export default {
+	data() {
+		return {
+			qunyiList: [
+				{ name: "打卡", type: 'daka', icon: "calendar", iconType: 'uni', iconSize: 20 },
+				{ name: "听书", type: 'tingshu', icon: "sound", iconType: 'uni', iconSize: 22 },
+				{ name: "书评", type: 'shuping', icon: "chat", iconType: 'uni', iconSize: 20 },
+				{ name: "讲书", type: 'jiangshu', icon: "file-text", iconType: 'uview', iconSize: 22 },
+				{ name: "医案", type: 'yian', icon: "order", iconType: 'uview', iconSize: 22 },
+			],
+
+			linkimg: '', // 选中的关联商品图片
+			playData: {},
+			contentShow: 0,
+			options: [{
+				icon: 'cart',
+				text: '购物车'
+			}],
+			buttonGroup: [{
+				text: '加入购物车',
+				backgroundColor: 'linear-gradient(90deg, #FFCD1E, #FF8A18)',
+				color: '#fff'
+			},
+			{
+				text: '立即购买',
+				backgroundColor: 'linear-gradient(90deg, #FE6035, #EF1224)',
+				color: '#fff'
+			}
+			],
+			contentButtonList: [{
+				name: '商品详情'
+			},
+			{
+				name: '商品评价'
+			}
+			],
+			// 轮播图数据
+			swiperlist: [],
+			// 商品详情数据
+			productInfo: {},
+			productAmount: 1, // 商品数量
+			cartList: [], // 购物车列表
+			commentsList: [], // 评论列表
+			productId: null, // 商品评论
+			listenList: [], // 关联得听书
+			linkProducts: [], // 关联的商品,
+			upoShow: false, // 显示底部购买选项
+			linkCur: 0, // 当前选中的关联项				
+		}
+	},
+	onLoad(e) {
+		this.productId = e.id
+		this.getProDetail(e)
+		this.getComments()
+		this.getLinkPros(this.productId)
+		// console.log(emojiList1,'emojiList1')
+	},
+	computed: {
+		...mapState(['userInfo']),
+	},
+	components: {
+		musicPlay
+	},
+	methods: {
+		handleClickQuanyi(v, i, item) {
+			switch (v.type) {
+				case 'tingshu':
+					if (item.canListen) {
+						uni.navigateTo({
+							url: "../listen/listen?bookid=" + item.id
+						});
+					} else {
+						this.goToListenNone(item.id)
 					}
-				],
-				contentButtonList: [{
-						name: '商品详情'
-					},
-					{
-						name: '商品评价'
-					}
-				],
-				// 轮播图数据
-				swiperlist: [],
-				// 商品详情数据
-				productInfo: {},
-				productAmount: 1, // 商品数量
-				cartList: [], // 购物车列表
-				commentsList: [], // 评论列表
-				productId: null, // 商品评论
-				listenList: [], // 关联得听书
-				linkProducts: [], // 关联的商品,
-				upoShow: false, // 显示底部购买选项
-				linkCur: 0, // 当前选中的关联项				
+					break;
+				// case 'tingshu':
+				// 	if (item.canListen) {
+				// 		uni.navigateTo({
+				// 			url: "../listen/listen?bookid=" + id
+				// 		});
+				// 	} else {
+				// 		goToListenNone(item.id)
+				// 	}
+				// 	break;
 			}
 		},
-		onLoad(e) {
-			this.productId = e.id
-			this.getProDetail(e)
-			this.getComments()
-			this.getLinkPros(this.productId)
-			// console.log(emojiList1,'emojiList1')
+		showImg(e) {
+			// console.log(e,'点击的内容')
+			// let contentimg = e.target.dataset.nodes;
+			this.previewImage(e.target.node.attrs.src)
 		},
-		computed: {
-			...mapState(['userInfo']),
+
+		gotoDetail(item) {
+			//	console.log(item,'gotoDetail')
+			uni.navigateTo({
+				url: '../bookShop/commodityDetail?id=' + item.productId
+			});
 		},
-		components: {
-			musicPlay
+		closeUpo() {
+			console.log('关闭弹窗')
+			this.upoShow = false
 		},
-		methods: {
-			showImg(e) {
-				// console.log(e,'点击的内容')
-				// let contentimg = e.target.dataset.nodes;
-				this.previewImage(e.target.node.attrs.src)
-			},
-
-			gotoDetail(item) {
-				//	console.log(item,'gotoDetail')
-				uni.navigateTo({
-					url: '../bookShop/commodityDetail?id=' + item.productId
-				});
-			},
-			closeUpo() {
-				console.log('关闭弹窗')
-				this.upoShow = false
-			},
-			// 点击其他套餐
-			previewProduct(item, index) {
-				console.log(item, 'item')
-				this.linkimg = item.productImages
-				this.upoShow = true
-				this.linkCur = index
-			},
-			// 获取商品关联商品
-			getLinkPros(id) {
-				this.$http
-					.post('book/shopproduct/getGlProductList', {
-						'productId': id
-					})
-					.then(res => {
-						console.log('关联商品', res)
-						if (res.code == 0) {
-							if (res.result.length > 0) {
-								this.linkProducts = res.result
-								this.linkimg = this.linkProducts[0].productImages
-								this.linkCur = 0
-							} else {
-								this.linkProducts = []
-							}
-						}
-					})
-					.catch(e => {
-						console.log(e, 'e')
-					})
-			},
-			goToListen(id) {
-				// 跳转到听书
-				uni.navigateTo({
-					url: "../listen/listen?bookid=" + id
-				});
-			},
-			// 放大图片
-			previewImage(url) {
-				console.log(url)
-				uni.previewImage({
-					urls: [url],
-					longPressActions: {
-						itemList: ['很抱歉，暂不支持保存图片到本地'],
-						success: function(res) {
-							// console.log(res,'+++++')
-						}
-					}
-				});
-			},
-			// 获取html格式的评论1
-			getHtmlComment(comment) {
-				// 格式化html
-				//	 console.log(comment,'comment')
-				// 这里处理 链接   换行符
-				let replacedStr = comment.replace(/\[([^(\]|\[)]*)\]/g, (item, index) => {
-					// console.log(item, index)
-					var indexss = emojiList1.findIndex(item1 => item1.alt === item)
-					// console.log(indexss, 'indexss')
-					return '<img src="https://www.nuttyreading.com/emojis/emojis/qq/' + emojiList1[indexss].url +
-						'" width="18rpx">';
-				});
-				// console.log(replacedStr,'replacedStr')
-				return replacedStr.replace(/(\r\n)|(\n)/g, '<br>');
-
-
-			},
-			// 获取评价
-			getComments() {
-				$http.request({
-						url: "buy/record/All",
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档1
-						data: {
-							'bookid': this.productId
-						},
-						header: { //默认 无 说明：请求头
-							'Content-Type': 'application/json'
-						},
-					})
-					.then(res => {
-						if (res.code == 0) {
-							console.log(res.list, 'res.list')
-							this.commentsList = res.list.map(item => {
-								var imgList = []
-								if (item.images !== null) {
-									imgList = item.images.split(',')
-									item.images = imgList
-									return item
-								} else {
-									return item
-								}
-							})
-							// 评论格式化							
-							var newarr = []
-							this.commentsList.forEach((item1) => {
-								var pjstr = ''
-								var zpstr = ''
-								pjstr = this.getHtmlComment(item1.content)
-								item1.followUpcontent == '' ? zpstr = '' : zpstr = this.getHtmlComment(item1
-									.followUpcontent)
-								//console.log(pjstr,'99999999999----------')
-								item1.phtml = pjstr
-								item1.zphtml = zpstr
-								newarr.push(item1)
-
-							})
-							this.commentsList = newarr
-							// console.log(this.commentsList,'评价+++++')							
-							// this.commentsList = res.list
-						}
-					})
-			},
-			getProDetail(e) {
-				// 获取商品详情
-				uni.showLoading({
-					title: '加载中'
-				});
-				console.log(e.id, 'e.id')
-				this.$http
-					.post('/book/shopproduct/info/' + e.id)
-					.then(res => {
-						console.log('shopproduct', res)
-						this.productInfo = res.shopProduct
-						this.listenList = res.shopProduct.bookidsimages
-						if (this.productInfo.productImageList == null || this.productInfo.productImageList == '') {
-							this.swiperlist.push(this.productInfo.productImages)
-						} else {
-							let imgList = this.productInfo.productImageList.split(",")
-							// if(this.productInfo.productDetails != null){
-							// 	let info = this.formatRichText(this.productInfo.productDetails)
-							// }
-							// this.productInfo.productDetails = info						
-							for (var i = 0; i < imgList.length; i++) {
-								this.swiperlist.push(imgList[i])
-							}
-						}
-						uni.hideLoading();
-					}).catch(e => {
-						console.log(e, 'e')
-						uni.hideLoading();
-						if (e.msg == '该商品不存在，看看其他商品吧') {
-							setTimeout(() => {
-								uni.navigateBack({
-									delta: 1
-								});
-							}, 2000)
-						}
-
-
-					})
-			},
-
-			contentButtonClick(e) {
-				this.contentShow = e.index
-			},
-			// 点击购物车
-			onClick(e) {
-				console.log(e.content.text)
-				uni.navigateTo({
-					url: '../peanut/shopping'
-				});
-			},
-			// 关联商品点击按钮组件
-			buttonClickLink(e) {
-				console.log('点击的是关联商品的组件')
-				if (e.index == 0) {
-					// 点击的是加入购物车
-					if (this.linkProducts[this.linkCur].productStock == 0) {
-						uni.showToast({
-							title: '商品库存不足',
-							icon: "none",
-							duration: 1000,
-						});
-					} else {
-						this.$http
-							.post(`book/ordercart/getCartList?userId=${this.userInfo.id}`)
-							.then(res => {
-								this.cartList = res.cartList
-								this.isAddLink(this.linkProducts[this.linkCur])
-							})
-					}
-				} else {
-					// 点击的是立即购买
-					if (this.linkProducts[this.linkCur].productStock == 0) {
-						uni.showToast({
-							title: '商品库存不足',
-							icon: "none",
-							duration: 1000,
-						});
-					} else {
-						uni.navigateTo({
-							url: '../bookShop/settlement?type=2&list=' + this.linkProducts[this.linkCur].productId
-						});
-					}
-				}
-			},
-			// 点击按钮组间
-			buttonClick(e) {
-				//	console.log(e)	
-				if (e.index == 0) {
-					// 点击的是加入购物车
-					//	console.log('+.........',this.linkProducts,'this.linkProducts')
-					if (this.linkProducts.length == 0) {
-						this.addCart()
-					} else {
-						this.upoShow = true
-					}
-
-				} else {
-					// 点击的是立即购买
-					if (this.linkProducts.length == 0) {
-						this.goPurse()
-					} else {
-						this.upoShow = true
-					}
-				}
-			},
-			goToListenNone() {
-				uni.showToast({
-					title: '该书暂未生成音频内容，敬请期待！',
-					icon: 'none'
+		// 点击其他套餐
+		previewProduct(item, index) {
+			console.log(item, 'item')
+			this.linkimg = item.productImages
+			this.upoShow = true
+			this.linkCur = index
+		},
+		// 获取商品关联商品
+		getLinkPros(id) {
+			this.$http
+				.post('book/shopproduct/getGlProductList', {
+					'productId': id
 				})
-			},
-			// 加入购物车
-			addCart() {
-				if (this.productInfo.productStock == 0) {
+				.then(res => {
+					console.log('关联商品', res)
+					if (res.code == 0) {
+						if (res.result.length > 0) {
+							this.linkProducts = res.result
+							this.linkimg = this.linkProducts[0].productImages
+							this.linkCur = 0
+						} else {
+							this.linkProducts = []
+						}
+					}
+				})
+				.catch(e => {
+					console.log(e, 'e')
+				})
+		},
+		goToListen(id) {
+			// 跳转到听书
+			uni.navigateTo({
+				url: "../listen/listen?bookid=" + id
+			});
+		},
+		// 放大图片
+		previewImage(url) {
+			console.log(url)
+			uni.previewImage({
+				urls: [url],
+				longPressActions: {
+					itemList: ['很抱歉，暂不支持保存图片到本地'],
+					success: function (res) {
+						// console.log(res,'+++++')
+					}
+				}
+			});
+		},
+		// 获取html格式的评论1
+		getHtmlComment(comment) {
+			// 格式化html
+			//	 console.log(comment,'comment')
+			// 这里处理 链接   换行符
+			let replacedStr = comment.replace(/\[([^(\]|\[)]*)\]/g, (item, index) => {
+				// console.log(item, index)
+				var indexss = emojiList1.findIndex(item1 => item1.alt === item)
+				// console.log(indexss, 'indexss')
+				return '<img src="https://www.nuttyreading.com/emojis/emojis/qq/' + emojiList1[indexss].url +
+					'" width="18rpx">';
+			});
+			// console.log(replacedStr,'replacedStr')
+			return replacedStr.replace(/(\r\n)|(\n)/g, '<br>');
+
+
+		},
+		// 获取评价
+		getComments() {
+			$http.request({
+				url: "buy/record/All",
+				method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档1
+				data: {
+					'bookid': this.productId
+				},
+				header: { //默认 无 说明：请求头
+					'Content-Type': 'application/json'
+				},
+			})
+				.then(res => {
+					if (res.code == 0) {
+						console.log(res.list, 'res.list')
+						this.commentsList = res.list.map(item => {
+							var imgList = []
+							if (item.images !== null) {
+								imgList = item.images.split(',')
+								item.images = imgList
+								return item
+							} else {
+								return item
+							}
+						})
+						// 评论格式化							
+						var newarr = []
+						this.commentsList.forEach((item1) => {
+							var pjstr = ''
+							var zpstr = ''
+							pjstr = this.getHtmlComment(item1.content)
+							item1.followUpcontent == '' ? zpstr = '' : zpstr = this.getHtmlComment(item1
+								.followUpcontent)
+							//console.log(pjstr,'99999999999----------')
+							item1.phtml = pjstr
+							item1.zphtml = zpstr
+							newarr.push(item1)
+
+						})
+						this.commentsList = newarr
+						// console.log(this.commentsList,'评价+++++')							
+						// this.commentsList = res.list
+					}
+				})
+		},
+		getProDetail(e) {
+			// 获取商品详情
+			uni.showLoading({
+				title: '加载中'
+			});
+			console.log(e.id, 'e.id')
+			this.$http
+				.post('/book/shopproduct/info/' + e.id)
+				.then(res => {
+					console.log('shopproduct', res)
+					this.productInfo = res.shopProduct
+					this.listenList = res.shopProduct.bookidsimages
+					if (this.productInfo.productImageList == null || this.productInfo.productImageList == '') {
+						this.swiperlist.push(this.productInfo.productImages)
+					} else {
+						let imgList = this.productInfo.productImageList.split(",")
+						// if(this.productInfo.productDetails != null){
+						// 	let info = this.formatRichText(this.productInfo.productDetails)
+						// }
+						// this.productInfo.productDetails = info						
+						for (var i = 0; i < imgList.length; i++) {
+							this.swiperlist.push(imgList[i])
+						}
+					}
+					uni.hideLoading();
+				}).catch(e => {
+					console.log(e, 'e')
+					uni.hideLoading();
+					if (e.msg == '该商品不存在，看看其他商品吧') {
+						setTimeout(() => {
+							uni.navigateBack({
+								delta: 1
+							});
+						}, 2000)
+					}
+
+
+				})
+		},
+
+		contentButtonClick(e) {
+			this.contentShow = e.index
+		},
+		// 点击购物车
+		onClick(e) {
+			console.log(e.content.text)
+			uni.navigateTo({
+				url: '../peanut/shopping'
+			});
+		},
+		// 关联商品点击按钮组件
+		buttonClickLink(e) {
+			console.log(e, '点击的是关联商品的组件')
+			if (e.index == 0) {
+				// 点击的是加入购物车
+				if (this.linkProducts[this.linkCur].productStock == 0) {
 					uni.showToast({
 						title: '商品库存不足',
 						icon: "none",
 						duration: 1000,
 					});
 				} else {
+					console.log(this.userInfo, '222')
 					this.$http
 						.post(`book/ordercart/getCartList?userId=${this.userInfo.id}`)
 						.then(res => {
+
+							// console.log(
 							this.cartList = res.cartList
-							this.isAdd()
+							this.isAddLink(this.linkProducts[this.linkCur])
 						})
 				}
-
-			},
-			isAddLink(item) {
-				// 统计商品信息
-				let data = {
-					"userId": this.userInfo.id,
-					"productId": item.productId,
-					"productAmount": this.productAmount,
-					"price": item.price
-				}
-				// 判断列表是否为空
-				if (this.cartList.length > 0) {
-					let flag = ''
-					let shagnpin = {}
-					// 循环购物车列表
-					flag = this.cartList.some((item, index) => {
-						if (item.productId == data.productId) {
-							shagnpin = item
-							shagnpin.productAmount = item.productAmount + 1
-							return true
-						}
-					})
-					if (flag) {
-						// 已在购物车中添加
-						$http.request({
-							url: "book/ordercart/update",
-							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-							data: shagnpin,
-							header: { //默认 无 说明：请求头
-								'Content-Type': 'application/json'
-							},
-						}).then(res => {
-							if (res.code == 0) {
-								this.upoShow = false
-								uni.showToast({
-									title: '加入购物车成功',
-									duration: 1000,
-								});
-							}
-						})
-					} else {
-						// 加入购物车
-						$http.request({
-							url: "book/ordercart/save",
-							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-							data,
-							header: { //默认 无 说明：请求头
-								'Content-Type': 'application/json'
-							},
-						}).then(res => {
-							if (res.code == 0) {
-								this.upoShow = false
-								uni.showToast({
-									title: '加入购物车成功',
-									duration: 1000,
-								});
-							}
-						})
-					}
-
-				} else {
-					// 购物车列表为空时直接加入购物车
-					$http.request({
-						url: "book/ordercart/save",
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-						data,
-						header: { //默认 无 说明：请求头
-							'Content-Type': 'application/json'
-						},
-					}).then(res => {
-						if (res.code == 0) {
-							uni.showToast({
-								title: '加入购物车成功',
-								duration: 1000,
-							});
-						}
-					})
-				}
-			},
-			isAdd() {
-				// 统计商品信息
-				let data = {
-					"userId": this.userInfo.id,
-					"productId": this.productInfo.productId,
-					"productAmount": this.productAmount,
-					"price": this.productInfo.price
-				}
-				// 判断列表是否为空
-				if (this.cartList.length > 0) {
-					let flag = ''
-					let shagnpin = {}
-					// 循环购物车列表
-					flag = this.cartList.some((item, index) => {
-						if (item.productId == data.productId) {
-							shagnpin = item
-							shagnpin.productAmount = item.productAmount + 1
-							return true
-						}
-					})
-					if (flag) {
-						// 已在购物车中添加
-						$http.request({
-							url: "book/ordercart/update",
-							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-							data: shagnpin,
-							header: { //默认 无 说明：请求头
-								'Content-Type': 'application/json'
-							},
-						}).then(res => {
-							if (res.code == 0) {
-								uni.showToast({
-									title: '加入购物车成功',
-									duration: 1000,
-								});
-							}
-						})
-					} else {
-						// 加入购物车
-						$http.request({
-							url: "book/ordercart/save",
-							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-							data,
-							header: { //默认 无 说明：请求头
-								'Content-Type': 'application/json'
-							},
-						}).then(res => {
-							if (res.code == 0) {
-								uni.showToast({
-									title: '加入购物车成功',
-									duration: 1000,
-								});
-							}
-						})
-					}
-
-				} else {
-					// 购物车列表为空时直接加入购物车
-					$http.request({
-						url: "book/ordercart/save",
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-						data,
-						header: { //默认 无 说明：请求头
-							'Content-Type': 'application/json'
-						},
-					}).then(res => {
-						if (res.code == 0) {
-							uni.showToast({
-								title: '加入购物车成功',
-								duration: 1000,
-							});
-						}
-					})
-				}
-			},
-
-			// 购买下单
-			goPurse() {
-				if (this.productInfo.productStock == 0) {
+			} else {
+				// 点击的是立即购买
+				if (this.linkProducts[this.linkCur].productStock == 0) {
 					uni.showToast({
 						title: '商品库存不足',
 						icon: "none",
@@ -690,442 +578,724 @@
 					});
 				} else {
 					uni.navigateTo({
-						url: '../bookShop/settlement?type=2&list=' + this.productInfo.productId
+						url: '../bookShop/settlement?type=2&list=' + this.linkProducts[this.linkCur].productId
 					});
 				}
-
-			},
-			formatRichText(html) { //控制图片大小
-				let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
-					match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
-					match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
-					match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
-					return match;
-				});
-				newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {
-					match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi,
-						'max-width:100%;');
-					return match;
-				});
-				// newContent = newContent.replace(/<img[^>]*>/gi, function(match, capture) {
-				// 	match = match.replace(/<img[^>]*>/gi, "@click='1111'").replace(/<img[^>]*>/gi, "@click='1111'");
-				// 	return match;
-				// });
-				newContent = newContent.replace(/<br[^>]*\/>/gi, '');
-				newContent = newContent.replace(/\<img/gi,
-					'<img style="max-width:100%;height:auto;display:inline-block;margin:10rpx auto;"');
-				return newContent;
-			},
-			// 去购物车
-			goCard() {
-				uni.switchTab({
-					url: '../peanut/shopping'
-				});
-			},
-			clickImg() {
-				console.log('点击了图片')
 			}
 		},
-		filters: {
-			/**
-			 * 处理富文本里的图片宽度自适应
-			 * 1.去掉img标签里的style、width、height属性
-			 * 2.img标签添加style属性：max-width:100%;height:auto
-			 * 3.修改所有style里的width属性为max-width:100%
-			 * 4.去掉<br/>标签
-			 * @param html
-			 * @returns {void|string|*}
-			 */
-			formatRichText(html) { //控制小程序中图片大小
-				let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
-					match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
-					match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
-					match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
-					return match;
-				});
-				newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {
-					match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi,
-						'max-width:100%;');
-					return match;
-				});
-				newContent = newContent.replace(/<br[^>]*\/>/gi, '');
-				newContent = newContent.replace(/\<img/gi,
-					'<img style="max-width:100%;height:auto;display:inline-block;margin:10rpx auto;"');
-				return newContent;
-			},
-			// 时间格式化
-			formatDate(date) {
-				console.log(date)
-				let newDate = new Date(date);
-				let year = newDate.getFullYear();
-				let month = newDate.getMonth().toString().padStart(2, 0);
-				let day = newDate.getDay().toString().padStart(2, 0);
-				return year + '-' + month + '-' + day;
+		// 点击按钮组间
+		buttonClick(e) {
+			//	console.log(e)	
+			if (e.index == 0) {
+				// 点击的是加入购物车
+				//	console.log('+.........',this.linkProducts,'this.linkProducts')
+				if (this.linkProducts.length == 0) {
+					this.addCart()
+				} else {
+					this.upoShow = true
+				}
+
+			} else {
+				// 点击的是立即购买
+				if (this.linkProducts.length == 0) {
+					this.goPurse()
+				} else {
+					this.upoShow = true
+				}
 			}
+		},
+		goToListenNone() {
+			uni.showToast({
+				title: '该书暂未生成音频内容，敬请期待！',
+				icon: 'none'
+			})
+		},
+		// 加入购物车
+		addCart() {
+			if (this.productInfo.productStock == 0) {
+				uni.showToast({
+					title: '商品库存不足',
+					icon: "none",
+					duration: 1000,
+				});
+			} else {
+				this.$http
+					.post(`book/ordercart/getCartList?userId=${this.userInfo.id}`)
+					.then(res => {
+						this.cartList = res.cartList
+						this.isAdd()
+					})
+			}
+
+		},
+		isAddLink(item) {
+			// 统计商品信息
+			let data = {
+				"userId": this.userInfo.id,
+				"productId": item.productId,
+				"productAmount": this.productAmount,
+				"price": item.price
+			}
+			// 判断列表是否为空
+			if (this.cartList.length > 0) {
+				let flag = ''
+				let shagnpin = {}
+				// 循环购物车列表
+				flag = this.cartList.some((item, index) => {
+					if (item.productId == data.productId) {
+						shagnpin = item
+						shagnpin.productAmount = item.productAmount + 1
+						return true
+					}
+				})
+				if (flag) {
+					// 已在购物车中添加
+					$http.request({
+						url: "book/ordercart/update",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: shagnpin,
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {
+						if (res.code == 0) {
+							this.upoShow = false
+							uni.showToast({
+								title: '加入购物车成功',
+								duration: 1000,
+							});
+						}
+					})
+				} else {
+					// 加入购物车
+					$http.request({
+						url: "book/ordercart/save",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data,
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {
+						if (res.code == 0) {
+							this.upoShow = false
+							uni.showToast({
+								title: '加入购物车成功',
+								duration: 1000,
+							});
+						}
+					})
+				}
+
+			} else {
+				// 购物车列表为空时直接加入购物车
+				$http.request({
+					url: "book/ordercart/save",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+					data,
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title: '加入购物车成功',
+							duration: 1000,
+						});
+					}
+				})
+			}
+		},
+		isAdd() {
+			// 统计商品信息
+			let data = {
+				"userId": this.userInfo.id,
+				"productId": this.productInfo.productId,
+				"productAmount": this.productAmount,
+				"price": this.productInfo.price
+			}
+			// 判断列表是否为空
+			if (this.cartList.length > 0) {
+				let flag = ''
+				let shagnpin = {}
+				// 循环购物车列表
+				flag = this.cartList.some((item, index) => {
+					if (item.productId == data.productId) {
+						shagnpin = item
+						shagnpin.productAmount = item.productAmount + 1
+						return true
+					}
+				})
+				if (flag) {
+					// 已在购物车中添加
+					$http.request({
+						url: "book/ordercart/update",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: shagnpin,
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {
+						if (res.code == 0) {
+							uni.showToast({
+								title: '加入购物车成功',
+								duration: 1000,
+							});
+						}
+					})
+				} else {
+					// 加入购物车
+					$http.request({
+						url: "book/ordercart/save",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data,
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					}).then(res => {
+						if (res.code == 0) {
+							uni.showToast({
+								title: '加入购物车成功',
+								duration: 1000,
+							});
+						}
+					})
+				}
+
+			} else {
+				// 购物车列表为空时直接加入购物车
+				$http.request({
+					url: "book/ordercart/save",
+					method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+					data,
+					header: { //默认 无 说明：请求头
+						'Content-Type': 'application/json'
+					},
+				}).then(res => {
+					if (res.code == 0) {
+						uni.showToast({
+							title: '加入购物车成功',
+							duration: 1000,
+						});
+					}
+				})
+			}
+		},
+
+		// 购买下单
+		goPurse() {
+			if (this.productInfo.productStock == 0) {
+				uni.showToast({
+					title: '商品库存不足',
+					icon: "none",
+					duration: 1000,
+				});
+			} else {
+				uni.navigateTo({
+					url: '../bookShop/settlement?type=2&list=' + this.productInfo.productId
+				});
+			}
+
+		},
+		formatRichText(html) { //控制图片大小
+			let newContent = html.replace(/<img[^>]*>/gi, function (match, capture) {
+				match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+				match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+				match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+				return match;
+			});
+			newContent = newContent.replace(/style="[^"]+"/gi, function (match, capture) {
+				match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi,
+					'max-width:100%;');
+				return match;
+			});
+			// newContent = newContent.replace(/<img[^>]*>/gi, function(match, capture) {
+			// 	match = match.replace(/<img[^>]*>/gi, "@click='1111'").replace(/<img[^>]*>/gi, "@click='1111'");
+			// 	return match;
+			// });
+			newContent = newContent.replace(/<br[^>]*\/>/gi, '');
+			newContent = newContent.replace(/\<img/gi,
+				'<img style="max-width:100%;height:auto;display:inline-block;margin:10rpx auto;"');
+			return newContent;
+		},
+		// 去购物车
+		goCard() {
+			uni.switchTab({
+				url: '../peanut/shopping'
+			});
+		},
+		clickImg() {
+			console.log('点击了图片')
+		}
+	},
+	filters: {
+		/**
+		 * 处理富文本里的图片宽度自适应
+		 * 1.去掉img标签里的style、width、height属性
+		 * 2.img标签添加style属性：max-width:100%;height:auto
+		 * 3.修改所有style里的width属性为max-width:100%
+		 * 4.去掉<br/>标签
+		 * @param html
+		 * @returns {void|string|*}
+		 */
+		formatRichText(html) { //控制小程序中图片大小
+			let newContent = html.replace(/<img[^>]*>/gi, function (match, capture) {
+				match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+				match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+				match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+				return match;
+			});
+			newContent = newContent.replace(/style="[^"]+"/gi, function (match, capture) {
+				match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi,
+					'max-width:100%;');
+				return match;
+			});
+			newContent = newContent.replace(/<br[^>]*\/>/gi, '');
+			newContent = newContent.replace(/\<img/gi,
+				'<img style="max-width:100%;height:auto;display:inline-block;margin:10rpx auto;"');
+			return newContent;
+		},
+		// 时间格式化
+		formatDate(date) {
+			console.log(date)
+			let newDate = new Date(date);
+			let year = newDate.getFullYear();
+			let month = newDate.getMonth().toString().padStart(2, 0);
+			let day = newDate.getDay().toString().padStart(2, 0);
+			return year + '-' + month + '-' + day;
 		}
 	}
+}
 </script>
 <style lang="scss" scoped>
-	.header_fixed {
-		background-color: #fff;
-	}
+.header_fixed {
+	background-color: #fff;
+}
 
-	.tanchu {
-		background: #fff;
-		position: relative;
-		padding: 40rpx 30rpx 40rpx 30rpx;
-		position: relative;
+.tanchu {
+	background: #fff;
+	position: relative;
+	padding: 40rpx 30rpx 40rpx 30rpx;
+	position: relative;
 
-		.list {
-			margin-bottom: 140rpx;
+	.list {
+		margin-bottom: 140rpx;
 
-			.imgBox {
-				height: 500rpx;
+		.imgBox {
+			height: 500rpx;
+			width: 100%;
+			margin-bottom: 10rpx;
+			position: relative;
+
+			.xiangxi {
+				text-align: center;
+				position: absolute;
+				left: 0;
+				bottom: 20rpx;
 				width: 100%;
-				margin-bottom: 10rpx;
-				position: relative;
 
-				.xiangxi {
-					text-align: center;
-					position: absolute;
-					left: 0;
-					bottom: 20rpx;
-					width: 100%;
-
-					text {
-						padding: 10rpx 20rpx;
-						font-size: 32rpx;
-						background-color: rgba(235, 160, 11, .9);
-						color: #def0ea;
-						border-radius: 10px;
-					}
+				text {
+					padding: 10rpx 20rpx;
+					font-size: 32rpx;
+					background-color: rgba(235, 160, 11, .9);
+					color: #def0ea;
+					border-radius: 10px;
 				}
 			}
 		}
-
-		.spbh {
-			border: 2rpx solid #fff;
-
-			.spbhimg {
-				image {
-					border: none !important;
-				}
-			}
-		}
-
-		.spbh.cur {
-			border: 2rpx solid #eba00b;
-			border-radius: 10rpx;
-			overflow: hidden;
-		}
-	}
-
-	.tingshuList {
-		margin-top: 20rpx;
-		background-color: #fff;
-		padding: 20rpx;
-		border-radius: 20rpx;
-		margin-bottom: 20rpx;
-		padding-top: 40rpx;
-		background-image: linear-gradient(0deg, #f7fffc 0%, #def0ea 100%);
-
-		.item {
-			margin-bottom: 20rpx;
-			vertical-align: middle;
-		}
-
-		h4 {
-			color: #5fb386;
-			font-size: 40rpx;
-			margin-bottom: 20rpx;
-		}
-
-		text {
-			color: #444;
-			font-size: 32rpx;
-			padding-left: 20rpx;
-		}
-	}
-
-	.pjimgs {
-		margin: 0;
-		flex-wrap: wrap;
-		display: flex;
-		justify-content: space-between;
-
-		.item {
-			width: 23%;
-			padding-right: 20rpx;
-			margin-top: 10rpx;
-
-			image {
-				border-radius: 15rpx;
-			}
-		}
-
-	}
-
-	.star {
-		display: inline-block;
-		width: 15px;
-		height: 15px;
-		margin-right: 6rpx;
-	}
-
-	.starGray {
-		background: url(../../static/icon/star_greey.png) no-repeat;
-		background-size: contain;
-	}
-
-	.starLight {
-		background: url(../../static/icon/star_light.png) no-repeat;
-		background-size: contain;
-	}
-
-	.quesheng {
-		text-align: center;
-		margin-top: 0rpx;
-		color: #8b8a91;
-	}
-
-	.pingjia {
-		background-color: #f5f5f5;
-		border-radius: 20rpx;
-		// margin-top: 20rpx;
-		padding: 30rpx 30rpx 20rpx;
-
-	}
-
-	.pingjiaBox {
-		color: #555;
-		margin-bottom: 20rpx;
-	}
-
-	.flexbox {
-		display: flex;
-	}
-
-	.contentBox {
-		width: 100%;
-		box-sizing: border-box;
-		padding: 0rpx 10rpx 30rpx 6rpx;
-
-		.content {
-			font-size: 28rpx;
-			line-height: 40rpx;
-			margin-top: 10rpx;
-		}
-
-		.time {
-			font-size: 24rpx;
-			color: #999;
-			padding-top: 6rpx;
-			float: right;
-		}
 	}
 
 	.spbh {
-		padding-bottom: 10rpx;
-		font-size: 26rpx;
-		padding: 0 10rpx;
+		border: 2rpx solid #fff;
+
+		.spbhimg {
+			image {
+				border: none !important;
+			}
+		}
 	}
 
-	.spbhimg {
-		width: 40px;
+	.spbh.cur {
+		border: 2rpx solid #eba00b;
+		border-radius: 10rpx;
 		overflow: hidden;
-		text-align: center;
+	}
+}
+
+.tingshuList {
+	margin-top: 20rpx;
+	background-color: #fff;
+	padding: 20rpx;
+	border-radius: 20rpx;
+	margin-bottom: 20rpx;
+	padding-top: 40rpx;
+	background-image: linear-gradient(0deg, #f7fffc 0%, #def0ea 100%);
+
+	.item {
+		margin-bottom: 20rpx;
+		vertical-align: middle;
+	}
+
+	h4 {
+		color: #5fb386;
+		font-size: 40rpx;
+		margin-bottom: 20rpx;
+	}
+
+	text {
+		color: #444;
+		font-size: 32rpx;
+		padding-left: 20rpx;
+	}
+}
+
+.pjimgs {
+	margin: 0;
+	flex-wrap: wrap;
+	display: flex;
+	justify-content: space-between;
+
+	.item {
+		width: 23%;
+		padding-right: 20rpx;
+		margin-top: 10rpx;
 
 		image {
-			width: 40px !important;
-			padding: 3px;
-			height: 40px !important;
-			border: 1px solid #eee;
-			border-radius: 6rpx;
-			overflow: hidden;
+			border-radius: 15rpx;
 		}
+	}
 
+}
+
+.star {
+	display: inline-block;
+	width: 15px;
+	height: 15px;
+	margin-right: 6rpx;
+}
+
+.starGray {
+	background: url(../../static/icon/star_greey.png) no-repeat;
+	background-size: contain;
+}
+
+.starLight {
+	background: url(../../static/icon/star_light.png) no-repeat;
+	background-size: contain;
+}
+
+.quesheng {
+	text-align: center;
+	margin-top: 0rpx;
+	color: #8b8a91;
+}
+
+.pingjia {
+	background-color: #f5f5f5;
+	border-radius: 20rpx;
+	// margin-top: 20rpx;
+	padding: 30rpx 30rpx 20rpx;
+
+}
+
+.pingjiaBox {
+	color: #555;
+	margin-bottom: 20rpx;
+}
+
+.flexbox {
+	display: flex;
+}
+
+.contentBox {
+	width: 100%;
+	box-sizing: border-box;
+	padding: 0rpx 10rpx 30rpx 6rpx;
+
+	.content {
+		font-size: 28rpx;
+		line-height: 40rpx;
+		margin-top: 10rpx;
+	}
+
+	.time {
+		font-size: 24rpx;
+		color: #999;
+		padding-top: 6rpx;
+		float: right;
+	}
+}
+
+.spbh {
+	padding-bottom: 10rpx;
+	font-size: 26rpx;
+	padding: 0 10rpx;
+}
+
+.spbhimg {
+	width: 40px;
+	overflow: hidden;
+	text-align: center;
+
+	image {
+		width: 40px !important;
+		padding: 3px;
+		height: 40px !important;
+		border: 1px solid #eee;
+		border-radius: 6rpx;
+		overflow: hidden;
+	}
+
+}
+
+.username {
+	margin-left: 10rpx;
+}
+
+.price {
+	margin-left: 5px;
+	color: #ffa200;
+	font-weight: bold;
+}
+
+.nowrap {
+	white-space: nowrap;
+	overflow-x: hidden;
+	text-overflow: ellipsis;
+}
+
+.touxiang {
+	width: 40px;
+	overflow: hidden;
+	text-align: center;
+
+	image {
+		width: 40px !important;
+		padding: 3px;
+		height: 40px !important;
+		border: 1px solid #eee;
+		border-radius: 64px;
+		overflow: hidden;
+		;
 	}
 
 	.username {
-		margin-left: 10rpx;
-	}
-
-	.price {
-		margin-left: 5px;
-		color: #ffa200;
-		font-weight: bold;
-	}
-
-	.nowrap {
-		white-space: nowrap;
-		overflow-x: hidden;
-		text-overflow: ellipsis;
-	}
-
-	.touxiang {
-		width: 40px;
-		overflow: hidden;
-		text-align: center;
-
-		image {
-			width: 40px !important;
-			padding: 3px;
-			height: 40px !important;
-			border: 1px solid #eee;
-			border-radius: 64px;
-			overflow: hidden;
-			;
-		}
-
-		.username {
-			font-size: 24rpx;
-			color: #999;
-			margin-top: 6rpx;
-		}
-	}
-
-	.aligncenter {
-		align-items: center;
-	}
-
-	.xiangqing {
-		overflow: hidden;
-		overflow-x: hidden;
-
-		img {
-			display: block;
-			max-width: 100%;
-		}
-
-		p {
-			max-width: 100%;
-		}
-	}
-
-	.goods_nav {
-		z-index: 1;
-		position: fixed;
-		bottom: 0;
-		width: 100%;
-	}
-
-	.SoldNumber {
 		font-size: 24rpx;
 		color: #999;
-		margin-top: 16rpx;
-		font-weight: 400;
+		margin-top: 6rpx;
+	}
+}
+
+.aligncenter {
+	align-items: center;
+}
+
+.xiangqing {
+	overflow: hidden;
+	overflow-x: hidden;
+
+	img {
+		display: block;
+		max-width: 100%;
 	}
 
-	.bookInfo {
-		// padding: 20px 10px;
-		// line-height: 30rpx;
-		// background-color: #fff;
-		font-size: 26rpx;
-		color: #555;
-		// border-radius: 20rpx 20rpx 0 0
+	p {
+		max-width: 100%;
 	}
+}
 
-	.header {
-		position: fixed;
-		top: 0%;
-		left: 0%;
-		z-index: 999;
-	}
+.goods_nav {
+	z-index: 1;
+	position: fixed;
+	bottom: 0;
+	width: 100%;
+}
 
-	.contentButton {
-		// margin: 10px 0;
-	}
+.SoldNumber {
+	font-size: 24rpx;
+	color: #999;
+	margin-top: 16rpx;
+	font-weight: 400;
+}
 
-	.swiperBox {
-		width: 100%;
-		height: 375px;
-		margin-top: 150rpx;
-	}
+.bookInfo {
+	// padding: 20px 10px;
+	// line-height: 30rpx;
+	// background-color: #fff;
+	font-size: 26rpx;
+	color: #555;
+	// border-radius: 20rpx 20rpx 0 0
+}
 
-	.commodityContent {
-		background-color: #fff;
-		padding: 30rpx 30rpx 10rpx 30rpx;
-		height: auto;
-		font-size: 26rpx;
+.header {
+	position: fixed;
+	top: 0%;
+	left: 0%;
+	z-index: 999;
+}
 
-		.commodityPrice {
-			// background-image: linear-gradient(0deg, #f7fffc 0%, #def0ea 100%);
-			// border-top: 1px solid #fff;
-			// background-color: #f7faf9;
-			// border-top-left-radius: 20rpx;
-			// border-top-right-radius: 20rpx;
-			color: #ffa200;
-			padding: 0rpx 0rpx 0rpx 16rpx;
+.contentButton {
+	// margin: 10px 0;
+}
 
-			em {
-				font-size: 40rpx;
-				font-style: normal;
-			}
+.swiperBox {
+	width: 100%;
+	height: 375px;
+	margin-top: 150rpx;
+}
 
-			.oldPrice {
-				background-color: #ff000013;
-				;
-				padding: 4rpx 14rpx;
-				border-radius: 20rpx;
-				margin-left: 20rpx;
-				font-size: 28rpx;
-				color: #ff0000;
-			}
-		}
+.commodityContent {
+	background-color: #fff;
+	padding: 30rpx 30rpx 10rpx 30rpx;
+	height: auto;
+	font-size: 26rpx;
 
-		.commodityyName {
-			margin-top: -20rpx;
-			padding: 30rpx 20rpx 40rpx 20rpx;
+	.commodityPrice {
+		// background-image: linear-gradient(0deg, #f7fffc 0%, #def0ea 100%);
+		// border-top: 1px solid #fff;
+		// background-color: #f7faf9;
+		// border-top-left-radius: 20rpx;
+		// border-top-right-radius: 20rpx;
+		color: #ffa200;
+		padding: 0rpx 0rpx 0rpx 16rpx;
+
+		em {
 			font-size: 40rpx;
-			font-weight: 600;
-			border-top-left-radius: 20rpx;
-			border-top-right-radius: 20rpx;
-			background-color: #fff;
+			font-style: normal;
 		}
 
-		.commodityIntroduce {
-			font-size: 30rpx;
-			// background-color: #fff;
-			// padding: 0 20rpx 30rpx 20rpx;
+		.oldPrice {
+			background-color: #ff000013;
+			;
+			padding: 4rpx 14rpx;
+			border-radius: 20rpx;
+			margin-left: 20rpx;
+			font-size: 28rpx;
+			color: #ff0000;
 		}
 	}
 
-	.footer {
-		width: 100%;
-		height: 100rpx;
+	.commodityyName {
+		margin-top: -20rpx;
+		padding: 30rpx 20rpx 40rpx 20rpx;
+		font-size: 40rpx;
+		font-weight: 600;
+		border-top-left-radius: 20rpx;
+		border-top-right-radius: 20rpx;
 		background-color: #fff;
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		position: fixed;
-		bottom: 0%;
+	}
 
-		.shopcard {
-			margin: 0 0 0 30rpx;
-			text-align: center;
-			font-size: 20rpx;
-			color: #eba00b;
+	.commodityIntroduce {
+		font-size: 30rpx;
+		// background-color: #fff;
+		// padding: 0 20rpx 30rpx 20rpx;
+	}
+}
+
+.footer {
+	width: 100%;
+	height: 100rpx;
+	background-color: #fff;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	position: fixed;
+	bottom: 0%;
+
+	.shopcard {
+		margin: 0 0 0 30rpx;
+		text-align: center;
+		font-size: 20rpx;
+		color: #eba00b;
+	}
+
+	.operate {
+		display: flex;
+
+		view {
+			font-size: 32rpx;
+			font-weight: 700;
+			color: #fff;
+			padding: 32rpx 40rpx;
+			letter-spacing: 0.8px;
 		}
 
-		.operate {
-			display: flex;
+		.addShopCar {
+			background-color: #eba00b;
+		}
 
-			view {
-				font-size: 32rpx;
-				font-weight: 700;
-				color: #fff;
-				padding: 32rpx 40rpx;
-				letter-spacing: 0.8px;
-			}
+		.goBuy {
 
-			.addShopCar {
-				background-color: #eba00b;
-			}
-
-			.goBuy {
-
-				background-color: #cf3906;
-			}
+			background-color: #cf3906;
 		}
 	}
+}
+
+.quanyi_box {
+	padding-right: 0rpx !important;
+	background: #f6fffc;
+	margin-top: 30rpx !important;
+	box-shadow: 0px 0px 6rpx 0px rgba(0, 82, 79, 0.2);
+}
+
+.quanyi {
+	margin-bottom: 30rpx;
+
+
+	overflow: hidden;
+
+	.item {
+		overflow: hidden;
+		margin-bottom: 30rpx;
+		border-bottom: 4rpx solid #f0f0f0;
+	}
+
+	.item:nth-last-child(1) {
+		border: none;
+	}
+
+	.quanyi_item:nth-last-child(1) {
+		margin-right: 0;
+	}
+
+	.spbhimg {
+		// width: 60rpx;
+		float: left;
+	}
+
+	.quanyi_book {
+		width: calc(100% - 80rpx);
+		float: right;
+
+		.quanyi_book_name {
+			font-size: 28rpx;
+		}
+	}
+}
+
+
+
+.quanyi_title {
+	font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
+	font-weight: normal;
+	font-size: 42rpx;
+	color: #018F89;
+	font-weight: 500;
+	margin-bottom: 30rpx;
+	color: #33b170;
+}
+
+.quanyi_item {
+
+	font-size: 26rpx;
+	width: auto;
+	border-radius: 10rpx;
+
+	box-sizing: border-box;
+	// display: inline-block;
+	margin-right: 10rpx;
+}
+
+.quanyi_book {
+	margin-bottom: 20rpx;
+}
 </style>
\ No newline at end of file
diff --git a/static/font/PangMenZhengDaoBiaoTiTiMianFeiBan.ttf b/static/font/PangMenZhengDaoBiaoTiTiMianFeiBan.ttf
new file mode 100644
index 0000000..cd65b62
Binary files /dev/null and b/static/font/PangMenZhengDaoBiaoTiTiMianFeiBan.ttf differ
diff --git a/static/font/msyh.ttc b/static/font/msyh.ttc
new file mode 100644
index 0000000..37c28de
Binary files /dev/null and b/static/font/msyh.ttc differ
diff --git a/static/font/msyh.ttf b/static/font/msyh.ttf
new file mode 100644
index 0000000..980ec43
Binary files /dev/null and b/static/font/msyh.ttf differ
diff --git a/static/font/msyhbd.ttf b/static/font/msyhbd.ttf
new file mode 100644
index 0000000..7949a5f
Binary files /dev/null and b/static/font/msyhbd.ttf differ
diff --git a/static/font/msyhl.ttf b/static/font/msyhl.ttf
new file mode 100644
index 0000000..448e2ed
Binary files /dev/null and b/static/font/msyhl.ttf differ
diff --git a/style/common.scss b/style/common.scss
index ede3474..aa35ce1 100644
--- a/style/common.scss
+++ b/style/common.scss
@@ -1,4 +1,12 @@
 @import '@/style/mixin.scss';
+
+@font-face {
+	font-family: 'PangMenZhengDaobiaoTiTiMianFeiBan';
+	src: url('@/static/font/PangMenZhengDaoBiaoTiTiMianFeiBan.ttf') format('truetype');
+	font-weight: normal;
+	font-style: normal;
+}
+
 view,
 page,
 text,