fix

apis/request.js

@@ -41,6 +41,8 @@ const request = options => {
 						})
 					}, 1500)
 					reject(data)
+				} else if (status == 10028) { // 用户不存在
+					resolve(data)
 				} else if (!status) {
 					resolve(data)
 				} else {

order/addCourse/addCourse.vue

@@ -230,7 +230,9 @@
 					miniProgramPictureAddress: e.appletIcon || '', // 图标
 					settlementPrice: trial ? 0 : '', // 结算价
 					settlementPriceUnit: e.settlementPrice || 0, // 结算单价
-					serviceFee: 0 // 平台服务费（前端计算后展示，不入库）
+					serviceFee: 0, // 平台服务费（前端计算后展示，不入库）
+					mallNonAssociatedLinks: e.mallNonAssociatedLinks, // 产品链接
+					typeName: e.typeName
 				}
 			},
 			// 判断是否为客户已有的课程

order/editCourse/editCourse.vue

@@ -16,7 +16,7 @@
 						<view class="form-list">
 							<view class="line">
 								<view class="name">产品类型</view>
-								<view class="val">{{ productTypes.find(e => e.id === item.productType).name }}</view>
+								<view class="val">{{ item.typeName }}</view>
 							</view>
 							<view :class="['line req', {err: err === 'periodOfUse' + item.dataOrCourseId + item.authority}]">
 								<view class="name">使用期限</view>
@@ -95,20 +95,6 @@
 					id: 2
 				}],
 				unitText: ['日', '月', '年'],
-				productTypes: [
-					{
-						name: '实训课程',
-						id: 1
-					},
-					{
-						name: '理论课程',
-						id: 0
-					},
-					{
-						name: '数据产品',
-						id: 2
-					}
-				],
 				courses: {} , // 上一页缓存的产品
 				orderRepeat: [],
 				repeatMsg: '',

order/orderDetail/orderDetail.vue

@@ -60,7 +60,7 @@
 				<view class="l-title">{{ c.name }}</view>
 				<uni-icons class="arrow" type="top" size="20" color="#007EFF" @click="toggle(c)"></uni-icons>
 				<ul class="pro-list" v-show="!c.shrink">
-					<li v-for="(item, i) in c.list" @click.stop="editCourse(c, i)">
+					<li v-for="(item, i) in c.list">
 						<view class="name">
 							<view class="left">
 								<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
@@ -73,28 +73,59 @@
 						</view>
 						<view class="info">
 							<view class="line">
+								<view class="label">起始日期</view>
+								<view v-if="isDetail || isEdit" class="ph">{{ item.endTime ? item.startTime + ' - ' + item.endTime : item.startTime}}</view>
+								<uni-datetime-picker v-else 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" :class="[ {err: err === 'periodOfUse' + item.dataOrCourseId + item.authority}]">
 								<view class="label">使用期限</view>
-								<view class="val">{{ item.startTime + (item.endTime ? ' - ' + item.endTime : '') }}</view>
+								<view v-if="isDetail" class="ph">{{item.periodOfUse}}{{ units.find(e => e.id === item.options).text }}</view>
+								<template v-else>
+									<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>
+								</template>
+							</view>
+							<view :class="['line req', {err: err === 'accountNum' + item.dataOrCourseId + item.authority}]">
+								<view class="label">数量</view>
+								<view v-if="item.authority || (!item.authority && isDetail)" class="ph">1</view>
+								<view v-else class="inline">
+									<input type="number" v-model="item.accountNum" placeholder="请输入账号数量" @input="calcFinalPrice(item)" @change="handleErr(item, 'accountNum')">
+								</view>
 							</view>
 							<view class="line">
-								<view class="label">市场价（元）</view>
+								<view class="label">{{ item.authority ? '市场价' : '市场单价' }}</view>
-								<view class="val">{{ item.marketValue && item.marketValue + '元' }}</view>
+								<view class="ph">{{ item.marketValue && item.marketValue + '元' }}</view>
 							</view>
 							<view class="line">
 								<view class="label">结算价</view>
-								<view class="val">{{ item.settlementPrice && item.settlementPrice + '元' }}</view>
+								<view v-if="isDetail" class="ph">{{ item.settlementPrice }}</view>
+								<view class="inline" v-else>
+									<input type="number" v-model="item.settlementPrice" placeholder="请输入" @change="handleErr(item, 'settlementPrice')" @input="updateServiceFee(item)">
+									元
+								</view>
 							</view>
 							<view class="line">
 								<view class="label">折扣率</view>
-								<view class="val">{{ item.discountRate }}</view>
+								<view class="ph">{{ item.discountRate }}</view>
 							</view>
 							<view class="line">
 								<view class="label">市场服务费</view>
-								<view class="val">{{ item.serviceFee }}元</view>
+								<view class="ph">{{ item.serviceFee }}元</view>
 							</view>
-							<view class="line done">
+							<view :class="['line req', {err: err === 'finalPrice' + item.dataOrCourseId + item.authority}]">
-								<view class="val">成交价格</view>
+								<view class="label">成交价</view>
-								<view class="price">{{ item.finalPrice }}元</view>
+								<view v-if="isDetail" class="ph">{{ item.finalPrice }}</view>
+								<view class="inline" v-else>
+									<input type="number" v-model="item.finalPrice" placeholder="请输入" @input="calcFinalValue(item)" @change="handleErr(item, 'finalPrice')">
+									元
+								</view>
 							</view>
 						</view>
 					</li>
@@ -200,7 +231,19 @@
 				customerListAll: [],
 				err: '',
 				rate: '',
-				shipInfo: ''
+				shipInfo: '',
+				orderRepeat:[],
+				units: [{
+					text: '日',
+					id: 0
+				}, {
+					text: '月',
+					id: 1
+				}, {
+					text: '年',
+					id: 2
+				}],
+				unitText: ['日', '月', '年'],
 			}
 		},
 		watch: {
@@ -234,12 +277,6 @@
 				}
 				this.courseList = store
 				this.courses = list
-				// this.$nextTick(() => {
-				// 	uni.pageScrollTo({
-				// 		selector: '#products',
-				// 	})
-				// })
-				
 				try {
 					uni.removeStorageSync('courses')
 				} catch (e) {}
@@ -459,7 +496,7 @@
 					} else {
 						this.calcDiscount(e)
 						this.dealSettlePrice(e)
-						this.calcFinalPrice(e)
+						// this.calcFinalPrice(e)
 						const curPurchase = +e.settlementPrice + +e.serviceFee
 						purchase += curPurchase
 						profit += +e.finalPrice - curPurchase
@@ -469,15 +506,82 @@
 				form.profit = profit
 				form.orderAmount = (+form.purchaseCost + +form.profit).toFixed(2)
 			},
-			calcDiscount(row) {
+			// 计算订单总额
-				const price = row.authority ? row.finalPrice : row.finalValue
+			calcAmount() {
-				const { marketValue } = row
+				const { form } = this
-				// (原价-现价)÷原价 x100%
+				const list = this.courses
-				if (price) row.discountRate = marketValue != 0 ? ((marketValue - price) / marketValue * 100).toFixed(2) + '%' : '0%'
+				let purchase = 0 // 总采购成本
+				let profit = 0 // 总利润
+				list.map(e => {
+					const curPurchase = +e.settlementPrice + +e.serviceFee
+					purchase += curPurchase
+					profit += +e.finalPrice - curPurchase
+				})
+				form.purchaseCost = Math.round(purchase)
+				form.profit = Math.round(profit)
+				form.orderAmount = (+form.purchaseCost + +form.profit).toFixed(2)
+				console.log(111, this.courseList, this.courses)
+			},
+			calcDate(row, fromData) {
+				clearTimeout(this.timer)
+				this.timer = setTimeout(() => {
+					const { periodOfUse, options } = row
+					let optionsData = 0
+					if (periodOfUse) {
+						if (options == 1){
+							optionsData = periodOfUse === '12' ? 31536000000 : periodOfUse*30*24*60*60*1000
+						} else if (options == 2){
+							optionsData = periodOfUse*365*24*60*60*1000
+						} else {
+							optionsData = periodOfUse*24*60*60*1000
+						}
+					}
+					let time = new Date(row.startTime).getTime()
+					let endTime = time + optionsData
+					row.endTime = time + optionsData
+					let dt = new Date(endTime)
+					row.endTime = (dt.getFullYear()) + "-" + (dt.getMonth() + 1) + "-" + (dt.getDate())
+					let endYear = endTime - time
+					let endYears = endYear/1000/60/60/24
+					row.remainingPeriod = endYears
+					const unit = row.options // 使用期限单位
+					const useUnit = row.periodOfUse // 使用期限
+					// 计算市场价
+					const price = row.marketPrice || 0 // 市场单价
+					// 结算单价是元/年，所以如果选择的不是年，要进行换算（日：/365,月：/12)
+					row.marketValue = (!unit ? 
+						price / 365 * useUnit :
+						unit === 1 ?
+							price / 12 * useUnit :
+							price * useUnit).toFixed(2)
+					this.dealSettlePrice(row)
+					// 只有改变了起止日期才需要调接口查询订单，该接口作用是把开始时间传过去，会返回一个提示或者时间，如果是时间，则把时间+1天，如果是提示，则无法保存
+					if (!fromData) {
+						const cId = row.dataOrCourseId
+						const date = new Date(row.startTime)
+						const orderRepeat = this.orderRepeat
+						getOrderOtherTime({
+							customerId: this.customerId,
+							id: cId,
+							startTime: this.$util.formatDate(date, 'yyyy-MM-dd'),
+							endTime: row.endTime
+						}).then(res => {
+							orderRepeat.includes(cId) && orderRepeat.splice(orderRepeat.findIndex(e => e === cId), 1)
+							if (res.endTime) {
+								let time = new Date(res.endTime)
+								time = new Date(time.setDate(time.getDate() + 1))
+								row.startTime = this.$util.formatDate(time, 'yyyy-MM-dd')
+							}
+						}).catch(res => {
+							this.repeatMsg = res.message
+							orderRepeat.includes(cId) || orderRepeat.push(cId)
+						})
+					}
+					// 折扣率
+					this.calcDiscount(row)
+				}, 500)
 			},
-			// 计算结算价及平台服务费
 			dealSettlePrice(row) {
-				console.log('row==>',row)
 				// 如果是试用或者没选择，结算价和平台服务费都是0
 				if (this.form.orderType != 1) {
 					row.settlementPrice = 0
@@ -485,9 +589,10 @@
 				} else {
 					const unit = row.options // 使用期限单位
 					const useUnit = row.periodOfUse // 使用期限
+					let sPrice = ''
 					// 结算单价。计算规则：结算单价（**元/年）*购买时长（单位年）*数量(课程为1，数据为账号数量)
 					const priceUnit = row.settlementPriceUnit
-					let sPrice = ((!unit ? 
+					sPrice = ((!unit ? 
 						priceUnit / 365 * useUnit :
 						unit === 1 ?
 							priceUnit / 12 * useUnit :
@@ -496,11 +601,41 @@
 								row.accountNum)).toFixed((2))
 					row.settlementPrice = this.$util.handleNaN(sPrice)
 					// 平台服务费
-					if (row.settlementPrice) {
+					row.serviceFee = (row.finalPrice * (this.rate / 100)).toFixed(2)
-						row.serviceFee = (row.finalPrice * (this.rate / 100)).toFixed(2)
+					this.calcAmount()
-					}
+					console.log('row.settlementPrice =>' ,row.settlementPrice,row.settlementPriceUnit,sPrice,row)
 				}
 			},
+			calcDiscount(row) {
+				const price = row.authority ? row.finalPrice : row.finalValue
+				const { marketValue } = row
+				// (原价-现价)÷原价 x100%
+				if (price) row.discountRate = marketValue != 0 ? ((marketValue - price) / marketValue * 100).toFixed(2) + '%' : '0%'
+			},
+			selectUnit(item) {
+				const that = this
+				uni.showActionSheet({
+					title: '标题',
+					itemList: that.unitText,
+					success: ({ tapIndex }) => {
+						item.options = tapIndex
+						that.calcDate(item)
+					}
+				})
+			},
+			// 成交价修改后，计算成交单价，数据才需要 计算规则：成交价/账号数/时间（成交单价为元/账号/年，所以时间要换算成年的单位去计算）
+			calcFinalValue(row) {
+				clearTimeout(this.timer)
+				this.timer = setTimeout(() => {
+					const { authority, periodOfUse, options, accountNum, finalPrice } = row
+					if (!authority && periodOfUse && accountNum && finalPrice) {
+						row.finalValue = (finalPrice / accountNum / periodOfUse).toFixed(2)
+					}
+					// 折扣率
+					this.calcDiscount(row)
+					this.dealSettlePrice(row)
+				}, 500)
+			},
 			// 计算成交价。计算规则：成交单价*账号数*时间（成交单价为元/账号/年，所以时间要换算成年的单位去计算）
 			calcFinalPrice(row) {
 				clearTimeout(this.timer)
@@ -524,6 +659,10 @@
 					this.dealSettlePrice(row)
 				}, 500)
 			},
+			// 结算价修改后计算平台服务费
+			updateServiceFee(row) {
+				options.serviceFee = (row.finalPrice * (this.rate / 100)).toFixed(2)
+			},
 			// 显示发货信息
 			showShip(row) {
 				let val = ''
@@ -661,21 +800,24 @@
 		color: #333;
 		background: linear-gradient(90deg, #FFF5E5 0%, #FFFFFF 100%);
 	}
+	.left {
+		display: inline-flex;
+		align-items: center;
+		max-width: 480rpx;
+		margin-right: 10rpx;
+	}
 	.course-action {
 		display: inline-flex;
 		align-items: center;
 	}
-	.info-btn {
+	.course-btn {
 		padding: 0 16rpx;
-		margin-left: 10rpx;
+		margin-right: 10rpx;
 		font-size: 28rpx;
 		white-space: nowrap;
-	}
+		&.mg {
-	.left {
+			margin-left: 10rpx;
-		display: inline-flex;
+		}
-		align-items: center;
-		max-width: 480rpx;
-		margin-right: 10rpx;
 	}
 	.del {
 		width: 40rpx;
@@ -697,6 +839,10 @@
 		font-size: 12px;
 	}
 	.label {
+		font-size: 28rpx;
+		color: #333;
+	}
+	.ph {
 		font-size: 28rpx;
 		color: #999;
 	}
@@ -715,8 +861,15 @@
 		font-size: 32rpx;
 		color: #007EFF;
 	}
+	.period {
+		flex: none;
+		width: 100rpx;
+		font-size: 28rpx;
+		text-align: center;
+	}
 }
 .bottom {
+	z-index: 2;
 	position: fixed;
 	bottom: 0;
 	padding-bottom: env(safe-area-inset-bottom);
@@ -812,6 +965,36 @@
 		background-color: #007EFF;
 	}
 }
+.unit {
+	display: inline-flex;
+	align-items: center;
+	.icon {
+		width: 28rpx;
+		margin-left: 20rpx;
+	}
+	input {
+		font-size: 28rpx;
+	}
+	text{
+		font-size: 28rpx;
+	}
+}
+.line {
+	.inline {
+		display: flex;
+		align-items: center;
+		font-size: 28rpx;
+		input {
+			text-align: right;
+			margin-right: 10rpx;
+			margin-left: 20rpx;
+			color: #333;
+		}
+	}
+	.edit {
+		margin-left: 10rpx;
+	}
+}
 .ship-info {
 	height: 400rpx;
 	padding: 20rpx;

order/productDetail/productDetail.vue

@@ -88,7 +88,7 @@
 						<image class="icon" src="@/static/image/product/ppt.png"></image>
 						{{ file.fileName }}
 					</view>
-					<view class="download" @click="download(file)">下载</view>
+					<view v-if="auth('产品:下载')" class="download" @click="download(file)">下载</view>
 				</view>
 			</view>
 		</view>
@@ -141,8 +141,8 @@
 					selectedBorder: '1px rgba(83, 200, 249,0.9) solid'
 				},
 				mpStyle: {
-					p: 'font-size: 26rpx !important;font-family: Microsoft Yahei !important;',
+					p: 'font-size: 26rpx !important;font-family: Microsoft Yahei !important;color: #333 !important;',
-					span: 'font-size: 26rpx !important;font-family: Microsoft Yahei !important;'
+					span: 'font-size: 26rpx !important;font-family: Microsoft Yahei !important;color: #333 !important;'
 				}
 			}
 		},
@@ -446,6 +446,7 @@
 	left: 0;
 	display: flex;
 	justify-content: space-between;
+	align-items: center;
 	width: 100%;
 	padding: 24rpx 32rpx 24rpx 73rpx;
 	background-color: #fff;

order/products/products.vue

@@ -65,7 +65,7 @@
 		
 		<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>
+				<image class="icon" src="@/static/image/product/shop-blue1.png" mode="widthFix" @click="$util.to('../shopCart/shopCart')"></image>
 			</uni-badge>
 		</view>
 		
@@ -353,6 +353,7 @@
 			min-width: 58rpx;
 			height: 58rpx;
 			margin-right: 20rpx;
+			border-radius: 4px;
 		}
 	}
 	.info {

order/shopCart/shopCart.vue

@@ -1,18 +1,34 @@
 <template>
 	<view class="page">
 		<ul class="list">
-			<li v-for="(item, i) in list">
+			<uni-swipe-action>
-				<uni-data-checkbox v-if="item.check" class="check" multiple :value="[1]" :localdata="item.checkData" @change="e => checkChange(e, i)"></uni-data-checkbox>
+				<uni-swipe-action-item
-				<uni-data-checkbox v-else class="check" multiple v-model="item.check" :localdata="item.checkData" @change="e => checkChange(e, i)"></uni-data-checkbox>
+					v-for="(item, i) in list"
-				<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
+					:key="i"
-				{{ item.productName }}
+					:threshold="0"
-			</li>
+					:right-options="delOption"
+					@click="del(item)"
+				>
+					<li>
+						<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)"></image>
+						<view class="texts">
+							<view class="name">{{ item.productName }}</view>
+							<view class="price">市场建议价：{{ item.marketUnitPrice }}元/年</view>
+						</view>
+					</li>
+				</uni-swipe-action-item>
+			</uni-swipe-action>
 		</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 class="btns">
+				<view class="btn del" @click="batchDel">删除</view>
+				<view class="btn" @click="submit">生成订单</view>
+			</view>
 		</view>
 	</view>
 </template>
@@ -40,6 +56,12 @@
 					value: 1
 				}],
 				checked: [], // 已经勾选的集合
+				delOption: [{
+					text: '删除',
+					style: {
+						backgroundColor: '#F56C6C'
+					}
+				}],
 			}
 		},
 		// 下拉刷新
@@ -63,8 +85,7 @@
 			try {
 				uni.removeStorageSync('orderForm')
 			} catch (e) {}
-			this.page = 1
+			this.initList()
-			this.getList()
 		},
 		methods: {
 			// 购物车列表
@@ -161,6 +182,43 @@
 					shopCartId// 购物车id，订单提交后，调删除购物车的接口把这个产品删除
 				}
 			},
+			// 删除
+			del(e) {
+				const that = this
+				uni.showModal({
+					title: '提示',
+					content: '确定要删除吗？',
+					success(res) {
+						if (res.confirm) {
+							delCart([e.id]).then(res => {
+								that.initList()
+							}).catch(e => {})
+						}
+					}
+				})
+			},
+			// 批量删除
+			batchDel() {
+				const list = this.checked // 已选产品
+				if (list.length) {
+					const that = this
+					uni.showModal({
+						title: '提示',
+						content: '确定要删除吗？',
+						success(res) {
+							if (res.confirm) {
+								delCart(list.map(e => e.id)).then(res => {
+									that.checkAll = []
+									that.checked = []
+									that.initList()
+								}).catch(e => {})
+							}
+						}
+					})
+				} else {
+					this.$util.errMsg('请选择产品！')
+				}
+			},
 			// 确定
 			submit() {
 				const list = this.checked // 已选产品
@@ -184,7 +242,7 @@
 						this.$util.to(`/order/editCourse/editCourse`)
 					})
 				} else {
-					this.$util.errMsg('请选择产品！')
+					this.$util.errMsg('请先添加产品！')
 				}
 			}
 		}
@@ -201,14 +259,24 @@
 		align-items: center;
 		padding: 30rpx 24rpx;
 		margin: 16rpx 24rpx;
-		font-size: 30rpx;
-		color: #333;
 		background-color: #fff;
 		border-radius: 16rpx;
 	}
+	.name {
+		margin-bottom: 10rpx;
+		font-size: 30rpx;
+		color: #333;
+	}
+	.price {
+		font-size: 26rpx;
+		color: #333;
+	}
 	.icon {
-		width: 80rpx;
+		width: 100rpx;
+		min-width: 100rpx;
+		height: 100rpx;
 		margin: 0 20rpx;
+		border-radius: 4px;
 	}
 }
 /deep/.check {
@@ -228,9 +296,16 @@
 .btn-wrap {
 	position: fixed;
 	justify-content: space-between;
+	.btns {
+		display: inline-flex;
+	}
 	.btn {
-		width: 340rpx;
+		width: auto;
-		margin-left: 27rpx;
+		padding: 0 50rpx;
+	}
+	.del {
+		margin-right: 20rpx;
+		background-color: #b5b5b5;
 	}
 }
 </style>

pages.json

@@ -148,7 +148,7 @@
                     "style" :                                                                                    
                 {
                     "navigationBarTitleText": "购物车",
-                    "enablePullDownRefresh": false
+                    "enablePullDownRefresh": true
                 }
                 
                 }
@@ -293,8 +293,8 @@
 		"selectedColor": "#007FFF",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
-		"fontSize": "16px",
+		"fontSize": "22px",
-		"iconWidth": "45px",
+		"iconWidth": "20px",
 		"list": [{
 			"pagePath": "pages/index/index",
 			"iconPath": "static/image/tab1.png",

pages/index/index.vue

@@ -28,7 +28,7 @@
 				<view class="title-wrap">
 					<view class="title">热销产品</view>
 					<view>
-						<button class="all" type="primary" @click.stop="toProduct">全部产品</button>
+						<!-- <button class="all" type="primary" @click.stop="toProduct">全部产品</button> -->
 					</view>
 				</view>
 				<view class="list">
@@ -48,7 +48,7 @@
 				<view class="title-wrap">
 					<view class="title">官方推荐</view>
 					<view>
-						<button class="all" type="primary" @click.stop="toProduct">全部产品</button>
+						<!-- <button class="all" type="primary" @click.stop="toProduct">全部产品</button> -->
 					</view>
 				</view>
 				<view class="list">
@@ -66,7 +66,7 @@
 		
 		<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>
+				<image class="icon" src="@/static/image/product/shop-blue1.png" mode="widthFix" @click="$util.to('/order/shopCart/shopCart')"></image>
 			</uni-badge>
 		</view>
 		
@@ -308,8 +308,8 @@
 		margin-bottom: 28rpx;
 	}
 	.pic {
-		width: 120rpx;
+		width: 100rpx;
-		height: 120rpx;
+		height: 100rpx;
 		margin-right: 20rpx;
 		border-radius: 8px;
 	}
@@ -323,7 +323,7 @@
 	}
 	.des {
 		margin: 10rpx 0;
-		font-size: 24rpx;
+		font-size: 22rpx;
 		color: #666;
 	}
 	.meta {

pages/login/login.vue

@@ -12,7 +12,7 @@
 					<image src="@/static/image/wechat.png" mode="widthFix"></image>
 					微信授权登录
 				</view>
-				<view class="reg" @click="toReg">没有账号？申请注册</view>
+				<!-- <view class="reg" @click="toReg">没有账号？申请注册</view> -->
 			</template>
 			
 			<view class="agree">
@@ -80,20 +80,38 @@
 										login({
 											code,
 											avatarUrl: userInfo.avatarUrl
-										}).then(({ data }) => {
+										}).then((res) => {
-											const e = data.sessionKey
+											const { data, status } = res
-											this.sessionKey = e.session_key
-											this.openid = e.openid
-											this.unionid = e.unionid
-											uni.setStorageSync('sessionKey', e.session_key)
-											uni.setStorageSync('openid', e.openid)
 											this.submiting = false
-											// 如果没有绑定手机号，则显示绑定按钮，引导用户绑定，否则，直接跳到首页
+											// 用户不存在，则让用户授权手机号，直接去注册
-											if (data.state === 'login') {
+											if (status == 10028) {
-												this.toIndex()
+												// 这里需要再调一次uni的login，因为code用过了一次，已经失效了
-												uni.setStorageSync('token', data.token)
+												uni.login({
+													success: ({ code }) => {
+														getSessionKey({
+															code,
+														}).then(({ sessionKey }) => {
+															this.sessionKey = sessionKey.session_key
+															this.openid = sessionKey.openid
+															this.isLogin = true
+														}).catch(e => {})
+														this.isReg = true
+													}
+												})
 											} else {
-												this.isLogin = true
+												const e = data.sessionKey
+												this.sessionKey = e.session_key
+												this.openid = e.openid
+												this.unionid = e.unionid
+												uni.setStorageSync('sessionKey', e.session_key)
+												uni.setStorageSync('openid', e.openid)
+												// 如果没有绑定手机号，则显示绑定按钮，引导用户绑定，否则，直接跳到首页
+												if (data.state === 'login') {
+													this.toIndex()
+													uni.setStorageSync('token', data.token)
+												} else {
+													this.isLogin = true
+												}
 											}
 										}).catch(e => {
 											this.submiting = false

pages/person/person.vue

@@ -16,7 +16,14 @@
 				<view v-if="auth('我的:我的团队')" class="item" @click="$util.to('/team/teams/teams')">
 					<view class="left">
 						<image class="icon" src="@/static/image/person4.png" mode=""></image>
-						<text class="name">我的团队</text>
+						<text class="name">{{ disabled ? '所属团队' : '我的团队' }}</text>
+					</view>
+					<uni-icons type="right" size="15" color="#ccc"></uni-icons>
+				</view>
+				<view v-if="disabled && auth('我的:我的团队')" class="item" @click="createTeam">
+					<view class="left">
+						<image class="icon" src="@/static/image/person4.png" mode=""></image>
+						<text class="name">创建自己的团队</text>
 					</view>
 					<uni-icons type="right" size="15" color="#ccc"></uni-icons>
 				</view>
@@ -128,7 +135,6 @@
 			}
 		},
 		onShow() {
-			console.log(11, uni.getStorageSync('avatar'))
 			this.per = true
 			this.initRole()
 			this.disabled = uni.getStorageSync('team').isTeam == 0 // 成员不能改省份城市
@@ -177,6 +183,10 @@
 					}
 				})
 			},
+			// 创建自己的团队
+			createTeam() {
+				this.$util.to(`../reg/reg?openid=${uni.getStorageSync('openid')}&phone=${this.my.info.phone}`)
+			},
 			// 进入设置
 			toSet() {
 				this.$util.to(`/team/setting/setting`)

pages/reg/reg.vue

@@ -57,40 +57,36 @@
 		methods: {
 			// 检查登录状态
 			checkLogin() {
-				if (uni.getStorageSync('token')) {
+				// 根据手机号获取是否注册过，如果有，则判断是否是队长（isTeam 1：队长，0：成员），如果没有返回team，则注册
-					this.toIndex()
+				queryPartnerAccount(this.phone).then(({ team, username }) => {
-				} else {
+					if (team) {
-					// 根据手机号获取是否注册过，如果有，则判断是否是队长（isTeam 1：队长，0：成员），如果没有返回team，则注册
+						team.teamId && uni.setStorageSync('teamId', team.teamId)
-					queryPartnerAccount(this.phone).then(({ team, username }) => {
+						this.form.userName = team.userName
-						if (team) {
+						if (team) this.exist = true
-							team.teamId && uni.setStorageSync('teamId', team.teamId)
+						if (team.isTeam) {
-							this.form.userName = team.userName
+							this.form = team
-							if (team) this.exist = true
+							this.getCity()
-							if (team.isTeam) {
+						} else {
-								this.form = team
+							this.form.isTeam = 0
-								this.getCity()
+							if (team.userName) this.form.userName = team.userName
-							} else {
+							uni.showModal({
-								this.form.isTeam = 0
+								title: '提示',
-								if (team.userName) this.form.userName = team.userName
+								content: `或然科技城市合伙人，欢迎回来！您已在${team.teamName}，是否要创建自己的团队？`,
-								uni.showModal({
+								success: function (res) {
-									title: '提示',
+									if (res.confirm) {
-									content: `或然科技城市合伙人，欢迎回来！您已在${team.teamName}，是否要创建自己的团队？`,
+										console.log('用户点击确定');
-									success: function (res) {
+									} else if (res.cancel) {
-										if (res.confirm) {
+										uni.redirectTo({
-											console.log('用户点击确定');
+											url: '../login/login'
-										} else if (res.cancel) {
+										})
-											uni.redirectTo({
-												url: '../login/login'
-											})
-										}
 									}
-								})
+								}
-							}
+							})
-						} else if (username) { // 没有团队，只有username
-							this.form.userName = username
 						}
-					}).catch(e => {})
+					} else if (username) { // 没有团队，只有username
-				}
+						this.form.userName = username
+					}
+				}).catch(e => {})
 			},
 			// 获取省份
 			getProvince() {

team/qrcode/qrcode.vue

@@ -63,8 +63,8 @@
 				generateInvitationCode(uni.getStorageSync('team').accountId).then(({ expireTime }) => {
 					const date = new Date(Date.now() + expireTime * 1000) // 返回的秒，要*1000
 					this.expireTime = `${date.getFullYear()}-${this.$util.preZero(date.getMonth() + 1)}-${this.$util.preZero(date.getDate())} ${this.$util.preZero(date.getHours())}:${this.$util.preZero(date.getMinutes())}:${this.$util.preZero(date.getMinutes())}`
-					this.link = `https://huorantech.cn/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}`
+					// this.link = `https://huorantech.cn/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}`
-					// this.link = `http://121.37.12.51/backstage/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}`
+					this.link = `http://121.37.12.51/backstage/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}`
 				}).catch(e => {})
 			},
 			// 二维码组件生成完成钩子。生成后把图片导出给image组件，image组件才可以长按二维码转发