From 1e766f08d6f43349b4b588b321aeec765f3a1e52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=8B=E4=BA=8E=E5=88=9D=E8=A7=81?= <752204717@qq.com>
Date: Thu, 20 Jun 2024 14:16:36 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E8=AE=A2=E5=8D=95+=E6=88=91?=
 =?UTF-8?q?=E7=9A=84+vip+=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85=EF=BC=88?=
 =?UTF-8?q?=E5=9F=BA=E7=A1=80=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 at.alicdn.com/t/font_533566_yfq2d9wdij.eot    |    0
 components/z-navigation/z-navigation.vue      |   12 +-
 config/utils.js                               |    2 +-
 pages.json                                    |   34 +-
 pages/bookShop/commodityDetail copy.vue       |  630 +++++
 pages/bookShop/commodityDetail.vue            |    8 +-
 pages/bookShop/deliverDetail.vue              |    2 +-
 pages/bookShop/orderLCont.vue                 |    2 +-
 pages/bookShop/settlement.vue                 |   23 +-
 pages/bookShop/settlementBook.vue             |   19 +-
 .../commonComponents/address/edit.vue         |    4 +-
 .../commonComponents/address/index.vue        |    2 +-
 pages/goods/index/index.vue                   | 2129 +++++++++++++++
 pages/goods/order/index.vue                   | 2304 +++++++++++++++++
 pages/mine/mine/index.vue                     |   14 +-
 pages/mine/vip/order.vue                      |   18 +-
 pages/mine/wallet/jf/index.vue                |    9 +-
 pages/mine/wallet/recharge/index.vue          |    4 +-
 pages/taihu/index.vue                         |    5 +-
 static/icon/course_ic.png                     |  Bin 0 -> 1685 bytes
 static/icon/home_icon_3.png                   |  Bin 24844 -> 0 bytes
 static/icon/ic_agreed.png                     |  Bin 4632 -> 1669 bytes
 static/icon/ic_gender_unselected.png          |  Bin 4385 -> 2704 bytes
 static/icon/jifen.png                         |  Bin 0 -> 6382 bytes
 static/icon/tel.png                           |  Bin 9166 -> 9833 bytes
 .../uni-popup-share/uni-popup-share.vue       |   34 +-
 26 files changed, 5168 insertions(+), 87 deletions(-)
 create mode 100644 at.alicdn.com/t/font_533566_yfq2d9wdij.eot
 create mode 100644 pages/bookShop/commodityDetail copy.vue
 create mode 100644 pages/goods/index/index.vue
 create mode 100644 pages/goods/order/index.vue
 create mode 100644 static/icon/course_ic.png
 delete mode 100644 static/icon/home_icon_3.png
 create mode 100644 static/icon/jifen.png

diff --git a/at.alicdn.com/t/font_533566_yfq2d9wdij.eot b/at.alicdn.com/t/font_533566_yfq2d9wdij.eot
new file mode 100644
index 0000000..e69de29
diff --git a/components/z-navigation/z-navigation.vue b/components/z-navigation/z-navigation.vue
index 8d5db07..03012e6 100644
--- a/components/z-navigation/z-navigation.vue
+++ b/components/z-navigation/z-navigation.vue
@@ -80,12 +80,12 @@ export default {
           selectedIconPath: "static/tab/icon1_y.png",
           text: "首页",
         },
-        {
-          pagePath: "pages/peanut/shopping",
-          iconPath: "static/tab/tab_nor_02.png",
-          selectedIconPath: "static/tab/tab_cur_02.png",
-          text: "购物车",
-        },
+        // {
+        //   pagePath: "pages/peanut/shopping",
+        //   iconPath: "static/tab/tab_nor_02.png",
+        //   selectedIconPath: "static/tab/tab_cur_02.png",
+        //   text: "购物车",
+        // },
         {
           pagePath: "pages/taihu/index",
           iconPath: "static/tab/tab_nor_03.png",
diff --git a/config/utils.js b/config/utils.js
index a715cec..43c0498 100644
--- a/config/utils.js
+++ b/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'
diff --git a/pages.json b/pages.json
index 7074500..d615283 100644
--- a/pages.json
+++ b/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",
-				"iconPath": "static/tab/tab_nor_02.png",
-				"selectedIconPath": "static/tab/tab_cur_02.png",
-				"text": "购物车"
-			},
+			// {
+			// 	"pagePath": "pages/peanut/shopping",
+			// 	"iconPath": "static/tab/tab_nor_02.png",
+			// 	"selectedIconPath": "static/tab/tab_cur_02.png",
+			// 	"text": "购物车"
+			// },
 			{
 				"pagePath": "pages/taihu/index",
 				"iconPath": "static/tab/tab_nor_03.png",
diff --git a/pages/bookShop/commodityDetail copy.vue b/pages/bookShop/commodityDetail copy.vue
new file mode 100644
index 0000000..ee206b2
--- /dev/null
+++ b/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>
diff --git a/pages/bookShop/commodityDetail.vue b/pages/bookShop/commodityDetail.vue
index b1da978..07131ba 100644
--- a/pages/bookShop/commodityDetail.vue
+++ b/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) {
diff --git a/pages/bookShop/deliverDetail.vue b/pages/bookShop/deliverDetail.vue
index 7ea8a47..664b372 100644
--- a/pages/bookShop/deliverDetail.vue
+++ b/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    // 过期时间
diff --git a/pages/bookShop/orderLCont.vue b/pages/bookShop/orderLCont.vue
index fe65762..d11f3c6 100644
--- a/pages/bookShop/orderLCont.vue
+++ b/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>
diff --git a/pages/bookShop/settlement.vue b/pages/bookShop/settlement.vue
index c4b0866..92f0063 100644
--- a/pages/bookShop/settlement.vue
+++ b/pages/bookShop/settlement.vue
@@ -635,8 +635,7 @@
 					orderStatus: 0, //订单状态
 					productList: xiaBiao, //订单列表商品
 					orderType: "order", //订单类型
-					addressId: this.adressMoRen.id, // 地址ID
-					jfDeduction:0,//积分抵扣
+					addressId: this.adressMoRen.id // 地址ID
 				}
 				$http.request({
 					// url: "book/buyOrder/buySave",
@@ -674,9 +673,9 @@
 											title: "支付成功"
 										});
 										setTimeout(() => {
-											uni.navigateTo({
-												url: '/pages/bookShop/orderList'
-											});	
+											uni.switchTab({
+												url: './orderList'
+											});
 											// uni.navigateTo({
 											// 	url: './orderList'
 											// });
@@ -708,9 +707,9 @@
 											title: "支付成功"
 										});
 										setTimeout(() => {
-											uni.navigateTo({
-												url: '/pages/bookShop/orderList'
-											});	
+											uni.switchTab({
+												url: './orderList'
+											});
 										}, 1000)
 									} else {
 										console.log(res)
@@ -733,12 +732,12 @@
 								// 天医币支付
 								uni.showToast({
 									title: "购买成功",
-									icon: "success"								
+									icon: "success"
 								});
 								setTimeout(() => {
-									uni.navigateTo({
-										url: '/pages/bookShop/orderList'
-									});									
+									uni.switchTab({
+										url: './orderList'
+									});
 								}, 1000)
 							}
 						}
diff --git a/pages/bookShop/settlementBook.vue b/pages/bookShop/settlementBook.vue
index 795dc6a..291e32b 100644
--- a/pages/bookShop/settlementBook.vue
+++ b/pages/bookShop/settlementBook.vue
@@ -661,9 +661,9 @@
 										title: "支付成功"
 									});
 									setTimeout(() => {
-										uni.navigateTo({
-											url: '/pages/bookShop/orderList'
-										});	
+										uni.switchTab({
+											url: './orderList'
+										});
 										// uni.navigateTo({
 										// 	url: './orderList'
 										// });
@@ -695,9 +695,9 @@
 											title: "支付成功"
 										});
 										setTimeout(() => {
-											uni.navigateTo({
-												url: '/pages/bookShop/orderList'
-											});	
+											uni.switchTab({
+												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({
-										url: '/pages/bookShop/orderList'
-									});									
+									uni.switchTab({
+										url: './orderList'
+									});
 								}, 1000)
 							}
 						}
diff --git a/pages/component/commonComponents/address/edit.vue b/pages/component/commonComponents/address/edit.vue
index 421684d..25ece08 100644
--- a/pages/component/commonComponents/address/edit.vue
+++ b/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",
 				}, ],
 			};
diff --git a/pages/component/commonComponents/address/index.vue b/pages/component/commonComponents/address/index.vue
index e7421c3..4da5069 100644
--- a/pages/component/commonComponents/address/index.vue
+++ b/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",
         },
       ],
diff --git a/pages/goods/index/index.vue b/pages/goods/index/index.vue
new file mode 100644
index 0000000..f9e3bda
--- /dev/null
+++ b/pages/goods/index/index.vue
@@ -0,0 +1,2129 @@
+<template>
+  <view class="container commonPageBox commonDetailPage">
+    <!-- 公共组件-每个页面必须引入 -->
+    <public-module></public-module>
+    <z-nav-bar title="商品详情" bgColor="#258feb" fontColor="#fff"></z-nav-bar>
+
+    <view
+      class="contentBox commonPageContentBox"
+      v-if="!this.$store.state.loadingShow"
+    >
+      <!-- :indicator-dots="true" -->
+      <swiper
+        :autoplay="true"
+        :interval="3000"
+        :duration="1000"
+        style="width: 100%; height: 750rpx; background-color: #f5f5f5"
+      >
+        <swiper-item
+          v-for="(item, index) in swiperList"
+          :key="index"
+          style="width: 100%; height: 100%"
+        >
+          <!-- <image :src="curriculumData.explainsImg" mode="widthFix" class="headImage"></image> -->
+          <image
+            :src="item"
+            mode="aspectFit"
+            style="width: 100%; height: 100%"
+            @click="previewImage(item)"
+          >
+          </image>
+        </swiper-item>
+      </swiper>
+
+      <view class="goods_box">
+        <view class="curriulum_title_box">
+          <view v-if="this.options.isMiaosha==1" class="miaosha_box">
+            <view class="price_box">
+              <view class="price_left">
+                <template
+                  v-if="
+                    curriculumData.activityPrice &&
+                    curriculumData.activityPrice > 0
+                  "
+                >
+                  <text class="aui-text-danger price">
+                    ￥{{ curriculumData.activityPrice }}
+                  </text>
+                  <text class="price original_price"
+                    >原价：￥{{ curriculumData.price }}
+                  </text>
+                </template>
+                <template v-else>
+                  <text class="aui-text-danger price">
+                    ￥{{ curriculumData.price }}
+                  </text>
+                </template>
+
+                <view class="price original_price sales_number"
+                  >已售 {{ curriculumData.sumSales }}件
+                </view>
+              </view>
+
+              <view class="xianshimaiosha_box">
+                <text class="xianshimaiosha">秒杀商品</text>
+
+                <!-- <view class="countdown">
+
+                                    <text style="margin-right: 8rpx;">距结束</text>
+                                    <uni-countdown :day="1" :hour="2" :minute="30" :second="0" color="#FFFFFF"
+                                        :font-size="12" backgroundColor="#000" />
+                                </view> -->
+              </view>
+            </view>
+
+            <view class="curriulum_title"
+              >{{ curriculumData.productName }}
+            </view>
+          </view>
+          <view v-else class="normal_box">
+            <view class="price_box">
+              <template
+                v-if="
+                  curriculumData.activityPrice &&
+                  curriculumData.activityPrice > 0
+                "
+              >
+                <text class="aui-text-danger price">
+                  ￥{{ curriculumData.activityPrice }}
+                </text>
+                <text class="price original_price"
+                  >原价：￥{{ curriculumData.price }}
+                </text>
+              </template>
+              <template v-else>
+                <text class="aui-text-danger price">
+                  ￥{{ curriculumData.price }}
+                </text>
+              </template>
+              <text
+                class="price original_price sales_number"
+                style="float: right"
+                >已售 {{ curriculumData.sumSales }}件
+              </text>
+            </view>
+
+            <view class="curriulum_title" style="margin-top: 40rpx;"
+              >{{ curriculumData.productName }}
+            </view>
+          </view>
+
+          <view class="price_box"> </view>
+        </view>
+      </view>
+
+      <template>
+        <common-sticky
+          label="title"
+          :itemStyle="`width:${
+            cateList.length == 2 ? '50' : '33'
+          }%;padding-left: 15px; padding-right: 15px; height: 68rpx;`"
+          :list="cateList"
+          :currentCateIndex="currentCateIndex"
+          @handleselectCate="handleselectCate"
+        >
+        </common-sticky>
+      </template>
+
+      <!-- <view :class="`priceDetail`" v-if="this.statusList[this.currentStatusIndex].type == 'price'">
+
+                <scroll-view scroll-y="true" class="scroll-Y">
+                    <price ref="priceDetail" type="price" :oid="this.statusList[this.currentStatusIndex].oid"></price>
+
+                </scroll-view>
+
+
+
+
+            </view>
+            <view :class="`priceDetail`" v-else-if="this.statusList[this.currentStatusIndex].type == 'purchaseNotice'">
+
+                <scroll-view scroll-y="true" class="scroll-Y">
+                    <price ref="purchaseNotice" :oid="this.statusList[this.currentStatusIndex].oid"></price>
+
+                </scroll-view>
+
+
+
+
+            </view>
+ -->
+
+      <view :class="`dataList `">
+        <view
+          class="goods_detail_list_title bg_box_shandow color_shandow bg_color PM_font"
+          style="background-color: #C7E9FB"
+        >
+          <view class="left" style="color: #258feb;">
+            <u-icon
+              name="grid"
+              color="#258feb"
+              size="23"
+              style="display: inline-block; margin-right: 10rpx"
+            ></u-icon>
+            商品规格</view
+          >
+
+          <text class="right" @click="openPopup"
+            >共{{ goodsList.length }}种商品可选择</text
+          >
+        </view>
+        <common-goods-list
+          imgUrl="url"
+          isNoIcon
+          imgMode="aspectFit"
+          class="color_shandow"
+          defaultUrl=""
+          :isCondition="true"
+          :dataList="goodsList"
+          @hancleClick="selectGoods"
+          label="title"
+        >
+          <template slot="labelSlot" slot-scope="slotProps">
+            <!-- isSelectGoods -->
+            <view
+              class="related_courses_name goodsList"
+              :class="`goods_item ${
+                selectGoodsData &&
+                selectGoodsData.productId == slotProps.row.productId
+                  ? ''
+                  : ''
+              }`"
+            >
+              <view class="image_box">
+                <image
+                  :src="slotProps.row.productImages"
+                  mode="aspectFit"
+                  class="goods_image"
+                ></image>
+              </view>
+            </view>
+
+            <!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
+          </template>
+
+          <!-- <template slot="rightSlot" slot-scope="slotProps">
+
+                        <view v-if="slotProps.row.surplusNum" class="related_courses_right">
+
+
+                            <view class="progress_icon" style=""><u-line-progress activeColor="#258feb" height="14"
+                                    :percentage="30" :showText="false" showText></u-line-progress></view>
+                            <view
+                                :class="slotProps.row.surplusNum < 30 ? 'aui-text-danger dateReminder' : 'dateReminder'">
+                                距&nbsp;{{ slotProps.row.surplusNum }}&nbsp;天到期</view>
+
+                        </view>
+                        <view v-if="slotProps.row.inType == '03'" class="fdButtonBox">
+
+
+                            <u-button type="primary" :plain="true" text="复读一月" :customStyle="fdButtonStyle" size="small"
+                                @click.native.stop="fnRelearn(slotProps.row.inType, 30, slotProps.row.courseFee)"></u-button>
+                            <u-button type="primary" :plain="true" text="复读三月" :customStyle="fdButtonStyle" size="small"
+                                @click.native.stop="fnRelearn(slotProps.row.inType, 90, slotProps.row.courseFee)"></u-button>
+
+                        </view>
+
+                        <view>
+
+
+                        </view>
+
+                    </template> -->
+        </common-goods-list>
+      </view>
+      <view :class="`dataList parameterList`" v-if="booksList.length > 0">
+        <view
+          class="goods_detail_list_title bg_box_shandow color_shandow bg_color PM_font"
+        >
+          <view class="left" style="color:#3C77BE !important">
+            <u-icon
+              name="list"
+              color="#3C77BE"
+              size="23"
+              style="display: inline-block; margin-right: 10rpx"
+            ></u-icon>
+            书籍信息</view
+          >
+        </view>
+
+        <common-list
+          imgUrl="url"
+          isNoIcon
+          imgMode="aspectFit"
+          class="color_shandow parameter_box book_box"
+          defaultUrl=""
+          :isCondition="true"
+          :dataList="booksList"
+          label="title"
+        >
+          <template slot="labelSlot" slot-scope="slotProps">
+            <!-- isSelectGoods -->
+            <view class="related_courses_name" :class="`goods_item `">
+              <view class="image_box" style="margin-right: 10rpx">
+                <image
+                  :src="slotProps.row.images"
+                  mode="aspectFit"
+                  class="goods_image"
+                ></image>
+              </view>
+              <view :class="`goods_info `">
+                <view class="name">
+                  <text style="color: #333"> {{ slotProps.row.name }}</text>
+                </view>
+              </view>
+            </view>
+
+            <!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
+          </template>
+        </common-list>
+      </view>
+      <view :class="`dataList parameterList`" v-if="coursesList.length > 0">
+        <view
+          class="goods_detail_list_title bg_box_shandow color_shandow bg_color PM_font"
+        >
+          <view class="left" style="color: #018f89 !important">
+            <u-icon
+              name="list"
+              color="#018F89"
+              size="23"
+              style="display: inline-block; margin-right: 10rpx"
+            ></u-icon>
+            课程信息</view
+          >
+        </view>
+
+        <common-list
+          imgUrl="url"
+          isNoIcon
+          imgMode="aspectFit"
+          class="color_shandow parameter_box"
+          defaultUrl=""
+          :isCondition="true"
+          :dataList="coursesList"
+          label="title"
+        >
+          <template slot="labelSlot" slot-scope="slotProps">
+            <!-- isSelectGoods -->
+            <view class="related_courses_name" :class="`goods_item `">
+              <view class="image_box" style="margin-right: 10rpx">
+                <image
+                  :src="slotProps.row.images"
+                  mode="aspectFit"
+                  class="goods_image"
+                ></image>
+              </view>
+              <view :class="`goods_info `">
+                <view class="name">
+                  <text style="color: #333"> {{ slotProps.row.title }}</text>
+                </view>
+              </view>
+            </view>
+
+            <!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
+          </template>
+        </common-list>
+      </view>
+
+      <u-divider
+        text="商品参数"
+        :hairline="true"
+        textColor="#333"
+        lineColor="#b0b0b0"
+      ></u-divider>
+      <view class="parameter_info_box">
+        <common-list
+          imgUrl="url"
+          isNoIcon
+          imgMode="aspectFit"
+          class="parameter_box parameter_info"
+          defaultUrl=""
+          :isCondition="true"
+          :dataList="parameterList"
+          @hancleClick="selectGoods"
+          label="name"
+        >
+          <template slot="labelSlot" slot-scope="slotProps">
+            <!-- isSelectGoods -->
+            <view
+              class="related_courses_name"
+              :class="`goods_item ${
+                selectGoodsData &&
+                selectGoodsData.productId == slotProps.row.productId
+                  ? ''
+                  : ''
+              }`"
+            >
+              <view :class="`goods_info `">
+                <view class="name">
+                  <text style="color: #333"> {{ slotProps.row.name }}：</text>
+                  <text v-if="slotProps.row.isTime">
+                    {{ slotProps.row.value | formatDate }}</text
+                  >
+                  <text v-else> {{ slotProps.row.value }}</text>
+                </view>
+              </view>
+            </view>
+
+            <!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
+          </template>
+
+          <!-- <template slot="rightSlot" slot-scope="slotProps">
+
+                        <view v-if="slotProps.row.surplusNum" class="related_courses_right">
+
+
+                            <view class="progress_icon" style=""><u-line-progress activeColor="#258feb" height="14"
+                                    :percentage="30" :showText="false" showText></u-line-progress></view>
+                            <view
+                                :class="slotProps.row.surplusNum < 30 ? 'aui-text-danger dateReminder' : 'dateReminder'">
+                                距&nbsp;{{ slotProps.row.surplusNum }}&nbsp;天到期</view>
+
+                        </view>
+                        <view v-if="slotProps.row.inType == '03'" class="fdButtonBox">
+
+
+                            <u-button type="primary" :plain="true" text="复读一月" :customStyle="fdButtonStyle" size="small"
+                                @click.native.stop="fnRelearn(slotProps.row.inType, 30, slotProps.row.courseFee)"></u-button>
+                            <u-button type="primary" :plain="true" text="复读三月" :customStyle="fdButtonStyle" size="small"
+                                @click.native.stop="fnRelearn(slotProps.row.inType, 90, slotProps.row.courseFee)"></u-button>
+
+                        </view>
+
+                        <view>
+
+
+                        </view>
+
+                    </template> -->
+        </common-list>
+      </view>
+
+      <u-divider
+        text="商品详情"
+        :hairline="true"
+        textColor="#333"
+        lineColor="#b0b0b0"
+      ></u-divider>
+      <view class="small_class_teaching_box" style="background-color: #B7E0E2">
+        <view class="common_divider divider_box"> </view>
+
+        <common-rich-detail :detailInfo="detailInfo" style="padding: 10rpx">
+          <template #richHeadImg>
+            <!-- <image :src="curriculumData.imgUrl" mode="widthFix" class="headImage"></image> -->
+
+            <!-- <image :src="detailInfo.imgUrl" v-if="detailInfo.imgUrl" mode="widthFix" class="headImage"></image> -->
+          </template>
+        </common-rich-detail>
+
+        <!-- <view class="small_class_teaching_top">
+                    <view class="small_class_teaching_top_left">
+                        <image src="@/static/icon/course_ic.png" mode="aspectFil" class="icon1"></image>
+                        <text>小班教学</text>
+                    </view>
+                    <text>{{ curriculumInfo.remainingDays }}</text>
+
+
+                </view> -->
+        <view class="small_class_teaching_content">
+          <!-- <view class="top">
+                        <view class="top_item" v-for="(v, i) in teachingList">
+                            {{ v.title }}
+
+
+                        </view>
+
+
+                    </view> -->
+
+          <!-- <view class="schedule">
+
+                        <view class="icon_box">
+                            <image src="@/static/icon/course_07.png" mode="aspectFil" class="icon1">学习进度</image>
+
+
+                        </view>
+                        <view class="progress_box">
+                            <view class="progress_icon" style=""><u-line-progress activeColor="#258feb" height="18"
+                                    :percentage="30" :showText="false" showText></u-line-progress></view>
+                            <image src="@/static/icon/curriculum_05.png" mode="aspectFil" class="icon1" />
+                            <image src="@/static/icon/curriculum_07.png" mode="aspectFil" class="icon2" />
+                        </view>
+
+                    </view> -->
+        </view>
+      </view>
+
+      <view
+        class="small_class_teaching_box related_courses_box"
+        v-if="relatedCoursesList.length > 0"
+      >
+        <view class="small_class_teaching_top">
+          <view class="small_class_teaching_top_left">
+            <image
+              src="@/static/icon/course_ic.png"
+              mode="aspectFil"
+              class="icon1"
+            ></image>
+            <text>相关课程</text>
+          </view>
+        </view>
+        <view class="small_class_teaching_content">
+          <common-curriculum-list
+            imgUrl="url"
+            :isCondition="true"
+            :dataList="relatedCoursesList"
+            @hancleClick="goCourseDescription"
+            label="title"
+          >
+            <template slot="labelSlot" slot-scope="slotProps">
+              <view class="related_courses_name hidden1">{{
+                slotProps.row.title
+              }}</view>
+
+              <!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
+            </template>
+
+            <template slot="rightSlot" slot-scope="slotProps">
+              <!-- {{ slotProps.row.bxType }} -->
+
+              <text class="aui-text-danger">
+                ￥{{ slotProps.row.courseFee }}</text
+              >
+
+              <view> </view>
+            </template>
+          </common-curriculum-list>
+        </view>
+      </view>
+    </view>
+    <view class="goods_nav_box" v-if="!this.$store.state.loadingShow">
+      <uni-goods-nav
+        :fill="true"
+        :options="buyOptions"
+        :button-group="customButtonGroup1"
+        @click="onHandleClickBuy"
+        @buttonClick="onHandleClickBuy1"
+      />
+    </view>
+    <!-- 
+    <u-modal
+      :show="show"
+      :title="modalInfo.title"
+      :content="modalInfo.content"
+      showCancelButton
+      @confirm="hancleModalConfirm"
+      @cancel="hancleModalCancel"
+    ></u-modal> -->
+    <common-select-goods
+      ref="commonSelectGoods"
+      :selectGoodsData="selectGoodsData"
+      :goodsList="goodsList"
+      :buyOptions="buyOptions"
+      :customButtonGroup1="customButtonGroup1"
+      @selectGoods="selectGoods"
+      @onHandleClickBuy="onHandleClickBuy"
+    ></common-select-goods>
+     <u-popup
+      :show="showInfo"
+      mode="bottom"
+      @close="closeShowInfo"
+      class="popup_box"
+    >
+      <view class="popup_top">
+        <view class="product_image">
+          <image
+            :src="selectGoodsData.productImages"
+            mode="aspectFit"
+            class="goods_image"
+          ></image>
+        </view>
+        <view class="title">已选：{{ selectGoodsData.productName }}</view>
+      </view>
+
+      <view :class="`common_radius_box  goods_box popup_content`">
+        <view class="title title_box"
+          ><text class="title_price">￥{{ selectGoodsData.price }}</text
+          ><u-icon
+            name="close"
+            color="#333"
+            size="18"
+            @click="close"
+            style="display: inline-block"
+          ></u-icon
+        ></view>
+        <view class="title title_list"
+          ><text>商品列表（{{ goodsList.length }}）</text></view
+        >
+
+        <common-list
+          imgUrl="url"
+          isNoIcon
+          imgMode="aspectFit"
+          defaultUrl=""
+          :isCondition="true"
+          :dataList="goodsList"
+          @hancleClick="selectGoods"
+          label="title"
+        >
+          <template slot="labelSlot" slot-scope="slotProps">
+            <!-- isSelectGoods -->
+            <view
+              class="related_courses_name"
+              :class="`goods_item ${
+                selectGoodsData &&
+                selectGoodsData.productId == slotProps.row.productId
+                  ? 'isSelectGoods color_shandow'
+                  : ''
+              }`"
+            >
+              <view class="image_box" style="margin-right: 10rpx">
+                <image
+                  :src="slotProps.row.productImages"
+                  mode="aspectFit"
+                  class="goods_image"
+                ></image>
+              </view>
+
+              <view :class="`goods_info `">
+                <view class="name">{{ slotProps.row.productName }}</view>
+                <view class="price" style="color: #258feb">{{
+                  slotProps.row.price
+                }}</view></view
+              >
+            </view>
+
+            <!-- <text v-if="slotProps.row.conditions!='03'">【试听】</text> -->
+          </template>
+        </common-list>
+
+        <view class="goods_nav_box">
+          <uni-goods-nav
+            :fill="true"
+            :options="buyOptions"
+            :button-group="customButtonGroup1"
+            @click="onHandleClickBuy"
+            @buttonClick="onHandleClickBuy"
+          />
+        </view>
+        <!-- <view>
+          <text @click="handleClickClose">取消</text>
+          <text @click="handleClickGoBuy">立即购买</text>
+        </view>-->
+      </view>
+    </u-popup>
+    
+  </view>
+</template>
+
+<script>
+import courseDescription from "@/pages/component/commonComponents/list";
+
+import $http from "@/config/requestConfig.js";
+import { mapState } from "vuex";
+export default {
+  components: {
+    courseDescription, //课程说明
+  },
+  data() {
+    return {
+      detailInfo: {},
+      showInfo: false,
+      selectGoodsData: {},
+      parameterList: [],
+      booksList: [],
+      coursesList: [],
+      buyOptions: [
+        // {
+        // 		icon: 'chat',
+        // 		text: '客服'
+        // 	},
+        // {
+        //   icon: "shop",
+        //   text: "店铺",
+        //   // info: 2,
+        //   infoBackgroundColor: "#007aff",
+        //   infoColor: "#f5f5f5",
+        // },
+        //  {
+        // 	icon: 'cart',
+        // 	text: '购物车',
+        // 	info: 2
+        // }
+      ],
+
+      swiperList: [],
+      goodsList: [],
+      options: {},
+      relatedCoursesList: [], //相关课程
+      curriculumData: {},
+      curriculumInfo: {},
+      detailInfo: {},
+      fdButtonStyle: {
+        width: "120rpx",
+        "border-color": "#258feb",
+        color: "#258feb",
+        float: "right",
+        "margin-right": "20rpx",
+        "margin-left": "30rpx",
+      },
+      modalInfo: {},
+
+      show: false,
+      playData: {},
+      taiHuClassInfo: {},
+      searchValue: "",
+      teachingList: [
+        {
+          title: "临床实践",
+
+          type: "02",
+          apiUrl: "app/phoneDoctor.do?getTaiHuToShine",
+        },
+        {
+          title: "学习问答",
+          type: "03",
+          oid: "8a9fb99809e4428888aad6b56a3096a6",
+        },
+        {
+          title: "学习心得",
+
+          type: "01",
+        },
+        {
+          title: "在线作业",
+
+          type: "04",
+          oid: "d0f47071c2194e94845fbb373d06f59d",
+        },
+      ], // 一级分类标题1
+      cateList: [], // 一级分类标题1
+      twoCateList: [], // 二级分类标题
+      dataList: [], // 方剂标题
+      allDataList: [], // 方剂标题
+      currentStatusIndex: 0, // 当前选中的一级分类
+      currentCateIndex: 0, // 当前选中的一级分类
+      curTwoCateIndex: 0, // 当前选中的二级分类
+      searchList: [], // 搜索结果数组
+      showSearchList: false,
+      userMes: {}, // 用户信息
+      searchDisable: false, // 搜索不可用
+      limitShow: false,
+      limitTitle: "提示",
+      limitContent: "",
+      scrollViewHeight: 0,
+      urlList: {
+        list: "app/phone.do?getCourseDetail_new",
+        curriculumInfo: "app/phone.do?getCourseInfo",
+        detailInfo: "sociology/product/getProductDetail",
+        goodsList: "book/shopproduct/getGlProductList",
+      },
+      customButtonGroup1: [
+        {
+          with: 200,
+          text: "立即购买",
+          backgroundColor: "linear-gradient(90deg, #FE6035, #EF1224)",
+          color: "#fff",
+        },
+      ],
+    };
+  },
+  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;
+    },
+  },
+  onLoad(options) {
+    this.options = options;
+
+    // this.handleClickGetGoodsList();
+    // this.getUserInfo()
+    // this.getCateList()
+  },
+  onHide() {
+    this.selectGoodsData = {};
+    this.$refs.commonSelectGoods.close();
+    // this.showSearchList = false
+    // this.searchList = []
+  },
+  onUnload() {
+    this.selectGoodsData = {};
+    this.$refs.commonSelectGoods.close();
+    this.show = false;
+    // this.showSearchList = false
+    // this.searchList = []
+  },
+  onShow() {
+    this.selectGoodsData = {};
+    this.getCourseDescriptionData();
+    this.show = false;
+  },
+  computed: {
+    ...mapState(["userInfo"]),
+  },
+  methods: {
+    closeShowInfo() {
+      this.showInfo = false;
+    },
+    openBookInfo() {
+      this.showInfo = true;
+    },
+    openPopup() {
+      // this.selectGoodsData = this.goodsList[0];
+      this.$refs.commonSelectGoods.open()
+      // this.show = true;
+      this.$forceUpdate();
+    },
+    close() {
+      this.show = false;
+    },
+    selectGoods(data) {
+      this.selectGoodsData = data;
+      this.$refs.commonSelectGoods.open()
+      // this.show = true;
+      this.$forceUpdate();
+    },
+
+    onHandleClickBuy1() {
+      this.$refs.commonSelectGoods.open();
+      // this.show = true;
+    },
+    onHandleClickBuy() {
+      console.log(
+        this.selectGoodsData,
+        "this.selectGoodsDatathis.selectGoodsDatathis.selectGoodsData"
+      );
+      var mynavData = JSON.stringify({
+        goods: [
+          {
+            productImages: this.selectGoodsData.productImages,
+            productId: this.selectGoodsData.productId,
+            productName: this.selectGoodsData.productName,
+            price: this.selectGoodsData.activityPrice?this.selectGoodsData.activityPrice:this.selectGoodsData.price,
+            goodsType: this.selectGoodsData.goodsType,
+          },
+        ],
+
+        navTitle: this.options.navTitle,
+        title: this.options.title,
+        typeId: 0,
+      }); // 这里转换成 字符串
+
+      uni.navigateTo({
+        url: `/pages/goods/order/index?data=${mynavData}`,
+      });
+      // uni.navigateTo({
+      //     // url: '../bookShop/commodityDetail?id=' + item.id
+      //     url: `/pages/goods/order/index?navTitle=${this.options.navTitle}&title=${this.options.title}&oid=${this.options.oid}&conditions=${this.options.conditions}&detailOid=${this.options.detailOid}`
+      // })
+    },
+    buttonClick(e) {
+      console.log(e);
+      this.options[2].info++;
+    },
+
+    hancleModalConfirm() {
+      var data = {
+        values: {
+          customerType: "D",
+          token: uni.getStorageSync("token"),
+          customerOid: uni.getStorageSync("customerOid"),
+          ...this.taiHuClassInfo,
+        },
+      };
+      // $mars.progressBegin('申请中...');
+      // $mars.post(customerType, 'applyRelearn', data, function (ret) {
+      //     api.hideProgress();
+
+      //     fnLoadDataGrid();
+      // });
+    },
+    fnRelearn(oid, days, courseFee) {
+      //99和199课程复读一个月60三个月120; 299和399课程复读一个月80三个月180
+      //499和599课程复读一个月90三个月220; 699和799课程复读一个月100三个月248
+      var feeAs = [
+        [60, 120],
+        [80, 180],
+        [90, 220],
+        [100, 248],
+      ];
+      var fee = 0;
+      if (courseFee < 206) {
+        fee = feeAs[0][days == 30 ? 0 : 1];
+      } else if (courseFee < 406) {
+        fee = feeAs[1][days == 30 ? 0 : 1];
+      } else if (courseFee < 606) {
+        fee = feeAs[2][days == 30 ? 0 : 1];
+      } else {
+        fee = feeAs[3][days == 30 ? 0 : 1];
+      }
+      this.modalInfo = {
+        title: "提示信息",
+        content:
+          "用户您好，该课程已到期，通过支付" +
+          fee +
+          "元，本门课程可获得" +
+          days +
+          "天延期学习时间，点击确认即完成自动扣费，感谢配合！",
+      };
+
+      this.taiHuClassInfo = {
+        taiHuClassOid: oid,
+        days: days,
+        fee: fee,
+      };
+      this.show = true;
+      // $aui.alert({
+      //     title: ,
+      //     content: '用户您好，该课程已到期，通过支付' + fee + '元，本门课程可获得' + days + '天延期学习时间，点击确认即完成自动扣费，感谢配合！',
+      //     buttons: ['取消', '确认'],
+      //     radius: 6,
+      //     titleColor: '#ff3300',
+      //     contColor: '#333',
+      //     btnColor: ''
+    },
+    //课程详情
+    async gotoDetail(v) {
+      console.log(v);
+
+      var result = await this.$commonJS.getCheckCourseStatus({
+        oid: v.courseOid,
+      });
+      console.log("result at line 364:", result);
+
+      if (result.buyFlg == 0 && v.conditions != "01") {
+        this.$commonJS.showToast("请先购买课程");
+        return;
+      }
+
+      uni.navigateTo({
+        // url: '../bookShop/commodityDetail?id=' + item.id
+        url: `/pages/curriculum/order/curriculum/detail?navTitle=${v.title}&title=${v.title}&oid=${v.courseOid}&conditions=${v.conditions}&detailOid=${v.detailOid}`,
+      });
+    },
+    //相关课程
+    goCourseDescription(v) {
+      console.log(v);
+      uni.navigateTo({
+        // url: '../bookShop/commodityDetail?id=' + item.id
+        url: `/pages/curriculum/order/curriculum/index?navTitle=${v.title}&title=${v.title}&oid=${v.oid}`,
+      });
+    },
+    async getCourseDescriptionData() {
+      var data = {};
+      var that = this;
+
+      this.$http
+        .request({
+          url: this.urlList.detailInfo,
+          method: "POST",
+          data: {
+            productId: this.options.id,
+          },
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+
+        .then(async (res) => {
+          that.selectGoodsData = res.data.GLProducts[0];
+          that.curriculumData = res.data.detail;
+          that.booksList = res.data.books ? res.data.books : [];
+          that.coursesList = res.data.courses ? res.data.courses : [];
+          that.goodsList = res.data.GLProducts;
+
+          that.parameterList = [];
+          if (that.curriculumData.productName) {
+            that.parameterList.push({
+              name: "书名",
+              value: that.curriculumData.productName,
+            });
+          }
+          if (that.curriculumData.author) {
+            that.parameterList.push({
+              name: "作者",
+              value: that.curriculumData.author,
+            });
+          }
+          if (that.curriculumData.publisher) {
+            that.parameterList.push({
+              name: "出版社",
+              value: that.curriculumData.publisher,
+            });
+          }
+          if (that.curriculumData.pubDate) {
+            that.parameterList.push({
+              name: "出版时间",
+              value: that.curriculumData.pubDate,
+              isTime: true,
+            });
+          }
+          if (that.curriculumData.format) {
+            that.parameterList.push({
+              name: "开本",
+              value: that.curriculumData.format,
+            });
+          }
+          if (that.curriculumData.pageNum) {
+            that.parameterList.push({
+              name: "页数",
+              value: that.curriculumData.pageNum,
+            });
+          }
+          if (that.curriculumData.quality) {
+            that.parameterList.push({
+              name: "内文用纸材质",
+              value: that.curriculumData.quality,
+            });
+          }
+
+          if (
+            that.curriculumData.productImageList == null ||
+            that.curriculumData.productImageList == ""
+          ) {
+            this.swiperList.push(that.curriculumData.explainsImg);
+          } else {
+            that.swiperList = that.curriculumData.productImageList.split(",");
+            // for (var i = 0; i < imgList.length; i++) {
+            // 	this.swiperList.push(imgList[i])
+            // }
+          }
+
+          this.detailInfo = {
+            content: this.curriculumData.productDetails,
+          };
+        });
+    },
+    getPriceData() {
+      var that = this;
+      setTimeout(() => {
+        that.$nextTick(() => {
+          that.$refs.priceDetail.getData();
+        });
+      }, 100);
+    },
+    // 检查是有权限使用搜索功能
+    checkDisable() {
+      console.log("点击了");
+    },
+    // 显示无权限弹窗
+    // showNoRights() {
+    // 	let that = this
+    // 	uni.showModal({
+    // 		content: "",
+    // 		confirmText: '好的',
+    // 		showCancel: false,
+    // 		success: function(res) {
+    // 			if (res.confirm) {
+    // 				// console.log('用户点击确定');
+    // 				that.clear()
+    // 			}
+    // 		}
+    // 	})
+    // },
+    // 获取用户详情
+    getUserInfo() {
+      // 用户详情
+      if (this.userInfo.id != undefined) {
+        this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
+          this.userMes = res.user;
+          this.getCateList();
+          console.log(this.userMes, "呼呼");
+        });
+      }
+    },
+
+    async handleselectCate(item, index) {
+      this.dataList = [];
+      var data = [];
+      console.log(item, index, 99999);
+      var that = this;
+
+      // curriculumInfo
+
+      this.$http
+        .post(this.urlList.curriculumInfo, {
+          customerType: "D",
+          token: uni.getStorageSync("token"),
+          customerOid: uni.getStorageSync("customerOid"),
+          oid: item.coid,
+        })
+        .then(async (res) => {
+          that.curriculumInfo = res.obj;
+          that.dataList = res.obj.courseList;
+
+          // socket.init();
+        });
+
+      // this.$nextTick(() => {
+      //     switch (item.type) {
+      //         case 1:
+      //             // allDataList
+      //             this.dataList = that.allDataList.result1Lst
+      //             break;
+      //         case 2:
+      //             this.dataList = that.allDataList.result2Lst
+      //             break;
+      //         case 3:
+      //             this.dataList = that.allDataList.result3Lst
+      //             break;
+      //         case 4:
+      //             this.dataList = that.allDataList.result4Lst.filter(e =>
+      //                 e.oid != '5fcf991c027b11e7ae62008cfae40c18' && e.oid != 'b3d8a938b8e147bc877613bb712a9cb3' && e.oid != '4d4730163135420ea962bfac4805e026' && e.oid != '49fb76ca3d6b43718d78c6aa9a3003c2' && e.oid != 'c7b047ed9246469b9ae2b1013fc3df9c'
+
+      //             )
+
+      //             console.log(this.dataList.length, 6666666)
+      //             break;
+
+      //     }
+
+      //     this.currentCateIndex = item.index
+      // })
+      console.log(this.allDataList, this.dataList, "1688");
+      // if(this.userMes.tgdzPower == 0){
+      // 	let that = this
+      // 	uni.showModal({
+      // 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
+      // 		confirmText: '好的',
+      // 		showCancel: false,
+      // 		success: function(res) {
+      // 			if (res.confirm) {
+      // 				// console.log('用户点击确定');
+      // 			}
+      // 		}
+      // 	})
+      // 	return
+      // }
+      // if(item.title == "时辰取穴"){
+      // 	uni.navigateTo({
+      // 		url: "../timeAcupoint/timeAcupoint"
+      // 	})
+      // 	return
+      // }
+
+      // this.currentStatusIndex = index
+
+      this.searchValue = "";
+      this.searchList = [];
+      this.showSearchList = false;
+      // if (index != 2) {
+
+      // uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) {
+      // 	var height = rect.height
+      // 	console.log('元素高度：',);
+
+      // }).exec();
+
+      // } else {
+      // 	this.getJFList(dictType)
+      // }
+
+      return data;
+    },
+    async getDetailInfo() {
+      var that = this;
+
+      // curriculumInfo
+
+      // this.$nextTick(() => {
+      //     switch (item.type) {
+      //         case 1:
+      //             // allDataList
+      //             this.dataList = that.allDataList.result1Lst
+      //             break;
+      //         case 2:
+      //             this.dataList = that.allDataList.result2Lst
+      //             break;
+      //         case 3:
+      //             this.dataList = that.allDataList.result3Lst
+      //             break;
+      //         case 4:
+      //             this.dataList = that.allDataList.result4Lst.filter(e =>
+      //                 e.oid != '5fcf991c027b11e7ae62008cfae40c18' && e.oid != 'b3d8a938b8e147bc877613bb712a9cb3' && e.oid != '4d4730163135420ea962bfac4805e026' && e.oid != '49fb76ca3d6b43718d78c6aa9a3003c2' && e.oid != 'c7b047ed9246469b9ae2b1013fc3df9c'
+
+      //             )
+
+      //             console.log(this.dataList.length, 6666666)
+      //             break;
+
+      //     }
+
+      //     this.currentCateIndex = item.index
+      // })
+      console.log(this.allDataList, this.dataList, "1688");
+      // if(this.userMes.tgdzPower == 0){
+      // 	let that = this
+      // 	uni.showModal({
+      // 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
+      // 		confirmText: '好的',
+      // 		showCancel: false,
+      // 		success: function(res) {
+      // 			if (res.confirm) {
+      // 				// console.log('用户点击确定');
+      // 			}
+      // 		}
+      // 	})
+      // 	return
+      // }
+      // if(item.title == "时辰取穴"){
+      // 	uni.navigateTo({
+      // 		url: "../timeAcupoint/timeAcupoint"
+      // 	})
+      // 	return
+      // }
+
+      // this.currentStatusIndex = index
+
+      this.searchValue = "";
+      this.searchList = [];
+      this.showSearchList = false;
+      // if (index != 2) {
+
+      // uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) {
+      // 	var height = rect.height
+      // 	console.log('元素高度：',);
+
+      // }).exec();
+
+      // } else {
+      // 	this.getJFList(dictType)
+      // }
+
+      return data;
+    },
+    async setOneCateIndex(item, index) {
+      this.allDataList = [];
+      console.log(index, 99999);
+      var that = this;
+
+      // if(this.userMes.tgdzPower == 0){
+      // 	let that = this
+      // 	uni.showModal({
+      // 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
+      // 		confirmText: '好的',
+      // 		showCancel: false,
+      // 		success: function(res) {
+      // 			if (res.confirm) {
+      // 				// console.log('用户点击确定');
+      // 			}
+      // 		}
+      // 	})
+      // 	return
+      // }
+      // if(item.title == "时辰取穴"){
+      // 	uni.navigateTo({
+      // 		url: "../timeAcupoint/timeAcupoint"
+      // 	})
+      // 	return
+      // }
+
+      this.currentStatusIndex = index;
+      // this.currentCateIndex = 0
+
+      this.searchValue = "";
+      this.searchList = [];
+      this.showSearchList = false;
+      this.$nextTick(async () => {
+        await that.getCourseDescriptionData();
+
+        this.$forceUpdate();
+      });
+
+      // this.handleselectCate(this.cateList[this.currentCateIndex])
+      // if (index != 2) {
+
+      // uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) {
+      // 	var height = rect.height
+      // 	console.log('元素高度：',);
+
+      // }).exec();
+
+      // } else {
+      // 	this.getJFList(dictType)
+      // }
+    },
+
+    transformData(inputData) {
+      const result = {};
+      inputData.forEach((item) => {
+        const { letter } = item;
+        if (!result[letter]) {
+          result[letter] = [];
+        }
+        result[letter].push(item);
+      });
+      // const finalResult = Object.keys(result).map(key => ({ [key]: result[key] }));
+      return result;
+    },
+    // getJFList(id) {
+    // 	$http.request({
+    // 		url: "book/prescript/prescriptListForJF",
+    // 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+    // 		data: {
+    // 			loadAnimate: 'none', // 请求加载动画
+    // 			'categoryId': id
+    // 		},
+    // 		header: { //默认 无 说明：请求头
+    // 			'Content-Type': 'application/json'
+    // 		},
+    // 	}).then(res => {
+    // 		if (res.code == 0 && res.list.length > 0) {
+    // 			this.twoCateList = []
+    // 			this.dataList = this.transformData(res.list)
+    // 			console.log('JF经方', this.dataList)
+    // 		} else {
+    // 			this.twoCateList = []
+    // 			this.dataList = []
+    // 		}
+    // 	}).catch(e => {
+    // 		this.twoCateList = []
+    // 		this.dataList = []
+    // 		console.log(e)
+    // 	})
+    // },
+    getCateList(id) {
+      id ? "" : (id = 0);
+      this.twoCateList = [];
+      this.curTwoCateIndex = 0;
+      // 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级
+      // $http.request({
+      // 	url: "book/prescript/prescriptCategoryList",
+      // 	method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+      // 	data: {
+      // 		loadAnimate: 'none', // 请求加载动画
+      // 		'categoryId': id
+      // 	},
+      // 	header: { //默认 无 说明：请求头
+      // 		'Content-Type': 'application/json'
+      // 	},
+      // }).then(res => {
+      // console.log(res, '脉穴分类获取成功')
+      // if (res.code == 0 && res.list.length > 0) {
+      // this.statusList = res.list
+      // this.getTowCateList(this.statusList[0].type)
+      // } else {
+      // 	this.statusList = []
+      // }
+      // }).catch(e => {
+      // 	this.statusList = []
+      // 	console.log(e)
+      // })
+    },
+
+    // 放大图片
+    previewImage(url) {
+      console.log(url);
+      uni.previewImage({
+        urls: [url],
+        longPressActions: {
+          itemList: ["很抱歉，暂不支持保存图片到本地"],
+          success: function (res) {
+            // console.log(res,'+++++')
+          },
+        },
+      });
+    },
+    // getSearch() {
+    // 	$http.request({
+    // 		url: "book/prescript/searchPrescript",
+    // 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+    // 		data: {
+    // 			loadAnimate: 'none', // 请求加载动画
+    // 			'keywords': this.searchValue,
+    // 			type: this.currentStatusIndex + 1
+    // 		},
+    // 		header: { //默认 无 说明：请求头
+    // 			'Content-Type': 'application/json'
+    // 		},
+    // 	}).then(res => {
+    // 		console.log(res, '搜索结果')
+    // 		if (res.code == 0 && res.list.length >= 0) {
+    // 			this.showSearchList = true
+    // 			this.searchList = res.list
+    // 		} else {
+    // 			this.searchList = []
+    // 		}
+    // 	}).catch(e => {
+    // 		// this.dataList = []
+    // 		this.searchList = []
+    // 		console.log(e)
+    // 	})
+    // },
+    // search(res) {
+    // 	console.log(res, 'res')
+    // 	// uni.showToast({
+    // 	// 	title: '搜索：' + res,
+    // 	// 	icon: 'none'
+    // 	// })
+    // 	if (res == '') {
+    // 		this.showSearchList = false
+    // 		this.searchList = []
+    // 	} else {
+    // 		this.getSearch()
+    // 	}
+
+    // },
+    // input(res) {
+    // 	console.log('----input:', res)
+    // 	if (res == '') {
+    // 		this.searchList = []
+    // 	} else {
+    // 		this.getSearch()
+    // 	}
+    // },
+    // clear(res) {
+    // 	console.log('----clear:', res)
+    // 	// uni.showToast({
+    // 	// 	title: 'clear事件，清除值为：',
+    // 	// 	icon: 'none'
+    // 	// })
+    // 	this.searchValue = ''
+    // 	this.showSearchList = false
+    // },
+    // blur(res) {
+    // 	// console.log('----blur:', res)
+    // 	// if (res == '') {
+    // 	// 	this.showSearchList = false
+    // 	// 	this.searchList = []
+    // 	// } else {
+    // 	// 	this.getSearch()
+    // 	// }
+    // },
+    // focus(e) {
+    // 	console.log('----focus:')
+    // 	// uni.showToast({
+    // 	// 	title: 'focus事件，输出值为：' + e.value,
+    // 	// 	icon: 'none'
+    // 	// })
+    // 	// 等于1 就是有权限
+    // 	// this.showSearchList = true
+
+    // },
+    // cancel(res) {
+    // 	uni.showToast({
+    // 		title: '点击取消，输入值为：' + res.value,
+    // 		icon: 'none'
+    // 	})
+    // }
+  },
+  onBackPress() {
+    // #ifdef APP-PLUS
+    plus.key.hideSoftKeybord();
+    // #endif
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import '@/style/mixin.scss';
+.u-grid-list {
+  // height: 40rpx;
+}
+
+.searchList {
+  .item {
+    font-size: 28rpx;
+    padding: 20rpx;
+    border-bottom: 1px solid #dadbde;
+  }
+}
+
+.scroll-view_H {
+  background-color: #fff;
+  white-space: nowrap;
+  padding: 10rpx;
+}
+
+.contentBox {
+  height: calc(100% - 50px);
+
+  .statusList {
+    padding: 10rpx;
+    box-sizing: border-box;
+    justify-content: space-between;
+
+    text {
+      text-align: center;
+      display: inline-block;
+      width: 32%;
+      padding: 20rpx 0;
+      font-size: 34rpx;
+      border-radius: 10rpx;
+    }
+
+    .cur {
+      background-color: $themeColor;
+      color: #fff;
+      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    }
+  }
+
+  .twoCateList {
+    font-size: 28rpx;
+    margin-top: 20rpx;
+
+    .grid-text {
+      padding: 10rpx 0rpx;
+      text-align: center;
+    }
+
+    .cur {
+      color: $themeColor;
+    }
+
+    // .u-grid-list{border: 0.5px solid #dadbde;}
+  }
+
+  .dataList {
+    font-size: 26rpx;
+    padding-bottom: 40rpx;
+    // margin-top: 20rpx;
+    // padding: 32rpx 0rpx;
+    border-radius: 10rpx;
+    background-color: #fff;
+    box-sizing: border-box;
+
+    .JFtitleItem {
+      background-color: #ffffff;
+      padding: 20rpx 10rpx;
+      width: 100%;
+      border-bottom: 0.5px solid #f8f9fa;
+    }
+
+    .wmzhimg {
+      width: 220rpx;
+      height: 220rpx;
+    }
+  }
+}
+
+.search_box {
+  margin: 0 auto;
+  overflow: hidden;
+  align-items: center;
+  width: calc(100% - 10px);
+  margin-top: 20rpx;
+  margin-bottom: 20rpx;
+
+  .search {
+    height: 56upx;
+    display: flex;
+    width: 86%;
+    margin: 0 auto;
+    align-items: center;
+    padding: 0upx 40upx;
+    background-color: #fff;
+    border-radius: 20upx;
+    box-shadow: 0 0px 10px 1px #258feb33;
+  }
+
+  .prompt {
+    color: #838383;
+    font-size: 24rpx;
+  }
+
+  .icon_search {
+    background-image: url("@/static/icon/map_ic_search.png");
+    background-position: center center;
+    background-repeat: no-repeat;
+    background-size: cover;
+    width: 36upx;
+    height: 36upx;
+    margin-right: 20upx;
+  }
+}
+
+.flexbox {
+  display: flex;
+}
+
+.uni-modal .uni-modal__bd {
+  text-align: left;
+}
+
+.limiTy {
+  font-size: 28rpx;
+  line-height: 46rpx;
+}
+
+.chImage {
+  height: 100rpx;
+}
+
+.dataList {
+  height: 100%;
+}
+
+.titleList2 {
+  height: calc(100% - 150rpx);
+}
+
+.priceDetail {
+  height: calc(100% - 180rpx) !important;
+  padding: 0rpx 0;
+  box-sizing: border-box;
+}
+
+.componentPage {
+  height: calc(100% - 90rpx) !important;
+}
+
+.dateReminder {
+  width: 100%;
+  font-size: 24rpx;
+  text-align: right;
+  line-height: 40rpx;
+}
+
+.fdButtonBox {
+  border: 1rpx solid $themeColor;
+  background-color: $themeColor;
+  color: #fff;
+  // width: 100%;
+  float: right;
+  padding: 4rpx 14rpx;
+  font-size: 24rpx;
+  font-weight: 500;
+  line-height: 30rpx;
+  border-radius: 10rpx;
+  box-sizing: border-box;
+
+  // margin-top: 20rpx;
+  // display: flex;
+  // align-items: center;
+}
+
+.headImage {
+  // height: 400rpx !important;
+}
+
+.commonDetailPage {
+  padding-bottom: 150rpx !important;
+  background-color: #f5f5f5 !important;
+}
+
+.goods_box {
+  background-color: #fff;
+  // margin-top: 20rpx;
+  // padding: 40rpx 30rpx;
+  box-sizing: border-box;
+  width: 100%;
+
+  .curriulum_title_box {
+    width: calc(100%) !important;
+    padding-bottom: 20rpx;
+    background-color: #fff;
+
+    .curriulum_title {
+      width: calc(100%);
+      font-weight: 600;
+      font-size: 34rpx;
+      // line-height: 40rpx;
+      //     display: flex;
+      // align-items: center;
+      margin-top: 80rpx;
+      margin-bottom: 0rpx;
+      // padding: 20rpx;
+      box-sizing: border-box;
+    }
+  }
+}
+
+.dataList {
+  background-color: #fff !important;
+  padding: 0 30rpx 40rpx !important;
+  box-sizing: border-box;
+}
+
+/deep/.titleItem {
+  // width: calc(100% - 120rpx) !important;
+}
+
+/deep/.scroll-view-item:nth-child(2n-1) {
+  background-color: transparent !important;
+}
+
+.dataList {
+  height: auto !important;
+}
+
+.small_class_teaching_box {
+  padding-top: 20rpx;
+  width: 100%;
+  margin-top: 20rpx;
+  background: #fff;
+
+  .small_class_teaching_top {
+    padding: 20rpx 20rpx 0 10rpx;
+    box-sizing: border-box;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    // background: #EDFCF7;
+    color: #8f8e8e;
+
+    // box-shadow: 0px 0px 6rpx 0px #E9DCCC;
+    .icon1 {
+      width: 50rpx;
+      height: 50rpx;
+    }
+
+    .small_class_teaching_top_left {
+      display: flex;
+      align-items: center;
+      color: #018f89;
+
+      font-family: MicrosoftYaHei;
+    }
+  }
+
+  .small_class_teaching_content {
+    margin-top: 20rpx;
+    // background: #EDFCF7;
+    padding-bottom: 10rpx;
+
+    .top {
+      padding: 20rpx 20rpx;
+      box-sizing: border-box;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+      border-bottom: 4rpx solid #fff;
+
+      .top_item {
+        width: 23%;
+        font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
+        font-weight: normal;
+        font-size: 34rpx;
+        color: #018f89;
+        line-height: 80rpx;
+        background: #cef8ea;
+        text-align: center;
+        border-radius: 10rpx;
+        box-shadow: 0px 0px 6rpx 0px #E9DCCC;
+      }
+    }
+
+    .schedule {
+      width: 100%;
+      overflow: hidden;
+      padding: 20rpx 20rpx;
+      box-sizing: border-box;
+      align-items: center;
+      color: #018f89;
+
+      font-family: MicrosoftYaHei;
+
+      .icon_box {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        margin-bottom: 0rpx;
+
+        .icon1 {
+          width: 50rpx;
+          height: 50rpx;
+          margin-right: 10rpx;
+        }
+      }
+
+      .progress_box {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        position: relative;
+
+        .progress_icon {
+          width: calc(100% - 240rpx);
+        }
+
+        .icon1 {
+          width: 60rpx;
+          height: 60rpx;
+          margin: 0 20rpx;
+        }
+
+        .icon2 {
+          width: 140rpx;
+          height: 100rpx;
+          position: absolute;
+          right: 0;
+          // margin-top: -20rpx;
+        }
+      }
+    }
+  }
+}
+
+.related_courses_box {
+  background-color: #fff;
+
+  .small_class_teaching_content {
+    padding: 10rpx 20rpx;
+    box-sizing: border-box;
+  }
+}
+
+.related_courses_name {
+  display: inline-block;
+  width: calc(100% - 0rpx) !important;
+
+  .aui-text-danger {
+    display: inline-block;
+    float: right;
+  }
+}
+
+.original_price {
+  font-size: 28rpx !important;
+  font-weight: 500;
+  color: #999 !important;
+  white-space: nowrap;
+  text-decoration: line-through;
+  float: left;
+  margin-top: 6rpx;
+}
+
+.price {
+  font-size: 48rpx;
+  font-weight: 700;
+  float: left;
+  margin-right: 10rpx;
+  // font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
+}
+
+.price_box {
+  width: 100%;
+  overflow: hidden;
+}
+
+.commonTags {
+  margin-right: 20rpx;
+  margin-top: -5rpx !important;
+}
+
+.sales_number {
+  text-decoration: none;
+  color: #b0b0b0;
+  font-weight: 500;
+}
+
+.miaosha_box {
+  overflow: hidden;
+
+  .countdown {
+    display: flex;
+    align-items: center;
+    color: #fff;
+    font-size: 24rpx;
+  }
+
+  .price_left {
+    width: calc(100% - 300rpx);
+    float: left;
+  }
+
+  .price_box {
+    .price {
+      color: #fff !important;
+    }
+
+    .original_price {
+      color: #e4dede !important;
+      font-weight: 500;
+      margin-left: 20rpx;
+      font-size: 26rpx !important;
+    }
+
+    .sales_number {
+      display: block;
+      width: 100%;
+      color: #fff !important;
+      font-weight: 500;
+      padding-left: 10rpx;
+      margin-left: 0rpx;
+      font-size: 24rpx !important;
+    }
+
+    padding: 30rpx 20rpx 30rpx;
+    background: linear-gradient(to right, #ff2701, #fd8d024d);
+    // height: 100rpx;
+  }
+
+  .curriulum_title {
+    padding: 20rpx 40rpx;
+    margin-top: 20rpx !important;
+  }
+}
+
+.normal_box {
+  padding: 40rpx 30rpx;
+}
+
+.xianshimaiosha_box {
+  width: 300rpx;
+  height: 100%;
+  float: right;
+}
+
+.xianshimaiosha {
+  display: inline-block;
+  width: 100%;
+  line-height: 100rpx;
+  font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
+  font-weight: blod;
+  font-size: 64rpx;
+  color: red;
+  text-align: right;
+  padding-right: 20rpx;
+  box-sizing: border-box;
+  font-style: italic;
+}
+
+// .common_curriculum_list{
+
+// }
+/deep/.common_curriculum_list {
+  margin-top: 20rpx;
+  padding: 20rpx 20rpx 20rpx;
+
+  .content_item {
+    width: 100% !important;
+    margin-bottom: 0 !important;
+    padding: 15rpx 0 0rpx;
+    border-top: 1rpx solid #f1f0f0;
+    // height: 160rpx;
+
+    .book_image {
+      width: 60rpx !important;
+      height: 60rpx !important;
+      float: left !important;
+      background-color: #f5f5f5;
+    }
+
+    .common_curriculum_item {
+      width: calc(100% - 88rpx);
+      float: right;
+      display: block !important;
+
+      // overflow: hidden;
+
+      .related_courses_name {
+        width: 100% !important;
+      }
+    }
+  }
+
+  .content_item:nth-child(1) {
+    border-top: none !important;
+  }
+}
+
+/deep/.common_section {
+  padding: 0 !important;
+  padding-bottom: 20rpx !important;
+}
+
+.goods_detail_list_title {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+
+  .left {
+    display: flex;
+    align-items: center;
+  }
+
+  .right {
+    font-size: 24rpx;
+    font-weight: 500 !important;
+    color: #333;
+    font-family: none;
+  }
+
+  // justify-content: space-between;
+}
+
+.commonPageContentBox {
+  height: auto !important;
+}
+
+.goods_item {
+  overflow: hidden;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  // margin-bottom: 20rpx;
+  padding: 10rpx 20rpx;
+  border: 2rpx solid #fff;
+  border-radius: 10rpx;
+}
+.title {
+  box-sizing: border-box;
+  // font-weight: bold;
+  margin-bottom: 40rpx;
+  padding-left: 20rpx;
+}
+.image_box {
+  width: 70rpx;
+  height: 70rpx;
+  float: left;
+  background-color: #f5f5f5;
+}
+
+.goods_image {
+  width: 100%;
+  height: 100%;
+}
+.goods_info {
+  width: calc(100%);
+  // padding: 10rpx 20rpx;
+  box-sizing: border-box;
+  // height: 100rpx;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  float: left;
+  .name {
+    font-size: 26rpx;
+    // font-weight: 600;
+    color: #333;
+  }
+  .price {
+    font-size: 26rpx;
+    color: #aaa;
+  }
+}
+.isSelectGoods {
+  color: $themeColor !important;
+  .name {
+    color: $themeColor !important;
+  }
+  .price {
+    color: $themeColor !important;
+  }
+  border: 2rpx solid $themeColor;
+  border-radius: 10rpx;
+}
+/deep/.list_item {
+  // border-bottom: none;
+  padding: 10rpx 0 !important;
+  padding-right: 0 !important;
+}
+
+
+.parameterList {
+  /deep/.list_item {
+    // border-bottom: none;
+    padding: 0 !important;
+    border: none !important;
+    box-shadow: none !important;
+  }
+  .parameter_box {
+    padding: 20rpx 0;
+  }
+  .goods_item {
+    padding-top: 5rpx !important;
+    padding-bottom: 5rpx !important;
+  }
+}
+.parameter_info_box {
+  padding: 0 20rpx;
+}
+.parameter_info {
+  /deep/.list_item {
+    // border-bottom: none;
+    padding: 0 !important;
+    border: none !important;
+    box-shadow: none !important;
+  }
+  .goods_item {
+    border: none !important;
+  }
+}
+.goodsList {
+  .image_box {
+    width: 80rpx;
+    height: 80rpx;
+    float: left;
+    background-color: #f5f5f5;
+  }
+}
+/deep/.u-popup__content {
+  background-color: transparent !important;
+}
+/deep/.u-popup__content__close {
+  color: #fff !important;
+}
+.title_box {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding-left: 0;
+  .title_price {
+    color: #ef1224;
+    font-size: 40rpx;
+    font-weight: 700;
+  }
+}
+.title_list {
+  margin-bottom: 20rpx;
+}
+
+.book_box {
+  .image_box {
+    width: 160rpx;
+    height: 160rpx;
+  }
+  .goods_info {
+    display: block;
+  }
+}
+</style>
diff --git a/pages/goods/order/index.vue b/pages/goods/order/index.vue
new file mode 100644
index 0000000..76e1900
--- /dev/null
+++ b/pages/goods/order/index.vue
@@ -0,0 +1,2304 @@
+<template>
+  <view class="container commonPageBox commonDetailPage">
+    <!-- 公共组件-每个页面必须引入 -->
+    <public-module></public-module>
+    <z-nav-bar title="确认订单" bgColor="#258feb" fontColor="#fff"></z-nav-bar>
+
+    <view class="contentBox commonPageContentBox order_box">
+      <!-- :indicator-dots="true" -->
+      <!-- <view class="order_top common_radius_box color_shandow">
+                <view class="goods_item">
+                    <image class="goods_item_img" src="http://oss.taihumed.com/other/null_20210528102528870.jpg"
+                        mode="aspectFit" >
+                    </image>
+                </view>
+
+            </view> -->
+      <!-- -->
+
+      <view
+        v-show="isShowAddress"
+        class="order_top common_radius_box color_shandow goods_box address_box"
+        @click="goToAddress"
+      >
+        <u-icon
+          name="map-fill"
+          color="#258feb"
+          size="23"
+          style="display: inline-block; margin-right: 10rpx"
+        ></u-icon>
+        <!-- <view class="curriulum_title_box goods_item"> -->
+
+        <view class="normal_box" v-if="addressData.consigneeName">
+          <view class="normal_box_top">
+            <view class="curriulum_title">{{ addressData.address }} </view>
+            <view class="user_info">
+              <text class="name"> {{ addressData.consigneeName }} </text>
+              <text class="tel"> {{ addressData.consigneePhone }} </text>
+            </view>
+          </view>
+        </view>
+        <view class="normal_box" v-else>
+          <view class="normal_box_top">
+            <view class="curriulum_title">请添加收获地址 </view>
+          </view>
+        </view>
+        <view class="right">
+          <image
+            src="@/static/icon/icon_right.png"
+            class="rightArrow"
+            style=""
+          ></image>
+        </view>
+
+        <!-- </view> -->
+      </view>
+
+      <view class="order_top common_radius_box color_shandow goods_box">
+        <view
+          class="curriulum_title_box goods_item"
+          v-for="(v, i) in goodsDataList"
+        >
+          <image class="goods_item_img" :src="v.productImages" mode="aspectFit">
+          </image>
+          <view class="normal_box">
+            <view class="normal_box_top" style="justify-content: space-between">
+              <view class="curriulum_title">{{ v.productName }} </view>
+              <view class="price_box">
+                <text class="price" style="margin-right: 0">
+                  ￥{{ v.price }}
+                </text>
+              </view>
+            </view>
+
+            <view style="width: 100%; text-align: right">
+              x 1
+              <!-- <u-number-box v-model="number" style="float: right">
+                <view slot="minus" class="minus">
+                  <u-icon name="minus" size="12"></u-icon>
+                </view>
+                <text
+                  slot="input"
+                  style="width: 50px; text-align: center"
+                  class="input"
+                  >{{ number }}</text
+                >
+                <view slot="plus" class="plus">
+                  <u-icon name="plus" color="#333" size="12"></u-icon>
+                </view>
+              </u-number-box> -->
+            </view>
+          </view>
+        </view>
+        <view class="pay_box" style="margin-top: 20rpx">
+          <view
+            @click="openOrderModal(v)"
+            class="curriulum_title_box goods_item pay_item"
+            v-for="(v, i) in orderInfoList"
+          >
+            <view class="top">
+              <view class="left">
+                <text> {{ v.text }}</text>
+              </view>
+              <view class="right" style="display: flex; align-items: center">
+                <text
+                  style="
+                    float: left;
+                    text-align: right;
+                    color: #b0b0b0;
+                    font-size: 24rpx;
+                    display: inline-block;
+                    width: 200rpx;
+                  "
+                  :class="remark ? 'hidden1 hasRemark' : 'hidden1'"
+                >
+                  {{ remark == "" ? v.placeholder : remark }}</text
+                >
+                <image
+                  src="@/static/icon/icon_right.png"
+                  class="rightArrow"
+                  style=""
+                ></image>
+              </view>
+            </view>
+
+            <!-- <radio
+            :value="i"
+            color="#258feb"
+            :checked="selectPayIndex == i ? true : false"
+            @click="radioChange(i)"
+            size="10"
+          /> -->
+          </view>
+        </view>
+      </view>
+
+      <view class="order_top common_radius_box color_shandow goods_box pay_box">
+        <view class="title">价格明细</view>
+
+        <view
+          class="curriulum_title_box goods_item pay_item"
+          v-for="(v, i) in priceBreakdownList"
+        >
+          <view class="top">
+            <view class="left">
+              <image
+                v-if="v.imgUrl"
+                class="pay_item_img"
+                :src="v.imgUrl"
+                mode="aspectFil"
+                :style="v.style"
+              >
+              </image>
+              <u-icon
+                v-if="v.icon"
+                name="map-fill"
+                color="#018F89"
+                size="23"
+                style="display: inline-block"
+              ></u-icon>
+
+              <text> {{ v.text }}</text
+              ><template v-if="v.type == 3">
+                <text style="color: #aaa; margin-left: 10rpx">
+                  (全部积分：{{ initData.user.jf }})</text
+                >
+              </template>
+            </view>
+            <view class="right">
+              <template v-if="v.type == 1"> ￥{{ totalPrice }}</template>
+              <template v-if="v.type == 2">
+                <text>
+                  ￥{{
+                    isShowAddress ? freightNum.toFixed(2) : Number(0).toFixed(2)
+                  }}</text
+                >
+              </template>
+              <template v-if="v.type == 3">
+                <text style="color: #fe6035"> -￥{{ jfNumberShow }}</text>
+              </template>
+            </view>
+          </view>
+
+          <view class="bottom jf_box" v-if="v.type == 3">
+            <view class="jf_box">
+              <text style="color: #258feb; font-weight: 600"
+                >可用积分({{ jfNumberMax }}分)</text
+              >
+              <view class="jf_input">
+                <u--input
+                  type="number"
+                  @input="handleChangejf"
+                  @clear="jfNumber = 0"
+                  :max="jfNumberMax"
+                  v-model="jfNumber"
+                  placeholder="请输入积分"
+                  border="surround"
+                  clearable
+                ></u--input>
+              </view>
+            </view>
+          </view>
+          <!-- <radio
+            :value="i"
+            color="#258feb"
+            :checked="selectPayIndex == i ? true : false"
+            @click="radioChange(i)"
+            size="10"
+          /> -->
+        </view>
+      </view>
+      <view class="order_top common_radius_box color_shandow goods_box pay_box">
+        <view class="title">支付方式</view>
+
+        <view
+          class="curriulum_title_box goods_item pay_item"
+          v-for="(v, i) in payList"
+        >
+          <view :class="isDefaultCurrency && i != 2 ? 'bgGrey top' : 'top'">
+            <view class="left">
+              <image
+                class="pay_item_img"
+                :src="v.imgUrl"
+                mode="aspectFil"
+                :style="v.style"
+              >
+              </image>
+              <template v-if="v.type == 4">
+                <text> {{ v.text }}</text>
+                <text
+                  style="color: #258feb; font-weight: 600; margin-left: 10rpx"
+                >
+                  (余额：{{
+                    initData && initData.user ? initData.user.peanutCoin : 0
+                  }})</text
+                >
+              </template>
+
+              <text v-else> {{ v.text }}</text>
+            </view>
+            <template v-if="isDefaultCurrency">
+              <radio
+                v-if="i == 2"
+                :value="v.value"
+                color="#258feb"
+                :checked="selectPayIndex == i ? true : false"
+                @click="radioChange(i)"
+                size="10"
+              />
+            </template>
+            <template v-else>
+              <radio
+                :value="v.value"
+                color="#258feb"
+                :checked="selectPayIndex == i ? true : false"
+                @click="radioChange(i)"
+                size="10"
+              />
+            </template>
+          </view>
+        </view>
+        <template v-if="selectPayIndex == 2">
+          <view
+            class="goods_detail_list_title bg_box_shandow color_shandow bg_color"
+          >
+            <view
+              class="linlanzhifu"
+              style="
+                width: 100%;
+                overflow: hidden;
+                justify-content: space-between;
+              "
+            >
+              <view class="linlanzhifu">
+                <u-icon
+                  name="error-circle"
+                  color="#018F89"
+                  size="20"
+                  style="display: inline-block; margin-right: 10rpx"
+                ></u-icon>
+                确保您的天医币足够支付
+              </view>
+
+              <text
+                class="fdButtonBox aui-text-danger fdButtonBoxRed"
+                style="float: right"
+                @click="
+                  onPageJump('/pages/mine/wallet/recharge/index?source=order')
+                "
+                >立即充值</text
+              >
+            </view>
+
+            <view class="other_info" style="margin-top: 12rpx">
+              <view class="explain" style="margin-bottom: 10rpx"> 说明 </view>
+              <view class="explain"> 1. 1天医币 = 1元人民币 </view>
+              <view class="explain">
+                2.若有疑问或意见请致电客服
+                <span style="font-size: 15px"
+                  ><u @click="gotoPhone">022-24142321</u></span
+                >
+              </view>
+              <view class="explain">
+                <!-- 3.非中国大陆用户可通过paypal账户支付
+            <br> &nbsp;&nbsp;&nbsp;&nbsp;
+            <account class="aui-text-success" style="text-decoration: underline;" tapmode onclick="fnCopyAccount()">
+                户名：tmrpublishgroup@sina.com
+            </account>
+            （点击复制）
+            <br> &nbsp;&nbsp;&nbsp;&nbsp;请务必备注本软件的用户姓名及电话以便核对信息，我们将于24小时内为您完成充值及升级。 -->
+
+                3.非中国大陆用户可以信用卡支付。简单快捷，推荐使用！
+                支付时使用的信用卡需要带有Visa或MasterCard的标识。请向邮箱
+                <text
+                  @click="fnCopy('publisher@tmrjournals.com', '邮箱')"
+                  class="aui-text-success"
+                  style="text-decoration: underline; color: #258feb"
+                >
+                  publisher@tmrjournals.com
+                </text>
+                （点击复制）发送支付请求，内容需包含：拟购买的课程名称、支付金额、APP注册姓名及手机号码，或者加一路健康客服微信（
+                <text
+                  class="aui-text-success"
+                  @click="fnCopy('yilujiankangkefu', '微信名')"
+                  style="text-decoration: underline; color: #258feb"
+                >
+                  yilujiankangkefu </text
+                >）（点击复制）联系我们，我们将在24小时内向您的邮箱或者微信发送支付链接，根据提示即可完成信用卡支付，无需兑换外币。
+              </view>
+            </view>
+          </view>
+        </template>
+      </view>
+
+      <template>
+        <common-sticky
+          label="title"
+          :itemStyle="`width:${
+            cateList.length == 2 ? '50' : '33'
+          }%;padding-left: 15px; padding-right: 15px; height: 68rpx;`"
+          :list="cateList"
+          :currentCateIndex="currentCateIndex"
+          @handleselectCate="handleselectCate"
+        >
+        </common-sticky>
+      </template>
+
+      <!-- <view :class="`priceDetail`" v-if="this.statusList[this.currentStatusIndex].type == 'price'">
+
+                <scroll-view scroll-y="true" class="scroll-Y">
+                    <price ref="priceDetail" type="price" :oid="this.statusList[this.currentStatusIndex].oid"></price>
+
+                </scroll-view>
+
+
+
+
+            </view>
+            <view :class="`priceDetail`" v-else-if="this.statusList[this.currentStatusIndex].type == 'purchaseNotice'">
+
+                <scroll-view scroll-y="true" class="scroll-Y">
+                    <price ref="purchaseNotice" :oid="this.statusList[this.currentStatusIndex].oid"></price>
+
+                </scroll-view>
+
+
+
+
+            </view>
+ -->
+    </view>
+    <view class="goods_nav_box">
+      <common-goods-nav
+        :iconList="[]"
+        :customButton="customButton"
+        @submit="goBuyJie"
+      >
+        <!-- leftSlot -->
+        <template slot="leftSlot" slot-scope="slotProps">
+          <view class="price_box order_bottom_box"
+            ><text class="number">共{{ number }}件</text>
+            <text class="price"
+              >合计:
+
+              <text class="total">￥{{ actualPayment }}</text>
+            </text>
+          </view>
+        </template>
+      </common-goods-nav>
+
+      <!-- <uni-goods-nav :fill="true" :options="buyOptions" :button-group="customButtonGroup1" @click="onClick"
+                @buttonClick="buttonClick" /> -->
+    </view>
+
+    <!-- <u-modal
+      :show="show"
+      :title="modalInfo.title"
+      :content="modalInfo.content"
+      showCancelButton
+      @confirm="hancleModalConfirm"
+      @cancel="hancleModalCancel"
+    ></u-modal> -->
+    <u-popup :show="show" mode="right">
+      <common-address
+        backState="3000"
+        ref="commonAddress"
+        @fresh="handleFresh"
+        @selectAddress="selectAddress"
+      ></common-address
+    ></u-popup>
+    <!-- @close="closeOrderModalShow" -->
+    <u-popup :show="orderModalShow" mode="bottom" :round="20">
+      <view class="orderModalShow popup_box">
+        <u-icon
+          name="close"
+          color="#333"
+          size="18"
+          @click="closeOrderModalShow"
+          style="
+            display: inline-block;
+            position: absolute;
+            right: 20rpx;
+            top: 20rpx;
+          "
+        ></u-icon>
+        <view v-if="orderModalShowInfo.type == 'remark'">
+          <view class="order_top common_radius_box goods_box">
+            <view class="curriulum_title_box goods_item">
+              <view class="title">订单备注</view>
+              <u--textarea
+                v-model="content"
+                placeholder="选填：给商家留言"
+                count
+                class="textarea"
+              ></u--textarea>
+            </view>
+          </view>
+        </view>
+        <view class="goods_nav_box">
+          <uni-goods-nav
+            :fill="true"
+            :options="[]"
+            :button-group="customButtonGroup1"
+            @click="onHandleClickBuy"
+            @buttonClick="onHandleClickBuy"
+          />
+        </view>
+      </view>
+    </u-popup>
+    <!-- <z-navigation></z-navigation> -->
+  </view>
+</template>
+
+<script>
+import courseDescription from "@/pages/component/commonComponents/list";
+import { setPay, setPayAssign, setWXPay } from "@/config/utils";
+import $http from "@/config/requestConfig.js";
+const { platform } = uni.getSystemInfoSync();
+import { mapState } from "vuex";
+export default {
+  components: {
+    courseDescription, //课程说明
+  },
+  watch: {
+    isDefaultCurrency: {
+      immediate: true,
+      handler(newRoute) {
+        if (this.isDefaultCurrency) {
+          if (platform == "ios") {
+            this.selectPayIndex = 2;
+          } else {
+            this.selectPayIndex = 2;
+          }
+        } else {
+          if (platform == "ios") {
+            this.selectPayIndex = 1;
+          } else {
+            this.selectPayIndex = 1;
+          }
+        }
+        this.payType = this.payList[this.selectPayIndex].type;
+        this.$forceUpdate();
+      },
+    },
+  },
+  data() {
+    return {
+      isDefaultCurrency: false,
+      isShowAddress: false,
+      jfNumber: 0,
+      totalPrice: 0,
+      actualPayment: 0,
+      jfNumberShow: "",
+      jfNumberMax: 0,
+      goodsDataList: [],
+      orderModalShowInfo: {},
+      orderModalShow: false,
+      payType: 2,
+      freightNum: 0,
+      addressData: {
+        address: "",
+        consigneeName: "",
+        consigneePhone: "",
+      },
+      selectPayIndex: 1,
+      farePrice: 0,
+      payList: [
+        {
+          text: "支付宝",
+          imgUrl: require("@/static/icon/pay_1.png"),
+          type: 2,
+          value: "0",
+        },
+        {
+          text: "微信",
+          imgUrl: require("@/static/icon/pay_2.png"),
+          type: 1,
+          value: "1",
+        },
+        {
+          text: "天医币",
+          imgUrl: require("@/static/icon/pay_3.png"),
+          type: 4,
+          value: "2",
+        },
+      ],
+      priceBreakdownList: [],
+      orderInfoList: [
+        {
+          text: "订单备注",
+          placeholder: "点击填写订单备注",
+          imgUrl: "",
+          type: "remark",
+        },
+      ],
+      number: 1,
+      detailInfo: {},
+      content: "",
+      remark: "",
+      iconList: [],
+
+      swiperList: [],
+      options: {},
+      relatedCoursesList: [], //相关课程
+      curriculumData: {},
+      curriculumInfo: {},
+      detailInfo: {},
+      fdButtonStyle: {
+        width: "120rpx",
+        "border-color": "#258feb",
+        color: "#258feb",
+        float: "right",
+        "margin-right": "20rpx",
+        "margin-left": "30rpx",
+      },
+      modalInfo: {},
+      currentCateIndex: 0,
+      show: false,
+      playData: {},
+      initData: {},
+      taiHuClassInfo: {},
+      searchValue: "",
+      teachingList: [
+        {
+          title: "临床实践",
+
+          type: "02",
+          apiUrl: "app/phoneDoctor.do?getTaiHuToShine",
+        },
+        {
+          title: "学习问答",
+          type: "03",
+          oid: "8a9fb99809e4428888aad6b56a3096a6",
+        },
+        {
+          title: "学习心得",
+
+          type: "01",
+        },
+        {
+          title: "在线作业",
+
+          type: "04",
+          oid: "d0f47071c2194e94845fbb373d06f59d",
+        },
+      ], // 一级分类标题1
+      cateList: [], // 一级分类标题1
+      twoCateList: [], // 二级分类标题
+      dataList: [], // 方剂标题
+      defaultAddressList: {},
+      allDataList: [], // 方剂标题
+      currentStatusIndex: 0, // 当前选中的一级分类
+
+      curTwoCateIndex: 0, // 当前选中的二级分类
+      searchList: [], // 搜索结果数组
+      showSearchList: false,
+      userMes: {}, // 用户信息
+      searchDisable: false, // 搜索不可用
+      limitShow: false,
+      limitTitle: "提示",
+      goToInfo: {},
+      limitContent: "",
+      scrollViewHeight: 0,
+      urlList: {
+        list: "app/phone.do?getCourseDetail_new",
+        initPrepareOrder: "common/buyOrder/initPrepareOrder",
+        // buyOrder: "book/buyOrder/placeOrder",
+        buyOrder: "book/buyOrder/placeOrder",
+        curriculumInfo: "app/phone.do?getCourseInfo",
+        detailInfo: "app/phoneDoctor.do?getTaiHuClassInfo_new",
+        addressList: "common/userAddress/getUserAddress",
+        freightNum: "book/buyOrder/calculateTransportPrice", //运费
+      },
+      customButton: [
+        {
+          width: "340rpx",
+          text: "立即支付",
+          backgroundColor: "linear-gradient(90deg,  #3C77BE 0%,#258feb 100%)",
+          color: "#fff",
+        },
+      ],
+      customButtonGroup1: [
+        {
+          with: 200,
+          text: "确定",
+          backgroundColor: "linear-gradient(90deg,  #3C77BE 0%,#258feb 100%)",
+          color: "#fff",
+        },
+      ],
+    };
+  },
+  async onLoad(options) {
+    console.log("调用了onLoad方法");
+    var that = this;
+    console.log("options at line 387:", options);
+    this.options = JSON.parse(options.data);
+    // if (this.options.goods.findIndex((e) => e.goodsType == "05") >= 0) {
+    //   this.isShowAddress = false;
+    // } else {
+    //   this.isShowAddress = true;
+    // }
+    this.goodsDataList = this.options.goods;
+    if (this.options.sourceType == "curriculum") {
+      this.goToInfo = {
+        url: "/pages/curriculum/order/index/index",
+        type: 2,
+      };
+    } else {
+      this.goToInfo = {
+        url: "/pages/bookShop/orderList",
+        type: 1,
+      };
+    }
+    that.initPrepareOrder();
+    console.log("this.options at line 375:", this.options, this.goToInfo);
+
+    // this.getUserInfo()
+    // this.getCateList()
+  },
+
+  onHide() {
+    // this.showSearchList = false
+    // this.searchList = []
+  },
+  async onShow() {
+    console.log("调用了onShow方法");
+    var that = this;
+    await uni.$on("returnData", function (data) {
+      console.log("data at line 415:", data);
+      if (data) {
+        that.addressData = {
+          ...data,
+          address: `${data.province}${data.city}${data.county}${data.detailAddress}`,
+          consigneeName: data.consigneeName,
+          consigneePhone: data.consigneePhone,
+        };
+        that.$forceUpdate();
+
+        that.getUserAddress();
+      } else {
+        console.log("没有接受到数据");
+      }
+    });
+    // this.selectPayIndex = 0;
+
+    console.log("this.addressData at line 416:", this.addressData);
+  },
+  computed: {
+    ...mapState(["userInfo"]),
+  },
+  methods: {
+    handleChangejf(val) {
+      console.log("val at line 653:", val);
+      var value = val;
+      this.$nextTick(() => {
+        if (val == 0) {
+          this.jfNumber = 0;
+          this.jfNumberShow = "0.00";
+        } else {
+          if (value >= this.jfNumberMax) {
+            value = this.jfNumberMax;
+
+            this.$forceUpdate();
+          } else {
+          }
+          // value = value.replace(/[^\d]/g, "");
+          this.jfNumber = Number(value);
+          this.jfNumberShow = this.jfNumber.toFixed(2);
+        }
+
+        this.actualPayment = this.totalPrice - this.jfNumber + this.freightNum;
+
+        if (this.actualPayment == 0) {
+          this.isDefaultCurrency = true;
+        } else {
+          this.isDefaultCurrency = false;
+        }
+        console.log(
+          "this.isDefaultCurrency at line 692:",
+          this.isDefaultCurrency
+        );
+        this.$forceUpdate();
+      });
+    },
+    onHandleClickBuy() {
+      this.orderModalShow = false;
+      this.remark = this.content;
+    },
+    closeOrderModalShow() {
+      if (this.orderModalShowInfo.type == "remark") {
+        this.content = "";
+      }
+      this.orderModalShow = false;
+    },
+    onPageJump(url) {
+      console.log(url, "url");
+      uni.navigateTo({
+        url: url,
+      });
+    },
+    // 获取订单初始话
+    async initPrepareOrder() {
+      this.priceBreakdownList = [
+        {
+          text: "商品总价",
+          imgUrl: "",
+          type: 1,
+        },
+        {
+          text: "运费",
+          imgUrl: "",
+          type: 2,
+        },
+      ];
+      // this.goodsDataList
+      console.log("this.goodsDataList at line 595:", this.goodsDataList);
+
+      var data = {
+        uid: this.userInfo.id,
+        productList: this.goodsDataList.map((e) => {
+          return {
+            productId: e.productId,
+            quantity: 1,
+          };
+        }),
+      };
+
+      var that = this;
+
+      this.$http
+        .request({
+          // url: "book/buyOrder/buySave",
+          url: `${this.urlList.initPrepareOrder}`,
+          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+          data,
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+
+        .then(async (res) => {
+          console.log("res at line 374:", res);
+          if (res.code == 0) {
+            this.initData = res.data;
+
+            this.isShowAddress = res.data.is_course ? false : true;
+            if (!this.isShowAddress) {
+              this.priceBreakdownList.push({
+                text: "积分",
+                imgUrl: require("@/static/icon/jifen.png"),
+                type: 3,
+              });
+            }
+
+            if (this.isShowAddress) {
+              await this.getUserAddress();
+            } else {
+              await this.getTotalPrice();
+            }
+          }
+
+          this.$forceUpdate();
+
+          // await that.getDetailInfo();
+        });
+    },
+    // 获取地址列表
+    async getUserAddress() {
+      console.log("this.userInfo.id at line 368:", this.userInfo.id);
+      var data = {};
+
+      var that = this;
+
+      this.$http
+        .request({
+          // url: "book/buyOrder/buySave",
+          url: `${this.urlList.addressList}?userId=${this.userInfo.id}`,
+          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+          data,
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+
+        .then(async (res) => {
+          console.log("res at line 374:", res);
+          if (res.code == 0) {
+            if (res.list.length > 0) {
+              var index = res.list.findIndex((e) => e.isDefault == 1);
+              console.log("index at line 37711111111111111111111111:", index);
+              if (index >= 0) {
+                that.defaultAddressList = {
+                  ...res.list[index],
+
+                  address: `${res.list[index].province}${res.list[index].city}${
+                    res.list[index].county
+                  }${
+                    res.list[index].detailAddress
+                      ? res.list[index].detailAddress
+                      : ""
+                  }`,
+                };
+              } else {
+                console.log(that.defaultAddressList, "11111111111111");
+                that.defaultAddressList = {
+                  ...res.list[0],
+                  address: `${res.list[0].province}${res.list[0].city}${
+                    res.list[0].county
+                  }${
+                    res.list[0].detailAddress ? res.list[0].detailAddress : ""
+                  }`,
+                };
+              }
+            } else {
+              this.defaultAddressList = {};
+            }
+          }
+          if (!this.addressData.id) {
+            this.addressData = this.defaultAddressList;
+          }
+          console.log("this.addressData at line 742:", this.addressData);
+          await this.getFreightNum();
+          this.$forceUpdate();
+
+          // await that.getDetailInfo();
+        });
+    },
+
+    //获取运费
+    async getFreightNum() {
+      console.log("this.userInfo.id at line 368:", this.userInfo.id);
+      var data = {
+        products: this.goodsDataList.map((e) => {
+          return {
+            productId: e.productId,
+            quantity: 1,
+          };
+        }),
+        regionCode: this.addressData.regionCode,
+      };
+
+      var that = this;
+
+      this.$http
+        .request({
+          // url: "book/buyOrder/buySave",
+          url: `${this.urlList.freightNum}`,
+          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+          data,
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+
+        .then(async (res) => {
+          console.log("res at line 37411:", res);
+          if (res.code == 0) {
+            this.freightNum = res.result;
+          }
+          await this.getTotalPrice();
+          this.$forceUpdate();
+
+          // await that.getDetailInfo();
+        });
+    },
+    handleFresh() {
+      this.show = false;
+    },
+    async getReturnData() {},
+    getTotalPrice() {
+      var s = 0;
+      var that = this;
+      for (var i = this.goodsDataList.length - 1; i >= 0; i--) {
+        s += this.goodsDataList[i].price ? this.goodsDataList[i].price : 0;
+      }
+      that.totalPrice = s;
+      // ！
+      if (!this.isShowAddress) {
+        if (this.initData.user.jf >= that.totalPrice) {
+          this.jfNumber = that.totalPrice;
+          this.jfNumberMax = that.totalPrice;
+        } else {
+          this.jfNumber = this.initData.user.jf;
+          this.jfNumberMax = this.initData.user.jf;
+        }
+        if (that.jfNumber == 0 || that.jfNumber == null) {
+          that.jfNumberShow = "0.00";
+          that.actualPayment = that.totalPrice;
+        } else {
+          that.jfNumberShow = that.jfNumber.toFixed(2);
+          that.actualPayment = that.totalPrice - that.jfNumber;
+        }
+        that.actualPayment = that.actualPayment + that.freightNum;
+      } else {
+        that.actualPayment = that.totalPrice + that.freightNum;
+      }
+
+      if (this.actualPayment == 0 && !this.isShowAddress) {
+        this.isDefaultCurrency = true;
+      } else {
+        this.isDefaultCurrency = false;
+      }
+      this.$forceUpdate();
+    },
+    selectAddress(data) {
+      this.show = false;
+    },
+    goToAddress() {
+      uni.navigateTo({
+        url: "/pages/component/commonComponents/address/index?type=order",
+      });
+      // this.show = true;
+      // this.$nextTick(() => {
+      //   this.$refs.commonAddress.open();
+      // });
+    },
+    fnCopy(value, title) {
+      this.$commonJS.handleMakingPhoneCalls(value, title);
+    },
+
+    gotoPhone() {
+      this.$commonJS.handleMakingPhoneCalls("022-24142321");
+    },
+    openOrderModal(v) {
+      this.orderModalShowInfo = v;
+      console.log(
+        "this.orderModalShowInfo at line 727:",
+        this.orderModalShowInfo
+      );
+      this.orderModalShow = true;
+      if (this.orderModalShowInfo.type == "remark") {
+        this.content = this.remark;
+      }
+    },
+    async goBuyJie() {
+      var that = this;
+      // if (this.addressList.length == 0) {
+      // 	this.dizhiShow = true // 如果没有地址信息
+      // }
+      // if (!this.nowClick) {
+      // 	return
+      // }
+      this.nowClick = false;
+      setTimeout(() => {
+        this.nowClick = true;
+      }, 5000);
+      // let youPre = {
+      //   id: "",
+      //   coupons: {
+      //     amount: 0,
+      //     name: "",
+      //   },
+      // };
+      // if (this.youhuiContent.id != undefined) {
+      //   youPre = this.youhuiContent;
+      // }
+      let xiaBiao = [];
+      // for (let i = 0; i < this.cartList.length; i++) {
+      //   xiaBiao.push({
+      //     productId: this.cartList[i].productId,
+      //     quantity: this.cartList[i].productAmount,
+      //   });
+      // }
+      if (this.options.goods[0].goodsType != "05") {
+        if (!this.addressData.id) {
+          this.$commonJS.showToast("请选择收货地址");
+          return false;
+        }
+      }
+      let data = {
+        buyType: this.options.typeId, //0- 商品页直接下单  1- 购物车结算
+        userId: this.userInfo.id, //下单人ID
+        shippingUser: this.addressData ? this.addressData.consigneeName : "111", //收货人姓名
+        userPhone: this.addressData.consigneePhone, //收货人手机号
+        jfDeduction: this.jfNumber,
+        paymentMethod: this.payType, //支付方式   2支付宝，1微信，3ios内购    4，天医币购买
+        orderMoney: this.totalPrice, //订单金额
+        realMoney: this.actualPayment, //实收金额
+        shippingMoney: this.freightNum, //运费
+        remark: this.remark, //备注
+        couponId: null, //优惠券Id
+        // isSend: this.isSend,
+        couponName: "", //优惠券名称
+        districtMoney: 0, //优惠金额
+
+        productList: this.goodsDataList.map((e) => {
+          return {
+            productId: e.productId,
+            quantity: 1,
+          };
+        }), //订单列表商品
+        orderType: "order", //订单类型
+        addressId:
+          this.options.goods[0].goodsType != "05" ? this.addressData.id : 0, // 地址ID
+        appName: "wumen",
+        come: "2",
+      };
+
+      console.log("data at line 477:", data);
+
+      await $http
+        .request({
+          // url: "book/buyOrder/buySave",
+          url: that.urlList.buyOrder,
+          method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+          data,
+          header: {
+            //默认 无 说明：请求头
+            "Content-Type": "application/json",
+          },
+        })
+        .then(async (res) => {
+          console.log("res at line 598:", res);
+          if (res.code == 0) {
+            if (res.orderSn == null) {
+              uni.showToast({
+                title: "失败,请重新下单",
+                icon: "none",
+                image: "../../../static/icon/ic_close.png",
+              });
+            } else {
+              console.log("that.payType at line 607:", that.payType);
+              if (that.payType == 2) {
+                // 常规支付
+                uni.showToast({
+                  title: "正在支付",
+                  icon: "loading",
+                });
+                await setPay(
+                  {
+                    typePay: "alipay",
+                    subject: "order",
+                    totalAmount: res.money,
+                    type: 2,
+                    relevanceoid: res.orderSn,
+                    customerId: that.userInfo.id,
+                  },
+                  (res) => {
+                    uni.showLoading({
+                      title: "加载中",
+                    });
+                    console.log(res, "支付支付");
+                    if (res.success) {
+                      uni.showToast({
+                        title: "支付成功",
+                      });
+                      setTimeout(() => {
+                        if (that.goToInfo.type == 1) {
+                          uni.switchTab({
+                            url: `${that.goToInfo.url}?type=order`,
+                          });
+                        } else {
+                          // uni.navigateBack({
+                          //   delta: 2,
+                          // });
+                          uni.redirectTo({
+                            url: `${that.goToInfo.url}?backType=order`,
+                          });
+                        }
+                      }, 1000);
+                    } else {
+                      console.log("失败失败失败");
+
+                      // that.$commonJS.showToast('支付是失败')
+                      setTimeout(() => {
+                        console.log("延迟调用 失败提示");
+                        uni.showToast({
+                          title: "支付失败",
+
+                          image: "../../../static/icon/ic_close.png",
+                        });
+                      }, 0);
+
+                      // setTimeout(() => {
+
+                      // 	uni.navigateTo({
+                      // 		url: './orderList'
+                      // 	});
+                      // }, 1000)
+                    }
+                  }
+                );
+              } else if (this.payType == 1) {
+                // 微信支付
+                let data1 = {
+                  orderSn: res.orderSn,
+                  buyOrderId: null,
+                  totalAmount: res.money,
+                };
+                setWXPay(data1, (res) => {
+                  if (res.success) {
+                    uni.showToast({
+                      title: "支付成功",
+                    });
+                    setTimeout(() => {
+                      if (that.goToInfo.type == 1) {
+                        uni.switchTab({
+                          url: `${that.goToInfo.url}?type=order`,
+                        });
+                      } else {
+                        // uni.navigateBack({
+                        //   delta: 2,
+                        // });
+                        // uni.n
+                        uni.redirectTo({
+                          url: `${that.goToInfo.url}?backType=order`,
+                        });
+                      }
+                    }, 1000);
+                  } else {
+                    console.log(res, "微信支付111111111111111");
+                    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 (this.payType == 4) {
+                // 天医币支付
+                uni.showToast({
+                  title: "购买成功",
+                  icon: "success",
+                });
+                setTimeout(() => {
+                  if (that.goToInfo.type == 1) {
+                    uni.switchTab({
+                      url: `${that.goToInfo.url}?type=order`,
+                    });
+                  } else {
+                    uni.redirectTo({
+                      url: `${that.goToInfo.url}?backType=order`,
+                    });
+                  }
+                }, 1000);
+              }
+            }
+          }
+        });
+    },
+
+    radioChange(index) {
+      this.selectPayIndex = index;
+      this.payType = this.payList[this.selectPayIndex].type;
+      console.log("this.selectPayIndex at line 315:", this.selectPayIndex);
+      this.$forceUpdate();
+    },
+    handleValChange(e) {
+      console.log("e at line 424:", e);
+    },
+    buttonClick(e) {
+      console.log(e);
+      this.options[2].info++;
+    },
+
+    hancleModalConfirm() {
+      var data = {
+        values: {
+          customerType: "D",
+          token: uni.getStorageSync("token"),
+          customerOid: uni.getStorageSync("customerOid"),
+          ...this.taiHuClassInfo,
+        },
+      };
+      // $mars.progressBegin('申请中...');
+      // $mars.post(customerType, 'applyRelearn', data, function (ret) {
+      //     api.hideProgress();
+
+      //     fnLoadDataGrid();
+      // });
+    },
+    fnRelearn(oid, days, courseFee) {
+      //99和199课程复读一个月60三个月120; 299和399课程复读一个月80三个月180
+      //499和599课程复读一个月90三个月220; 699和799课程复读一个月100三个月248
+      var feeAs = [
+        [60, 120],
+        [80, 180],
+        [90, 220],
+        [100, 248],
+      ];
+      var fee = 0;
+      if (courseFee < 206) {
+        fee = feeAs[0][days == 30 ? 0 : 1];
+      } else if (courseFee < 406) {
+        fee = feeAs[1][days == 30 ? 0 : 1];
+      } else if (courseFee < 606) {
+        fee = feeAs[2][days == 30 ? 0 : 1];
+      } else {
+        fee = feeAs[3][days == 30 ? 0 : 1];
+      }
+      this.modalInfo = {
+        title: "提示信息",
+        content:
+          "用户您好，该课程已到期，通过支付" +
+          fee +
+          "元，本门课程可获得" +
+          days +
+          "天延期学习时间，点击确认即完成自动扣费，感谢配合！",
+      };
+
+      this.taiHuClassInfo = {
+        taiHuClassOid: oid,
+        days: days,
+        fee: fee,
+      };
+      this.show = true;
+      // $aui.alert({
+      //     title: ,
+      //     content: '用户您好，该课程已到期，通过支付' + fee + '元，本门课程可获得' + days + '天延期学习时间，点击确认即完成自动扣费，感谢配合！',
+      //     buttons: ['取消', '确认'],
+      //     radius: 6,
+      //     titleColor: '#ff3300',
+      //     contColor: '#333',
+      //     btnColor: ''
+    },
+    //课程详情
+    async gotoDetail(v) {
+      console.log(v);
+
+      var result = await this.$commonJS.getCheckCourseStatus({
+        oid: v.courseOid,
+      });
+      console.log("result at line 364:", result);
+
+      if (result.buyFlg == 0 && v.conditions != "01") {
+        this.$commonJS.showToast("请先购买课程");
+        return;
+      }
+
+      uni.navigateTo({
+        // url: '../bookShop/commodityDetail?id=' + item.id
+        url: `/pages/curriculum/order/curriculum/detail?navTitle=${v.title}&title=${v.title}&oid=${v.courseOid}&conditions=${v.conditions}&detailOid=${v.detailOid}`,
+      });
+    },
+    //相关课程
+    goCourseDescription(v) {
+      console.log(v);
+      uni.navigateTo({
+        // url: '../bookShop/commodityDetail?id=' + item.id
+        url: `/pages/curriculum/order/curriculum/index?navTitle=${v.title}&title=${v.title}&oid=${v.oid}`,
+      });
+    },
+    async getCourseDescriptionData() {
+      var data = {};
+      var that = this;
+      console.log(this.$store.state, "11111111111");
+      this.$http
+        .post(this.urlList.list, {
+          customerType: "D",
+          token: uni.getStorageSync("token"),
+          customerOid: uni.getStorageSync("customerOid"),
+          oid: this.options.oid,
+        })
+        .then(async (res) => {
+          that.curriculumData = res.obj;
+
+          if (
+            that.curriculumData.productImageList == null ||
+            that.curriculumData.productImageList == ""
+          ) {
+            this.swiperList.push(that.curriculumData.explainsImg);
+          } else {
+            that.swiperList = that.curriculumData.productImageList.split(",");
+            // for (var i = 0; i < imgList.length; i++) {
+            // 	this.swiperList.push(imgList[i])
+            // }
+          }
+
+          that.dataList = res.obj.correlatedList;
+          await that.getDetailInfo();
+          // that.relatedCoursesList = res.obj.correlatedList
+          // await that.handleselectCate({ ...this.cateList[0], index: 0 })
+          // socket.init();
+        });
+    },
+    getPriceData() {
+      var that = this;
+      setTimeout(() => {
+        that.$nextTick(() => {
+          that.$refs.priceDetail.getTotalPrice();
+        });
+      }, 100);
+    },
+    // 检查是有权限使用搜索功能
+    checkDisable() {
+      console.log("点击了");
+    },
+    // 显示无权限弹窗
+    // showNoRights() {
+    // 	let that = this
+    // 	uni.showModal({
+    // 		content: "",
+    // 		confirmText: '好的',
+    // 		showCancel: false,
+    // 		success: function(res) {
+    // 			if (res.confirm) {
+    // 				// console.log('用户点击确定');
+    // 				that.clear()
+    // 			}
+    // 		}
+    // 	})
+    // },
+    // 获取用户详情
+    getUserInfo() {
+      // 用户详情
+      if (this.userInfo.id != undefined) {
+        this.$http.post("book/user/info/" + this.userInfo.id).then((res) => {
+          this.userMes = res.user;
+          this.getCateList();
+          console.log(this.userMes, "呼呼");
+        });
+      }
+    },
+
+    async handleselectCate(item, index) {
+      this.dataList = [];
+      var data = [];
+      console.log(item, index, 99999);
+      var that = this;
+
+      // curriculumInfo
+
+      this.$http
+        .post(this.urlList.curriculumInfo, {
+          customerType: "D",
+          token: uni.getStorageSync("token"),
+          customerOid: uni.getStorageSync("customerOid"),
+          oid: item.coid,
+        })
+        .then(async (res) => {
+          that.curriculumInfo = res.obj;
+          that.dataList = res.obj.courseList;
+
+          // socket.init();
+        });
+
+      // this.$nextTick(() => {
+      //     switch (item.type) {
+      //         case 1:
+      //             // allDataList
+      //             this.dataList = that.allDataList.result1Lst
+      //             break;
+      //         case 2:
+      //             this.dataList = that.allDataList.result2Lst
+      //             break;
+      //         case 3:
+      //             this.dataList = that.allDataList.result3Lst
+      //             break;
+      //         case 4:
+      //             this.dataList = that.allDataList.result4Lst.filter(e =>
+      //                 e.oid != '5fcf991c027b11e7ae62008cfae40c18' && e.oid != 'b3d8a938b8e147bc877613bb712a9cb3' && e.oid != '4d4730163135420ea962bfac4805e026' && e.oid != '49fb76ca3d6b43718d78c6aa9a3003c2' && e.oid != 'c7b047ed9246469b9ae2b1013fc3df9c'
+
+      //             )
+
+      //             console.log(this.dataList.length, 6666666)
+      //             break;
+
+      //     }
+
+      //     this.currentCateIndex = item.index
+      // })
+      console.log(this.allDataList, this.dataList, "1688");
+      // if(this.userMes.tgdzPower == 0){
+      // 	let that = this
+      // 	uni.showModal({
+      // 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
+      // 		confirmText: '好的',
+      // 		showCancel: false,
+      // 		success: function(res) {
+      // 			if (res.confirm) {
+      // 				// console.log('用户点击确定');
+      // 			}
+      // 		}
+      // 	})
+      // 	return
+      // }
+      // if(item.title == "时辰取穴"){
+      // 	uni.navigateTo({
+      // 		url: "../timeAcupoint/timeAcupoint"
+      // 	})
+      // 	return
+      // }
+
+      // this.currentStatusIndex = index
+
+      this.searchValue = "";
+      this.searchList = [];
+      this.showSearchList = false;
+      // if (index != 2) {
+
+      // uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) {
+      // 	var height = rect.height
+      // 	console.log('元素高度：',);
+
+      // }).exec();
+
+      // } else {
+      // 	this.getJFList(dictType)
+      // }
+
+      return data;
+    },
+    async getDetailInfo() {
+      var that = this;
+
+      // curriculumInfo
+
+      this.detailInfo = {
+        content:
+          "<img src='http://oss.taihumed.com/other/null_20210528102528870.jpg' ></img> <img src='http://101.201.146.165:8088/curriculum/detailImg/curriculum_20170420143333621.png'  ></img><p><p>没有中医基础想学中医难不难？中医学者治疗出现瓶颈怎么办？中西医究竟有什么不同呢？吴雄志教授将以全新的视角，完美整合中药学和西医学知识，让你领略当代中医生理学魅力。</p><p><br/><p></p><p><br/></p><p>【思考题】</p><p>1、简述中医的发展这些年出现了哪些变化？</p><p>2、简述中西医学科的异同？</p>",
+      };
+
+      // this.$http
+      //     .post(this.urlList.detailInfo, {
+      //         customerType
+      //             :
+      //             "D",
+      //         token
+      //             : uni.getStorageSync("token")
+      //         ,
+      //         customerOid
+      //             : uni.getStorageSync("customerOid"),
+      //         classOid: 'f81b558ca4ee406e97c4045c87c2539c'
+
+      //     })
+      //     .then(async res => {
+      //         that.detailInfo = res.obj
+      //         // that.dataList = res.obj.courseList
+
+      //         // socket.init();
+
+      //     });
+
+      // this.$nextTick(() => {
+      //     switch (item.type) {
+      //         case 1:
+      //             // allDataList
+      //             this.dataList = that.allDataList.result1Lst
+      //             break;
+      //         case 2:
+      //             this.dataList = that.allDataList.result2Lst
+      //             break;
+      //         case 3:
+      //             this.dataList = that.allDataList.result3Lst
+      //             break;
+      //         case 4:
+      //             this.dataList = that.allDataList.result4Lst.filter(e =>
+      //                 e.oid != '5fcf991c027b11e7ae62008cfae40c18' && e.oid != 'b3d8a938b8e147bc877613bb712a9cb3' && e.oid != '4d4730163135420ea962bfac4805e026' && e.oid != '49fb76ca3d6b43718d78c6aa9a3003c2' && e.oid != 'c7b047ed9246469b9ae2b1013fc3df9c'
+
+      //             )
+
+      //             console.log(this.dataList.length, 6666666)
+      //             break;
+
+      //     }
+
+      //     this.currentCateIndex = item.index
+      // })
+      console.log(this.allDataList, this.dataList, "1688");
+      // if(this.userMes.tgdzPower == 0){
+      // 	let that = this
+      // 	uni.showModal({
+      // 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
+      // 		confirmText: '好的',
+      // 		showCancel: false,
+      // 		success: function(res) {
+      // 			if (res.confirm) {
+      // 				// console.log('用户点击确定');
+      // 			}
+      // 		}
+      // 	})
+      // 	return
+      // }
+      // if(item.title == "时辰取穴"){
+      // 	uni.navigateTo({
+      // 		url: "../timeAcupoint/timeAcupoint"
+      // 	})
+      // 	return
+      // }
+
+      // this.currentStatusIndex = index
+
+      this.searchValue = "";
+      this.searchList = [];
+      this.showSearchList = false;
+      // if (index != 2) {
+
+      // uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) {
+      // 	var height = rect.height
+      // 	console.log('元素高度：',);
+
+      // }).exec();
+
+      // } else {
+      // 	this.getJFList(dictType)
+      // }
+
+      return data;
+    },
+    async setOneCateIndex(item, index) {
+      this.allDataList = [];
+      console.log(index, 99999);
+      var that = this;
+
+      // if(this.userMes.tgdzPower == 0){
+      // 	let that = this
+      // 	uni.showModal({
+      // 		content: "购买 针灸六经法要上册和下册 后方可使用此功能",
+      // 		confirmText: '好的',
+      // 		showCancel: false,
+      // 		success: function(res) {
+      // 			if (res.confirm) {
+      // 				// console.log('用户点击确定');
+      // 			}
+      // 		}
+      // 	})
+      // 	return
+      // }
+      // if(item.title == "时辰取穴"){
+      // 	uni.navigateTo({
+      // 		url: "../timeAcupoint/timeAcupoint"
+      // 	})
+      // 	return
+      // }
+
+      this.currentStatusIndex = index;
+      // this.currentCateIndex = 0
+
+      this.searchValue = "";
+      this.searchList = [];
+      this.showSearchList = false;
+      this.$nextTick(async () => {
+        await that.getCourseDescriptionData();
+
+        this.$forceUpdate();
+      });
+
+      // this.handleselectCate(this.cateList[this.currentCateIndex])
+      // if (index != 2) {
+
+      // uni.createSelectorQuery().select('.statusList').boundingClientRect(function (rect) {
+      // 	var height = rect.height
+      // 	console.log('元素高度：',);
+
+      // }).exec();
+
+      // } else {
+      // 	this.getJFList(dictType)
+      // }
+    },
+
+    transformData(inputData) {
+      const result = {};
+      inputData.forEach((item) => {
+        const { letter } = item;
+        if (!result[letter]) {
+          result[letter] = [];
+        }
+        result[letter].push(item);
+      });
+      // const finalResult = Object.keys(result).map(key => ({ [key]: result[key] }));
+      return result;
+    },
+    // getJFList(id) {
+    // 	$http.request({
+    // 		url: "book/prescript/prescriptListForJF",
+    // 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+    // 		data: {
+    // 			loadAnimate: 'none', // 请求加载动画
+    // 			'categoryId': id
+    // 		},
+    // 		header: { //默认 无 说明：请求头
+    // 			'Content-Type': 'application/json'
+    // 		},
+    // 	}).then(res => {
+    // 		if (res.code == 0 && res.list.length > 0) {
+    // 			this.twoCateList = []
+    // 			this.dataList = this.transformData(res.list)
+    // 			console.log('JF经方', this.dataList)
+    // 		} else {
+    // 			this.twoCateList = []
+    // 			this.dataList = []
+    // 		}
+    // 	}).catch(e => {
+    // 		this.twoCateList = []
+    // 		this.dataList = []
+    // 		console.log(e)
+    // 	})
+    // },
+    getCateList(id) {
+      id ? "" : (id = 0);
+      this.twoCateList = [];
+      this.curTwoCateIndex = 0;
+      // 0为获取顶级分类，其他为搜索下级分类，目前的逻辑，顶级是写死的，所以可能只会涉及到搜索第二级
+      // $http.request({
+      // 	url: "book/prescript/prescriptCategoryList",
+      // 	method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+      // 	data: {
+      // 		loadAnimate: 'none', // 请求加载动画
+      // 		'categoryId': id
+      // 	},
+      // 	header: { //默认 无 说明：请求头
+      // 		'Content-Type': 'application/json'
+      // 	},
+      // }).then(res => {
+      // console.log(res, '脉穴分类获取成功')
+      // if (res.code == 0 && res.list.length > 0) {
+      // this.statusList = res.list
+      // this.getTowCateList(this.statusList[0].type)
+      // } else {
+      // 	this.statusList = []
+      // }
+      // }).catch(e => {
+      // 	this.statusList = []
+      // 	console.log(e)
+      // })
+    },
+
+    // 放大图片
+    previewImage(url) {
+      console.log(url);
+      uni.previewImage({
+        urls: [url],
+        longPressActions: {
+          itemList: ["很抱歉，暂不支持保存图片到本地"],
+          success: function (res) {
+            // console.log(res,'+++++')
+          },
+        },
+      });
+    },
+    // getSearch() {
+    // 	$http.request({
+    // 		url: "book/prescript/searchPrescript",
+    // 		method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+    // 		data: {
+    // 			loadAnimate: 'none', // 请求加载动画
+    // 			'keywords': this.searchValue,
+    // 			type: this.currentStatusIndex + 1
+    // 		},
+    // 		header: { //默认 无 说明：请求头
+    // 			'Content-Type': 'application/json'
+    // 		},
+    // 	}).then(res => {
+    // 		console.log(res, '搜索结果')
+    // 		if (res.code == 0 && res.list.length >= 0) {
+    // 			this.showSearchList = true
+    // 			this.searchList = res.list
+    // 		} else {
+    // 			this.searchList = []
+    // 		}
+    // 	}).catch(e => {
+    // 		// this.dataList = []
+    // 		this.searchList = []
+    // 		console.log(e)
+    // 	})
+    // },
+    // search(res) {
+    // 	console.log(res, 'res')
+    // 	// uni.showToast({
+    // 	// 	title: '搜索：' + res,
+    // 	// 	icon: 'none'
+    // 	// })
+    // 	if (res == '') {
+    // 		this.showSearchList = false
+    // 		this.searchList = []
+    // 	} else {
+    // 		this.getSearch()
+    // 	}
+
+    // },
+    // input(res) {
+    // 	console.log('----input:', res)
+    // 	if (res == '') {
+    // 		this.searchList = []
+    // 	} else {
+    // 		this.getSearch()
+    // 	}
+    // },
+    // clear(res) {
+    // 	console.log('----clear:', res)
+    // 	// uni.showToast({
+    // 	// 	title: 'clear事件，清除值为：',
+    // 	// 	icon: 'none'
+    // 	// })
+    // 	this.searchValue = ''
+    // 	this.showSearchList = false
+    // },
+    // blur(res) {
+    // 	// console.log('----blur:', res)
+    // 	// if (res == '') {
+    // 	// 	this.showSearchList = false
+    // 	// 	this.searchList = []
+    // 	// } else {
+    // 	// 	this.getSearch()
+    // 	// }
+    // },
+    // focus(e) {
+    // 	console.log('----focus:')
+    // 	// uni.showToast({
+    // 	// 	title: 'focus事件，输出值为：' + e.value,
+    // 	// 	icon: 'none'
+    // 	// })
+    // 	// 等于1 就是有权限
+    // 	// this.showSearchList = true
+
+    // },
+    // cancel(res) {
+    // 	uni.showToast({
+    // 		title: '点击取消，输入值为：' + res.value,
+    // 		icon: 'none'
+    // 	})
+    // }
+  },
+  onBackPress() {
+    // #ifdef APP-PLUS
+    plus.key.hideSoftKeybord();
+    // #endif
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "@/style/mixin.scss";
+.order_box {
+  padding: 20rpx;
+
+  .order_top {
+    background-color: #fff;
+    margin-bottom: 20rpx;
+  }
+
+  .goods_item {
+    //
+    width: 100%;
+    overflow: hidden;
+
+    .textarea {
+      margin-top: 20rpx;
+      background-color: #fffdfd;
+    }
+
+    .goods_item_img {
+      width: 140rpx;
+      height: 140rpx;
+      float: left;
+      background-color: #f5f5f5;
+      border-radius: 10rpx;
+    }
+
+    .normal_box {
+      width: calc(100% - 160rpx);
+      height: auto;
+      float: right;
+
+      // overflow: hidden;
+      .normal_box_top {
+        width: 100%;
+        display: flex;
+
+        height: 100rpx;
+        // margin-bottom: 40rpx;
+      }
+    }
+  }
+}
+
+.u-grid-list {
+  // height: 40rpx;
+}
+
+.flexbox {
+  display: flex;
+}
+
+.dataList {
+  height: 100%;
+}
+
+.titleList2 {
+  height: calc(100% - 150rpx);
+}
+
+.priceDetail {
+  height: calc(100% - 180rpx) !important;
+  padding: 0rpx 0;
+  box-sizing: border-box;
+}
+
+.componentPage {
+  height: calc(100% - 90rpx) !important;
+}
+
+.dateReminder {
+  width: 100%;
+  font-size: 24rpx;
+  text-align: right;
+  line-height: 40rpx;
+}
+
+.fdButtonBox {
+  border: 1rpx solid $themeColor;
+  background-color: $themeColor;
+  color: #fff;
+  // width: 100%;
+  float: right;
+  padding: 4rpx 14rpx;
+  font-size: 24rpx;
+  font-weight: 500;
+  line-height: 30rpx;
+  border-radius: 10rpx;
+  box-sizing: border-box;
+
+  // margin-top: 20rpx;
+  // display: flex;
+  // align-items: center;
+}
+
+.commonDetailPage {
+font-size: 24rpx;
+  padding-bottom: 150rpx !important;
+}
+
+.goods_box {
+  background-color: #fff;
+  // margin-top: 20rpx;
+  // padding: 40rpx 30rpx;
+  box-sizing: border-box;
+  width: 100%;
+
+  .title {
+    color: #333;
+    font-weight: 600;
+    margin-bottom: 20rpx;
+  }
+
+  .curriulum_title_box {
+    width: calc(100%) !important;
+    padding-bottom: 20rpx;
+    background-color: #fff;
+
+    .curriulum_title {
+      width: calc(100% - 80rpx);
+      font-weight: 500;
+      font-size: 30rpx;
+      // line-height: 40rpx;
+      //     display: flex;
+      // align-items: center;
+      margin-top: 10rpx;
+      float: left;
+      margin-bottom: 0rpx;
+      color: #333;
+      // padding: 20rpx;
+      box-sizing: border-box;
+    }
+  }
+}
+
+.dataList {
+  background-color: #fff !important;
+  padding: 0 30rpx 40rpx !important;
+  box-sizing: border-box;
+}
+
+/deep/.titleItem {
+  // width: calc(100% - 120rpx) !important;
+}
+
+/deep/.scroll-view-item:nth-child(2n-1) {
+  background-color: transparent !important;
+}
+
+.dataList {
+  height: auto !important;
+}
+
+.related_courses_box {
+  background-color: #fff;
+
+  .small_class_teaching_content {
+    padding: 10rpx 20rpx;
+    box-sizing: border-box;
+  }
+}
+
+.related_courses_name {
+  display: inline-block;
+  width: calc(100% - 150rpx) !important;
+
+  .aui-text-danger {
+    display: inline-block;
+    float: right;
+  }
+}
+
+.original_price {
+  font-size: 28rpx !important;
+  font-weight: 500;
+  color: #999 !important;
+  white-space: nowrap;
+  text-decoration: line-through;
+  float: left;
+  margin-top: 6rpx;
+}
+
+.price {
+  width: auto;
+  font-size: 30rpx;
+  font-weight: 600;
+  float: right;
+  margin-right: 10rpx;
+  color: #333;
+  // font-family: PangMenZhengDaoBiaoTiTiMianFeiBan;
+}
+
+.price_box {
+  width: auto;
+  overflow: hidden;
+  margin-top: 10rpx;
+}
+
+.commonTags {
+  margin-right: 20rpx;
+  margin-top: -5rpx !important;
+}
+
+.sales_number {
+  text-decoration: none;
+  color: #b0b0b0;
+  font-weight: 500;
+}
+
+// .common_curriculum_list{
+
+// }
+/deep/.common_curriculum_list {
+  margin-top: 20rpx;
+  padding: 20rpx 20rpx 20rpx;
+
+  .content_item {
+    width: 100% !important;
+    margin-bottom: 0 !important;
+    padding: 15rpx 0 0rpx;
+    border-top: 1rpx solid #f1f0f0;
+    // height: 160rpx;
+
+    .book_image {
+      width: 60rpx !important;
+      height: 60rpx !important;
+      float: left !important;
+      background-color: #f5f5f5;
+    }
+
+    .common_curriculum_item {
+      width: calc(100% - 88rpx);
+      float: right;
+      display: block !important;
+
+      // overflow: hidden;
+
+      .related_courses_name {
+        width: 100% !important;
+      }
+    }
+  }
+
+  .content_item:nth-child(1) {
+    border-top: none !important;
+  }
+}
+
+/deep/.common_section {
+  padding: 0 !important;
+  padding-bottom: 20rpx !important;
+}
+
+.goods_detail_list_title {
+  display: block;
+  padding-top: 20rpx;
+  padding-bottom: 40rpx;
+
+  .linlanzhifu {
+    display: flex;
+    align-items: center;
+  }
+
+  .other_info {
+    font-size: 28rpx;
+    // color: #aaa;
+    color: #5a5a5a;
+
+    .explain {
+    }
+  }
+
+  .left {
+    display: flex;
+    align-items: center;
+  }
+
+  .right {
+    font-size: 24rpx;
+    font-weight: 500 !important;
+    color: #999;
+    font-family: none;
+  }
+
+  // justify-content: space-between;
+}
+
+.commonPageContentBox {
+  height: auto !important;
+}
+
+.minus {
+  width: 50rpx;
+  height: 50rpx;
+  border-width: 2rpx;
+  border-color: #e6e6e6;
+  border-right-color: transparent;
+
+  border-top-left-radius: 10rpx;
+  border-bottom-left-radius: 10rpx;
+  border-style: solid;
+  // border-top-left-radius: 100px;
+  // border-top-right-radius: 100px;
+  // border-bottom-left-radius: 100px;
+  // border-bottom-right-radius: 100px;
+  // border-radius:10rpx;
+  @include flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.input {
+  padding: 0 10px;
+  height: 50rpx;
+  border: 1rpx solid #e6e6e6;
+}
+
+.plus {
+  width: 50rpx;
+  height: 50rpx;
+  border-width: 2rpx;
+  border-color: #e6e6e6;
+  border-left-color: transparent;
+  border-style: solid;
+  // background-color: #258feb;
+
+  border-top-right-radius: 10rpx;
+  border-bottom-right-radius: 10rpx;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  /* #endif */
+  justify-content: center;
+  align-items: center;
+  color: $themeColor;
+}
+
+.order_bottom_box {
+  position: absolute;
+  right: 20rpx;
+
+  .number {
+    font-size: 28rpx;
+    margin-right: 15rpx;
+    margin-top: 5rpx;
+  }
+
+  .price {
+    .total {
+      font-size: 38rpx;
+      color: red;
+    }
+  }
+}
+
+/deep/.goods_nav_box {
+  .left {
+    margin-top: -10rpx;
+    width: calc(100% - 220rpx);
+    height: auto;
+    position: relative;
+    // overflow: hidden;
+  }
+}
+
+.explain {
+  word-wrap: break-word;
+  word-break: normal;
+  word-break: break-all; //会断词
+  // white-space: nowrap;
+}
+
+.order_bottom_box {
+  display: flex;
+  align-items: center;
+}
+
+.pay_box {
+  .pay_item {
+    border-bottom: 1rpx solid #eeecec;
+    padding-top: 20rpx;
+    justify-content: space-between;
+
+    .top {
+      width: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: space-between;
+    }
+
+    .left {
+      line-height: 50rpx;
+      font-family: MicrosoftYaHei;
+      font-weight: 500;
+
+      color: #242323;
+
+      .pay_item_img {
+        width: 50rpx;
+        height: 50rpx;
+        float: left;
+        margin-right: 20rpx;
+      }
+    }
+
+    .bottom {
+      width: calc(100% - 60rpx);
+      float: right;
+      // background-color: #dcdfe6;
+      background-color: #f5f5f5;
+      border-radius: 20rpx;
+      margin-top: 20rpx;
+
+      .jf_box {
+        width: 100%;
+        display: flex;
+        align-items: center;
+        padding: 0 20rpx;
+        box-sizing: border-box;
+        justify-content: space-between;
+        color: #aaa;
+      }
+
+      .jf_input {
+        width: calc(100% - 320rpx) !important;
+        padding: 10rpx 0;
+        box-sizing: border-box;
+      }
+    }
+  }
+
+  /deep/.pay_item:nth-last-child(1) {
+    border-bottom: none !important;
+  }
+}
+
+.linlanzhifu {
+  font-size: 28rpx;
+  line-height: 24rpx;
+}
+
+.address_box {
+  // padding: 20rpx;
+  display: flex;
+  align-items: center;
+
+  .order_top {
+    background-color: #fff;
+    // margin-bottom: 20rpx;
+  }
+
+  .user_info {
+    width: 100%;
+    float: left;
+    display: flex;
+    margin-top: 10rpx;
+    align-items: center;
+
+    .name {
+      color: #838282;
+      margin-right: 10rpx;
+    }
+
+    .tel {
+      color: #838282;
+    }
+  }
+
+  .curriulum_title {
+    width: auto;
+    font-size: 34rpx;
+    font-weight: 700;
+    float: left;
+    margin-right: 10rpx;
+    color: #333;
+    line-height: 50rpx;
+    letter-spacing: 2rpx;
+  }
+
+  .normal_box {
+    margin-left: 5rpx;
+    width: calc(100% - 120rpx);
+  }
+
+  .goods_box {
+    padding: 20rpx 20rpx;
+    display: flex;
+    align-items: center;
+  }
+
+  .rightArrow {
+    margin-left: 40rpx;
+    width: 40rpx;
+    height: 40rpx;
+    // position: absolute;
+    // right: 30rpx;
+  }
+}
+
+.rightArrow {
+  width: 40rpx;
+  height: 40rpx;
+  // position: absolute;
+  // right: 30rpx;
+}
+
+.orderModalShow {
+  width: 100%;
+  max-height: 48vh;
+  padding-bottom: 120rpx;
+}
+
+.popup_box {
+  .curriulum_title_box {
+    .title {
+      text-align: center;
+      font-size: 34rpx !important;
+      padding-top: 15rpx !important;
+      margin-bottom: 60rpx !important;
+    }
+  }
+}
+
+.hasRemark {
+  color: #333 !important;
+  font-size: 40rpx !important;
+}
+
+.bgGrey {
+  // background-color: #f5f5f5;
+}
+</style>
diff --git a/pages/mine/mine/index.vue b/pages/mine/mine/index.vue
index 06fd4f8..5e6d8a5 100644
--- a/pages/mine/mine/index.vue
+++ b/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: "众妙之门",
-          summary: "我正在使用众妙之门提升自己，赶紧跟我一起来体验吧！",
-          imageUrl: "static/icon/fengziIcon.png",
+          title: "吴门医述",
+          summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
+          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: "众妙之门",
-          summary: "我正在使用众妙之门提升自己，赶紧跟我一起来体验吧！",
-          imageUrl: "static/icon/fengziIcon.png",
+          title: "吴门医述",
+          summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
+          imageUrl: "static/icon/home_icon_logo.png",
           success: function (res) {
             console.log("success:" + JSON.stringify(res));
           },
diff --git a/pages/mine/vip/order.vue b/pages/mine/vip/order.vue
index 6097e80..5c5f585 100644
--- a/pages/mine/vip/order.vue
+++ b/pages/mine/vip/order.vue
@@ -240,12 +240,12 @@ export default {
           type: 2,
           value: "0",
         },
-        // {
-        //   text: "微信",
-        //   imgUrl: require("@/static/icon/pay_2.png"),
-        //   type: 1,
-        //   value: "1",
-        // },
+        {
+          text: "微信",
+          imgUrl: require("@/static/icon/pay_2.png"),
+          type: 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);
diff --git a/pages/mine/wallet/jf/index.vue b/pages/mine/wallet/jf/index.vue
index 905177c..31ea31f 100644
--- a/pages/mine/wallet/jf/index.vue
+++ b/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;
diff --git a/pages/mine/wallet/recharge/index.vue b/pages/mine/wallet/recharge/index.vue
index 7ca263a..aedaf74 100644
--- a/pages/mine/wallet/recharge/index.vue
+++ b/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
 					};
diff --git a/pages/taihu/index.vue b/pages/taihu/index.vue
index 106e433..e57aa20 100644
--- a/pages/taihu/index.vue
+++ b/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) {
diff --git a/static/icon/course_ic.png b/static/icon/course_ic.png
new file mode 100644
index 0000000000000000000000000000000000000000..383d0915343329d9ba18843984a999da14a8d671
GIT binary patch
literal 1685
zcmbVNZ)_7~7(W)lK>){aW*a8nZVSrbdVktpdnX0gKU-_;7+c+D;^MCFz3ndR-Fx1>
zUE6)YvdA0>Xf$Y)0LCxy!33fob%De*sEG;L2O`9fpnTB}Nc^JwQR91E+iV6T()4=o
zpWpj?p5OC6&(p(0g9Dp3bZ($1YEvQ}9VYLv`!ug3zc*6U&*Zh<iofDe)aHu&ta*Ru
z=4}+UwpCA!<MHH63P6TO)leFGiiSnd6t#PA(Ne)Q#B>^Fbu+}=`tkxp>sp8z^C$VF
z6@gQFeAb2|vx6xxI}K!w*}I3{T~r8x0kKLKjhyKy#Sl~FRmj*~<`}vP!P6n8&oxMo
zCx_?=vLWsFNGuS1A{~%Dg2c<BZx=1{LV)7~oZw}7LE$CEE7P?PL#)|aMj4Lw*KCnl
zh?&CJQaG+qD0m8953;kIAj>kxi<~I31i?Bb6RSnmbh_&dQRo0$x3G>(+GSMJD33!7
z@pM^&VKrz?rxqp>Fs`UtoZ#VINmZZ*8aOL&=c>jvz`-0epotxV6&hG;3Ss0-p$AYm
zwpSS-p-m<mHty?-VKhuQI5tCM)B<u}w38}XkQ;^$%G&_OW{8{Jt{O{;*igmDP9c=5
zU(`_DWjYd}pBvLn4HcXnE8sAyVi;mXUi7g%`36&hr1)ipmv{0(h3A){Nu=qS(rTzk
zpaI3_Q~bgzC`lMi#p*-B8c;IGHdG>4H`FZTEHlf{jUXx!ltVT#OuX~1Tu($ILpI9j
zIkMpl4}|GNEFuZAB(b7LsJfd>DhboUstI5s8e&LjJi4wa!0Yt~(xSko1xaK5eqVqM
z@)?Phg1(F>0||hDuYNv?K;BJ&`g!etp5JHdqyW|2BlEar>1K`+*Bx@FrCQ;Pz}IV|
zoK9DhMNxrU1R(~vw+}U@wyZyL1eR$FQ;?AUM_w$$9F)NY)rNgp60L`19Y<W}++tl;
z!Tnocb#Fys*WsjFxWh)9B9lg=gC^;2HfdwM0~41hYR!&Bv@caWar1|e`PEQM>_<>J
zdnMdCdVHSMCQe_M5?c=~e%$fPiN8Dk{PxN3zWKUzs{PfOHxBl$fA`IJxTovAmc&9&
zw3S&k{o?KO*KhuI=lkwwt;Kt#*Pi*K@Xmqh;A7{u-Mfkccex{5UcRg6PIipWm5;Vx
zrYE=d$C|H{_qR1Y1yb|nL+zKlCb#rI-aKAjTHCZ8;JNbQ_G|QHYyUv=hvlWVrgZ?%
zmk+jI>ze;7e`}+F4=lB%Z?~N3t{h8@1{U-ii-RpA+2a%R=_h8Me__{0=Ga@~(og3$
zeugjYZ%g0#{0vk1;OLlt!I-}AV#}|4t{$PR+vhKS+Pkmv`-2s^0#7}Cv2!l|NzXC&
Ok0TKqjGhfo&iw-b=OnNI

literal 0
HcmV?d00001

diff --git a/static/icon/home_icon_3.png b/static/icon/home_icon_3.png
deleted file mode 100644
index e55055342ceac398f32268795e66b840a1bd3231..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 24844
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

diff --git a/static/icon/ic_agreed.png b/static/icon/ic_agreed.png
index 8bfbc31ef850386e9f4a0b2de73e7fc3ba46b2bb..800df93f73d724b93fd42d53c16849999ec57695 100644
GIT binary patch
delta 1436
zcmV;N1!MY{B!vx-90>qBFs`Bi00B#rnF>z<3X|yyLn|^MH#sgbHZVCdG%O%8FflhT
zFgGtTGc7PNIxsdmGdUn2ARr(hARr<>3X@g~LIMgPlb8!0e=j}?AUrQ}WM(>2L`FUe
zJTG`Ucx`ZPWprUa3Oqk}aA9L>Wpp5AZe%?oaw0!Io*ZEB000E_Nkl<ZNQtf2Uu+ab
z90%~<%<Sym?%rLmch_>kB2Ba<ZJH2`FKD6?l~6pfP>3ef1Rul)6XDH2iSdDGO!yNL
zV^D}Z8K4?`f4~ZYiSnY+Cy{^lKosOkTH3o_ySI0{J3BKz+#R{Q_6}P5eY>6C&Sz)l
zZe|ay*)5@2La~uBNb<1Y<~Hs}HwtdFOBv8Pix>a^gysqeIYq2kH;6L*J;udv0r7vV
zOfuiBU(^f^MNfBgKe~r`iKhh*nt}%vDO3c2>MA8*f9yy^Y#-x-O|`Kfh?3i7W&0-<
z44aX2A24^tTfUcQ7u>9ung$a~DC+nfRZH*9=hp6<uSS_O%GgMhv-n}x?o0YCt}X<u
zMDP&yilKzyEgu=-Usn^F-EL))qUPc1(75j<h8??aV6kX*e6L+|?7nTBwVepXMrsCG
z19R4Pf6%pipA$TYVTmGm7&~^~M$V##=7r73x%b>c_ka+_g4Xl?a1*=5RYSqZ&u`bj
zq3G#8=C0Vu{nj~azEt5XMw#33PAE1K1ppwuTc1$5A3x|7A9-9#`oN<_h=FFLuB%!)
zC8e5>!XTA4DXB@6*?1s$;S2^zx|x@FW+|q)e}s-+Rs%OT7xRxjsp+YsM49$0?Sh9f
zb33+xB%N4rb4d6hbE#0OjlE`N`!4_h5M^esqE3!i*GX;|QfMz=?nhq|!hE2$El=+i
zs-=gl?D{_dN<U5RN8a_l_C$595C-Ku@~R@Z*<RWP=LQp7NJ)?sfriU~kY7e`ZMCxf
ze^<(Al(YC}ZlPz8`z@rpUT_0(zhxDcQq$+`y+{Dn(pDgN{z$;Q_#?v3y!&bi9j!;h
zoW&2ih2A-6B~mIBS5BGgD0IqE^}jzU%slmmqD~Cz!9PzR?AG9A^e?L2+Ej%GIcxi}
zgofuu0T6K3)-vx7g>j*PkbeyTz{(`^e}qoHt_RQG#jDT(E8BmyjH;Z)k2rSErp9QM
zL1?Z}f04P%qs;Bt6Kp-Zz79W$i7hlEm8wHAXYpf>-Md-vd!Z5tot(i4xkZ55C6rPH
zuh_Mcxt)iCt!LNW#g)uXBlP<&s{OaIf&u_=7C-LTy)WMzEd?Q;p|$%jUUrLJe?3xY
zbH2F<aZvT^X{z0LGe5oVRDFACq;12F-LqNn@O>RDm=vUDjQ)a&lKl>2+n=vUN&;^2
z(GKQxeo>kBS~PxqAt(R<#sx-5?l{K8{tA=4-LO*P67F^$uExvLJGc-O005KO8HAm)
z3Lt)!YGbFlAA3b`vq2{q+(K6ee}MQr82M?R5a#oa-TUGqP(ih^VL;+vv}U)2Q1sMF
zx7hWYSL{kOzf}NL#|xZCbio&XsHpn2+nSMDZDo>E7y!V^Zn#Ocu}`Z{k_OKV%v)|O
z1|>AZR4u*7$|R>sJ(XkUp8Z%eMu#!6MdRBS7ffb_rl*ePb88RWy;k>Bf7=7*rIVP<
zE*XxAB?9J^ZwSrqsJUMK!OA3kLMI0U=H+39PI(WCD(W3KU|u>(=+uyvN!Ik&?1lbA
z-+gEY^Oh~U-yNwEqU1QClM||z-rwkjzWHC6*hrB3tp}L1Vv7)lE`?47*HPU>0e}EZ
ziV|bn!z4dTwcB4~CHKCSN=eQ(>bogi#to39TL^uF;NgDGBC8}2%2`_r005zrGYB{%
qG?yaE^f83oGl0aHl}S3y`u!gtyNFw>Ehd=&0000<MNUMnLSTY@^`#d8

delta 4410
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
EFYAff(EtDd

diff --git a/static/icon/ic_gender_unselected.png b/static/icon/ic_gender_unselected.png
index 0a3f2582b408b88026a291858215208e5d8f666a..ebd36ece5062b7a13e5e6d4bbd0373597216f1fb 100644
GIT binary patch
delta 1859
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

delta 3658
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

diff --git a/static/icon/jifen.png b/static/icon/jifen.png
new file mode 100644
index 0000000000000000000000000000000000000000..5319e4de942ad1f7eb91f695e4424e5f0669ad06
GIT binary patch
literal 6382
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
Z=ayExQFpZkWd8o9(7k4;Rioh;|9{Mbk){9u

literal 0
HcmV?d00001

diff --git a/static/icon/tel.png b/static/icon/tel.png
index d92998881bbb056fced1c81212d403dc59660a2c..226ed936df46ac671cc30897f816cce5ddcb14e8 100644
GIT binary patch
literal 9833
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

literal 9166
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

diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
index ea3ad04..5be7624 100644
--- a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
+++ b/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: '微信好友',
-						icon: '@/static/haoyou.png',
-						// icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
+						text: '微信',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
 						name: 'wx'
 					},
 					{
-						text: '微信朋友圈',
-						// icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
-						icon: '@/static/quan.png',
+						text: '支付宝',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
 						name: 'wx'
 					},
-					// {
-					// 	text: 'QQ',
-					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
-					// 	name: 'qq'
-					// },
-					// {
-					// 	text: '新浪',
-					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
-					// 	name: 'sina'
-					// },
+					{
+						text: 'QQ',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
+						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 {