我的订单+我的+vip+商品详情（基础）

components/z-navigation/z-navigation.vue

@@ -80,12 +80,12 @@ export default {
           selectedIconPath: "static/tab/icon1_y.png",
           text: "首页",
         },
-        {
+        // {
-          pagePath: "pages/peanut/shopping",
+        //   pagePath: "pages/peanut/shopping",
-          iconPath: "static/tab/tab_nor_02.png",
+        //   iconPath: "static/tab/tab_nor_02.png",
-          selectedIconPath: "static/tab/tab_cur_02.png",
+        //   selectedIconPath: "static/tab/tab_cur_02.png",
-          text: "购物车",
+        //   text: "购物车",
-        },
+        // },
         {
           pagePath: "pages/taihu/index",
           iconPath: "static/tab/tab_nor_03.png",

config/utils.js

@@ -274,7 +274,7 @@ export const setWXPay = function(payInfo, callback) {
 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
 		data: {
 			...payInfo,
-			appName: 'medicine'
+			appName: 'wumen'
 		},
 		header: { //默认 无 说明：请求头1
 			'Content-Type': 'application/json'

pages.json

@@ -439,6 +439,28 @@
 				"navigationBarTitleText" : "我的课程",
 				"enablePullDownRefresh": true
 			}
+		},{
+			"path": "pages/goods/index/index",
+			"style": {
+				"navigationBarTitleText": "商品信息",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
+			}
+		},{
+			"path": "pages/goods/order/index",
+			"style": {
+				"navigationBarTitleText": "确认订单",
+				"enablePullDownRefresh": false,
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": false,
+					"popGesture": "none"
+				}
+			}
 		}		
 	],
 	"globalStyle": {
@@ -462,12 +484,12 @@
 				"selectedIconPath": "static/tab/icon1_y.png",
 				"text": "首页"
 			},
-			{
+			// {
-				"pagePath": "pages/peanut/shopping",
+			// 	"pagePath": "pages/peanut/shopping",
-				"iconPath": "static/tab/tab_nor_02.png",
+			// 	"iconPath": "static/tab/tab_nor_02.png",
-				"selectedIconPath": "static/tab/tab_cur_02.png",
+			// 	"selectedIconPath": "static/tab/tab_cur_02.png",
-				"text": "购物车"
+			// 	"text": "购物车"
-			},
+			// },
 			{
 				"pagePath": "pages/taihu/index",
 				"iconPath": "static/tab/tab_nor_03.png",

pages/bookShop/commodityDetail copy.vue

@@ -0,0 +1,630 @@
+<template>
+	<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()
+						})
+				}
+
+			},
+			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(/<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%;
+	}
+
+	.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
+	}
+
+	.header {
+		position: fixed;
+		top: 0%;
+		left: 0%;
+		z-index: 999;
+	}
+
+	.contentButton {
+		margin: 10px 0;
+	}
+
+	.swiperBox {
+		width: 100%;
+		height: 375px;
+		margin-top: 150rpx;
+	}
+
+	.commodityContent {
+
+		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;
+
+			em {
+				font-size: 74rpx;
+				font-style: normal;
+			}
+
+			.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;
+		}
+
+		.commodityIntroduce {
+			font-size: 30rpx;
+			background-color: #fff;
+			padding: 0 20rpx 30rpx 20rpx;
+		}
+	}
+
+	.footer {
+		width: 100%;
+		height: 100rpx;
+		background-color: #fff;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		position: fixed;
+		bottom: 0%;
+
+		.shopcard {
+			margin: 0 0 0 30rpx;
+			text-align: center;
+			font-size: 20rpx;
+			color: #eba00b;
+		}
+
+		.operate {
+			display: flex;
+
+			view {
+				font-size: 32rpx;
+				font-weight: 700;
+				color: #fff;
+				padding: 32rpx 40rpx;
+				letter-spacing: 0.8px;
+			}
+
+			.addShopCar {
+				background-color: #eba00b;
+			}
+
+			.goBuy {
+
+				background-color: #cf3906;
+			}
+		}
+	}
+</style>

pages/bookShop/commodityDetail.vue

@@ -394,7 +394,7 @@ export default {
 			this.linkCur = index
 		},
 		// 获取商品关联商品
-		getLinkPros(id) {			
+		getLinkPros(id) {
 			this.$http
 				.post('book/shopproduct/getGlProductList', {
 					'productId': id
@@ -1114,7 +1114,7 @@ export default {
 	font-size: 24rpx;
 	color: #999;
 	margin-top: 16rpx;
-	font-weight: 400;
+	font-weight: 600;
 }
 
 .bookInfo {
@@ -1165,7 +1165,7 @@ export default {
 
 		.oldPrice {
 			background-color: #ff000013;
-			;
+			
 			padding: 4rpx 14rpx;
 			border-radius: 20rpx;
 			margin-left: 20rpx;
@@ -1246,7 +1246,7 @@ export default {
 	.item {
 		overflow: hidden;
 		margin-bottom: 30rpx;
-		border-bottom: 4rpx solid #f0f0f0;
+		border-bottom: 4rpx solid #f5f5f5;
 	}
 
 	.item:nth-last-child(1) {

pages/bookShop/deliverDetail.vue

@@ -88,7 +88,7 @@
 				console.log('this.orderType',this.orderType)
 				this.$http
 					// .get(`book/buyOrder/getOrderInfo?orderId=${this.orderID}`)
-					.get(`/book/buyOrder/orderDetail?orderSn=${this.orderSn}`)
+					.get(`book/buyOrder/orderDetail?orderSn=${this.orderSn}`)
 					.then(res => {
 						console.log('订单详情',res)
 						var seconds = res.result.timestamp + 30 * 60 + 2    // 过期时间

pages/bookShop/orderLCont.vue

@@ -16,7 +16,7 @@
         >
           <u-icon
             name="map-fill"
-            color="#018F89"
+            color="#258feb"
             size="23"
             style="display: inline-block; margin-right: 10rpx"
           ></u-icon>

pages/bookShop/settlement.vue

@@ -635,8 +635,7 @@
 					orderStatus: 0, //订单状态
 					productList: xiaBiao, //订单列表商品
 					orderType: "order", //订单类型
-					addressId: this.adressMoRen.id, // 地址ID
+					addressId: this.adressMoRen.id // 地址ID
-					jfDeduction:0,//积分抵扣
 				}
 				$http.request({
 					// url: "book/buyOrder/buySave",
@@ -674,9 +673,9 @@
 											title: "支付成功"
 										});
 										setTimeout(() => {
-											uni.navigateTo({
+											uni.switchTab({
-												url: '/pages/bookShop/orderList'
+												url: './orderList'
-											});	
+											});
 											// uni.navigateTo({
 											// 	url: './orderList'
 											// });
@@ -708,9 +707,9 @@
 											title: "支付成功"
 										});
 										setTimeout(() => {
-											uni.navigateTo({
+											uni.switchTab({
-												url: '/pages/bookShop/orderList'
+												url: './orderList'
-											});	
+											});
 										}, 1000)
 									} else {
 										console.log(res)
@@ -733,12 +732,12 @@
 								// 天医币支付
 								uni.showToast({
 									title: "购买成功",
-									icon: "success"								
+									icon: "success"
 								});
 								setTimeout(() => {
-									uni.navigateTo({
+									uni.switchTab({
-										url: '/pages/bookShop/orderList'
+										url: './orderList'
-									});									
+									});
 								}, 1000)
 							}
 						}

pages/bookShop/settlementBook.vue

@@ -661,9 +661,9 @@
 										title: "支付成功"
 									});
 									setTimeout(() => {
-										uni.navigateTo({
+										uni.switchTab({
-											url: '/pages/bookShop/orderList'
+											url: './orderList'
-										});	
+										});
 										// uni.navigateTo({
 										// 	url: './orderList'
 										// });
@@ -695,9 +695,9 @@
 											title: "支付成功"
 										});
 										setTimeout(() => {
-											uni.navigateTo({
+											uni.switchTab({
-												url: '/pages/bookShop/orderList'
+												url: './orderList'
-											});	
+											});
 										}, 1000)
 									} else {	
 										console.log(res)
@@ -718,15 +718,14 @@
 								})
 							}else if(this.payType == 4){
 								// 天医币支付
-								// console.log('到这里--------',res)
 								uni.showToast({
 									title: "购买成功",
 									icon: "success"								
 								});
 								setTimeout(() => {
-									uni.navigateTo({
+									uni.switchTab({
-										url: '/pages/bookShop/orderList'
+										url: './orderList'
-									});									
+									});
 								}, 1000)
 							}
 						}

pages/component/commonComponents/address/edit.vue

@@ -155,7 +155,7 @@
 				customButtonGroup1: [{
 					with: 200,
 					text: "保存",
-					backgroundColor: "linear-gradient(90deg, #258feb 0%, #B9E0F5 100%)",
+					backgroundColor: "linear-gradient(90deg, #3C77BE 0%,#258feb 100%)",
 					color: "#fff",
 				}, ],
 				addressPopup: false,
@@ -305,7 +305,7 @@
 				customButton: [{
 					width: "340rpx",
 					text: "立即支付",
-					backgroundColor: "linear-gradient(90deg, #258feb 0%, #B9E0F5 100%)",
+					backgroundColor: "linear-gradient(90deg,#3C77BE 0%,#258feb 100%)",
 					color: "#fff",
 				}, ],
 			};

pages/component/commonComponents/address/index.vue

@@ -162,7 +162,7 @@ export default {
         {
           with: 200,
           text: "+ 添加收货地址",
-          backgroundColor: "linear-gradient(90deg, #258feb 0%, #B9E0F5 100%)",
+          backgroundColor: "linear-gradient(90deg, #3C77BE 0%,#258feb 100%)",
           color: "#fff",
         },
       ],

pages/mine/mine/index.vue

@@ -3,7 +3,7 @@
     style="
       padding: 0 0;
       font-size: 28rpx;
-      background-color: #39b4a84d !important;
+      ;
     "
     class="commonPage commonPageBox"
   >
@@ -494,9 +494,9 @@ export default {
           scene: "WXSceneSession",
           type: 0,
           href: this.$apkUrl,
-          title: "众妙之门",
+          title: "吴门医述",
-          summary: "我正在使用众妙之门提升自己，赶紧跟我一起来体验吧！",
+          summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
-          imageUrl: "static/icon/fengziIcon.png",
+          imageUrl: "static/icon/home_icon_logo.png",
           success: function (res) {
             console.log("success:" + JSON.stringify(res));
           },
@@ -511,9 +511,9 @@ export default {
           scene: "WXSceneTimeline",
           type: 0,
           href: this.$apkUrl,
-          title: "众妙之门",
+          title: "吴门医述",
-          summary: "我正在使用众妙之门提升自己，赶紧跟我一起来体验吧！",
+          summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
-          imageUrl: "static/icon/fengziIcon.png",
+          imageUrl: "static/icon/home_icon_logo.png",
           success: function (res) {
             console.log("success:" + JSON.stringify(res));
           },

pages/mine/vip/order.vue

@@ -240,12 +240,12 @@ export default {
           type: 2,
           value: "0",
         },
-        // {
+        {
-        //   text: "微信",
+          text: "微信",
-        //   imgUrl: require("@/static/icon/pay_2.png"),
+          imgUrl: require("@/static/icon/pay_2.png"),
-        //   type: 1,
+          type: 1,
-        //   value: "1",
+          value: "1",
-        // },
+        },
         {
           text: "天医币",
           imgUrl: require("@/static/icon/pay_3.png"),
@@ -321,7 +321,7 @@ export default {
         {
           width: "160rpx",
           text: "立即支付",
-          backgroundColor: "linear-gradient(90deg, #258feb 0%, #E2F5FA 100%)",
+          backgroundColor: "linear-gradient(90deg, #3C77BE 0%,#258feb 100%)",
           color: "#fff",
         },
       ],
@@ -329,7 +329,7 @@ export default {
         {
           with: 200,
           text: "确定",
-          backgroundColor: "linear-gradient(90deg, #258feb 0%, #E2F5FA 100%)",
+          backgroundColor: "linear-gradient(90deg, #3C77BE 0%,#258feb 100%)",
           color: "#fff",
         },
       ],
@@ -567,7 +567,7 @@ export default {
         vipBuyConfigId: this.dataInfo.id,
         come: 2, //订单来源，0疯子读书1国学众妙之门2医学吴门医述
 
-        // appName: "medicine",
+        // appName: "wumen",
       };
 
       console.log("data at line 477:", data);

pages/mine/wallet/jf/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <view class="commonPageBox">
+  <view class="commonPageBox" style="height: 100vh">
     <!-- 公共组件-每个页面必须引入 -->
     <public-module></public-module>
     <z-nav-bar title="我的积分" bgColor="" fontColor="#000000"> </z-nav-bar>
@@ -22,12 +22,11 @@
           > -->
         </view>
         <!-- :style="`height:calc(100vh - ${(120 + statusBarHeight) * 2}rpx)`" -->
-  
+
         <view style="padding: 30rpx; padding-top: 0">
           <view class="AC_con">
             <view class="AC_jilu PM_font">积分记录</view>
             <common-list
-           
               :dataList="MoneyRecord"
               isCondition="true"
               isNoIcon="true"
@@ -326,7 +325,7 @@ export default {
 <style lang="scss" scoped>
 @import "@/style/mixin.scss";
 .commonPageBox {
-  background-color: #DBEFF9;
+  background-color: #dbeff9;
   // background-image: url("@/static/icon/mine_bg.png");
   // background-repeat: no-repeat;
   // background-size: 100% 100%;
@@ -386,7 +385,7 @@ export default {
     .AC_jilu {
       font-size: 42rpx;
       text-align: left;
-      color:#3D75BF ;
+      color: #3d75bf;
       //   background-image: linear-gradient(90deg, #258feb 20%, #c3fade 100%);
       //   margin-bottom: 30rpx;
       padding: 10rpx 20rpx 40rpx;

pages/mine/wallet/recharge/index.vue

@@ -203,7 +203,7 @@
 				// });
 
 
-				var data = await this.$commonJS.getAgreement(104);
+				var data = await this.$commonJS.getAgreement(106);
 				if (data.content) {
 					data.content = data.content.replace(
 						/<h5>/g,
@@ -473,7 +473,7 @@
 						realMoney: that.stepsCj.money * 1, //实收金额
 						orderStatus: 0, //订单状态
 						orderType: "point", //订单类型
-						appName: "medicine",
+						appName: "wumen",
 						come: "2",
 						productId: that.stepsCj.priceTypeId, // 充值的类型id
 					};

pages/taihu/index.vue

@@ -162,9 +162,10 @@
 		},
 		//方法
 		methods: {
-			proClick(item) {
+			proClick(v) {
 				uni.navigateTo({
-					url: `/pages/bookShop/commodityDetail?id=${item.productId}&title=${item.productName}`
+					url: `/pages/goods/index/index?navTitle=${v.title}&title=${v.title}&id=${v.productId}`,
+					// url: `/pages/bookShop/commodityDetail?id=${item.productId}&title=${item.productName}`
 				});
 			},
 			newsClick(item) {

uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue

@@ -5,7 +5,7 @@
 			<view class="uni-share-content-box">
 				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
 					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
-					<text class="uni-share-text" style="color: #777;">{{item.text}}</text>
+					<text class="uni-share-text">{{item.text}}</text>
 				</view>
 
 			</view>
@@ -40,27 +40,25 @@
 		data() {
 			return {
 				bottomData: [{
-						text: '微信好友',
+						text: '微信',
-						icon: '@/static/haoyou.png',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
-						// icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
 						name: 'wx'
 					},
 					{
-						text: '微信朋友圈',
+						text: '支付宝',
-						// icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
-						icon: '@/static/quan.png',
 						name: 'wx'
 					},
-					// {
+					{
-					// 	text: 'QQ',
+						text: 'QQ',
-					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
-					// 	name: 'qq'
+						name: 'qq'
-					// },
+					},
-					// {
+					{
-					// 	text: '新浪',
+						text: '新浪',
-					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
-					// 	name: 'sina'
+						name: 'sina'
-					// },
+					},
 					// {
 					// 	text: '百度',
 					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
@@ -139,7 +137,7 @@
 		/* #endif */
 		flex-direction: row;
 		flex-wrap: wrap;
-		// width: 360px;
+		width: 360px;
 	}
 
 	.uni-share-content-item {