diff --git a/apis/modules/order.js b/apis/modules/order.js
index 0d8332b..e9a003d 100644
--- a/apis/modules/order.js
+++ b/apis/modules/order.js
@@ -35,4 +35,8 @@ export const del = (data) => {
 
 export const miniProgramOrderRecord = (data) => {
   return post('nakadai/nakadai/applets/order/miniProgramOrderRecord', data)
+}
+
+export const queryCitySettlementPrice = (mallId, provinceId, cityId) => {
+  return post(`nakadai/mallPrice/queryCitySettlementPrice?mallId=${mallId}&provinceId=${provinceId}&cityId=${cityId}`)
 }
\ No newline at end of file
diff --git a/apis/modules/product.js b/apis/modules/product.js
index 6af27bb..50aeada 100644
--- a/apis/modules/product.js
+++ b/apis/modules/product.js
@@ -19,4 +19,20 @@ export const detailsOfGoods = (id) => {
 
 export const productCategoryList = () => {
   return get('nakadai/productClassification/productCategoryList')
+}
+
+export const productTypeList = () => {
+  return get('nakadai/productType/productTypeList')
+}
+
+export const addToShoppingCart = (data) => {
+  return post('nakadai/mini/program/shopping/cart/addToShoppingCart', data)
+}
+
+export const delCart = (data) => {
+  return post('nakadai/mini/program/shopping/cart/batchDeletion', data)
+}
+
+export const shoppingCartList = (data) => {
+  return post('nakadai/mini/program/shopping/cart/shoppingCartList', data)
 }
\ No newline at end of file
diff --git a/config/request.js b/config/request.js
index 6748186..2e4f704 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,8 +5,8 @@
  */
 
 export default {
-  baseURL: 'https://huorantech.cn/',
-  // baseURL: 'http://192.168.31.151:9000/',
+  // baseURL: 'https://huorantech.cn/',
+  baseURL: 'http://192.168.31.51:9000/',
   // baseURL: 'http://121.37.12.51/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
diff --git a/order/addCourse/addCourse.vue b/order/addCourse/addCourse.vue
index 2520aff..c750721 100644
--- a/order/addCourse/addCourse.vue
+++ b/order/addCourse/addCourse.vue
@@ -11,7 +11,7 @@
 		</ul>
 		
 		<ul class="list">
-			<li v-for="(item, i) in list">
+			<li v-for="(item, i) in list" :key="i">
 				<uni-data-checkbox v-if="item.check" class="check" multiple :value="[1]" :localdata="item.checkData" @change="e => checkChange(e, i)"></uni-data-checkbox>
 				<uni-data-checkbox v-else class="check" multiple v-model="item.check" :localdata="item.checkData" @change="e => checkChange(e, i)"></uni-data-checkbox>
 				<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
@@ -29,12 +29,15 @@
 
 <script>
 	import { productCategoryList, listOfGoods } from '@/apis/modules/product.js'
-	import { renew } from '@/apis/modules/order.js'
+	import { renew, queryCitySettlementPrice } from '@/apis/modules/order.js'
 	export default {
 		data() {
 			return {
+				// authority: 权限。0数据平台，1为课程，2职站增值模块，3实训课程（非集成），4实验工具
 				orderType: 1,
 				customerId: '',
+				provinceId: '',
+				cityId: '',
 				curTab: '',
 				tabs: [
 					{
@@ -96,6 +99,8 @@
 			const { options } = pages[pages.length - 1]
 			this.orderType = options.orderType
 			this.customerId = options.customerId
+			this.provinceId = options.provinceId
+			this.cityId = options.cityId
 			this.getTypes()
 			this.getList()
 		},
@@ -201,7 +206,7 @@
 				})
 			},
 			// 生成产品参数
-			createParam(e) {
+			createParam(e, authority) {
 				const { orderType } = this
 				const trial = orderType == 2 // 是否是试用
 				return {
@@ -217,16 +222,16 @@
 					finalPrice: trial ? 0 : '', // 成交价
 					finalValue: trial ? 0 : '', // 成交单价（数据产品特有）
 					discountRate: trial ? '0%' : '', // 折扣率
-					accountNum: '', // 账号数
+					accountNum: authority ? 1 : '', // 账号数
 					totalAmount: '', // 总价
 					isEnable: 0, // 启用否：1启用，0禁用
 					ship: 0, // 发货否（0未发货，1已发货，默认不发货）
-					authority: e.productType === 2 ? 0 : 1, // 区分权限 0为数据平台权限，1为课程权限
+					authority, // 区分权限 0为数据平台权限，1为课程权限
 					options: 2,
 					miniProgramPictureAddress: e.appletIcon, // 图标
 					settlementPrice: trial ? 0 : '', // 结算价
 					settlementMethod: e.settlementMethod, // 结算方式，0为单价，1为分成
-					settlementPriceUnit: e.settlementPrice, // 结算单价
+					settlementPriceUnit: e.settlementPrice || 0, // 结算单价
 					serviceFee: 0 // 平台服务费（前端计算后展示，不入库）
 				}
 			},
@@ -255,29 +260,72 @@
 				const list = this.checked // 已选产品
 				if (list.length) {
 					const result = this.courses
-					const courseIds = []
-					const dataIds = []
+					const list1 = [] // 实训、理论
+					const list0 = [] // 数据前瞻
+					const list2 = [] // 职站增值
+					const list3 = [] // 实训课程（非集成）
+					const list4 = [] // 实验工具
 					const { customerId } = this
-					list.map(e => {
-						// 新勾选的产品，则获取到id，下面要调用，
-						if (!result.find(n => (n.dataOrCourseId == e.associatedProduct || n.dataOrCourseId == e.dataOrCourseId) && n.authority == e.authority)) {
-							e.productType === 2 ? dataIds.push(e.id) : courseIds.push(e.id)
-							result.push(this.createParam(e))
-						}
+					
+					const listPromise = []
+					list.forEach(async e => {
+						listPromise.push(new Promise(async (resolve, reject) => {
+							// 新勾选的产品，则获取到id，下面要调用
+							if (!result.find(n => (n.dataOrCourseId == e.associatedProduct || n.dataOrCourseId == e.dataOrCourseId) && n.authority == e.authority)) {
+								let authority
+								// 查询产品管理设置的平台结算价
+								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
+								if (classId == 1 || classId == 2) {
+									authority = 1
+									list1.push(pid)
+								} else if (classId == 3) {
+									authority = 2
+									list2.push(pid)
+								} else if (classId == 4) {
+									authority = 3
+									list3.push(pid)
+								} else if (classId == 5) {
+									authority = 0
+									list0.push(pid)
+								} else if (classId == 6) {
+									authority = 4
+									list4.push(pid)
+								}
+								result.push(this.createParam(e, authority))
+								resolve()
+							} else {
+								resolve()
+							}
+						}))
 					})
-					const promises = []
-					// 课程和数据的分别调接口
-					dataIds.length && promises.push(new Promise((resolve, reject) => {
-						this.handleRenew(0, customerId, dataIds, result, resolve, reject)
-					}))
-					courseIds.length && promises.push(new Promise((resolve, reject) => {
-						this.handleRenew(1, customerId, courseIds, result, resolve, reject)
-					}))
-					Promise.all(promises).then(_ => {
-					    uni.setStorageSync('courses', result) // 把选中的产品添加至缓存
-					    uni.redirectTo({
-					    	url: `../editCourse/editCourse?customerId=${customerId}&orderType=${this.orderType}`
-					    })
+					Promise.all(listPromise).then(_ => {
+						const promises = []
+						// 有5种产品，要传不同的authority调renew接口
+						list0.length && promises.push(new Promise((resolve, reject) => {
+							this.handleRenew(0, customerId, list0, result, resolve, reject)
+						}))
+						list1.length && promises.push(new Promise((resolve, reject) => {
+							this.handleRenew(1, customerId, list1, result, resolve, reject)
+						}))
+						list2.length && promises.push(new Promise((resolve, reject) => {
+							this.handleRenew(2, customerId, list2, result, resolve, reject)
+						}))
+						list3.length && promises.push(new Promise((resolve, reject) => {
+							this.handleRenew(3, customerId, list3, result, resolve, reject)
+						}))
+						list4.length && promises.push(new Promise((resolve, reject) => {
+							this.handleRenew(4, customerId, list4, result, resolve, reject)
+						}))
+						Promise.all(promises).then(_ => {
+							uni.setStorageSync('courses', result) // 把选中的产品添加至缓存
+							uni.redirectTo({
+								url: `../editCourse/editCourse?customerId=${customerId}&orderType=${this.orderType}`
+							})
+						})
 					})
 				} else {
 					this.$util.errMsg('请选择产品！')
diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
index 684ef5b..cd54f3e 100644
--- a/order/editCourse/editCourse.vue
+++ b/order/editCourse/editCourse.vue
@@ -253,7 +253,7 @@
 			// 计算结算价及平台服务费
 			dealSettlePrice(row) {
 				// 如果是试用，结算价和平台服务费都是0
-				console.log('row=>', row)
+				console.log('dealSettlePrice=>', row, this.orderType)
 				if (this.orderType == 2) {
 					row.settlementPrice = 0
 					row.serviceFee = 0
@@ -261,22 +261,18 @@
 					const unit = row.options // 使用期限单位
 					const useUnit = row.periodOfUse // 使用期限
 					let sPrice = ''
-					if (row.settlementMethod == 0) {
-						// 结算单价。计算规则：结算单价（**元/年）*购买时长（单位年）*数量(课程为1，数据为账号数量)
-						const priceUnit = row.settlementPriceUnit
-						sPrice = ((!unit ? 
-							priceUnit / 365 * useUnit :
-							unit === 1 ?
-								priceUnit / 12 * useUnit :
-								priceUnit * useUnit) * (row.authority ?
-									1 :
-									row.accountNum)).toFixed((2))
-					} else {
-						// 比例分成。计算规则：成交价*商务分成比例
-						sPrice = (row.finalPrice * row.businessProportion / 100).toFixed((2))
-					}
+					// 结算单价。计算规则：结算单价（**元/年）*购买时长（单位年）*数量(课程为1，数据为账号数量)
+					const priceUnit = row.settlementPriceUnit
+					sPrice = ((!unit ? 
+						priceUnit / 365 * useUnit :
+						unit === 1 ?
+							priceUnit / 12 * useUnit :
+							priceUnit * useUnit) * (row.authority ?
+								1 :
+								row.accountNum)).toFixed((2))
+				console.log('dealSettlePrice2=>', row, this.orderType, this.$util.handleNaN(sPrice))
 					row.settlementPrice = this.$util.handleNaN(sPrice)
-					// 平台服务费（结算价*10%）
+					// 平台服务费
 					if (row.settlementPrice) {
 						row.serviceFee = (row.finalPrice * (this.rate / 100)).toFixed(2)
 					}
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index 4e9281f..9bf6ebf 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -366,7 +366,7 @@
 				uni.setStorageSync('courses', this.courses)
 				const { customerId, orderType } = this.form
 				customerId ?
-					this.$util.to(`../addCourse/addCourse?orderType=${orderType}&customerId=${customerId}`) :
+					this.$util.to(`../addCourse/addCourse?orderType=${orderType}&customerId=${customerId}&provinceId=${this.form.provinceId}&cityId=${this.form.cityId}`) :
 					this.$util.errMsg('请先选择客户！')
 			},
 			// 编辑课程
@@ -459,21 +459,15 @@
 				} else {
 					const unit = row.options // 使用期限单位
 					const useUnit = row.periodOfUse // 使用期限
-					let sPrice = ''
-					if (row.settlementMethod == 0) {
-						// 结算单价。计算规则：结算单价（**元/年）*购买时长（单位年）*数量(课程为1，数据为账号数量)
-						const priceUnit = row.settlementPriceUnit
-						sPrice = ((!unit ? 
-							priceUnit / 365 * useUnit :
-							unit === 1 ?
-								priceUnit / 12 * useUnit :
-								priceUnit * useUnit) * (row.authority ?
-									1 :
-									row.accountNum)).toFixed((2))
-					} else {
-						// 比例分成。计算规则：成交价*商务分成比例
-						sPrice = (row.finalPrice * row.businessProportion / 100).toFixed((2))
-					}
+					// 结算单价。计算规则：结算单价（**元/年）*购买时长（单位年）*数量(课程为1，数据为账号数量)
+					const priceUnit = row.settlementPriceUnit
+					let sPrice = ((!unit ? 
+						priceUnit / 365 * useUnit :
+						unit === 1 ?
+							priceUnit / 12 * useUnit :
+							priceUnit * useUnit) * (row.authority ?
+								1 :
+								row.accountNum)).toFixed((2))
 					row.settlementPrice = this.$util.handleNaN(sPrice)
 					// 平台服务费（结算价*10%）
 					if (row.settlementPrice) {
@@ -511,7 +505,7 @@
 			// 消息推送授权
 			publicNotice() {
 				uni.requestSubscribeMessage({
-					tmplIds: ['8pDVfWYqh9c-nn3CeA1NXM58pmoyQXZzkVnRFKy_l2A'],
+					tmplIds: ['8pDVfWYqh9c-nn3CeA1NXJtBxdd1FYiCtrl5BeLvbgU'],
 					success: (res) => {
 						uni.navigateBack()
 					},
diff --git a/order/productDetail/productDetail.vue b/order/productDetail/productDetail.vue
index 0e8fe5a..87c9aaa 100644
--- a/order/productDetail/productDetail.vue
+++ b/order/productDetail/productDetail.vue
@@ -81,19 +81,21 @@
 						<image class="icon" src="@/static/image/product/ppt.png"></image>
 						{{ file.fileName }}
 					</view>
-					<view class="download">下载</view>
+					<view class="download" @click="download(file)">下载</view>
 				</view>
 			</view>
 		</view>
 		
 		<view class="footer">
-			<view class="shop">
-				<image class="icon" src="@/static/image/product/shop.png" mode="widthFix"></image>
+			<view 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>
 				<view>购物车</view>
 			</view>
 			
 			<view class="btns">
-				<view class="btn">加入购物车</view>
+				<view class="btn" @click="addShop">加入购物车</view>
 				<view class="btn order">下单</view>
 			</view>
 		</view>
@@ -101,7 +103,7 @@
 </template>
 
 <script>
-	import { detailsOfGoods } from '@/apis/modules/product.js'
+	import { detailsOfGoods, addToShoppingCart, shoppingCartList } from '@/apis/modules/product.js'
 	export default {
 		data() {
 			return {
@@ -129,6 +131,7 @@
 					goodsRes: {},
 					mallAnnex: []
 				},
+				shopCartTotal: 0
 			}
 		},
 		onShow() {
@@ -136,6 +139,7 @@
 			const { options } = pages[pages.length - 1]
 			this.id = options.id
 			this.getInfo()
+			this.getShopCart()
 		},
 		methods: {
 			// 获取详情
@@ -150,14 +154,38 @@
 					uni.hideLoading()
 				})
 			},
+			// 购物车列表
+			getShopCart() {
+				shoppingCartList({
+					pageNum: 1,
+					pageSize: 1000,
+				}).then(({ data }) => {
+					this.shopCartTotal = data.total
+				}).catch(e => {})
+			},
 			// tab切换
 			tabChange(tab) {
 				this.curTab = tab.id
 			},
 			// 下载附件
 			download(item) {
-				this.$util.to(`../send/send?url=${item.filePath}&copyWriting=${item.fileName}`)
+				this.$util.to(`/team/send/send?url=${item.filePath}&copyWriting=${item.fileName}`)
 			},
+			// 加入购物车
+			addShop() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				addToShoppingCart({
+					mallId: this.id
+				}).then(res => {
+					this.$util.sucMsg('加购成功')
+					uni.hideLoading()
+					this.getShopCart()
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			}
 		}
 	}
 </script>
@@ -316,11 +344,12 @@
 	background-color: #fff;
 	box-sizing: border-box;
 	.shop {
+		text-align: center;
+		font-size: 24rpx;
+		color: #333;
 		.icon {
 			width: 56rpx;
 		}
-		font-size: 24rpx;
-		color: #333;
 	}
 	.btns {
 		display: inline-flex;
diff --git a/order/products/products.vue b/order/products/products.vue
index 977c5d0..ee8e00c 100644
--- a/order/products/products.vue
+++ b/order/products/products.vue
@@ -2,15 +2,17 @@
 	<view>
 		<view class="filter">
 			<uni-search-bar class="search" radius="30" placeholder="请输入产品名称" v-model="keyword" clearButton="auto" cancelButton="none" />
-			<view :class="['sort', sort]" @click="switchSort"></view>
 			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
 		</view>
 		<ul class="tab">
-			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
+			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">
+				{{ tab.name }}
+				<view v-if="i == 2" :class="['sort', {desc: sort == 2, asc: sort == 5}]"></view>
+			</li>
 		</ul>
 		
 		<ul class="list">
-			<li v-for="item in list">
+			<li v-for="(item, i) in list" :key="i" @click="toDetail(item)">
 				<view class="pro-name">
 				<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
 					{{ item.productName }}
@@ -39,40 +41,58 @@
 			</li>
 		</ul>
 		
-		<uni-icons class="plus" type="plus-filled" size="60" color="#007eff" @click="$util.to('/order/orderDetail/orderDetail')"></uni-icons>
-		<filter-popup :data="filterData" :form.sync="filterForm" v-model="popup" title="全部筛选" height="1104rpx" @finsh="subFinsh"></filter-popup>
+		<view 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>
+		</view>
+		
+		<filter-popup :data="filters" :form.sync="filterForm" v-model="popup" title="全部筛选" height="1104rpx" @finsh="subFinsh"></filter-popup>
 	</view>
 </template>
 
 <script>
-	import { tagsList, listOfGoods } from '@/apis/modules/product.js'
-	import { queryCustomer } from '@/apis/modules/client.js'
-	import { list, del } from '@/apis/modules/order.js'
+	import { tagsList, listOfGoods, productTypeList } from '@/apis/modules/product.js'
 	export default {
 		data() {
 			return {
 				popup: false,
 				//筛选表单数据
-				filterData: [
+				filters: [
 					{
 						children: false,//是否有子项
-						title: "订单状态",
-						key: "orderStatus", //键名 接收对象名字
+						title: "产品类型",
+						key: "productType", //键名 接收对象名字
 						keyValue: "value", //获取的值是哪个
 						isRadio: true, //是否单选 否则多选
+						data: [],
+					},
+					{
+						children: false,//是否有子项
+						title: "官方精选",
+						key: "selection", //键名 接收对象名字
+						keyValue: "value", //获取的值是哪个
 						data: [
 							{
-								title: "待发货",
-								value: 0
-							},
-							{
-								title: "已完成",
-								value: 1
-							},
+								value: 1,
+								title: '官方精选'
+							}
 						],
-					}
+					},
+					{
+						children: false,//是否有子项
+						title: "产品标签",
+						key: "tagId", //键名 接收对象名字
+						keyValue: "value", //获取的值是哪个
+						isRadio: true, //是否单选 否则多选
+						data: [],
+					},
 				],
 				filterForm: {},
+				productType: '',
+				selection: '',
+				hotTag: 1,
+				tagId: '',
 				curTab: 0,
 				tabs: [
 					{
@@ -85,24 +105,19 @@
 					},
 					{
 						name: '发布时间',
-						id: 1
+						id: 2
 					}
 				],
 				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
 				status: 'more', // 上拉加载状态 more|loading|noMore
 				searchTimer: null,
-				orderStatus: '',
-				sort: 'desc',
+				sort: 2,
 				keyword: '',
 				list: [],
 				page: 1,
 				pageSize: 10,
-				delOption: [{
-					text: '删除',
-					style: {
-						backgroundColor: '#F56C6C'
-					}
-				}],
+				total: 0,
+				cartNum: ''
 			}
 		},
 		watch: {
@@ -129,17 +144,25 @@
 			}
 		},
 		onShow() {
+			const pages = getCurrentPages()
+			const { options } = pages[pages.length - 1]
+			this.tagId = +options.tagId || ''
+			this.page = 1
 			this.getList()
+			this.getFilter()
 		},
 		methods: {
 			getList() {
 				listOfGoods({
 					pageNum: this.page,
 					pageSize: this.pageSize,
-					sort: 0,
+					sort: this.curTab == 2 ? this.sort : this.curTab,
 					isShelves: 0,
-					hotTag: 1,
+					hotTag: this.tagId ? 2 : 1,
+					tagId: this.tagId,
 					productName: this.keyword,
+					productType: this.productType,
+					selection: this.selection
 				}).then(({ page }) => {
 					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
 					const list = page.records
@@ -148,6 +171,7 @@
 					})
 					this.list = this.reachBottom > 0 ? [...this.list, ...list] : list
 					this.page++ // 每次获取了数据后page+1
+					this.total = page.total
 					const noMore = this.list.length === page.total // 是否加载完所有数据
 					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
 					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
@@ -158,107 +182,118 @@
 				this.reachBottom = 0
 				this.getList()
 			},
+			// 筛选
+			getFilter() {
+				// 产品类型
+				productTypeList().then(res => {
+					res.typeList.forEach(e => {
+						e.value = e.typeId
+						e.title = e.typeName
+					})
+					this.filters[0].data = res.typeList
+				}).catch(e => {})
+				
+				// 产品标签
+				tagsList().then(res => {
+					res.tagsList.forEach(e => {
+						e.value = e.tagsId
+						e.title = e.tagsName
+					})
+					this.filters[2].data = res.tagsList
+				}).catch(e => {})
+			},
 			// 展开
 			toggle(item) {
 				item.toggle = !item.toggle
 			},
 			// 筛选确定回调
 			subFinsh(val) {
-				const { orderStatus } = val
-				this.orderStatus = orderStatus.length ? orderStatus[0] : ''
-				this.initList()
-			},
-			// 排序
-			switchSort() {
-				this.sort = this.sort === 'desc' ? 'asc' : 'desc'
+				const { productType, selection, tagId } = val
+				this.productType = productType.length ? productType[0] : ''
+				this.selection = selection.length ? selection[0] : ''
+				this.tagId = tagId.length ? tagId[0] : ''
 				this.initList()
 			},
 			// tab切换
-			tabChange(tab) {
-				this.curTab = tab.id
+			tabChange({ id }) {
+				this.sort = id == 2 ?
+					this.sort == 2 ? 5 : 2
+					: ''
+				this.curTab = id
 				this.initList()
 			},
 			// 跳转详情
 			toDetail(item) {
-				this.$util.to(`/order/orderDetail/orderDetail?orderId=${item.orderId}&show=1`)
-			},
-			// 删除
-			del(e) {
-				const that = this
-				uni.showModal({
-					title: '提示',
-					content: '确定要删除吗？',
-					success(res) {
-						if (res.confirm) {
-							del({
-								ids: [e.orderId]
-							}).then(res => {
-								that.$util.sucMsg('删除成功')
-								that.initList()
-							}).catch(res => {})
-						}
-					}
-				})
+				console.log(44, item)
+				this.$util.to(`../productDetail/productDetail?id=${item.mallId}`)
 			},
 		}
 	}
 </script>
 
 <style scoped lang="scss">
+.tab {
+	li {
+		display: inline-flex;
+		align-items: center;
+	}
+}
 .list {
-	margin-top: 20rpx;
-	background-color: #fff;
-	.item {
-		padding: 20rpx 40rpx;
-		border-bottom: 1px solid #f1f1f1;
+	li {
+		padding: 0 24rpx;
+		margin: 16rpx 24rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
 	}
-	.c-name {
+	.pro-name {
+		display: flex;
+		align-items: center;
+		padding: 18rpx 0;
 		font-size: 30rpx;
 		color: #333;
+		border-bottom: 1px solid #E6E8ED;
+		.icon {
+			width: 52rpx;
+			height: 52rpx;
+			margin-right: 20rpx;
+		}
 	}
 	.info {
-		display: flex;
-		justify-content: space-between;
-		align-items: center;
-		margin-top: 10rpx;
-	}
-	.left {
-		max-width: 70%;
+		padding: 12rpx 0;
 	}
 	.line {
 		display: flex;
-		padding: 10rpx 0;
+		padding: 12rpx 0;
 	}
 	.name {
 		margin-right: 10rpx;
-		white-space: nowrap;
 		font-size: 28rpx;
 		color: #999;
 	}
 	.val {
-		max-width: 88%;
+		max-width: 70%;
 		font-size: 28rpx;
 		color: #333;
 	}
+	.ell-wrap {
+		display: inline-flex;
+		align-items: center;
+	}
 	.ell {
 		white-space: nowrap;
 		text-overflow: ellipsis;
 		overflow: hidden;
 	}
 	.toggle {
-		margin-top: 10rpx;
+		margin-left: 10rpx;
 		white-space: nowrap;
 		font-size: 24rpx;
 		color: #0e92ef;
 	}
-	.type {
-		margin-left: 20rpx;
-		font-size: 28rpx;
-		color: #ff7b2d;
-		white-space: nowrap;
-	}
-	.type1 {
-		color: #bdbdbd;
+}
+.plus {
+	.icon {
+		width: 80rpx;
 	}
 }
 </style>
diff --git a/order/shopCart/shopCart.vue b/order/shopCart/shopCart.vue
new file mode 100644
index 0000000..771275a
--- /dev/null
+++ b/order/shopCart/shopCart.vue
@@ -0,0 +1,183 @@
+<template>
+	<view class="page">
+		<ul class="list">
+			<li v-for="(item, i) in list">
+				<uni-data-checkbox v-if="item.check" class="check" multiple :value="[1]" :localdata="item.checkData" @change="e => checkChange(e, i)"></uni-data-checkbox>
+				<uni-data-checkbox v-else class="check" multiple v-model="item.check" :localdata="item.checkData" @change="e => checkChange(e, i)"></uni-data-checkbox>
+				<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
+				{{ item.productName }}
+			</li>
+		</ul>
+		<uni-load-more :status="status" />
+		
+		<view class="btn-wrap">
+			<uni-data-checkbox class="check" multiple v-model="checkAll" :localdata="checkAllData" @change="allChange"></uni-data-checkbox>
+			<view class="btn" @click="submit">生成订单</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { shoppingCartList, delCart } from '@/apis/modules/product.js'
+	export default {
+		data() {
+			return {
+				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
+				status: 'more', // 上拉加载状态 more|loading|noMore
+				searchTimer: null,
+				list: [],
+				page: 1,
+				pageSize: 10,
+				check: [1],
+				noCheck: [],
+				checkData: [{
+					text: '',
+					value: 1
+				}],
+				checkAll: [],
+				checkAllData: [{
+					text: '全部',
+					value: 1
+				}],
+				checked: [], // 已经勾选的集合
+			}
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.initList()
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 1500)
+		},
+		// 上拉加载
+		onReachBottom() {
+			if (this.reachBottom >= 0) {
+				this.reachBottom = 1
+				this.status = 'loading'
+				this.getList()
+			}
+		},
+		onShow() {
+			this.getList()
+		},
+		methods: {
+			// 购物车列表
+			getList() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				shoppingCartList({
+					pageNum: this.page,
+					pageSize: this.pageSize,
+				}).then(({ data }) => {
+					const { records } = data
+					const all = this.checkAll.length // 是否勾选了全选
+					const pageChange = this.reachBottom > 0 // 是否是翻页
+					const { checked } = this // 已选数据
+					// 添加选择框字段
+					records.forEach(e => {
+						e.check = 0
+						e.checkData = [{
+							text: '',
+							value: 1
+						}]
+					})
+					
+					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
+					this.list = pageChange ? [...this.list, ...records] : records
+					this.page++ // 每次获取了数据后page+1
+					const noMore = this.list.length === data.total // 是否加载完所有数据
+					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
+					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
+					uni.hideLoading()
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			},
+			initList() {
+				this.page = 1
+				this.reachBottom = 0
+				this.getList()
+			},
+			// 选择框回调
+			checkChange(e, i) {
+				const { checked } = this
+				const item = this.list[i]
+				const { id } = item
+				const include = checked.findIndex(e => e.id === id)
+				// 选中的情况下，该产品如果没有push到已选数组里，则push
+				if (e.detail.value.length) {
+					include === -1 && checked.push(item)
+				} else {
+					// 取消选中的情况下，如果已选数组里存在该产品，则移除
+					if (include !== -1) {
+						checked.splice(include, 1)
+						this.checkAll = []
+					}
+				}
+			},
+			// 全选
+			allChange(e) {
+				const isCheck = !!e.detail.value.length // 是否选中
+				const { list } = this
+				this.checked = isCheck ? list.map(e => e.id) : []
+				list.forEach(e => {
+					e.check = isCheck ? 1 : 0
+				})
+			},
+			// 确定
+			submit() {
+				const list = this.checked // 已选产品
+				if (list.length) {
+					
+				} else {
+					this.$util.errMsg('请选择产品！')
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page {
+	padding-bottom: 130rpx;
+}
+.list {
+	li {
+		display: flex;
+		align-items: center;
+		padding: 30rpx 24rpx;
+		margin: 16rpx 24rpx;
+		font-size: 30rpx;
+		color: #333;
+		background-color: #fff;
+		border-radius: 16rpx;
+	}
+	.icon {
+		width: 80rpx;
+		margin: 0 20rpx;
+	}
+}
+/deep/.check {
+	.checklist-box {
+		margin: 0 !important;
+	}
+	.checkbox__inner {
+		width: 40rpx !important;
+		height: 40rpx !important;
+		border-radius: 50% !important;
+	}
+	.checkbox__inner-icon {
+		top: 8rpx !important;
+		left: 14rpx !important;
+	}
+}
+.btn-wrap {
+	position: fixed;
+	justify-content: space-between;
+	.btn {
+		width: 340rpx;
+		margin-left: 27rpx;
+	}
+}
+</style>
diff --git a/pages.json b/pages.json
index 1401c7f..c78d6ff 100644
--- a/pages.json
+++ b/pages.json
@@ -142,6 +142,15 @@
 					"enablePullDownRefresh": true
                 }
                 
+                }
+                ,{
+                    "path" : "shopCart/shopCart",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "购物车",
+                    "enablePullDownRefresh": false
+                }
+                
                 }
             ]
 		},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index c69bf3a..73ff45d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -16,7 +16,7 @@
 			</view>
 			
 			<ul class="tags">
-				<li v-for="(tag, i) in tags" :key="i" @click="$util.to('/order/productDetail/productDetail?id=' + item.mallId)">
+				<li v-for="(tag, i) in tags" :key="i" @click="toHot(tag)">
 					<image class="icon" :src="require('@/static/image/index/' + (i + 1) + '.png')"></image>
 					<view class="text ell">{{ tag.tagsName }}</view>
 				</li>
@@ -27,7 +27,7 @@
 		<view class="block">
 			<view class="title-wrap">
 				<view class="title">热销产品</view>
-				<view class="all">全部产品</view>
+				<view class="all" @click="toProduct">全部产品</view>
 			</view>
 			<view class="list">
 				<view v-for="(item, i) in hotProducts" :key="i" class="item" @click="toDetail(item)">
@@ -49,7 +49,7 @@
 		<view class="block">
 			<view class="title-wrap">
 				<view class="title">官方推荐</view>
-				<view class="all">全部产品</view>
+				<view class="all" @click="toProduct">全部产品</view>
 			</view>
 			<view class="list">
 				<view v-for="(item, i) in offcialProducts" :key="i" class="item" @click="toDetail(item)">
@@ -72,12 +72,15 @@
 </template>
 
 <script>
+	import { getUserRolesPermissionMenu } from '@/apis/modules/user.js'
 	import { tagsList, listOfGoods } from '@/apis/modules/product.js'
+	import { getTeamsByAccountId } from '@/apis/modules/client.js'
 	export default {
 		data() {
 			return {
 				per: true, // 是否有权限
 				teamId: uni.getStorageSync('teamId') || '',
+				list: [],
 				keyword: '',
 				tags: [],
 				hotProducts: [],
@@ -94,8 +97,7 @@
 		},
 		onShow() {
 			this.per = true
-			this.getTags()
-			this.getProducts()
+			this.getInfo()
 		},
 		methods: {
 			// 初始化权限
@@ -103,9 +105,72 @@
 				if (!uni.getStorageSync('auth').includes('首页')) {
 					this.per = false
 				}
-				this.getStudy()
-				this.getSell()
-				this.getAnalysis()
+				this.getTags()
+				this.getProducts()
+			},
+			// 查询当前角色权限
+			getAuth() {
+				uni.getStorageSync('token') && getUserRolesPermissionMenu({
+					teamId: this.list.find(e => e.teamId == this.teamId).partnerClassificationId,
+					platformId: 4
+				}).then(({ permissionMenu }) => {
+					uni.hideLoading()
+					const auth = []
+					// 生成权限数组
+					const generateAuth = (list, parent) => {
+						list.map(e => {
+							const name = `${parent ? parent + ':' : ''}${e.name}`
+							auth.push(name)
+							generateAuth(e.children, name)
+						})
+					}
+					generateAuth(permissionMenu[0].children, '')
+					uni.setStorageSync('auth', auth)
+					this.$forceUpdate()
+					this.initRole()
+				}).catch(e => {
+					uni.hideLoading()
+					uni.setStorageSync('auth', [])
+					this.initRole()
+				})
+			},
+			// 获取团队
+			getInfo() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				getTeamsByAccountId().then(({ data }) => {
+					data.map(e => {
+						const n = e.partnerClassificationList
+						e.id = n.id
+						// parnerId是商务经理id，teamId则是下面这个，其他地方要用的话直接uni.getStorageSync('team').partnerId去使用
+						e.teamId = e.isTeam == 1 ? +e.partnerClassificationId : n.id
+						e.partnerClassificationName = n.partnerClassificationName
+						delete e.partnerClassificationList
+					})
+					if (data.length) {
+						/**
+						 * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
+						 * 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队
+						 */
+						if (!uni.getStorageSync('team') || !data.find(e => e.teamId == this.teamId)) {
+							this.teamId = data[0].teamId
+							uni.setStorageSync('team', data[0])
+						}
+					} else {
+						// 如果没有团队，则退出登录
+						uni.hideLoading()
+						uni.clearStorageSync()
+						uni.navigateTo({
+							url: '../login/login'
+						})
+					}
+					
+					this.list = data
+					this.getAuth()
+				}).catch(e => {
+					uni.hideLoading()
+				})
 			},
 			// 热门标签
 			getTags() {
@@ -138,11 +203,13 @@
 					this.offcialProducts = page.records
 				}).catch(e => {})
 			},
+			// 跳转热门标签
+			toHot(item) {
+				this.$util.to(`/order/products/products?tagId=${item.tagsId}`)
+			},
 			// 跳转学习
-			toStudy() {
-				uni.switchTab({
-					url: '/pages/study/study'
-				})
+			toProduct() {
+				this.$util.to('/order/products/products')
 			},
 			// 跳转学习详情
 			toDetail(item) {
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index fdb590c..f8b899c 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -159,6 +159,7 @@
 				this.getStudy()
 				this.getSell()
 				this.getAnalysis()
+				uni.hideLoading()
 			},
 			// 查询当前角色权限
 			getAuth() {
@@ -219,7 +220,7 @@
 					}
 					
 					this.list = data
-					this.getAuth()
+					this.initRole()
 				}).catch(e => {
 					uni.hideLoading()
 				})
diff --git a/static/image/product/shop-blue.png b/static/image/product/shop-blue.png
new file mode 100644
index 0000000..426c807
Binary files /dev/null and b/static/image/product/shop-blue.png differ
diff --git a/static/image/product/shop.png b/static/image/product/shop.png
index b794821..4c11ccc 100644
Binary files a/static/image/product/shop.png and b/static/image/product/shop.png differ
diff --git a/styles/common.scss b/styles/common.scss
index 8812fce..797c9f7 100644
--- a/styles/common.scss
+++ b/styles/common.scss
@@ -40,6 +40,28 @@ ul {
 		background-color: #4876F9;
 	}
 }
+@mixin sort {
+	margin: 0 20rpx 0 10rpx;
+	&:before {
+		content: '';
+		display: block;
+		margin-bottom: 5rpx;
+		border: 15rpx solid transparent;
+		border-bottom-color: #B9B9B9;
+	}
+	&:after {
+		content: '';
+		display: block;
+		border: 15rpx solid transparent;
+		border-top-color: #B9B9B9;
+	}
+	&.desc:before {
+		border-bottom-color: #007EFF;
+	}
+	&.asc:after {
+		border-top-color: #007EFF;
+	}
+}
 .filter {
 	display: flex;
 	align-items: center;
@@ -52,26 +74,7 @@ ul {
 		height: 70rpx;
 	}
 	.sort {
-		margin: 0 20rpx 0 10rpx;
-		&:before {
-			content: '';
-			display: block;
-			margin-bottom: 5rpx;
-			border: 15rpx solid transparent;
-			border-bottom-color: #B9B9B9;
-		}
-		&:after {
-			content: '';
-			display: block;
-			border: 15rpx solid transparent;
-			border-top-color: #B9B9B9;
-		}
-		&.desc:before {
-			border-bottom-color: #007EFF;
-		}
-		&.asc:after {
-			border-top-color: #007EFF;
-		}
+		@include sort;
 	}
 }
 .form-list {
@@ -141,6 +144,9 @@ ul {
 		color: $uni-primary;
 		border-bottom-color: $uni-primary;
 	}
+	.sort {
+		@include sort;
+	}
 }
 .plus {
 	position: fixed;