diff --git a/pages/about/about.vue b/pages/about/about.vue
index 77e3e7a..526d0d2 100644
--- a/pages/about/about.vue
+++ b/pages/about/about.vue
@@ -1,220 +1,236 @@
-<template><page-meta
+<template>
+  <page-meta
     :page-font-size="$baseFontSize() + 'px'"
     :root-font-size="$baseFontSize() + 'px'"
   ></page-meta>
-	<view class="about">
-		<view class="content">
-			<view class="qrcode">
-				<image src="https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/app_download.png" @longtap="save"></image>
-				<text class="tip">扫码体验uni-app</text>
-			</view>
-			<view class="desc">
-				<text class="code">uni-app</text>
-				是一个使用 <text class="code">Vue.js</text> 开发跨平台应用的前端框架。
-			</view>
-			<view class="source">
-				<view class="title">本示例源码获取方式：</view>
-				<view class="source-list">
-					<view class="source-cell">
-						<text space="nbsp">1. </text>
-						<text>下载 HBuilderX，新建 uni-app 项目时选择 <text class="code">Hello uni-app</text> 模板。</text>
-					</view>
-					<view class="source-cell">
-						<text space="nbsp">2. </text>
-						<u-link class="link" :href="'https://github.com/dcloudio/hello-uniapp'" :text="'https://github.com/dcloudio/hello-uniapp'"></u-link>
-					</view>
-				</view>
-			</view>
-			<!-- #ifdef APP-PLUS -->
-			<button type="primary" @click="share">分享</button>
-			<!-- #endif -->
-		</view>
-		<!-- #ifdef APP-PLUS -->
-		<view class="version">
-			当前版本：{{version}}
-		</view>
-		<!-- #endif -->
-	</view>
+  <view class="about">
+    <view class="content">
+      <view class="qrcode">
+        <image
+          src="https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/app_download.png"
+          @longtap="save"
+        ></image>
+        <text class="tip">扫码体验uni-app</text>
+      </view>
+      <view class="desc">
+        <text class="code">uni-app</text>
+        是一个使用 <text class="code">Vue.js</text> 开发跨平台应用的前端框架。
+      </view>
+      <view class="source">
+        <view class="title">本示例源码获取方式：</view>
+        <view class="source-list">
+          <view class="source-cell">
+            <text space="nbsp">1. </text>
+            <text
+              >下载 HBuilderX，新建 uni-app 项目时选择
+              <text class="code">Hello uni-app</text> 模板。</text
+            >
+          </view>
+          <view class="source-cell">
+            <text space="nbsp">2. </text>
+            <u-link
+              class="link"
+              :href="'https://github.com/dcloudio/hello-uniapp'"
+              :text="'https://github.com/dcloudio/hello-uniapp'"
+            ></u-link>
+          </view>
+        </view>
+      </view>
+      <!-- #ifdef APP-PLUS -->
+      <button type="primary" @click="share">分享</button>
+      <!-- #endif -->
+    </view>
+    <!-- #ifdef APP-PLUS -->
+    <view class="version"> 当前版本：{{ version }} </view>
+    <!-- #endif -->
+  </view>
 </template>
 
 <script>
-	export default {
-		data() {
-			return {
-				providerList: [],
-				version: ''
-			}
-		},
-		onLoad() {
-			// #ifdef APP-PLUS
-			this.version = plus.runtime.version;
-			uni.getProvider({
-				service: 'share',
-				success: (result) => {
-					const data = [];
-					for (let i = 0; i < result.provider.length; i++) {
-						switch (result.provider[i]) {
-							case 'weixin':
-								data.push({
-									name: '分享到微信好友',
-									id: 'weixin'
-								});
-								data.push({
-									name: '分享到微信朋友圈',
-									id: 'weixin',
-									type: 'WXSceneTimeline'
-								});
-								break;
-							case 'qq':
-								data.push({
-									name: '分享到QQ',
-									id: 'qq'
-								});
-								break;
-							default:
-								break;
-						}
-					}
-					this.providerList = data;
-				},
-				fail: (error) => {
-					console.log('获取分享通道失败' + JSON.stringify(error));
-				}
-			});
-			// #endif
-		},
-		methods: {
-			// #ifdef APP-PLUS
-			save() {
-				uni.showActionSheet({
-					itemList: ['保存图片到相册'],
-					success: () => {
-						plus.gallery.save('https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/app_download.png', function() {
-							uni.showToast({
-								title: '保存成功',
-								icon: 'none'
-							});
-						}, function() {
-							uni.showToast({
-								title: '保存失败，请重试！',
-								icon: 'none'
-							});
-						});
-					}
-				});
-			},
-			share(e) {
-				if (this.providerList.length === 0) {
-					uni.showModal({
-						title: '当前环境无分享渠道!',
-						showCancel: false
-					});
-					return;
-				}
-				let itemList = this.providerList.map(function(value) {
-					return value.name;
-				})
-				uni.showActionSheet({
-					itemList: itemList,
-					success: (res) => {
-						let provider = this.providerList[res.tapIndex].id;
-						uni.share({
-							provider: provider,
-							scene: this.providerList[res.tapIndex].type && this.providerList[res.tapIndex].type === 'WXSceneTimeline' ?
-								'WXSceneTimeline' : "WXSceneSession",
-							type: (provider === "qq") ? 1 : 0,
-							title: '欢迎体验uni-app',
-							summary: 'uni-app 是一个使用 Vue.js 开发跨平台应用的前端框架',
-							imageUrl: 'https://web-assets.dcloud.net.cn/unidoc/zh/8.jpg',
-							href: "https://m3w.cn/uniapp",
-							success: (res) => {
-								console.log("success:" + JSON.stringify(res));
-							},
-							fail: (e) => {
-								uni.showModal({
-									content: e.errMsg,
-									showCancel: false
-								})
-							}
-						});
-					}
-				})
-			}
-			// #endif
-		}
-	}
+export default {
+  data() {
+    return {
+      providerList: [],
+      version: "",
+    };
+  },
+  onLoad() {
+    // #ifdef APP-PLUS
+    this.version = plus.runtime.version;
+    uni.getProvider({
+      service: "share",
+      success: (result) => {
+        const data = [];
+        for (let i = 0; i < result.provider.length; i++) {
+          switch (result.provider[i]) {
+            case "weixin":
+              data.push({
+                name: "分享到微信好友",
+                id: "weixin",
+              });
+              data.push({
+                name: "分享到微信朋友圈",
+                id: "weixin",
+                type: "WXSceneTimeline",
+              });
+              break;
+            case "qq":
+              data.push({
+                name: "分享到QQ",
+                id: "qq",
+              });
+              break;
+            default:
+              break;
+          }
+        }
+        this.providerList = data;
+      },
+      fail: (error) => {
+        console.log("获取分享通道失败" + JSON.stringify(error));
+      },
+    });
+    // #endif
+  },
+  methods: {
+    // #ifdef APP-PLUS
+    save() {
+      uni.showActionSheet({
+        itemList: ["保存图片到相册"],
+        success: () => {
+          plus.gallery.save(
+            "https://img.cdn.aliyun.dcloud.net.cn/guide/uniapp/app_download.png",
+            function () {
+              uni.showToast({
+                title: "保存成功",
+                icon: "none",
+              });
+            },
+            function () {
+              uni.showToast({
+                title: "保存失败，请重试！",
+                icon: "none",
+              });
+            }
+          );
+        },
+      });
+    },
+    share(e) {
+      if (this.providerList.length === 0) {
+        uni.showModal({
+          title: "当前环境无分享渠道!",
+          showCancel: false,
+        });
+        return;
+      }
+      let itemList = this.providerList.map(function (value) {
+        return value.name;
+      });
+      uni.showActionSheet({
+        itemList: itemList,
+        success: (res) => {
+          let provider = this.providerList[res.tapIndex].id;
+          uni.share({
+            provider: provider,
+            scene:
+              this.providerList[res.tapIndex].type &&
+              this.providerList[res.tapIndex].type === "WXSceneTimeline"
+                ? "WXSceneTimeline"
+                : "WXSceneSession",
+            type: provider === "qq" ? 1 : 0,
+            title: "欢迎体验uni-app",
+            summary: "uni-app 是一个使用 Vue.js 开发跨平台应用的前端框架",
+            imageUrl: "https://web-assets.dcloud.net.cn/unidoc/zh/8.jpg",
+            href: "https://m3w.cn/uniapp",
+            success: (res) => {
+              console.log("success:" + JSON.stringify(res));
+            },
+            fail: (e) => {
+              uni.showModal({
+                content: e.errMsg,
+                showCancel: false,
+              });
+            },
+          });
+        },
+      });
+    },
+    // #endif
+  },
+};
 </script>
 
 <style>
-	page,
-	view {
-		display: flex;
-	}
+page,
+view {
+  display: flex;
+}
 
-	page {
-		min-height: 100%;
-		background-color: #FFFFFF;
-	}
+page {
+  min-height: 100%;
+  background-color: #ffffff;
+}
 
-	image {
-		width: 360rpx;
-		height: 360rpx;
-	}
+image {
+  width: 360rpx;
+  height: 360rpx;
+}
 
-	.about {
-		flex-direction: column;
-		flex: 1;
-	}
+.about {
+  flex-direction: column;
+  flex: 1;
+}
 
-	.content {
-		flex: 1;
-		padding: 30rpx;
-		flex-direction: column;
-		justify-content: center;
-	}
+.content {
+  flex: 1;
+  padding: 30rpx;
+  flex-direction: column;
+  justify-content: center;
+}
 
-	.qrcode {
-		display: flex;
-		align-items: center;
-		flex-direction: column;
-	}
+.qrcode {
+  display: flex;
+  align-items: center;
+  flex-direction: column;
+}
 
-	.qrcode .tip {
-		margin-top: 20rpx;
-	}
+.qrcode .tip {
+  margin-top: 20rpx;
+}
 
-	.desc {
-		margin-top: 30rpx;
-		display: block;
-	}
+.desc {
+  margin-top: 30rpx;
+  display: block;
+}
 
-	.code {
-		color: #e96900;
-		background-color: #f8f8f8;
-	}
+.code {
+  color: #e96900;
+  background-color: #f8f8f8;
+}
 
-	button {
-		width: 100%;
-		margin-top: 40rpx;
-	}
+button {
+  width: 100%;
+  margin-top: 40rpx;
+}
 
-	.version {
-		height: 80rpx;
-		line-height: 80rpx;
-		justify-content: center;
-		color: #ccc;
-	}
+.version {
+  height: 80rpx;
+  line-height: 80rpx;
+  justify-content: center;
+  color: #ccc;
+}
 
-	.source {
-		margin-top: 30rpx;
-		flex-direction: column;
-	}
+.source {
+  margin-top: 30rpx;
+  flex-direction: column;
+}
 
-	.source-list {
-		flex-direction: column;
-	}
+.source-list {
+  flex-direction: column;
+}
 
-	.link {
-		color: #007AFF;
-	}
+.link {
+  color: #007aff;
+}
 </style>
diff --git a/pages/advertisement/advertisement.vue b/pages/advertisement/advertisement.vue
index b8adcc7..a3cda35 100644
--- a/pages/advertisement/advertisement.vue
+++ b/pages/advertisement/advertisement.vue
@@ -1,90 +1,88 @@
-<template><page-meta
+<template>
+  <page-meta
     :page-font-size="$baseFontSize() + 'px'"
     :root-font-size="$baseFontSize() + 'px'"
   ></page-meta>
-	<view class=" commonPage commonPageBox  bg" @click="navigateTo">
-		<view class="">{{ content }}</view>
-		<public-module></public-module>
-		<!-- <z-nav-bar title="设置" bgColor="#3AB3AE" fontColor="#fff"></z-nav-bar> -->
+  <view class="commonPage commonPageBox bg" @click="navigateTo">
+    <view class="">{{ content }}</view>
+    <public-module></public-module>
+    <!-- <z-nav-bar title="设置" bgColor="#3AB3AE" fontColor="#fff"></z-nav-bar> -->
 
-
-		<view class="contentBox  commonPageContentBox"></view>
-		<!-- 右上角跳过按钮 -->
-		<!-- <view class="passbtn" @click.stop="launchApp">跳过</view> -->
-	</view>
+    <view class="contentBox commonPageContentBox"></view>
+    <!-- 右上角跳过按钮 -->
+    <!-- <view class="passbtn" @click.stop="launchApp">跳过</view> -->
+  </view>
 </template>
 
 <script>
-	export default {
-
-		data() {
-			return {
-				content: '',
-				totalTime: 10,
-				clock: null
-			};
-		},
-		onLoad() {
-			this.getData()
-		},
-		onHide() {
-			clearInterval(this.clock);
-		},
-		methods: {
-			navigateTo() {
-				// clearInterval(this.clock);
-			},
-			getData() {
-				this.clock = setInterval(() => {
-					this.totalTime--;
-					this.content = this.totalTime + 's后跳转';
-					// if (this.totalTime == 0) {
-					// 	this.launchApp()
-					// }
-				}, 1000);
-				console.log(this.clock);
-			},
-			launchApp() {
-				//跳过引导页,储存本地值,下次进入直接跳过
-				// clearInterval(this.clock);
-				// this.$mRouter.push('/pages/index/index')
-				uni.switchTab({
-					url: "/pages/homePage/index/index",
-					success: function() {
-						let page = getCurrentPages()[0];
-						console.log(page);
-						page.$vm.requestAll();
-					},
-				});
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      content: "",
+      totalTime: 10,
+      clock: null,
+    };
+  },
+  onLoad() {
+    this.getData();
+  },
+  onHide() {
+    clearInterval(this.clock);
+  },
+  methods: {
+    navigateTo() {
+      // clearInterval(this.clock);
+    },
+    getData() {
+      this.clock = setInterval(() => {
+        this.totalTime--;
+        this.content = this.totalTime + "s后跳转";
+        // if (this.totalTime == 0) {
+        // 	this.launchApp()
+        // }
+      }, 1000);
+      console.log(this.clock);
+    },
+    launchApp() {
+      //跳过引导页,储存本地值,下次进入直接跳过
+      // clearInterval(this.clock);
+      // this.$mRouter.push('/pages/index/index')
+      uni.switchTab({
+        url: "/pages/homePage/index/index",
+        success: function () {
+          let page = getCurrentPages()[0];
+          console.log(page);
+          page.$vm.requestAll();
+        },
+      });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	@import "@/static/customicons.css";
-	@import "@/style/common.scss";
+@import "@/static/customicons.css";
+@import "@/style/common.scss";
 
+.bg {
+}
 
-
-	.bg {}
-
-	// .passbtn {
-	// 	width: 130rpx;
-	// 	height: 60rpx;
-	// 	line-height: 60rpx;
-	// 	position: fixed;
-	// 	z-index: 999;
-	// 	bottom: 50rpx;
-	// 	right: 50rpx;
-	// 	color: #838892;
-	// 	text-align: center;
-	// 	border-width: 1rpx;
-	// 	border-color: rgba(0, 0, 0, 0.5);
-	// 	border-style: solid;
-	// 	border-radius: 30rpx;
-	// 	font-size: 28rpx;
-	// 	padding-left: 25rpx;
-	// 	padding-right: 25rpx;
-	// }
-</style>
\ No newline at end of file
+// .passbtn {
+// 	width: 130rpx;
+// 	height: 60rpx;
+// 	line-height: 60rpx;
+// 	position: fixed;
+// 	z-index: 999;
+// 	bottom: 50rpx;
+// 	right: 50rpx;
+// 	color: #838892;
+// 	text-align: center;
+// 	border-width: 1rpx;
+// 	border-color: rgba(0, 0, 0, 0.5);
+// 	border-style: solid;
+// 	border-radius: 30rpx;
+// 	font-size: 28rpx;
+// 	padding-left: 25rpx;
+// 	padding-right: 25rpx;
+// }
+</style>
diff --git a/pages/advertisement/index/detail.vue b/pages/advertisement/index/detail.vue
index fcce214..0eac6d2 100644
--- a/pages/advertisement/index/detail.vue
+++ b/pages/advertisement/index/detail.vue
@@ -1,12 +1,13 @@
-<template><page-meta
+<template>
+  <page-meta
     :page-font-size="$baseFontSize() + 'px'"
     :root-font-size="$baseFontSize() + 'px'"
   ></page-meta>
-	<view class="container">
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
-		<z-nav-bar title="说明" bgColor="#3AB3AE" fontColor="#fff"></z-nav-bar>
-		<!-- <view
+  <view class="container">
+    <!-- 公共组件-每个页面必须引入 -->
+    <public-module></public-module>
+    <z-nav-bar title="说明" bgColor="#3AB3AE" fontColor="#fff"></z-nav-bar>
+    <!-- <view
       class="contentBox"
       v-if="prescriptDetail.content && prescriptDetail.type == 0"
     >
@@ -18,128 +19,121 @@
      
       </view>
     </view> -->
-		<view class="fullscreen-webview">
-			<web-view :src="urlPath"> </web-view>
-		</view>
-
-	</view>
+    <view class="fullscreen-webview">
+      <web-view :src="urlPath"> </web-view>
+    </view>
+  </view>
 </template>
 
 <script>
-
-	export default {
-
-		data() {
-			return {
-				playData: {},
-				urlPath: '',
-				title: '',
-				id: null,
-				indicatorDots: true,
-				autoplay: true,
-				interval: 5000,
-				duration: 500,
-			};
-		},
-		onLoad(options) {
-			if (options.type == 1) {
-				this.urlPath = 'https://zmzm.taihumed.com/agreement.html'
-				this.title = '用户协议'
-			} else if (options.type == 2) {
-				this.urlPath = 'https://zmzm.taihumed.com/privacy.html'
-				this.title = '隐私策略'
-			}
-		},
-		onShow() {
-
-		},
-		methods: {
-			// 放大图片
-			previewImage(url) {
-				console.log(url);
-				uni.previewImage({
-					urls: [url],
-					longPressActions: {
-						itemList: ["很抱歉，暂不支持保存图片到本地"],
-						success: function(res) {
-							// console.log(res,'+++++')
-						},
-					},
-				});
-			},
-			// 方剂详情
-		
-		},
-		
-	};
+export default {
+  data() {
+    return {
+      playData: {},
+      urlPath: "",
+      title: "",
+      id: null,
+      indicatorDots: true,
+      autoplay: true,
+      interval: 5000,
+      duration: 500,
+    };
+  },
+  onLoad(options) {
+    if (options.type == 1) {
+      this.urlPath = "https://zmzm.taihumed.com/agreement.html";
+      this.title = "用户协议";
+    } else if (options.type == 2) {
+      this.urlPath = "https://zmzm.taihumed.com/privacy.html";
+      this.title = "隐私策略";
+    }
+  },
+  onShow() {},
+  methods: {
+    // 放大图片
+    previewImage(url) {
+      console.log(url);
+      uni.previewImage({
+        urls: [url],
+        longPressActions: {
+          itemList: ["很抱歉，暂不支持保存图片到本地"],
+          success: function (res) {
+            // console.log(res,'+++++')
+          },
+        },
+      });
+    },
+    // 方剂详情
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.contentBox {
-		padding-bottom: 20rpx;
-	}
+.contentBox {
+  padding-bottom: 20rpx;
+}
 
-	.contentBoxwebwiew {
-		height: 100%;
-		// .webwiew{
-		// 	height: 100%;
-		// }
-	}
+.contentBoxwebwiew {
+  height: 100%;
+  // .webwiew{
+  // 	height: 100%;
+  // }
+}
 
-	.fullscreen-webview {
-		width: 100%;
-		height: 100%;
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-	}
+.fullscreen-webview {
+  width: 100%;
+  height: 100%;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+}
 
-	.mb-10 {
-		margin-bottom: 10px;
-	}
+.mb-10 {
+  margin-bottom: 10px;
+}
 
-	.content {
-		font-size: 28rpx;
-	}
+.content {
+  font-size: 28rpx;
+}
 
-	.swiper-item {
-		image {
-			margin: 0 auto;
-			height: 250rpx;
-		}
-	}
+.swiper-item {
+  image {
+    margin: 0 auto;
+    height: 250rpx;
+  }
+}
 
-	.uni-margin-wrap {
-		margin-bottom: 20rpx;
-		padding-top: 20rpx;
-		background-color: #fff;
-	}
+.uni-margin-wrap {
+  margin-bottom: 20rpx;
+  padding-top: 20rpx;
+  background-color: #fff;
+}
 
-	.container {
-		padding: 10rpx;
+.container {
+  padding: 10rpx;
 
-		// background-color: #fff;
-		.item {
-			// color: #666;
-			padding: 10rpx 20rpx;
-			padding-bottom: 20rpx;
-			line-height: 46rpx;
-		}
+  // background-color: #fff;
+  .item {
+    // color: #666;
+    padding: 10rpx 20rpx;
+    padding-bottom: 20rpx;
+    line-height: 46rpx;
+  }
 
-		.title-center {
-			text-align: center;
-			font-size: 32rpx;
-			font-weight: 700 !important;
-		}
-	}
+  .title-center {
+    text-align: center;
+    font-size: 32rpx;
+    font-weight: 700 !important;
+  }
+}
 
-	.flexbox {
-		display: flex;
-	}
+.flexbox {
+  display: flex;
+}
 
-	/deep/ .uni-section-header__decoration.line {
-		background-color: #18bc37;
-	}
-</style>
\ No newline at end of file
+/deep/ .uni-section-header__decoration.line {
+  background-color: #18bc37;
+}
+</style>
diff --git a/pages/advertisement/index/index.vue b/pages/advertisement/index/index.vue
index ef92124..157f583 100644
--- a/pages/advertisement/index/index.vue
+++ b/pages/advertisement/index/index.vue
@@ -1,7 +1,8 @@
-<template><page-meta
-  :page-font-size="$baseFontSize() + 'px'"
-  :root-font-size="$baseFontSize() + 'px'"
-></page-meta>
+<template>
+  <page-meta
+    :page-font-size="$baseFontSize() + 'px'"
+    :root-font-size="$baseFontSize() + 'px'"
+  ></page-meta>
   <view v-if="show">
     <swiper
       class="guide_pages_swiper"
@@ -131,86 +132,81 @@
 </template>
 
 <script>
-import {
-	mapState,
-	mapMutations
-} from "vuex";
+import { mapState, mapMutations } from "vuex";
 export default {
-	data() {
-		return {
-      title:"融儒、医、美、文为一体",
+  data() {
+    return {
+      title: "融儒、医、美、文为一体",
       // title:"融儒、释、道、医、美、文为一体",
-			screenHeight: 667,
-			show: false,
-			protocolShow: false,
-			DisagreeProtocolShow: false,
-		};
-	},
-	onReady() {
-		// this.show = false;
+      screenHeight: 667,
+      show: false,
+      protocolShow: false,
+      DisagreeProtocolShow: false,
+    };
+  },
+  onReady() {
+    // this.show = false;
 
+    if (uni.getStorageSync("guidePages") != 2) {
+      let systemInfo = uni.getSystemInfoSync();
+      this.screenHeight = systemInfo.screenHeight;
+      this.show = true;
+      // this.protocolShow = true;
+    }
 
-		if (uni.getStorageSync("guidePages") != 2) {
-			let systemInfo = uni.getSystemInfoSync();
-			this.screenHeight = systemInfo.screenHeight;
-			this.show = true;
-			// this.protocolShow = true;
-		}
-		
-		
-		// else {
-			// uni.switchTab({
-			// 	// url: "/pages/advertisement/index/index",
-			// 	url: "/pages/homePage/index/index",
-			// 	success: function() {
-			// 		let page = getCurrentPages()[0];
-			// 		console.log(page);
-			// 		page.$vm.requestAll();
-			// 	},
-			// });
-		// }
-	},
-	methods: {
-		openDetail(type) {
-			console.log('type at line 152:', type)
-			uni.navigateTo({
-				url: "/pages/advertisement/index/detail?type=" + type,
-			});
-		},
-		quit() {
-			if (uni.getSystemInfoSync().platform === "ios") {
-				plus.runtime.launchApplication({
-					action: "QUIT"
-				});
-			} else {
-				plus.runtime.quit();
-			}
-		},
-		onSee() {
-			this.protocolShow = true;
-			this.DisagreeProtocolShow = false;
-		},
-		onDisagree() {
-			this.protocolShow = false;
-			this.DisagreeProtocolShow = true;
-		},
-		close() {
-			this.protocolShow = false;
-		},
-		onClose() {
-			uni.setStorageSync("guidePages", 2);
-			this.show = false;
-			this.protocolShow = false;
-			uni.redirectTo({
-				url: "/pages/user/login/login",
-			});
-		},
-	},
+    // else {
+    // uni.switchTab({
+    // 	// url: "/pages/advertisement/index/index",
+    // 	url: "/pages/homePage/index/index",
+    // 	success: function() {
+    // 		let page = getCurrentPages()[0];
+    // 		console.log(page);
+    // 		page.$vm.requestAll();
+    // 	},
+    // });
+    // }
+  },
+  methods: {
+    openDetail(type) {
+      console.log("type at line 152:", type);
+      uni.navigateTo({
+        url: "/pages/advertisement/index/detail?type=" + type,
+      });
+    },
+    quit() {
+      if (uni.getSystemInfoSync().platform === "ios") {
+        plus.runtime.launchApplication({
+          action: "QUIT",
+        });
+      } else {
+        plus.runtime.quit();
+      }
+    },
+    onSee() {
+      this.protocolShow = true;
+      this.DisagreeProtocolShow = false;
+    },
+    onDisagree() {
+      this.protocolShow = false;
+      this.DisagreeProtocolShow = true;
+    },
+    close() {
+      this.protocolShow = false;
+    },
+    onClose() {
+      uni.setStorageSync("guidePages", 2);
+      this.show = false;
+      this.protocolShow = false;
+      uni.redirectTo({
+        url: "/pages/user/login/login",
+      });
+    },
+  },
 };
 </script>
 
 <style lang="scss">
-@import '@/style/mixin.scss';
+@import "@/style/mixin.scss";
 .guide_pages_swiper {
   position: fixed;
   top: 0;
diff --git a/pages/advertisement2/advertisement.vue b/pages/advertisement2/advertisement.vue
index b8adcc7..a3cda35 100644
--- a/pages/advertisement2/advertisement.vue
+++ b/pages/advertisement2/advertisement.vue
@@ -1,90 +1,88 @@
-<template><page-meta
+<template>
+  <page-meta
     :page-font-size="$baseFontSize() + 'px'"
     :root-font-size="$baseFontSize() + 'px'"
   ></page-meta>
-	<view class=" commonPage commonPageBox  bg" @click="navigateTo">
-		<view class="">{{ content }}</view>
-		<public-module></public-module>
-		<!-- <z-nav-bar title="设置" bgColor="#3AB3AE" fontColor="#fff"></z-nav-bar> -->
+  <view class="commonPage commonPageBox bg" @click="navigateTo">
+    <view class="">{{ content }}</view>
+    <public-module></public-module>
+    <!-- <z-nav-bar title="设置" bgColor="#3AB3AE" fontColor="#fff"></z-nav-bar> -->
 
-
-		<view class="contentBox  commonPageContentBox"></view>
-		<!-- 右上角跳过按钮 -->
-		<!-- <view class="passbtn" @click.stop="launchApp">跳过</view> -->
-	</view>
+    <view class="contentBox commonPageContentBox"></view>
+    <!-- 右上角跳过按钮 -->
+    <!-- <view class="passbtn" @click.stop="launchApp">跳过</view> -->
+  </view>
 </template>
 
 <script>
-	export default {
-
-		data() {
-			return {
-				content: '',
-				totalTime: 10,
-				clock: null
-			};
-		},
-		onLoad() {
-			this.getData()
-		},
-		onHide() {
-			clearInterval(this.clock);
-		},
-		methods: {
-			navigateTo() {
-				// clearInterval(this.clock);
-			},
-			getData() {
-				this.clock = setInterval(() => {
-					this.totalTime--;
-					this.content = this.totalTime + 's后跳转';
-					// if (this.totalTime == 0) {
-					// 	this.launchApp()
-					// }
-				}, 1000);
-				console.log(this.clock);
-			},
-			launchApp() {
-				//跳过引导页,储存本地值,下次进入直接跳过
-				// clearInterval(this.clock);
-				// this.$mRouter.push('/pages/index/index')
-				uni.switchTab({
-					url: "/pages/homePage/index/index",
-					success: function() {
-						let page = getCurrentPages()[0];
-						console.log(page);
-						page.$vm.requestAll();
-					},
-				});
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      content: "",
+      totalTime: 10,
+      clock: null,
+    };
+  },
+  onLoad() {
+    this.getData();
+  },
+  onHide() {
+    clearInterval(this.clock);
+  },
+  methods: {
+    navigateTo() {
+      // clearInterval(this.clock);
+    },
+    getData() {
+      this.clock = setInterval(() => {
+        this.totalTime--;
+        this.content = this.totalTime + "s后跳转";
+        // if (this.totalTime == 0) {
+        // 	this.launchApp()
+        // }
+      }, 1000);
+      console.log(this.clock);
+    },
+    launchApp() {
+      //跳过引导页,储存本地值,下次进入直接跳过
+      // clearInterval(this.clock);
+      // this.$mRouter.push('/pages/index/index')
+      uni.switchTab({
+        url: "/pages/homePage/index/index",
+        success: function () {
+          let page = getCurrentPages()[0];
+          console.log(page);
+          page.$vm.requestAll();
+        },
+      });
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
-	@import "@/static/customicons.css";
-	@import "@/style/common.scss";
+@import "@/static/customicons.css";
+@import "@/style/common.scss";
 
+.bg {
+}
 
-
-	.bg {}
-
-	// .passbtn {
-	// 	width: 130rpx;
-	// 	height: 60rpx;
-	// 	line-height: 60rpx;
-	// 	position: fixed;
-	// 	z-index: 999;
-	// 	bottom: 50rpx;
-	// 	right: 50rpx;
-	// 	color: #838892;
-	// 	text-align: center;
-	// 	border-width: 1rpx;
-	// 	border-color: rgba(0, 0, 0, 0.5);
-	// 	border-style: solid;
-	// 	border-radius: 30rpx;
-	// 	font-size: 28rpx;
-	// 	padding-left: 25rpx;
-	// 	padding-right: 25rpx;
-	// }
-</style>
\ No newline at end of file
+// .passbtn {
+// 	width: 130rpx;
+// 	height: 60rpx;
+// 	line-height: 60rpx;
+// 	position: fixed;
+// 	z-index: 999;
+// 	bottom: 50rpx;
+// 	right: 50rpx;
+// 	color: #838892;
+// 	text-align: center;
+// 	border-width: 1rpx;
+// 	border-color: rgba(0, 0, 0, 0.5);
+// 	border-style: solid;
+// 	border-radius: 30rpx;
+// 	font-size: 28rpx;
+// 	padding-left: 25rpx;
+// 	padding-right: 25rpx;
+// }
+</style>
diff --git a/pages/bookShop/bookShopIndex.vue b/pages/bookShop/bookShopIndex.vue
index 36bfd32..4c6603f 100644
--- a/pages/bookShop/bookShopIndex.vue
+++ b/pages/bookShop/bookShopIndex.vue
@@ -1,403 +1,414 @@
-<template><page-meta
+<template>
+  <page-meta
     :page-font-size="$baseFontSize() + 'px'"
     :root-font-size="$baseFontSize() + 'px'"
   ></page-meta>
-	<view class="">
-		<view class="shopHeader">
-			<!-- 顶部导航栏 -->
-			<z-nav-bar title="健康超市"></z-nav-bar>
-			<!-- 搜索 -->
-			<!-- <view class="search" @click="goSearch()">
+  <view class="">
+    <view class="shopHeader">
+      <!-- 顶部导航栏 -->
+      <z-nav-bar title="健康超市"></z-nav-bar>
+      <!-- 搜索 -->
+      <!-- <view class="search" @click="goSearch()">
 				<u-search placeholder="请输入需4545要的商品" v-model="keyword" :show-action="false"></u-search>
 			</view> -->
-		</view>
-		<!-- 主盒子 -->
-		<view class="indexBox">
-			<!-- 轮播图 -->
-			<view class="swiper_box">
-				<swiper :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000">
-					<swiper-item v-for="(item,index) in swiperlist" :key="index">
-						<view class="swiper-item">
-							<image :src="item.image" mode="widthFix " class="swiperImg"></image>
-						</view>
-					</swiper-item>
-				</swiper>
-			</view>
-			<!-- 分类 -->
-			<view class="head_line">
-				<b></b>
-				<text>商品分类</text>
-			</view>
-			<view class="classfy">
-				<view v-for="(item,index) in gridArr" :key="index" @click='toClassify(item.catId,index)'>
-					<!-- <u-icon v-if="item.icon" :name="item.icon" :size="46"></u-icon> -->
-					<image :src="item.icon"></image>
-					<text class="grid-text">{{item.name}}</text>
-				</view>
-				<br clear="both">
-			</view>
-			<!-- 商品展示 -->
-			<view class="head_line">
-				<b></b>
-				<text>限时秒杀</text>
-				<i @click="onShopMore('Sale')">查看更多 ></i>
-			</view>
-			<!-- 限时秒杀 -->
-			<view class="limited">
-				<view class="limitedSymbol">
-					<image src="../../static/icon/shopping_xsh.png"></image>
-				</view>
-				<view class="limitedScrollBox">
-					<u-scroll-list indicatorActiveColor="#27b386">
-						<view class="limitedItem" v-for="(item,index) in seckillList" :key="index"
-							@click="goDetail(item.prodInfo.productId)">
-							<image :src="item.prodInfo.productImages" mode=""></image>
-							<text class="biaoti">{{item.prodInfo.productName}}</text>
-							<text class="xian">￥{{item.seckillPrice}}</text>
-							<text class="yuan">￥{{item.prodInfo.price}}</text>
-						</view>
-					</u-scroll-list>
-				</view>
-			</view>
-			<!-- 商品展示 -->
-			<view class="head_line">
-				<b></b>
-				<text>精选商品</text>
-				<i @click="onShopMore('Hot')">查看更多 ></i>
-			</view>
-			<view class="goods">
-				<view class="goodsItem" v-for="(item,index) in goodsList" :key="item.productId"
-					@click="goDetail(item.productId)">
-					<image :src="item.productImages" mode="" class="goodsImg"></image>
-					<view class="goodsContent">
-						<view class="goodsName">
-							{{item.productName}}
-						</view>
-						<view class="goodsPrice">
-							￥{{item.price}}
-						</view>
-					</view>
-				</view>
-				<br clear="both">
-			</view>
-			<view style="height: 30rpx;"></view>
-			<!-- 公共组件-每个页面必须引入 -->
-			<public-module></public-module>
-			<music-play :playData="playData"></music-play>
-		</view>
-	</view>
+    </view>
+    <!-- 主盒子 -->
+    <view class="indexBox">
+      <!-- 轮播图 -->
+      <view class="swiper_box">
+        <swiper
+          :indicator-dots="true"
+          :autoplay="true"
+          :interval="3000"
+          :duration="1000"
+        >
+          <swiper-item v-for="(item, index) in swiperlist" :key="index">
+            <view class="swiper-item">
+              <image
+                :src="item.image"
+                mode="widthFix "
+                class="swiperImg"
+              ></image>
+            </view>
+          </swiper-item>
+        </swiper>
+      </view>
+      <!-- 分类 -->
+      <view class="head_line">
+        <b></b>
+        <text>商品分类</text>
+      </view>
+      <view class="classfy">
+        <view
+          v-for="(item, index) in gridArr"
+          :key="index"
+          @click="toClassify(item.catId, index)"
+        >
+          <!-- <u-icon v-if="item.icon" :name="item.icon" :size="46"></u-icon> -->
+          <image :src="item.icon"></image>
+          <text class="grid-text">{{ item.name }}</text>
+        </view>
+        <br clear="both" />
+      </view>
+      <!-- 商品展示 -->
+      <view class="head_line">
+        <b></b>
+        <text>限时秒杀</text>
+        <i @click="onShopMore('Sale')">查看更多 ></i>
+      </view>
+      <!-- 限时秒杀 -->
+      <view class="limited">
+        <view class="limitedSymbol">
+          <image src="../../static/icon/shopping_xsh.png"></image>
+        </view>
+        <view class="limitedScrollBox">
+          <u-scroll-list indicatorActiveColor="#27b386">
+            <view
+              class="limitedItem"
+              v-for="(item, index) in seckillList"
+              :key="index"
+              @click="goDetail(item.prodInfo.productId)"
+            >
+              <image :src="item.prodInfo.productImages" mode=""></image>
+              <text class="biaoti">{{ item.prodInfo.productName }}</text>
+              <text class="xian">￥{{ item.seckillPrice }}</text>
+              <text class="yuan">￥{{ item.prodInfo.price }}</text>
+            </view>
+          </u-scroll-list>
+        </view>
+      </view>
+      <!-- 商品展示 -->
+      <view class="head_line">
+        <b></b>
+        <text>精选商品</text>
+        <i @click="onShopMore('Hot')">查看更多 ></i>
+      </view>
+      <view class="goods">
+        <view
+          class="goodsItem"
+          v-for="(item, index) in goodsList"
+          :key="item.productId"
+          @click="goDetail(item.productId)"
+        >
+          <image :src="item.productImages" mode="" class="goodsImg"></image>
+          <view class="goodsContent">
+            <view class="goodsName">
+              {{ item.productName }}
+            </view>
+            <view class="goodsPrice"> ￥{{ item.price }} </view>
+          </view>
+        </view>
+        <br clear="both" />
+      </view>
+      <view style="height: 30rpx"></view>
+      <!-- 公共组件-每个页面必须引入 -->
+      <public-module></public-module>
+      <music-play :playData="playData"></music-play>
+    </view>
+  </view>
 </template>
 
 <script>
-	import musicPlay from '@/components/music.vue'
-	import {
-		mapState
-	} from 'vuex';
-	export default {
-		data() {
-			return {
-				playData:{},
-				keyword: '', // 搜索索引值
-				// 轮播图数据
-				swiperlist: [{
-						image: '../../static/icon/home_ban_1.jpg',
-					},
-					{
-						image: '../../static/icon//home_ban_2.jpg',
-					},
-					{
-						image: '../../static/icon//home_ban_3.jpg',
-					}
-				],
-				totalCount: 4,
-				pageSize: 1,
-				totalPage: 4,
-				currPage: 1,
-				limit: 4,
-				page: 1,
-				istop: 1, // 是否是精选商品
-				// 秒杀列表
-				seckillList: [],
-				// 商品列表
-				goodsList: [],
-				// 分类数据
-				gridArr: [{
-					icon: "list-dot",
-					name: '更多'
-				}],
-			}
-		},
-		computed: {
-			...mapState(['userInfo']),
-		},
-		components: {			
-			musicPlay
-		},
-		onLoad() {
-			// 获取分类
-			this.$http
-				.post('book/shopcategory/getOneLevel')
-				.then(res => {
-					// 用一个空数组去接分类数据
-					let arr = []
-					if (res.list.length >= 5) {
-						for (let i in res.list) {
-							if (i < 5) {
-								arr.push({
-									icon: "../../static/icon/shop_bar_" + (Number(i) + Number(1)) + ".png",
-									name: res.list[i].name,
-									catId: res.list[i].catId
-								})
-							}
-						}
-						arr.push({
-							icon: "../../static/icon/shop_bar_more.png",
-							name: '更多'
-						})
-						this.gridArr = arr
-					}
-				})
+import musicPlay from "@/components/music.vue";
+import { mapState } from "vuex";
+export default {
+  data() {
+    return {
+      playData: {},
+      keyword: "", // 搜索索引值
+      // 轮播图数据
+      swiperlist: [
+        {
+          image: "../../static/icon/home_ban_1.jpg",
+        },
+        {
+          image: "../../static/icon//home_ban_2.jpg",
+        },
+        {
+          image: "../../static/icon//home_ban_3.jpg",
+        },
+      ],
+      totalCount: 4,
+      pageSize: 1,
+      totalPage: 4,
+      currPage: 1,
+      limit: 4,
+      page: 1,
+      istop: 1, // 是否是精选商品
+      // 秒杀列表
+      seckillList: [],
+      // 商品列表
+      goodsList: [],
+      // 分类数据
+      gridArr: [
+        {
+          icon: "list-dot",
+          name: "更多",
+        },
+      ],
+    };
+  },
+  computed: {
+    ...mapState(["userInfo"]),
+  },
+  components: {
+    musicPlay,
+  },
+  onLoad() {
+    // 获取分类
+    this.$http.post("book/shopcategory/getOneLevel").then((res) => {
+      // 用一个空数组去接分类数据
+      let arr = [];
+      if (res.list.length >= 5) {
+        for (let i in res.list) {
+          if (i < 5) {
+            arr.push({
+              icon:
+                "../../static/icon/shop_bar_" +
+                (Number(i) + Number(1)) +
+                ".png",
+              name: res.list[i].name,
+              catId: res.list[i].catId,
+            });
+          }
+        }
+        arr.push({
+          icon: "../../static/icon/shop_bar_more.png",
+          name: "更多",
+        });
+        this.gridArr = arr;
+      }
+    });
 
-			// 获取限时秒杀
-			this.$http
-				.get(`book/shopseckill/getSeckillProd`)
-				.then(res => {
-					this.seckillList = res.list
-					console.log(this.seckillList)
-				})
+    // 获取限时秒杀
+    this.$http.get(`book/shopseckill/getSeckillProd`).then((res) => {
+      this.seckillList = res.list;
+      console.log(this.seckillList);
+    });
 
-			// 获取精选商品
-			this.$http
-				.post(`book/shopproduct/appGetList?limit=${this.limit}&page=${this.page}&istop=${this.istop}`)
-				.then(
-					res => {
-						this.goodsList = res.page.list
-					})
+    // 获取精选商品
+    this.$http
+      .post(
+        `book/shopproduct/appGetList?limit=${this.limit}&page=${this.page}&istop=${this.istop}`
+      )
+      .then((res) => {
+        this.goodsList = res.page.list;
+      });
+  },
+  methods: {
+    // 跳转详情页
+    goDetail(id) {
+      uni.navigateTo({
+        url: "./commodityDetail?id=" + id,
+      });
+    },
 
-		},
-		methods: {
-			// 跳转详情页
-			goDetail(id) {
-				uni.navigateTo({
-					url: './commodityDetail?id=' + id
-				});
-			},
-			
-			// 跳转分类页
-			toClassify(catId, index) {
-				if (catId) {
-					uni.navigateTo({
-						url: `./classify?type=${index}`
-					})
-				} else {
-					uni.navigateTo({
-						url: './classifyAll'
-					})
-				}
-			},
-			
-			// 跳转搜索页
-			goSearch() {
-				uni.navigateTo({
-					url: './commoditySearch'
-				})
-			},
+    // 跳转分类页
+    toClassify(catId, index) {
+      if (catId) {
+        uni.navigateTo({
+          url: `./classify?type=${index}`,
+        });
+      } else {
+        uni.navigateTo({
+          url: "./classifyAll",
+        });
+      }
+    },
 
-			// 列表跳页
-			onShopMore(e) {
-				uni.navigateTo({
-					url: './bookShopType?type=' + e
-				});
-			},
+    // 跳转搜索页
+    goSearch() {
+      uni.navigateTo({
+        url: "./commoditySearch",
+      });
+    },
 
-		}
-	}
+    // 列表跳页
+    onShopMore(e) {
+      uni.navigateTo({
+        url: "./bookShopType?type=" + e,
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.shopHeader {
-		position: relative;
-		top: 0;
-		left: 0;
-	}
+.shopHeader {
+  position: relative;
+  top: 0;
+  left: 0;
+}
 
-	.search {
-		padding: 10rpx;
-		background-color: #fff;
-		margin: 10rpx 0;
+.search {
+  padding: 10rpx;
+  background-color: #fff;
+  margin: 10rpx 0;
+}
 
-	}
+.swiper_box {
+  margin-top: 20rpx;
+  padding: 0 20rpx;
 
-	.swiper_box {
-		margin-top: 20rpx;
-		padding: 0 20rpx;
+  .swiper-item {
+    width: 100%;
+    height: 100%;
+    border-radius: 20rpx;
 
-		.swiper-item {
-			width: 100%;
-			height: 100%;
-			border-radius: 20rpx;
+    .swiperImg {
+      width: 100%;
+      height: 100%;
+      border-radius: 20rpx;
+    }
+  }
+}
 
-			.swiperImg {
-				width: 100%;
-				height: 100%;
-				border-radius: 20rpx;
-			}
-		}
-	}
+.classfy {
+  margin: 0 10rpx;
+  border-radius: 30rpx;
 
-	.classfy {
-		margin: 0 10rpx;
-		border-radius: 30rpx;
+  view {
+    float: left;
+    width: 16.6%;
+    text-align: center;
 
-		view {
-			float: left;
-			width: 16.6%;
-			text-align: center;
+    image {
+      width: 100rpx;
+      height: 100rpx;
+      margin: 0 auto;
+    }
 
-			image {
-				width: 100rpx;
-				height: 100rpx;
-				margin: 0 auto;
-			}
+    .grid-text {
+      font-size: 25rpx;
+      margin-top: 4rpx;
+    }
+  }
+}
 
-			.grid-text {
-				font-size: 25rpx;
-				margin-top: 4rpx;
-			}
+.head_line {
+  margin: 30rpx 0 30rpx 0;
+  padding: 10rpx;
 
-		}
+  b {
+    display: inline-block;
+    width: 12rpx;
+    height: 40rpx;
+    background-color: #54a966;
+    vertical-align: bottom;
+    margin: 0 20rpx 0 0;
+  }
 
+  text {
+    font-size: 32rpx;
+    font-weight: bold;
+  }
 
-	}
+  i {
+    float: right;
+    font-style: normal;
+    color: #8b8a91;
+    font-size: 24rpx;
+    margin: 15rpx 35rpx 0 0;
+  }
+}
 
-	.head_line {
-		margin: 30rpx 0 30rpx 0;
-		padding: 10rpx;
+.limited {
+  width: 100%;
+  height: auto;
+  padding: 20rpx 10rpx 10rpx 10rpx;
+  display: flex;
+  align-items: center;
+  background-color: #fff;
+  margin-top: 10rpx;
 
-		b {
-			display: inline-block;
-			width: 12rpx;
-			height: 40rpx;
-			background-color: #54a966;
-			vertical-align: bottom;
-			margin: 0 20rpx 0 0;
-		}
+  .limitedSymbol {
+    width: 22%;
+    height: 300rpx;
+    border-right: 1px solid #eee;
+    vertical-align: middle;
 
-		text {
-			font-size: 32rpx;
-			font-weight: bold;
-		}
+    image {
+      width: 120rpx;
+      height: 120rpx;
+      margin: 45px auto 0 auto;
+    }
+  }
 
-		i {
-			float: right;
-			font-style: normal;
-			color: #8b8a91;
-			font-size: 24rpx;
-			margin: 15rpx 35rpx 0 0;
-		}
-	}
+  .limitedScrollBox {
+    width: 76%;
+    padding: 0 10rpx;
+  }
 
-	.limited {
-		width: 100%;
-		height: auto;
-		padding: 20rpx 10rpx 10rpx 10rpx;
-		display: flex;
-		align-items: center;
-		background-color: #fff;
-		margin-top: 10rpx;
+  .limitedItem {
+    width: 200rpx;
+    text-align: center;
 
-		.limitedSymbol {
-			width: 22%;
-			height: 300rpx;
-			border-right: 1px solid #eee;
-			vertical-align: middle;
+    image {
+      width: 150upx;
+      height: 200upx;
+      margin: 15rpx auto 20rpx auto;
+    }
 
-			image {
-				width: 120rpx;
-				height: 120rpx;
-				margin: 45px auto 0 auto;
-			}
-		}
+    text {
+      font-size: 20rpx;
+      display: block;
+    }
 
-		.limitedScrollBox {
-			width: 76%;
-			padding: 0 10rpx;
-		}
+    .biaoti {
+      font-size: 30rpx;
+      margin: 10rpx 0 10rpx 0;
+      font-weight: bold;
+    }
 
-		.limitedItem {
-			width: 200rpx;
-			text-align: center;
+    .xian {
+      font-size: 32rpx;
+      color: #bf0c0c;
+      font-weight: bold;
+    }
 
-			image {
-				width: 150upx;
-				height: 200upx;
-				margin: 15rpx auto 20rpx auto;
-			}
+    .yuan {
+      text-decoration: line-through;
+      color: #c1c1c1;
+    }
+  }
+}
 
-			text {
-				font-size: 20rpx;
-				display: block;
-			}
+.goods {
+  width: 100%;
 
-			.biaoti {
-				font-size: 30rpx;
-				margin: 10rpx 0 10rpx 0;
-				font-weight: bold;
-			}
+  .goodsItem {
+    display: inline-block;
+    width: 46%;
+    border-radius: 20rpx;
+    padding: 25rpx 25rpx 20rpx 25rpx;
+    margin: 0 20rpx 20rpx 20rpx;
+    background-color: #fff;
+    border: 1px solid #eee;
 
-			.xian {
-				font-size: 32rpx;
-				color: #bf0c0c;
-				font-weight: bold;
-			}
+    .goodsImg {
+      width: 98%;
+      height: 380rpx;
+      border-radius: 10rpx;
+    }
 
-			.yuan {
-				text-decoration: line-through;
-				color: #c1c1c1;
+    .goodsContent {
+      .goodsName {
+        margin-top: 10rpx;
+        font-size: 30rpx;
+        font-weight: bold;
+      }
 
-			}
-		}
-	}
+      .goodsPrice {
+        font-size: 30rpx;
+        margin: 5rpx 0 0 3rpx;
+        color: #bf0c0c;
+        font-weight: bold;
+      }
+    }
+  }
 
-	.goods {
-		width: 100%;
-
-
-		.goodsItem {
-			display: inline-block;
-			width: 46%;
-			border-radius: 20rpx;
-			padding: 25rpx 25rpx 20rpx 25rpx;
-			margin: 0 20rpx 20rpx 20rpx;
-			background-color: #fff;
-			border: 1px solid #eee;
-
-			.goodsImg {
-				width: 98%;
-				height: 380rpx;
-				border-radius: 10rpx;
-			}
-
-			.goodsContent {
-
-				.goodsName {
-					margin-top: 10rpx;
-					font-size: 30rpx;
-					font-weight: bold;
-				}
-
-				.goodsPrice {
-					font-size: 30rpx;
-					margin: 5rpx 0 0 3rpx;
-					color: #bf0c0c;
-					font-weight: bold;
-
-				}
-			}
-		}
-
-		.goodsItem:nth-child(2n) {
-			margin-left: 0;
-		}
-	}
+  .goodsItem:nth-child(2n) {
+    margin-left: 0;
+  }
+}
 </style>
diff --git a/pages/bookShop/bookShopType.vue b/pages/bookShop/bookShopType.vue
index b0de54b..6a95e7f 100644
--- a/pages/bookShop/bookShopType.vue
+++ b/pages/bookShop/bookShopType.vue
@@ -1,333 +1,359 @@
-<template><page-meta
+<template>
+  <page-meta
     :page-font-size="$baseFontSize() + 'px'"
     :root-font-size="$baseFontSize() + 'px'"
   ></page-meta>
-	<view>
-		<z-nav-bar :title="title"></z-nav-bar>
+  <view>
+    <z-nav-bar :title="title"></z-nav-bar>
 
-		<view class="shop_list">
-			<view class="sl_tioa" v-for="(item,index) in shopList" @click="onShopJump(item)">
-				<image :src="item.productImages"></image>
-				<view class="sl_cont">
-					<view class="sl_tit">
-						<text class="bok_name">
-						{{item.productName}}
-						<span v-if="item.productStock==0" style="color: #aaa;font-size:26rpx;">（无货）</span>
-						</text>
-					</view>
-					<view class="sl_ric">
-						￥{{item.price}}
-					</view>
-					<view class="sl_del" v-if="shopScreen.type == 'Sale'">
-						￥{{item.oldprice}}
-					</view>
-					<view class="sl_gou" v-if="item.productStock>0" @click.stop="addShopCar(item)">
-						<u-icon name="shopping-cart" :size="26" color="#eba00b"></u-icon>
-					</view>
-				</view>
-				<br clear="both">
-			</view>
-			<view style="height: 1px;"></view>
-		</view>
+    <view class="shop_list">
+      <view
+        class="sl_tioa"
+        v-for="(item, index) in shopList"
+        @click="onShopJump(item)"
+      >
+        <image :src="item.productImages"></image>
+        <view class="sl_cont">
+          <view class="sl_tit">
+            <text class="bok_name">
+              {{ item.productName }}
+              <span
+                v-if="item.productStock == 0"
+                style="color: #aaa; font-size: 26rpx"
+                >（无货）</span
+              >
+            </text>
+          </view>
+          <view class="sl_ric"> ￥{{ item.price }} </view>
+          <view class="sl_del" v-if="shopScreen.type == 'Sale'">
+            ￥{{ item.oldprice }}
+          </view>
+          <view
+            class="sl_gou"
+            v-if="item.productStock > 0"
+            @click.stop="addShopCar(item)"
+          >
+            <u-icon name="shopping-cart" :size="26" color="#eba00b"></u-icon>
+          </view>
+        </view>
+        <br clear="both" />
+      </view>
+      <view style="height: 1px"></view>
+    </view>
 
+    <view>
+      <view v-if="status == 0" style="text-align: center">
+        <u-loading-icon style="display: inline-block"></u-loading-icon>
+        <font
+          style="
+            vertical-align: super;
+            margin-left: 10px;
+            font-size: 26rpx;
+            color: #909399;
+          "
+          >努力加载中</font
+        >
+      </view>
+      <view v-if="status == 1">
+        <u-divider text="全部加载完成"></u-divider>
+      </view>
+    </view>
 
-		<view>
-			<view v-if="status==0" style="text-align: center;">
-				<u-loading-icon style="display: inline-block;"></u-loading-icon>
-				<font style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>努力加载中</font>
-			</view>
-			<view v-if="status==1">
-				<u-divider text="全部加载完成"></u-divider>
-			</view>
-		</view>
-
-		<view style="padding-bottom: 20rpx;">
-			<u-back-top :scroll-top="scrollTop" bottom="60" :customStyle='bgiStyle' :iconStyle="iconStyle"></u-back-top>
-		</view>
-		<music-play :playData="playData"></music-play>
-	</view>
+    <view style="padding-bottom: 20rpx">
+      <u-back-top
+        :scroll-top="scrollTop"
+        bottom="60"
+        :customStyle="bgiStyle"
+        :iconStyle="iconStyle"
+      ></u-back-top>
+    </view>
+    <music-play :playData="playData"></music-play>
+  </view>
 </template>
 
 <script>
-	import musicPlay from '@/components/music.vue'
-	import $http from '@/config/requestConfig.js';
-	import {
-		mapState
-	} from 'vuex';
-	export default {
-		data() {
-			return {
-				playData:{},
-				scrollTop: 0,
-				status: 3,
-				shopScreen: {
-					type: '',
-					page: 1, //当前页码数
-					limit: 5, //单页数据数量
-				},
-				productInfo: {},
-				totalPage: 0,
-				totalCount: 0,
-				shopList: [],
-				bgiStyle: {
-					background: '#2ab58833'
-				},
-				iconStyle: {
-					fontSize: '40rpx',
-					fontWeight: 'bold',
-					color: '#54a966',
-				},
-				urList: '',
-				title: '',
-			}
-		},
+import musicPlay from "@/components/music.vue";
+import $http from "@/config/requestConfig.js";
+import { mapState } from "vuex";
+export default {
+  data() {
+    return {
+      playData: {},
+      scrollTop: 0,
+      status: 3,
+      shopScreen: {
+        type: "",
+        page: 1, //当前页码数
+        limit: 5, //单页数据数量
+      },
+      productInfo: {},
+      totalPage: 0,
+      totalCount: 0,
+      shopList: [],
+      bgiStyle: {
+        background: "#2ab58833",
+      },
+      iconStyle: {
+        fontSize: "40rpx",
+        fontWeight: "bold",
+        color: "#54a966",
+      },
+      urList: "",
+      title: "",
+    };
+  },
 
-		// 返回顶部
-		onPageScroll(e) {
-			this.scrollTop = e.scrollTop;
-		},
+  // 返回顶部
+  onPageScroll(e) {
+    this.scrollTop = e.scrollTop;
+  },
 
-		// 下拉刷新
-		onReachBottom() {
-			this.status = 0
-			if (this.shopScreen.page < this.totalPage) {
-				this.shopScreen.page = this.shopScreen.page + 1
-				setTimeout(() => {
-					if (this.shopScreen.type == 'Hot') {
-						this.$http
-							.post(this.urList + '?page=' + this.shopScreen.page + '&limit=' + this.shopScreen
-								.limit)
-							.then(res => {
-								this.totalPage = res.page.totalPage
-								this.totalCount = res.page.totalCount
-								for (let i in res.page.list) {
-									this.shopList.push(res.page.list[i])
-								}
-							});
-					}
-				}, 1000)
-			} else {
-				this.status = 1
-			}
-		},
+  // 下拉刷新
+  onReachBottom() {
+    this.status = 0;
+    if (this.shopScreen.page < this.totalPage) {
+      this.shopScreen.page = this.shopScreen.page + 1;
+      setTimeout(() => {
+        if (this.shopScreen.type == "Hot") {
+          this.$http
+            .post(
+              this.urList +
+                "?page=" +
+                this.shopScreen.page +
+                "&limit=" +
+                this.shopScreen.limit
+            )
+            .then((res) => {
+              this.totalPage = res.page.totalPage;
+              this.totalCount = res.page.totalCount;
+              for (let i in res.page.list) {
+                this.shopList.push(res.page.list[i]);
+              }
+            });
+        }
+      }, 1000);
+    } else {
+      this.status = 1;
+    }
+  },
 
-		//第一次加载
-		onLoad(e) {
-			this.shopScreen.type = e.type
-			if (this.shopScreen.type == 'Sale') {
-				this.urList = 'book/shopseckill/getSeckillProd'
-				this.title = '限时秒杀'
-			} else if (this.shopScreen.type == 'Hot') {
-				this.urList = 'book/shopproduct/appGetList'
-				this.title = '精选商品'
-			}
+  //第一次加载
+  onLoad(e) {
+    this.shopScreen.type = e.type;
+    if (this.shopScreen.type == "Sale") {
+      this.urList = "book/shopseckill/getSeckillProd";
+      this.title = "限时秒杀";
+    } else if (this.shopScreen.type == "Hot") {
+      this.urList = "book/shopproduct/appGetList";
+      this.title = "精选商品";
+    }
 
-			this.getData();
-		},
-		//页面显示
-		onShow() {
-			// this.getData();
-		},
-		// 下拉刷新
-		onPullDownRefresh() {
-			this.getData()
-			uni.stopPullDownRefresh()
-		},
-		computed: {
-			...mapState(['userInfo']),
-		},
-		components: {
-			musicPlay
-		},
-		//方法
-		methods: {
-			// 获取列表数据
-			getData() {
-				console.log(this.urList)
-				this.shopList = []
-				if (this.shopScreen.type == 'Hot') {
-					this.$http
-						.post(this.urList + '?page=' + this.shopScreen.page + '&limit=' + this.shopScreen.limit)
-						.then(res => {
-							this.shopList = res.page.list
-							this.totalPage = res.page.totalPage
-							this.status = 3
-						});
-				} else if (this.shopScreen.type == 'Sale') {
-					this.$http
-						.get(this.urList)
-						.then(res => {
-							let arr = []
-							for (let i in res.list) {
-								arr.push({
-									productImages: res.list[i].prodInfo.productImages,
-									productName: res.list[i].prodInfo.productName,
-									price: res.list[i].seckillPrice,
-									oldprice: res.list[i].prodInfo.price,
-									productId: res.list[i].prodInfo.productId,
-								})
-							}
-							this.shopList = arr
-							this.status = 3
-						});
-				}
+    this.getData();
+  },
+  //页面显示
+  onShow() {
+    // this.getData();
+  },
+  // 下拉刷新
+  onPullDownRefresh() {
+    this.getData();
+    uni.stopPullDownRefresh();
+  },
+  computed: {
+    ...mapState(["userInfo"]),
+  },
+  components: {
+    musicPlay,
+  },
+  //方法
+  methods: {
+    // 获取列表数据
+    getData() {
+      console.log(this.urList);
+      this.shopList = [];
+      if (this.shopScreen.type == "Hot") {
+        this.$http
+          .post(
+            this.urList +
+              "?page=" +
+              this.shopScreen.page +
+              "&limit=" +
+              this.shopScreen.limit
+          )
+          .then((res) => {
+            this.shopList = res.page.list;
+            this.totalPage = res.page.totalPage;
+            this.status = 3;
+          });
+      } else if (this.shopScreen.type == "Sale") {
+        this.$http.get(this.urList).then((res) => {
+          let arr = [];
+          for (let i in res.list) {
+            arr.push({
+              productImages: res.list[i].prodInfo.productImages,
+              productName: res.list[i].prodInfo.productName,
+              price: res.list[i].seckillPrice,
+              oldprice: res.list[i].prodInfo.price,
+              productId: res.list[i].prodInfo.productId,
+            });
+          }
+          this.shopList = arr;
+          this.status = 3;
+        });
+      }
+    },
 
-			},
+    // 加入购物车
+    addShopCar(e) {
+      this.$http
+        .post(`book/ordercart/getCartList?userId=${this.userInfo.id}`)
+        .then((res) => {
+          this.cartList = res.cartList;
+          // 统计商品信息
+          let data = {
+            userId: this.userInfo.id,
+            productId: e.productId,
+            productAmount: 1,
+            price: e.price,
+          };
+          console.log(e);
+          // 判断列表是否为空
+          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,
+                  });
+                }
+              });
+          }
+        });
+    },
 
-			// 加入购物车
-			addShopCar(e) {
-				this.$http
-					.post(`book/ordercart/getCartList?userId=${this.userInfo.id}`)
-					.then(res => {
-						this.cartList = res.cartList
-						// 统计商品信息
-						let data = {
-							"userId": this.userInfo.id,
-							"productId": e.productId,
-							"productAmount": 1,
-							"price": e.price
-						}
-						console.log(e)
-						// 判断列表是否为空
-						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,
-									});
-								}
-							})
-						}
-					})
-			},
-
-			// 商品内容跳转
-			onShopJump(e) {
-				uni.navigateTo({
-					url: './commodityDetail?id=' + e.productId
-				});
-			}
-
-		},
-
-	};
+    // 商品内容跳转
+    onShopJump(e) {
+      uni.navigateTo({
+        url: "./commodityDetail?id=" + e.productId,
+      });
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-	@import '@/style/mixin.scss';
+@import "@/style/mixin.scss";
 
+.shop_list {
+  margin: 30rpx;
 
+  .sl_tioa {
+    box-shadow: 0 0px 10px 1px #d3d1d133;
+    background-color: #fff;
+    padding: 25rpx;
+    margin: 0 0 20rpx 0;
+    border-radius: 15rpx;
+    position: relative;
 
+    image {
+      width: 160upx;
+      height: 240upx;
+      float: left;
+      margin-right: 20rpx;
+    }
 
-	.shop_list {
-		margin: 30rpx;
+    .sl_cont {
+      float: left;
 
-		.sl_tioa {
-			box-shadow: 0 0px 10px 1px #d3d1d133;
-			background-color: #fff;
-			padding: 25rpx;
-			margin: 0 0 20rpx 0;
-			border-radius: 15rpx;
-			position: relative;
+      .sl_tit {
+        max-width: 420rpx;
+        font-size: 30rpx;
+      }
 
-			image {
-				width: 160upx;
-				height: 240upx;
-				float: left;
-				margin-right: 20rpx;
-			}
+      .sl_ric {
+        color: #bf0c0c;
+        font-weight: bold;
+        margin-top: 50rpx;
+      }
 
-			.sl_cont {
-				float: left;
+      .sl_del {
+        text-decoration: line-through;
+        color: #c1c1c1;
+        font-size: 30rpx;
+        margin-left: 10rpx;
+      }
 
-
-				.sl_tit {
-					max-width: 420rpx;
-					font-size: 30rpx;
-				}
-
-				.sl_ric {
-					color: #bf0c0c;
-					font-weight: bold;
-					margin-top: 50rpx;
-				}
-
-				.sl_del {
-					text-decoration: line-through;
-					color: #c1c1c1;
-					font-size: 30rpx;
-					margin-left: 10rpx;
-				}
-
-				.sl_gou {
-					background-color: #fbf6ec;
-					border-radius: 50rpx;
-					padding: 5rpx;
-					position: absolute;
-					right: 50rpx;
-					bottom: 40rpx;
-
-				}
-			}
-
-
-
-
-		}
-
-	}
+      .sl_gou {
+        background-color: #fbf6ec;
+        border-radius: 50rpx;
+        padding: 5rpx;
+        position: absolute;
+        right: 50rpx;
+        bottom: 40rpx;
+      }
+    }
+  }
+}
 </style>
diff --git a/pages/bookShop/classify.vue b/pages/bookShop/classify.vue
index d8cbc1e..90029e5 100644
--- a/pages/bookShop/classify.vue
+++ b/pages/bookShop/classify.vue
@@ -1,458 +1,523 @@
-<template><page-meta
+<template>
+  <page-meta
     :page-font-size="$baseFontSize() + 'px'"
     :root-font-size="$baseFontSize() + 'px'"
   ></page-meta>
-	<view class="">
-		<z-nav-bar title="健康超市"></z-nav-bar>
-		<!-- 一级分类 -->
-		<view class="oneBox">
-			<view class="oneLevel">
-				<u-tabs :scrollable="false" :current="current" lineWidth="42" :inactiveStyle="{fontSize:'32rpx'}"
-					:list="oneLevel" @click="getTowLevel" lineColor="#54a966"
-					:activeStyle="{color: '#303133',fontWeight: 'bold', transform: 'scale(1.01)'}"></u-tabs>
-			</view>
-		</view>
-		<!-- <view class="search_box" @click="onPageJump('../peanut/searchFor')">
+  <view class="">
+    <z-nav-bar title="健康超市"></z-nav-bar>
+    <!-- 一级分类 -->
+    <view class="oneBox">
+      <view class="oneLevel">
+        <u-tabs
+          :scrollable="false"
+          :current="current"
+          lineWidth="42"
+          :inactiveStyle="{ fontSize: '32rpx' }"
+          :list="oneLevel"
+          @click="getTowLevel"
+          lineColor="#54a966"
+          :activeStyle="{
+            color: '#303133',
+            fontWeight: 'bold',
+            transform: 'scale(1.01)',
+          }"
+        ></u-tabs>
+      </view>
+    </view>
+    <!-- <view class="search_box" @click="onPageJump('../peanut/searchFor')">
 			<text class="icon_search"></text>
 			<text class="prompt">搜索...</text>
 		</view> -->
-		
-		<!-- 二级分类、商品 -->
-		<view class="twoBox" style="">
-			<!-- <u-sticky> -->
-			<u-tabs v-if="utabs" :list="towLevel" :current = "0" :inactiveStyle="{fontSize:'28rpx'}" lineWidth="40" @click="getCategoryList"
-				:activeStyle="{transform: 'scale(1.01)'}"></u-tabs>
-			<!-- </u-sticky> -->
-		</view>
-		<view class="classfyBody">
-			<!-- 二级分类、商品 -->
-			<view class="towLevel" v-if="towLevel.length > 0">
-				<view class="towLevelContent" v-if="commodityList && commodityList.length > 0">
-					<view class="commodityItem" v-for="(item,index) in commodityList" :key="index"
-						@click.stop="toDetail(item.productId)">
-						<view class="box">
-							<image :src="item.productImages" mode=""></image>
-							<view class="commodityContent">
-								<view class="commodityTitle">
-									{{item.productName}}
-									<span v-if="item.productStock==0" style="color: #aaa;font-size:26rpx;">（暂无库存）</span>
-								</view>
-								<view class="commodityPrice">
-									<text class="price" v-if="item.price">￥
-										<b style="font-size: 40rpx;">{{item.price}}</b>
-										<span class="priceTag" v-if="item.activityPrice">原价：￥{{item.activityPrice}}</span>
-									</text>
-									<text class="SoldNumber" v-if="item.sumSales">已售<span>{{item.sumSales}}</span>件</text>
-									<!-- <text class="icon" @click.stop="addShopCar(item)" v-if="item.productStock">								
+
+    <!-- 二级分类、商品 -->
+    <view class="twoBox" style="">
+      <!-- <u-sticky> -->
+      <u-tabs
+        v-if="utabs"
+        :list="towLevel"
+        :current="0"
+        :inactiveStyle="{ fontSize: '28rpx' }"
+        lineWidth="40"
+        @click="getCategoryList"
+        :activeStyle="{ transform: 'scale(1.01)' }"
+      ></u-tabs>
+      <!-- </u-sticky> -->
+    </view>
+    <view class="classfyBody">
+      <!-- 二级分类、商品 -->
+      <view class="towLevel" v-if="towLevel.length > 0">
+        <view
+          class="towLevelContent"
+          v-if="commodityList && commodityList.length > 0"
+        >
+          <view
+            class="commodityItem"
+            v-for="(item, index) in commodityList"
+            :key="index"
+            @click.stop="toDetail(item.productId)"
+          >
+            <view class="box">
+              <image :src="item.productImages" mode=""></image>
+              <view class="commodityContent">
+                <view class="commodityTitle">
+                  {{ item.productName }}
+                  <span
+                    v-if="item.productStock == 0"
+                    style="color: #aaa; font-size: 26rpx"
+                    >（暂无库存）</span
+                  >
+                </view>
+                <view class="commodityPrice">
+                  <text class="price" v-if="item.price"
+                    >￥
+                    <b style="font-size: 40rpx">{{ item.price }}</b>
+                    <span class="priceTag" v-if="item.activityPrice"
+                      >原价：￥{{ item.activityPrice }}</span
+                    >
+                  </text>
+                  <text class="SoldNumber" v-if="item.sumSales"
+                    >已售<span>{{ item.sumSales }}</span
+                    >件</text
+                  >
+                  <!-- <text class="icon" @click.stop="addShopCar(item)" v-if="item.productStock">								
 									<u-icon name="shopping-cart" :size="26" color="#eba00b"></u-icon>
 								</text> -->
-									<view class="publierInfo" v-if="item.author && item.publisher">
-										<span class="c999 f24">{{item.author}}著</span><span class="c999 f24">/ {{item.publisher}}</span>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view v-else style="text-align: center;font-size: 30rpx;color: #888;margin: 20rpx 0 0 0;flex: 1;">
-					暂无商品
-				</view>
-			</view>
-			<view v-else style="text-align: center;font-size:30rpx;color: #888;margin: 50rpx 0 0 0;">
-				暂无分类
-			</view>
-		</view>
-		<view>
-			<u-back-top :scroll-top="scrollTop" bottom="60" :customStyle='bgiStyle' :iconStyle="iconStyle"></u-back-top>
-		</view>
-		<music-play :playData="playData"></music-play>
-	</view>
+                  <view
+                    class="publierInfo"
+                    v-if="item.author && item.publisher"
+                  >
+                    <span class="c999 f24">{{ item.author }}著</span
+                    ><span class="c999 f24">/ {{ item.publisher }}</span>
+                  </view>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view
+          v-else
+          style="
+            text-align: center;
+            font-size: 30rpx;
+            color: #888;
+            margin: 20rpx 0 0 0;
+            flex: 1;
+          "
+        >
+          暂无商品
+        </view>
+      </view>
+      <view
+        v-else
+        style="
+          text-align: center;
+          font-size: 30rpx;
+          color: #888;
+          margin: 50rpx 0 0 0;
+        "
+      >
+        暂无分类
+      </view>
+    </view>
+    <view>
+      <u-back-top
+        :scroll-top="scrollTop"
+        bottom="60"
+        :customStyle="bgiStyle"
+        :iconStyle="iconStyle"
+      ></u-back-top>
+    </view>
+    <music-play :playData="playData"></music-play>
+  </view>
 </template>
 
 <script>
-	import musicPlay from '@/components/music.vue'
-	import $http from '@/config/requestConfig.js';
-	import {
-		mapState
-	} from 'vuex';
-	export default {
-		data() {
-			return {
-				playData:{},
-				highlight: '', // 高亮下标
-				current: 0,
-				twocurrent:0,
-				oneLevel: [],
-				towLevel: [],
-				commodityList: [] ,// 商品列表		
-				utabs:false,
-				bgiStyle: {
-					background: '#2ab58833'
-				},
-				iconStyle: {					
-					fontSize: '40rpx',
-					fontWeight: 'bold',
-					color: '#54a966',
-				},
-				scrollTop: 0,
-			}
-		},
-		// contentButtonClick(e) {
-		// 	console.log(e)
-		// },		
-		// onLoad(e) {
-		// 	//获取一级分类
-		// 	this.$http
-		// 		.post('book/shopcategory/getOneLevel')
-		// 		.then(res => {
-		// 			this.oneLevel = res.list
-		// 			this.current = e.type
-		// 			this.getTowLevel(this.oneLevel[e.type])
-		// 		})
-		// },
-		//页面显示
-		onShow() {
-			this.getOneLevel()
-		},
-		computed: {
-			...mapState(['userInfo']),
-		},		
-		mounted () {
-		    setTimeout(() => { // 解决vant-tab组件官方问题：底部条位置错误
-		      this.utabs = true
-		    }, 200)
-		},
-		components: {
-			musicPlay
-		},
-		methods: {
-			onPageScroll(e) {
-				this.scrollTop = e.scrollTop;
-			},
-			// 跳转
-			onPageJump(url) {
-				uni.navigateTo({
-					url: url
-				});
-			},
-			// 获取一级分类
-			getOneLevel() {
-				this.$http
-					.post('book/shopcategory/getOneLevel')
-					.then(res => {
-						//console.log(res,'一级分类')
-						this.oneLevel = res.list
-						// this.current = e.type
-						this.getTowLevel(this.oneLevel[0])
-					})
-			},
-			// 点击一级分类
-			getTowLevel(e) {
-				this.utabs = false
-				// this.twocurrent = 0; 	
-				uni.showLoading()
-				this.$http
-					.post(`book/shopcategory/getTwoLevel?catId=${e.catId}`)
-					.then(res => {
-						//console.log(res,'二级分类')
-						this.towLevel = res.list
-						if (this.towLevel == '') {
-							this.commodityList = []
-						} else {
-							let newo = {
-								catId:0,
-								name:'全部',
-								parentCid:e.catId
-							}
-							this.towLevel.splice(0,0,newo)
-							// this.getCategoryList(res.list[0])
-							// console.log(this.towLevel, 'towLevel')
-							this.getCategoryList(res.list[0])
-						}
-						uni.hideLoading()
-						this.utabs = true
-						uni.stopPullDownRefresh();
-					})
-			},
+import musicPlay from "@/components/music.vue";
+import $http from "@/config/requestConfig.js";
+import { mapState } from "vuex";
+export default {
+  data() {
+    return {
+      playData: {},
+      highlight: "", // 高亮下标
+      current: 0,
+      twocurrent: 0,
+      oneLevel: [],
+      towLevel: [],
+      commodityList: [], // 商品列表
+      utabs: false,
+      bgiStyle: {
+        background: "#2ab58833",
+      },
+      iconStyle: {
+        fontSize: "40rpx",
+        fontWeight: "bold",
+        color: "#54a966",
+      },
+      scrollTop: 0,
+    };
+  },
+  // contentButtonClick(e) {
+  // 	console.log(e)
+  // },
+  // onLoad(e) {
+  // 	//获取一级分类
+  // 	this.$http
+  // 		.post('book/shopcategory/getOneLevel')
+  // 		.then(res => {
+  // 			this.oneLevel = res.list
+  // 			this.current = e.type
+  // 			this.getTowLevel(this.oneLevel[e.type])
+  // 		})
+  // },
+  //页面显示
+  onShow() {
+    this.getOneLevel();
+  },
+  computed: {
+    ...mapState(["userInfo"]),
+  },
+  mounted() {
+    setTimeout(() => {
+      // 解决vant-tab组件官方问题：底部条位置错误
+      this.utabs = true;
+    }, 200);
+  },
+  components: {
+    musicPlay,
+  },
+  methods: {
+    onPageScroll(e) {
+      this.scrollTop = e.scrollTop;
+    },
+    // 跳转
+    onPageJump(url) {
+      uni.navigateTo({
+        url: url,
+      });
+    },
+    // 获取一级分类
+    getOneLevel() {
+      this.$http.post("book/shopcategory/getOneLevel").then((res) => {
+        //console.log(res,'一级分类')
+        this.oneLevel = res.list;
+        // this.current = e.type
+        this.getTowLevel(this.oneLevel[0]);
+      });
+    },
+    // 点击一级分类
+    getTowLevel(e) {
+      this.utabs = false;
+      // this.twocurrent = 0;
+      uni.showLoading();
+      this.$http
+        .post(`book/shopcategory/getTwoLevel?catId=${e.catId}`)
+        .then((res) => {
+          //console.log(res,'二级分类')
+          this.towLevel = res.list;
+          if (this.towLevel == "") {
+            this.commodityList = [];
+          } else {
+            let newo = {
+              catId: 0,
+              name: "全部",
+              parentCid: e.catId,
+            };
+            this.towLevel.splice(0, 0, newo);
+            // this.getCategoryList(res.list[0])
+            // console.log(this.towLevel, 'towLevel')
+            this.getCategoryList(res.list[0]);
+          }
+          uni.hideLoading();
+          this.utabs = true;
+          uni.stopPullDownRefresh();
+        });
+    },
 
-			// 点击二级分类
-			getCategoryList(e) {
-				// console.log(e)
-				// return false
-				// this.highlight = index			
-				this.$http
-					.post('book/shopproduct/appGetCategoryList', {
-						'catId': e.catId
-					})
-					.then(res => {
-						// console.log(res,'二级分类')
-						this.commodityList = res.list
-					})
-			},
-			// 加入购物车
-			addShopCar(e) {
-				this.$http
-					.post(`book/ordercart/getCartList?userId=${this.userInfo.id}`)
-					.then(res => {
-						//  获得用户的购物车列表信息
-						this.cartList = res.cartList
-						// 统计商品信息
-						let data = {
-							"userId": this.userInfo.id,
-							"productId": e.productId,
-							"productAmount": 1,
-							"price": e.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,
-									});
-								}
-							})
-						}
-					})
-			},
-			// 商品内容跳转
-			toDetail(id) {
-				uni.navigateTo({
-					url: `./commodityDetail?id=${id}`
-				})
-			}			
-		},
-		onPullDownRefresh(){
-			// console.log('refresh');
-			this.commodityList = []
-			this.getOneLevel()			
-		}
-	}
+    // 点击二级分类
+    getCategoryList(e) {
+      // console.log(e)
+      // return false
+      // this.highlight = index
+      this.$http
+        .post("book/shopproduct/appGetCategoryList", {
+          catId: e.catId,
+        })
+        .then((res) => {
+          // console.log(res,'二级分类')
+          this.commodityList = res.list;
+        });
+    },
+    // 加入购物车
+    addShopCar(e) {
+      this.$http
+        .post(`book/ordercart/getCartList?userId=${this.userInfo.id}`)
+        .then((res) => {
+          //  获得用户的购物车列表信息
+          this.cartList = res.cartList;
+          // 统计商品信息
+          let data = {
+            userId: this.userInfo.id,
+            productId: e.productId,
+            productAmount: 1,
+            price: e.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,
+                  });
+                }
+              });
+          }
+        });
+    },
+    // 商品内容跳转
+    toDetail(id) {
+      uni.navigateTo({
+        url: `./commodityDetail?id=${id}`,
+      });
+    },
+  },
+  onPullDownRefresh() {
+    // console.log('refresh');
+    this.commodityList = [];
+    this.getOneLevel();
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.publierInfo {
-		display: inline-block;
-		background-color: #f1f1f1;
-		flex-direction: row;
-		border-radius: 10px;
-		vertical-align: middle;
-		padding: 0 12rpx;
-		line-height: 32rpx;
-	}
+.publierInfo {
+  display: inline-block;
+  background-color: #f1f1f1;
+  flex-direction: row;
+  border-radius: 10px;
+  vertical-align: middle;
+  padding: 0 12rpx;
+  line-height: 32rpx;
+}
 
-	.c999 {
-		color: #999;
-	}
+.c999 {
+  color: #999;
+}
 
-	.f24 {
-		font-size: 24rpx;
-	}
+.f24 {
+  font-size: 24rpx;
+}
 
-	.search_box {
-		width: 90%;
-		height: 64upx;
-		background-color: #fff;
-		border-radius: 32upx;
-		display: flex;
-		align-items: center;
-		padding: 0upx 40upx;
-		position: relative;
-		margin: 30rpx 0 15rpx -46%;
-		left: 50%;
-		box-shadow: 0 0px 10px 1px #54a96633;
+.search_box {
+  width: 90%;
+  height: 64upx;
+  background-color: #fff;
+  border-radius: 32upx;
+  display: flex;
+  align-items: center;
+  padding: 0upx 40upx;
+  position: relative;
+  margin: 30rpx 0 15rpx -46%;
+  left: 50%;
+  box-shadow: 0 0px 10px 1px #54a96633;
 
-		.prompt {
-			color: #cccccc;
+  .prompt {
+    color: #cccccc;
+  }
 
-		}
+  .icon_search {
+    background-image: url("@/static/icon/map_ic_search.png");
+    background-position: center center;
+    background-repeat: no-repeat;
+    background-size: cover;
+    width: 29upx;
+    height: 28upx;
+    margin-right: 20upx;
+  }
+}
 
-		.icon_search {
-			background-image: url('@/static/icon/map_ic_search.png');
-			background-position: center center;
-			background-repeat: no-repeat;
-			background-size: cover;
-			width: 29upx;
-			height: 28upx;
-			margin-right: 20upx;
-		}
-	}
+.oneBox {
+  margin: 10rpx auto;
 
-	.oneBox {
-		margin: 10rpx auto;
+  .oneLevel {
+  }
+}
 
-		.oneLevel {}
-	}
+.twoBox {
+  width: 95%;
+  margin: 0 auto;
+}
 
-	.twoBox {
-		width: 95%;
-		margin: 0 auto;
-	}
+.classfyBody {
+  margin: 5rpx auto;
+  // width: 100%;
+  height: 100%;
 
-	.classfyBody {
-		margin: 5rpx auto;
-		// width: 100%;
-		height: 100%;
+  .towLevel {
+    width: 100%;
+    height: 100%;
+    display: flex;
 
+    .towLevelTitle {
+      width: 28%;
+      height: auto;
+      text-align: center;
 
+      .titleItem {
+        font-size: 35rpx;
+        padding: 20rpx 10rpx;
+      }
 
-		.towLevel {
-			width: 100%;
-			height: 100%;
-			display: flex;
+      .active {
+        background-color: #fff;
+        border-left: solid 10rpx #eba00b;
+        font-weight: bold;
+      }
+    }
 
-			.towLevelTitle {
-				width: 28%;
-				height: auto;
-				text-align: center;
+    .towLevelContent {
+      display: flex;
+      flex-wrap: wrap;
+      padding: 10rpx 20rpx;
+      width: 100%;
+      align-items: stretch;
+      // align-content:center;
+      align-content: start;
+      .commodityItem {
+        width: 50%;
+        // background-color: #fff;
+        padding: 10rpx;
 
-				.titleItem {
-					font-size: 35rpx;
-					padding: 20rpx 10rpx;
-				}
+        .box {
+          background-color: #fff;
+          padding: 10rpx;
+          border-radius: 20rpx !important;
+          overflow: hidden;
+          box-shadow: 0 0px 10px 1px #54a96633;
+        }
 
-				.active {
-					background-color: #fff;
-					border-left: solid 10rpx #eba00b;
-					font-weight: bold;
-				}
-			}
+        .commodityTitle {
+          font-size: 32rpx;
+          margin: 20rpx 0 10rpx 0;
+        }
 
-			.towLevelContent {
-				display: flex;
-				flex-wrap: wrap;
-				padding: 10rpx 20rpx;
-				width: 100%;
-				align-items: stretch;
-				// align-content:center;
-				align-content:start;
-				.commodityItem {
-					width: 50%;
-					// background-color: #fff;					
-					padding: 10rpx;
+        image {
+          width: 100%;
+          border-radius: 10rpx;
+          height: 300rpx;
+          margin-right: 20rpx;
+        }
 
-					.box {
-						background-color: #fff;
-						padding: 10rpx;
-						border-radius: 20rpx !important;
-						overflow: hidden;
-						box-shadow: 0 0px 10px 1px #54a96633;
-					}
+        .commodityContent {
+          flex: 1;
+          font-size: 16px;
 
-					.commodityTitle {
-						font-size: 32rpx;
-						margin: 20rpx 0 10rpx 0;
-					}
+          display: flex;
+          flex-direction: column;
+          justify-content: space-between;
 
-					image {
-						width: 100%;
-						border-radius: 10rpx;
-						height: 300rpx;
-						margin-right: 20rpx;
-					}
+          .commodityPrice {
+            width: 100%;
+            position: relative;
+            margin: 0 0 3rpx 0;
 
-					.commodityContent {
-						flex: 1;
-						font-size: 16px;
+            .price {
+              vertical-align: middle;
+              color: #ffa200;
 
-						display: flex;
-						flex-direction: column;
-						justify-content: space-between;
+              .priceTag {
+                flex-direction: row;
+                color: #999;
+                display: inline-block;
+                zoom: 0.8;
+                margin-left: 6rpx;
+                margin-bottom: 6px;
+              }
+            }
 
-						.commodityPrice {
-							width: 100%;
-							position: relative;
-							margin: 0 0 3rpx 0;
+            .SoldNumber {
+              font-size: 24rpx;
+              color: #999;
+              float: right;
+              margin-top: 16rpx;
+            }
 
-							.price {
-								vertical-align: middle;
-								color: #ffa200;
-
-								.priceTag {
-									flex-direction: row;
-									color: #999;
-									display: inline-block;
-									zoom: .8;
-									margin-left: 6rpx;
-									margin-bottom: 6px;
-								}
-							}
-
-							.SoldNumber {
-								font-size: 24rpx;
-								color: #999;
-								float: right;
-								margin-top: 16rpx;
-							}
-
-							.icon {
-								background-color: #fbf6ec;
-								border-radius: 50rpx;
-								padding: 5rpx;
-								position: absolute;
-								right: 0;
-								bottom: -20rpx;
-							}
-						}
-					}
-				}
-			}
-		}
-	}
+            .icon {
+              background-color: #fbf6ec;
+              border-radius: 50rpx;
+              padding: 5rpx;
+              position: absolute;
+              right: 0;
+              bottom: -20rpx;
+            }
+          }
+        }
+      }
+    }
+  }
+}
 </style>
diff --git a/pages/bookShop/classifyAll.vue b/pages/bookShop/classifyAll.vue
index 1d38b48..f68401d 100644
--- a/pages/bookShop/classifyAll.vue
+++ b/pages/bookShop/classifyAll.vue
@@ -1,81 +1,80 @@
-<template><page-meta
+<template>
+  <page-meta
     :page-font-size="$baseFontSize() + 'px'"
     :root-font-size="$baseFontSize() + 'px'"
   ></page-meta>
-	<view>
-		<z-nav-bar title="全部分类"></z-nav-bar>
-		<view class="oneLevel">
-			<view class="oneItem" v-for="(item,index) in oneLevel" @click="getTowLevel(index)">
-				<image :src="item.icon"></image>
-				<text>{{item.name}}</text>
-			</view>
-		</view>
-		<music-play :playData="playData"></music-play>
-	</view>
-
+  <view>
+    <z-nav-bar title="全部分类"></z-nav-bar>
+    <view class="oneLevel">
+      <view
+        class="oneItem"
+        v-for="(item, index) in oneLevel"
+        @click="getTowLevel(index)"
+      >
+        <image :src="item.icon"></image>
+        <text>{{ item.name }}</text>
+      </view>
+    </view>
+    <music-play :playData="playData"></music-play>
+  </view>
 </template>
 
 <script>
-	import musicPlay from '@/components/music.vue'
-	export default {
-		data() {
-			return {
-				playData:{},
-				oneLevel: [],
-			}
-		},
-		onLoad(e) {
-			this.$http
-				.post('book/shopcategory/getOneLevel')
-				.then(res => {
-					let arr = []
-					for (let i in res.list) {
-						arr.push({
-							icon: "../../static/icon/shop_bar_" + (Number(i) + Number(1)) + ".png",
-							name: res.list[i].name,
-							catId: res.list[i].catId
-						})
-					}
-					this.oneLevel = arr
-				})
-		},
-		components: {
-			musicPlay
-		},
-		methods: {
-			// 点击分类跳转
-			getTowLevel(e) {
-				uni.navigateTo({
-					url: `./classify?type=${e}`
-				})
-			},
-
-		}
-	}
+import musicPlay from "@/components/music.vue";
+export default {
+  data() {
+    return {
+      playData: {},
+      oneLevel: [],
+    };
+  },
+  onLoad(e) {
+    this.$http.post("book/shopcategory/getOneLevel").then((res) => {
+      let arr = [];
+      for (let i in res.list) {
+        arr.push({
+          icon:
+            "../../static/icon/shop_bar_" + (Number(i) + Number(1)) + ".png",
+          name: res.list[i].name,
+          catId: res.list[i].catId,
+        });
+      }
+      this.oneLevel = arr;
+    });
+  },
+  components: {
+    musicPlay,
+  },
+  methods: {
+    // 点击分类跳转
+    getTowLevel(e) {
+      uni.navigateTo({
+        url: `./classify?type=${e}`,
+      });
+    },
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	.oneLevel {
+.oneLevel {
+  margin: 10rpx 0 0 0;
 
-		margin: 10rpx 0 0 0;
+  .oneItem {
+    display: inline-block;
+    width: 20%;
+    text-align: center;
+    margin: 30rpx 0 0 0;
 
+    image {
+      width: 100rpx;
+      height: 100rpx;
+      margin: 0 auto;
+    }
 
-		.oneItem {
-			display: inline-block;
-			width: 20%;
-			text-align: center;
-			margin: 30rpx 0 0 0;
-
-			image {
-				width: 100rpx;
-				height: 100rpx;
-				margin: 0 auto;
-			}
-
-			text {
-				font-size: 30rpx;
-			}
-		}
-
-	}
+    text {
+      font-size: 30rpx;
+    }
+  }
+}
 </style>
diff --git a/pages/bookShop/commodityDetail copy.vue b/pages/bookShop/commodityDetail copy.vue
index 7be4793..0aa966e 100644
--- a/pages/bookShop/commodityDetail copy.vue	
+++ b/pages/bookShop/commodityDetail copy.vue	
@@ -1,633 +1,859 @@
-<template><page-meta
+<template>
+  <page-meta
     :page-font-size="$baseFontSize() + 'px'"
     :root-font-size="$baseFontSize() + 'px'"
   ></page-meta>
-	<view class="">
-		<view class="header">
-			<!-- 顶部导航栏 -->
-			<z-nav-bar title="商品详情" bgColor="red"></z-nav-bar>
-		</view>
-		<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%;">
-					<image :src="item" mode="scaleToFill" style="width: 100%;height: 100%;"></image>
-				</swiper-item>
-			</swiper>
-		</view>
-		<view class="commodityContent">
-			<view class="commodityPrice">
-				<span>￥</span><em>{{productInfo.price}}</em>
-				<span class="oldPrice " v-if="productInfo.activityPrice">原价￥{{productInfo.activityPrice}}</span>
-			</view>
-			<view class="commodityyName">
-				{{productInfo.productName}}
-				<span v-if="productInfo.productStock==0" style="color: #aaa;font-size:26rpx;">（无货）</span>
-				<view><text class="SoldNumber">已售<span>{{productInfo.sumSales}}</span>件</text></view>
-			</view>
-			<view class="contentButton">
-				<u-tabs :scrollable="false" :list="contentButtonList" @click="contentButtonClick"></u-tabs>
-			</view>
-			<!-- 详情 + 评价1 -->
-			<view v-if="contentShow == 0">
-				<view class="tingshuList" v-if="listenList.length > 0">
-					<h4>赠送听书权益</h4>
-					<view class="item flexbox" v-for="item in listenList" :key="item.id" style="vertical-align: middle;">
-						<text style="margin-top: 10rpx; 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>
-				</view>
-			<view class="bookInfo" >
-				<u-row customStyle="margin-bottom: 10px">
-					<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-row>
-				<u-row>
-				
-					<u-col span="6" v-if="productInfo.publisher"><span>出版社：{{productInfo.publisher}}</span></u-col>
-					<u-col span="6" v-if="productInfo.pubDate"><span>出版时间：{{ productInfo.pubDate | formatDate }}</span></u-col>	
-					</u-row>
-				<u-row>				
-					<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>
-					<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" :nodes="productInfo.productDetails|formatRichText"></rich-text>
-				</view>
-			</view>
-			</view>
-			<view v-else >
-				<!-- 商品评价 -->
-				<view class="" v-if="commentsList && commentsList.length > 0">				
-				<view class="pingjiaBox" v-for="(item, index) in commentsList" :key="index">
-					<view class="flexbox">
-						<view class="touxiang">
-							<image :src="item.avatar" mode="aspectFit"></image>
-							<text class="username nowrap ">{{item.name}}</text>
-						</view>
-						<view class="contentBox">
-							<view class="mb30">
-								<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>
-							
-							<div class="pjimgs flexbox">
-								<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>
-						</view>						
-					</view>
-					<!-- 显示追平 -->
-					<view class="zhuiping item" v-if="item.zphtml != ''" style="padding-left: 50px;">
-						<h5 style="color: #dbdbdb; margin:10px;">追评内容：</h5>
-						<view class="flexbox">							
-							<view class="contentBox">
-								<view class="content" v-html="item.zphtml"></view>
-								<text class="time">{{item.followUpdate}}</text>
-							</view>						
-						</view>
-					</view>
-				</view>
-				</view>
-				<view class="quesheng" v-else>
-					<text>暂无评价~</text>
-				</view>
-			</view>
-			<view style="height: 120rpx;"></view>
-		</view>
-		<uni-goods-nav class="goods_nav" :fill="true" :options="options" :buttonGroup="buttonGroup" @click="onClick"
-			@buttonClick="buttonClick" />
-		<music-play :playData="playData"></music-play>
-	</view>
+  <view class="">
+    <view class="header">
+      <!-- 顶部导航栏 -->
+      <z-nav-bar title="商品详情" bgColor="red"></z-nav-bar>
+    </view>
+    <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%"
+        >
+          <image
+            :src="item"
+            mode="scaleToFill"
+            style="width: 100%; height: 100%"
+          ></image>
+        </swiper-item>
+      </swiper>
+    </view>
+    <view class="commodityContent">
+      <view class="commodityPrice">
+        <span>￥</span><em>{{ productInfo.price }}</em>
+        <span class="oldPrice" v-if="productInfo.activityPrice"
+          >原价￥{{ productInfo.activityPrice }}</span
+        >
+      </view>
+      <view class="commodityyName">
+        {{ productInfo.productName }}
+        <span
+          v-if="productInfo.productStock == 0"
+          style="color: #aaa; font-size: 26rpx"
+          >（无货）</span
+        >
+        <view
+          ><text class="SoldNumber"
+            >已售<span>{{ productInfo.sumSales }}</span
+            >件</text
+          ></view
+        >
+      </view>
+      <view class="contentButton">
+        <u-tabs
+          :scrollable="false"
+          :list="contentButtonList"
+          @click="contentButtonClick"
+        ></u-tabs>
+      </view>
+      <!-- 详情 + 评价1 -->
+      <view v-if="contentShow == 0">
+        <view class="tingshuList" v-if="listenList.length > 0">
+          <h4>赠送听书权益</h4>
+          <view
+            class="item flexbox"
+            v-for="item in listenList"
+            :key="item.id"
+            style="vertical-align: middle"
+          >
+            <text style="margin-top: 10rpx; 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>
+        </view>
+        <view class="bookInfo">
+          <u-row customStyle="margin-bottom: 10px">
+            <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-row>
+          <u-row>
+            <u-col span="6" v-if="productInfo.publisher"
+              ><span>出版社：{{ productInfo.publisher }}</span></u-col
+            >
+            <u-col span="6" v-if="productInfo.pubDate"
+              ><span
+                >出版时间：{{ productInfo.pubDate | formatDate }}</span
+              ></u-col
+            >
+          </u-row>
+          <u-row>
+            <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>
+            <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"
+              :nodes="productInfo.productDetails | formatRichText"
+            ></rich-text>
+          </view>
+        </view>
+      </view>
+      <view v-else>
+        <!-- 商品评价 -->
+        <view class="" v-if="commentsList && commentsList.length > 0">
+          <view
+            class="pingjiaBox"
+            v-for="(item, index) in commentsList"
+            :key="index"
+          >
+            <view class="flexbox">
+              <view class="touxiang">
+                <image :src="item.avatar" mode="aspectFit"></image>
+                <text class="username nowrap">{{ item.name }}</text>
+              </view>
+              <view class="contentBox">
+                <view class="mb30">
+                  <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>
+
+                <div class="pjimgs flexbox">
+                  <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>
+              </view>
+            </view>
+            <!-- 显示追平 -->
+            <view
+              class="zhuiping item"
+              v-if="item.zphtml != ''"
+              style="padding-left: 50px"
+            >
+              <h5 style="color: #dbdbdb; margin: 10px">追评内容：</h5>
+              <view class="flexbox">
+                <view class="contentBox">
+                  <view class="content" v-html="item.zphtml"></view>
+                  <text class="time">{{ item.followUpdate }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="quesheng" v-else>
+          <text>暂无评价~</text>
+        </view>
+      </view>
+      <view style="height: 120rpx"></view>
+    </view>
+    <uni-goods-nav
+      class="goods_nav"
+      :fill="true"
+      :options="options"
+      :buttonGroup="buttonGroup"
+      @click="onClick"
+      @buttonClick="buttonClick"
+    />
+    <music-play :playData="playData"></music-play>
+  </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 {
-				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:[] // 关联得听书
-			}
-		},
-		onLoad(e) {	
-			this.productId = e.id
-			this.getProDetail(e)			
-			this.getComments()
-			// console.log(emojiList1,'emojiList1')
-		},
-		computed: {
-			...mapState(['userInfo']),
-		},
-		components: {
-			musicPlay
-		},
-		methods: {
-			goToListen(id){
-				// 跳转到听书
-				uni.navigateTo({
-					 url: "../listen/listen?bookid="+ id					
-				});
-			},
-			// 放大图片
-			previewImage(url){
-				console.log(url)
-				uni.previewImage({
-					urls: [url]
-				});
-			},
-			// 获取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();
-					})
-			},			
-			
-			contentButtonClick(e){				
-				this.contentShow = e.index
-			},
-			// 点击购物车
-			onClick(e) {
-				console.log(e.content.text)
-				uni.switchTab({
-					url: '../peanut/shopping'
-				});				
-			},
-			// 点击按钮组间
-			buttonClick(e) {
-				console.log(e)	
-				if(e.index == 0){
-				// 点击的是加入购物车
-					this.addCart()
-				}else{
-				// 点击的是立即购买
-				this.goPurse()
-				}
-			},
-			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()
-						})
-				}
+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 {
+      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: [], // 关联得听书
+    };
+  },
+  onLoad(e) {
+    this.productId = e.id;
+    this.getProDetail(e);
+    this.getComments();
+    // console.log(emojiList1,'emojiList1')
+  },
+  computed: {
+    ...mapState(["userInfo"]),
+  },
+  components: {
+    musicPlay,
+  },
+  methods: {
+    goToListen(id) {
+      // 跳转到听书
+      uni.navigateTo({
+        url: "../listen/listen?bookid=" + id,
+      });
+    },
+    // 放大图片
+    previewImage(url) {
+      console.log(url);
+      uni.previewImage({
+        urls: [url],
+      });
+    },
+    // 获取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();
+      });
+    },
 
-			},
-			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,
-								});
-							}
-						})
-					}
+    contentButtonClick(e) {
+      this.contentShow = e.index;
+    },
+    // 点击购物车
+    onClick(e) {
+      console.log(e.content.text);
+      uni.switchTab({
+        url: "../peanut/shopping",
+      });
+    },
+    // 点击按钮组间
+    buttonClick(e) {
+      console.log(e);
+      if (e.index == 0) {
+        // 点击的是加入购物车
+        this.addCart();
+      } else {
+        // 点击的是立即购买
+        this.goPurse();
+      }
+    },
+    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();
+          });
+      }
+    },
+    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,
+              });
+            }
+          });
+      }
+    },
 
-				} 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(/<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'
-				});
-			},		
-
-		},
-		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;
-					            }					
-				}	
-	}
+    // 购买下单
+    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(/<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",
+      });
+    },
+  },
+  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>
-	.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: 10px 0;flex-wrap: wrap; display: flex; justify-content: space-between;
-		.item{width: 23%;  margin-right: 10px; 
-		image{ }
-		}
-		
-	}
-	.star{display: inline-block; width: 20px; height: 20px;  margin-right: 10rpx;}
-	.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: 100rpx; color: #8b8a91;}
-	.pingjiaBox{color: #555; margin-bottom: 20rpx;}
-	.flexbox{display: flex;}
-	.contentBox{width: calc(100% - 50px);box-sizing: border-box; padding-left: 20rpx;
-		.content{font-size: 28rpx; line-height: 40rpx;}
-		.time{font-size: 24rpx; color: #999; margin-top: 6rpx; float: right;}
-	}
-	.nowrap {
-				white-space: nowrap;
-				overflow-x: hidden;	           
-	            text-overflow: ellipsis;
-	        }	
-	.touxiang{width:50px; overflow: hidden; text-align: center;
-		image{width:50px !important; padding: 3px; height: 50px !important; border:  1px solid #eee;  border-radius: 64px; overflow: hidden;;}
-		.username{font-size: 24rpx; color: #999; margin-top: 6rpx; }
-	}
-	.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%;
-	}
+.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: 10px 0;
+  flex-wrap: wrap;
+  display: flex;
+  justify-content: space-between;
+  .item {
+    width: 23%;
+    margin-right: 10px;
+    image {
+    }
+  }
+}
+.star {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  margin-right: 10rpx;
+}
+.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: 100rpx;
+  color: #8b8a91;
+}
+.pingjiaBox {
+  color: #555;
+  margin-bottom: 20rpx;
+}
+.flexbox {
+  display: flex;
+}
+.contentBox {
+  width: calc(100% - 50px);
+  box-sizing: border-box;
+  padding-left: 20rpx;
+  .content {
+    font-size: 28rpx;
+    line-height: 40rpx;
+  }
+  .time {
+    font-size: 24rpx;
+    color: #999;
+    margin-top: 6rpx;
+    float: right;
+  }
+}
+.nowrap {
+  white-space: nowrap;
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+}
+.touxiang {
+  width: 50px;
+  overflow: hidden;
+  text-align: center;
+  image {
+    width: 50px !important;
+    padding: 3px;
+    height: 50px !important;
+    border: 1px solid #eee;
+    border-radius: 64px;
+    overflow: hidden;
+  }
+  .username {
+    font-size: 24rpx;
+    color: #999;
+    margin-top: 6rpx;
+  }
+}
+.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;
-	}
+.SoldNumber {
+  font-size: 24rpx;
+  color: #999;
+  margin-top: 16rpx;
+}
 
-	.bookInfo {
-		padding: 20px 10px;
-		line-height: 30rpx;
-		background-color: #fff;
-		font-size: 26rpx;
-		color: #555;
-		border-radius: 20rpx 20rpx 0 0
-	}
+.bookInfo {
+  padding: 20px 10px;
+  line-height: 30rpx;
+  background-color: #fff;
+  font-size: 26rpx;
+  color: #555;
+  border-radius: 20rpx 20rpx 0 0;
+}
 
-	.header {
-		position: fixed;
-		top: 0%;
-		left: 0%;
-		z-index: 999;
-	}
+.header {
+  position: fixed;
+  top: 0%;
+  left: 0%;
+  z-index: 999;
+}
 
-	.contentButton {
-		margin: 10px 0;
-	}
+.contentButton {
+  margin: 10px 0;
+}
 
-	.swiperBox {
-		width: 100%;
-		height: 375px;
-		margin-top: 150rpx;
-	}
+.swiperBox {
+  width: 100%;
+  height: 375px;
+  margin-top: 150rpx;
+}
 
-	.commodityContent {
+.commodityContent {
+  margin: 30rpx 20rpx 10rpx 20rpx;
+  height: auto;
 
-		margin: 30rpx 20rpx 10rpx 20rpx;
-		height: auto;
+  .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: 20rpx 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: 20rpx 20rpx 40rpx 20rpx;
+    em {
+      font-size: 74rpx;
+      font-style: normal;
+    }
 
-			em {
-				font-size: 74rpx;
-				font-style: normal;
-			}
+    .oldPrice {
+      margin-left: 10rpx;
+      font-size: 32rpx;
+      color: #999;
+    }
+  }
 
-			.oldPrice {
-				margin-left: 10rpx;
-				font-size: 32rpx;
-				color: #999;
-			}
-		}
+  .commodityyName {
+    margin-top: -20rpx;
+    padding: 30rpx 20rpx 40rpx 20rpx;
+    font-size: 40rpx;
+    border-top-left-radius: 20rpx;
+    border-top-right-radius: 20rpx;
+    background-color: #fff;
+  }
 
-		.commodityyName {
-			margin-top: -20rpx;
-			padding: 30rpx 20rpx 40rpx 20rpx;
-			font-size: 40rpx;
-			border-top-left-radius: 20rpx;
-			border-top-right-radius: 20rpx;
-			background-color: #fff;
-		}
+  .commodityIntroduce {
+    font-size: 30rpx;
+    background-color: #fff;
+    padding: 0 20rpx 30rpx 20rpx;
+  }
+}
 
-		.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%;
 
-	.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;
+  }
 
-		.shopcard {
-			margin: 0 0 0 30rpx;
-			text-align: center;
-			font-size: 20rpx;
-			color: #eba00b;
-		}
+  .operate {
+    display: flex;
 
-		.operate {
-			display: flex;
+    view {
+      font-size: 32rpx;
+      font-weight: 700;
+      color: #fff;
+      padding: 32rpx 40rpx;
+      letter-spacing: 0.8px;
+    }
 
-			view {
-				font-size: 32rpx;
-				font-weight: 700;
-				color: #fff;
-				padding: 32rpx 40rpx;
-				letter-spacing: 0.8px;
-			}
+    .addShopCar {
+      background-color: #eba00b;
+    }
 
-			.addShopCar {
-				background-color: #eba00b;
-			}
-
-			.goBuy {
-
-				background-color: #cf3906;
-			}
-		}
-	}
+    .goBuy {
+      background-color: #cf3906;
+    }
+  }
+}
 </style>
diff --git a/pages/bookShop/commodityDetail.vue b/pages/bookShop/commodityDetail.vue
index 70aa87b..42f4e9a 100644
--- a/pages/bookShop/commodityDetail.vue
+++ b/pages/bookShop/commodityDetail.vue
@@ -1,125 +1,189 @@
-<template><page-meta
+<template>
+  <page-meta
     :page-font-size="$baseFontSize() + 'px'"
     :root-font-size="$baseFontSize() + 'px'"
   ></page-meta>
-	<view class="">
-		<view class="header">
-			<!-- 顶部导航栏 -->
-			<z-nav-bar title="商品详情" bgColor="red"></z-nav-bar>
-		</view>
-		<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%;">
-					<image :src="item" mode="aspectFit" style="width: 100%;height: 100%;" @click="previewImage(item)">
-					</image>
-				</swiper-item>
-			</swiper>
-		</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>
-			</view>
-			<view class="commodityPrice" v-else>
-				<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>
-			</view>
-			<view class="pingjia" v-if="linkProducts && linkProducts.length > 0 && linkProducts[0]">
-				<view class="">
-					<view style="font-weight: 600;margin-bottom: 30rpx;">商品列表</view>
-					<!-- <view class="icon-del rotate"></view> -->
-				</view>
-				<!-- 商品包含 -->
-				<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="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>
-						</view>
-					</view>
-				</view>
-				<!-- <view class="quesheng" v-else>
+  <view class="">
+    <view class="header">
+      <!-- 顶部导航栏 -->
+      <z-nav-bar title="商品详情" bgColor="red"></z-nav-bar>
+    </view>
+    <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%"
+        >
+          <image
+            :src="item"
+            mode="aspectFit"
+            style="width: 100%; height: 100%"
+            @click="previewImage(item)"
+          >
+          </image>
+        </swiper-item>
+      </swiper>
+    </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
+        >
+      </view>
+      <view class="commodityPrice" v-else>
+        <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
+        >
+      </view>
+      <view
+        class="pingjia"
+        v-if="linkProducts && linkProducts.length > 0 && linkProducts[0]"
+      >
+        <view class="">
+          <view style="font-weight: 600; margin-bottom: 30rpx">商品列表</view>
+          <!-- <view class="icon-del rotate"></view> -->
+        </view>
+        <!-- 商品包含 -->
+        <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="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>
+            </view>
+          </view>
+        </view>
+        <!-- <view class="quesheng" v-else>
 					<text>暂无关联商品~</text>
 				</view> -->
-			</view>
+      </view>
 
-			<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>
-			</view>
-			<!-- 详情 + 评价1 -->
-			<view v-if="contentShow == 0">
-				<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="contentButton">
+        <u-tabs
+          :scrollable="false"
+          :list="contentButtonList"
+          @click="contentButtonClick"
+          :activeStyle="{
+            color: '#303133',
+            fontWeight: 'bold',
+            fontSize: '28rpx',
+          }"
+          :inactiveStyle="{
+            color: '#606266',
+            fontSize: '28rpx',
+          }"
+        ></u-tabs>
+      </view>
+      <!-- 详情 + 评价1 -->
+      <view v-if="contentShow == 0">
+        <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>
+              <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="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>
-							<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>
 
-								<view class="qunyi_bottom ">
+                      <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 " 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 "
+                  <!-- <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>听书
@@ -136,1169 +200,1327 @@
 									<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"
+                </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>
+        <view class="pingjia">
+          <!-- <h4></h4> -->
 
-						</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-row>
-						<u-row customStyle="margin-bottom: 10px">
-							<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-row>
-						<u-row customStyle="margin-bottom: 10px">
-							<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-row>
-						<u-row customStyle="margin-bottom: 10px">
-							<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>
-						</view>
-					</view>
-				</view>
-				<!-- <view class="pingjia quesheng" v-else>
+          <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-row>
+            <u-row customStyle="margin-bottom: 10px">
+              <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-row>
+            <u-row customStyle="margin-bottom: 10px">
+              <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-row>
+            <u-row customStyle="margin-bottom: 10px">
+              <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>
+            </view>
+          </view>
+        </view>
+        <!-- <view class="pingjia quesheng" v-else>
 					<text>暂无详情~</text>
 				</view> -->
-			</view>
-			<view class="pingjia" v-else>
-				<view class="">
-					<view style="font-weight: 700;margin-bottom: 30rpx;">评价({{ commentsList ? commentsList.length : 0
-						}})
-					</view>
-					<!-- <view class="icon-del rotate"></view> -->
-				</view>
-				<!-- 商品评价 -->
-				<view class="" v-if="commentsList && commentsList.length > 0">
-					<view class="pingjiaBox" v-for="(item, index) in commentsList" :key="index">
-						<view class="flexbox aligncenter">
-							<view class="touxiang">
-								<image :src="item.avatar" mode="aspectFit"></image>
-								<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>
-							</view>
-						</view>
-						<view class="contentBox">
-							<div class="pjimgs flexbox">
-								<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>
-						</view>
-						<!-- 显示追平 -->
-						<view class="zhuiping item" v-if="item.zphtml != ''" style="padding-left: 60rpx;">
-							<h5 style="color: #dbdbdb;padding: 30rpx 10rpx 10rpx 0rpx;">追评内容：</h5>
-							<view class="flexbox">
-								<view class="contentBox">
-									<view class="content" v-html="item.zphtml"></view>
-									<text class="time">{{ item.followUpdate }}</text>
-								</view>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="quesheng" v-else>
-					<text>暂无评价~</text>
-				</view>
-			</view>
-			<view style="height: 120rpx;"></view>
-		</view>
-		<view class="" v-if="upoShow">
-			<u-popup :show="upoShow" :round="10" @close="closeUpo" style="z-index: 2;">
-				<view class="tanchu">
-					<view class="list">
-						<view class="imgBox">
-							<image v-if="linkimg == ''" src="../../static/icon/wufeng.jpg" mode="aspectFit"
-								style="width: 100%; height: 100%;"></image>
-							<image v-else :src="linkimg" mode="aspectFit" style="width: 100%; height: 100%;"
-								@click="previewImage(linkimg)"></image>
-							<view class="xiangxi" v-if="productId != linkProducts[linkCur].productId"
-								@click="gotoDetail(linkProducts[linkCur])">
-								<text>查看详情</text>
-							</view>
-						</view>
-						<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="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>
-							</view>
-						</view>
-					</view>
-					<uni-goods-nav style="left: 0;" class="goods_nav" :fill="true" :options="options"
-						:buttonGroup="buttonGroup" @click="onClick" @buttonClick="buttonClickLink" />
-				</view>
-			</u-popup>
-		</view>
-		<uni-goods-nav class="goods_nav" :fill="true" :options="options" :buttonGroup="buttonGroup" @click="onClick"
-			@buttonClick="buttonClick" />
-		<music-play :playData="playData"></music-play>
-	</view>
+      </view>
+      <view class="pingjia" v-else>
+        <view class="">
+          <view style="font-weight: 700; margin-bottom: 30rpx"
+            >评价({{ commentsList ? commentsList.length : 0 }})
+          </view>
+          <!-- <view class="icon-del rotate"></view> -->
+        </view>
+        <!-- 商品评价 -->
+        <view class="" v-if="commentsList && commentsList.length > 0">
+          <view
+            class="pingjiaBox"
+            v-for="(item, index) in commentsList"
+            :key="index"
+          >
+            <view class="flexbox aligncenter">
+              <view class="touxiang">
+                <image :src="item.avatar" mode="aspectFit"></image>
+                <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>
+              </view>
+            </view>
+            <view class="contentBox">
+              <div class="pjimgs flexbox">
+                <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>
+            </view>
+            <!-- 显示追平 -->
+            <view
+              class="zhuiping item"
+              v-if="item.zphtml != ''"
+              style="padding-left: 60rpx"
+            >
+              <h5 style="color: #dbdbdb; padding: 30rpx 10rpx 10rpx 0rpx">
+                追评内容：
+              </h5>
+              <view class="flexbox">
+                <view class="contentBox">
+                  <view class="content" v-html="item.zphtml"></view>
+                  <text class="time">{{ item.followUpdate }}</text>
+                </view>
+              </view>
+            </view>
+          </view>
+        </view>
+        <view class="quesheng" v-else>
+          <text>暂无评价~</text>
+        </view>
+      </view>
+      <view style="height: 120rpx"></view>
+    </view>
+    <view class="" v-if="upoShow">
+      <u-popup :show="upoShow" :round="10" @close="closeUpo" style="z-index: 2">
+        <view class="tanchu">
+          <view class="list">
+            <view class="imgBox">
+              <image
+                v-if="linkimg == ''"
+                src="../../static/icon/wufeng.jpg"
+                mode="aspectFit"
+                style="width: 100%; height: 100%"
+              ></image>
+              <image
+                v-else
+                :src="linkimg"
+                mode="aspectFit"
+                style="width: 100%; height: 100%"
+                @click="previewImage(linkimg)"
+              ></image>
+              <view
+                class="xiangxi"
+                v-if="productId != linkProducts[linkCur].productId"
+                @click="gotoDetail(linkProducts[linkCur])"
+              >
+                <text>查看详情</text>
+              </view>
+            </view>
+            <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="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>
+              </view>
+            </view>
+          </view>
+          <uni-goods-nav
+            style="left: 0"
+            class="goods_nav"
+            :fill="true"
+            :options="options"
+            :buttonGroup="buttonGroup"
+            @click="onClick"
+            @buttonClick="buttonClickLink"
+          />
+        </view>
+      </u-popup>
+    </view>
+    <uni-goods-nav
+      class="goods_nav"
+      :fill="true"
+      :options="options"
+      :buttonGroup="buttonGroup"
+      @click="onClick"
+      @buttonClick="buttonClick"
+    />
+    <music-play :playData="playData"></music-play>
+  </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';
+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 },
-			],
+  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)
-					}
-					break;
-				// case 'tingshu':
-				// 	if (item.canListen) {
-				// 		uni.navigateTo({
-				// 			url: "../listen/listen?bookid=" + id
-				// 		});
-				// 	} else {
-				// 		goToListenNone(item.id)
-				// 	}
-				// 	break;
-			}
-		},
-		showImg(e) {
-			// console.log(e,'点击的内容')
-			// let contentimg = e.target.dataset.nodes;
-			this.previewImage(e.target.node.attrs.src)
-		},
+      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);
+          }
+          break;
+        // case 'tingshu':
+        // 	if (item.canListen) {
+        // 		uni.navigateTo({
+        // 			url: "../listen/listen?bookid=" + id
+        // 		});
+        // 	} else {
+        // 		goToListenNone(item.id)
+        // 	}
+        // 	break;
+      }
+    },
+    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>');
+    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(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.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",
+      });
+    },
+    // 加入购物车
+    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,
+              });
+            }
+          });
+      }
+    },
 
-		},
-		// 获取评价
-		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.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'
-			})
-		},
-		// 加入购物车
-		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;
-		}
-	}
-}
+    // 购买下单
+    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;
+  background-color: #fff;
 }
 
 .tanchu {
-	background: #fff;
-	position: relative;
-	padding: 40rpx 30rpx 40rpx 30rpx;
-	position: relative;
+  background: #fff;
+  position: relative;
+  padding: 40rpx 30rpx 40rpx 30rpx;
+  position: relative;
 
-	.list {
-		margin-bottom: 140rpx;
+  .list {
+    margin-bottom: 140rpx;
 
-		.imgBox {
-			height: 500rpx;
-			width: 100%;
-			margin-bottom: 10rpx;
-			position: relative;
+    .imgBox {
+      height: 500rpx;
+      width: 100%;
+      margin-bottom: 10rpx;
+      position: relative;
 
-			.xiangxi {
-				text-align: center;
-				position: absolute;
-				left: 0;
-				bottom: 20rpx;
-				width: 100%;
+      .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, 0.9);
+          color: #def0ea;
+          border-radius: 10px;
+        }
+      }
+    }
+  }
 
-	.spbh {
-		border: 2rpx solid #fff;
+  .spbh {
+    border: 2rpx solid #fff;
 
-		.spbhimg {
-			image {
-				border: none !important;
-			}
-		}
-	}
+    .spbhimg {
+      image {
+        border: none !important;
+      }
+    }
+  }
 
-	.spbh.cur {
-		border: 2rpx solid #eba00b;
-		border-radius: 10rpx;
-		overflow: hidden;
-	}
+  .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%);
+  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;
-	}
+  .item {
+    margin-bottom: 20rpx;
+    vertical-align: middle;
+  }
 
-	h4 {
-		color: #5fb386;
-		font-size: 40rpx;
-		margin-bottom: 20rpx;
-	}
+  h4 {
+    color: #5fb386;
+    font-size: 40rpx;
+    margin-bottom: 20rpx;
+  }
 
-	text {
-		color: #444;
-		font-size: 32rpx;
-		padding-left: 20rpx;
-	}
+  text {
+    color: #444;
+    font-size: 32rpx;
+    padding-left: 20rpx;
+  }
 }
 
 .pjimgs {
-	margin: 0;
-	flex-wrap: wrap;
-	display: flex;
-	justify-content: space-between;
+  margin: 0;
+  flex-wrap: wrap;
+  display: flex;
+  justify-content: space-between;
 
-	.item {
-		width: 23%;
-		padding-right: 20rpx;
-		margin-top: 10rpx;
-
-		image {
-			border-radius: 15rpx;
-		}
-	}
+  .item {
+    width: 23%;
+    padding-right: 20rpx;
+    margin-top: 10rpx;
 
+    image {
+      border-radius: 15rpx;
+    }
+  }
 }
 
 .star {
-	display: inline-block;
-	width: 15px;
-	height: 15px;
-	margin-right: 6rpx;
+  display: inline-block;
+  width: 15px;
+  height: 15px;
+  margin-right: 6rpx;
 }
 
 .starGray {
-	background: url(../../static/icon/star_greey.png) no-repeat;
-	background-size: contain;
+  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;
+  background: url(../../static/icon/star_light.png) no-repeat;
+  background-size: contain;
 }
 
 .quesheng {
-	text-align: center;
-	margin-top: 0rpx;
-	color: #8b8a91;
+  text-align: center;
+  margin-top: 0rpx;
+  color: #8b8a91;
 }
 
 .pingjia {
-	background-color: #f5f5f5;
-	border-radius: 20rpx;
-	// margin-top: 20rpx;
-	padding: 30rpx 30rpx 20rpx;
-
+  background-color: #f5f5f5;
+  border-radius: 20rpx;
+  // margin-top: 20rpx;
+  padding: 30rpx 30rpx 20rpx;
 }
 
 .pingjiaBox {
-	color: #555;
-	margin-bottom: 20rpx;
+  color: #555;
+  margin-bottom: 20rpx;
 }
 
 .flexbox {
-	display: flex;
+  display: flex;
 }
 
 .contentBox {
-	width: 100%;
-	box-sizing: border-box;
-	padding: 0rpx 10rpx 30rpx 6rpx;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 0rpx 10rpx 30rpx 6rpx;
 
-	.content {
-		font-size: 28rpx;
-		line-height: 40rpx;
-		margin-top: 10rpx;
-	}
+  .content {
+    font-size: 28rpx;
+    line-height: 40rpx;
+    margin-top: 10rpx;
+  }
 
-	.time {
-		font-size: 24rpx;
-		color: #999;
-		padding-top: 6rpx;
-		float: right;
-	}
+  .time {
+    font-size: 24rpx;
+    color: #999;
+    padding-top: 6rpx;
+    float: right;
+  }
 }
 
 .spbh {
-	padding-bottom: 10rpx;
-	font-size: 26rpx;
-	padding: 0 10rpx;
+  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;
-	}
+  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;
+  margin-left: 10rpx;
 }
 
 .price {
-	margin-left: 5px;
-	color: #ffa200;
-	font-weight: bold;
+  margin-left: 5px;
+  color: #ffa200;
+  font-weight: bold;
 }
 
 .nowrap {
-	white-space: nowrap;
-	overflow-x: hidden;
-	text-overflow: ellipsis;
+  white-space: nowrap;
+  overflow-x: hidden;
+  text-overflow: ellipsis;
 }
 
 .touxiang {
-	width: 40px;
-	overflow: hidden;
-	text-align: center;
+  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;
-		;
-	}
+  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;
-	}
+  .username {
+    font-size: 24rpx;
+    color: #999;
+    margin-top: 6rpx;
+  }
 }
 
 .aligncenter {
-	align-items: center;
+  align-items: center;
 }
 
 .xiangqing {
-	overflow: hidden;
-	overflow-x: hidden;
+  overflow: hidden;
+  overflow-x: hidden;
 
-	img {
-		display: block;
-		max-width: 100%;
-	}
+  img {
+    display: block;
+    max-width: 100%;
+  }
 
-	p {
-		max-width: 100%;
-	}
+  p {
+    max-width: 100%;
+  }
 }
 
 .goods_nav {
-	z-index: 1;
-	position: fixed;
-	bottom: 0;
-	width: 100%;
+  z-index: 1;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
 }
 
 .SoldNumber {
-	font-size: 24rpx;
-	color: #999;
-	margin-top: 16rpx;
-	font-weight: 600;
+  font-size: 24rpx;
+  color: #999;
+  margin-top: 16rpx;
+  font-weight: 600;
 }
 
 .bookInfo {
-	// padding: 20px 10px;
-	// line-height: 30rpx;
-	// background-color: #fff;
-	font-size: 26rpx;
-	color: #555;
-	// border-radius: 20rpx 20rpx 0 0
+  // padding: 20px 10px;
+  // line-height: 30rpx;
+  // background-color: #fff;
+  font-size: 26rpx;
+  color: #555;
+  // border-radius: 20rpx 20rpx 0 0
 }
 
 .header {
-	position: fixed;
-	top: 0%;
-	left: 0%;
-	z-index: 999;
+  position: fixed;
+  top: 0%;
+  left: 0%;
+  z-index: 999;
 }
 
 .contentButton {
-	// margin: 10px 0;
+  // margin: 10px 0;
 }
 
 .swiperBox {
-	width: 100%;
-	height: 375px;
-	margin-top: 150rpx;
+  width: 100%;
+  height: 375px;
+  margin-top: 150rpx;
 }
 
 .commodityContent {
-	background-color: #fff;
-	padding: 30rpx 30rpx 10rpx 30rpx;
-	height: auto;
-	font-size: 26rpx;
+  background-color: #fff;
+  padding: 30rpx 30rpx 10rpx 30rpx;
+  height: auto;
+  font-size: 26rpx;
 
-	.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;
+  .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-style: normal;
-		}
+    em {
+      font-size: 40rpx;
+      font-style: normal;
+    }
 
-		.oldPrice {
-			background-color: #ff000013;
-			
-			padding: 4rpx 14rpx;
-			border-radius: 20rpx;
-			margin-left: 20rpx;
-			font-size: 28rpx;
-			color: #ff0000;
-		}
-	}
+    .oldPrice {
+      background-color: #ff000013;
 
-	.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;
-	}
+      padding: 4rpx 14rpx;
+      border-radius: 20rpx;
+      margin-left: 20rpx;
+      font-size: 28rpx;
+      color: #ff0000;
+    }
+  }
 
-	.commodityIntroduce {
-		font-size: 30rpx;
-		// background-color: #fff;
-		// padding: 0 20rpx 30rpx 20rpx;
-	}
+  .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;
+  }
+
+  .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%;
+  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;
-	}
+  .shopcard {
+    margin: 0 0 0 30rpx;
+    text-align: center;
+    font-size: 20rpx;
+    color: #eba00b;
+  }
 
-	.operate {
-		display: flex;
+  .operate {
+    display: flex;
 
-		view {
-			font-size: 32rpx;
-			font-weight: 700;
-			color: #fff;
-			padding: 32rpx 40rpx;
-			letter-spacing: 0.8px;
-		}
+    view {
+      font-size: 32rpx;
+      font-weight: 700;
+      color: #fff;
+      padding: 32rpx 40rpx;
+      letter-spacing: 0.8px;
+    }
 
-		.addShopCar {
-			background-color: #eba00b;
-		}
+    .addShopCar {
+      background-color: #eba00b;
+    }
 
-		.goBuy {
-
-			background-color: #cf3906;
-		}
-	}
+    .goBuy {
+      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);
+  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;
+  margin-bottom: 30rpx;
 
+  overflow: hidden;
 
-	overflow: hidden;
+  .item {
+    overflow: hidden;
+    margin-bottom: 30rpx;
+    border-bottom: 4rpx solid #f5f5f5;
+  }
 
-	.item {
-		overflow: hidden;
-		margin-bottom: 30rpx;
-		border-bottom: 4rpx solid #f5f5f5;
-	}
+  .item:nth-last-child(1) {
+    border: none;
+  }
 
-	.item:nth-last-child(1) {
-		border: none;
-	}
+  .quanyi_item:nth-last-child(1) {
+    margin-right: 0;
+  }
 
-	.quanyi_item:nth-last-child(1) {
-		margin-right: 0;
-	}
+  .spbhimg {
+    // width: 60rpx;
+    float: left;
+  }
 
-	.spbhimg {
-		// width: 60rpx;
-		float: left;
-	}
+  .quanyi_book {
+    width: calc(100% - 80rpx);
+    float: right;
 
-	.quanyi_book {
-		width: calc(100% - 80rpx);
-		float: right;
-
-		.quanyi_book_name {
-			font-size: 28rpx;
-		}
-	}
+    .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;
+  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;
 
-	font-size: 26rpx;
-	width: auto;
-	border-radius: 10rpx;
-
-	box-sizing: border-box;
-	// display: inline-block;
-	margin-right: 10rpx;
+  box-sizing: border-box;
+  // display: inline-block;
+  margin-right: 10rpx;
 }
 
 .quanyi_book {
-	margin-bottom: 20rpx;
+  margin-bottom: 20rpx;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/pages/bookShop/orderLCont.vue b/pages/bookShop/orderLCont.vue
index a9409ae..cc9439b 100644
--- a/pages/bookShop/orderLCont.vue
+++ b/pages/bookShop/orderLCont.vue
@@ -1,7 +1,8 @@
-<template><page-meta
-  :page-font-size="$baseFontSize() + 'px'"
-  :root-font-size="$baseFontSize() + 'px'"
-></page-meta>
+<template>
+  <page-meta
+    :page-font-size="$baseFontSize() + 'px'"
+    :root-font-size="$baseFontSize() + 'px'"
+  ></page-meta>
   <view class="">
     <!-- 公共组件-每个页面必须引入 -->
     <public-module></public-module>
@@ -262,10 +263,15 @@
                 type="success"
               ></u-tag>
             </view>
-            <view class="orderReal" style="    width: 100%;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;">
+            <view
+              class="orderReal"
+              style="
+                width: 100%;
+                display: flex;
+                align-items: center;
+                justify-content: space-between;
+              "
+            >
               <span style="color: #666; margin-right: 10rpx; float: left"
                 >创建时间 :
               </span>
@@ -1108,7 +1114,8 @@ export default {
 <style lang="scss" scoped>
 @import "@/style/mixin.scss";
 @import "@/style/common.scss";
-view,uni-view {
+view,
+uni-view {
   font-size: 28rpx;
 }
 .expresslist {
diff --git a/pages/bookShop/orderList.vue b/pages/bookShop/orderList.vue
index 43b5631..219e601 100644
--- a/pages/bookShop/orderList.vue
+++ b/pages/bookShop/orderList.vue
@@ -1,9 +1,21 @@
-<template><page-meta :page-font-size="$baseFontSize() + 'px'" :root-font-size="$baseFontSize() + 'px'"></page-meta>
-	<view class="container commonPageBox commonDetailPage" style="background-color: #f2f2f2">
-		<!-- 公共组件-每个页面必须引入 -->
-		<public-module></public-module>
-		<z-nav-bar title="我的订单" bgColor="#3AB3AE" fontColor="#fff" :backState="2000">
-			<!-- <template slot="left">
+<template>
+  <page-meta
+    :page-font-size="$baseFontSize() + 'px'"
+    :root-font-size="$baseFontSize() + 'px'"
+  ></page-meta>
+  <view
+    class="container commonPageBox commonDetailPage"
+    style="background-color: #f2f2f2"
+  >
+    <!-- 公共组件-每个页面必须引入 -->
+    <public-module></public-module>
+    <z-nav-bar
+      title="我的订单"
+      bgColor="#3AB3AE"
+      fontColor="#fff"
+      :backState="2000"
+    >
+      <!-- <template slot="left">
         <u-icon 
           @click="goHome"
           name="home"
@@ -12,30 +24,51 @@
           style="display: inline-block; margin-left: 30rpx"
         ></u-icon>
       </template> -->
-		</z-nav-bar>
+    </z-nav-bar>
 
-		<!-- 顶部导航栏 -->
-		<!-- <z-nav-bar backState="2000" title="我的订单"></z-nav-bar> -->
+    <!-- 顶部导航栏 -->
+    <!-- <z-nav-bar backState="2000" title="我的订单"></z-nav-bar> -->
 
-		<view class="cateList flexbox">
-			<common-sticky itemStyle="width:20%; height: 68rpx;font-size:24rpx;" :list="ordersTabs" label="name"
-				:currentCateIndex="currentCateIndex" @handleselectCate="ordersTabCLi"></common-sticky>
-		</view>
+    <view class="cateList flexbox">
+      <common-sticky
+        itemStyle="width:20%; height: 68rpx;font-size:24rpx;"
+        :list="ordersTabs"
+        label="name"
+        :currentCateIndex="currentCateIndex"
+        @handleselectCate="ordersTabCLi"
+      ></common-sticky>
+    </view>
 
-		<!-- 站位 -->
+    <!-- 站位 -->
 
-		<!-- <view v-if="ordersListTab == 1"> -->
-		<view class="order_box" :style="`height: calc(100% - ${(80 + statusBarHeight) * 2}rpx);`"
-			style="background-color: #f2f2f2">
-			<common-list imgUrl="url" indexKey="orderSn" noDataIcon="data" :isScroll="true" :axiosStatus="axiosStatus"
-				:isLoadingHide="isLoadingHide" :isNoIcon="true" :isCondition="true" :dataList="newList"
-				@hancleClick="toDetail" @lower="onReachBottom1" :pagination="pagination" label="title">
-				<view slot="labelSlot" slot-scope="slotProps">
-					<view class="orderInfo color_shandow">
-						<view class="mainContent">
-							<view class="btns" style="margin-top: 0rpx">
-								<view class="flexbox opbtns" style="letter-spacing: 1rpx">
-									<view style="
+    <!-- <view v-if="ordersListTab == 1"> -->
+    <view
+      class="order_box"
+      :style="`height: calc(100% - ${(80 + statusBarHeight) * 2}rpx);`"
+      style="background-color: #f2f2f2"
+    >
+      <common-list
+        imgUrl="url"
+        indexKey="orderSn"
+        noDataIcon="data"
+        :isScroll="true"
+        :axiosStatus="axiosStatus"
+        :isLoadingHide="isLoadingHide"
+        :isNoIcon="true"
+        :isCondition="true"
+        :dataList="newList"
+        @hancleClick="toDetail"
+        @lower="onReachBottom1"
+        :pagination="pagination"
+        label="title"
+      >
+        <view slot="labelSlot" slot-scope="slotProps">
+          <view class="orderInfo color_shandow">
+            <view class="mainContent">
+              <view class="btns" style="margin-top: 0rpx">
+                <view class="flexbox opbtns" style="letter-spacing: 1rpx">
+                  <view
+                    style="
                       width: 100%;
                       display: flex;
                       align-items: center;
@@ -44,235 +77,378 @@
                       color: #9b9b9b;
                       font-size: 26rpx;
                       font-weight: 400;
-                    ">{{ slotProps.row.orderSn }}
+                    "
+                    >{{ slotProps.row.orderSn }}
 
-										<u-tag @click="handleCopy(slotProps.row.orderSn, '订单编号')" borderColor="#3ab3ae"
-											color="#3ab3ae" text="复制" plain style="float: right" size="mini"
-											type="success"></u-tag>
-									</view>
-								</view>
-							</view>
+                    <u-tag
+                      @click="handleCopy(slotProps.row.orderSn, '订单编号')"
+                      borderColor="#3ab3ae"
+                      color="#3ab3ae"
+                      text="复制"
+                      plain
+                      style="float: right"
+                      size="mini"
+                      type="success"
+                    ></u-tag>
+                  </view>
+                </view>
+              </view>
 
-							<view class="item">
-								<view class="item_top" style="margin-top: 10rpx; margin-bottom: 0">
-									<view class="source_app"></view>
-									<view style="text-align: left">
-										<text class="orderstatus" v-show="slotProps.row.orderStatus == 0">未付款</text>
-										<text class="orderstatus" v-show="slotProps.row.orderStatus == 1">待发货</text>
-										<text class="orderstatus" v-show="slotProps.row.orderStatus == 2">已发货</text>
-										<text class="orderstatus" v-show="slotProps.row.orderStatus == 3">交易成功</text>
-										<text class="orderstatus" v-show="slotProps.row.orderStatus == 4">交易失败</text>
-										<text class="orderstatus" v-show="slotProps.row.orderStatus == 5">已过期</text>
-									</view>
-								</view>
+              <view class="item">
+                <view
+                  class="item_top"
+                  style="margin-top: 10rpx; margin-bottom: 0"
+                >
+                  <view class="source_app"></view>
+                  <view style="text-align: left">
+                    <text
+                      class="orderstatus"
+                      v-show="slotProps.row.orderStatus == 0"
+                      >未付款</text
+                    >
+                    <text
+                      class="orderstatus"
+                      v-show="slotProps.row.orderStatus == 1"
+                      >待发货</text
+                    >
+                    <text
+                      class="orderstatus"
+                      v-show="slotProps.row.orderStatus == 2"
+                      >已发货</text
+                    >
+                    <text
+                      class="orderstatus"
+                      v-show="slotProps.row.orderStatus == 3"
+                      >交易成功</text
+                    >
+                    <text
+                      class="orderstatus"
+                      v-show="slotProps.row.orderStatus == 4"
+                      >交易失败</text
+                    >
+                    <text
+                      class="orderstatus"
+                      v-show="slotProps.row.orderStatus == 5"
+                      >已过期</text
+                    >
+                  </view>
+                </view>
 
-								<view v-if="slotProps.row.orderType == 'vip'" class="bookinfolist">
-									<image class="feng fengPoint" src="/static/icon/vip.png" mode="aspectFill"></image>
-									<!-- <view class="description" v-html="item.content">
+                <view
+                  v-if="slotProps.row.orderType == 'vip'"
+                  class="bookinfolist"
+                >
+                  <image
+                    class="feng fengPoint"
+                    src="/static/icon/vip.png"
+                    mode="aspectFill"
+                  ></image>
+                  <!-- <view class="description" v-html="item.content">
 								</view> -->
-									<view class="btns flexbox">
-										<view class="booknameleft">
-											{{ slotProps.row.vipBuyConfigEntity?slotProps.row.vipBuyConfigEntity.title:'' }}
-										</view>
+                  <view class="btns flexbox">
+                    <view class="booknameleft">
+                      {{
+                        slotProps.row.vipBuyConfigEntity
+                          ? slotProps.row.vipBuyConfigEntity.title
+                          : ""
+                      }}
+                    </view>
 
-										<view style="
+                    <view
+                      style="
                         line-height: 58rpx;
                         color: #333;
                         font-size: 26rpx;
                         font-weight: 700;
-                      ">
-											<text style="font-size: 20rpx"></text>
-										</view>
-									</view>
-									<view class="btns flexbox"
-										style="color: #9f9f9f; margin-top: 10rpx; font-size: 24rpx">
-										下单时间：{{ slotProps.row.createTime }}
-									</view>
-								</view>
+                      "
+                    >
+                      <text style="font-size: 20rpx"></text>
+                    </view>
+                  </view>
+                  <view
+                    class="btns flexbox"
+                    style="color: #9f9f9f; margin-top: 10rpx; font-size: 24rpx"
+                  >
+                    下单时间：{{ slotProps.row.createTime }}
+                  </view>
+                </view>
 
-								<view v-if="slotProps.row.orderType == 'point'" class="bookinfolist">
-									<image class="feng fengPoint" src="/static/icon/pay_3.png" mode="aspectFill">
-									</image>
-									<!-- <view class="description" v-html="item.content">
+                <view
+                  v-if="slotProps.row.orderType == 'point'"
+                  class="bookinfolist"
+                >
+                  <image
+                    class="feng fengPoint"
+                    src="/static/icon/pay_3.png"
+                    mode="aspectFill"
+                  >
+                  </image>
+                  <!-- <view class="description" v-html="item.content">
 								</view> -->
-									<view class="btns flexbox">
-										<view class="booknameleft"> 充值 {{
-                       slotProps.row.bookBuyConfigEntity?   slotProps.row.bookBuyConfigEntity.money:""
-                        }}天医币</view>
+                  <view class="btns flexbox">
+                    <view class="booknameleft">
+                      充值
+                      {{
+                        slotProps.row.bookBuyConfigEntity
+                          ? slotProps.row.bookBuyConfigEntity.money
+                          : ""
+                      }}天医币</view
+                    >
 
-										<view style="
+                    <view
+                      style="
                         line-height: 58rpx;
                         color: #333;
                         font-size: 26rpx;
                         font-weight: 700;
-                      ">
+                      "
+                    >
+                    </view>
+                  </view>
+                  <view
+                    class="btns flexbox"
+                    style="color: #9f9f9f; margin-top: 10rpx; font-size: 24rpx"
+                  >
+                    下单时间：{{ slotProps.row.createTime }}
+                  </view>
+                </view>
 
-										</view>
-									</view>
-									<view class="btns flexbox"
-										style="color: #9f9f9f; margin-top: 10rpx; font-size: 24rpx">
-										下单时间：{{ slotProps.row.createTime }}
-									</view>
-								</view>
+                <view v-if="slotProps.row.orderType == 'order'">
+                  <view
+                    v-for="(item2, index2) in slotProps.row.productList"
+                    :key="slotProps.row.orderId"
+                    class="bookinfolist"
+                  >
+                    <view v-if="item2.product">
+                      <view
+                        class="feng"
+                        v-if="item2.product && item2.product.productImages"
+                      >
+                        <image
+                          :key="Date.now()"
+                          style="width: 100%; height: 100%"
+                          mode="aspectFit"
+                          :src="item2.product.productImages"
+                        ></image>
+                      </view>
 
-								<view v-if="slotProps.row.orderType == 'order'">
-									<view v-for="(item2, index2) in slotProps.row.productList"
-										:key="slotProps.row.orderId" class="bookinfolist">
-										<view v-if="item2.product">
-											<view class="feng" v-if="item2.product && item2.product.productImages">
-												<image :key="Date.now()" style="width: 100%; height: 100%"
-													mode="aspectFit" :src="item2.product.productImages"></image>
-											</view>
-
-											<view v-else class="feng" style="
+                      <view
+                        v-else
+                        class="feng"
+                        style="
                           color: #c0c4cc;
                           font-size: 22rpx;
                           line-height: 140rpx;
                           text-align: center;
-                        ">暂无封面图</view>
-											<!-- <view class="description" v-html="item.content">
+                        "
+                        >暂无封面图</view
+                      >
+                      <!-- <view class="description" v-html="item.content">
 								</view> -->
-											<view class="btns flexbox">
-												<view class="booknameleft">{{
+                      <view class="btns flexbox">
+                        <view class="booknameleft">{{
                           item2.product && item2.product.productName
                             ? item2.product.productName
                             : ""
                         }}</view>
 
-												<view style="
+                        <view
+                          style="
                             line-height: 58rpx;
                             color: #333;
                             font-size: 26rpx;
                             font-weight: 700;
-                          ">
-													<text style="font-size: 20rpx">￥</text>
-													{{
-                            item2.product.price ? item2.product.price : ""
-                          }}
-												</view>
-											</view>
-											<view class="btns flexbox" style="margin-top: 10rpx">
-												<view class="left" style="color: #c0c4cc"></view>
-												<view class="right flexbox opbtns" style="color: #c0c4cc">
-													×{{ item2.quantity ? item2.quantity : "" }}
-												</view>
-											</view>
-										</view>
-										<view v-else>
-											<view class="feng"></view>
-											<view class="btns flexbox">
-												<view class="booknameleft" style="color: #181818">未知商品</view>
-												<view style="" class="right flexbox opbtns product_quantity">
-													×{{ item2.quantity ? item2.quantity : "" }}
-												</view>
-											</view>
-										</view>
-									</view>
-								</view>
+                          "
+                        >
+                          <text style="font-size: 20rpx">￥</text>
+                          {{ item2.product.price ? item2.product.price : "" }}
+                        </view>
+                      </view>
+                      <view class="btns flexbox" style="margin-top: 10rpx">
+                        <view class="left" style="color: #c0c4cc"></view>
+                        <view
+                          class="right flexbox opbtns"
+                          style="color: #c0c4cc"
+                        >
+                          ×{{ item2.quantity ? item2.quantity : "" }}
+                        </view>
+                      </view>
+                    </view>
+                    <view v-else>
+                      <view class="feng"></view>
+                      <view class="btns flexbox">
+                        <view class="booknameleft" style="color: #181818"
+                          >未知商品</view
+                        >
+                        <view
+                          style=""
+                          class="right flexbox opbtns product_quantity"
+                        >
+                          ×{{ item2.quantity ? item2.quantity : "" }}
+                        </view>
+                      </view>
+                    </view>
+                  </view>
+                </view>
 
-								<view style="margin-top: 10rpx; overflow: hidden">
-									<view class="btns flexbox" style="float: right; width: auto !important">
-										<view class="right flexbox opbtns" style="
+                <view style="margin-top: 10rpx; overflow: hidden">
+                  <view
+                    class="btns flexbox"
+                    style="float: right; width: auto !important"
+                  >
+                    <view
+                      class="right flexbox opbtns"
+                      style="
                         width: auto;
                         line-height: 44rpx;
                         letter-spacing: 1rpx;
                         display: flex;
                         align-items: center;
-                      ">
-											<view style="
+                      "
+                    >
+                      <view
+                        style="
                           line-height: 46rpx;
                           color: #000;
                           font-size: 28rpx;
                           font-weight: 500;
                           margin-right: 10rpx;
-                        ">实付款</view>
-											<view style="
+                        "
+                        >实付款</view
+                      >
+                      <view
+                        style="
                           /* margin-top: 8rpx; */
                           line-height: 46rpx;
                           color: #333;
                           font-size: 30rpx;
                           font-weight: 700;
-                        ">
-												<text style="font-size: 20rpx">￥</text>
-												{{
+                        "
+                      >
+                        <text style="font-size: 20rpx">￥</text>
+                        {{
                           slotProps.row.realMoney ||
                           slotProps.row.realMoney == 0
                             ? slotProps.row.realMoney
                             : ""
                         }}
-											</view>
-										</view>
-									</view>
-									<view class="btns flexbox" style="
+                      </view>
+                    </view>
+                  </view>
+                  <view
+                    class="btns flexbox"
+                    style="
                       margin-top: 0rpx;
                       float: right;
                       width: auto;
                       margin-left: 20rpx;
-                    " v-if="
+                    "
+                    v-if="
                       (slotProps.row.addressId == 0 ||
                         slotProps.row.addressId == null) &&
                       slotProps.row.orderType == 'order' &&
                       slotProps.row.jfDeduction > 0
-                    ">
-										<view class="right flexbox opbtns" style="
+                    "
+                  >
+                    <view
+                      class="right flexbox opbtns"
+                      style="
                         line-height: 44rpx;
                         letter-spacing: 1rpx;
                         display: flex;
                         align-items: center;
-                      "><text style="color: #9b9b9b">（ </text>
-											<view style="
+                      "
+                      ><text style="color: #9b9b9b">（ </text>
+                      <view
+                        style="
                           line-height: 46rpx;
                           color: #9b9b9b;
                           font-size: 24rpx;
                           font-weight: 500;
                           margin-right: 10rpx;
-                        ">积分抵扣</view>
-											<view style="
+                        "
+                        >积分抵扣</view
+                      >
+                      <view
+                        style="
                           /* margin-top: 8rpx; */
                           line-height: 46rpx;
                           color: #9b9b9b;
                           font-size: 26rpx;
                           font-weight: 700;
-                        ">
-												<text style="font-size: 20rpx">￥</text>
-												{{ slotProps.row.jfDeduction }}
-											</view>
-										</view><text style="color: #9b9b9b">）</text>
-									</view>
-								</view>
+                        "
+                      >
+                        <text style="font-size: 20rpx">￥</text>
+                        {{ slotProps.row.jfDeduction }}
+                      </view> </view
+                    ><text style="color: #9b9b9b">）</text>
+                  </view>
+                </view>
 
-								<view class="operation_box boxShadow" v-if="slotProps.row.isShowMore == true">
-									<view v-if="slotProps.row.orderStatus == 0"
-										@click.native.stop="canceOrder(slotProps.row)">取消订单</view>
-								</view>
-								<view class="btns flexbox" style="margin-top: 10rpx">
-									<view class="left" style="color: #c0c4cc" @click.native.stop="
+                <view
+                  class="operation_box boxShadow"
+                  v-if="slotProps.row.isShowMore == true"
+                >
+                  <view
+                    v-if="slotProps.row.orderStatus == 0"
+                    @click.native.stop="canceOrder(slotProps.row)"
+                    >取消订单</view
+                  >
+                </view>
+                <view class="btns flexbox" style="margin-top: 10rpx">
+                  <view
+                    class="left"
+                    style="color: #c0c4cc"
+                    @click.native.stop="
                       openMore(slotProps.row, slotProps.rowIndex)
-                    ">更多</view>
-									<view class="right flexbox opbtns">
-										<view class="orderstatusbtn orderstatusbtn_success"
-											v-if="slotProps.row.orderStatus == 0"
-											@click.native.stop="goPay(slotProps.row)">继续付款</view>
-										<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 1">催发货</view>
-										<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 2"
-											@click.native.stop="seeExpressDetail(slotProps.row)">查看物流</view>
-										<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 2"
-											@click.native.stop="OverOrder(slotProps.row)">确认收货</view>
-										<view class="orderstatusbtn" v-if="slotProps.row.orderStatus == 3">申请售后</view>
-										<!-- <view
+                    "
+                    >更多</view
+                  >
+                  <view class="right flexbox opbtns">
+                    <view
+                      class="orderstatusbtn orderstatusbtn_success"
+                      v-if="slotProps.row.orderStatus == 0"
+                      @click.native.stop="goPay(slotProps.row)"
+                      >继续付款</view
+                    >
+                    <view
+                      class="orderstatusbtn"
+                      v-if="slotProps.row.orderStatus == 1"
+                      >催发货</view
+                    >
+                    <view
+                      class="orderstatusbtn"
+                      v-if="slotProps.row.orderStatus == 2"
+                      @click.native.stop="seeExpressDetail(slotProps.row)"
+                      >查看物流</view
+                    >
+                    <view
+                      class="orderstatusbtn"
+                      v-if="slotProps.row.orderStatus == 2"
+                      @click.native.stop="OverOrder(slotProps.row)"
+                      >确认收货</view
+                    >
+                    <view
+                      class="orderstatusbtn"
+                      v-if="slotProps.row.orderStatus == 3"
+                      >申请售后</view
+                    >
+                    <!-- <view
                       class="orderstatusbtn"
                       v-if="item.orderStatus == 3 && userRecordid == null"
                       @click.native.stop="pingji(item.productId)"
                       >评价</view
                     > -->
-										<!-- <view class="orderstatusbtn" v-if="item.orderStatus == 3 && userRecordid != null" @click.stop="showZhuiping(item.productId)">追评</view> -->
-									</view>
-								</view>
+                    <!-- <view class="orderstatusbtn" v-if="item.orderStatus == 3 && userRecordid != null" @click.stop="showZhuiping(item.productId)">追评</view> -->
+                  </view>
+                </view>
 
-								<view style="border-bottom: 2rpx solid #e9e9e9; height: 50rpx"
-									v-if="slotProps.rowIndex < slotProps.row.length - 1"></view>
-							</view>
-							<!-- <view class="btns" style="margin-top: 10rpx">
+                <view
+                  style="border-bottom: 2rpx solid #e9e9e9; height: 50rpx"
+                  v-if="slotProps.rowIndex < slotProps.row.length - 1"
+                ></view>
+              </view>
+              <!-- <view class="btns" style="margin-top: 10rpx">
                 <view class="flexbox opbtns" style="">
                   <view
                     style="
@@ -295,14 +471,14 @@
                   >
                 </view>
               </view> -->
-						</view>
-					</view>
+            </view>
+          </view>
 
-					<!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
-				</view>
-			</common-list>
-		</view>
-		<!-- <view v-if="status == 0" style="text-align: center">
+          <!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
+        </view>
+      </common-list>
+    </view>
+    <!-- <view v-if="status == 0" style="text-align: center">
       <u-loading-icon style="display: inline-block"></u-loading-icon>
       <font
         style="
@@ -319,1129 +495,1180 @@
       <u-divider v-else text="暂无订单"></u-divider>
     </view> -->
 
-		<!-- 对话框 -->
-		<u-popup :show="pingjiaShow" :round="10" @close="closePingjia">
-			<view class="tanchu">
-				<view class="dp_title" v-if="pjType != 'zhuiping'">添加评价</view>
-				<view class="dp_title" v-else>添加追评</view>
+    <!-- 对话框 -->
+    <u-popup :show="pingjiaShow" :round="10" @close="closePingjia">
+      <view class="tanchu">
+        <view class="dp_title" v-if="pjType != 'zhuiping'">添加评价</view>
+        <view class="dp_title" v-else>添加追评</view>
 
-				<view style="max-height: 1000rpx; overflow-y: scroll">
-					<uni-forms :modelValue="Pform">
-						<!-- 评价图片 -->
-						<!-- end -->
-						<!-- <uni-forms-item name="comment" label-width="0">
+        <view style="max-height: 1000rpx; overflow-y: scroll">
+          <uni-forms :modelValue="Pform">
+            <!-- 评价图片 -->
+            <!-- end -->
+            <!-- <uni-forms-item name="comment" label-width="0">
 									<uni-easyinput type="textarea" v-model="Pform.comment" placeholder="请输入您的商品评价"  />
 								</uni-forms-item>		 -->
-					</uni-forms>
-					<!-- <u-button type="success" @click="submitPJ">提交评价</u-button> -->
-					<!-- 提交 -->
-					<view class="padding-bottom-sm flex padding-lr-sm" style="border-bottom: 1px solid #eeeeee">
-						<view class="mb30" v-if="pjType != 'zhuiping'">
-							<view :class="['star', Pform.star >= 1 ? 'starLight' : 'starGray']" @click="getStar(1)">
-							</view>
-							<view :class="['star', Pform.star >= 2 ? 'starLight' : 'starGray']" @click="getStar(2)">
-							</view>
-							<view :class="['star', Pform.star >= 3 ? 'starLight' : 'starGray']" @click="getStar(3)">
-							</view>
-							<view :class="['star', Pform.star >= 4 ? 'starLight' : 'starGray']" @click="getStar(4)">
-							</view>
-							<view :class="['star', Pform.star >= 5 ? 'starLight' : 'starGray']" @click="getStar(5)">
-							</view>
-						</view>
-						<view class="mb30" v-if="pjType != 'zhuiping'">
-							<!-- <uni-file-picker :auto-upload="false" ref="files" @delete="deleteImg" limit="5" @success="upSuccess" @select="select" v-model="Pform.img" fileMediatype="image" :image-styles="imageStyles"/> -->
-							<u-upload :fileList="Pform.img" @afterRead="afterRead" @delete="deletePic" multiple
-								:maxCount="4" width="80" height="80" :previewFullImage="true">
-							</u-upload>
-						</view>
-						<view class="flex-sub flexbox">
-							<i @click="showEmj()" :class="emojiIcon"></i>
-							<!-- <input type="text" @focus="InputFocus" @blur="InputBlur" v-model="message"  @input="textareaBInput"  placeholder-style="font-size:24rpx;color:#aaaaaa;"  placeholder="请输入您要发送的内容"></input> -->
-							<textarea class="textarea" v-model="Pform.comment" @focus="InputFocus" @blur="InputBlur"
-								@input="textareaBInput" placeholder-style="font-size:24rpx;color:#aaaaaa;"
-								placeholder="请输入您要发送的内容"></textarea>
-						</view>
-						<view class="">
-							<!-- <button class="cu-btn bg-gradual-blue shadow-blur">发送</button> -->
-							<u-button type="success" @click="submitPJ" v-if="pjType != 'zhuiping'">提交评价</u-button>
-							<u-button type="success" @click="zhuiping" v-else>提交追评</u-button>
-						</view>
-					</view>
+          </uni-forms>
+          <!-- <u-button type="success" @click="submitPJ">提交评价</u-button> -->
+          <!-- 提交 -->
+          <view
+            class="padding-bottom-sm flex padding-lr-sm"
+            style="border-bottom: 1px solid #eeeeee"
+          >
+            <view class="mb30" v-if="pjType != 'zhuiping'">
+              <view
+                :class="['star', Pform.star >= 1 ? 'starLight' : 'starGray']"
+                @click="getStar(1)"
+              >
+              </view>
+              <view
+                :class="['star', Pform.star >= 2 ? 'starLight' : 'starGray']"
+                @click="getStar(2)"
+              >
+              </view>
+              <view
+                :class="['star', Pform.star >= 3 ? 'starLight' : 'starGray']"
+                @click="getStar(3)"
+              >
+              </view>
+              <view
+                :class="['star', Pform.star >= 4 ? 'starLight' : 'starGray']"
+                @click="getStar(4)"
+              >
+              </view>
+              <view
+                :class="['star', Pform.star >= 5 ? 'starLight' : 'starGray']"
+                @click="getStar(5)"
+              >
+              </view>
+            </view>
+            <view class="mb30" v-if="pjType != 'zhuiping'">
+              <!-- <uni-file-picker :auto-upload="false" ref="files" @delete="deleteImg" limit="5" @success="upSuccess" @select="select" v-model="Pform.img" fileMediatype="image" :image-styles="imageStyles"/> -->
+              <u-upload
+                :fileList="Pform.img"
+                @afterRead="afterRead"
+                @delete="deletePic"
+                multiple
+                :maxCount="4"
+                width="80"
+                height="80"
+                :previewFullImage="true"
+              >
+              </u-upload>
+            </view>
+            <view class="flex-sub flexbox">
+              <i @click="showEmj()" :class="emojiIcon"></i>
+              <!-- <input type="text" @focus="InputFocus" @blur="InputBlur" v-model="message"  @input="textareaBInput"  placeholder-style="font-size:24rpx;color:#aaaaaa;"  placeholder="请输入您要发送的内容"></input> -->
+              <textarea
+                class="textarea"
+                v-model="Pform.comment"
+                @focus="InputFocus"
+                @blur="InputBlur"
+                @input="textareaBInput"
+                placeholder-style="font-size:24rpx;color:#aaaaaa;"
+                placeholder="请输入您要发送的内容"
+              ></textarea>
+            </view>
+            <view class="">
+              <!-- <button class="cu-btn bg-gradual-blue shadow-blur">发送</button> -->
+              <u-button
+                type="success"
+                @click="submitPJ"
+                v-if="pjType != 'zhuiping'"
+                >提交评价</u-button
+              >
+              <u-button type="success" @click="zhuiping" v-else
+                >提交追评</u-button
+              >
+            </view>
+          </view>
 
-					<view style="position: relative">
-						<emotion @emotion="handleEmj" :height="220" v-if="isShowEmj" :windowWidth="windowWidth">
-						</emotion>
-					</view>
-				</view>
-			</view>
-		</u-popup>
-		<z-navigation></z-navigation>
-		<u-action-sheet :closeOnClickAction="true" :closeOnClickOverlay="true" :actions="moreList" :show="isShowMore"
-			cancelText="关闭" @close="isShowMore = false" @select="selectClick"></u-action-sheet>
-		<music-play :playData="playData"></music-play>
-	</view>
+          <view style="position: relative">
+            <emotion
+              @emotion="handleEmj"
+              :height="220"
+              v-if="isShowEmj"
+              :windowWidth="windowWidth"
+            >
+            </emotion>
+          </view>
+        </view>
+      </view>
+    </u-popup>
+    <z-navigation></z-navigation>
+    <u-action-sheet
+      :closeOnClickAction="true"
+      :closeOnClickOverlay="true"
+      :actions="moreList"
+      :show="isShowMore"
+      cancelText="关闭"
+      @close="isShowMore = false"
+      @select="selectClick"
+    ></u-action-sheet>
+    <music-play :playData="playData"></music-play>
+  </view>
 </template>
 
 <script>
-	import $http from "@/config/requestConfig.js";
-	import emotion from "@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue";
-	import musicPlay from "@/components/music.vue";
-	import {
-		setPay,
-		setPayAssign,
-		setWXPay
-	} from "@/config/utils";
-	// import { data } from 'jquery';
-	import {
-		mapState,
-		mapMutations
-	} from "vuex";
-	export default {
-		data() {
-			return {
-				axiosStatus: null,
-				isShowMore: false,
-				come: "1",
-				isShowTab: false,
-				isLoadingHide: false,
-				moreList: [{
-					name: "取消订单",
-					key: "false",
-				}, ],
-				currentCateIndex: 0,
-				pagination: {
-					// 请求参数
-					page: 1, //页码
-					limit: 20, //每页显示
-					total: 0, //总条数
-				},
-				// loadingNow : false,
-				playData: {},
-				options: {},
-				emojiIcon: "cuIcon-emoji",
-				windowWidth: 0,
-				bookid: null,
-				booklistpage: 1,
-				productList: [],
-				productInfo: {},
-				emoji: [],
-				Files: [],
-				page: 1,
-				pageSize: 10,
-				total: 0,
-				status: 3,
-				shupingList: [],
-				bfaid: null,
-				ordersTabs: [{
-						name: "全部",
-						value: -1,
-						badge: {},
-					},
-					{
-						name: "待付款",
-						value: 0,
-						badge: {},
-					},
-					{
-						name: "待发货",
-						value: 1,
-						badge: {},
-					},
-					{
-						name: "待收货",
-						value: 2,
-						badge: {},
-					},
-					{
-						name: "已完成",
-						value: 3,
-						badge: {},
-					},
-				],
-				selectOrderInfo: {},
-				ordersListTab: 1,
-				newestpage: 1,
-				// hotestpage: 1,
-				// booksetpage: 1,
-				newList: [],
-				// hotList:[],
-				// bookList:[],
-				map: {},
-				userRecordid: null, // 用户的评价状态
-				pingjiaShow: false, //添加评价
-				Pform: {
-					// 评价表单
-					star: 0,
-					comment: "",
-					img: [],
-					html: "",
-				},
-				isShowEmj: false,
-				pjType: "",
-			};
-		},
-		onUnload() {
-			uni.getStorageSync("orderStatus", 0)
-		},
-		onPullDownRefresh() {
-			console.log("下拉刷新了");
-			uni.stopPullDownRefresh();
+import $http from "@/config/requestConfig.js";
+import emotion from "@/bkhumor-emojiplus/components/bkhumor-emojiplus/bkhumor-emojiplus.vue";
+import musicPlay from "@/components/music.vue";
+import { setPay, setPayAssign, setWXPay } from "@/config/utils";
+// import { data } from 'jquery';
+import { mapState, mapMutations } from "vuex";
+export default {
+  data() {
+    return {
+      axiosStatus: null,
+      isShowMore: false,
+      come: "1",
+      isShowTab: false,
+      isLoadingHide: false,
+      moreList: [
+        {
+          name: "取消订单",
+          key: "false",
+        },
+      ],
+      currentCateIndex: 0,
+      pagination: {
+        // 请求参数
+        page: 1, //页码
+        limit: 20, //每页显示
+        total: 0, //总条数
+      },
+      // loadingNow : false,
+      playData: {},
+      options: {},
+      emojiIcon: "cuIcon-emoji",
+      windowWidth: 0,
+      bookid: null,
+      booklistpage: 1,
+      productList: [],
+      productInfo: {},
+      emoji: [],
+      Files: [],
+      page: 1,
+      pageSize: 10,
+      total: 0,
+      status: 3,
+      shupingList: [],
+      bfaid: null,
+      ordersTabs: [
+        {
+          name: "全部",
+          value: -1,
+          badge: {},
+        },
+        {
+          name: "待付款",
+          value: 0,
+          badge: {},
+        },
+        {
+          name: "待发货",
+          value: 1,
+          badge: {},
+        },
+        {
+          name: "待收货",
+          value: 2,
+          badge: {},
+        },
+        {
+          name: "已完成",
+          value: 3,
+          badge: {},
+        },
+      ],
+      selectOrderInfo: {},
+      ordersListTab: 1,
+      newestpage: 1,
+      // hotestpage: 1,
+      // booksetpage: 1,
+      newList: [],
+      // hotList:[],
+      // bookList:[],
+      map: {},
+      userRecordid: null, // 用户的评价状态
+      pingjiaShow: false, //添加评价
+      Pform: {
+        // 评价表单
+        star: 0,
+        comment: "",
+        img: [],
+        html: "",
+      },
+      isShowEmj: false,
+      pjType: "",
+    };
+  },
+  onUnload() {
+    uni.getStorageSync("orderStatus", 0);
+  },
+  onPullDownRefresh() {
+    console.log("下拉刷新了");
+    uni.stopPullDownRefresh();
 
-			this.newestpage = 1;
-			this.pagination.page = 1
-			// this.hotestpage = 1
-			// this.booksetpage = 1
-			this.newList = [];
-			// this.hotList = []
-			// this.bookList = []
+    this.newestpage = 1;
+    this.pagination.page = 1;
+    // this.hotestpage = 1
+    // this.booksetpage = 1
+    this.newList = [];
+    // this.hotList = []
+    // this.bookList = []
 
-			this.getBookList(this.ordersListTab, false);
-		},
-		onReachBottom() {
-			this.newestpage++;
-			this.pagination.page++
-			// this.hotestpage++
-			// this.booksetpage++
-			this.getBookList(this.ordersListTab, false);
-		},
-		onLoad(e) {
-			this.windowWidth = uni.getSystemInfoSync().windowWidth;
-			console.log(e, "onload111");
-			// this.bookid = e.bookid
-			this.options = e;
-			// this.newList = [];
-			// this.pagination = {
-			//   page: 1, //页码
-			//   limit: 20, //每页显示
-			//   total: 0, //总条数
-			// };
-			// this.$nextTick(() => {
-			//   this.ordersTabCLi(this.ordersTabs[0],0);
-			//   // this.getBookList(null, false);
-			// });
-		},
+    this.getBookList(this.ordersListTab, false);
+  },
+  onReachBottom() {
+    this.newestpage++;
+    this.pagination.page++;
+    // this.hotestpage++
+    // this.booksetpage++
+    this.getBookList(this.ordersListTab, false);
+  },
+  onLoad(e) {
+    this.windowWidth = uni.getSystemInfoSync().windowWidth;
+    console.log(e, "onload111");
+    // this.bookid = e.bookid
+    this.options = e;
+    // this.newList = [];
+    // this.pagination = {
+    //   page: 1, //页码
+    //   limit: 20, //每页显示
+    //   total: 0, //总条数
+    // };
+    // this.$nextTick(() => {
+    //   this.ordersTabCLi(this.ordersTabs[0],0);
+    //   // this.getBookList(null, false);
+    // });
+  },
 
-		onShow() {
-			console.log('onshow at line onShow:', '先走onshow')
-			uni.setStorageSync("orderStatus", 0)
-			var status = uni.getStorageSync("orderStatus");
-			this.newList = [];
-			this.pagination = {
-				page: 1, //页码
-				limit: 20, //每页显示
-				total: 0, //总条数
-			};
-			this.$nextTick(async () => {
-				await this.ordersTabCLi(this.ordersTabs[status], status);
-			});
-		},
-		async created() {
+  onShow() {
+    console.log("onshow at line onShow:", "先走onshow");
+    uni.setStorageSync("orderStatus", 0);
+    var status = uni.getStorageSync("orderStatus");
+    this.newList = [];
+    this.pagination = {
+      page: 1, //页码
+      limit: 20, //每页显示
+      total: 0, //总条数
+    };
+    this.$nextTick(async () => {
+      await this.ordersTabCLi(this.ordersTabs[status], status);
+    });
+  },
+  async created() {
+    // console.log('onshow at line created:', '先走onshow')
+    // var status = uni.getStorageSync("orderStatus");
+    // this.newList = [];
+    // this.pagination = {
+    // 	page: 1, //页码
+    // 	limit: 20, //每页显示
+    // 	total: 0, //总条数
+    // };
+    // this.$nextTick(async () => {
+    // 	await this.ordersTabCLi(this.ordersTabs[status], status);
+    // });
+  },
+  async onTabItemTap() {
+    // console.log('onshow at line 724:', 'onTabItemTap')
+    //   uni.setStorageSync("orderStatus", 0);
+    //   var status=uni.getStorageSync("orderStatus");
+    // this.newList = [];
+    // this.pagination = {
+    //   page: 1, //页码
+    //   limit: 20, //每页显示
+    //   total: 0, //总条数
+    // };
+    // this.$nextTick(async () => {
+    //   await this.ordersTabCLi(this.ordersTabs[status], status);
+    // });
+  },
+  onReady() {},
+  computed: {
+    ...mapState(["userInfo"]),
+  },
+  methods: {
+    ...mapMutations(["setLoadingShow"]),
+    getImageUrl(url) {
+      // 通过在URL后面添加时间戳来避免缓存
+      return `${url}?timestamp=${Date.now()}`;
+    },
+    selectClick(index) {
+      console.log("index at line 609:", index);
+      if (index.key == "false") {
+        this.isShowMore = false;
+        this.canceOrder(this.selectOrderInfo);
+      }
+    },
+    openMore(row, index) {
+      this.selectOrderInfo = row;
+      this.isShowMore = true;
+    },
+    handleCopy(value, title) {
+      this.$commonJS.handleCopy(value, title);
+    },
+    onReachBottom1() {
+      // 上拉加载
+      // 当列表数量不大于或等于总数量，则再次调用接口请求数据
+      if (this.newList.length >= this.pagination.total) return;
+      this.pagination.page++;
+      this.getBookList(this.ordersListTab, false);
+    },
+    goHome() {
+      if (this.options.type == "order") {
+        uni.switchTab({
+          url: "/pages/homePage/index/index",
+        });
+      } else {
+        uni.navigateBack({
+          delta: 1,
+        });
+      }
+    },
+    // 切换tab状态
+    ordersTabCLi(data, index) {
+      this.axiosStatus = 0;
+      this.currentCateIndex = index;
+      this.pagination = {
+        page: 1, //页码
+        limit: 20, //每页显示
+        total: 0, //总条数
+      };
 
-			// console.log('onshow at line created:', '先走onshow')
-			// var status = uni.getStorageSync("orderStatus");
-			// this.newList = [];
-			// this.pagination = {
-			// 	page: 1, //页码
-			// 	limit: 20, //每页显示
-			// 	total: 0, //总条数
-			// };
-			// this.$nextTick(async () => {
-			// 	await this.ordersTabCLi(this.ordersTabs[status], status);
-			// });
-		},
-		async onTabItemTap() {
-			// console.log('onshow at line 724:', 'onTabItemTap')
-			//   uni.setStorageSync("orderStatus", 0);
-			//   var status=uni.getStorageSync("orderStatus");
-			// this.newList = [];
-			// this.pagination = {
-			//   page: 1, //页码
-			//   limit: 20, //每页显示
-			//   total: 0, //总条数
-			// };
-			// this.$nextTick(async () => {
-			//   await this.ordersTabCLi(this.ordersTabs[status], status);
-			// });
-		},
-		onReady() {},
-		computed: {
-			...mapState(["userInfo"]),
-		},
-		methods: {
-			...mapMutations(["setLoadingShow"]),
-			getImageUrl(url) {
-				// 通过在URL后面添加时间戳来避免缓存
-				return `${url}?timestamp=${Date.now()}`;
-			},
-			selectClick(index) {
-				console.log("index at line 609:", index);
-				if (index.key == "false") {
-					this.isShowMore = false;
-					this.canceOrder(this.selectOrderInfo);
-				}
-			},
-			openMore(row, index) {
-				this.selectOrderInfo = row;
-				this.isShowMore = true;
-			},
-			handleCopy(value, title) {
-				this.$commonJS.handleCopy(value, title);
-			},
-			onReachBottom1() {
-				// 上拉加载
-				// 当列表数量不大于或等于总数量，则再次调用接口请求数据
-				if (this.newList.length >= this.pagination.total) return;
-				this.pagination.page++;
-				this.getBookList(this.ordersListTab, false);
-			},
-			goHome() {
-				if (this.options.type == "order") {
-					uni.switchTab({
-						url: "/pages/homePage/index/index",
-					});
-				} else {
-					uni.navigateBack({
-						delta: 1,
-					});
-				}
-			},
-			// 切换tab状态
-			ordersTabCLi(data, index) {
-				this.axiosStatus = 0
-				this.currentCateIndex = index;
-				this.pagination = {
-					page: 1, //页码
-					limit: 20, //每页显示
-					total: 0, //总条数
-				};
+      this.ordersListTab = data.value;
+      this.newestpage = 1;
+      this.newList = [];
+      this.getBookList(this.ordersListTab, false);
+    },
+    // 查看本书更多书评
+    toMore(val) {
+      console.log(val, "val");
+      uni.navigateTo({
+        url: "../comments/comments?bookid=" + val.id,
+      });
+    },
+    // 订单详情
+    toDetail(val) {
+      console.log(val, "val");
+      // uni.navigateTo({
+      // 	url:'../bookShop/commentsDetail?bookid='+val.bookid+'&bfa_id='+val.id
+      // })
+      uni.navigateTo({
+        url:
+          "/pages/bookShop/orderLCont?orderId=" +
+          val.orderId +
+          "&orderType=" +
+          val.orderStatus +
+          "&orderSn=" +
+          val.orderSn,
+      });
+    },
+    getBookList(flag, refreshflag) {
+      this.isLoadingHide = false;
+      var that = this;
 
-				this.ordersListTab = data.value;
-				this.newestpage = 1;
-				this.newList = [];
-				this.getBookList(this.ordersListTab, false);
-			},
-			// 查看本书更多书评
-			toMore(val) {
-				console.log(val, "val");
-				uni.navigateTo({
-					url: "../comments/comments?bookid=" + val.id,
-				});
-			},
-			// 订单详情
-			toDetail(val) {
-				console.log(val, "val");
-				// uni.navigateTo({
-				// 	url:'../bookShop/commentsDetail?bookid='+val.bookid+'&bfa_id='+val.id
-				// })
-				uni.navigateTo({
-					url: "/pages/bookShop/orderLCont?orderId=" +
-						val.orderId +
-						"&orderType=" +
-						val.orderStatus +
-						"&orderSn=" +
-						val.orderSn,
-				});
-			},
-			getBookList(flag, refreshflag) {
-				this.isLoadingHide = false;
-				var that = this;
+      // 顶部红点数量
+      $http
+        .request({
+          url: "common/buyOrder/getBuyOrderNumByStatus",
+          method: "POST",
+          data: {
+            userId: that.userInfo.id,
+            come: this.come,
+          },
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+        .then((res) => {
+          //           订单状态
+          // * 0: 待付款
+          // * 1: 待发货
+          // * 2: 已发货
+          // * 3：已完成
+          // * 4: 交易失败
+          // * 5: 已过期
 
-				// 顶部红点数量
-				$http
-					.request({
-						url: "common/buyOrder/getBuyOrderNumByStatus",
-						method: "POST",
-						data: {
-							userId: that.userInfo.id,
-							come: this.come,
-						},
-						header: {
-							//默认 无 说明：请求头
-							"Content-Type": "application/json",
-						},
-					})
-					.then((res) => {
-						//           订单状态
-						// * 0: 待付款
-						// * 1: 待发货
-						// * 2: 已发货
-						// * 3：已完成
-						// * 4: 交易失败
-						// * 5: 已过期
+          console.log("res at line 757:", res);
+          that.map = res.data;
 
-						console.log("res at line 757:", res);
-						that.map = res.data;
+          that.ordersTabs.map((e) => {
+            if (e.value == 0 || e.value == 1 || e.value == 2) {
+              var numList = that.map.filter((v) => v.order_status == e.value);
+              console.log("num at line 771:", numList);
+              if (numList.length > 0) {
+                e.badge = {
+                  value: numList[0].num,
+                };
+              }
+            } else {
+              e.badge = {};
+            }
+          });
+          // this.$set('this.ordersTabs',)
+          that.$forceUpdate();
+        })
+        .catch((e) => {
+          console.log(e);
+        });
 
-						that.ordersTabs.map((e) => {
-							if (e.value == 0 || e.value == 1 || e.value == 2) {
-								var numList = that.map.filter((v) => v.order_status == e.value);
-								console.log("num at line 771:", numList);
-								if (numList.length > 0) {
-									e.badge = {
-										value: numList[0].num,
-									};
-								}
-							} else {
-								e.badge = {};
-							}
-						});
-						// this.$set('this.ordersTabs',)
-						that.$forceUpdate();
-					})
-					.catch((e) => {
-						console.log(e);
-					});
+      var params = {
+        userId: this.userInfo.id,
+        come: this.come,
+        orderStatus: flag == -1 ? "" : flag, //传null为全部，订单状态  0-未付款 1-待发货 2-已发货 3-交易成功 4-交易失败 5-过期
+        ...this.pagination,
+        // limit: 10,
+        // page: this.newestpage,
+      };
 
-				var params = {
-					userId: this.userInfo.id,
-					come: this.come,
-					orderStatus: flag == -1 ? "" : flag, //传null为全部，订单状态  0-未付款 1-待发货 2-已发货 3-交易成功 4-交易失败 5-过期
-					...this.pagination,
-					// limit: 10,
-					// page: this.newestpage,
-				};
+      console.log("1111111111111传参数", params);
+      this.$http
+        .request({
+          url: "common/buyOrder/commonBuyOrderList",
+          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+          data: params,
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+        .then((res) => {
+          console.log(res, "内容获取成功");
+          that.pagination.total = res.data.total;
+          if (res.data.total == 0) {
+            this.isLoadingHide = true;
+          }
+          if (res.code == 0 && res.data && res.data.records.length > 0) {
+            that.newList = that.newList.concat(res.data.records);
+          } else {
+            //
+          }
+          if (res.data.records.length != 10) {
+            that.status = 1;
+          } else {
+            that.status = 0;
+          }
+        })
+        .catch((e) => {
+          console.log(e);
+        });
 
-				console.log('1111111111111传参数', params)
-				this.$http
-					.request({
-						url: "common/buyOrder/commonBuyOrderList",
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-						data: params,
-						header: {
-							//默认 无 说明：请求头
-							"Content-Type": "application/json",
-						},
-					})
-					.then((res) => {
-						console.log(res, "内容获取成功");
-						that.pagination.total = res.data.total;
-						if (res.data.total == 0) {
-							this.isLoadingHide = true;
-						}
-						if (res.code == 0 && res.data && res.data.records.length > 0) {
-							that.newList = that.newList.concat(res.data.records);
-						} else {
-							//
-						}
-						if (res.data.records.length != 10) {
-							that.status = 1;
-						} else {
-							that.status = 0;
-						}
-					})
-					.catch((e) => {
-						console.log(e);
-					});
+      this.axiosStatus = 1;
+    },
+    // 支付
+    goPay(payItem) {
+      console.log(payItem, "订单数据");
+      if (payItem.paymentMethod == 2) {
+        console.log("阿里支付");
+        setPay(
+          {
+            typePay: "alipay",
+            subject: "order",
+            totalAmount: payItem.realMoney,
+            type: 2,
+            relevanceoid: payItem.orderSn,
+            customerId: this.userInfo.id,
+          },
+          (res) => {
+            if (res.success) {
+              uni.showToast({
+                title: "支付成功",
+              });
+            } else {
+              uni.showToast({
+                title: "支付失败",
+                icon: "none",
+                image: "../../static/icon/ic_close.png",
+              });
+            }
+            this.getOrderList();
+          }
+        );
+      } else if (payItem.paymentMethod == 1) {
+        console.log("微信支付");
+        // console.log(this.isAndorid)
+        if (this.isAndorid == false) {
+          uni.showModal({
+            title: "提示",
+            content: "很抱歉，苹果系统暂不支持微信支付",
+            showCancel: false,
+          });
+          return false;
+        } else {
+          let data1 = {
+            orderSn: payItem.orderSn,
+            buyOrderId: null,
+            totalAmount: payItem.realMoney,
+          };
+          console.log(data1, "data1");
+          setWXPay(data1, (res) => {
+            if (res.success) {
+              uni.showToast({
+                title: "支付成功",
+              });
+            } else {
+              console.log(res);
+              if (res.data.errMsg.indexOf("User canceled") != -1) {
+                uni.showToast({
+                  title: "用户取消支付",
+                  icon: "none",
+                  image: "../../static/icon/ic_close.png",
+                });
+              } else {
+                uni.showToast({
+                  title: "支付失败",
+                  icon: "none",
+                  image: "../../static/icon/ic_close.png",
+                });
+              }
+            }
+          });
+        }
+      } else if (payItem.paymentMethod == 3) {
+        // 苹果充值
+        console.log("苹果二次支付");
+        if (this.isAndorid) {
+          uni.showModal({
+            title: "提示",
+            showCancel: false,
+            content:
+              "很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单",
+          });
+        } else {
+          this.iphonepay(payItem);
+        }
+      }
+    },
+    // 取消订单
+    canceOrder(item) {
+      uni.showModal({
+        title: "提示",
+        content: "确定要取消订单吗？",
+        confirmText: "取消订单",
+        cancelText: "考虑一下",
+        confirmColor: "#c96713",
+        cancelColor: "#555",
+        success: (res) => {
+          if (res.confirm) {
+            this.$http
+              .get("book/buyOrder/cancelOrder?orderSn=" + item.orderSn)
+              .then((res) => {
+                if (res.code == 0) {
+                  uni.showToast({
+                    icon: "none",
+                    title: "取消订单成功",
+                  });
+                  // uni.switchTab({
+                  // 	url: './orderList'
+                  // });
 
-				this.axiosStatus = 1
-			},
-			// 支付
-			goPay(payItem) {
-				console.log(payItem, "订单数据");
-				if (payItem.paymentMethod == 2) {
-					console.log("阿里支付");
-					setPay({
-							typePay: "alipay",
-							subject: "order",
-							totalAmount: payItem.realMoney,
-							type: 2,
-							relevanceoid: payItem.orderSn,
-							customerId: this.userInfo.id,
-						},
-						(res) => {
-							if (res.success) {
-								uni.showToast({
-									title: "支付成功",
-								});
-							} else {
-								uni.showToast({
-									title: "支付失败",
-									icon: "none",
-									image: "../../static/icon/ic_close.png",
-								});
-							}
-							this.getOrderList();
-						}
-					);
-				} else if (payItem.paymentMethod == 1) {
-					console.log("微信支付");
-					// console.log(this.isAndorid)
-					if (this.isAndorid == false) {
-						uni.showModal({
-							title: "提示",
-							content: "很抱歉，苹果系统暂不支持微信支付",
-							showCancel: false,
-						});
-						return false;
-					} else {
-						let data1 = {
-							orderSn: payItem.orderSn,
-							buyOrderId: null,
-							totalAmount: payItem.realMoney,
-						};
-						console.log(data1, "data1");
-						setWXPay(data1, (res) => {
-							if (res.success) {
-								uni.showToast({
-									title: "支付成功",
-								});
-							} else {
-								console.log(res);
-								if (res.data.errMsg.indexOf("User canceled") != -1) {
-									uni.showToast({
-										title: "用户取消支付",
-										icon: "none",
-										image: "../../static/icon/ic_close.png",
-									});
-								} else {
-									uni.showToast({
-										title: "支付失败",
-										icon: "none",
-										image: "../../static/icon/ic_close.png",
-									});
-								}
-							}
-						});
-					}
-				} else if (payItem.paymentMethod == 3) {
-					// 苹果充值
-					console.log("苹果二次支付");
-					if (this.isAndorid) {
-						uni.showModal({
-							title: "提示",
-							showCancel: false,
-							content: "很抱歉，当前订单属于苹果系统内购订单，安卓系统无法完成支付操作，您可切换到苹果系统进行支付，也可以取消该订单，并重新下单",
-						});
-					} else {
-						this.iphonepay(payItem);
-					}
-				}
-			},
-			// 取消订单
-			canceOrder(item) {
-				uni.showModal({
-					title: "提示",
-					content: "确定要取消订单吗？",
-					confirmText: "取消订单",
-					cancelText: "考虑一下",
-					confirmColor: "#c96713",
-					cancelColor: "#555",
-					success: (res) => {
-						if (res.confirm) {
-							this.$http
-								.get("book/buyOrder/cancelOrder?orderSn=" + item.orderSn)
-								.then((res) => {
-									if (res.code == 0) {
-										uni.showToast({
-											icon: "none",
-											title: "取消订单成功",
-										});
-										// uni.switchTab({
-										// 	url: './orderList'
-										// });
+                  this.newestpage = 1;
+                  this.pagination.page = 1;
+                  this.newList = [];
+                  this.getBookList(this.ordersListTab, false);
+                }
+              });
+          }
+        },
+      });
+    },
+    // canceOrder(item) {
+    // 	uni.showModal({
+    // 		title: '提示',
+    // 		content: '确定要取消订单吗？',
+    // 		confirmText: "取消订单",
+    // 		cancelText: "考虑一下",
+    // 		confirmColor: '#c96713',
+    // 		cancelColor: '#555',
+    // 		success: res => {
+    // 			if (res.confirm) {
+    // 				uni.showLoading()
+    // 				$http.request({
+    // 					url: "book/buyOrder/cancelOrder",
+    // 					method: "GET", // POST、GET、PUT、DELETE，具体说明查看官方文档
+    // 					data,
+    // 					header: { //默认 无 说明：请求头
+    // 						'Content-Type': 'application/json'
+    // 					},
+    // 				}).then(res => {
+    // 					if (res.code == 0) {
+    // 						uni.hideLoading()
+    // 						uni.showToast({
+    // 							title: '订单已取消',
+    // 							icon: 'success',
+    // 							duration: 1000
+    // 						})
+    // 						this.getBookList(this.ordersListTab, false)
+    // 					}
+    // 				})
+    // 			} else if (res.cancel) {}
+    // 		}
+    // 	});
+    // },
+    // 查看物流
+    seeExpressDetail(item) {
+      // console.log(item, this.sheetList.length)
+      // if(this.sheetList.length > 1){
+      // 	this.sheetListShow = true
+      // }else if(this.sheetList.length == 1){
+      // 直接展示详情
+      uni.navigateTo({
+        url:
+          "./deliverDetail?orderSn=" +
+          item.orderSn +
+          "&expressOrderSn=" +
+          item.expressList[0].expressOrderSn,
+      });
+      // }
+    },
+    // 确认收货
+    OverOrder(item) {
+      uni.showModal({
+        title: "提示",
+        content: "确认收货？",
+        success: (res) => {
+          let data = {
+            orderId: item.orderId,
+            orderStatus: "3",
+          };
+          if (res.confirm) {
+            uni.showLoading();
+            $http
+              .request({
+                url: "book/buyOrder/update",
+                method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+                data,
+                header: {
+                  //默认 无 说明：请求头
+                  "Content-Type": "application/json",
+                },
+              })
+              .then((res) => {
+                if (res.code == 0) {
+                  uni.hideLoading();
+                  uni.showToast({
+                    title: "收货成功",
+                    icon: "success",
+                    duration: 1000,
+                  });
+                  this.newestpage = 1;
+                  this.pagination.page = 1;
+                  this.newList = [];
+                  this.getBookList(this.ordersListTab, false);
+                }
+              });
+          } else if (res.cancel) {
+          }
+        },
+      });
+    },
+    closePingjia() {
+      this.pingjiaShow = false;
+      this.Pform.comment = "";
+      this.Pform.html = "";
+      this.emoji = [];
+    },
+    // 提交评价
+    submitPJ() {
+      if (this.Pform.comment != "") {
+        let data = {
+          userid: this.userInfo.id,
+          orderSn: this.orderSn,
+          bookid: this.productID,
+          // 'content': this.Pform.html,
+          content: this.Pform.comment,
+          starLevel: this.Pform.star,
+          images: this.Pform.img,
+          // 'emoji':this.emoji  // 表情数组
+        };
+        // console.log(data,'data')
+        $http
+          .request({
+            url: "buy/record/UserRecordcomment",
+            method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+            data,
+            header: {
+              //默认 无 说明：请求头
+              "Content-Type": "application/json",
+            },
+          })
+          .then((res) => {
+            if (res.code == 0) {
+              uni.showToast({
+                title: "评价成功！",
+                icon: "success",
+              });
 
-										this.newestpage = 1;
-										this.pagination.page = 1
-										this.newList = [];
-										this.getBookList(this.ordersListTab, false);
-									}
-								});
-						}
-					},
-				});
-			},
-			// canceOrder(item) {
-			// 	uni.showModal({
-			// 		title: '提示',
-			// 		content: '确定要取消订单吗？',
-			// 		confirmText: "取消订单",
-			// 		cancelText: "考虑一下",
-			// 		confirmColor: '#c96713',
-			// 		cancelColor: '#555',
-			// 		success: res => {
-			// 			if (res.confirm) {
-			// 				uni.showLoading()
-			// 				$http.request({
-			// 					url: "book/buyOrder/cancelOrder",
-			// 					method: "GET", // POST、GET、PUT、DELETE，具体说明查看官方文档
-			// 					data,
-			// 					header: { //默认 无 说明：请求头
-			// 						'Content-Type': 'application/json'
-			// 					},
-			// 				}).then(res => {
-			// 					if (res.code == 0) {
-			// 						uni.hideLoading()
-			// 						uni.showToast({
-			// 							title: '订单已取消',
-			// 							icon: 'success',
-			// 							duration: 1000
-			// 						})
-			// 						this.getBookList(this.ordersListTab, false)
-			// 					}
-			// 				})
-			// 			} else if (res.cancel) {}
-			// 		}
-			// 	});
-			// },
-			// 查看物流
-			seeExpressDetail(item) {
-				// console.log(item, this.sheetList.length)
-				// if(this.sheetList.length > 1){
-				// 	this.sheetListShow = true
-				// }else if(this.sheetList.length == 1){
-				// 直接展示详情
-				uni.navigateTo({
-					url: "./deliverDetail?orderSn=" +
-						item.orderSn +
-						"&expressOrderSn=" +
-						item.expressList[0].expressOrderSn,
-				});
-				// }
-			},
-			// 确认收货
-			OverOrder(item) {
-				uni.showModal({
-					title: "提示",
-					content: "确认收货？",
-					success: (res) => {
-						let data = {
-							orderId: item.orderId,
-							orderStatus: "3",
-						};
-						if (res.confirm) {
-							uni.showLoading();
-							$http
-								.request({
-									url: "book/buyOrder/update",
-									method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-									data,
-									header: {
-										//默认 无 说明：请求头
-										"Content-Type": "application/json",
-									},
-								})
-								.then((res) => {
-									if (res.code == 0) {
-										uni.hideLoading();
-										uni.showToast({
-											title: "收货成功",
-											icon: "success",
-											duration: 1000,
-										});
-										this.newestpage = 1;
-										this.pagination.page = 1
-										this.newList = [];
-										this.getBookList(this.ordersListTab, false);
-									}
-								});
-						} else if (res.cancel) {}
-					},
-				});
-			},
-			closePingjia() {
-				this.pingjiaShow = false;
-				this.Pform.comment = "";
-				this.Pform.html = "";
-				this.emoji = [];
-			},
-			// 提交评价
-			submitPJ() {
-				if (this.Pform.comment != "") {
-					let data = {
-						userid: this.userInfo.id,
-						orderSn: this.orderSn,
-						bookid: this.productID,
-						// 'content': this.Pform.html,
-						content: this.Pform.comment,
-						starLevel: this.Pform.star,
-						images: this.Pform.img,
-						// 'emoji':this.emoji  // 表情数组
-					};
-					// console.log(data,'data')
-					$http
-						.request({
-							url: "buy/record/UserRecordcomment",
-							method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
-							data,
-							header: {
-								//默认 无 说明：请求头
-								"Content-Type": "application/json",
-							},
-						})
-						.then((res) => {
-							if (res.code == 0) {
-								uni.showToast({
-									title: "评价成功！",
-									icon: "success",
-								});
+              this.pingjiaShow = false;
+              this.Pform.comment = "";
+              this.Pform.html = "";
+              this.emoji = [];
+              setTimeout(() => {
+                uni.navigateBack({
+                  delta: 1,
+                });
+              }, 2000);
+            }
+          });
+      } else {
+        uni.showToast({
+          title: "请先输入您的评价内容 ！",
+          icon: "none",
+        });
+      }
+    },
+    // 添加评价
+    pingji(id) {
+      console.log(id);
+      this.pjType = "";
+      this.productID = id;
+      this.pingjiaShow = true;
+    },
+    getStar(i) {
+      this.Pform.star = i;
+    },
+    InputBlur(e) {},
+    InputFocus(e) {
+      this.isShowEmj = false;
+      this.emojiIcon = "cuIcon-emoji";
+      this.$emit("foc");
+    },
+    textareaBInput(e) {
+      console.log(e, "e");
+      this.Pform.comment = e.detail.value;
+      /// this.Pform.html = e.detail.value
+    },
+    showEmj() {
+      let bool = !this.isShowEmj;
+      if (bool) {
+        this.emojiIcon = "cuIcon-keyboard";
+      } else {
+        this.emojiIcon = "cuIcon-emoji";
+      }
 
-								this.pingjiaShow = false;
-								this.Pform.comment = "";
-								this.Pform.html = "";
-								this.emoji = [];
-								setTimeout(() => {
-									uni.navigateBack({
-										delta: 1,
-									});
-								}, 2000);
-							}
-						});
-				} else {
-					uni.showToast({
-						title: "请先输入您的评价内容 ！",
-						icon: "none",
-					});
-				}
-			},
-			// 添加评价
-			pingji(id) {
-				console.log(id);
-				this.pjType = "";
-				this.productID = id;
-				this.pingjiaShow = true;
-			},
-			getStar(i) {
-				this.Pform.star = i;
-			},
-			InputBlur(e) {},
-			InputFocus(e) {
-				this.isShowEmj = false;
-				this.emojiIcon = "cuIcon-emoji";
-				this.$emit("foc");
-			},
-			textareaBInput(e) {
-				console.log(e, "e");
-				this.Pform.comment = e.detail.value;
-				/// this.Pform.html = e.detail.value
-			},
-			showEmj() {
-				let bool = !this.isShowEmj;
-				if (bool) {
-					this.emojiIcon = "cuIcon-keyboard";
-				} else {
-					this.emojiIcon = "cuIcon-emoji";
-				}
-
-				this.isShowEmj = bool;
-				this.$emit("show");
-			},
-			deletePic() {
-				let that = this;
-				that.Pform.img.splice(0, 1);
-				//console.log(that.Pform.img)
-			},
-			afterRead(e) {
-				//console.log(e)
-				let that = this;
-				for (var i = 0; i < e.file.length; i++) {
-					//console.log(i,e.file[i].url)
-					uni.uploadFile({
-						url: this.$baseUrl + "oss/fileoss",
-						filePath: e.file[i].url,
-						//files:e.file,
-						name: "file",
-						formData: {},
-						success: (res) => {
-							that.Pform.img.push({
-								url: JSON.parse(res.data).url,
-							});
-						},
-					});
-				}
-			},
-			// 获得输入的表情数组
-			handleEmj(i) {
-				console.log(i, "i---------");
-				this.inputValue = i;
-				// console.log(this.inputValue);
-				if (i.emotioni == "[em_98]") {
-					//匹配最后一个表情符号并删除11。
-					this.Pform.comment = this.Pform.comment.replace(
-						/(\[[^\]]+\]|[\s\S])$/,
-						""
-					);
-					if (this.emoji.length > 0) {
-						this.emoji = this.emoji.slice(0, -1);
-					}
-				} else {
-					this.emoji.push({
-						tag: i.emotion,
-						name: i.emotioni
-					});
-					// console.log(this.emoji,'this.emoji')
-					this.Pform.comment += i.emotioni;
-					/// this.Pform.html += i.emotion
-				}
-			},
-		},
-		components: {
-			musicPlay,
-			emotion,
-		},
-	};
+      this.isShowEmj = bool;
+      this.$emit("show");
+    },
+    deletePic() {
+      let that = this;
+      that.Pform.img.splice(0, 1);
+      //console.log(that.Pform.img)
+    },
+    afterRead(e) {
+      //console.log(e)
+      let that = this;
+      for (var i = 0; i < e.file.length; i++) {
+        //console.log(i,e.file[i].url)
+        uni.uploadFile({
+          url: this.$baseUrl + "oss/fileoss",
+          filePath: e.file[i].url,
+          //files:e.file,
+          name: "file",
+          formData: {},
+          success: (res) => {
+            that.Pform.img.push({
+              url: JSON.parse(res.data).url,
+            });
+          },
+        });
+      }
+    },
+    // 获得输入的表情数组
+    handleEmj(i) {
+      console.log(i, "i---------");
+      this.inputValue = i;
+      // console.log(this.inputValue);
+      if (i.emotioni == "[em_98]") {
+        //匹配最后一个表情符号并删除11。
+        this.Pform.comment = this.Pform.comment.replace(
+          /(\[[^\]]+\]|[\s\S])$/,
+          ""
+        );
+        if (this.emoji.length > 0) {
+          this.emoji = this.emoji.slice(0, -1);
+        }
+      } else {
+        this.emoji.push({
+          tag: i.emotion,
+          name: i.emotioni,
+        });
+        // console.log(this.emoji,'this.emoji')
+        this.Pform.comment += i.emotioni;
+        /// this.Pform.html += i.emotion
+      }
+    },
+  },
+  components: {
+    musicPlay,
+    emotion,
+  },
+};
 </script>
 
 <style lang="scss" scoped>
-	@import "@/style/mixin.scss";
+@import "@/style/mixin.scss";
 
-	.ordersTabs {
-		// margin: 70rpx 0 0 0;
-		width: 730rpx;
-		// padding: 0 3% 3% 3%;
-		position: fixed;
-		// top: 80rpx;
-		background-color: #f7faf9;
-		z-index: 100;
+.ordersTabs {
+  // margin: 70rpx 0 0 0;
+  width: 730rpx;
+  // padding: 0 3% 3% 3%;
+  position: fixed;
+  // top: 80rpx;
+  background-color: #f7faf9;
+  z-index: 100;
 
-		.ordersdefine {
-			display: inline-block;
-			padding: 20rpx 0 20rpx 0;
-			// margin: 40rpx 0 15rpx 0;
-			width: 140rpx;
-			text-align: center;
-			font-size: 30rpx;
-			position: relative;
+  .ordersdefine {
+    display: inline-block;
+    padding: 20rpx 0 20rpx 0;
+    // margin: 40rpx 0 15rpx 0;
+    width: 140rpx;
+    text-align: center;
+    font-size: 30rpx;
+    position: relative;
 
-			.ordersnum {
-				position: absolute;
-				top: 8rpx;
-				right: 0rpx;
-				background-color: red;
-				// border:1rpx solid #a3a3a3;
-				border-radius: 40rpx;
-				width: 28rpx;
-				height: 28rpx;
-				font-size: 20rpx;
-				font-weight: 500;
-				color: rgb(255, 255, 255);
-			}
-		}
+    .ordersnum {
+      position: absolute;
+      top: 8rpx;
+      right: 0rpx;
+      background-color: red;
+      // border:1rpx solid #a3a3a3;
+      border-radius: 40rpx;
+      width: 28rpx;
+      height: 28rpx;
+      font-size: 20rpx;
+      font-weight: 500;
+      color: rgb(255, 255, 255);
+    }
+  }
 
-		.ordStyle {
-			// border-bottom: 4rpx solid #54a966;
-			// color: #54a966;
-			font-weight: bold;
-		}
-	}
+  .ordStyle {
+    // border-bottom: 4rpx solid #54a966;
+    // color: #54a966;
+    font-weight: bold;
+  }
+}
 
-	.orderstatusbtn {
-		width: 160rpx !important;
-		height: 60rpx;
-		line-height: 55rpx !important;
-		color: #1d1d1d;
-		border: 1px solid #a0a0a0;
-		border-radius: 30rpx;
-		// padding: 0 10rpx;
-		text-align: center;
-		margin-left: 20rpx;
-		font-size: 28rpx;
-	}
+.orderstatusbtn {
+  width: 160rpx !important;
+  height: 60rpx;
+  line-height: 55rpx !important;
+  color: #1d1d1d;
+  border: 1px solid #a0a0a0;
+  border-radius: 30rpx;
+  // padding: 0 10rpx;
+  text-align: center;
+  margin-left: 20rpx;
+  font-size: 28rpx;
+}
 
-	.orderstatusbtn_success {
-		color: #f5342b;
-		border-color: #f5342b;
-	}
+.orderstatusbtn_success {
+  color: #f5342b;
+  border-color: #f5342b;
+}
 
-	.flexbox {
-		display: flex;
-	}
+.flexbox {
+  display: flex;
+}
 
-	.container {
-		padding: 0 10px;
-	}
+.container {
+  padding: 0 10px;
+}
 
-	.star {
-		display: inline-block;
-		width: 20px;
-		height: 20px;
-		margin-right: 10rpx;
-	}
+.star {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  margin-right: 10rpx;
+}
 
-	.starGray {
-		background: url(../../static/icon/star_greey.png) no-repeat;
-		background-size: contain;
-	}
+.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;
-	}
+.starLight {
+  background: url(../../static/icon/star_light.png) no-repeat;
+  background-size: contain;
+}
 
-	.cuIcon-emoji {
-		background: url(../../static/biaoqing.png) no-repeat;
-		background-size: contain;
-		display: block;
-		margin-right: 20rpx;
-		width: 30px;
-	}
+.cuIcon-emoji {
+  background: url(../../static/biaoqing.png) no-repeat;
+  background-size: contain;
+  display: block;
+  margin-right: 20rpx;
+  width: 30px;
+}
 
-	.cuIcon-keyboard {
-		background: url(../../static/biaoqing.png) no-repeat;
-		background-size: contain;
-		display: block;
-		width: 30px;
-	}
+.cuIcon-keyboard {
+  background: url(../../static/biaoqing.png) no-repeat;
+  background-size: contain;
+  display: block;
+  width: 30px;
+}
 
-	.tanchu {
-		padding: 40rpx 30rpx 40rpx 30rpx;
-		position: relative;
+.tanchu {
+  padding: 40rpx 30rpx 40rpx 30rpx;
+  position: relative;
 
-		.dp_title {
-			font-size: 32rpx;
-			margin-bottom: 50rpx;
-			color: #555;
-			text-align: center;
-			font-weight: bold;
-		}
+  .dp_title {
+    font-size: 32rpx;
+    margin-bottom: 50rpx;
+    color: #555;
+    text-align: center;
+    font-weight: bold;
+  }
 
-		.dp_add {
-			position: absolute;
-			top: 40rpx;
-			right: 30rpx;
-			font-size: 22rpx;
-			background-color: #fd6004;
-			color: #fff;
-			border-radius: 10rpx;
-			padding: 5rpx 10rpx;
+  .dp_add {
+    position: absolute;
+    top: 40rpx;
+    right: 30rpx;
+    font-size: 22rpx;
+    background-color: #fd6004;
+    color: #fff;
+    border-radius: 10rpx;
+    padding: 5rpx 10rpx;
 
-			.u-icon {
-				display: inline-block;
-				margin-right: 5rpx;
-			}
-		}
-	}
+    .u-icon {
+      display: inline-block;
+      margin-right: 5rpx;
+    }
+  }
+}
 
-	.quesheng {
-		text-align: center;
-		margin-top: 100rpx;
-		color: #8b8a91;
-		padding-bottom: 20rpx;
-		padding-top: 20rpx;
-	}
+.quesheng {
+  text-align: center;
+  margin-top: 100rpx;
+  color: #8b8a91;
+  padding-bottom: 20rpx;
+  padding-top: 20rpx;
+}
 
-	.gengduoshuping {
-		text-align: right;
-		color: #0044ff;
-		padding-bottom: 20rpx;
-		padding-top: 20rpx;
-	}
+.gengduoshuping {
+  text-align: right;
+  color: #0044ff;
+  padding-bottom: 20rpx;
+  padding-top: 20rpx;
+}
 
-	.orderInfo {
-		position: relative;
-		justify-content: space-between;
-		// margin-bottom: 15px;
-		background-color: #fff;
-		padding: 20rpx 20rpx;
-		border: 1px splid #999;
-		box-sizing: border-box;
-		// padding-bottom: 20rpx;
-		border-radius: 20rpx;
-		margin-bottom: 20rpx;
+.orderInfo {
+  position: relative;
+  justify-content: space-between;
+  // margin-bottom: 15px;
+  background-color: #fff;
+  padding: 20rpx 20rpx;
+  border: 1px splid #999;
+  box-sizing: border-box;
+  // padding-bottom: 20rpx;
+  border-radius: 20rpx;
+  margin-bottom: 20rpx;
 
-		.bookinfolist {
-			width: 100%;
-			margin-bottom: 20rpx;
-			overflow: hidden;
-			// height: 180rpx;
-		}
+  .bookinfolist {
+    width: 100%;
+    margin-bottom: 20rpx;
+    overflow: hidden;
+    // height: 180rpx;
+  }
 
-		.bookinfolist:nth-last-child(1) {
-			margin-bottom: 0 !important;
-		}
+  .bookinfolist:nth-last-child(1) {
+    margin-bottom: 0 !important;
+  }
 
-		.operation_box {
-			position: absolute;
-			bottom: 20rpx;
-			left: 40rpx;
-		}
-	}
+  .operation_box {
+    position: absolute;
+    bottom: 20rpx;
+    left: 40rpx;
+  }
+}
 
-	.mainContent {
-		background-color: #fff;
+.mainContent {
+  background-color: #fff;
 
-		.item {
-			// padding: 10px;
-			// margin-bottom: 30rpx;
-			// border: 1px solid #999;
-			box-sizing: border-box;
-			// padding-bottom: 20rpx;
-			border-radius: 20rpx;
-			// margin-bottom: 20rpx;
-		}
+  .item {
+    // padding: 10px;
+    // margin-bottom: 30rpx;
+    // border: 1px solid #999;
+    box-sizing: border-box;
+    // padding-bottom: 20rpx;
+    border-radius: 20rpx;
+    // margin-bottom: 20rpx;
+  }
 
-		.feng {
-			background-color: #fafafa;
-			margin: 0rpx 22rpx 0 0;
-			height: 140rpx;
-			width: 140rpx;
-			float: left;
-			border-radius: 14rpx;
-			// border: 1rpx solid #e9e9e9;
-		}
+  .feng {
+    background-color: #fafafa;
+    margin: 0rpx 22rpx 0 0;
+    height: 140rpx;
+    width: 140rpx;
+    float: left;
+    border-radius: 14rpx;
+    // border: 1rpx solid #e9e9e9;
+  }
 
-		.point_box {
-			.booknameleft {
-				line-height: 70rpx !important;
-			}
-		}
+  .point_box {
+    .booknameleft {
+      line-height: 70rpx !important;
+    }
+  }
 
-		.fengPoint {
-			background-color: #fff;
-			height: 100rpx;
-			width: 100rpx;
-		}
+  .fengPoint {
+    background-color: #fff;
+    height: 100rpx;
+    width: 100rpx;
+  }
 
-		.item_top {
-			width: 100%;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
+  .item_top {
+    width: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
 
-			margin-bottom: 25rpx;
+    margin-bottom: 25rpx;
 
-			.source_app {
-				font-size: 26rpx;
-				font-weight: bold;
-				line-height: 26rpx;
-			}
-		}
+    .source_app {
+      font-size: 26rpx;
+      font-weight: bold;
+      line-height: 26rpx;
+    }
+  }
 
-		.orderstatus {
-			line-height: 24rpx;
-			font-size: 24rpx;
-			color: #e55f18;
-			text-align: right;
-			letter-spacing: 2rpx;
-		}
+  .orderstatus {
+    line-height: 24rpx;
+    font-size: 24rpx;
+    color: #e55f18;
+    text-align: right;
+    letter-spacing: 2rpx;
+  }
 
-		/deep/.description {
-			overflow: hidden;
-			color: #666;
-			text-overflow: -o-ellipsis-lastline;
-			overflow: hidden;
-			text-overflow: ellipsis;
-			display: -webkit-box;
-			-webkit-line-clamp: 5;
-			line-clamp: 5;
-			-webkit-box-orient: vertical;
-			font-size: 26rpx;
-			margin-bottom: 20rpx;
-			margin-top: 10rpx;
-			height: 172rpx;
+  /deep/.description {
+    overflow: hidden;
+    color: #666;
+    text-overflow: -o-ellipsis-lastline;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 5;
+    line-clamp: 5;
+    -webkit-box-orient: vertical;
+    font-size: 26rpx;
+    margin-bottom: 20rpx;
+    margin-top: 10rpx;
+    height: 172rpx;
 
-			img {
-				width: 100% !important;
-			}
-		}
+    img {
+      width: 100% !important;
+    }
+  }
 
-		.btns {
-			font-size: 28rpx;
-			justify-content: space-between;
-			align-items: center;
+  .btns {
+    font-size: 28rpx;
+    justify-content: space-between;
+    align-items: center;
 
-			.booknameleft {
-				font-size: 32rpx;
-				width: calc(100% - 200rpx);
-				color: #070707;
-				letter-spacing: 0.5rpx;
-				font-weight: 600;
-			}
+    .booknameleft {
+      font-size: 32rpx;
+      width: calc(100% - 200rpx);
+      color: #070707;
+      letter-spacing: 0.5rpx;
+      font-weight: 600;
+    }
 
-			.left {
-				width: 300rpx;
-				color: #a1a1a1;
-			}
+    .left {
+      width: 300rpx;
+      color: #a1a1a1;
+    }
 
-			.right {
-				width: 350rpx;
-				display: flex;
-				justify-content: flex-end;
-				align-items: center;
-			}
+    .right {
+      width: 350rpx;
+      display: flex;
+      justify-content: flex-end;
+      align-items: center;
+    }
 
-			.price {
-				width: 120rpx;
-			}
+    .price {
+      width: 120rpx;
+    }
 
-			.gzicon {
-				margin: 0 0 0 20rpx;
-				height: 40rpx;
-				width: 40rpx;
-				// float:left;
-				// border-radius: 20rpx;
-				// border:1rpx solid #e9e9e9;
-			}
+    .gzicon {
+      margin: 0 0 0 20rpx;
+      height: 40rpx;
+      width: 40rpx;
+      // float:left;
+      // border-radius: 20rpx;
+      // border:1rpx solid #e9e9e9;
+    }
 
-			.opbtns {
-				.pingjia {
-					margin-left: 10px;
-				}
-			}
-		}
-	}
+    .opbtns {
+      .pingjia {
+        margin-left: 10px;
+      }
+    }
+  }
+}
 
-	.mb30 {
-		margin-bottom: 30rpx;
-		overflow: hidden;
-	}
+.mb30 {
+  margin-bottom: 30rpx;
+  overflow: hidden;
+}
 
-	.mytabs {
-		// background: url('@/static/icon/bgtushu.png') no-repeat left top;
-		height: 80rpx;
-		// margin-bottom: 30rpx;
+.mytabs {
+  // background: url('@/static/icon/bgtushu.png') no-repeat left top;
+  height: 80rpx;
+  // margin-bottom: 30rpx;
 
-		.item {
-			border-radius: 10rpx;
-			background-color: #c6ead0;
-			width: 48%;
-			// margin: 0 10rpx;
-			text-align: center;
-			color: #3c7f56;
-			font-size: 36rpx;
-			line-height: 80rpx;
-		}
+  .item {
+    border-radius: 10rpx;
+    background-color: #c6ead0;
+    width: 48%;
+    // margin: 0 10rpx;
+    text-align: center;
+    color: #3c7f56;
+    font-size: 36rpx;
+    line-height: 80rpx;
+  }
 
-		.item.active {
-			background-color: #3c7f56;
-			color: #fff;
-		}
+  .item.active {
+    background-color: #3c7f56;
+    color: #fff;
+  }
 
-		.item2 {
-			margin-right: 20rpx;
-		}
-	}
+  .item2 {
+    margin-right: 20rpx;
+  }
+}
 
-	/deep/.u-tabs__wrapper__nav__item__text {
-		// font-size: 32rpx !important;
-	}
+/deep/.u-tabs__wrapper__nav__item__text {
+  // font-size: 32rpx !important;
+}
 
-	.cateList {
-		width: 100%;
-	}
+.cateList {
+  width: 100%;
+}
 
-	/deep/.u-tabs__wrapper__nav__item {
-		padding: 0 !important;
-	}
+/deep/.u-tabs__wrapper__nav__item {
+  padding: 0 !important;
+}
 
-	.commonDetailPage {
-		background-color: $themeBgColor;
-		height: calc(100vh);
-	}
+.commonDetailPage {
+  background-color: $themeBgColor;
+  height: calc(100vh);
+}
 
-	.order_box {
-		padding: 20rpx;
-	}
+.order_box {
+  padding: 20rpx;
+}
 
-	/deep/.order_box .list_item {
-		// border-bottom: none;
-		padding: 0 !important;
-		padding-right: 0 !important;
-		border: none !important;
-	}
+/deep/.order_box .list_item {
+  // border-bottom: none;
+  padding: 0 !important;
+  padding-right: 0 !important;
+  border: none !important;
+}
 
-	.product_quantity {
-		width: auto;
-		color: #9b9b9b;
-		font-size: 26rpx;
-	}
-</style>
\ No newline at end of file
+.product_quantity {
+  width: auto;
+  color: #9b9b9b;
+  font-size: 26rpx;
+}
+</style>
diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue
index 9cc1c7b..152f6e2 100644
--- a/pages/goods/order/index.vue
+++ b/pages/goods/order/index.vue
@@ -88,7 +88,17 @@
           </image>
           <view class="normal_box">
             <view class="normal_box_top" style="justify-content: space-between">
-              <view class="curriulum_title">{{ v.productName }} </view>
+              <view
+                class="curriulum_title"
+                style="width: calc(100% - 160rpx); font-size: 14px"
+                >{{ v.productName }}
+              </view>
+              <u-number-box
+                :min="1"
+                :input-width="30"
+                v-model="orderNumber"
+                button-size="20"
+              ></u-number-box>
             </view>
 
             <view>
@@ -97,16 +107,16 @@
                   v.isVipPrice == 1 && v.vipPrice != 0 && v.vipPrice != null
                 "
               >
-                <text style="color: #e97512; font-size: 12px; font-weight: bold"
+                <text style="color: #e97512; font-size: 14px; font-weight: bold"
                   >￥{{ v.vipPrice.toFixed(2) }}</text
                 >
-                <text style="color: #fa2d12; font-size: 10px; margin-left: 4px"
+                <text style="color: #fa2d12; font-size: 12px; margin-left: 4px"
                   >VIP到手价</text
                 >
                 <text
                   style="
                     color: #8a8a8a;
-                    font-size: 10px;
+                    font-size: 12px;
                     margin-left: 4px;
                     font-weight: bold;
                     text-decoration: line-through;
@@ -116,16 +126,16 @@
               </text>
 
               <text v-else-if="v.activityPrice && v.activityPrice > 0">
-                <text style="color: #e97512; font-size: 12px; font-weight: bold"
+                <text style="color: #e97512; font-size: 14px; font-weight: bold"
                   >￥{{ v.activityPrice.toFixed(2) }}</text
                 >
-                <text style="color: #613804; font-size: 10px; margin-left: 4px"
+                <text style="color: #613804; font-size: 12px; margin-left: 4px"
                   >活动价</text
                 >
                 <text
                   style="
                     color: #8a8a8a;
-                    font-size: 10px;
+                    font-size: 12px;
                     margin-left: 4px;
                     font-weight: bold;
                     text-decoration: line-through;
@@ -134,25 +144,9 @@
                 >
               </text>
 
-              <text v-else style="font-size: 12px"
+              <text v-else style="font-size: 14px"
                 >￥{{ Number(v.price).toFixed(2) }}</text
               >
-              <!-- <u-number-box v-model="orderNumber" style="float: right">
-                <view slot="minus" class="minus">
-                  <u-icon name="minus" size="12"></u-icon>
-                </view>
-                <text
-                  slot="input"
-                  style="width: auto; text-align: center; border: none"
-                  class="input"
-                  >{{ orderNumber }}</text
-                >
-                <view slot="plus" class="plus">
-                  <u-icon name="plus" color="#FFFFFF" size="12"></u-icon>
-                </view>
-              </u-number-box> -->
-              <u-number-box :min="1"  v-model="orderNumber" ></u-number-box>
-
             </view>
           </view>
         </view>
@@ -941,7 +935,12 @@ export default {
           this.jfNumberShow = this.jfNumber.toFixed(2);
         }
 
-        this.actualPayment = this.totalPrice - this.jfNumber -this.districtAmount -this.vipPrice + this.freightNum;
+        this.actualPayment =Number(
+          this.totalPrice -
+          this.jfNumber -
+          this.districtAmount -
+          this.vipPrice +
+          this.freightNum).toFixed(2);
 
         if (this.actualPayment == 0) {
           this.isDefaultCurrency = true;
@@ -1200,23 +1199,23 @@ export default {
         }
         if (that.jfNumber == 0 || that.jfNumber == null) {
           that.jfNumberShow = "0.00";
-          that.actualPayment = that.totalPrice;
+          that.actualPayment = that.totalPrice.toFixed(2);
         } else {
           that.jfNumberShow = that.jfNumber.toFixed(2);
-          that.actualPayment = that.totalPrice - that.jfNumber;
+          that.actualPayment = Number(that.totalPrice - that.jfNumber).toFixed(2);
         }
-        that.actualPayment =
+        that.actualPayment =Number(
           that.actualPayment +
           that.freightNum -
           that.districtAmount -
-          that.vipPrice;
+          that.vipPrice).toFixed(2);
       } else {
-        that.actualPayment =
+        that.actualPayment =Number(
           that.totalPrice +
           that.freightNum -
           couponAmount -
           that.districtAmount -
-          that.vipPrice;
+          that.vipPrice).toFixed(2);
       }
 
       if (this.actualPayment == 0 && !this.isShowAddress) {
@@ -1314,12 +1313,13 @@ export default {
           couponId: null, //优惠券Id
           // isSend: this.isSend,
           couponName: "", //优惠券名称
-          districtMoney: 0, //优惠金额
+          vipDiscountAmount: this.vipPrice, //折扣金额
+          districtMoney: this.districtAmount, //折扣金额
 
           productList: this.goodsDataList.map((e) => {
             return {
               productId: e.productId,
-              quantity: 1,
+              quantity: this.orderNumber,
             };
           }), //订单列表商品
           orderType: "order", //订单类型