diff --git a/manifest.json b/manifest.json
index f45145a6..99d50a90 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
     "name" : "太湖云医",
     "appid" : "__UNI__1B1584A",
     "description" : "太湖云医",
-    "versionName" : "1.0.10",
-    "versionCode" : 1010,
+    "versionName" : "1.0.11",
+    "versionCode" : 1011,
     "transformPx" : false,
     "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */
diff --git a/package.json b/package.json
index 81c5cdbe..129c2a73 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "edu-core": "file:../edu-core",
+    "edu-core": "git+https://git.nuttyreading.com/chenghuan/edu-core.git#v1.0.11",
     "jquery": "^3.7.1",
     "lodash": "^4.17.21",
     "qs": "^6.14.0",
diff --git a/pages/curriculum/detail.vue b/pages/curriculum/detail.vue
index c704cd2c..f3fe1001 100644
--- a/pages/curriculum/detail.vue
+++ b/pages/curriculum/detail.vue
@@ -6,7 +6,7 @@
 			<CommonCourseVideo
         :video-list="videoArray"
         :current-index="currentVideoIndex !== null ? currentVideoIndex : 0"
-        :course="{courseTitle:options.navTitle, chapterTitle: curriculumData.title}"
+        :course="{courseTitle:options.navTitle, chapterTitle: curriculumData.title, catalogueId: curriculumData.catalogueId || '', courseId: curriculumData.courseId || ''}"
         :cover="options.curriculumImgUrl"
         :http="$http"
       />
diff --git a/pages/curriculum/index3.vue b/pages/curriculum/index3.vue
index db575c40..4158bdd9 100644
--- a/pages/curriculum/index3.vue
+++ b/pages/curriculum/index3.vue
@@ -422,7 +422,7 @@
 						});
 						
 						const joinedText = this.textList.join('/');
-						this.goBuyTitle = '购买'+joinedText+'VIP，即可畅享更多专属权益';
+						this.goBuyTitle = '购买'+joinedText+'VIP，即可畅享更多专属权益(不包含论坛)';
 					}
 				})
 			},
diff --git a/pages/my/index.vue b/pages/my/index.vue
index e9837922..ab3cbdaf 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -34,12 +34,17 @@
           </view>
         </view>
         <view class="userInfoBox">
-          <view class="name">{{
-            userMes.nickname ? userMes.nickname : "未设置"
-          }}</view>
+          <view class="name">
+						{{ userMes.nickname ? userMes.nickname : "未设置" }}
+						<text v-if="userMes.profile" class="user-profile">({{userMes.profile}})</text>
+					</view>
           <view class="phone" v-if="userMes.tel"
             >手机号：({{ userMes.tel }})</view
           >
+					<view>
+						<u-tag v-if="userMes.todayWatch" :text="userMes.todayWatch" size="mini" plain plainFill type="success" class="watch-time"></u-tag>
+						<u-tag v-if="userMes.totalWatch" :text="userMes.totalWatch" size="mini" plain plainFill class="watch-time"></u-tag>
+					</view>
         </view>
         <br clear="both" />
       </view>
@@ -256,6 +261,9 @@ export default {
       if (this.userInfo.id != undefined) {
         this.$http.post("common/user/getUserInfo").then((res) => {
           this.userMes = res.result;
+					this.userMes.profile = res.des || '';
+					this.userMes.todayWatch = res.todayWatch || '';
+					this.userMes.totalWatch = res.totalWatch || '';
         });
       }
     },
@@ -429,6 +437,12 @@ export default {
       line-height: 40rpx;
       color: #333;
     }
+		
+		.user-profile{
+			font-size: 28rpx;
+			font-weight: normal;
+			display: inline-block;
+		}
 
     .phone {
       font-size: 26rpx;
@@ -442,6 +456,11 @@ export default {
       margin-left: 10rpx;
       vertical-align: super;
     }
+		.watch-time {
+			margin-top: 10rpx;
+			display: inline-block;
+			margin-right: 10rpx;
+		}
   }
 }
 
diff --git a/pages/my/persData.vue b/pages/my/persData.vue
index 4947b7a4..501676ea 100644
--- a/pages/my/persData.vue
+++ b/pages/my/persData.vue
@@ -1,1048 +1,91 @@
 <template>
-	<view class="commonPageBox">
-		<z-nav-bar title="个人资料"></z-nav-bar>
-		<view class="contentBox commonPageContentBox">
-			<view class="avatar_box">
-				<image :src="userData.avatar" class="per_mes_img" @click="
-					handleClickRightContent(
-					  { type: 'avatar' },
-					  userData.avatar ? '' : 'bind'
-					)
-				  "></image>
-				<text class="avatar_text" @click="
-					handleClickRightContent(
-					  { type: 'avatar' },
-					  userData.avatar ? '' : 'bind'
-					)
-				  ">{{ userData.avatar ? "更换头像" : "设置头像" }}</text>
-			</view>
-			<view class="set_box">
-				<common-list :dataList="dataList" isNoIcon="true" label="title">
-					<template slot="rightSlot" slot-scope="slotProps">
-						<view class="right_content">
-							<view v-if="slotProps.row.type == 'sex'">
-								<text v-if="userData[slotProps.row.indexValue]">
-									{{ userData[slotProps.row.indexValue] == 2 ? "女" : "男" }}</text>
-								<view v-else @click="handleClickRightContent(slotProps.row, 'bind')">未设置</view>
-							</view>
-							<view v-if="slotProps.row.type == 'nickname'">
-								<text v-if="userData[slotProps.row.indexValue]">
-									{{ userData[slotProps.row.indexValue] }}</text>
-								<view v-else @click="handleClickRightContent(slotProps.row, 'bind')">未设置</view>
-							</view>
-							<view v-if="slotProps.row.type == 'tel'">
-								<text v-if="userData[slotProps.row.indexValue]">
-									{{ userData[slotProps.row.indexValue] }}</text>
-								<view v-else @click="handleClickRightContent(slotProps.row, 'bind')">点击绑定</view>
-							</view>
-							<view v-if="slotProps.row.type == 'password'"
-								@click="handleClickRightContent(slotProps.row, 'bind')">
-								{{ userData[slotProps.row.indexValue] ? "更改密码" : "设置密码" }}
-							</view>
-							<view v-if="slotProps.row.type == 'email'">
-								<text v-if="userData[slotProps.row.indexValue]">
-									{{ userData[slotProps.row.indexValue] }}</text>
-								<view v-else @click="handleClickRightContent(slotProps.row, 'bind')">点击绑定</view>
-							</view>
-							<view v-if="slotProps.row.type == 'age'">
-								<text v-if="userData[slotProps.row.indexValue]">
-									{{ userData[slotProps.row.indexValue] }}</text>
-								<view v-else @click="handleClickRightContent(slotProps.row, 'bind')">未设置</view>
-							</view>
-
-							<u-icon v-if="
-                  userData[slotProps.row.indexValue] &&
-                  userData[slotProps.row.indexValue] != ''
-                " class="editIcon" name="edit-pen-fill" color="#5188e5" size="20"
-								@click.native.stop="handleClickRightContent(slotProps.row)"></u-icon>
-						</view>
-						<text class="fdButtonBox aui-text-success">{{ slotProps.row.content }}</text>
-
-						<view> </view>
-					</template>
-				</common-list>
-			</view>
-			<view class="button_box">
-			</view>
-		</view>
-		<u-popup :show="editModalShow" :round="10" @close="">
-			<view class="tanchu">
-				<view class="dp_title">{{ editModalTitle }}</view>
-				<template v-if="currentEditType == 'nickname'">
-					<u--input v-model="editForm.nickname" placeholder="请输入昵称" border="surround" clearable></u--input>
-				</template>
-				<template v-if="currentEditType == 'tel'">
-					<view style="display: flex">
-						<view class="quhao">
-							<uni-data-select class="quhaoSel" placeholder="请选择区号" v-model="editForm.quCode"
-								:localdata="quCodeList"></uni-data-select>
-						</view>
-						<u--input v-model="editForm.phone" placeholder="请输入手机号" border="surround" clearable>
-						</u--input>
-					</view>
-					<view style="display: flex">
-						<u--input v-model="editForm.phonecode" type="number" placeholder="请输入验证码" border="surround"
-							clearable style="margin-top: 20rpx">
-						</u--input>
-						<button class="emPHCode" @click="onSetCode('phone')">
-							{{ PhoneEmailNote }}
-						</button>
-					</view>
-				</template>
-				<template v-if="currentEditType == 'password'">
-					<u--input maxlength="8" v-model="editForm.password" placeholder="请输入新密码" :password="true"
-						border="surround" clearable @input="inputMethod(editForm.password)">
-					</u--input>
-					<view class="" style="font-size: 28rpx; color: #999">
-						<p v-if="passNote != ''">{{ passNote }}</p>
-						<p v-html="passStr" style="margin-top: 10rpx"></p>
-					</view>
-					<u--input maxlength="8" v-model="editForm.Repassword" placeholder="请再确认密码" :password="true"
-						border="surround" clearable style="margin-top: 20rpx"></u--input>
-				</template>
-				<template v-if="currentEditType == 'email'">
-					<u--input v-model="editForm.email" placeholder="请输入邮箱" border="surround" clearable>
-					</u--input>
-					<view style="display: flex">
-						<u--input v-model="editForm.emailcode" type="number" placeholder="请输入验证码" border="surround"
-							clearable style="margin-top: 20rpx">
-						</u--input>
-						<button class="emPHCode" @click="onSetCode('email')">
-							{{ PhoneEmailNote }}
-						</button>
-					</view>
-				</template>
-
-				<template v-if="currentEditType == 'age'">
-					<u--input v-model="editForm.age" type="number" placeholder="请输入年龄" border="surround" clearable>
-					</u--input>
-				</template>
-				<template v-if="currentEditType == 'sex'">
-					<u-radio-group v-model="editForm.sex">
-						<view style="width: 100%">
-							<view v-for="(item, index) in sexList" class="dp_sex">
-								{{ item.title }}
-								<u-radio :key="index" activeColor="#5188e5" :name="item.id"
-									style="float: right; margin-top: 5rpx"></u-radio>
-							</view>
-						</view>
-					</u-radio-group>
-				</template>
-				<template v-if="currentEditType == 'avatar'">
-					<view class="" @click="checkPermision">
-						<u-upload :fileList="fileAvatar" @afterRead="afterRead" @delete="deletePic" multiple
-							:maxCount="1" width="150" height="150" :previewFullImage="true">
-						</u-upload>
-					</view>
-				</template>
-
-				<u-button color="linear-gradient(to right, #005eae, #5188e5)" text="确定" @click="handleSubmit()"
-					style="margin-top: 50rpx; border-radius: 50rpx;"></u-button>
-				<view @click="closeModal()" class="dp_canBtn"> 取消</view>
-			</view>
-		</u-popup>
-	</view>
+  <view class="container commonPageBox">
+    <!-- 公共组件-每个页面必须引入 -->
+    <public-module></public-module>
+    <z-nav-bar title="个人资料" bgColor="#258feb" fontColor="#fff"></z-nav-bar>
+    
+    <UserInfo :userInfo="userInfo" :$http="$http" :dataList="dataList" @show-submit-info="onShowSubmitInfo" @close-submit-info="closeManager"></UserInfo>
+  </view>
 </template>
 
 <script>
-	import permission from "@/js_sdk/wa-permission/permission.js"
-	import $http from "@/config/requestConfig.js";
-	var clear;
-	import {
-		mapState
-	} from "vuex";
-	// 密码验证的正则
-	//1、密码为八位及以上并且字母数字特殊字符三项都包括
-	var strongRegex = new RegExp(
-		"^(?=.{8,})(?=.*[A-Z])(?=.*[a-z])(?=.*[0-9])(?=.*\\W).*$",
-		"g"
-	);
-	//2、密码为八位及以上并且字母、数字、特殊字符三项中有两项，强度是中等
-	var mediumRegex = new RegExp(
-		"^(?=.{8,})(((?=.*[A-Z])(?=.*[a-z]))|((?=.*[A-Z])(?=.*[0-9]))|((?=.*[a-z])(?=.*[0-9]))|((?=.*[a-z])(?=.*\\W))|((?=.*[0-9])(?=.*\\W))|((?=.*[A-Z])(?=.*\\W))).*$",
-		"g"
-	);
-	var enoughRegex = new RegExp("(?=.{8,}).*", "g");
-	export default {
-		data() {
-			return {
-				showCropper: false,
-				submitInfo: {},
-				showSubmitInfoBlank: false,
-				playData: {},
-				userData: {},
-				isPassWordPhone: true,
-				currentEditType: null,
-				editForm: {},
-				editModalShow: false,
-				dataList: [{
-						title: "昵称",
-						indexValue: "nickname",
-						type: "nickname",
-					},
-					{
-						title: "手机号",
-						indexValue: "tel",
-						type: "tel",
-					},
-					{
-						title: "邮箱",
-						indexValue: "email",
-						type: "email",
-					},
-					{
-						title: "密码",
-						indexValue: "password",
-						type: "password",
-					},
-					{
-						title: "年龄",
-						indexValue: "age",
-						type: "age",
-					},
-					{
-						title: "性别",
-						indexValue: "sex",
-						type: "sex",
-					}
-				],
-				userMes: {
-					quCode: "",
-					phone: "",
-					email: "",
-					id: "",
-					age: "",
-					sex: "",
-					nickname: "",
-					tel: "",
-					oldName: "", // 老的用户名
-				},
-				userMsage: {
-					quCode: "",
-					phonecode: "",
-					phone: "",
-					emailcode: "",
-					email: "",
-					id: "",
-					age: "",
-					sex: "",
-					nickname: "",
-					tel: "",
-					YNpass: "",
-					oldName: "", // 老的用户名
-				},
-				userMiMa: {
-					id: "",
-					password: "",
-					Repassword: "",
-				},
-				readonly: false,
-				phoneShow: false,
-				emailShow: false,
-				avatarShow: false,
-				nicknameShow: false,
-				ageShow: false,
-				sexShow: false,
-				passwordShow: false,
-				fileAvatar: [],
-				quCodeList: [], // 国家区域码
-				sexList: [{
-						title: "男",
-						id: 1,
-					},
-					{
-						title: "女",
-						id: 2,
-					},
-				],
-				PhoneEmailNote: "获取验证码",
-				passNote: "",
-				passStr: "",
-				editModalTitle: "",
-				passwordOk: false, // 密码是否满足规则
+  import UserInfo from "edu-core/components/user-info/index.vue";
+  import $http from "@/config/requestConfig.js";
+  import { mapState } from "vuex";
 
-				urlList: {
-					sendcode: "common/user/sms/sendcode", //密码登录
-					sendEmailcode: "common/user/getMailCaptcha", //密码登录
-					setPassword: "common/user/setPasswordById", //密码登录
-					userInfo: "book/user/info/", //密码登录
-					updateUserTel: "common/user/updateUserTel", //绑定手机号
-					updateUserEmail: "common/user/updateUserEmail", //绑定邮箱
-				},
-			};
-		},
-		//第一次加载
-		onLoad(e) {
-			// 隐藏原生的tabbar
-			uni.hideTabBar();
-		},
-		computed: {
-			...mapState(["userInfo"]),
-		},
-		//页面显示
-		onShow() {
-			// 隐藏原生的tabbar
-			uni.hideTabBar();
-			this.getData();
-			this.getCountyCode();
-		},
-		//方法
-		methods: {
-
-			async checkPermision() {
-				var result = await permission.premissionCheck("CAMERA_EXTERNAL_STORAGE")
-				if (result != 1) {
-					return false
-				}
-			},
-			handleChangeIsPassWordPhone() {
-				this.editForm = {};
-				this.isPassWordPhone = !this.isPassWordPhone;
-				this.editForm.quCode = this.quCodeList[0].value;
-				this.OpenClear();
-			},
-			closeModal() {
-				this.currentEditType = null;
-				this.editForm = {};
-				this.editModalShow = false;
-			},
-			handleClickRightContent(row, type) {
-				this.OpenClear();
-				var title = "";
-				this.currentEditType = row.type;
-				console.log("row.type at line 122:", row);
-				switch (row.type) {
-					case "tel":
-						title = `${type == "bind" ? "绑定" : "修改"}手机号`;
-						this.editForm.quCode = this.quCodeList[0].value;
-
-						break;
-					case "email":
-						title = `${type == "bind" ? "绑定" : "修改"}邮箱`;
-						break;
-
-					case "password":
-						title = "修改密码";
-						this.isPassWordPhone = true;
-						break;
-
-					case "nickname":
-						title = `${type == "bind" ? "设置" : "更改"}昵称`;
-
-						break;
-					case "age":
-						title = `${type == "bind" ? "设置" : "更改"}年龄`;
-						break;
-
-					case "sex":
-						title = `${type == "bind" ? "设置" : "更改"}性别`;
-						if (this.userData.sex) {
-							this.editForm.sex = this.userData.sex;
-							console.log("this.editForm.sex at line 603:", this.editForm.sex);
-						}
-
-						break;
-					case "avatar":
-						title = `${type == "bind" ? "设置" : "更改"}头像`;
-						break;
-				}
-				this.editModalTitle = title;
-				this.editModalShow = true;
-			},
-			async handleSubmit() {
-				var title = "";
-				switch (this.currentEditType) {
-					case "tel":
-						await this.chosePhone();
-						break;
-					case "email":
-						await this.choseEmail();
-						break;
-
-					case "password":
-						await this.chosePassword();
-						break;
-					case "avatar":
-						await this.choseAvatar();
-						break;
-
-					default:
-						if (this.currentEditType == "nickname") {
-							if (!this.editForm.nickname || this.editForm.nickname == "") {
-								this.editForm.nickname = this.userData.nickname;
-								this.$commonJS.showToast("昵称不可为空");
-								return false;
-							}
-						} else if (this.currentEditType == "avatar") {
-							if (this.fileAvatar.length == 0) {
-								this.$commonJS.showToast("请上传图片");
-								return false;
-							}
-							this.editForm.avatar = this.fileAvatar[0].url;
-						} else if (this.currentEditType == "sex") {
-							if (this.editForm.sex == 2) {
-								this.editForm.sex = 0
-							}
-						} else if (this.currentEditType == "age") {
-							if (this.editForm.age <= 0) {
-								this.$commonJS.showToast("年龄不能小于0");
-								return false;
-							}
-						}
-						await this.choseData();
-						break;
-				}
-			},
-			// 获取
-			// 获取国家区域编码
-			getCountyCode() {
-				this.$http.request({
-					url: "book/baseArea/getAllBaseArea",
-					method: "POST",
-					data: {},
-					header: {
-						"Content-Type": "application/json",
-					},
-				})
-				.then((res) => {
-					if (res.code == 0 && res.baseAreas.length > 0) {
-						this.quCodeList = res.baseAreas.map((item) => {
-							let obj = {
-								text: item.title + " (+" + item.code + ")",
-								value: item.code,
-							};
-							return obj;
-						});
-						this.$forceUpdate();
-					} else {
-						this.quCodeList = [];
-					}
-				})
-				.catch((e) => {
-					
-				});
-			},
-			getData() {
-				let that = this;
-				// 获取个人信息
-				if (this.userInfo.id != undefined) {
-					this.$http.post(this.urlList.userInfo + that.userInfo.id)
-					.then((res) => {
-						that.userData = res.user;
-						if (that.userData.sex == 0) {
-							that.userData.sex = 2
-						}
-					});
-				}
-			},
-			cancelPass() {
-				this.passwordShow = false;
-				this.userMiMa.password = "";
-				this.userMiMa.Repassword = "";
-				this.passNote = "";
-				this.passStr = "";
-			},
-			// 密码验证
-			inputMethod(value) {
-				this.passwordOk = false;
-				if (strongRegex.test(value)) {
-					this.passStr = "<span style='color:#18bc37'>密码强度很不错哦！</span>";
-					this.passNote = "";
-					this.passwordOk = true;
-				} else if (mediumRegex.test(value)) {
-					this.passNote =
-						"请至少使用大小写字母、数字、符号两种类型组合的密码，长度为8位。";
-					this.passStr = "<span style='color:#2979ff'>密码强度中等!</span>";
-					this.passwordOk = true;
-				} else if (enoughRegex.test(value)) {
-					this.passStr = "<span style='color:#f3a73f'>密码强度太弱!</span>";
-					this.passNote =
-						"请至少使用大小写字母、数字、符号两种类型组合的密码，长度为8位。";
-				} else {
-					this.passwordOk = false;
-					this.passNote =
-						"请至少使用大小写字母、数字、符号两种类型组合的密码，长度为8位。";
-					this.passStr = "";
-				}
-			},
-			openTel() {
-				this.userMes = {};
-				this.phoneShow = true;
-				this.OpenClear();
-			},
-			openEmail() {
-				this.userMes = {};
-				this.emailShow = true;
-				this.OpenClear();
-			},
-			// 清除验证码
-			OpenClear() {
-				clearInterval(clear);
-				this.PhoneEmailNote = "获取验证码";
-				this.readonly = false;
-			},
-
-			// 获取验证码
-			emPHCode() {
-				clear && clearInterval(clear);
-				this.readonly = true;
-				this.PhoneEmailNote = "60S";
-				var s = 60;
-				clear = setInterval(() => {
-					s--;
-					this.PhoneEmailNote = s + "S";
-					if (s <= 0) {
-						clearInterval(clear);
-						this.PhoneEmailNote = "获取验证码";
-						this.readonly = false;
-					}
-				}, 1000);
-			},
-			sendTelCode(phone, quCode) {
-				if (phone == "") {
-					uni.showToast({
-						title: "请输入手机号",
-						icon: "none",
-					});
-					return;
-				}
-				if (quCode == "" || quCode == 86) {
-					if (!this.$base.phoneRegular.test(phone)) {
-						uni.showToast({
-							title: "手机格式不正确",
-							icon: "none",
-						});
-						return;
-					}
-				}
-
-				this.$http
-					.post(this.urlList.sendcode, {
-						phone: phone,
-						areaCode: quCode,
-						type: 2000,
-					})
-					.then((res) => {
-						uni.showToast({
-							title: "验证码发送成功",
-							icon: "none",
-						});
-						this.emPHCode();
-					});
-			},
-			sendEmailCode(email) {
-				if (email == "") {
-					uni.showToast({
-						title: "请输入邮箱",
-						icon: "none",
-					});
-					return;
-				}
-				if (!this.$base.mailRegular.test(email)) {
-					uni.showToast({
-						title: "邮箱格式不正确",
-						icon: "none",
-					});
-					return;
-				}
-				this.$http
-					.post(this.urlList.sendEmailcode, {
-						email: email,
-					})
-					.then((res) => {
-						uni.showToast({
-							title: "验证码发送成功",
-							icon: "none",
-						});
-						this.emPHCode();
-					});
-			},
-			// 发送验证码
-			onSetCode(e) {
-				console.log("e at line 932:", e);
-				var that = this;
-				if (this.readonly) {
-					return;
-				}
-				if (e == "phone" || e == "phone") {
-					this.sendTelCode(this.editForm.phone, this.editForm.quCode);
-				}
-				if (e == "email") {
-					this.sendEmailCode(this.editForm.email);
-				}
-				if (e == "phonePassword") {
-					this.sendTelCode(this.editForm.phone, this.editForm.quCode);
-				}
-				if (e == "emailPassword") {
-					this.sendEmailCode(this.editForm.phone);
-				}
-			},
-
-			// 手机
-			async chosePhone(e) {
-				var data = {
-					code: this.editForm.phonecode,
-					phone: this.editForm.phone,
-					id: this.userData.id,
-					quCode: this.editForm.quCode,
-				};
-				if (data.phone == "") {
-					this.$commonJS.showToast("请输入手机号");
-					return;
-				}
-				if (data.quCode == null || data.quCode == 86) {
-					// 如果没选择国家code，默认是中国大陆
-					if (!this.$base.phoneRegular.test(data.phone)) {
-						this.$commonJS.showToast("手机格式不正确");
-						return;
-					}
-				}
-
-				if (data.code == "" || data.code == null) {
-					this.$commonJS.showToast("请输入验证码");
-					return;
-				}
-				let that = this;
-				$http.request({
-					url: this.urlList.updateUserTel,
-					method: "POST",
-					data: data,
-					header: {
-						"Content-Type": "application/json",
-					},
-				})
-				.then(async (res) => {
-					if (res.code == 0) {
-						that.$commonJS.showToast("绑定手机号成功");
-						that.editModalShow = false;
-						that.editForm = {};
-						that.OpenClear();
-						setTimeout(async () => {
-							await this.getData();
-						}, 500);
-					}
-				})
-				.catch(function(error) {
-					
-				});
-			},
-
-			// 邮箱
-			async choseEmail(e) {
-				var data = {
-					code: this.editForm.emailcode,
-					email: this.editForm.email,
-					id: this.userData.id,
-				};
-
-				if (data.email == "") {
-					this.$commonJS.showToast("请输入邮箱");
-
-					return;
-				}
-
-				if (!this.$base.mailRegular.test(data.email)) {
-					this.$commonJS.showToast("邮箱格式不正确");
-
-					return;
-				}
-				if (data.code == "" || data.code == null) {
-					this.$commonJS.showToast("请输入验证码");
-					return;
-				}
-				let that = this;
-				$http.request({
-					url: this.urlList.updateUserEmail,
-					method: "POST",
-					data: data,
-					header: {
-						"Content-Type": "application/json",
-					},
-				})
-
-				.then(async (res) => {
-					if (res.code == 0) {
-						that.$commonJS.showToast("绑定邮箱成功");
-						that.editModalShow = false;
-						that.editForm = {};
-						that.OpenClear();
-						setTimeout(async () => {
-							await that.getData();
-						}, 500);
-					}
-				})
-				.catch(function(error) {
-					console.log(error);
-				});
-			},
-
-			// 头像
-			choseAvatar(e) {
-				let that = this;
-				if (that.fileAvatar.length == 0) {
-					uni.showToast({
-						title: "请选择图片",
-						icon: "none",
-					});
-					return;
-				}
-				that.editForm.avatar = that.fileAvatar[0].url;
-				that.choseData();
-				that.avatarShow = false;
-				that.fileAvatar.splice(0, 1);
-			},
-			// 年龄
-			choseAge(e) {
-				let that = this;
-				if (that.userMes.age <= 0) {
-					uni.showToast({
-						title: "年龄不能小于0",
-						icon: "none",
-					});
-					return;
-				}
-				that.choseData();
-				that.ageShow = false;
-			},
-
-			// 昵称
-			choseNickname(e) {
-				let that = this;
-				if (e && e != "") {
-					that.choseData();
-					that.nicknameShow = false;
-				} else {
-					that.userMes.nickname = that.userMes.oldName;
-					uni.showToast({
-						title: "昵称不可为空",
-						icon: "none",
-					});
-				}
-			},
-
-			// 性别
-			choseSex(e) {
-				let that = this;
-				that.editForm.sex = e;
-				that.choseData();
-			},
-
-			// 修改密码
-			async chosePassword() {
-				var data = {
-					id: this.userData.id,
-					password: this.editForm.password
-				};
-				if (!this.passwordOk) {
-					this.$commonJS.showToast(this.passNote);
-					return;
-				}
-				let that = this;
-				if (that.editForm.Repassword == "" || that.editForm.password == "") {
-					this.$commonJS.showToast("请输入密码！");
-
-					return;
-				}
-				if (that.editForm.Repassword != that.editForm.password) {
-					this.$commonJS.showToast("两次密码输入不一致！");
-
-					return;
-				}
-				this.$http
-					.post(this.urlList.setPassword, data)
-
-					.then(async (res) => {
-						if (res.code == 0) {
-							that.$commonJS.showToast("修改成功");
-							that.editModalShow = false;
-							that.editForm = {};
-							that.OpenClear();
-							setTimeout(async () => {
-								await that.getData();
-							}, 500);
-						}
-					})
-					.catch(function(error) {
-						console.log(error);
-					});
-			},
-
-			// 修改个人资料
-			choseData() {
-				var that = this;
-				var data = {
-					...this.userData,
-					...this.editForm,
-				};
-				this.$http.request({
-					url: "book/user/update",
-					method: "POST",
-					data: data,
-					header: {
-						"Content-Type": "application/json",
-					},
-				})
-
-				.then(function(res) {
-					if (res.code == 0) {
-						that.$commonJS.showToast("修改成功");
-						that.editModalShow = false;
-						that.editForm = {};
-						setTimeout(async () => {
-							await that.getData();
-						}, 500);
-					}
-				})
-				.catch(function(error) {
-					
-				});
-			},
-
-			// 头像上传
-			afterRead(e) {
-				let that = this;
-				uni.uploadFile({
-					url: this.$baseUrl + "/oss/fileoss",
-					filePath: e.file[0].url,
-					name: "file",
-					formData: {},
-					success: (res) => {
-						that.fileAvatar.push({
-							url: JSON.parse(res.data).url,
-						});
-					},
-				});
-			},
-
-			//删除图片
-			deletePic() {
-				let that = this;
-				that.fileAvatar.splice(0, 1);
-			},
-		},
-	};
+export default {
+  data() {
+    return {
+      showSubmitInfoBlank: false,
+      submitInfo: {},
+      dataList: [
+        {
+          title: "昵称",
+          indexValue: "nickname",
+          type: "nickname",
+        },
+        {
+          title: "手机号",
+          indexValue: "tel",
+          type: "tel",
+        },
+        {
+          title: "邮箱",
+          indexValue: "email",
+          type: "email",
+        },
+        {
+          title: "密码",
+          indexValue: "password",
+          type: "password",
+        },
+        {
+          title: "年龄",
+          indexValue: "age",
+          type: "age",
+        },
+        {
+          title: "性别",
+          indexValue: "sex",
+          type: "sex",
+        },
+        {
+          title: "身份",
+          indexValue: "socialIdentity",
+          type: "profile",
+        },
+      ],
+    }
+  },
+  //第一次加载
+  onLoad(e) {
+    // 隐藏原生的tabbar
+    uni.hideTabBar();
+  },
+  computed: {
+    ...mapState(["userInfo"]),
+  },
+  //页面显示
+  onShow() {
+    // 隐藏原生的tabbar
+    uni.hideTabBar();
+  },
+  components: {
+	  UserInfo
+  },
+  //方法
+  methods: {
+    onShowSubmitInfo(info) {
+      this.submitInfo = info;
+      this.showSubmitInfoBlank = true;
+    },
+    closeManager() {
+      this.submitInfo = {};
+      this.showSubmitInfoBlank = false;
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-@import "@/static/mixin.scss";
-.btn_box {
-	margin-top: 40rpx;
-	padding: 10px;
-
-	button {
-		font-size: 32rpx;
-		background-color: #e5e5e5;
-		color: #fff;
-		height: 80rpx;
-		line-height: 80rpx;
-		border-radius: 50rpx;
-
-		&.active {
-			@include theme("btn_bg") color: #fff;
-		}
-	}
-}
-
-.tabulate {
-	.per_list {
-		font-size: 30rpx;
-		background-color: #fff;
-		padding: 0;
-		align-items: center;
-		position: relative;
-		border-top: 1px solid #e5e5e5;
-		width: 100%;
-		overflow: auto;
-
-		text.biaoti {
-			color: #333;
-			display: inline-block;
-			margin: 25rpx 0 25rpx 40rpx;
-		}
-
-		text.neirong {
-			color: #888;
-			font-weight: normal;
-			float: right;
-			margin: 25rpx 80rpx 0 0;
-			display: block;
-		}
-
-		text.marPer {
-			color: #fff;
-			font-weight: normal;
-			float: right;
-			margin: 25rpx 0 0 0;
-			display: block;
-			border-radius: 10rpx;
-			background-color: #eee;
-			padding: 2rpx 10rpx;
-		}
-	}
-
-	.per_list_arrow {
-		font-size: 30rpx;
-		background-color: #fff;
-		padding: 0;
-		align-items: center;
-		position: relative;
-		border-top: 1px solid #e5e5e5;
-		width: 100%;
-		overflow: auto;
-
-		&:active {
-			background-color: #f5f5f5;
-		}
-
-		&::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;
-		}
-	}
-}
-
-.avatar_box {
-	padding: 20rpx;
-	box-sizing: border-box;
-	display: flex;
-	align-items: center;
-	flex-direction: column;
-	justify-content: center;
-	background-color: #fff;
-
-	.per_mes_img {
-		width: 180rpx;
-		height: 180rpx;
-		background-color: #f5f5f5;
-		border-radius: 120rpx;
-		margin: 10rpx 0;
-	}
-
-	.avatar_text {
-		color: $themeColor;
-		line-height: 60rpx;
-		font-size: 30rpx;
-		font-weight: 600;
-	}
-}
-
-.tanchu {
-	padding: 60rpx 50rpx 80rpx 50rpx;
-
-	.dp_title {
-		font-size: 32rpx;
-		margin-bottom: 50rpx;
-		color: #555;
-		text-align: center;
-		font-weight: bold;
-	}
-
-	.dp_sex {
-		font-size: 30rpx;
-		padding-bottom: 20rpx;
-		margin-bottom: 20rpx;
-		border-bottom: 1px solid #ededed;
-
-		image {
-			width: 40rpx;
-			height: 40rpx;
-			display: inline-block;
-			margin-right: 20rpx;
-			vertical-align: bottom;
-		}
-	}
-
-	.dp_canBtn {
-		text-align: center;
-		font-size: 28rpx;
-		margin-top: 25rpx;
-		color: #888;
-	}
-
-	.emPHCode {
-		height: 80rpx;
-		width: 200rpx;
-		background-color: #f8f9fb;
-		font-size: 28rpx;
-		padding: 0 14rpx;
-		color: $themeColor;
-		line-height: 80rpx;
-		margin: 20rpx 0 0 20rpx;
-		display: inline-block;
-	}
-
-	.quhao {
-		height: 60rpx;
-		width: 240rpx;
-		margin: 1rpx 15rpx 0 0;
-
-		.quhaoSel {
-			/deep/.uni-select {
-				font-size: 24rpx;
-			}
-
-			/deep/.uni-select__selector-item {
-				font-size: 24rpx;
-			}
-
-			/deep/.uni-stat__select {
-				height: 60rpx;
-			}
-		}
-	}
-}
-
-/deep/.scroll-view-item:nth-child(2n-1) {
-	background-color: transparent !important;
-}
-
-.right_content {
-	width: auto;
-	height: 100%;
-	float: right;
-	color: #909090;
-	display: flex;
-	align-items: center;
-}
-
-.fdButtonBox {
-	color: #b0b0b0;
-	float: right;
-	padding: 4rpx 14rpx;
-	font-size: 24rpx;
-	font-weight: 500;
-	line-height: 30rpx;
-	border-radius: 10rpx;
-	box-sizing: border-box;
-	margin-top: 10rpx;
-}
-
-.commonPageBox {
-	background-color: #fff;
-	padding: 0 20rpx;
-}
-
-.set_box {
-	background-color: #fff;
-	height: auto;
-}
-
-.button_box {
-	width: 100%;
-	position: fixed;
-	bottom: 40rpx;
-	padding: 20rpx 80rpx;
-
-	.button {
-		margin-top: 40rpx;
-	}
-}
-</style>
\ No newline at end of file
+// @import "@/style/mixin.scss";
+</style>
diff --git a/pages/wumen/medicaldes.vue b/pages/wumen/medicaldes.vue
index 37688a6a..d61ce9fd 100644
--- a/pages/wumen/medicaldes.vue
+++ b/pages/wumen/medicaldes.vue
@@ -1,542 +1,970 @@
 <template>
-	<view class="container">
-		<z-nav-bar title="吴门医述" bgColor="#5188e5" fontColor="#fff" :backState="2000"></z-nav-bar>
-		<view class="contentBox">
-			<view class="oneCateList">
-				<common-sticky itemStyle="width:33.3%; height: 38px;font-size:24rpx;" :list="oneCateList" label="title"
-				:currentCateIndex="curOneCateIndex" @handleselectCate="setOneCateIndex"></common-sticky>
-			</view>
-			
-			<view v-show="!showSearchList" style="padding-bottom: 140rpx;">
-				<view class="grid twoCateList" v-if="twoCateList.length > 0">
-					<u-grid :col="3" border class="u-grid-list">
-						<u-grid-item v-for="(item, index) in twoCateList" :key="item.dictType"
-							@click="setTwoCateIndex(item, index)">
-							<view :class="['grid-text',curTwoCateIndex == index ? 'cur' : '']">{{item.dictValue}}</view>
-						</u-grid-item>
-					</u-grid>
-				</view>
-				<!-- 吴门缘起-吴门之徽 -->
-				<view class="titleList" v-if="curOneCateIndex == 2&&curTwoCateIndex == 2">
-					<u-grid :col="3" v-if="titleList.length > 0">
-						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="previewImage(item.url)"
-							style="align-items: flex-start;">
-							<img :src="item.url" alt="" class="wmzhimg" mode="aspectFit">
-						</u-grid-item>
-					</u-grid>
-					<u-divider v-else text="暂无数据哦~"></u-divider>
-				</view>
-				<!-- 学术贡献-学术思想和学术平台 -->
-				<view class="titleList" v-else-if="curOneCateIndex == 0&&(curTwoCateIndex == 0||curTwoCateIndex == 2)">
-					<u-grid :col="1" v-if="titleList.length > 0">
-						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)"
-							style="align-items: flex-start;border-bottom: 2px solid #fff;">
-							<view :class="['titleItem']">{{item.title}}</view>
-						</u-grid-item>
-					</u-grid>
-					<u-divider v-else text="暂无数据哦~"></u-divider>
-				</view>
-				<!-- 学术贡献-出版专著 -->
-				<view class="titleList" v-else-if="curOneCateIndex == 0&&(curTwoCateIndex == 1)">
-					<u-divider text="点击标签进入出版专著"></u-divider>
-				</view>
-				<!-- 其他 -->
-				<view class="titleList" v-else>
-					<u-grid :col="1" v-if="titleList.length > 0&&(curOneCateIndex==0||curOneCateIndex==2)">
-						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)"
-							style="align-items: flex-start;border-bottom: 2px solid #fff;">
-							<view :class="['titleItem']">{{item.name}}</view>
-						</u-grid-item>
-					</u-grid>
-					<u-grid :col="1" v-if="titleList.length > 0&&curOneCateIndex==3">
-						<u-grid-item v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)"
-							style="align-items: flex-start;border-bottom: 2px solid #fff;">
-							<view :class="['titleItem']">{{item.title}}</view>
-						</u-grid-item>
-					</u-grid>
-					<view :col="1" v-if="titleList.length > 0&&curOneCateIndex==1">
-						<view v-for="(item, index) in titleList" :key="item.id" @click="gotoDetail(item)"
-							style="align-items:center;border-bottom: 2px solid #fff;display: flex;padding: 20rpx 0;">
-							<view style="width: 280rpx;text-align: center;">
-								<img src=""  v-if="item.imageslist&&item.imageslist.length==0" class="chImage">
-								<img :src="item.imageslist&&item.imageslist[0]" v-else class="chImage">
-							</view>
-							<view :class="['titleItem']" style=" font-size: 28rpx;">{{item.name}}</view>
-						</view>
+   
+  <view
+    class="container commonPageBox"
+    style="background-color: #fff !important"
+  >
+    <!-- 公共组件-每个页面必须引入 -->
+    <public-module></public-module>
+    <z-nav-bar title="吴门医述" bgColor="#5188e5" fontColor="#fff"></z-nav-bar>
+    <!-- <uni-search-bar @confirm="search" :focus="true" v-model="searchValue" @blur="blur" @focus="focus" @input="input"
+			@cancel="cancel" @clear="clear">
+		</uni-search-bar> -->
+
+    <view class="contentBox">
+      <!-- <scroll-view class="scroll-view_H oneCateList" scroll-x="true" scroll-left="0"> -->
+      <view class="oneCateList flexbox">
+        <text
+          :class="[curOneCateIndex == index ? 'cur' : '']"
+          @click="setOneCateIndex(item, index)"
+          v-for="(item, index) in oneCateList"
+          :key="item.type"
+          >{{ item.title }}</text
+        >
+      </view>
+      <!-- <view class="search_box" v-if="oneCateList.length > 0">
+				<u-search @click="checkDisable" placeholder="请输入方剂名" @focus="focus" @clear="clear" v-model="searchValue"
+					@input="input" @blur="blur" @search="search" @custom="search"></u-search>
+			</view> -->
+      <!-- <view class="searchList" v-show="showSearchList">
+				<view class="itemBox" v-if="searchList.length > 0">
+					<view class="item" v-for="(item, index) in searchList" :key="index" @click="gotoDetail(item)">
+						{{item.title}}
 					</view>
-					<u-divider text="暂无数据哦~" v-if="titleList.length==0"></u-divider>
+				</view>
+				<view v-else class="">
+					<u-divider text="未找到相关方剂哦~"></u-divider>
+				</view>
+			</view> -->
+      <!-- </scroll-view> -->
+      <template v-if="!showSearchList">
+        <view class="grid twoCateList" v-if="twoCateList.length > 0">
+          <view
+            class="custom-grid"
+            :class="curOneCateIndex == 1 ? 'col-4' : 'col-3'"
+          >
+            <view
+              v-for="(item, index) in twoCateList"
+              :key="item.dictType"
+              class="grid-item"
+              @click="setTwoCateIndex(item, index)"
+            >
+              <view
+                :class="['grid-text', curTwoCateIndex == index ? 'cur' : '']"
+                >{{ item.dictValue }}
+              </view>
+            </view>
+          </view>
+        </view>
+
+        <view
+          :class="` titleList`"
+          :style="`height:calc(100% - ${scrollViewHeight * 2}rpx;`"
+        >
+          <scroll-view
+            scroll-y="true"
+            class="scroll-Y"
+            v-if="titleList.length > 0"
+          >
+            <template v-if="curOneCateIndex == 2 && curTwoCateIndex == 2">
+              <!-- 吴门缘起-吴门之徽 -->
+
+              <u-grid :col="3">
+                <u-grid-item
+                  class="scroll-view-item"
+                  v-for="(item, index) in titleList"
+                  :key="item.id"
+                  @click="previewImage(item.url)"
+                  style="align-items: flex-start"
+                >
+                  <img
+                    :src="item.url"
+                    alt=""
+                    class="wmzhimg"
+                    mode="aspectFit"
+                  />
+                </u-grid-item>
+              </u-grid>
+            </template>
+            <template
+              v-else-if="
+                curOneCateIndex == 0 &&
+                (curTwoCateIndex == 0 || curTwoCateIndex == 2)
+              "
+            >
+              <common-list
+                :dataList="titleList"
+                @hancleClick="gotoDetail"
+                label="title"
+              >
+              </common-list>
+              <!-- 学术贡献-学术思想和学术平台 -->
+            </template>
+            <template v-else-if="curOneCateIndex == 0 && curTwoCateIndex == 1">
+              <u-divider text="点击标签进入出版专著"></u-divider>
+            </template>
+            <template v-else-if="curOneCateIndex == 0 || curOneCateIndex == 2">
+              <common-list
+                :dataList="titleList"
+                @hancleClick="gotoDetail"
+                label="name"
+              >
+              </common-list>
+              <!-- <u-grid :col="1">
+
+							<u-grid-item class="scroll-view-item " v-for="(item, index) in titleList" :key="item.id"
+								@click="gotoDetail(item)"
+								style="align-items: flex-start;border-bottom: 2px solid #fff;">
+								<view :class="['titleItem']">{{ item.name }}</view>
+							</u-grid-item>
+
+							</u-grid> -->
+            </template>
+            <template v-if="curOneCateIndex == 3">
+              <common-list
+                :dataList="titleList"
+                @hancleClick="gotoDetail"
+                label="title"
+              >
+              </common-list>
+
+              <!-- <u-grid :col="1">
+
+
+
+								<scroll-view class="scroll-Y" scroll-y="true">
+									<u-grid-item class="scroll-view-item " v-for="(item, index) in titleList"
+										:key="item.id" @click="gotoDetail(item)"
+										style="align-items: flex-start;border-bottom: 2px solid #fff;">
+										<view :class="['titleItem']">{{ item.title }}</view>
+									</u-grid-item></scroll-view>
+							</u-grid> -->
+            </template>
+
+            <template v-if="curOneCateIndex == 1">
+              <view
+                class="scroll-view-item"
+                v-for="(item, index) in titleList"
+                :key="item.id"
+                @click="gotoDetail(item)"
+                style="
+                  align-items: flex-start;
+                  border-bottom: 2px solid #fff;
+                  display: flex;
+                  padding: 20rpx 0;
+                "
+              >
+                <view style="width: 280rpx; text-align: center">
+                  <img
+                    src=""
+                    v-if="item.imageslist && item.imageslist.length == 0"
+                    class="chImage"
+                  />
+                  <img
+                    :src="item.imageslist && item.imageslist[0]"
+                    v-else
+                    class="chImage"
+                  />
+                </view>
+                <view :class="['titleItem']">{{ item.name }}</view>
+              </view>
+            </template>
+          </scroll-view>
+
+          <u-divider v-else text="暂无数据哦~"></u-divider>
+        </view>
+      </template>
+    </view>
+
+    <!-- <view class="search_box flexbox" @click="">
+			<view class="search">
+				<text class="icon_search"></text>
+				<text class="prompt">请输入方剂名</text>
+			</view>
+		</view> -->
+
+    <!-- <u-modal :show="limitShow" :title="limitTitle" :content='limitContent' @confirm="limitShow=false">
+			<view class="limiTy">
+				<view v-if="curOneCateIndex == 0">
+					此功能使用权限仅对同一手机账号注册过一路健康APP，且开通《吴门验方基础班》【上中下】与《吴门验方提高班》【上下】五部课程的疯子读书APP学员开通。
+					<br>如果您符合条件，请联系微信客服开通。
+					<br>客服微信：<b>yilujiankangkefu</b>
+				</view>
+				<view v-if="curOneCateIndex == 3">
+					此功能使用权限仅对在疯子读书APP购买《肿瘤六经辨证法》书籍的学员开通。
+					<br>如果您符合条件，请联系微信客服开通。
+					<br>客服微信：<b>yilujiankangkefu</b>
 				</view>
 			</view>
-		</view>
-		<view>
-		  <u-back-top
-		    :scroll-top="scrollTop"
-		    bottom="65"
-		    :customStyle="bgiStyle"
-		    :iconStyle="iconStyle"
-		  >
-		  </u-back-top>
-		</view>
-		<z-navigation></z-navigation>
-	</view>
+		</u-modal> -->
+
+  </view>
 </template>
 
 <script>
-import $http from '@/config/requestConfig.js';
-import {
-	mapState
-} from 'vuex';
+import $http from "@/config/requestConfig.js";
+import { mapState } from "vuex";
 export default {
-	data() {
-		return {
-			playData: {},
-			searchValue: '',
-			oneCateList: [{
-				title: "学术贡献",
-				type: 'medicaldesBookType'
-			}, {
-				title: "学术传承",
-				type: 'inheritType'
-			}, {
-				title: "吴门缘起",
-				type: 'lightType'
-			}], // 一级分类标题1
-			twoCateList: [], // 二级分类标题
-			titleList: [], // 方剂标题
-			curOneCateIndex: 0, // 当前选中的一级分类
-			curTwoCateIndex: 0, // 当前选中的二级分类
-			searchList: [], // 搜索结果数组
-			showSearchList: false,
-			userMes: {}, // 用户信息
-			searchDisable: false, // 搜索不可用
-			limitShow: false,
-			limitTitle: '提示',
-			limitContent: '',
-			scrollTop: 0,
-			bgiStyle: {
-			  background: "#5188e5",
-			},
-			iconStyle: {
-			  fontSize: "40rpx",
-			  fontWeight: "bold",
-			  color: "#fff",
-			},
-		}
-	},
-	onLoad() {
-		uni.hideTabBar();
-		this.getUserInfo();
-	},
-	onHide() {
-		
-	},
-	//返回顶部
-	onPageScroll(e) {
-	  this.scrollTop = e.scrollTop;
-	},
-	computed: {
-		...mapState(['userInfo']),
-	},
-	methods: {
-		// 检查是有权限使用搜索功能
-		checkDisable() {
-			console.log('点击了')
-		},
-		// 获取用户详情
-		getUserInfo() {
-			if (this.userInfo.id != undefined) {
-				this.$http
-					.post('book/user/info/' + this.userInfo.id)
-					.then(res => {
-						this.userMes = res.user
-						this.getCateList();
-					});
-			}
-		},
-		// 详情
-		gotoDetail(item) {
-			console.log('111', item)
-			console.log('this.curOneCateIndex', this.curOneCateIndex)
-			console.log('this.curTwoCateIndex', this.curTwoCateIndex)
-			if (this.curOneCateIndex == 0) {
-				if(item.contentType == 2){
-					uni.navigateTo({
-						url: './xueshuwebView?id=' + item.id
-					})
-				}else{
-					uni.navigateTo({
-						url: './xueshugongxianDetail?id=' + item.id
-					})
-				}
-				return
-			}
-			if (this.curOneCateIndex == 1) {
-				uni.navigateTo({
-					url: "./medicaldesDetail?id=" + item.id
-				})
-				return
-			}
-			if (this.curOneCateIndex == 2) {
-				console.log('111', item)
-				uni.navigateTo({
-					url: './video?title=' + item.name + '&src=' + item.url
-				})
-				return
-			}
-			if (this.curOneCateIndex == 3) {
-				console.log('111', item)
-				uni.navigateTo({
-					url: "./recordDetail?id=" + item.id
-				})
-				return
-			}
-		},
-		// 获取名称
-		getTitles(dictType) {
-			console.log('dictType', dictType)
-			if (this.curOneCateIndex == 0) {
-				if(dictType == 2){
-					uni.navigateTo({
-						url: './zhuanzhuchuban'
-					})
-					return
-				}
-				$http.request({
-					url: "book/generalArticle/articleByPage",
-					method: "POST",
-					data: {
-						"type": dictType==1?'1':'2',
-						"limit": 1000,
-						"current": 1,
-					},
-					header: {
-						'Content-Type': 'application/json'
-					},
-				}).then(res => {
-					console.log(res, '内容获取成功')
-					if (res.code == 0 && res.result && res.result.records.length > 0) {
-						this.titleList = res.result.records
-					} else {
-						this.titleList = []
-					}
-				}).catch(e => {
-					this.titleList = []
-					console.log(e)
-				})
-			}
-			if (this.curOneCateIndex == 1) {
-				$http.request({
-					url: "book/medicaldes/inheritListByPage",
-					method: "POST",
-					data: {
-						'dictType': dictType,
-						"limit": 1000,
-						"current": 1
-					},
-					header: {
-						'Content-Type': 'application/json'
-					},
-				}).then(res => {
-					console.log(res, '内容获取成功')
-					if (res.code == 0 && res.result.records.length > 0) {
-						this.titleList = res.result.records
-						for (let i = 0; i < this.titleList.length; i++) {
-							this.titleList[i].imageslist = [];
-							this.titleList[i].imageslist = this.titleList[i].img.split(";");
-						}
-					} else {
-						this.titleList = []
-					}
-				}).catch(e => {
-					this.titleList = []
-					console.log(e)
-				})
-			}
-			if (this.curOneCateIndex == 2) {
-				$http.request({
-					url: "book/medicaldes/lightListByType?type=" + dictType,
-					method: "POST",
-					data: {
-						"limit": 1000,
-						"page": 1,
-					},
-					header: {
-						'Content-Type': 'application/json'
-					},
-				}).then(res => {
-					console.log(res, '内容获取成功')
-					if (res.code == 0 && res.result.length > 0) {
-						this.titleList = res.result
-					} else {
-						this.titleList = []
-					}
-				}).catch(e => {
-					this.titleList = []
-					console.log(e)
-				})
-			}
-			if (this.curOneCateIndex == 3) {
-				$http.request({
-					url: "book/medicaldes/recordByType?type=" + dictType,
-					method: "POST",
-					data: {
-						"limit": 1000,
-						"page": 1,
-					},
-					header: {
-						'Content-Type': 'application/json'
-					},
-				}).then(res => {
-					console.log(res, '内容获取成功')
-					if (res.code == 0 && res.result.length > 0) {
-						this.titleList = res.result
-					} else {
-						this.titleList = []
-					}
-				}).catch(e => {
-					this.titleList = []
-					console.log(e)
-				})
-			}
+  data() {
+    return {
+      playData: {},
+      searchValue: "",
+      oneCateList: [
+        {
+          title: "学术贡献",
+          type: "medicaldesBookType",
+        },
+        {
+          title: "学术传承",
+          type: "inheritType",
+        },
+        {
+          title: "吴门缘起",
+          type: "lightType",
+          // }, {
+          // 	title: "吴门纪实",
+          // 	type: 'recordType'
+        },
+      ], // 一级分类标题1
+      twoCateList: [], // 二级分类标题
+      titleList: [], // 方剂标题
+      curOneCateIndex: 0, // 当前选中的一级分类
+      curTwoCateIndex: 0, // 当前选中的二级分类
+      searchList: [], // 搜索结果数组
+      showSearchList: false,
+      userMes: {}, // 用户信息
+      searchDisable: false, // 搜索不可用
+      limitShow: false,
+      limitTitle: "提示",
+      limitContent: "",
+      scrollViewHeight: 0,
+    };
+  },
+  onLoad() {
+    this.getUserInfo();
+    // this.getCateList()
+  },
+  onHide() {
+    // this.showSearchList = false
+    // this.searchList = []
+  },
+  computed: {
+    ...mapState(["userInfo"]),
+  },
+  methods: {
+    // 检查是有权限使用搜索功能
+    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, "呼呼");
+        });
+      }
+    },
+    // 详情
+    gotoDetail(item) {
+      console.log("111", item);
+      console.log("this.curOneCateIndex", this.curOneCateIndex);
+      console.log("this.curTwoCateIndex", this.curTwoCateIndex);
+      if (this.curOneCateIndex == 0) {
+        uni.navigateTo({
+          // url: '../bookShop/commodityDetail?id=' + item.id
+          url: "./xueshugongxianDetail?id=" + item.id,
+        });
+        return;
+      }
+      if (this.curOneCateIndex == 1) {
+        uni.navigateTo({
+          url: "./medicaldesDetail?id=" + item.id,
+        });
+        return;
+      }
+      if (this.curOneCateIndex == 2) {
+        console.log("111", item);
+        uni.navigateTo({
+          url: "./video?title=" + item.name + "&src=" + item.url,
+        });
+        return;
+      }
+      if (this.curOneCateIndex == 3) {
+        console.log("111", item);
+        uni.navigateTo({
+          url: "./recordDetail?id=" + item.id,
+        });
+        return;
+      }
+    },
+    // 获取名称
+    getTitles(dictType) {
+      console.log("dictType", dictType);
+      if (this.curOneCateIndex == 0) {
+        if (dictType == 2) {
+          uni.navigateTo({
+            url: "./zhuanzhuchuban",
+          });
+          return;
+        }
+        $http
+          .request({
+            url: "book/generalArticle/articleByPage",
+            method: "POST",
+            data: {
+              // loadAnimate: 'none', // 请求加载动画
+              type: dictType == 1 ? "1" : "2",
+              limit: 1000,
+              current: 1,
+            },
+            header: {
+              //默认 无 说明：请求头
+              "Content-Type": "application/json",
+            },
+          })
+          .then((res) => {
+            console.log(res, "内容获取成功");
+            if (res.code == 0 && res.result && res.result.records.length > 0) {
+              this.titleList = res.result.records;
+            } else {
+              this.titleList = [];
+            }
+          })
+          .catch((e) => {
+            this.titleList = [];
+            console.log(e);
+          });
+      }
+      if (this.curOneCateIndex == 1) {
+        $http
+          .request({
+            url: "book/medicaldes/inheritListByPage",
+            method: "POST",
+            data: {
+              // loadAnimate: 'none', // 请求加载动画
+              dictType: dictType,
+              limit: 1000,
+              current: 1,
+            },
+            header: {
+              //默认 无 说明：请求头
+              "Content-Type": "application/json",
+            },
+          })
+          .then((res) => {
+            console.log(res, "内容获取成功");
+            if (res.code == 0 && res.result.records.length > 0) {
+              this.titleList = res.result.records;
+              for (let i = 0; i < this.titleList.length; i++) {
+                this.titleList[i].imageslist = [];
+                this.titleList[i].imageslist = this.titleList[i].img.split(";");
+              }
+            } else {
+              this.titleList = [];
+            }
+          })
+          .catch((e) => {
+            this.titleList = [];
+            console.log(e);
+          });
+      }
+      if (this.curOneCateIndex == 2) {
+        $http
+          .request({
+            url: "book/medicaldes/lightListByType?type=" + dictType,
+            method: "POST",
+            data: {
+              // loadAnimate: 'none', // 请求加载动画
+              limit: 1000,
+              page: 1,
+            },
+            header: {
+              //默认 无 说明：请求头
+              "Content-Type": "application/json",
+            },
+          })
+          .then((res) => {
+            console.log(res, "内容获取成功");
+            if (res.code == 0 && res.result.length > 0) {
+              this.titleList = res.result;
+            } else {
+              this.titleList = [];
+            }
+          })
+          .catch((e) => {
+            this.titleList = [];
+            console.log(e);
+          });
+      }
+      if (this.curOneCateIndex == 3) {
+        $http
+          .request({
+            url: "book/medicaldes/recordByType?type=" + dictType,
+            method: "POST",
+            data: {
+              // loadAnimate: 'none', // 请求加载动画
+              limit: 1000,
+              page: 1,
+            },
+            header: {
+              //默认 无 说明：请求头
+              "Content-Type": "application/json",
+            },
+          })
+          .then((res) => {
+            console.log(res, "内容获取成功");
+            if (res.code == 0 && res.result.length > 0) {
+              this.titleList = res.result;
+            } else {
+              this.titleList = [];
+            }
+          })
+          .catch((e) => {
+            this.titleList = [];
+            console.log(e);
+          });
+      }
+    },
+    setTwoCateIndex(item, index) {
+      let dictType = item.dictType;
+      this.curTwoCateIndex = index;
+      this.getTitles(dictType);
+    },
+    async setOneCateIndex(item, index) {
+      console.log(index, 99999);
+      var that = this;
 
-		},
-		setTwoCateIndex(item, index) {
-			let dictType = item.dictType
-			this.curTwoCateIndex = index
-			this.getTitles(dictType)
-		},
-		setOneCateIndex(item, index) {
-			let type = item.type
-			this.curOneCateIndex = index
-			this.curTwoCateIndex = 0
-			this.searchValue = ''
-			this.searchList = []
-			this.showSearchList = false
-			this.getTowCateList(type)
-		},
-		getTowCateList(type) {
-			$http.request({
-				url: "book/medicaldes/typeList?label=" + type,
-				method: "POST",
-				data: {
-					loadAnimate: 'none'
-				},
-			}).then(res => {
-				console.log(res, '二级分类获取成功')
-				if (res.code == 0 && res.result.length >= 0) {
-					this.twoCateList = res.result
-					if (this.curOneCateIndex == 0) {
-						this.twoCateList = [{
-							'dictType': "1",
-							"dictValue": "学术思想"
-						}, {
-							'dictType': "2",
-							"dictValue": "出版专著"
-						}, {
-							'dictType': "3",
-							"dictValue": "学术平台"
-						}]
-					}
-					if (this.curOneCateIndex == 2) {
-						this.twoCateList = [{
-							'dictType': "1",
-							"dictValue": "吴门之歌"
-						}, {
-							'dictType': "2",
-							"dictValue": "巴山夜语"
-						}, {
-							'dictType': "3",
-							"dictValue": "吴门之徽"
-						}]
-					}
-					if (this.curOneCateIndex == 3) {
-						this.twoCateList = [{
-							'dictType': "1",
-							"dictValue": "学术贡献"
-						}, {
-							'dictType': "2",
-							"dictValue": "抗疫纪实"
-						}, {
-							'dictType': "3",
-							"dictValue": "吴门公益"
-						}]
-					}
-					this.getTitles(this.twoCateList[0].dictType)
-				} else {
-					this.twoCateList = []
-					this.titleList = []
-				}
-			}).catch(e => {
-				this.twoCateList = []
-				this.titleList = []
-				console.log(e)
-			})
-		},
-		transformData(inputData) {
-			const result = {};
-			inputData.forEach(item => {
-				const {
-					letter
-				} = item;
-				if (!result[letter]) {
-					result[letter] = [];
-				}
-				result[letter].push(item);
-			});
-			return result;
-		},
-		
-		getCateList(id) {
-			id ? '' : id = 0
-			this.twoCateList = []
-			this.curTwoCateIndex = 0;
-			this.getTowCateList(this.oneCateList[0].type);
-		},
+      // 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
+      // }
+      let type = item.type;
+      this.curOneCateIndex = index;
+      this.curTwoCateIndex = 0;
+      this.searchValue = "";
+      this.searchList = [];
+      this.showSearchList = false;
+      // if (index != 2) {
+      await this.getTowCateList(type);
 
-		// 放大图片
-		previewImage(url) {
-			console.log(url)
-			uni.previewImage({
-				urls: [url],
-				longPressActions: {
-					itemList: ['很抱歉，暂不支持保存图片到本地'],
-					success: function(res) {
-						// console.log(res,'+++++')
-					}
-				}
-			});
-		},
-	},
-	onBackPress() {
-		// #ifdef APP-PLUS
-		plus.key.hideSoftKeybord();
-		// #endif
-	},
-	components: {
+      // uni.createSelectorQuery().select('.oneCateList').boundingClientRect(function (rect) {
+      // 	var height = rect.height
+      // 	console.log('元素高度：',);
 
-	},
-}
+      // }).exec();
+
+      // } else {
+      // 	this.getJFList(dictType)
+      // }
+    },
+    async getTowCateList(type) {
+      var that = this;
+      $http
+        .request({
+          url: "book/medicaldes/typeList?label=" + type,
+          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.result.length >= 0) {
+            this.twoCateList = res.result;
+            if (this.curOneCateIndex == 0) {
+              this.twoCateList = [
+                {
+                  dictType: "1",
+                  dictValue: "学术思想",
+                },
+                {
+                  dictType: "2",
+                  dictValue: "出版专著",
+                },
+                {
+                  dictType: "3",
+                  dictValue: "学术平台",
+                },
+              ];
+            }
+            if (this.curOneCateIndex == 2) {
+              this.twoCateList = [
+                {
+                  dictType: "1",
+                  dictValue: "吴门之歌",
+                },
+                {
+                  dictType: "2",
+                  dictValue: "巴山夜语",
+                },
+                {
+                  dictType: "3",
+                  dictValue: "吴门之徽",
+                },
+              ];
+            }
+            if (this.curOneCateIndex == 3) {
+              this.twoCateList = [
+                {
+                  dictType: "1",
+                  dictValue: "学术贡献",
+                },
+                {
+                  dictType: "2",
+                  dictValue: "抗疫纪实",
+                },
+                {
+                  dictType: "3",
+                  dictValue: "吴门公益",
+                },
+              ];
+            }
+            this.getTitles(this.twoCateList[0].dictType);
+
+            this.$nextTick(async () => {
+              // await uni.createSelectorQuery().select('.uni-tabbar').boundingClientRect(function (rect) {
+              // 	console.log(rect.height, '3333')
+
+              // 	// var height = 42 + rect.height + 10;
+              // 	// that.scrollViewHeight = height;
+              // 	// console.log(that.scrollViewHeight, '111111')
+              // 	// that.$forceUpdate()
+              // 	// console.log('元素高度2：', height);
+              // }).exec();
+              await uni
+                .createSelectorQuery()
+                .in(this)
+                .select(".twoCateList")
+                .boundingClientRect(function (rect) {
+                  if (!rect || typeof rect.height !== "number") {
+                    return;
+                  }
+                  console.log(rect.height, "22222");
+
+                  var height = 42 + rect.height + 20;
+                  that.scrollViewHeight = height;
+                  console.log(that.scrollViewHeight, "111111");
+                  that.$forceUpdate();
+                  console.log("元素高度2：", height);
+                })
+                .exec();
+            });
+          } else {
+            this.twoCateList = [];
+            this.titleList = [];
+          }
+        })
+        .catch((e) => {
+          this.twoCateList = [];
+          this.titleList = [];
+          console.log(e);
+        });
+    },
+    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.titleList = this.transformData(res.list)
+    // 			console.log('JF经方', this.titleList)
+    // 		} else {
+    // 			this.twoCateList = []
+    // 			this.titleList = []
+    // 		}
+    // 	}).catch(e => {
+    // 		this.twoCateList = []
+    // 		this.titleList = []
+    // 		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.oneCateList = res.list
+      this.getTowCateList(this.oneCateList[0].type);
+      // } else {
+      // 	this.oneCateList = []
+      // }
+      // }).catch(e => {
+      // 	this.oneCateList = []
+      // 	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.curOneCateIndex + 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.titleList = []
+    // 		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
+  },
+  components: {},
+};
 </script>
 
 <style lang="scss" scoped>
 @import '@/static/mixin.scss';
+.u-grid-list {
+  // height: 40rpx;
+}
+
+.custom-grid {
+  display: flex;
+  flex-wrap: wrap;
+  // border: 1px solid #dadbde;
+	// border-bottom: 0;
+
+  &.col-3 {
+    .grid-item {
+      min-width: 33.33%;
+      flex: 1;
+    }
+  }
+
+  &.col-4 {
+    .grid-item {
+      min-width: 25%;
+      flex: 1;
+    }
+  }
+
+  .grid-item {
+    // border-right: 1px solid #dadbde;
+    // border-bottom: 1px solid #dadbde;
+    padding: 10rpx 0;
+    text-align: center;
+    font-size: 30rpx;
+    cursor: pointer;
+    box-sizing: border-box;
+  }
+}
+
 .searchList {
-	.item {
-		font-size: 28rpx;
-		padding: 20rpx;
-		border-bottom: 1px solid #dadbde;
-	}
+  .item {
+    font-size: 28rpx;
+    padding: 20rpx;
+    border-bottom: 1px solid #dadbde;
+  }
 }
 
 .scroll-view_H {
-	background-color: #fff;
-	white-space: nowrap;
-	padding: 10rpx;
-}
-/deep/.u-grid-item{
-	margin: 12rpx 0;
+  background-color: #fff;
+  white-space: nowrap;
+  padding: 10rpx;
 }
 
 .contentBox {
-	height: 100vh;
-	
-	.oneCateList {
-		width: 100%;
-		background: #f3f3f3;
-	}
+  height: calc(100% - 50px);
 
-	.twoCateList {
-		font-size: 28rpx;
-		margin: 12rpx 0;
+  .oneCateList {
+    padding: 10rpx;
+    box-sizing: border-box;
+    justify-content: space-between;
 
-		.grid-text {
-			text-align: center;
-			font-size: 28rpx;
-			line-height: 38rpx;
-		}
+    text {
+      text-align: center;
+      display: inline-block;
+      width: 32%;
+      padding: 16rpx 0;
+      font-size: 34rpx;
+      border-radius: 10rpx;
+    }
 
-		.cur {
-			color: $themeColor;
-		}
-	}
+    .cur {
+      background-color: $themeColor;
+      color: #fff;
+      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+    }
+  }
 
-	.titleList {
-		padding: 0 10rpx;
-		border-radius: 10rpx;
-		background-color: #f8f9fa;
+  .twoCateList {
+    font-size: 30rpx;
+    margin-top: 20rpx;
 
-		.titleItem {
-			font-size: 28rpx;
-			padding: 20rpx 20rpx;
-		}
+    .grid-text {
+      padding: 10rpx 0rpx;
+      text-align: center;
+    }
 
-		.JFtitleItem {
-			background-color: #ffffff;
-			padding: 20rpx 10rpx;
-			width: 100%;
-			border-bottom: 0.5px solid #f8f9fa;
-		}
+    .cur {
+      color: $themeColor;
+    }
 
-		.wmzhimg {
-			width: 220rpx;
-			height: 220rpx;
-		}
-	}
+    // .u-grid-list{border: 0.5px solid #dadbde;}
+  }
+
+  .titleList {
+    font-size: 26rpx;
+    margin-top: 20rpx;
+    padding: 0 10rpx;
+    border-radius: 10rpx;
+    background-color: #f8f9fa;
+
+    .JFtitleItem {
+      background-color: #ffffff;
+      padding: 20rpx 10rpx;
+      width: 100%;
+      border-bottom: 0.5px solid #f8f9fa;
+    }
+
+    .wmzhimg {
+      width: 220rpx;
+      height: 220rpx;
+    }
+  }
 }
 
-
-.container {
-	height: 100vh;
-	background-color: #fff;
-}
-/deep/.u-grid .u-grid-item:last-child{
-	border-bottom: 0 !important;
-}
 .search_box {
-	margin: 0 auto;
-	overflow: hidden;
-	align-items: center;
-	width: calc(100% - 10px);
-	margin-top: 20rpx;
-	margin-bottom: 20rpx;
+  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 #54a96633;
-	}
+  .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 #3ab3ae33;
+  }
 
-	.prompt {
-		color: #838383;
-		font-size: 24rpx;
+  .prompt {
+    color: #838383;
+    font-size: 24rpx;
+  }
 
-	}
-}
-
-/deep/.u-divider__text{
-	font-size: 28rpx !important;
+  // .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;
+  display: flex;
 }
 
 .uni-modal .uni-modal__bd {
-	text-align: left;
+  text-align: left;
 }
 
 .limiTy {
-	font-size: 28rpx;
-	line-height: 46rpx;
+  font-size: 28rpx;
+  line-height: 46rpx;
 }
 
 .chImage {
-	height: 100rpx;
+  height: 100rpx;
 }
-</style>
\ No newline at end of file
+
+.scroll-Y {
+  height: 100%;
+}
+
+.scroll-view_H {
+  white-space: nowrap;
+  width: 100%;
+}
+
+.scroll-view-item {
+  // height: 300rpx;
+  // line-height: 300rpx;
+  // text-align: center;
+  // font-size: 36rpx;
+}
+
+.scroll-view-item_H {
+  display: inline-block;
+  width: 100%;
+  // height: 300rpx;
+  // line-height: 300rpx;
+  // text-align: center;
+  // font-size: 36rpx;
+}
+
+.titleList {
+  height: 100%;
+}
+
+.titleList2 {
+  height: calc(100% - 170rpx);
+}
+</style>
diff --git a/static/icon/map_ic_search.png b/static/icon/map_ic_search.png
new file mode 100644
index 00000000..ba5e5b02
Binary files /dev/null and b/static/icon/map_ic_search.png differ
diff --git a/style/mixin.scss b/style/mixin.scss
new file mode 100644
index 00000000..66bab11f
--- /dev/null
+++ b/style/mixin.scss
@@ -0,0 +1,3 @@
+@charset "utf-8";
+//主题色
+$themeColor: #5188e5;
\ No newline at end of file