From 19f0e898af03bce3001edab58f10b9898375bb2a Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 14 Jul 2023 18:24:13 +0800
Subject: [PATCH] fix

---
 apis/request.js                       |   2 +-
 order/addCourse/addCourse.vue         |   2 +-
 order/curClient/curClient.vue         |   5 +
 order/editCourse/editCourse.vue       | 139 ++++++++--------
 order/orderDetail/orderDetail.vue     | 152 ++++++++++--------
 order/productDetail/productDetail.vue |  15 +-
 order/shopCart/shopCart.vue           |   4 +-
 pages.json                            |  25 +--
 pages/index/index.vue                 |   3 +
 pages/login/login.vue                 |  27 +++-
 pages/orders/orders.vue               |   2 +-
 pages/person/person.vue               |   8 +-
 pages/products/products.vue           | 219 --------------------------
 pages/workbench/workbench.vue         |  10 +-
 {pages => team}/plans/plans.vue       |   0
 15 files changed, 227 insertions(+), 386 deletions(-)
 delete mode 100644 pages/products/products.vue
 rename {pages => team}/plans/plans.vue (100%)

diff --git a/apis/request.js b/apis/request.js
index a736015..4031782 100644
--- a/apis/request.js
+++ b/apis/request.js
@@ -41,7 +41,7 @@ const request = options => {
 						})
 					}, 1500)
 					reject(data)
-				} else if (status == 10028) { // 用户不存在
+				} else if (status == 10028 || status == 10014) { // 用户不存在
 					resolve(data)
 				} else if (!status) {
 					resolve(data)
diff --git a/order/addCourse/addCourse.vue b/order/addCourse/addCourse.vue
index d6c6e47..518b9c5 100644
--- a/order/addCourse/addCourse.vue
+++ b/order/addCourse/addCourse.vue
@@ -232,7 +232,7 @@
 					settlementPriceUnit: e.settlementPrice || 0, // 结算单价
 					serviceFee: 0, // 平台服务费（前端计算后展示，不入库）
 					mallNonAssociatedLinks: e.mallNonAssociatedLinks, // 产品链接
-					typeName: e.typeName
+					typeName: e.typeName,
 				}
 			},
 			// 判断是否为客户已有的课程
diff --git a/order/curClient/curClient.vue b/order/curClient/curClient.vue
index 1fa3992..95c66fb 100644
--- a/order/curClient/curClient.vue
+++ b/order/curClient/curClient.vue
@@ -132,6 +132,11 @@
 			const { options } = pages[pages.length - 1]
 			this.customerId = options.customerId
 			this.customerName = options.name
+			// 清除订单缓存
+			try {
+				uni.removeStorageSync('orderForm')
+				uni.removeStorageSync('courses')
+			} catch (e) {}
 			this.initList()
 		},
 		methods: {
diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
index 5bc749c..720d3f8 100644
--- a/order/editCourse/editCourse.vue
+++ b/order/editCourse/editCourse.vue
@@ -1,69 +1,71 @@
 <template>
 	<view class="page">
 		<template v-for="c in courses">
-			<view v-if="c.list.length" class="block">
+			<view v-if="c.list.length && c.list.filter(e => !e.edited).length" class="block">
 				<view class="l-title">{{ c.name }}</view>
 				<uni-icons class="arrow" type="top" size="20" color="#007EFF" @click="toggle(c)"></uni-icons>
 				<view v-show="!c.shrink">
-					<view v-for="(item, i) in c.list">
-						<view class="pro-name">
-							<view class="left">
-								<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
-								{{ item.productName }}
-							</view>
-							<uni-icons class="del" type="trash" size="25" color="#ADADAD" @click="delCourse(c, i)"></uni-icons>
-						</view>
-						<view class="form-list">
-							<view class="line">
-								<view class="name">产品类型</view>
-								<view class="val">{{ item.typeName }}</view>
-							</view>
-							<view :class="['line req', {err: err === 'periodOfUse' + item.dataOrCourseId + item.authority}]">
-								<view class="name">使用期限</view>
-								<input class="period" type="number" v-model="item.periodOfUse" placeholder="请输入" @input="calcDate(item, !item.authority)" @change="handleErr(item, 'periodOfUse')">
-								<view class="val unit" @click="selectUnit(item)">
-									<text>{{ units.find(e => e.id === item.options).text }}</text>
-									<image class="icon" src="@/static/image/arrow-down.png" mode="widthFix"></image>
+					<template v-for="(item, i) in c.list">
+						<view v-if="!item.edited" :key="i">
+							<view class="pro-name">
+								<view class="left">
+									<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
+									{{ item.productName }}
 								</view>
+								<uni-icons class="del" type="trash" size="25" color="#ADADAD" @click="delCourse(c, i)"></uni-icons>
 							</view>
-							<view :class="['line req', {err: err === 'startTime' + item.dataOrCourseId + item.authority}]">
-								<view class="name">起止日期</view>
-								<uni-datetime-picker type="date" v-model="item.startTime" :border="false" @change="calcDate(item)">
-									<view :class="['ph', {val: item.startTime}]">
-										{{ item.endTime ? item.startTime + ' - ' + item.endTime : item.startTime}}
+							<view class="form-list">
+								<view class="line">
+									<view class="name">产品类型</view>
+									<view class="val">{{ item.typeName }}</view>
+								</view>
+								<view :class="['line req', {err: err === 'periodOfUse' + item.dataOrCourseId + item.authority}]">
+									<view class="name">使用期限</view>
+									<input class="period" type="number" v-model="item.periodOfUse" placeholder="请输入" @input="calcDate(item, !item.authority)" @change="handleErr(item, 'periodOfUse')">
+									<view class="val unit" @click="selectUnit(item)">
+										<text>{{ units.find(e => e.id === item.options).text }}</text>
+										<image class="icon" src="@/static/image/arrow-down.png" mode="widthFix"></image>
+									</view>
+								</view>
+								<view :class="['line req', {err: err === 'startTime' + item.dataOrCourseId + item.authority}]">
+									<view class="name">起止日期</view>
+									<uni-datetime-picker type="date" v-model="item.startTime" :border="false" @change="calcDate(item)">
+										<view :class="['ph', {val: item.startTime}]">
+											{{ item.endTime ? item.startTime + ' - ' + item.endTime : item.startTime}}
+										</view>
+									</uni-datetime-picker>
+								</view>
+								<view :class="['line req', {err: err === 'accountNum' + item.dataOrCourseId + item.authority}]">
+									<view class="name">数量</view>
+									<view v-if="item.authority" class="val">1</view>
+									<input v-else type="number" v-model="item.accountNum" placeholder="请输入账号数量" @input="calcFinalPrice(item)" @change="handleErr(item, 'accountNum')">
+								</view>
+								<view class="line">
+									<view class="name">{{ item.authority ? '市场价' : '市场单价' }}</view>
+									<view class="val">{{ item.marketValue }}元</view>
+								</view>
+								<view class="line">
+									<view class="name">结算价</view>
+									<view class="val">{{ item.settlementPrice && item.settlementPrice + '元' }}</view>
+								</view>
+								<view class="line">
+									<view class="name">折扣率</view>
+									<view class="val">{{ item.discountRate }}</view>
+								</view>
+								<view class="line">
+									<view class="name">市场服务费</view>
+									<view class="val">{{ item.serviceFee }}元</view>
+								</view>
+								<view :class="['line req', {err: err === 'finalPrice' + item.dataOrCourseId + item.authority}]">
+									<view class="name">成交价</view>
+									<view class="inline">
+										<input type="number" v-model="item.finalPrice" placeholder="请输入" @input="calcFinalValue(item)" @change="handleErr(item, 'finalPrice')">
+										元
 									</view>
-								</uni-datetime-picker>
-							</view>
-							<view :class="['line req', {err: err === 'accountNum' + item.dataOrCourseId + item.authority}]">
-								<view class="name">数量</view>
-								<view v-if="item.authority" class="val">1</view>
-								<input v-else type="number" v-model="item.accountNum" placeholder="请输入账号数量" @input="calcFinalPrice(item)" @change="handleErr(item, 'accountNum')">
-							</view>
-							<view class="line">
-								<view class="name">{{ item.authority ? '市场价' : '市场单价' }}</view>
-								<view class="val">{{ item.marketValue }}元</view>
-							</view>
-							<view class="line">
-								<view class="name">结算价</view>
-								<view class="val">{{ item.settlementPrice && item.settlementPrice + '元' }}</view>
-							</view>
-							<view class="line">
-								<view class="name">折扣率</view>
-								<view class="val">{{ item.discountRate }}</view>
-							</view>
-							<view class="line">
-								<view class="name">市场服务费</view>
-								<view class="val">{{ item.serviceFee }}元</view>
-							</view>
-							<view :class="['line req', {err: err === 'finalPrice' + item.dataOrCourseId + item.authority}]">
-								<view class="name">成交价</view>
-								<view class="inline">
-									<input type="number" v-model="item.finalPrice" placeholder="请输入" @input="calcFinalValue(item)" @change="handleErr(item, 'finalPrice')">
-									元
 								</view>
 							</view>
 						</view>
-					</view>
+					</template>
 				</view>
 			</view>
 		</template>
@@ -74,7 +76,7 @@
 </template>
 
 <script>
-	import { getOrderOtherTime } from '@/apis/modules/order.js'
+	import { getOrderOtherTime, queryCitySettlementPrice } from '@/apis/modules/order.js'
 	import { getPartnerTeamRates } from '@/apis/modules/parner.js'
 	import { productCategoryList } from '@/apis/modules/product.js'
 	export default {
@@ -83,6 +85,8 @@
 				orderType: 1,
 				customerId: '',
 				action: '',
+				provinceId: '',
+				cityId: '',
 				timer: null,
 				units: [{
 					text: '日',
@@ -108,14 +112,17 @@
 			this.orderType = options.orderType
 			this.customerId = options.customerId
 			this.action = options.action
+			this.provinceId = options.provinceId
+			this.cityId = options.cityId
 			this.handleProduct()
 			this.getRate()
 		},
 		methods: {
 			// 转换产品列表
-			handleProduct() {
+			async handleProduct() {
 				const list = uni.getStorageSync('courses')
 				let courses = {}
+					
 				// 产品分类
 				productCategoryList().then(res => {
 					res.classificationList.forEach(e => {
@@ -125,14 +132,20 @@
 							list: []
 						}
 					})
-					list.map(e => {
+					const { provinceId, cityId } = this
+					list.map(async e => {
+						// 查询产品管理设置的平台结算价
+						if (provinceId) {
+							const res = await queryCitySettlementPrice(e.mallId, provinceId, cityId)
+							if (res.mallPrice) e.settlementPriceUnit = res.mallPrice.discountRate || 0
+						}
 						courses['list' + e.authority].list.push(e)
 					})
 					this.courses = courses
 				}).catch(e => {})
-				try {
-					uni.removeStorageSync('courses')
-				} catch (e) {}
+				// try {
+				// 	uni.removeStorageSync('courses')
+				// } catch (e) {}
 			},
 			selectUnit(item) {
 				const that = this
@@ -244,8 +257,8 @@
 							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)
+				console.log('dealSettlePrice2=>', row, this.$util.handleNaN(sPrice))
 					// 平台服务费
 					if (row.settlementPrice) {
 						row.serviceFee = (row.finalPrice * (this.rate / 100)).toFixed(2)
@@ -343,13 +356,13 @@
 						msg = '请输入成交价！'
 						break
 					}
+					e.edited = 1 // 未编辑过的标识，编辑过了的产品在编辑产品页不再显示
 				}
-				console.log(33, this.err)
 				if (msg) return this.$util.errMsg(msg)
 				if (this.orderRepeat.length) return this.$util.errMsg(this.repeatMsg) // 有重复订单不能提交
 				uni.setStorageSync('courses', this.courses)
 				uni.redirectTo({
-					url: `../orderDetail/orderDetail`
+					url: `../orderDetail/orderDetail?edited=1`
 				})
 			},
 		}
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index 9724676..63e0343 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -40,18 +40,20 @@
 					<view v-if="isDetail" class="val">{{ orderTypes.find(e => e.value === form.orderType).text }}</view>
 					<uni-data-picker v-else class="picker-input" placeholder="请选择订单类型" popup-title="请选择订单类型" preload :clear-icon="false" :localdata="orderTypes" v-model="form.orderType" @change="calcTotal(1)"></uni-data-picker>
 				</view>
-				<view class="line">
-					<view class="name">订单编号</view>
-					<view class="val">{{ form.orderNumber }}</view>
-				</view>
-				<view class="line">
-					<view class="name">订单时间</view>
-					<view class="val">{{ form.createTime }}</view>
-				</view>
-				<view class="line">
-					<view class="name">订单金额（元）</view>
-					<view class="val">{{ form.orderAmount }}</view>
-				</view>
+				<template v-if="edited">
+					<view class="line">
+						<view class="name">订单编号</view>
+						<view class="val">{{ form.orderNumber }}</view>
+					</view>
+					<view class="line">
+						<view class="name">订单时间</view>
+						<view class="val">{{ form.createTime }}</view>
+					</view>
+					<view class="line">
+						<view class="name">订单金额（元）</view>
+						<view class="val">{{ form.orderAmount }}</view>
+					</view>
+				</template>
 			</view>
 		</view>
 		
@@ -68,7 +70,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) && (!isDetail || (isDetail && item.shipContent))" class="info-btn" type="primary" @click.stop="showShip(item)">发货信息</button>
+								<button v-if="(item.authority == 0 || item.authority == 3 || item.authority == 4) && ((!isDetail && item.mallNonAssociatedLinks && item.mallNonAssociatedLinks.length) || (isDetail && item.shipContent))" class="course-btn" type="primary" @click.stop="showShip(item)">发货信息</button>
 							</view>
 						</view>
 						<view class="info">
@@ -134,30 +136,37 @@
 		</template>
 		
 		<view class="bottom">
-			<view v-if="!orderId" class="add-wrap">
-				<view class="add-btn" @click="toAdd">
-					<uni-icons class="icon" type="plus" color="#007FFF"></uni-icons>
-					添加产品
+			<template v-if="!edited && !orderId">
+				<view class="next-wrap">
+					<view class="lg-btn next" @click="toAdd(0)">下一步</view>
 				</view>
-			</view>
-			
-			<view :class="['product', isDetail ? 'show' : 'edit']">
-				<view class="text">
-					<view class="total">
-						<view v-if="isDetail">共选<text class="num">{{ courses.length }}</text>个产品</view>
-						<view class="column">总成交价合计<text class="num">{{ form.orderAmount }}</text>元</view>
+			</template>
+			<template v-else>
+				<view v-if="!orderId" class="add-wrap">
+					<view class="lg-btn" @click="toAdd(1)">
+						<uni-icons class="icon" type="plus" color="#007FFF"></uni-icons>
+						添加产品
 					</view>
-					<view class="info">
-						<view class="line">
-							总采购成本:<text class="num">{{ form.purchaseCost }}</text>元
+				</view>
+				
+				<view :class="['product', isDetail ? 'show' : 'edit']">
+					<view class="text">
+						<view class="total">
+							<view v-if="isDetail">共选<text class="num">{{ courses.length }}</text>个产品</view>
+							<view class="column">总成交价合计<text class="num">{{ form.orderAmount }}</text>元</view>
 						</view>
-						<view class="line">
-							总产品利润:<text class="num"> {{ form.profit }}</text> 元
+						<view class="info">
+							<view class="line">
+								总采购成本:<text class="num">{{ form.purchaseCost }}</text>元
+							</view>
+							<view class="line">
+								总产品利润:<text class="num"> {{ form.profit }}</text> 元
+							</view>
 						</view>
 					</view>
+					<view v-if="!isDetail" class="btn" @click="submit">提交({{ courses.length }})</view>
 				</view>
-				<view v-if="!isDetail" class="btn" @click="submit">提交({{ courses.length }})</view>
-			</view>
+			</template>
 		</view>
 		
 		<view class="popup-mask" v-show="customerVisible" @click="closeCustomer"></view>
@@ -186,6 +195,8 @@
 			return {
 				isDetail: false,
 				orderId: '',
+				edited: false,
+				shopCart: false,
 				orderTypes: [{
 					text: '正式',
 					value: 1
@@ -259,6 +270,8 @@
 			const { options } = pages[pages.length - 1]
 			this.orderId = options.orderId
 			this.isDetail = !!options.show
+			this.edited = options.edited // 已经编辑过产品的标识
+			this.shopCart = options.shopCart // 从购物车进来的标识
 			const store = uni.getStorageSync('courses')
 			const form = uni.getStorageSync('orderForm')
 			if (form) {
@@ -268,7 +281,7 @@
 			this.getRate()
 			if (this.orderId) {
 				this.getInfo()
-			} else if (store) {
+			} else if (options.edited && store) { // 不是从购物车进来，并且有产品缓存（即是从当前页面点下一步编辑完产品回来的情况），则处理缓存里的产品
 				console.log(11, store)
 				// 新增取缓存，取了删除
 				const list = []
@@ -418,22 +431,18 @@
 				}).catch(res => {})
 			},
 			// 跳转
-			toAdd() {
-				uni.setStorageSync('courses', this.courses)
+			toAdd(add) {
+				add && uni.setStorageSync('courses', this.courses)
 				uni.setStorageSync('orderForm', this.form)
 				const { customerId, orderType } = this.form
+				// 从购物车进来的，直接跳转到编辑产品；否则跳转到选择产品
+				const url = this.shopCart ?
+					`../editCourse/editCourse` :
+					`../addCourse/addCourse`
 				customerId ?
-					this.$util.to(`../addCourse/addCourse?orderType=${orderType}&customerId=${customerId}&provinceId=${this.form.provinceId}&cityId=${this.form.cityId}`) :
+					this.$util.to(url + `?orderType=${orderType}&customerId=${customerId}&provinceId=${this.form.provinceId}&cityId=${this.form.cityId}`) :
 					this.$util.errMsg('请先选择客户！')
 			},
-			// 编辑课程
-			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)
@@ -812,15 +821,12 @@
 	}
 	.course-btn {
 		padding: 0 16rpx;
-		margin-right: 10rpx;
 		font-size: 28rpx;
 		white-space: nowrap;
-		&.mg {
-			margin-left: 10rpx;
-		}
 	}
 	.del {
 		width: 40rpx;
+		margin-right: 20rpx;
 	}
 	.icon {
 		width: 60rpx;
@@ -834,9 +840,12 @@
 	.line {
 		display: flex;
 		justify-content: space-between;
-		padding: 12rpx 0;
-		margin: 5px 0;
+		padding: 28rpx 0;
 		font-size: 12px;
+		border-bottom: 1px solid #E6E8ED;
+		&:last-child {
+			border-bottom: 0;
+		}
 	}
 	.label {
 		font-size: 28rpx;
@@ -877,26 +886,33 @@
 	background-color: #fff;
 	box-shadow: 0 -2px 2px #f5f5f5;
 	box-sizing: border-box;
-}
-.add-wrap {
-	padding: 16rpx 24rpx 40rpx;
-	background-color: #f5f5f5;
-}
-/deep/.add-btn {
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	font-size: 28rpx;
-	line-height: 88rpx;
-	color: #007EFF;
-	background-color: #fff;
-	border: 1px solid #007EFF;
-	border-radius: 16rpx;
-	.icon {
-		margin-right: 10rpx;
+	.add-wrap {
+		padding: 16rpx 24rpx 40rpx;
+		background-color: #f5f5f5;
+	}
+	.next-wrap {
+		padding: 24rpx 24rpx 0;
 	}
-	.uni-icons {
-		font-size: 38rpx !important;
+	/deep/.lg-btn {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 28rpx;
+		line-height: 88rpx;
+		color: #007EFF;
+		background-color: #fff;
+		border: 1px solid #007EFF;
+		border-radius: 16rpx;
+		.icon {
+			margin-right: 10rpx;
+		}
+		.uni-icons {
+			font-size: 38rpx !important;
+		}
+		&.next {
+			color: #fff;
+			background-color: #007EFF;
+		}
 	}
 }
 .product {
diff --git a/order/productDetail/productDetail.vue b/order/productDetail/productDetail.vue
index d41d74d..262d8f9 100644
--- a/order/productDetail/productDetail.vue
+++ b/order/productDetail/productDetail.vue
@@ -76,14 +76,14 @@
 					<image class="icon" src="@/static/image/product/5.png"></image>
 					产品参数
 				</view>
-				<view class="download" @click="downloadAll">
+				<view v-if="auth('产品:下载')" class="download" @click="downloadAll">
 					下载全部
 					<image class="icon" src="@/static/image/product/6.png"></image>
 				</view>
 			</view>
 			
 			<view v-if="form.mallAnnex" class="files">
-				<view v-for="(file, i) in form.mallAnnex" :key="i" class="file" @click="download(file)">
+				<view v-for="(file, i) in form.mallAnnex" :key="i" class="file">
 					<view class="text">
 						<image class="icon" src="@/static/image/product/ppt.png"></image>
 						{{ file.fileName }}
@@ -141,8 +141,8 @@
 					selectedBorder: '1px rgba(83, 200, 249,0.9) solid'
 				},
 				mpStyle: {
-					p: 'font-size: 26rpx !important;font-family: Microsoft Yahei !important;color: #333 !important;',
-					span: 'font-size: 26rpx !important;font-family: Microsoft Yahei !important;color: #333 !important;'
+					p: 'font-size: 25rpx !important;font-family: Microsoft Yahei !important;font-weight: 400 !important;color: #333 !important;',
+					span: 'font-size: 25rpx !important;font-family: Microsoft Yahei !important;font-weight: 400 !important;color: #333 !important;'
 				}
 			}
 		},
@@ -159,6 +159,11 @@
 			this.getInfo()
 			this.getShopCart()
 			this.getTypes()
+			// 清除订单缓存
+			try {
+				uni.removeStorageSync('orderForm')
+				uni.removeStorageSync('courses')
+			} catch (e) {}
 		},
 		methods: {
 			// 获取详情
@@ -282,7 +287,7 @@
 					settlementPriceUnit: 0, // 结算单价
 					serviceFee: 0 // 平台服务费（前端计算后展示，不入库）
 				}])
-				this.$util.to(`/order/editCourse/editCourse`)
+				this.$util.to(`../orderDetail/orderDetail?shopCart=1`)
 			}
 		}
 	}
diff --git a/order/shopCart/shopCart.vue b/order/shopCart/shopCart.vue
index 4bc5580..39c28ef 100644
--- a/order/shopCart/shopCart.vue
+++ b/order/shopCart/shopCart.vue
@@ -84,6 +84,8 @@
 			// 清除产品缓存
 			try {
 				uni.removeStorageSync('orderForm')
+				uni.removeStorageSync('courses')
+				uni.removeStorageSync('orderEdited')
 			} catch (e) {}
 			this.initList()
 		},
@@ -239,7 +241,7 @@
 					})
 					Promise.all(promises).then(_ => {
 						uni.setStorageSync('courses', courses)
-						this.$util.to(`/order/editCourse/editCourse`)
+						this.$util.to(`../orderDetail/orderDetail?shopCart=1`)
 					})
 				} else {
 					this.$util.errMsg('请先添加产品！')
diff --git a/pages.json b/pages.json
index 1a8bbb8..e4c7879 100644
--- a/pages.json
+++ b/pages.json
@@ -32,22 +32,6 @@
 				"enablePullDownRefresh": true
 			}
 		},
-        {
-            "path" : "pages/products/products",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "产品",
-                "enablePullDownRefresh": true
-            }
-        },
-		{
-		    "path" : "pages/plans/plans",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "产品方案",
-		        "enablePullDownRefresh": true
-		    }
-		},
         {
             "path" : "pages/person/person",
             "style" :                                                                                    
@@ -164,7 +148,14 @@
 				        "navigationBarTitleText": "学习",
 				        "enablePullDownRefresh": true
 				    }
-				    
+				},
+				{
+					"path" : "plans/plans",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "产品方案",
+						"enablePullDownRefresh": true
+					}
 				}
 				,{
 				    "path" : "info/info",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6982360..10b4c50 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -138,6 +138,7 @@
 					title: '加载中'
 				})
 				getTeamsByAccountId().then(({ data }) => {
+					let hasOwnTeam = 0 // 是否有自己的团队
 					data.map(e => {
 						const n = e.partnerClassificationList
 						e.id = n.id
@@ -145,7 +146,9 @@
 						e.teamId = e.isTeam == 1 ? +e.partnerClassificationId : n.id
 						e.partnerClassificationName = n.partnerClassificationName
 						delete e.partnerClassificationList
+						if (e.isTeam == 1) hasOwnTeam = 1
 					})
+					uni.setStorageSync('hasOwnTeam', hasOwnTeam)
 					if (data.length) {
 						/**
 						 * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
diff --git a/pages/login/login.vue b/pages/login/login.vue
index be24577..101ce8e 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -152,10 +152,29 @@
 						phone,
 						unionid: this.unionid,
 						platformId: 4
-					}).then(({ token }) => {
-						this.submiting = false
-						uni.setStorageSync('token', token)
-						this.toIndex()
+					}).then(res => {
+						const { token, status } = res
+						if (status == 10014) {
+							// 这里需要再调一次uni的login，因为code用过了一次，已经失效了
+							uni.login({
+								success: ({ code }) => {
+									getSessionKey({
+										code,
+									}).then(({ sessionKey }) => {
+										this.sessionKey = sessionKey.session_key
+										this.openid = sessionKey.openid
+										uni.redirectTo({
+											url: `../reg/reg?openid=${this.openid}&phone=${phone}`
+										})
+									}).catch(e => {})
+									this.isReg = true
+								}
+							})
+						} else {
+							this.submiting = false
+							uni.setStorageSync('token', token)
+							this.toIndex()
+						}
 					}).catch(e => {
 						this.submiting = false
 						uni.showToast({
diff --git a/pages/orders/orders.vue b/pages/orders/orders.vue
index 5d535c2..6397686 100644
--- a/pages/orders/orders.vue
+++ b/pages/orders/orders.vue
@@ -146,7 +146,7 @@
 		},
 		onShow() {
 			this.per = true
-			// 清除产品缓存
+			// 清除订单缓存
 			try {
 				uni.removeStorageSync('orderForm')
 				uni.removeStorageSync('courses')
diff --git a/pages/person/person.vue b/pages/person/person.vue
index ab6112a..37a94cf 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -20,7 +20,7 @@
 					</view>
 					<uni-icons type="right" size="15" color="#ccc"></uni-icons>
 				</view>
-				<view v-if="disabled && auth('我的:我的团队')" class="item" @click="createTeam">
+				<view v-if="!hasOwnTeam && auth('我的:我的团队')" class="item" @click="createTeam">
 					<view class="left">
 						<image class="icon" src="@/static/image/person4.png" mode=""></image>
 						<text class="name">创建自己的团队</text>
@@ -115,6 +115,7 @@
 				},
 				avatar: uni.getStorageSync('avatar') || '@/static/image/avatar.png',
 				userName: uni.getStorageSync('userName'),
+				hasOwnTeam: uni.getStorageSync('hasOwnTeam') == 1, // 有自己的团队
 				disabled: true,
 				provinces: [],
 				cities: [],
@@ -156,8 +157,9 @@
 					teamId
 				}).then(({ my }) => {
 					this.my = my
-					this.avatar = my.info.userAvatars
-					uni.setStorageSync('avatar', my.info.userAvatars)
+					const avatar = my.info.userAvatars || 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png'
+					this.avatar = avatar
+					uni.setStorageSync('avatar', avatar)
 					this.provinceId = my.teamInfo.provinceId
 					this.cityId = my.teamInfo.cityId
 					uni.setStorageSync('provinceId', this.provinceId)
diff --git a/pages/products/products.vue b/pages/products/products.vue
deleted file mode 100644
index 218737b..0000000
--- a/pages/products/products.vue
+++ /dev/null
@@ -1,219 +0,0 @@
-<template>
-	<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>
-		</view>
-		
-		<ul class="tab">
-			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
-		</ul>
-		
-		<ul class="list">
-			<li v-for="item in list">
-				<view class="pro-name">
-				<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
-					{{ item.productName }}
-				</view>
-				<view class="info">
-					<view class="line">
-						<text class="name">产品简介：</text>
-						<view class="val ell-wrap">
-							<view :class="{ell: !item.toggle}">{{ item.briefIntroduction }}</view>
-							<view v-if="item.briefIntroduction.length > 14" class="toggle" @click="toggle(item)">{{ item.toggle ? '收起' : '展开' }}</view>
-						</view>
-					</view>
-					<view class="line">
-						<text class="name">产品类型：</text>
-						<text class="val">{{ tabs.find(e => e.id === item.productType).name }}</text>
-					</view>
-					<view class="line">
-						<text class="name">市场单价：</text>
-						<text class="val">{{ item.marketPrice }}元/年</text>
-					</view>
-					<view class="line">
-						<text class="name">结算方式：</text>
-						<text class="val">{{ item.settlementMethod ? '比例分成' : '结算单价' }} {{ item.settlementPrice }}元/年</text>
-					</view>
-					<view class="line">
-						<text class="name">供应厂商：</text>
-						<text class="val">{{ item.supplierName }}</text>
-					</view>
-				</view>
-			</li>
-		</ul>
-		<uni-load-more :status="status" />
-	</view>
-</template>
-
-<script>
-	import { AppletsDataProductList, tagsList, listOfGoods } from '@/apis/modules/product.js'
-	export default {
-		data() {
-			return {
-				curTab: '',
-				tabs: [
-					{
-						name: '全部',
-						id: ''
-					},
-					{
-						name: '实训课程',
-						id: 1
-					},
-					{
-						name: '理论课程',
-						id: 0
-					},
-					{
-						name: '数据产品',
-						id: 2
-					}
-				],
-				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
-				status: 'more', // 上拉加载状态 more|loading|noMore
-				searchTimer: null,
-				sort: 'desc',
-				keyword: '',
-				list: [],
-				page: 1,
-				pageSize: 10
-			}
-		},
-		watch: {
-			keyword () {
-				clearTimeout(this.searchTimer)
-				this.searchTimer = setTimeout(() => {
-					this.initList()
-				}, 500)
-			}
-		},
-		// 下拉刷新
-		onPullDownRefresh() {
-			this.initList()
-			setTimeout(() => {
-				uni.stopPullDownRefresh()
-			}, 1500)
-		},
-		// 上拉加载
-		onReachBottom() {
-			if (this.reachBottom >= 0) {
-				this.reachBottom = 1
-				this.status = 'loading'
-				this.getList()
-			}
-		},
-		onShow() {
-			this.initList()
-		},
-		methods: {
-			getList() {
-				listOfGoods({
-					pageNum: this.page,
-					pageSize: this.pageSize,
-					sort: 0,
-					isShelves: 0,
-					hotTag: 1,
-					productName: this.keyword,
-				}).then(({ page }) => {
-					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
-					const list = page.records
-					list.map(e => {
-						e.toggle = e.briefIntroduction.length < 14 // 超过了14个字才需要显示展开按钮
-					})
-					this.list = this.reachBottom > 0 ? [...this.list, ...list] : list
-					this.page++ // 每次获取了数据后page+1
-					const noMore = this.list.length === page.total // 是否加载完所有数据
-					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
-					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
-				}).catch(e => {})
-			},
-			initList() {
-				this.page = 1
-				this.reachBottom = 0
-				this.getList()
-			},
-			// 展开
-			toggle(item) {
-				item.toggle = !item.toggle
-			},
-			// 排序
-			switchSort() {
-				this.sort = this.sort === 'desc' ? 'asc' : 'desc'
-				this.initList()
-			},
-			// tab切换
-			tabChange(tab) {
-				this.curTab = tab.id
-				this.initList()
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-.filter {
-	display: flex;
-	align-items: center;
-	.search {
-		flex: 1;
-	}
-	.sl-filter {
-		width: 30%;
-		margin-left: 10%;
-	}
-}
-.list {
-	li {
-		padding: 0 24rpx;
-		margin: 16rpx 24rpx;
-		background-color: #fff;
-		border-radius: 16rpx;
-	}
-	.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 {
-		padding: 12rpx 0;
-	}
-	.line {
-		display: flex;
-		padding: 12rpx 0;
-	}
-	.name {
-		margin-right: 10rpx;
-		font-size: 28rpx;
-		color: #999;
-	}
-	.val {
-		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-left: 10rpx;
-		white-space: nowrap;
-		font-size: 24rpx;
-		color: #0e92ef;
-	}
-}
-</style>
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index 6c9f59f..8185815 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -18,16 +18,16 @@
 				<image class="icon" src="@/static/image/workbench/index3.png" mode="widthFix"></image>
 				<view class="text">客户</view>
 			</li>
-			<li v-if="auth('工作台:方案')" @click="$util.to('../plans/plans')">
+			<li v-if="auth('工作台:方案')" @click="$util.to('/team/plans/plans')">
 				<image class="icon" src="@/static/image/workbench/index4.png" mode="widthFix"></image>
 				<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" style="width: 64rpx"></image>
+				<image class="icon info-icon" src="@/static/image/workbench/index11.png" mode="widthFix"></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" style="width: 64rpx"></image>
+				<image class="icon info-icon" src="@/static/image/workbench/index12.png" mode="widthFix"></image>
 				<view class="text">资讯</view>
 			</li>
 		</ul>
@@ -333,6 +333,10 @@
 	.icon {
 		width: 78rpx;
 	}
+	.info-icon {
+		width: 64rpx;
+		max-height: 64rpx;
+	}
 	.text {
 		font-size: 28rpx;
 		color: #333;
diff --git a/pages/plans/plans.vue b/team/plans/plans.vue
similarity index 100%
rename from pages/plans/plans.vue
rename to team/plans/plans.vue