diff --git a/components/guide-pages/guide-pages.vue b/components/guide-pages/guide-pages.vue
index d228785..e47da6e 100644
--- a/components/guide-pages/guide-pages.vue
+++ b/components/guide-pages/guide-pages.vue
@@ -93,7 +93,7 @@
 		.guide_pages_bg2 {
 			width: 100vw;
 			height: 100vh;
-			background: url("@/static/icon/e_0ban_2.jpg") no-repeat;
+			background: url("@/static/icon/e_0ban_2.jpg") no-repeat bottom center;
 			background-size: cover;
 			// background-color: #007AFF;
 			display: flex;
@@ -107,7 +107,7 @@
 		.guide_pages_bg3 {
 			width: 100vw;
 			height: 100vh;
-			background: url("@/static/icon/e_0ban_3.jpg") no-repeat;
+			background: url("@/static/icon/e_0ban_3.jpg") no-repeat bottom center;
 			background-size: cover;
 			// background-color: #EA552D;
 			display: flex;
@@ -127,7 +127,7 @@
 
 		.close_btj {
 			position: absolute;
-			top: 60%;
+			top: 50%;
 			left: 50%;
 			width: 290rpx;
 			height: 68rpx;
diff --git a/manifest.json b/manifest.json
index 4e14ca4..d58c8b9 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
             "src" : "图片路径"
         }
     ],
-    "versionName" : "1.0.02",
-    "versionCode" : 1002,
+    "versionName" : "1.0.03",
+    "versionCode" : 1003,
     "app-plus" : {
         "compatible" : {
             "ignoreVersion" : true
@@ -120,8 +120,9 @@
                 "urltypes" : "medicine",
                 "urlschemewhitelist" : "nuttyreading,zmzm",
                 "privacyDescription" : {
-                    "NSPhotoLibraryUsageDescription" : "为了给您提供修改头像的功能",
-                    "NSCameraUsageDescription" : "为了给您提供修改头像的功能"
+                    "NSPhotoLibraryUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用",
+                    "NSCameraUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用",
+                    "NSPhotoLibraryAddUsageDescription" : "保障您在此app中的修改头像、申诉反馈上传图片、留言上传图片功能的正常使用"
                 }
             },
             "icons" : {
diff --git a/pages.json b/pages.json
index 89f3694..7b2d0bc 100644
--- a/pages.json
+++ b/pages.json
@@ -579,7 +579,7 @@
 				"pagePath": "pages/bookShop/orderList",
 				"iconPath": "static/tab/order.png",
 				"selectedIconPath": "static/tab/order_active.png",
-				"text": "订单"
+				"text": "我的订单"
 			},
 			{
 				"pagePath": "pages/taihu/index",
diff --git a/pages/goods/index/index.vue b/pages/goods/index/index.vue
index 3542f2a..a166865 100644
--- a/pages/goods/index/index.vue
+++ b/pages/goods/index/index.vue
@@ -717,6 +717,7 @@ export default {
         curriculumInfo: "app/phone.do?getCourseInfo",
         detailInfo: "sociology/product/getProductDetail",
         goodsList: "book/shopproduct/getGlProductList",
+		visitorDetailInfo: "visitor/getProductDetail",     // 游客状态下的商品详情
       },
       customButtonGroup1: [
         {
@@ -726,6 +727,7 @@ export default {
           color: "#fff",
         },
       ],
+	  requestType:'',  // 数据请求类型是否为游客登陆状态
     };
   },
   filters: {
@@ -780,7 +782,7 @@ export default {
   },
   onLoad(options) {
     this.options = options;
-	console.log('options',options)
+	console.log('options',options)	
     // this.handleClickGetGoodsList();
     // this.getUserInfo()
     // this.getCateList()
@@ -799,6 +801,7 @@ export default {
     // this.searchList = []
   },
   onShow() {
+	this.requestType = this.options.type
     this.selectGoodsData = {};
     this.getCourseDescriptionData();
     this.show = false;
@@ -823,6 +826,21 @@ export default {
       this.show = false;
     },
     selectGoods(data) {
+		if(this.requestType == 'visitor'){
+			uni.showModal({
+				content:"登陆后可购买本商品",
+				confirmText:'去登录',
+				cancelText:'再逛逛',
+				success(res) {
+					if (res.confirm) {
+					uni.navigateTo({
+						url:'/pages/user/login'
+					})
+					}
+				},
+			})
+			return
+		}
       this.selectGoodsData = data;
       this.$refs.commonSelectGoods.open()
       // this.show = true;
@@ -830,10 +848,25 @@ export default {
     },
 
     onHandleClickBuy1() {
+		if(this.requestType == 'visitor'){
+			uni.showModal({
+				content:"登陆后可购买本商品",
+				confirmText:'去登录',
+				cancelText:'再逛逛',
+				success(res) {
+					if (res.confirm) {
+					uni.navigateTo({
+						url:'/pages/user/login'
+					})
+					}
+				},
+			})
+			return
+		}
       this.$refs.commonSelectGoods.open();
       // this.show = true;
     },
-    onHandleClickBuy() {
+    onHandleClickBuy() {		
       console.log(
         this.selectGoodsData,
         "this.selectGoodsDatathis.selectGoodsDatathis.selectGoodsData"
@@ -957,10 +990,11 @@ export default {
     async getCourseDescriptionData() {
       var data = {};
       var that = this;
-
+	  let url = ''
+	  this.requestType == 'visitor' ? url = this.urlList.visitorDetailInfo : url = this.urlList.detailInfo	
       this.$http
         .request({
-          url: this.urlList.detailInfo,
+          url,
           method: "POST",
           data: {
             productId: this.options.id,
diff --git a/pages/mine/userInfo/persData.vue b/pages/mine/userInfo/persData.vue
index a49076c..b008d37 100644
--- a/pages/mine/userInfo/persData.vue
+++ b/pages/mine/userInfo/persData.vue
@@ -373,8 +373,9 @@
             </view>
           </u-radio-group>
         </template>
-        <template v-if="currentEditType == 'avatar'">
-          <u-upload
+        <template v-if="currentEditType == 'avatar'" >
+			<view class="" @click="checkPermision">
+          <u-upload	  
             :fileList="fileAvatar"
             @afterRead="afterRead"
             @delete="deletePic"
@@ -385,6 +386,7 @@
             :previewFullImage="true"
           >
           </u-upload>
+		  </view>
         </template>
 
         <u-button
@@ -397,11 +399,12 @@
       </view>
     </u-popup>
 
-    <music-play :playData="playData"></music-play>
+    <!-- <music-play :playData="playData"></music-play> -->
   </view>
 </template>
 
 <script>
+	import permission from "@/js_sdk/wa-permission/permission.js"
 import musicPlay from "@/components/music.vue";
 import $http from "@/config/requestConfig.js";
 var clear;
@@ -1146,9 +1149,14 @@ export default {
           console.log(error);
         });
     },
-
+	async checkPermision(){
+			  var result = await permission.premissionCheck("CAMERA_EXTERNAL_STORAGE")
+			  if (result != 1) {			 
+			  	return false
+			  }		  
+	},
     // 头像上传
-    afterRead(e) {
+    async afterRead(e) {		
       let that = this;
       uni.uploadFile({
         url: this.$baseUrl + "oss/fileoss",
diff --git a/pages/peanut/home.vue b/pages/peanut/home.vue
index 2bd0ceb..f1dd24d 100644
--- a/pages/peanut/home.vue
+++ b/pages/peanut/home.vue
@@ -199,6 +199,7 @@
 		<view>
 			<u-back-top :scroll-top="scrollTop" bottom="60" :customStyle='bgiStyle' :iconStyle="iconStyle"></u-back-top>
 		</view>
+		<!-- 应对华为审核，去掉app跳转 -->
 		<view class="appJump ">
 			<view class="everhealth item flexbox" @click="appjumpfun('nuttyreading')">
 				<view class="img">
diff --git a/pages/user/login.vue b/pages/user/login.vue
index 7b3bfad..2225291 100644
--- a/pages/user/login.vue
+++ b/pages/user/login.vue
@@ -447,6 +447,7 @@
 					}
 					if (this.quCode == null || this.quCode == 86) { // 如果没选择国家code，默认是中国大陆
 						if (!this.$base.phoneRegular.test(this.phone)) {
+							this.submitClickNum += 1
 							uni.showToast({
 								title: '手机格式不正确',
 								icon: 'none'
diff --git a/pages/user/persData.vue b/pages/user/persData.vue
index fecf4b3..b5cbc8b 100644
--- a/pages/user/persData.vue
+++ b/pages/user/persData.vue
@@ -172,6 +172,7 @@
 </template>
 
 <script>
+	import permission from "@/js_sdk/wa-permission/permission.js"
 	import musicPlay from '@/components/music.vue'
 	import $http from '@/config/requestConfig.js';
 	var clear;
@@ -530,7 +531,11 @@
 			},
 
 			// 头像
-			choseAvatar(e) {
+			async choseAvatar(e) {
+				var result = await permission.premissionCheck("CAMERA_EXTERNAL_STORAGE")
+						  if (result != 1) {			 
+						  	return false
+				}
 				let that = this
 				if (that.fileAvatar.length == 0) {
 					uni.showToast({
diff --git a/pages/user/visitor.vue b/pages/user/visitor.vue
index e1f1fca..ce315eb 100644
--- a/pages/user/visitor.vue
+++ b/pages/user/visitor.vue
@@ -1,573 +1,482 @@
 <template>
-	<view style="font-size: 28upx;padding-top: 75rpx;">
-		<view v-if="pageNum==1">
-			<view v-if="selected==1">
-				<view class="home_bg">
-					<view class="" style=" ">
-						<view class="icon_hua">
-							<image src="../../static/logo.png" mode="aspectFit" class="icon_hua_1"></image>
-						</view>
-						<!-- <view class="hehan">
-							<image src="../../static/icon/hehan.png" mode="aspectFit" class="icon_hua_1"></image>
-						</view> -->
-
-					</view>
-				</view>
-
-				<view class="head_line" style="background-color: #fff;">
-					<b></b>
-					<text>新书上市</text>
-					<!-- <i @click="onBookMore('New')">查看更多 ></i> -->
-				</view>
-
-				<view class="newBook">
-					<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="10"
-						style="margin-top: 0 !important;">
-						<view :class="['item']" v-for="(item,index) in newBookList" :key="index">
-							<view class="videoBox" @click="goDetail(item.productId)">
-								<image v-if="item.productImages != ''" :src="item.productImages" mode="scaleToFill">
-								</image>
-								<image v-else src="../../static/icon/wufeng.jpg" mode="scaleToFill"></image>
-							</view>
-							<text class="bookName">{{item.productName}}</text>
-						</view>
-					</scroll-view>
-				</view>
-
-
-				<scroll-view class="scroll-view_H " scroll-x="true" scroll-left="0">
-					<view class="ProTabs">
-						<text v-for="item in tagList" :key="item.splId" :class="[tabsid == item.splId ? 'cur' :'']"
-							@click="tabsChange(item)">{{item.labelName}}</text>
-					</view>
-				</scroll-view>
-				<!-- 商品展示 -->
-				<view class="goods">
-					<!-- 精选 -->
-					<view class="">
-						<view v-if="tjProList.length > 0">
-							<view class="flexbox" style="flex-wrap: wrap;">
-								<view class="goodsItem" v-for="(item,index) in tjProList" :key="index"
-									@click="goDetail(item.productId)">
-									<image :src="item.productImages" mode="" class="goodsImg"></image>
-									<view class="goodsContent">
-										<view class="goodsName">
-											{{item.productName}}
-										</view>
-										<view class="goodsPrice">
-											<span class="price"
-												v-if="item.activityPrice && item.activityPrice > 0">￥{{item.activityPrice}}</span>
-											<span class="price" v-else>￥{{item.price}}</span>
-											<span class="Salesnum">已售：{{item.sumSales}} 件</span>
-										</view>
-									</view>
-								</view>
-							</view>
-							<view class="">
-								<view v-if="status==0" style="text-align: center;">
-									<u-loading-icon style="display: inline-block;"></u-loading-icon>
-									<font
-										style='vertical-align: super;margin-left: 10px;font-size: 26rpx;color: #909399;'>
-										努力加载中
-									</font>
-								</view>
-								<view v-if="status==1">
-									<u-divider text="全部加载完成"></u-divider>
-								</view>
-							</view>
-						</view>
-						<u-divider v-else text="暂无数据哦~"></u-divider>
-
-					</view>
-
+	<view class="containerBg" style="font-size: 28upx;">
+		<view v-if="selected == 1">
+		<view class="home_bg">
+			<view class="" style=" ">
+				<view style="height: 60rpx"></view>
+				<view class="icon_hua">
+					<image src="../../static/homeLogo.png" mode="aspectFit" class="icon_hua_1"></image>
+				</view>				
+			</view>
+		</view>		
+		<view class="newLeve2">	
+		<view class="home_nar nomargin" style="padding: 0; background-color: #fff;">
+			<view class="flexbox">
+				<view :class="['hn_cl_tit',tabsid==item.id?'active':'']" @click="curseClick(item)"
+					v-for="(item, index) in curseTagList" :key="index">
+					<image :src="item.icon" mode="aspectFit"></image>
+					<text>{{item.title}}</text>
 				</view>
 			</view>
-			<view v-if="selected==4" style="padding: 0 40rpx;font-size: 28rpx;">
-				<view style="height: 50rpx;"></view>
-				<view class="per_mes">
-
-					<image src="../../static/icon/home_icon_1.png" class="per_mes_img"></image>
-					<view @click="onLoginJump">
-						<text class="name">点击登录</text>
-
-					</view>
-					<br clear="both">
-				</view>
-
-				<view class="xiugai">
-					<view class="nav_list" @click="newOnShare">
-						<text>分享App</text>
-					</view>
-					<view class="nav_list" @click="onPageJump('../peanut/aboutUs')">
-						<text>关于我们</text>
-					</view>
-
-				</view>
-			</view>
-
-
-			<view>
-				<view class="footer_box footer_bg">
-					<view class="footer_item">
-						<view class="footer_nav_item" @click="selected=1">
-							<image v-if="selected == 1" class="footer_nav_item_image footer_nav_item_image_scale"
-								src="/static/tab/icon1_y.png" mode="aspectFit"></image>
-							<image v-else class="footer_nav_item_image" src="/static/tab/icon1_n.png" mode="aspectFit">
-							</image>
-							<text class="footer_nav_item_text"
-								:class="[selected == 1 ? 'footer_item_text_active' : '']">首页</text>
-						</view>
-					</view>
-					<view class="footer_item">
-						<view class="footer_nav_item" @click="onYouAlert()">
-							<image class="footer_nav_item_image" src="/static/tab/order.png" mode="aspectFit"></image>
-							<text class="footer_nav_item_text">我的订单</text>
-						</view>
-					</view>
-					<view class="footer_item">
-						<view class="footer_nav_item" @click="onYouAlert()">
-							<image class="footer_nav_item_image" src="/static/tab/tab_nor_03.png" mode="aspectFit"></image>
-							<text class="footer_nav_item_text">太湖公益</text>
-						</view>
-					</view>
-					<view class="footer_item">
-						<view class="footer_nav_item" @click="selected=4">
-							<image v-if="selected == 4" class="footer_nav_item_image footer_nav_item_image_scale"
-								src="/static/tab/icon4_y.png" mode="aspectFit"></image>
-							<image v-else class="footer_nav_item_image" src="/static/tab/tab_nor_04.png" mode="aspectFit">
-							</image>
-							<text class="footer_nav_item_text"
-								:class="[selected == 4 ? 'footer_item_text_active' : '']">我的</text>
-						</view>
-					</view>
-				</view>
-				<view class="footer_station"></view>
-
-			</view>
-
 		</view>
-
-		<view v-if="pageNum==2">
-			<view class="shXiang">
-				<image src="../../static/icon/me_lise_more.png" @click="pageNum=1"></image>
-				<view style="height: 20rpx;"></view>
-				<view>商品详情</view>
+		<view class="fourBox" style="padding: 0;" v-if="sbuMedicalTagsList && sbuMedicalTagsList.length > 0">
+			<view class="childrenBox fourIcon flexbox" style="justify-content: space-around;">
+				<div class="item flexbox" @click="curseClickJump(item)" v-for="(item, index) in sbuMedicalTagsList"
+					:key="index">
+					<image :src="item.icon" mode="aspectFit"></image>
+					<text>{{item.title}}</text>
+				</div>
 			</view>
-			<view style="height: 80rpx;"></view>
-			<view class="swiperBox">
-				<swiper :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000"
-					style="width: 100%;height: 100%;">
-					<swiper-item v-for="(item,index) in swiperlist" :key="index" style="width: 100%;height: 100%;">
-						<image :src="item" mode="aspectFit" style="width: 100%;height: 100%;"
-							@click="previewImage(item)">
-						</image>
-					</swiper-item>
-				</swiper>
+		</view></view>		
+		<!-- 正在学习 -->
+		<view class="" style="padding:0 5px;" v-if="learnList.length > 0">		
+		<view class="learnBox" >
+			<view class="titleBox flexbox">
+				<image src="../../static/learing.png" mode="aspectFit"></image>
+				<text>正在学习</text>
 			</view>
-
-			<view class="commodityContent">
-				<view class="commodityPrice" v-if="productInfo.activityPrice && productInfo.activityPrice > 0">
-					<span style="font-size: 28rpx;">￥</span><em>{{productInfo.activityPrice}}</em>
-					<span class="oldPrice ">原价<span
-							style="font-size: 20rpx;padding-left:10rpx;">￥</span>{{productInfo.price}}</span>
-				</view>
-				<view class="commodityPrice" v-else>
-					<span style="font-size: 28rpx;">￥</span><em>{{productInfo.price}}</em>
-				</view>
-				<view class="commodityyName">
-					{{productInfo.productName}}
-					<span v-if="productInfo.productStock==0" style="color: #aaa;font-size:26rpx;">（无货）</span>
-					<view><text class="SoldNumber">已售<span
-								style="padding-left:10rpx;">{{productInfo.sumSales}}</span>件</text></view>
-				</view>
-				<view class="pingjia" v-if="linkProducts && linkProducts.length > 0 && linkProducts[0]">
-					<view class="">
-						<view style="font-weight: 600;margin-bottom: 30rpx;">商品列表</view>
-						<!-- <view class="icon-del rotate"></view> -->
+			<view class="learn flexbox">
+				<view class="item" v-for="(item, index) in learnList" :key="index" @click="onPageJump('/pages/course/myCourseLearn',item.id)">
+					<view class="img" style="overflow: hidden;">
+						<image v-if="item.image && item.image != ''" :src="item.image" mode="aspectFit"></image>
+						<image v-else src="/static/nobg.jpg" mode="widthFix"></image>
 					</view>
-					<!-- 商品包含 -->
-					<view v-if="linkProducts && linkProducts.length > 0 && linkProducts[0]">
-						<view class="spbh" v-for="(item, index) in linkProducts" :key="item.id">
-							<view class="flexbox aligncenter" @click="previewProduct(item,index)">
-								<view class="spbhimg">
+					<view class="txt555">
+						{{item.title}}
+					</view>
+				</view>				
+			</view>
+		</view>
+		</view>
+		<!-- 健康超市 -->
+		<view class="supermarketBox" v-if="tjProList.length > 0">
+			<view class="hightLightTitleBox " @click="onPageJump('/pages/course/healthMarket',2,'健康超市')">
+				<text>健康超市</text>
+			</view>
+			<view class="supermarket">
+				<view class="borderbb">
+					<view class=" main">
+						<view class="flexbox">
+							<view class="item" v-for="(item, index) in tjProList" :key="index"  @click="goGoodsDetail(item,0)">
+								<view class="imgcontainer">
 									<image :src="item.productImages" mode="aspectFit"></image>
 								</view>
-								<text class="username nowrap ">{{item.productName}}</text>
-								<text class="price"
-									v-if="item.activityPrice && item.activityPrice > 0">￥{{item.activityPrice}}</text>
-								<text class="price" v-else>￥{{item.price}}</text>
-							</view>
-						</view>
-					</view>
-					<!-- <view class="quesheng" v-else>
-						<text>暂无关联商品~</text>
-					</view> -->
-				</view>
+								<view class="name">
+									{{item.productName}}
+								</view>
+
+								<view class="price" v-if="item.activityPrice && item.activityPrice > 0">
+									￥{{item.activityPrice}}
+								</view>
+								<view class="price" v-else>
+									￥{{item.price}}
+								</view>
+							</view>
+						</view>
+						<view class="tips">
+							更多保健产品、教学辅助器材及书籍点击<text>健康超市</text>图标进入！
+						</view>
+
+					</view>
 
-				<view class="contentButton">
-					<u-tabs :scrollable="false" :list="contentButtonList" @click="contentButtonClick" :activeStyle="{
-							color: '#303133',
-							fontWeight: 'bold',
-							fontSize: '28rpx'
-						}" :inactiveStyle="{
-							color: '#606266',
-							fontSize: '28rpx'
-						}"></u-tabs>
 				</view>
-				<!-- 详情 + 评价1 -->
-				<view v-if="contentShow == 0">
-					<view class="pingjia">
-						<!-- <h4></h4> -->
-						<view class="" v-if="listenList.length > 0 && listenList[0]&&iosHide" style="margin:0rpx 0rpx 30rpx;">
-							<view class="">
-								<view style="font-weight: 700;margin-bottom: 30rpx;color:#71d5a1;">赠送听书权益</view>
-							</view>
-							<view class="item flexbox aligncenter" v-for="item in listenList" :key="item.id"
-								style="padding-bottom:10rpx;">
-								<view class="spbhimg" @click="previewImage(item.images)">
-									<image :src="item.images" mode="aspectFit"></image>
-								</view>
-								<text style="padding-right: 10rpx;">{{item.name}}</text>
-								<u-icon v-if="item.canListen == true" name="volume" color="#71d5a1" size="24"
-									@click="onYouAlert()"></u-icon>
-								<u-icon v-else name="volume" color="#71d5a1" size="24"
-									@click="onYouAlert()"></u-icon>
-							</view>
-						</view>
-						<view class="">
-							<view style="font-weight: 700;margin:0rpx 0rpx 30rpx;">商品详情</view>
-						</view>
-						<view class="bookInfo">
-							<u-row customStyle="margin-bottom: 10px">
-								<u-col><span>书名：{{productInfo.productName}}</span></u-col>
-							</u-row>
-							<u-row customStyle="margin-bottom: 10px">
-								<u-col v-if="productInfo.author"><span>作者：{{productInfo.author}}</span></u-col>
-							</u-row>
-							<u-row customStyle="margin-bottom: 10px">
-								<u-col span="12"
-									v-if="productInfo.publisher"><span>出版社：{{productInfo.publisher}}</span></u-col>
-							</u-row>
-							<u-row customStyle="margin-bottom: 10px">
-								<u-col span="12"
-									v-if="productInfo.pubDate"><span>出版时间：{{ productInfo.pubDate | formatDate }}</span></u-col>
-							</u-row>
-							<u-row customStyle="margin-bottom: 10px">
-								<u-col span="6" v-if="productInfo.format"><span>开本：{{productInfo.format}}</span></u-col>
-								<u-col span="6"
-									v-if="productInfo.pageNum"><span>页数：{{productInfo.pageNum}}</span></u-col>
-							</u-row>
-							<u-row customStyle="margin-bottom: 10px">
-								<u-col span="6"
-									v-if="productInfo.quality"><span>内文用纸材质：{{productInfo.quality}}</span></u-col>
-							</u-row>
-						</view>
-						<view class="commodityIntroduce">
-							<view v-if="productInfo.productDetails">
-								<rich-text v-if="productInfo.productDetails" class="xiangqing" @itemclick="showImg"
-									:nodes="productInfo.productDetails|formatRichText"></rich-text>
-							</view>
-						</view>
-					</view>
-				</view>
-				<view class="pingjia" v-else>
-					<view class="">
-						<view style="font-weight: 700;margin-bottom: 30rpx;">评价({{commentsList?commentsList.length:0}})
-						</view>
-						<!-- <view class="icon-del rotate"></view> -->
-					</view>
-					<!-- 商品评价 -->
-					<view class="" v-if="commentsList && commentsList.length > 0">
-						<view class="pingjiaBox" v-for="(item, index) in commentsList" :key="index">
-							<view class="flexbox aligncenter">
-								<view class="touxiang">
-									<image :src="item.avatar" mode="aspectFit"></image>
-									<text class="username nowrap ">{{item.name}}</text>
-								</view>
-								<view class="mb30" style="padding: 6rpx 0rpx 0rpx 20rpx;">
-									<span :class="['star',item.starlevel >= 1 ? 'starLight':'starGray']"></span>
-									<span :class="['star',item.starlevel >= 2 ? 'starLight':'starGray']"></span>
-									<span :class="['star',item.starlevel >= 3 ? 'starLight':'starGray']"></span>
-									<span :class="['star',item.starlevel >= 4 ? 'starLight':'starGray']"></span>
-									<span :class="['star',item.starlevel >= 5 ? 'starLight':'starGray']"></span>
-								</view>
-							</view>
-							<view class="contentBox">
-								<div class="pjimgs flexbox">
-									<view class="item" v-for="(item1,index) in item.images">
-										<image v-if="item1.length > 10" @click="previewImage(item1)" :src="item1"
-											mode="aspectFill" style="width:100%; height: 50px;"></image>
-									</view>
-								</div>
-								<view class="content" v-html="item.phtml"></view>
-								<text class="time">{{item.createdate}}</text>
-							</view>
-							<!-- 显示追平 -->
-							<view class="zhuiping item" v-if="item.zphtml != ''" style="padding-left: 60rpx;">
-								<h5 style="color: #dbdbdb;padding: 30rpx 10rpx 10rpx 0rpx;">追评内容：</h5>
-								<view class="flexbox">
-									<view class="contentBox">
-										<view class="content" v-html="item.zphtml"></view>
-										<text class="time">{{item.followUpdate}}</text>
-									</view>
-								</view>
-							</view>
-						</view>
-					</view>
-					<view class="quesheng" v-else>
-						<text>暂无评价~</text>
-					</view>
-				</view>
-				<view style="height: 120rpx;"></view>
 			</view>
-			<uni-goods-nav class="goods_nav" :fill="true" :options="options" :buttonGroup="buttonGroup" @click="onClick"
-				@buttonClick="onYouAlert" />
+		</view>
+		<!-- 限时秒杀 -->
+		<view class="seckillBox" v-if="seckillList.length > 0">
+			<view class="hightLightTitleBox ">
+				<text>限时秒杀</text>
+			</view>
+			<view class="seckill">
+				<view class="borderbb">
+					<view class=" main">
+						<view class="ftitle">
+							<text>天天秒杀 时时返积分</text>
+						</view>
+						<scroll-view class="scroll-view_H" scroll-x="true">
+							<!-- <view class=""> -->
+							<view class="item" v-for="(item, index) in seckillList" :key="index"  @click="goGoodsDetail(item,1)">
+
+								<view class="imgcontainer">
+									<image :src="item.productImages" mode="aspectFit"></image>
+								</view>
+								<view class="name">
+									{{item.productName}}
+								</view>
+								<view class="price" v-if="item.activityPrice && item.activityPrice > 0">
+									￥{{item.activityPrice}}
+								</view>
+								<view class="price" v-else>
+									￥{{item.price}}
+								</view>
+								<view class="fall">
+									<text class="mprice">￥{{item.price}}</text>
+									<text class="cprice">直降<br />￥{{item.price - item.activityPrice}}</text>
+								</view>
+							</view>
+
+							<!-- </view> -->
+						</scroll-view>
+
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 新闻播报 -->
+		<view class="fourBox  " v-if="newsList.length > 0">
+			<view class="newsBox flexbox">
+				<view class="icon">
+					<u-icon name="volume-fill" color="#2979ff" size="26"></u-icon>
+				</view>
+				<view class="newscoll">
+					<swiper class="swiper" interval='5000' circular autoplay vertical indicator-dots="false">
+						<swiper-item class="item" v-for="(item, index) in newsList" :key="index"
+							@click="newsClick(item)">
+							<view class="swiper-item">{{item.title}}</view>
+						</swiper-item>
+		
+					</swiper>
+				</view>
+			</view>
+		</view>
+		<!-- 精彩试听 -->
+		<view class="fourBox" v-if="tryListenList.length > 0">
+			<view class="learnBox">
+				<view class="titleBox flexbox">
+					<image src="../../static/try_listen.png" mode="aspectFit"></image>
+					<text>精彩试听</text>
+				</view>
+				<view class="learn flexbox shiting">
+					<view class="item" v-for="(item, index) in tryListenList" :key="index"
+						@click="onPageJump('/pages/course/courseDetail',item.id, item.title)">
+						<view class="imgcontainer">
+							<image v-if="item.image==''" src="@/static/nobg.jpg" mode="aspectFit"></image>
+							<image v-else :src="item.image" mode="aspectFit"></image>
+						</view>
+						<view class="buyItems flexbox">
+							<view class="txt555">
+								{{item.title}}
+							</view>
+							<view class="buybtn" @click.stop="onPageJump()">
+								<span>购买</span>
+							</view>
+						</view>
+
+					</view>
+				</view>
+				<view class="moreBox shiting">
+					<text @click="onPageJump('/pages/course/tryListen',1,'精彩试听')">更多试听</text>
+				</view>
+			</view>
+		</view>
+		<view>
+			<u-back-top :scroll-top="scrollTop" bottom="60" :customStyle='bgiStyle' :iconStyle="iconStyle"></u-back-top>
+		</view>	
+		</view>
+		<view v-if="selected == 4" style="padding: 0 40rpx;font-size: 28rpx;">
+						<view style="height: 50rpx;"></view>
+						<view class="per_mes">
+		
+							<image src="../../static/icon/home_icon_1.png" class="per_mes_img"></image>
+							<view @click="onLoginJump">
+								<text class="name">点击登录</text>
+		
+							</view>
+							<br clear="both">
+						</view>
+		
+						<view class="xiugai">
+							<view class="nav_list" @click="newOnShare">
+								<text>分享App</text>
+							</view>
+							<view class="nav_list" @click="gotoAbout">
+								<text>关于我们</text>
+							</view>
+		
+						</view>
+					</view>
+		<view>
+			<view class="footer_box footer_bg">
+				<view class="footer_item">
+					<view class="footer_nav_item" @click="selected=1">
+						<image v-if="selected == 1" class="footer_nav_item_image footer_nav_item_image_scale"
+							src="/static/tab/icon1_y.png" mode="aspectFit"></image>
+						<image v-else class="footer_nav_item_image" src="/static/tab/icon1_n.png" mode="aspectFit">
+						</image>
+						<text class="footer_nav_item_text"
+							:class="[selected == 1 ? 'footer_item_text_active' : '']">首页</text>
+					</view>
+				</view>
+				<view class="footer_item">
+					<view class="footer_nav_item" @click="onPageJump()">
+						<image class="footer_nav_item_image" src="/static/tab/order.png" mode="aspectFit"></image>
+						<text class="footer_nav_item_text">我的订单</text>
+					</view>
+				</view>
+				<view class="footer_item">
+					<view class="footer_nav_item" @click="onPageJump()">
+						<image class="footer_nav_item_image" src="/static/tab/tab_nor_03.png" mode="aspectFit"></image>
+						<text class="footer_nav_item_text">太湖公益</text>
+					</view>
+				</view>
+				<view class="footer_item">
+					<view class="footer_nav_item" @click="selected = 4">
+						<image v-if="selected == 4" class="footer_nav_item_image footer_nav_item_image_scale"
+							src="/static/tab/tab_cur_04.png" mode="aspectFit"></image>
+						<image v-else class="footer_nav_item_image" src="/static/tab/tab_nor_04.png" mode="aspectFit">
+						</image>
+						<text class="footer_nav_item_text"
+							:class="[selected == 4 ? 'footer_item_text_active' : '']">我的</text>
+					</view>
+				</view>
+			</view>
+			<view class="footer_station"></view>
+		
 		</view>
 		<!-- 分享弹窗 -->
 		<uni-popup ref="share" type="share" safeArea backgroundColor="#fff">
 			<uni-popup-share @select="haveSelected"></uni-popup-share>
 		</uni-popup>
-
-		<!-- 登录弹窗 -->
-		<u-modal :show="youkeShow" @confirm="onLoginJump" @cancel="youkeShow=false" :show-cancel-button="true"
-			cancel-text="再逛逛~" confirm-text="去登录">
-			<view>
-				您还未登录，请先登录~
-			</view>
-		</u-modal>
+		<!-- 公共组件-每个页面必须引入 -->
+		<public-module></public-module>
 		<!-- <z-navigation></z-navigation> -->
+		<music-play :playList="myList"></music-play>
 	</view>
-
 </template>
 
 <script>
+	import musicPlay from '@/components/music.vue'
+	import repciptData from '@/static/json/repcipt.json'
 	import $http from '@/config/requestConfig.js';
-	import emojiList1 from '../../bkhumor-emojiplus/emoji/biaoqin.js'
 	import {
-
+		mapState,
+		mapMutations
 	} from 'vuex';
 	export default {
 		data() {
 			return {
-				selected: 1,
-				pageNum: 1,
-				newBookList: [],
-				tjProList: [],
-				tagList: [], // 推荐标签列表
+				selected : 1,
+				myList: [],
+
+				showEbook: false, // 显示电子书相关
+				transaction: { // 成功回调
+
+				},
+				curseTagList: [], // 课程标签列表
+				tabsNumber: null,
+				scrollLeft: 0,
+				checking: false, // 正在检测	
+				scrollTop: 0,
 				loadingNow: false,
+				seckillList: [],
+				bgiStyle: {
+					background: '#fff'
+				},
+				learnList: [],
+				tryListenList: [ // 试听列表
+				],
+				curChildrenId: 0,
+				iconStyle: {
+					fontSize: '40rpx',
+					fontWeight: 'bold',
+					color: '#258feb',
+				},
+				tabsid: null,
 				pageSize: 10,
 				page: 1,
 				totalPage: 0,
+				tjProList: [],
 				status: 3,
-				path: '',
-				youkeShow: false,
-				contentShow: 0,
-				swiperlist: [],
-				productInfo: {},
-				listenList: [],
-				linkProducts: [],
-				commentsList: [],
-				options: [],	
-				buttonGroup: [{
-						text: '加入购物车',
-						backgroundColor: 'linear-gradient(90deg, #FFCD1E, #FF8A18)',
-						color: '#fff'
-					},
-					{
-						text: '立即购买',
-						backgroundColor: 'linear-gradient(90deg, #FE6035, #EF1224)',
-						color: '#fff'
-					}
-				],
-				contentButtonList: [{
-						name: '商品详情'
-					},
-					{
-						name: '商品评价'
-					}
-				],
+				userMsg: {}, // 用户信息
+				yxCurIndex: 0, // 当前营销标签序号
+				SystemInfoSync: {}, // 屏幕尺寸
+				sbuMedicalTagsList: [],
+				newsList: [], // 播报新闻列表
+				weburl: '',
+				// webviewStyles: {
+				// 	progress: true,
+				// 	width: '100%',
+				// 	height: '100vh'
+				// }
 			};
 		},
-
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop;
+		},
 		//第一次加载
 		onLoad(e) {
-
-
+			uni.hideTabBar();
 		},
 		onHide() {
 			this.page = 1
-			this.tjProList = []
 		},
 		//页面显示
 		onShow() {
-			// 隐藏原生的tabbar
-			// uni.hideTabBar();
-			this.tjProList = []
-			this.getData();
-			this.getTags()
+			uni.hideTabBar();
+			// #ifdef APP-PLUS
+			plus.screen.unlockOrientation();
+			plus.screen.lockOrientation("portrait-primary");
+			// #endif			
+			this.requestAll()
+		},
+		onTabItemTap() {
+
 		},
 		// 页面加载完毕
 		onReady() {
 			// this.requestIapOrder()
+			// console.log(uni.getSystemInfoSync(), '屏幕')
+		},
+		mounted() {
+			this.requestAll()
 		},
 		// 下拉刷新
 		onPullDownRefresh() {
 			this.page = 1
-			this.tjProList = []
-			this.getData()
-			this.getTags()
+			this.getUserInfo()
+			this.requestAll()
 			uni.stopPullDownRefresh()
 
-		},
-		onReachBottom() {
-			this.loadingNow = true
-			console.log('到底了')
-			if (this.page + 1 <= this.totalPage) {
-				this.status = 0
-				this.page++
-				this.getJtData()
-			} else {
-				this.status = 1
-			}
-
 		},
 
 		filters: {
-			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;
+			// 控制字数
+			ellipsis(value) {
+				if (!value) return '';
+				let reg = /[\u4e00-\u9fa5]/g;
+				let names = value.match(reg);
+				value = names ? names.join('') : '';
+				if (value.length > 50) {
+					return value.slice(0, 50) + '...'
+				}
+				return value
 			},
 		},
-
+		computed: {
+			...mapState(['userInfo']),
+		},
+		components: {
+			musicPlay
+		},
 		//方法
 		methods: {
-			// 获取列表数据
-			getData() {
-				this.getNewBook()
-			},
-
-
-			// 新书上市
-			getNewBook() {
-				this.$http
-					.post('visitor/getNewBook', {
-						'limit': 4,
-						'page': 1
-					})
-					.then(res => {
-						// console.log(res, 'xinshu')
-						this.newBookList = res.page.list
-					}).catch(e => {
-						console.log(e, '新书上市报错')
-					});
-			},
-
-			// 获取商品标签
-			getTags() {
-				this.loadingNow = false
-				this.$http
-					.post('visitor/getLabels')
-					.then(res => {
-						console.log(res, '标签列表')
-						if (res.code == 0 && res.result.labels.length > 0) {
-							this.tagList = res.result.labels
-							this.tabsid = this.tagList[0].splId
-							this.getJtData()
-						}
-					}).catch(e => {
-						console.log(e, 'e')
-					});
-			},
-
-			tabsChange(item) {
-				this.tjProList = []
-				this.tabsid = item.splId
-				this.page = 1
-				// 获取推荐数据
-				this.getJtData()
-			},
-			getJtData() {
-				this.$http
-					.post('visitor/getProductsByLabel', {
-						'splId': this.tabsid,
-						'limit': this.pageSize,
-						'page': this.page
-					})
-					.then(res => {
-						if (res.code == 0 && res.page.records.length > 0) {
-							this.tjProList = this.tjProList.concat(res.page.records)
-							this.totalPage = res.page.pages
-							this.status = 3
-							// console.log(this.tjProList, '按标签检索结果')
-						} else {
-							this.tjProList = []
-							this.totalPage = 0
-						}
-					}).catch(e => {
-						console.log(e, '标签检索报错')
-					});
-			},
-
-			// 页面跳转跳转
-			onPageJump(e) {
+			...mapMutations(['setUserInfo']),
+			gotoAbout(){
 				uni.navigateTo({
-					url: e
-				});
+					url:"/pages/mine/aboutUs/index"
+				})
 			},
-
-			// 商品详情页
-			goDetail(id) {
-				this.pageNum = 2
-				// 获取商品详情
-				uni.showLoading({
-					title: '加载中'
-				});
-				this.swiperlist=[]
+			onLoginJump(){
+				uni.navigateTo({
+					url:"/pages/user/login"
+				})
+			},
+			// 分享
+			newOnShare() {
+				this.$refs.share.open()
+			},
+			haveSelected(data) {
+			  console.log(data, " 选择的是");
+			  if (data.index == 0) {
+			    // 分享到好友
+			    uni.share({
+			      provider: "weixin",
+			      scene: "WXSceneSession",
+			      type: 0,
+			      href: this.$apkUrl,
+			      title: "吴门医述",
+			      summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
+			      imageUrl: "static/icon/home_icon_logo.png",
+			      success: function (res) {
+			        console.log("success:" + JSON.stringify(res));
+			      },
+			      fail: function (err) {
+			        console.log("fail:" + JSON.stringify(err));
+			      },
+			    });
+			  } else if (data.index == 1) {
+			    // 分享到朋友圈
+			    uni.share({
+			      provider: "weixin",
+			      scene: "WXSceneTimeline",
+			      type: 0,
+			      href: this.$apkUrl,
+			      title: "吴门医述",
+			      summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
+			      imageUrl: "static/icon/home_icon_logo.png",
+			      success: function (res) {
+			        console.log("success:" + JSON.stringify(res));
+			      },
+			      fail: function (err) {
+			        console.log("fail:" + JSON.stringify(err));
+			      },
+			    });
+			  }
+			},
+			goGoodsDetail(v,isMiaosha) {
+      console.log(v);
+      uni.navigateTo({
+        // url: '../bookShop/commodityDetail?id=' + item.id
+        url: `/pages/goods/index/index?navTitle=${v.title}&isMiaosha=${isMiaosha}&title=${v.title}&id=${v.productId}&type=visitor`,
+      });
+    },
+			getWebViewMessage(e) {
+				uni.showModal({
+					content: JSON.stringify(e.detail),
+					showCancel: false
+				})
+			},
+			requestAll() {
+				this.getUserInfo()
+				this.tjProList = []
+				uni.hideTabBar();
+				// this.getLearnCourse();
+				this.getSuperMarketList();
+				this.getMedicalTags()
+				this.getSeckill()
+				this.getTryListenList()
+				this.getNewsList()
+				// this.getTags()
+				// this.getYXTgs()
+			},
+			// 获取医学标签列表
+			getMedicalTags(id) {
+				var ftag = null
+				id ? ftag = id : ftag = 0
 				this.$http
-					.post('/visitor/info/' + id)
+					.post('visitor/getCourseMedicalTree')
 					.then(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(",")
-							for (var i = 0; i < imgList.length; i++) {
-								this.swiperlist.push(imgList[i])
+						// console.log(res)
+						if (res.code == 0) {
+							if (res.labels.length > 0) {
+								this.curseTagList = res.labels
+								this.tabsid = res.labels[0].id
+								// this.curseClick(res.labels[0])
+								if (res.labels[0].isLast == 0) { // 非终极
+									if (res.labels[0].children && res.labels[0].children.length > 0) {
+										this.sbuMedicalTagsList = res.labels[0].children
+									} else {
+										this.sbuMedicalTagsList = []
+									}
+								}
+							} else {
+								this.tabsid = null
+								this.curseTagList = []
 							}
 						}
-						uni.hideLoading();
 					}).catch(e => {
-						uni.hideLoading();
-						if (e.msg == '该商品不存在，看看其他商品吧') {
-							setTimeout(() => {
-								uni.navigateBack({
-									delta: 1
-								});
-							}, 2000)
-						}
-					})
-
-
-				// 获取评价详情
+						console.log(e, '获取医学标签列表报错')
+					});
+			},
+			// 获取精彩试听课程列表
+			getTryListenList() {
 				$http.request({
-						url: "visitor/All",
-						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档1
+						url: "visitor/getMarketCourseList",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
 						data: {
-							'bookid': id
+							"id": 1,
+							"limit": 6,
+							"page": 1
 						},
 						header: { //默认 无 说明：请求头
 							'Content-Type': 'application/json'
@@ -575,225 +484,916 @@
 					})
 					.then(res => {
 						if (res.code == 0) {
-							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)
-								item1.phtml = pjstr
-								item1.zphtml = zpstr
-								newarr.push(item1)
-							})
-							this.commentsList = newarr
+							if (res.courseList.records.length > 0) {
+								this.tryListenList = res.courseList.records
+							} else {
+								this.tryListenList = []
+							}
 						}
-					})
-			},
 
-
-			// 获取html格式的评论1
-			getHtmlComment(comment) {
-				// 格式化html
-				// 这里处理 链接   换行符
-				let replacedStr = comment.replace(/\[([^(\]|\[)]*)\]/g, (item, index) => {
-					var indexss = emojiList1.findIndex(item1 => item1.alt === item)
-					return '<img src="https://www.nuttyreading.com/emojis/emojis/qq/' + emojiList1[indexss].url +
-						'" width="18rpx">';
-				});
-				return replacedStr.replace(/(\r\n)|(\n)/g, '<br>');
-			},
-
-
-			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;
-			},
-
-			contentButtonClick(e) {
-				this.contentShow = e.index
-			},
-
-			// 分享
-			newOnShare() {
-				this.$refs.share.open()
-			},
-
-
-			haveSelected(data) {
-				if (data.index == 0) {
-					// 分享到好友
-					uni.share({
-						provider: "weixin",
-						scene: "WXSceneSession",
-						type: 0,
-						href: this.$apkUrl,
-						title: "吴门医述",
-						summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
-						imageUrl: "static/icon/home_icon_logo.png",
-						success: function(res) {
-							console.log("success:" + JSON.stringify(res));
-						},
-						fail: function(err) {
-							console.log("fail:" + JSON.stringify(err));
-						}
 					});
-				} else if (data.index == 1) {
-					// 分享到朋友圈
-					uni.share({
-						provider: "weixin",
-						scene: "WXSceneTimeline",
-						type: 0,
-						href: this.$apkUrl,
-						title: "吴门医述",
-						summary: "我正在使用吴门医述提升自己，赶紧跟我一起来体验吧！",
-						imageUrl: "static/icon/home_icon_logo.png",
-						success: function(res) {
-							console.log("success:" + JSON.stringify(res));
+			},
+			// 获取秒杀商品列表
+			getSeckill() {
+				$http.request({
+						url: "visitor/getMarketShopProductList",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"current": 1,
+							"limit": 12,
+							"medicineMarketId": "1"
 						},
-						fail: function(err) {
-							console.log("fail:" + JSON.stringify(err));
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0) {
+							if (res.result.records.length > 0) {
+								this.seckillList = res.result.records
+							} else {
+								this.seckillList = []
+							}
 						}
+
+					});
+			},
+			// 获取播报新闻列表
+			getNewsList() {
+				$http.request({
+						url: "visitor/listByPage",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"isBook": 0, //是否是疯子读书0否1是
+							"isMedical": 1, //是否是吴门医述0否1是
+							"isSociology": 0 //是否是众妙之门0否1是
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0) {
+							if (res.messages.length > 0) {
+								this.newsList = res.messages
+							} else {
+								this.newsList = []
+							}
+						}
+
+					});
+			},			
+			// 获取健康超市商品列表
+			getSuperMarketList() {
+				$http.request({
+						url: "visitor/getMarketShopProductList",
+						method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+						data: {
+							"current": 1,
+							"limit": 4,
+							"medicineMarketId": "2"
+						},
+						header: { //默认 无 说明：请求头
+							'Content-Type': 'application/json'
+						},
+					})
+					.then(res => {
+						if (res.code == 0) {
+							if (res.result.records.length > 0) {
+								this.tjProList = res.result.records
+							} else {
+								this.tjProList = []
+							}
+						}
+
+					});
+			},
+			newsClick(item) {
+				console.log('item', item)
+				uni.showModal({
+					content:"客官请先登录哦~",
+					confirmText:'去登录',
+					cancelText:'再逛逛',
+					success(res) {
+						if (res.confirm) {
+						uni.navigateTo({
+							url:'/pages/user/login'
+						})
+						}
+					},
+				})
+				return
+				if(item.type == 1 && item.url != ''){
+				uni.navigateTo({
+					url: `/pages/news/newsForwebview?newsId=${item.id}&url=${item.url}&type=${item.type}`
+				})	
+				}else{
+				uni.navigateTo({
+					url: `/pages/news/news?newsId=${item.id}&url=${item.url}&type=${item.type}`
+				})
+				}
+				// }
+			},
+			openURL(url) {
+				// #ifdef APP-PLUS
+				plus.runtime.openURL(url) //这里默认使用外部浏览器打开而不是内部web-view组件打开
+				// #endif
+				// #ifdef H5
+				window.open(url)
+				// #endif
+			},
+			curseClick(item) {
+				uni.showModal({
+					content:"客官请先登录哦~",
+					confirmText:'去登录',
+					cancelText:'再逛逛',
+					success(res) {
+						if (res.confirm) {
+						uni.navigateTo({
+							url:'/pages/user/login'
+						})
+						}
+					},
+				})
+				return
+				this.tabsid = item.id
+				if (item.isLast == 0) { // 终极
+					if (item.children && item.children.length > 0) {
+						this.sbuMedicalTagsList = item.children
+					} else {
+						this.sbuMedicalTagsList = []
+					}
+				} else {
+					uni.navigateTo({
+						url: `/pages/course/index?id=${this.tabsid}&title=${item.title}&pid=${this.tabsid}`
 					});
 				}
 			},
-
-
-
-			// 游客跳转
-			onYouAlert() {
-				// uni.showToast({
-				// 	icon: 'none',
-				// 	title: '请先登录'
-				// })
-				this.youkeShow = true
-			},
-
-
-			// 点击去登录
-			onLoginJump(e) {
+			curseClickJump(item) {
+				uni.showModal({
+					content:"客官请先登录哦~",
+					confirmText:'去登录',
+					cancelText:'再逛逛',
+					success(res) {
+						if (res.confirm) {
+						uni.navigateTo({
+							url:'/pages/user/login'
+						})
+						}
+					},
+				})
+				return
 				uni.navigateTo({
-					url: '/pages/user/login'
+					// url: `/pages/course/index?id=${item.id}&title=中医学`
+					url: `/pages/course/index?id=${item.id}&title=${item.title}&pid=${item.pid}`
 				});
 			},
+			// 获取用户详情
+			getUserInfo() {
+				// 用户详情
+				// if (this.userInfo.id != undefined) {
+				this.$http
+					.post('book/user/info/' + this.userInfo.id)
+					.then(res => {
+						this.userMsg = res.user
+					});
+				// }
+			},
+
+			// 跳转
+			onPageJump(url, thatId, title) {
+				uni.showModal({
+					content:"客官请先登录哦~",
+					confirmText:'去登录',
+					cancelText:'再逛逛',
+					success(res) {
+						if (res.confirm) {
+						uni.navigateTo({
+							url:'/pages/user/login'
+						})
+						}
+					},
+				})
+				return
+				uni.navigateTo({
+					url: `${url}?id=${thatId}&title=${title}`
+				});
+			},
+
+			onPageJumpData(url, data) {
+				uni.navigateTo({
+					url: url + '?id=' + data
+				});
+			},
+
+			onTabJump(url) {
+				uni.switchTab({
+					url: url
+				});
+			},
+
+			onGoing() {
+				uni.showToast({
+					icon: 'none',
+					title: '开发中，敬请期待...'
+				})
+			},
+
+			// 电子书内容跳转
+			onBookJump(e) {
+				uni.navigateTo({
+					url: '../eBook/bookContent?Id=' + e.bookid
+				});
+			},
+			// 商品详情页
+			goDetail(id) {
+				uni.navigateTo({
+					url: '../bookShop/commodityDetail?id=' + id
+				});
+			},
+
+			// 列表跳页
+			onShopMore(e) {
+				uni.navigateTo({
+					url: '../bookShop/bookShopType?type=' + e
+				});
+			},
+			appjumpfun(name) {
+				let bagName = ''
+				let schemes = ''
+				if (name == 'zmzm') {
+					bagName = 'com.cn.zmzm'
+					schemes = 'zmzm'
+				}
+				if (name == 'nuttyreading') {
+					bagName = 'com.cn.nuttyreading'
+					schemes = 'nuttyreading'
+				}
+				// if(name == 'everhealth'){
+				if (plus.os.name == "Android") { //安卓
+					if (plus.runtime.isApplicationExist({ //查看安卓系统手机有没有下载这款app
+							pname: bagName, //B款app云打包的包名
+						})) { //安装了app
+						plus.runtime.launchApplication({ //打开app
+							pname: bagName, //B款app云打包的包名
+							extra: {
+								url: `${schemes}://${bagName}` //B款app配置的schemes+云打包的包名
+							},
+							function(e) {
+								console.log("Open system default browser failed: " + e.message);
+							}
+						})
+					} else { //未安装app
+						plus.runtime.openURL(`https://a.app.qq.com/o/simple.jsp?pkgname=${bagName}`, function(res) {
+							//进入后台小哥哥给我的应用宝下载链接，让你们后台给你
+							//这链接会判断你手机是ios还是Android，Android进入应用宝下载app
+							//跟下面的是一个链接
+							console.log(res);
+						});
+					}
+				} else if (plus.os.name == "iOS") { //苹果
+					//因为ios查不到B款app在ios系统手机里面，其实下载了，也是检测不到，所以就不检测了
+					//直接打开B款app，B款app没有的话，会进入回调报错，我们在回调去打开下载链接
+					plus.runtime.launchApplication({
+						action: "${schemes}://"
+					}, function(e) {
+						plus.runtime.openURL(`https://a.app.qq.com/o/simple.jsp?pkgname=${bagName}`, function(
+						res) {
+							//进入后台小哥哥给我的appStore下载app链接，，让你们后台给你
+							//这链接会判断你手机是ios还是Android，ios进入应用宝下载app
+							//跟上面的是一个链接
+							console.log(res);
+						});
+					});
+					// }
+
+				}
+			},
+
+			// 三个列表跳页
+			onBookMore(e) {
+				uni.navigateTo({
+					url: '../eBook/bookType?Type=' + e
+				});
+			},
+
 
 
 		},
 
 	};
 </script>
-
 <style lang="scss" scoped>
 	@import '@/style/mixin.scss';
-
-	.flexbox {
-		display: flex;
+	.xiugai {
+	
+		.nav_list {
+			background-color: #fff;
+			padding: 30upx 0 30upx 20upx;
+			display: flex;
+			align-items: center;
+			position: relative;
+			font-weight: bold;
+			border-bottom: 1px solid #e5e5e5;
+	
+			&:active {
+				background-color: #f5f5f5;
+			}
+	
+			text {
+				color: #333;
+				margin-left: 10rpx;
+			}
+	
+			&::after {
+				content: '';
+				position: absolute;
+				right: 20upx;
+				top: 50%;
+				transform: translateY(-50%);
+				width: 40upx;
+				height: 40upx;
+				background-image: url('../../static/icon/icon_right.png');
+				background-position: center center;
+				background-repeat: no-repeat;
+				background-size: cover;
+			}
+		}
+	
+		.nav_list:nth-last-child(1) {
+			border-bottom: 0;
+		}
 	}
-
-	.aligncenter {
+	.per_mes {
+		margin: 0 0 50rpx 0;
 		align-items: center;
-	}
-
-	.home_bg {
-		background-image: url('@/static/icon/home_bg.jpg');
-		background-position: center center;
-		background-repeat: no-repeat;
-		background-size: cover;
-		padding: 20rpx;
-		position: relative;
-
-		.icon_hua_1 {
-			width: 100%;
-			text-align: center;
-			height: 80rpx;
-
-			image {
-				width: 150rpx;
-				height: 80rpx;
+	
+		.per_mes_img {
+			width: 120upx;
+			height: 120upx;
+			background-color: #fff;
+			border-radius: 120upx;
+			margin: 0 30upx 0 0;
+			float: left;
+		}
+	
+		view {
+			float: left;
+			margin-top: 20rpx;
+	
+			.name {
+				display: inline-block;
+				font-weight: bold;
+				font-size: 38upx;
+				margin-bottom: 10rpx;
+			}
+	
+			.tong {
+				color: #999;
+				font-size: 25upx;
+			}
+	
+			.per_user_img {
+				display: inline-block;
+				width: 40upx;
+				height: 40upx;
+				margin-left: 10rpx;
+				vertical-align: super;
 			}
 		}
+	
+	
+	}
+	.nomargin{margin: 0 !important;}
+	.nopadding{padding: 0 !important;}
+	.noRadius{border-radius: 0 !important;}
+	.appJump {
+		position: fixed;
+		right: 0;
+		top: 8%;
+		z-index: 1;
 
-		.icon_hua {
-			width: 100%;
-			text-align: center;
-			display: block;
+		.item {
+			background: rgba(255, 255, 255, .9);
+			margin-bottom: 20rpx;
+			border: 1px solid #fff;
+			align-items: center;
+			padding-right: 10rpx;
+			overflow: hidden;
+			border-radius: 50rpx 0 0 50rpx;
 
-			image {
-				width: 150rpx;
-				height: 150rpx;
-				margin: 0 auto;
+			text {
+				font-size: 20rpx;
+			}
+
+			.img {
+				// width: 60rpx;  height: 60rpx;
+				padding: 6rpx;
+				overflow: hidden;
+
+				image {
+					width: 36rpx;
+					height: 36rpx;
+					border-radius: 100%;
+				}
 			}
 		}
-
-
 	}
 
-	.head_line {
-		padding-top: 8rpx;
-		margin: 12rpx 0 0 0;
+	.newsBox {
+		justify-content: space-between;
+		background-color: #fff;
+		@include mshadow(10px, 1);
+		margin-top: 10px;
+		overflow: hidden;
+		border-radius: 20rpx;
+		padding: 10rpx;
+		overflow: hidden;
 
+		.icon {
+			width: 44rpx;
+		}
 
-		b {
-			display: inline-block;
-			width: 12rpx;
+		.newscoll {
+			overflow: hidden;
+			width: calc(100% - 60rpx);
 			height: 40rpx;
-			background-color: #54a966;
-			vertical-align: bottom;
-			margin: 0 20rpx 0 0;
+			border: #11a669;
+			line-height: 50rpx;
+
+			.item {
+
+
+				.swiper-item {
+					font-size: 28rpx;
+					@include toe();
+				}
+			}
+		}
+	}
+
+	.containerBg {
+		min-height: 100vh;
+		background-color: $containerColor;
+
+	}
+
+	.shiting {
+		flex-wrap: wrap;
+		justify-content: space-between;
+		margin-bottom: 40rpx;
+
+		.buyItems {
+			align-items: center;
+
+			.buybtn {
+				display: block;
+				width: 28%;
+				padding: 0 4px;
+				font-size: 24rpx;
+				line-height: 40rpx;
+				text-align: center;
+				background-color: $themeColor;
+				color: #fff;
+				border-radius: 20rpx;
+				height: 40rpx;
+			}
+
+			.txt555 {
+				width: 70%;
+				overflow: hidden;
+			}
+		}
+	}
+
+	.moreBox {
+		margin-top: 10px;
+		text-align: center;
+
+		text {
+			display: inline-block;
+			border: 1px solid $themeColor;
+			// @include theme("btn_bg");
+			padding: 14rpx 0;
+			width: 80%;
+			border-radius: 60rpx;
+			color: $themeColor;
+		}
+
+	}
+
+	.supermarket {
+		@include pleft_right(5px) .borderbb {
+			background-image: linear-gradient(180deg, #468aff 0%, #46c0ff 100%);
+			@include pleft_right(10px);
+			border-radius: 20rpx;
+			@include ptop_bottm(10px);
+			@include mshadow(10px, 1);
+
+		}
+
+		.tips {
+			margin-top: 10px;
+			background-color: #e9f0ff;
+			padding: 5px;
+			border-radius: 5px;
+			font-size: 24rpx;
+
+
+			text {
+				font-weight: bold;
+				color: $themeColor;
+			}
+		}
+
+	}
+
+	.seckillBox {
+		.hightLightTitleBox {
+			background: url('@/static/level_bg_red.png') center top no-repeat;
+			background-size: contain;
+			height: 60rpx;
+			color: red;
+		}
+	}
+
+	.seckill {
+		@include pleft_right(5px) .borderbb {
+			background-image: linear-gradient(180deg, #d93737 0%, #fff 100%);
+			@include pleft_right(10px);
+			border-radius: 20rpx;
+			@include ptop_bottm(10px);
+			@include mshadow(10px, 1);
+
+		}
+
+		.yxTagBox {
+			width: 100%;
+		}
+
+		.tips {
+			margin-top: 10px;
+			background-color: #e9f0ff;
+			padding: 5px;
+			border-radius: 5px;
+			font-size: 24rpx;
+
+
+			text {
+				font-weight: bold;
+				color: $themeColor;
+			}
+		}
+
+		.main {
+
+			background-color: #fff;
+			@include pleft_right(10px);
+			@include ptop_bottm(10px);
+			border-radius: 20rpx;
+
+			.ftitle {
+				font-size: 34rpx;
+				color: red;
+				font-weight: bold;
+			}
+		}
+
+		.item {
+			display: inline-block;
+			overflow: hidden;
+
+			.name {
+				font-size: 24rpx;
+				@include toe();
+				margin-top: 10rpx;
+			}
+
+			.price {
+				font-size: 26rpx;
+
+				color: #666;
+				padding-top: 10rpx;
+			}
+
+			.fall {
+				background-image: linear-gradient(-90deg, #e70503 0%, #e7a535 100%);
+				border-radius: 10px;
+				color: #fff;
+				padding: 4rpx;
+				padding-bottom: 8rpx;
+				height: 50rpx;
+				line-height: 40rpx;
+				position: relative;
+				margin-top: 50rpx;
+				font-size: 24rpx;
+
+				.mprice {
+					width: 52%;
+					font-size: 28rpx;
+					font-weight: bold;
+				}
+
+				.cprice {
+					color: #333;
+					text-align: center;
+					padding: 28rpx 0;
+					width: 46%;
+
+					line-height: 24rpx;
+					position: absolute;
+					right: 0;
+					bottom: 0;
+					background: url(@/static/miaosha_bg.png) center no-repeat;
+					background-size: contain;
+				}
+			}
+
+			image {
+				width: 100%;
+				height: 240rpx;
+			}
+		}
+	}
+
+	.supermarketBox {
+		.hightLightTitleBox {
+			background: url('@/static/level_bg_green.png') center top no-repeat;
+			background-size: contain;
+			height: 60rpx;
+			color: $themeColor;
+		}
+
+		.main {
+
+			background-color: #fff;
+			@include pleft_right(10px);
+			@include ptop_bottm(10px);
+			border-radius: 20rpx;
+
+			.flexbox {
+				justify-content: space-between;
+			}
+		}
+
+		.item {
+			overflow: hidden;
+			width: 23%;
+
+			.name {
+				font-size: 24rpx;
+				@include toe();
+				margin-top: 10rpx;
+			}
+
+			.price {
+				text-align: center;
+				font-size: 26rpx;
+				font-weight: bold;
+				color: $themeColor;
+				padding-top: 10rpx;
+			}
+
+			image {
+				width: 100%;
+				height: 240rpx;
+			}
+		}
+	}
+
+	.hightLightTitleBox {
+		margin: 20rpx 0;
+		text-align: center;
+		line-height: 60rpx;
+
+		text {
+
+			font-size: 30rpx;
+			font-weight: bold;
+		}
+	}
+
+	.learnBox {
+		background-color: #fff;
+		margin-top: 10px;
+		border-radius: 20rpx;
+		@include ptop_bottm(10px);
+		@include pleft_right(10px);
+		@include mshadow(10px, 1);
+		margin-bottom: 10px;
+		.img{
+			width: 100%; height: 180rpx;
+			background-color: #f7f7f7;
+			display: flex; align-items: center;
+		}
+		.learn {
+			justify-content: space-between;
+			margin-top: 20rpx;
+			flex-wrap: wrap;
+			.item {
+				width: 48%;
+
+				overflow: hidden;
+
+				image {
+					width: 100%;
+					height: 200rpx;
+				}
+
+				.txt555 {
+					height: 40rpx;
+					line-height: 40rpx;
+					@include bov(1);
+					margin-top: 10rpx;
+					font-size: 24rpx;
+
+				}
+
+			}
+		}
+	}
+
+	.titleBox {
+		align-items: center;
+
+		image {
+			width: 50rpx;
+			height: 50rpx
 		}
 
 		text {
-			font-size: 32rpx;
-			font-weight: bold;
+			font-size: 30rpx;
+			padding-left: 20rpx;
+			align-items: center
+		}
+	}
+
+	.fourBox {
+		@include pleft_right(4px)
+	}
+
+	.childrenBox {		
+		background-color: #e4eefa !important;
+		// @include mshadow(10px, 1);
+		background-color: #fff;
+		justify-content: center;
+		box-shadow: none !important;
+		border-radius: 0 !important;		
+
+		.item {
+			text {
+				color: #3361a5;
+			}
 		}
 
-		i {
-			float: right;
-			font-style: normal;
-			color: #8b8a91;
-			font-size: 24rpx;
-			margin: 5rpx 35rpx 0 0;
+		image {
+			width: 80rpx;
+			height: 80rpx;
+		}
+	}
+
+	.children_cate {
+		justify-content: space-evenly;
+		padding: 0 10rpx;
+		background-color: #fff;
+		display: flex;
+		justify-items: normal;
+		padding-top: 12rpx;
+		overflow: hidden;
+		padding-bottom: 10rpx;
+
+		.item {
+			width: 100%;
+			text-align: center;
+			margin-right: 1px;
+			font-size: 32rpx;
+			padding: 10rpx;
+			color: #fff;
+			// background-color: #55aa7f;
+			background-color: #eee;
+			color: #333;
+			border-radius: 10rpx;
+		}
+
+		.item:last-child {
+			margin-right: 0;
+		}
+
+		.cur {
+			color: #55aa7f;
+			font-weight: bold;
+			border-radius: 5rpx;
+		}
+	}
+
+	.fourIcon {
+		justify-content: space-between;
+		box-shadow: 0px 0px 10px 0px rgba(167, 187, 228, 1);
+		margin-bottom: 8px;
+		// border: 1px solid #fff;
+		text-align: center;
+		height: 60px;
+		// border: 2px solid #e0e9ff;
+		background-color: #fff;
+		border-radius: 10px;
+		// @include theme('fourIcon') ;
+		line-height: 60px;
+
+		.item {
+			align-items: center;
+		}
+
+		text {
+			font-size: 28rpx;
+			color: #76664d;
+			padding-left: 6rpx;
+		}
+
+		image {
+			width: 48rpx;
+			height: 48rpx;
+			margin: 0 auto;
 		}
 	}
 
 
+
+
+
+	.activityPrice {
+		font-size: 60rpx;
+	}
+
+
+
+	.ProTabs {
+		// margin: 20rpx 0; 
+		padding: 0 20rpx;
+
+		text {
+
+			padding: 8rpx 14rpx;
+			font-size: 32rpx;
+			display: inline-block;
+			border-radius: 10rpx;
+			overflow: hidden;
+			// background-color: #eee;
+			color: #55aa7f;
+			margin-right: 10rpx;
+		}
+
+		text.cur {
+			background-color: #55aa7f;
+			color: #fff;
+		}
+	}
+
+	.New_ProTabs {
+		justify-content: space-between;
+		background-color: #fff;
+		padding-left: 5px;
+		padding-right: 5px;
+
+		text {
+			// max-width: 12.5%;
+			// background-color: #56565633;
+			font-size: 32rpx;
+			padding: 5px 3px;
+			font-weight: bold;
+			display: block;
+			width: 100%;
+			border-radius: 10rpx;
+			overflow: hidden;
+			// background-color: #eee;
+			color: #333;
+			// white-space:wrap !important;
+			text-align: center;
+		}
+
+		text.cur {
+			background-color: #55aa7f;
+			color: #fff;
+		}
+	}
+
+
+
+	// .newBook{margin-top: 10rpx;}
 	.scroll-view_H {
 		background-color: #fff;
 		white-space: nowrap;
 		padding: 10rpx;
 		margin-top: 12rpx;
+	}
 
+	.scroll-view_H {
 		.item {
 			padding: 10rpx;
 			overflow: hidden;
 			display: inline-block;
 			padding-bottom: 0;
-			width: 180rpx !important;
-			margin-right: 20rpx;
+			width: 210rpx !important;
+			margin-right: 8rpx;
 			border-radius: 10rpx;
 
 			.videoBox {
@@ -819,361 +1419,202 @@
 		// .item.active{margin-right: 20rpx; border: 1px solid #55aa00;  border-radius: 10rpx;}
 	}
 
-
-
-	.ProTabs {
-		// margin: 20rpx 0; 
-		padding: 0 20rpx;
-
-		text {
-			padding: 8rpx 14rpx;
-			font-size: 32rpx;
-			display: inline-block;
-			border-radius: 10rpx;
-			overflow: hidden;
-			// background-color: #eee;
-			color: #55aa7f;
-			margin-right: 10rpx;
-		}
-
-		text.cur {
-			background-color: #55aa7f;
-			color: #fff;
-		}
+	.flexbox {
+		display: flex;
 	}
 
-	.goods {
-		width: 100%;
-		margin: 0 0 50rpx 0;
-		background-color: #fff;
 
-		.goodsItem {
-			display: inline-block;
-			width: 46%;
-			border-radius: 20rpx;
-			padding: 25rpx;
-			padding-bottom: 5rpx;
-			margin: 0 20rpx 20rpx 20rpx;
+	.home_bg {
+		background-image: url('@/static/icon/home_bg.jpg');
+		background-position: center center;
+		background-repeat: no-repeat;
+		background-size: cover;
+		padding:30rpx 20rpx;
+		position: relative;
+		padding-bottom: 40rpx;
+		// margin-bottom:60rpx;
+		// height: 400rpx; margin-bottom: 130rpx;
+		.icon_hua_1 {
+			// margin: 0 auto;
+			width: 100%;
+			text-align: center;
+			height: 80rpx;
+
+			image {
+				width: 150rpx;
+				height: 80rpx;
+			}
+		}
+
+		.icon_hua {
+			width: 100%;
+			text-align: center;
+			display: block;
+
+			image {
+				width: 150rpx;
+				height: 150rpx;
+				margin: 0 auto;
+			}
+		}
+
+
+	}
+
+.newLeve2{
+	// box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.3);
+	background-color: #fff;
+	padding: 0 10rpx;
+	border-top: 1px solid #eee;
+	// padding-bottom:2rpx;
+}
+	.home_nar {
+		margin: 10px 0;
+		justify-content: space-between;
+		color: #333;
+		margin-bottom: 0;
+
+		@include pleft_right(5px) 
+		.hn_cl_tit {
+			display: block;
+			width: 100%;
 			background-color: #fff;
-			border: 1px solid #eee;
+			text-align: center;
+			// border-radius: 20rpx;
+			align-content: center;
+			justify-content: center;
+			margin-right: 8rpx;
+			border-bottom: 1px solid #fff;
+			// box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.3);
 
-			.goodsImg {
-				width: 98%;
-				height: 380rpx;
-				border-radius: 10rpx;
-			}
-
-			.goodsContent {
-
-				.goodsName {
-					margin-top: 10rpx;
-					font-size: 28rpx;
-					// font-weight: bold;
-				}
-
-				.goodsPrice {
-					font-size: 28rpx;
-					margin: 5rpx 0 0 3rpx;
-					display: flex;
-					justify-content: space-between;
-
-					.price {
-						font-weight: bold;
-						color: #ff0000;
-					}
-
-					.Salesnum {
-						color: #9b9b9b;
-					}
-				}
-			}
-		}
-
-		.goodsItem:nth-child(2n) {
-			margin-left: 0;
-		}
-	}
-
-	.per_mes {
-		margin: 0 0 50rpx 0;
-		align-items: center;
-
-		.per_mes_img {
-			width: 120upx;
-			height: 120upx;
-			background-color: #fff;
-			border-radius: 120upx;
-			margin: 0 30upx 0 0;
-			float: left;
-		}
-
-		view {
-			float: left;
-			margin-top: 20rpx;
-
-			.name {
-				display: inline-block;
-				font-weight: bold;
-				font-size: 38upx;
-				margin-bottom: 10rpx;
-			}
-
-			.tong {
-				color: #999;
-				font-size: 25upx;
-			}
-
-			.per_user_img {
-				display: inline-block;
-				width: 40upx;
-				height: 40upx;
-				margin-left: 10rpx;
-				vertical-align: super;
-			}
-		}
-
-
-	}
-
-	.shXiang {
-		background-color: #fff;
-		height: 80rpx;
-		text-align: center;
-		position: fixed;
-		top: 80rpx;
-		left: 0;
-		right: 0;
-		z-index: 100;
-
-		view {
-			font-weight: bold;
-			font-size: 32rpx;
-		}
-
-		image {
-			width: 18rpx;
-			height: 25rpx;
-			transform: scale(-1);
-			position: fixed;
-			top: 105rpx;
-			left: 40rpx;
-		}
-	}
-
-
-	.xiugai {
-
-		.nav_list {
-			background-color: #fff;
-			padding: 30upx 0 30upx 20upx;
-			display: flex;
-			align-items: center;
-			position: relative;
-			font-weight: bold;
-			border-bottom: 1px solid #e5e5e5;
-
-			&:active {
-				background-color: #f5f5f5;
+			image {
+				width: 120rpx;
+				height: 90rpx;
+				display: block;
+				margin: 0 auto;
+				padding: 20rpx;
+				// margin: 0 20rpx;
 			}
 
 			text {
-				color: #333;
-				margin-left: 10rpx;
-			}
-
-			&::after {
-				content: '';
-				position: absolute;
-				right: 20upx;
-				top: 50%;
-				transform: translateY(-50%);
-				width: 40upx;
-				height: 40upx;
-				background-image: url('../../static/icon/icon_right.png');
-				background-position: center center;
-				background-repeat: no-repeat;
-				background-size: cover;
-			}
-		}
-
-		.nav_list:nth-last-child(1) {
-			border-bottom: 0;
-		}
-	}
-
-
-	.swiperBox {
-		width: 100%;
-		height: 375px;
-
-	}
-
-	.commodityContent {
-		background-color: #fff;
-		padding: 30rpx 30rpx 10rpx 30rpx;
-		height: auto;
-		font-size: 26rpx;
-
-		.commodityPrice {
-			// background-image: linear-gradient(0deg, #f7fffc 0%, #def0ea 100%);
-			// border-top: 1px solid #fff;
-			// background-color: #f7faf9;
-			// border-top-left-radius: 20rpx;
-			// border-top-right-radius: 20rpx;
-			color: #ffa200;
-			padding: 0rpx 0rpx 0rpx 16rpx;
-
-			em {
-				font-size: 40rpx;
-				font-style: normal;
-			}
-
-			.oldPrice {
-				background-color: #ff000013;
-				;
-				padding: 4rpx 14rpx;
-				border-radius: 20rpx;
-				margin-left: 20rpx;
-				font-size: 28rpx;
-				color: #ff0000;
-			}
-		}
-
-		.commodityyName {
-			margin-top: -20rpx;
-			padding: 30rpx 20rpx 40rpx 20rpx;
-			font-size: 40rpx;
-			font-weight: 600;
-			border-top-left-radius: 20rpx;
-			border-top-right-radius: 20rpx;
-			background-color: #fff;
-
-			.SoldNumber {
-				font-size: 24rpx;
-				color: #999;
-				margin-top: 16rpx;
-				font-weight: 400;
-			}
-		}
-
-		.commodityIntroduce {
-			font-size: 30rpx;
-			// background-color: #fff;
-			// padding: 0 20rpx 30rpx 20rpx;
-		}
-
-
-		.pingjia {
-			background-color: #f5f5f5;
-			border-radius: 20rpx;
-			// margin-top: 20rpx;
-			padding: 30rpx 30rpx 20rpx;
-
-			.pingjiaBox {
-				color: #555;
-				margin-bottom: 20rpx;
-			}
-			
-			.touxiang {
-				width: 100rpx;
-				overflow: hidden;
+				display: block;
+				padding-bottom: 20rpx;
 				text-align: center;
-			
-				image {
-					width: 40px !important;
-					padding: 3px;
-					height: 40px !important;
-					border: 1px solid #eee;
-					border-radius: 64px;
-					overflow: hidden;
-					margin: 0 auto;
-				}
-			
-				.username {
-					font-size: 24rpx;
-					color: #999;
-					margin-top: 6rpx;
-				}
+				margin-top: 4rpx;
+				font-size: 28rpx;
+				color: #00337f;
+				font-weight: blod;
 			}
-			
-			.contentBox {
-				width: 100%;
-				box-sizing: border-box;
-				padding: 0rpx 10rpx 30rpx 6rpx;
-			
-				.content {
-					font-size: 28rpx;
-					line-height: 40rpx;
-					margin-top: 10rpx;
-				}
-			
-				.time {
-					font-size: 24rpx;
-					color: #999;
-					padding-top: 6rpx;
-					float: right;
-				}
-			}
-			
-			.star {
-				display: inline-block;
-				width: 15px;
-				height: 15px;
-				margin-right: 6rpx;
-			}
-			
-			.starGray {
-				background: url(../../static/icon/star_greey.png) no-repeat;
-				background-size: contain;
-			}
-			
-			.starLight {
-				background: url(../../static/icon/star_light.png) no-repeat;
-				background-size: contain;
-			}
-
 		}
 
+		.hn_cl_tit:last-child {
+			margin-right: 0;
+		}
 
-		.spbh {
-			padding-bottom: 10rpx;
-			font-size: 26rpx;
+		.hn_cl_tit.active {
+			background-color: #e4eefa;
+			// position: relative;
+			text {
+				color: #3361a5;
+				font-weight: bold;
+			}
+		}
+		// .hn_cl_tit.active::after{ 
+		// 	 display: block; 
+		// 	 transform: rotate(180deg);
+		// 	content: ''; position: absolute; bottom: -20rpx; left: calc(50% - 16rpx); z-index: 1;
+		// 	 border-right: 20rpx solid transparent;
+		// 	       border-left: 20rpx solid transparent;
+		// 	       border-bottom: 20rpx solid #ffff;
+		// }
+	}
+
+
+
+	.home_shujia {
+		margin: 40rpx 20rpx 0 20rpx;
+		display: flex;
+		color: #333;
+
+		.hn_sj {
+			width: 20%;
+			text-align: center;
+			font-size: 26upx;
+
+			image {
+				width: 100upx;
+				height: 100upx;
+				margin: 0 auto;
+			}
+		}
+	}
+
+	.limited {
+		width: 100%;
+		height: auto;
+		padding: 20rpx 10rpx 10rpx 10rpx;
+		display: flex;
+		align-items: center;
+		background-color: #fff;
+		margin-top: 50rpx;
+
+		.limitedSymbol {
+			width: 22%;
+			height: 300rpx;
+			border-right: 1px solid #eee;
+			vertical-align: middle;
+
+			image {
+				width: 120rpx;
+				height: 120rpx;
+				margin: 45px auto 0 auto;
+			}
+		}
+
+		.limitedScrollBox {
+			width: 76%;
 			padding: 0 10rpx;
 		}
 
-		.spbhimg {
-			width: 40px;
-			overflow: hidden;
+		.limitedItem {
+			width: 200rpx;
 			text-align: center;
 
 			image {
-				width: 40px !important;
-				padding: 3px;
-				height: 40px !important;
-				border: 1px solid #eee;
-				border-radius: 6rpx;
-				overflow: hidden;
+				width: 150upx;
+				height: 200upx;
+				margin: 15rpx auto 20rpx auto;
 			}
 
+			text {
+				font-size: 20rpx;
+				display: block;
+			}
+
+			.biaoti {
+				font-size: 30rpx;
+				margin: 10rpx 0 10rpx 0;
+				font-weight: bold;
+			}
+
+			.xian {
+				font-size: 32rpx;
+				color: #bf0c0c;
+				font-weight: bold;
+			}
+
+			.yuan {
+				text-decoration: line-through;
+				color: #c1c1c1;
+
+			}
 		}
 
 	}
 
-	.goods_nav {
-		z-index: 1;
-		position: fixed;
-		bottom: 0;
-		width: 100%;
+	.imgcontainer {
+		background-color: $imgBg;
 	}
-
-
-	.footer_station {
-		height: 110rpx;
-		box-sizing: content-box;
-		padding-bottom: constant(safe-area-inset-bottom);
-		padding-bottom: env(safe-area-inset-bottom);
-	}
-
 	.footer_box {
 		height: 110rpx;
 		position: fixed;
@@ -1189,17 +1630,17 @@
 		padding-bottom: constant(safe-area-inset-bottom);
 		padding-bottom: env(safe-area-inset-bottom);
 	}
-
+	
 	.footer_bg {
 		background-color: #FFF;
 		box-shadow: 0 0px 10px 1px #0000001a;
 	}
-
+	
 	.footer_item {
 		position: relative;
 		flex: 1;
 	}
-
+	
 	.footer_nav_item {
 		/* #ifndef APP-NVUE */
 		display: flex;
@@ -1209,45 +1650,45 @@
 		justify-content: center;
 		height: 100%;
 	}
-
+	
 	.footer_nav_item:active {
 		background-color: rgba($color: #fff, $alpha: 0.1);
 	}
-
+	
 	.footer_nav_item_text {
 		font-size: 26rpx;
 		color: #909090;
 		margin-top: 6rpx;
 	}
-
+	
 	.footer_nav_item_text_active {
 		color: #f9a633;
 	}
-
+	
 	.footer_nav_item_image {
 		width: 50rpx;
 		height: 50rpx;
-
+	
 	}
-
+	
 	.footer_nav_item_image_scale {
 		animation: mescrollUpRotate 0.6s linear 1;
 	}
-
+	
 	@keyframes mescrollUpRotate {
 		0% {
 			transform: scale(1.2);
 		}
-
+	
 		100% {
 			transform: scale(1);
 		}
 	}
-
-
-
+	
+	
+	
 	.footer_item_text_active {
-		color: #258feb;
+		color: $themeColor;
 		font-weight: bold;
 	}
 </style>
\ No newline at end of file
diff --git a/pages/user/workOrder.vue b/pages/user/workOrder.vue
index 2e68f49..0719ae1 100644
--- a/pages/user/workOrder.vue
+++ b/pages/user/workOrder.vue
@@ -64,7 +64,7 @@
 
 			<view class="input_box">
 				<text class="input_tit">问题截图:</text>
-				<view class="in" style="border: none;">
+				<view class="in" style="border: none;" @click="checkPermision">
 					<u-upload :fileList="fileList1" @afterRead="addPic" @delete="deletePic" multiple :maxCount="4"
 						width="40" height="40" :previewFullImage="true">
 					</u-upload>
@@ -78,6 +78,7 @@
 </template>
 <script>
 	import $http from '@/config/requestConfig.js';
+	import permission from "@/js_sdk/wa-permission/permission.js"
 	import {
 		mapState,
 		mapMutations
@@ -207,8 +208,14 @@
 				// console.log('键盘输入',e);
 				this.telError = false
 			},
-			addPic(e) {
-				// console.log("添加图片");
+			async checkPermision(){
+					  var result = await permission.premissionCheck("CAMERA_EXTERNAL_STORAGE")
+					  if (result != 1) {			 
+					  	return false
+					  }		  
+			},
+			async addPic(e) {				
+				 console.log("添加图片");
 				let that = this;
 				for (var i = 0; i < e.file.length; i++) {
 					//console.log(i,e.file[i].url)
diff --git a/unpackage/debug/iOS_debug.ipa b/unpackage/debug/iOS_debug.ipa
index 87f1662..e0e9d72 100644
Binary files a/unpackage/debug/iOS_debug.ipa and b/unpackage/debug/iOS_debug.ipa differ