diff --git a/components/filter-popup/filter-popup.vue b/components/filter-popup/filter-popup.vue
index d377343..70ce029 100644
--- a/components/filter-popup/filter-popup.vue
+++ b/components/filter-popup/filter-popup.vue
@@ -19,9 +19,12 @@
             <view class="select-main">
 				<view v-if="showCategory" class="select-item">
 				    <view class="title">学科专业</view>
-					<picker mode="multiSelector" v-model="category" @change="change" @columnchange="columnchange" :range="categories" range-key="title">
-						<view class="category">{{categoryName ? categoryName : '请选择'}}</view>
-					</picker>
+					<view class="category-wrap">
+						<picker mode="multiSelector" v-model="category" @change="change" @columnchange="columnchange" :range="categories" range-key="title">
+							<view class="category">{{categoryName ? categoryName : '请选择'}}</view>
+						</picker>
+						<uni-icons v-if="categoryName" class="icon" type="closeempty" size="16" color="#333" @click.stop="delCatagory"></uni-icons>
+					</view>
 				</view>
 				
                 <view class="select-item" v-for="(item, index) in data" :key="index">
@@ -213,18 +216,24 @@ export default {
 			const i1IsNumber = typeof i1 === 'number'
 			const i2IsNumber = typeof i2 === 'number'
 			const list = this.categories
-			
 			this.categoryId = list[0][i0].id
-			this.professionalCategoryId = !i1IsNumber ? '' : list[1][i1].id
-			this.professionalId = !i2IsNumber ? '' : list[2][i2].id
-			
 			this.categoryName = list[0][i0].title
-			if (i1IsNumber && list[1].length) this.categoryName += '/' + list[1][i1].title
-			if (i2IsNumber && list[2].length) this.categoryName += '/' + list[2][i2].title
+			
+			this.professionalCategoryId = ''
+			this.professionalId = ''
+			if (i1IsNumber && list[1].length > 0) {
+				this.professionalCategoryId = list[1][i1].id
+				this.categoryName += '/' + list[1][i1].title
+			}
+			if (i2IsNumber && list[2].length > 0) {
+				this.professionalId = list[2][i2].id
+				this.categoryName += '/' + list[2][i2].title
+			}
 		},
 		// 学科专业切换回调
 		async columnchange(e) {
 			const { column } = e.detail
+			console.log('change',column)
 			if (column == 0) {
 				const { list } = await courseProfessionalClass(this.categories[0][e.detail.value].id)
 				list.map(e => {
@@ -234,6 +243,7 @@ export default {
 				this.categories[1] = list
 				this.categories[2] = []
 				this.$set(this.categories, 1, list)
+			console.log('inner',this.categories)
 			} else 
 			if (column == 1) {
 				const { list } = await courseProfessional(this.categories[1][e.detail.value].id)
@@ -245,6 +255,14 @@ export default {
 				this.$set(this.categories, 2, list)
 			}
 		},
+		// 删除学科专业
+		delCatagory() {
+			this.category = []
+			this.categoryName = ''
+			this.categoryId = ''
+			this.professionalCategoryId = ''
+			this.professionalId = ''
+		},
 		
         //  点击完成
         finsh() {
@@ -264,6 +282,14 @@ export default {
         //重置
         reset() {
             this.acceptForm = {}
+			this.categoryId = ''
+			this.professionalCategoryId = ''
+			this.professionalId = ''
+			this.categoryName = ''
+			this.$nextTick(() => {
+				this.$emit("finsh", this.acceptForm);
+				this.$emit("input", false);
+			})
         },
     },
 };
@@ -301,8 +327,15 @@ export default {
     }
     .select-scroll {
     }
-	.category {
+	.category-wrap {
+		display: flex;
+		align-items: center;
 		margin-top: 10rpx;
+		.icon {
+			margin-left: 10rpx;
+		}
+	}
+	.category {
 		font-size: 28rpx;
 	}
     .select-main {
diff --git a/libs/util.js b/libs/util.js
index ecc0c75..ebf5089 100644
--- a/libs/util.js
+++ b/libs/util.js
@@ -32,7 +32,7 @@ export default {
 	},
 	// 如果非数字，则返回0
 	handleNaN(val) {
-		return isNaN(val) ? 0 : val
+		return isNaN(val) || val == 0 ? '' : val
 	},
 	// 小于10，返回0+传入值
 	preZero(val) {
@@ -117,4 +117,8 @@ export default {
 		if (id == 5) return 0
 		if (id == 6) return 4
 	},
+	// 去掉html标签
+	removeTag(str) {
+		return str.replace(/(<[^>]+>)|((&nbsp;)+)/g , '')
+	},
 }
\ No newline at end of file
diff --git a/order/addCourse/addCourse.vue b/order/addCourse/addCourse.vue
index 2ce2a39..71f5934 100644
--- a/order/addCourse/addCourse.vue
+++ b/order/addCourse/addCourse.vue
@@ -5,8 +5,12 @@
 		</uni-card>
 		
 		<ul class="tab-wrap">
-			<scroll-view scroll-x :scroll-left="scrollLeft" class="tab">
-				<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
+			<view class="tab">
+				<li :class="{active: curTab === ''}" @click="tabChange('')">全部</li>
+			</view>
+			
+			<scroll-view scroll-x :scroll-left="scrollLeft" class="tab tab-scroll">
+				<li v-for="(tab, i) in tabs" :key="i" :class="{active: curTab === tab.id}" @click="tabChange(tab.id)">{{ tab.name }}</li>
 			</scroll-view>
 		</ul>
 		
@@ -28,7 +32,7 @@
 </template>
 
 <script>
-	import { productCategoryList, listOfGoods } from '@/apis/modules/product.js'
+	import { productTypeList, listOfGoods } from '@/apis/modules/product.js'
 	import { renew, queryCitySettlementPrice } from '@/apis/modules/order.js'
 	export default {
 		data() {
@@ -39,12 +43,7 @@
 				provinceId: '',
 				cityId: '',
 				curTab: '',
-				tabs: [
-					{
-						name: '全部',
-						id: ''
-					},
-				],
+				tabs: [],
 				scrollLeft: 0,
 				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
 				status: 'more', // 上拉加载状态 more|loading|noMore
@@ -105,14 +104,14 @@
 			this.getList()
 		},
 		methods: {
-			// 产品分类
+			// 产品类型
 			getTypes() {
-				productCategoryList().then(res => {
-					res.classificationList.forEach(e => {
-						e.id = e.classificationId
-						e.name = e.classificationName
+				productTypeList().then(res => {
+					res.typeList.forEach(e => {
+						e.id = e.typeId
+						e.name = e.typeName
 					})
-					this.tabs.push(...res.classificationList)
+					this.tabs.push(...res.typeList)
 				}).catch(e => {})
 			},
 			// 获取课程列表
@@ -127,7 +126,7 @@
 					isShelves: 0,
 					hotTag: 1,
 					productName: this.keyword,
-					productClassification: this.curTab,
+					productType: this.curTab,
 				}).then(({ page }) => {
 					const { records } = page
 					const list = this.courses
@@ -142,7 +141,7 @@
 						}
 						e.check = (all && pageChange) || checked.find(n => n.mallId === e.mallId) ? 1 : 0
 						// 筛选已经勾选的产品
-						if (list.find(n => n.dataOrCourseId == e.mallId)) {
+						if (list.find(n => n.mallId == e.mallId)) {
 							// 已经选择了的则禁止选择，并且直接选中
 							checkData.disable = true 
 							e.check = 1
@@ -167,8 +166,8 @@
 				this.getList()
 			},
 			// tab切换
-			tabChange(tab) {
-				this.curTab = tab.id
+			tabChange(id) {
+				this.curTab = id
 				this.initList()
 			},
 			// 选择框回调
@@ -259,6 +258,7 @@
 				const list = this.checked // 已选产品
 				if (list.length) {
 					const result = this.courses
+					console.log(123, result)
 					const list1 = [] // 实训、理论
 					const list0 = [] // 数据前瞻
 					const list2 = [] // 职站增值
@@ -272,8 +272,10 @@
 							// 新勾选的产品，则获取到id，下面要调用
 							if (!result.find(n => (n.dataOrCourseId == e.associatedProduct || n.dataOrCourseId == e.dataOrCourseId) && n.authority == e.authority)) {
 								// 查询产品管理设置的平台结算价
-								const res = await queryCitySettlementPrice(e.mallId, this.provinceId, this.cityId)
-								if (res.mallPrice) e.settlementPrice = res.mallPrice.discountRate
+								if (this.provinceId) {
+									const res = await queryCitySettlementPrice(e.mallId, this.provinceId, this.cityId)
+									if (res.mallPrice) e.settlementPrice = res.mallPrice.discountRate
+								}
 								console.log(44, e)
 								const classId = e.classificationId
 								const pid = +e.associatedProduct
@@ -333,8 +335,9 @@
 	padding-bottom: 130rpx;
 }
 .tab-wrap {
-	.tab {
-		width: 100%;
+	display: flex;
+	.tab-scroll {
+		width: calc(100% - 100rpx);
 		white-space: nowrap;
 		li {
 			display: inline-block;
diff --git a/pages/clientDetail/clientDetail.vue b/order/clientDetail/clientDetail.vue
similarity index 100%
rename from pages/clientDetail/clientDetail.vue
rename to order/clientDetail/clientDetail.vue
diff --git a/pages/clients/clients.vue b/order/clients/clients.vue
similarity index 100%
rename from pages/clients/clients.vue
rename to order/clients/clients.vue
diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
index 80fd083..b9ee743 100644
--- a/order/editCourse/editCourse.vue
+++ b/order/editCourse/editCourse.vue
@@ -45,7 +45,7 @@
 							</view>
 							<view class="line">
 								<view class="name">结算价</view>
-								<view class="val">{{ item.settlementPrice }}元</view>
+								<view class="val">{{ item.settlementPrice && item.settlementPrice + '元' }}</view>
 							</view>
 							<view class="line">
 								<view class="name">折扣率</view>
@@ -143,6 +143,7 @@
 						courses['list' + e.authority].list.push(e)
 					})
 					this.courses = courses
+					console.log('editCourse', this.courses)
 				}).catch(e => {})
 				try {
 					uni.removeStorageSync('courses')
@@ -362,7 +363,9 @@
 				if (msg) return this.$util.errMsg(msg)
 				if (this.orderRepeat.length) return this.$util.errMsg(this.repeatMsg) // 有重复订单不能提交
 				uni.setStorageSync('courses', this.courses)
-				uni.navigateBack()
+				uni.redirectTo({
+					url: `../orderDetail/orderDetail`
+				})
 			},
 		}
 	}
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index fbbf6a2..ba461dd 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -12,7 +12,7 @@
 					<view v-if="isDetail" class="val">{{ form.customerName }}</view>
 					<view v-else class="customer-wrap">
 						<view :class="['ph', {val: form.customerName}]" @click="customerVisible = true">{{ form.customerName || '请选择客户' }}</view>
-						<view class="create" @click="$util.to(`/pages/clientDetail/clientDetail`)">找不到客户？马上创建</view>
+						<view class="create" @click="toClient">找不到客户？马上创建</view>
 					</view>
 				</view>
 				<view class="line" v-if="form.customerName">
@@ -68,7 +68,7 @@
 							</view>
 							<view class="course-action">
 								<image v-if="!isDetail" class="del" src="@/static/image/trash.png" mode="widthFix" @click.stop="delCourse(c, i)"></image>
-								<button v-if="(item.authority == 3 || item.authority == 4) && item.mallNonAssociatedLinks" class="info-btn" type="primary" @click.stop="showShip(item)">发货信息</button>
+								<button v-if="(item.authority == 3 || item.authority == 4) && ((item.mallNonAssociatedLinks && item.mallNonAssociatedLinks.length) || item.shipContent)" class="info-btn" type="primary" @click.stop="showShip(item)">发货信息</button>
 							</view>
 						</view>
 						<view class="info">
@@ -82,7 +82,7 @@
 							</view>
 							<view class="line">
 								<view class="label">结算价</view>
-								<view class="val">{{ item.settlementPrice }}元</view>
+								<view class="val">{{ item.settlementPrice && item.settlementPrice + '元' }}</view>
 							</view>
 							<view class="line">
 								<view class="label">折扣率</view>
@@ -216,11 +216,15 @@
 			this.orderId = options.orderId
 			this.isDetail = !!options.show
 			const store = uni.getStorageSync('courses')
+			const form = uni.getStorageSync('orderForm')
+			if (form) {
+				this.form = form
+				uni.removeStorageSync('orderForm')
+			}
 			this.getRate()
 			if (this.orderId) {
 				this.getInfo()
 			} else if (store) {
-			console.log(33, store)
 				// 新增取缓存，取了删除
 				const list = []
 				for (const i in store) {
@@ -238,13 +242,13 @@
 					uni.removeStorageSync('courses')
 				} catch (e) {}
 				this.calcTotal()
-			} else {
-				// 如果是客户订单记录页面点的新增，会有客户id，要默认选中该客户
-				const { customerId } = options
-				customerId && this.customerChange({
-					customerId
-				})
 			}
+			
+			// 如果是客户订单记录页面点的新增，会有客户id，要默认选中该客户
+			const { customerId } = options
+			customerId && this.customerChange({
+				customerId
+			})
 			// 非详情才需要查询客户
 			if (!this.isDetail) {
 				this.getCustomer()
@@ -378,6 +382,7 @@
 			// 跳转
 			toAdd() {
 				uni.setStorageSync('courses', this.courses)
+				uni.setStorageSync('orderForm', this.form)
 				const { customerId, orderType } = this.form
 				customerId ?
 					this.$util.to(`../addCourse/addCourse?orderType=${orderType}&customerId=${customerId}&provinceId=${this.form.provinceId}&cityId=${this.form.cityId}`) :
@@ -387,9 +392,15 @@
 			editCourse(c, i) {
 				if (this.isDetail) return false
 				uni.setStorageSync('courses', this.courses)
+				uni.setStorageSync('orderForm', this.form)
 				const { customerId, orderType } = this.form
 				this.$util.to(`../editCourse/editCourse?orderType=${orderType}&customerId=${customerId}`)
 			},
+			// 前往创建客户
+			toClient() {
+				uni.setStorageSync('courses', this.courseList)
+				this.$util.to(`/order/clientDetail/clientDetail`)
+			},
 			// 删除课程
 			delCourse(c, i) {
 				const that = this
@@ -519,7 +530,7 @@
 				row.mallNonAssociatedLinks && row.mallNonAssociatedLinks.forEach(e => {
 					val += e.urlName + '：' + e.url + '\n'
 				})
-				this.shipInfo = val
+				this.shipInfo = row.shipContent || val
 				this.$refs.info.open()
 			},
 			// 复制发货信息
diff --git a/order/productDetail/productDetail.vue b/order/productDetail/productDetail.vue
index d2bfb56..25bee27 100644
--- a/order/productDetail/productDetail.vue
+++ b/order/productDetail/productDetail.vue
@@ -28,7 +28,7 @@
 			<view class="texts">
 				<view class="line">
 					<text class="name">产品简介：</text>
-					<view class="val" v-html="form.mall.productIntroduction"></view>
+					<text class="val">{{ form.mall.productIntroduction }}</text>
 				</view>
 				<view class="line">
 					<text class="name">适用专业：</text>
@@ -48,30 +48,27 @@
 				</view>
 				<view class="line">
 					<text class="name">详情介绍：</text>
-					<view class="val" v-html="form.mall.detailedIntroduction"></view>
+					<!-- <view class="val" v-html="form.mall.detailedIntroduction"></view> -->
+					<mp-html class="val" :content="form.mall.detailedIntroduction"/>
 				</view>
 			</view>
 		</view>
 		
-		<view v-if="form.interfaceDiagram" class="detail">
+		<view v-if="form.interfaceDiagram" class="detail" id="pics">
 			<view class="title mb">
 				<image class="icon" src="@/static/image/product/4.png"></image>
 				产品界面图
 			</view>
-			<uni-swiper-dot :info="info" field="content" mode="round">
-				<swiper class="swiper-box" @change="change">
+			<uni-swiper-dot :info="form.interfaceDiagram.length > 1 ? form.interfaceDiagram : 0" field="content" mode="round" :dotsStyles="dotsStyles">
+				<swiper class="swiper-box" autoplay>
 					<swiper-item v-for="(pic, i) in form.interfaceDiagram" :key="i">
 						<image class="pic" mode="widthFix" :src="pic"></image>
 					</swiper-item>
 				</swiper>
 			</uni-swiper-dot>
-			
-			<!-- <template>
-				<image v-for="(pic, i) in form.mall.interfaceDiagram" :key="i" class="pic" mode="widthFix" :src="pic"></image>
-			</template> -->
 		</view>
 		
-		<view v-if="form.mallAnnex && form.mallAnnex.length" class="detail">
+		<view v-if="form.mallAnnex && form.mallAnnex.length" class="detail" id="annex">
 			<view class="title-wrap">
 				<view class="title">
 					<image class="icon" src="@/static/image/product/5.png"></image>
@@ -95,7 +92,7 @@
 		</view>
 		
 		<view class="footer">
-			<view class="shop" @click="$util.to('../shopCart/shopCart')">
+			<view v-if="auth('产品:购物车')" class="shop" @click="$util.to('../shopCart/shopCart')">
 				<uni-badge size="small" :text="shopCartTotal" absolute="topRight" type="error">
 					<image class="icon" src="@/static/image/product/shop.png" mode="widthFix"></image>
 				</uni-badge>
@@ -103,8 +100,8 @@
 			</view>
 			
 			<view class="btns">
-				<view class="btn" @click="addShop">加入购物车</view>
-				<view class="btn order" @click="order">下单</view>
+				<view v-if="auth('产品:加入购物车')" class="btn" @click="addShop">加入购物车</view>
+				<view v-if="auth('产品:下单')" class="btn order" @click="order">下单</view>
 			</view>
 		</view>
 	</view>
@@ -121,15 +118,7 @@
 					{
 						name: '详情介绍',
 						id: 0
-					},
-					{
-						name: '界面图',
-						id: 1
-					},
-					{
-						name: '参数',
-						id: 2
-					},
+					}
 				],
 				form: {
 					classificationIds: [],
@@ -141,10 +130,23 @@
 					mallAnnex: []
 				},
 				shopCartTotal: 0,
-				types: []
+				types: [],
+				dotsStyles: {
+					backgroundColor: 'rgba(83, 200, 249,0.3)',
+					border: '1px rgba(83, 200, 249,0.3) solid',
+					color: '#fff',
+					selectedBackgroundColor: 'rgba(83, 200, 249,0.9)',
+					selectedBorder: '1px rgba(83, 200, 249,0.9) solid'
+				}
 			}
 		},
 		onShow() {
+			this.tabs = [
+				{
+					name: '详情介绍',
+					id: 0
+				}
+			]
 			const pages = getCurrentPages()
 			const { options } = pages[pages.length - 1]
 			this.id = options.id
@@ -159,9 +161,21 @@
 					title: '加载中'
 				})
 				detailsOfGoods(this.id).then(res => {
-					this.form = res.orderDetails
+					const e = res.orderDetails
+					e.mall.productIntroduction = this.$util.removeTag(e.mall.productIntroduction)
+					this.form = e
 					const pics = this.form.mall.interfaceDiagram
-					if (pics) this.form.interfaceDiagram = pics.split(',')
+					if (pics) {
+						this.form.interfaceDiagram = pics.split(',')
+						this.tabs.push({
+							name: '界面图',
+							id: 1
+						})
+					}
+					this.form.mallAnnex && this.form.mallAnnex.length && this.tabs.push({
+						name: '参数',
+						id: 2
+					})
 					uni.hideLoading()
 				}).catch(e => {
 					uni.hideLoading()
@@ -183,8 +197,14 @@
 				}).catch(e => {})
 			},
 			// tab切换
-			tabChange(tab) {
-				this.curTab = tab.id
+			tabChange({ id }) {
+				this.curTab = id
+				id == 1 && uni.pageScrollTo({
+					selector: '#pics',
+				})
+				id == 2 && uni.pageScrollTo({
+					selector: '#annex',
+				})
 			},
 			// 下载全部
 			downloadAll() {
@@ -231,37 +251,31 @@
 				const classificationId = this.form.classificationIds[0]
 				const authority = this.$util.getOrderType(classificationId)
 				// 把该产品添加至缓存
-				uni.setStorageSync('courses', {
-					['list' + authority]: {
-						shrink: false,
-						name: this.form.goodsRes.classificationName,
-						list: [{
-							dataOrCourseId: mall.associatedProduct, // id
-							mallId: mall.mallId,
-							productName: mall.productName, // 名称
-							periodOfUse: '', // 使用期限
-							startTime: this.$util.formatDate(new Date(), 'yyyy-MM-dd'), // 开始
-							endTime: '', // 终止
-							remainingPeriod: '', // 剩余期限
-							marketValue: '', // 市场价
-							marketPrice: mall.marketUnitPrice, // 市场单价
-							finalPrice: 0, // 成交价
-							finalValue: 0, // 成交单价（数据产品特有）
-							discountRate: '0%', // 折扣率
-							accountNum: 1, // 账号数
-							totalAmount: '', // 总价
-							isEnable: 0, // 启用否：1启用，0禁用
-							ship: 0, // 发货否（0未发货，1已发货，默认不发货）
-							authority, // 区分权限
-							options: 2,
-							miniProgramPictureAddress: mall.appletIcon || '', // 图标
-							settlementPrice: 0, // 结算价
-							settlementPriceUnit: 0, // 结算单价
-							serviceFee: 0 // 平台服务费（前端计算后展示，不入库）
-						}]
-					}
-				})
-				this.$util.to(`/order/orderDetail/orderDetail`)
+				uni.setStorageSync('courses', [{
+					dataOrCourseId: mall.associatedProduct, // id
+					mallId: mall.mallId,
+					productName: mall.productName, // 名称
+					periodOfUse: '', // 使用期限
+					startTime: this.$util.formatDate(new Date(), 'yyyy-MM-dd'), // 开始
+					endTime: '', // 终止
+					remainingPeriod: '', // 剩余期限
+					marketValue: '', // 市场价
+					marketPrice: mall.marketUnitPrice, // 市场单价
+					finalPrice: 0, // 成交价
+					finalValue: 0, // 成交单价（数据产品特有）
+					discountRate: '0%', // 折扣率
+					accountNum: 1, // 账号数
+					totalAmount: '', // 总价
+					isEnable: 0, // 启用否：1启用，0禁用
+					ship: 0, // 发货否（0未发货，1已发货，默认不发货）
+					authority, // 区分权限
+					options: 2,
+					miniProgramPictureAddress: mall.appletIcon || '', // 图标
+					settlementPrice: 0, // 结算价
+					settlementPriceUnit: 0, // 结算单价
+					serviceFee: 0 // 平台服务费（前端计算后展示，不入库）
+				}])
+				this.$util.to(`/order/editCourse/editCourse`)
 			}
 		}
 	}
@@ -284,6 +298,7 @@
 	.pro-title {
 		margin-top: 22rpx;
 		font-size: 30rpx;
+		font-weight: 600;
 		color: #333;
 	}
 	.fields {
@@ -306,7 +321,6 @@
 }
 .tabs {
 	display: flex;
-	justify-content: space-around;
 	margin-bottom: 32rpx;
 	li {
 		width: 33.33%;
@@ -356,6 +370,7 @@
 		display: flex;
 		align-items: center;
 		font-size: 30rpx;
+		font-weight: 600;
 		color: #333 ;
 		.icon {
 			width: 36rpx;
diff --git a/order/products/products.vue b/order/products/products.vue
index 0aeb8e9..360c0ac 100644
--- a/order/products/products.vue
+++ b/order/products/products.vue
@@ -10,7 +10,6 @@
 				<view v-if="i == 2" :class="['sort', {desc: sort == 2, asc: sort == 5}]"></view>
 			</li>
 		</ul>
-		
 		<view class="tags">
 			<view v-if="categoryName" class="tag" @click="delCategory">
 				{{ categoryName }}
@@ -40,8 +39,7 @@
 					<view class="line">
 						<text class="name">产品简介：</text>
 						<view class="val ell-wrap">
-							<view :class="{ell: !item.toggle}" v-html="item.productIntroduction"></view>
-							<view v-if="item.productIntroduction.length > 14" class="toggle" @click="toggle(item)">{{ item.toggle ? '收起' : '展开' }}</view>
+							<view class="ell">{{ item.productIntroduction }}</view>
 						</view>
 					</view>
 					<view class="line">
@@ -60,7 +58,7 @@
 			</li>
 		</ul>
 		
-		<view class="plus">
+		<view v-if="auth('产品:购物车')" class="plus">
 			<uni-badge size="small" :text="total" absolute="topRight" type="error">
 				<image class="icon" src="@/static/image/product/shop-blue.png" mode="widthFix" @click="$util.to('../shopCart/shopCart')"></image>
 			</uni-badge>
@@ -107,14 +105,18 @@
 						data: [],
 					},
 				],
-				filterForm: {},
+				filterForm: {
+					productType: [],
+					selection: [],
+					tagId: []
+				},
 				form: {
 					categoryId: '',
 					professionalCategoryId: '',
 					professionalId: '',
 					productType: '',
 					selection: '',
-					hotTag: 1,
+					tagId: ''
 				},
 				tagId: '',
 				curTab: 0,
@@ -124,7 +126,7 @@
 						id: 0
 					},
 					{
-						name: '热搜排行',
+						name: '热销排行',
 						id: 1
 					},
 					{
@@ -135,7 +137,7 @@
 				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
 				status: 'more', // 上拉加载状态 more|loading|noMore
 				searchTimer: null,
-				sort: 2,
+				sort: 0,
 				keyword: '',
 				list: [],
 				page: 1,
@@ -173,7 +175,14 @@
 		onShow() {
 			const pages = getCurrentPages()
 			const { options } = pages[pages.length - 1]
-			this.tagId = +options.tagId || ''
+			const { tagId, tagsName } = options
+			this.form.tagId = +tagId || ''
+			if (tagId) {
+				this.filterForm.tagId = [+tagId]
+				this.tagName = tagsName
+			}
+			
+			this.keyword = options.keyword || ''
 			this.page = 1
 			this.getList()
 			this.getFilter()
@@ -193,7 +202,7 @@
 					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
 					const list = page.records
 					list.map(e => {
-						e.toggle = e.productIntroduction.length < 14 // 超过了14个字才需要显示展开按钮
+						e.productIntroduction = this.$util.removeTag(e.productIntroduction)
 					})
 					this.list = this.reachBottom > 0 ? [...this.list, ...list] : list
 					this.page++ // 每次获取了数据后page+1
@@ -236,22 +245,18 @@
 					this.filters[2].data = res.tagsList
 				}).catch(e => {})
 			},
-			// 展开
-			toggle(item) {
-				item.toggle = !item.toggle
-			},
 			// 筛选确定回调
 			subFinsh(val) {
 				const { productType, selection, tagId, categoryId, professionalCategoryId, professionalId, categoryName } = val
 				this.form = {
-					categoryId,
-					professionalCategoryId,
-					professionalId,
+					categoryId: categoryId || '',
+					professionalCategoryId: professionalCategoryId || '',
+					professionalId: professionalId || '',
 					productType: productType.length ? productType[0] : '',
 					selection: selection.length ? selection[0] : '',
 					tagId: tagId.length ? tagId[0] : ''
 				}
-				this.categoryName = categoryName
+				this.categoryName = categoryName || ''
 				this.productTypeName = this.form.productType ? this.filters[0].data.find(e => e.value == this.form.productType).title : ''
 				this.tagName = this.form.tagId ? this.filters[2].data.find(e => e.value == this.form.tagId).title : ''
 				this.initList()
@@ -322,7 +327,7 @@
 		display: inline-flex;
 		align-items: center;
 		padding: 10rpx 14rpx;
-		margin: 20rpx 20rpx 0 0;
+		margin: 0 20rpx 16rpx 0;
 		font-size: 28rpx;
 		color: #007EFF;
 		background-color: #fff;
@@ -386,6 +391,8 @@
 	}
 }
 .plus {
+	bottom: 140rpx;
+	right: 60rpx;
 	.icon {
 		width: 80rpx;
 	}
diff --git a/order/shopCart/shopCart.vue b/order/shopCart/shopCart.vue
index 2393b5a..b7d2540 100644
--- a/order/shopCart/shopCart.vue
+++ b/order/shopCart/shopCart.vue
@@ -58,6 +58,10 @@
 			}
 		},
 		onShow() {
+			// 清除产品缓存
+			try {
+				uni.removeStorageSync('orderForm')
+			} catch (e) {}
 			this.page = 1
 			this.getList()
 		},
@@ -160,31 +164,22 @@
 			submit() {
 				const list = this.checked // 已选产品
 				if (list.length) {
+					if (new Set(list.map(e => e.mallId)).size !== list.length) return this.$util.errMsg('所选产品存在重复，请重新选择')
+					
 					const promises = []
-					let courses = {}
+					let courses = []
 					list.forEach(e => {
 						promises.push(new Promise(async (resolve, reject) => {
 							// 查询产品详情
 							const res = await detailsOfGoods(e.mallId)
 							const n = res.orderDetails
-							const authority = this.$util.getOrderType(n.classificationIds[0])
-							const curCourse = this.createParam(n.mall, authority, e.id)
-							// 有则push，没有则创建对象，这里的格式跟订单详情里的格式要一致
-							if (courses['list' + authority]) {
-								courses['list' + authority].list.push(curCourse)
-							} else {
-								courses['list' + authority] = {
-									shrink: false,
-									name: n.goodsRes.classificationName,
-									list: [curCourse]
-								}
-							}
+							courses.push(this.createParam(n.mall, this.$util.getOrderType(n.classificationIds[0]), e.id))
 							resolve()
 						}))
 					})
 					Promise.all(promises).then(_ => {
 						uni.setStorageSync('courses', courses)
-						this.$util.to(`/order/orderDetail/orderDetail`)
+						this.$util.to(`/order/editCourse/editCourse`)
 					})
 				} else {
 					this.$util.errMsg('请选择产品！')
diff --git a/pages.json b/pages.json
index b782313..7df87e2 100644
--- a/pages.json
+++ b/pages.json
@@ -32,14 +32,6 @@
 				"enablePullDownRefresh": true
 			}
 		},
-		{
-            "path" : "pages/clients/clients",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "客户列表",
-                "enablePullDownRefresh": true
-            }
-        },
         {
             "path" : "pages/products/products",
             "style" :                                                                                    
@@ -48,14 +40,6 @@
                 "enablePullDownRefresh": true
             }
         },
-		{
-		    "path" : "pages/clientDetail/clientDetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "客户详情",
-		        "enablePullDownRefresh": false
-		    }
-		},
 		{
 		    "path" : "pages/plans/plans",
 		    "style" :                                                                                    
@@ -86,6 +70,22 @@
 		{
 			"root": "order",
 			"pages": [
+				{
+					"path" : "clients/clients",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "客户列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path" : "clientDetail/clientDetail",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "客户详情",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
 					"path" : "addCourse/addCourse",
 					"style" :                                                                                    
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f6d3c42..42c8d83 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,12 +1,12 @@
 <template>
 	<view :class="['page', {oh: !per}]">
-		<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" />
+		<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="searchConfirm" />
 		
 		<view class="banner">
 			<image class="img" src="@/static/image/index/banner.png" mode="widthFix"></image>
 		</view>
 		
-		<view class="block">
+		<view class="block" style="margin-top: 0">
 			<view class="title-wrap">
 				<view class="title">热门标签</view>
 			</view>
@@ -30,7 +30,7 @@
 					<image class="pic" :src="$util.getIcon(item)"></image>
 					<view class="texts">
 						<view class="name ell">{{ item.productName }}</view>
-						<view class="des ell" v-html="item.productIntroduction"></view>
+						<view class="des ell">{{ item.productIntroduction }}</view>
 						<view class="meta">
 							<image class="icon" src="@/static/image/index/9.png"></image>
 							适用专业: 
@@ -42,7 +42,7 @@
 		</view>
 		
 		
-		<view class="block">
+		<view class="block" style="margin-top: 40rpx">
 			<view class="title-wrap">
 				<view class="title">官方推荐</view>
 				<view class="all" @click="toProduct">全部产品</view>
@@ -52,7 +52,7 @@
 					<image class="pic" :src="$util.getIcon(item)"></image>
 					<view class="texts">
 						<view class="name ell">{{ item.productName }}</view>
-						<view class="des ell" v-html="item.productIntroduction"></view>
+						<view class="des ell">{{ item.productIntroduction }}</view>
 						<view class="meta">
 							<image class="icon" src="@/static/image/index/9.png"></image>
 							适用专业: 
@@ -83,15 +83,8 @@
 				offcialProducts: [],
 			}
 		},
-		watch: {
-			keyword () {
-				clearTimeout(this.searchTimer)
-				this.searchTimer = setTimeout(() => {
-					this.initList()
-				}, 500)
-			}
-		},
 		onShow() {
+			this.keyword = ''
 			this.per = true
 			this.getInfo()
 		},
@@ -184,6 +177,9 @@
 					isShelves: 0,
 					hotTag: 1
 				}).then(({ page }) => {
+					page.records.forEach(e => {
+						e.productIntroduction = this.$util.removeTag(e.productIntroduction)
+					})
 					this.hotProducts = page.records
 				}).catch(e => {})
 				
@@ -196,12 +192,19 @@
 					hotTag: 1,
 					selection: 1
 				}).then(({ page }) => {
+					page.records.forEach(e => {
+						e.productIntroduction = this.$util.removeTag(e.productIntroduction)
+					})
 					this.offcialProducts = page.records
 				}).catch(e => {})
 			},
+			// 模糊查询回调
+			searchConfirm(e) {
+				e.value && this.$util.to(`/order/products/products?keyword=${e.value}`)
+			},
 			// 跳转热门标签
 			toHot(item) {
-				this.$util.to(`/order/products/products?tagId=${item.tagsId}`)
+				this.$util.to(`/order/products/products?tagId=${item.tagsId}&tagsName=${item.tagsName}`)
 			},
 			// 跳转学习
 			toProduct() {
@@ -219,7 +222,7 @@
 .page {
 	position: relative;
 	min-height: 100%;
-	padding: 30rpx 22rpx;
+	padding: 10rpx 22rpx;
 	box-sizing: border-box;
 	background-color: #fff;
 }
@@ -246,7 +249,7 @@
 	}
 }
 .block {
-	margin: 40rpx 0;
+	margin: 20rpx 0;
 	.title-wrap {
 		display: flex;
 		justify-content: space-between;
@@ -260,6 +263,7 @@
 		display: inline-flex;
 		align-items: center;
 		font-size: 28rpx;
+		font-weight: 600;
 		color: #333;
 		&:before {
 			content: '';
@@ -280,8 +284,8 @@
 		text-align: center;
 	}
 	.icon {
-		width: 64rpx;
-		height: 64rpx;
+		width: 70rpx;
+		height: 70rpx;
 		margin-bottom: 18rpx;
 	}
 	.text {
@@ -306,6 +310,7 @@
 	}
 	.name {
 		font-size: 28rpx;
+		font-weight: 600;
 		color: #333;
 	}
 	.des {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d1823b2..02c31de 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -45,6 +45,7 @@
 			}
 		},
 		onShow() {
+						// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjg2NzExNTA5LCJleHAiOjE2ODY3NTQ3MDksImFjY291bnRJZCI6IjEyNTU4In0.SX1sNFtb2JiCufgTz3ZmQkcJ-FtVci7Hp0DFd_mVk8E')
 			// 先授权用户信息，再授权手机号
 			this.checkLogin()
 		},
diff --git a/pages/orders/orders.vue b/pages/orders/orders.vue
index 800a28f..2e1c8a5 100644
--- a/pages/orders/orders.vue
+++ b/pages/orders/orders.vue
@@ -145,6 +145,7 @@
 		onShow() {
 			// 清除产品缓存
 			try {
+				uni.removeStorageSync('orderForm')
 				uni.removeStorageSync('courses')
 			} catch (e) {}
 			this.initRole()
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 0fed4f0..ae41cfc 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -10,7 +10,7 @@
 					<view class="name">{{ my.info.userName }}</view>
 					<view class="phone">{{ my.info.phone }}</view>
 				</view>
-				<uni-tag v-if="!disabled" class="tag" :circle="true" text="团队负责人" type="primary" size="small" />
+				<view v-if="!disabled" class="tag">团队负责人</view>
 			</view>
 			<view class="list">
 				<view v-if="auth('我的:我的团队')" class="item" @click="$util.to('/team/teams/teams')">
@@ -269,7 +269,12 @@
 		color: #333;
 	}
 	.tag {
+		padding: 8rpx 16rpx;
 		margin-top: -50rpx;
+		font-size: 24rpx;
+		color: #fff;
+		background-color: #2979ff;
+		border-radius: 20px;
 	}
 }
 .list {
diff --git a/pages/products/products.vue b/pages/products/products.vue
index fab5234..218737b 100644
--- a/pages/products/products.vue
+++ b/pages/products/products.vue
@@ -47,8 +47,7 @@
 </template>
 
 <script>
-	import { tagsList, listOfGoods } from '@/apis/modules/product.js'
-	import { AppletsDataProductList } from '@/apis/modules/product.js'
+	import { AppletsDataProductList, tagsList, listOfGoods } from '@/apis/modules/product.js'
 	export default {
 		data() {
 			return {
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index 8ff68a9..6c9f59f 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -14,7 +14,7 @@
 		</view>
 		
 		<ul class="entry">
-			<li v-if="auth('工作台:客户')" @click="$util.to('../clients/clients')">
+			<li v-if="auth('工作台:客户')" @click="$util.to('/order/clients/clients')">
 				<image class="icon" src="@/static/image/workbench/index3.png" mode="widthFix"></image>
 				<view class="text">客户</view>
 			</li>
@@ -23,11 +23,11 @@
 				<view class="text">方案</view>
 			</li>
 			<li v-if="auth('工作台:学习')" @click="$util.to('/team/study/study')">
-				<image class="icon" src="@/static/image/workbench/index11.png" mode="widthFix"></image>
+				<image class="icon" src="@/static/image/workbench/index11.png" mode="widthFix" style="width: 64rpx"></image>
 				<view class="text">学习</view>
 			</li>
 			<li v-if="auth('工作台:资讯')" @click="$util.to('/team/info/info')">
-				<image class="icon" src="@/static/image/workbench/index12.png" mode="widthFix"></image>
+				<image class="icon" src="@/static/image/workbench/index12.png" mode="widthFix" style="width: 64rpx"></image>
 				<view class="text">资讯</view>
 			</li>
 		</ul>
diff --git a/static/image/workbench/index11.png b/static/image/workbench/index11.png
index 1a93aba..415c90c 100644
Binary files a/static/image/workbench/index11.png and b/static/image/workbench/index11.png differ
diff --git a/static/image/workbench/index12.png b/static/image/workbench/index12.png
index 2da7ae4..076af33 100644
Binary files a/static/image/workbench/index12.png and b/static/image/workbench/index12.png differ
diff --git a/team/teams/teams.vue b/team/teams/teams.vue
index dfaf1bb..c48205c 100644
--- a/team/teams/teams.vue
+++ b/team/teams/teams.vue
@@ -19,7 +19,7 @@
 							<text class="val">{{ item.lastLoginTime.split(' ')[0] }}</text>
 						</view>
 					</view>
-					<uni-tag v-if="item.isTeam == 1" class="tag" :circle="true" text="团队负责人" type="primary" size="small" />
+					<view v-if="item.isTeam == 1" class="tag">团队负责人</view>
 				</li>
 			</ul>
 			<uni-load-more :status="status" />
@@ -151,6 +151,11 @@
 		position: absolute;
 		top: 20rpx;
 		right: 40rpx;
+		padding: 8rpx 16rpx;
+		font-size: 24rpx;
+		color: #fff;
+		background-color: #2979ff;
+		border-radius: 20px;
 	}
 }
 .plus {