登录、订单、客户

apis/modules/user.js

@@ -4,3 +4,7 @@ const { get, post } = request
 export const login = (data) => {
   return get('users/users/user/weChatAppletCallback', data)
 }
+
+export const userBinding = (data) => {
+  return post('users/users/user/userBinding', data)
+}

apis/request.js

@@ -12,13 +12,14 @@ const request = options => {
 		})
 	}
 	const header = Object.assign({}, config.headers, {
-		token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjU0MTM1MDg4LCJleHAiOjE2NTQxNzgyODgsImFjY291bnRJZCI6IjEifQ.wSb1OgO7vfJoRRNe9tHirTAiTd7vHQLsKFU58cQTe84'
+		// token: uni.getStorageSync('token')
+		token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjU0MTYzMjI2LCJleHAiOjE2NTQyMDY0MjYsImFjY291bnRJZCI6IjQ1MiJ9.oqupeDUjOWMKjdj7p7TclcfnPbsZfqwra5QKxo2YqvU'
 	})
 	return new Promise((resolve, reject)=>{
 		const { url } = options
 		uni.request({
 			header,
-			url: (url.includes('weChatAppletCallback') ? 'http://192.168.31.137:9000/' : config.baseURL) + url,
+			url: ((url.includes('weChatAppletCallback') || url.includes('userBinding')) ? 'http://192.168.31.137:9000/' : config.baseURL) + url,
 			method: options.method || 'GET', // 请求类型，默认为GET
 			data: options.data || {}, // 请求参数，默认空对象
 			success: ({ data }) => {

libs/util.js

@@ -43,5 +43,13 @@ export default {
 			}
 		}
 		return fmt
-	}
+	},
+	// 获取商务经理id
+	getBmId(val) {
+		return uni.getStorageSync('partnerId')
+	},
+	// 获取商务经理名称
+	getBmName(val) {
+		return uni.getStorageSync('partnerClassificationName')
+	},
 }

pages.json

@@ -158,6 +158,15 @@
                 "enablePullDownRefresh": false
             }
         }
+        ,{
+            "path" : "pages/main/main",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式（list 的索引项）

pages/addCourse/addCourse.vue

@@ -90,7 +90,6 @@
 		},
 		// 上拉加载
 		onReachBottom() {
-			console.log(4444)
 			if (this.reachBottom >= 0) {
 				this.reachBottom = 1
 				this.status = 'loading'
@@ -174,6 +173,7 @@
 					authority: e.productType === 2 ? 0 : 1, // 区分权限 0为数据平台权限，1为课程权限
 					productType: e.productType, // 课程分类 (0->理论 1-实训 2 数据产品) 
 					options: 1,
+					miniProgramPictureAddress: e.miniProgramPictureAddress, // 图标
 					settlementPrice: '', // 结算价
 					settlementMethod: e.settlementMethod, // 结算方式，0为单价，1为分成
 					settlementPriceUnit: e.settlementPrice, // 结算单价
@@ -181,39 +181,55 @@
 					serviceFee: 0 // 平台服务费（前端计算后展示，不入库）
 				}
 			},
-			// 确定
-			submit() {
-				const list = this.list.filter(e => e.check.length) // 筛选出选中了的产品
-				if (list.length) {
-					const result = this.courses
-					const courseIds = []
-					const dataIds = []
-					const { customerId } = this
-					list.map(e => {
-						// e.authority ? courseIds.push(e.cid) : dataIds.push(e.cid)
-						courseIds.push(e.cid)
-						result.find(n => n.dataOrCourseId == e.cid) || result.push(this.createParam(e))
-					})
 			// 判断是否为客户已有的课程
+			handleRenew(authority, customerId, productId, result, resolve, reject) {
 				renew({
-						authority: 1,
+					authority,
 					customerId,
-						productId: courseIds
+					productId
 				}).then(({ orderOthers }) => {
 					result.map(e => {
-							// const item = orderOthers.map(n => dataOrCourseId == e.dataOrCourseId && n.authority && e.authority)
+						const item = orderOthers.find(n => n.dataOrCourseId == e.dataOrCourseId && n.authority == authority && e.authority == authority)
-							const item = orderOthers.find(n => n.dataOrCourseId == e.dataOrCourseId)
 						if (item) {
 							let date = new Date(item.endTime)
 							date = new Date(date.setDate(date.getDate() + 1))
 							e.startTime = this.$util.formatDate(date, 'yyyy-MM-dd')
 						}
 					})
+					resolve()
+				}).catch(e => {
+					reject()
+				})
+			},
+			// 确定
+			submit() {
+				const list = this.list.filter(e => e.check.length) // 筛选出选中了的产品
+				if (list.length) {
+					const result = this.courses
+					const courseIds = []
+					const dataIds = []
+					const { customerId } = this
+					list.map(e => {
+						// 新勾选的产品，则获取到id，下面要调用，
+						if (!result.find(n => n.dataOrCourseId == e.id)) {
+							e.productType === 2 ? dataIds.push(e.id) : courseIds.push(e.id)
+							result.push(this.createParam(e))
+						}
+					})
+					
+					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=${this.customerId}`
+					    	url: `../editCourse/editCourse?customerId=${customerId}`
+					    })
 					})
-					}).catch(e => {})
 				} else {
 					this.$util.errMsg('请选择产品！')
 				}

pages/clients/clients.vue

@@ -118,7 +118,7 @@
 			getList() {
 				const method = this.curTab ? all : list
 				method({
-					businessManagerId: 112,
+					businessManagerId: this.$util.getBmId(),
 					customerType: this.customerType,
 					keywords: this.keyword,
 					pageNum: this.page,

pages/editCourse/editCourse.vue

@@ -6,7 +6,7 @@
 			<view v-for="(item, i) in courses">
 				<view class="pro-name">
 					<view class="left">
-						<image class="icon" src="../../static/image/course1.png" mode=""></image>
+						<image v-if="item.miniProgramPictureAddress" class="icon" :src="item.miniProgramPictureAddress" mode="widthFix"></image>
 						{{ item.productName }}
 					</view>
 					<uni-icons class="del" type="trash" size="25" color="#ADADAD" @click="delCourse(i)"></uni-icons>
@@ -85,7 +85,7 @@
 					text: '年',
 					value: 2
 				}],
-				courses: uni.getStorageSync('courses'), // 上一页缓存的产品
+				courses: [], // 上一页缓存的产品
 				orderRepeat: [],
 				repeatMsg: ''
 			}
@@ -94,6 +94,13 @@
 			const pages = getCurrentPages()
 			const { options } = pages[pages.length - 1]
 			this.customerId = options.customerId
+			const store = uni.getStorageSync('courses')
+			if (store) {
+				this.courses = store
+				try {
+					uni.removeStorageSync('courses')
+				} catch (e) {}
+			}
 		},
 		methods: {
 			// 删除课程
@@ -195,32 +202,37 @@
 			calcDiscount(row) {
 				const price = row.authority ? row.finalPrice : row.finalValue
 				const { marketValue } = row
-				// 课程：成交价/市场价；数据：成交单价/市场单价
+				// (原价-现价)÷原价 x100%
-				if (price) row.discountRate = marketValue != 0 ? (price / row.marketValue * 100).toFixed(2) + '%' : '0%'
+				if (price) row.discountRate = marketValue != 0 ? ((marketValue - price) / marketValue * 100).toFixed(2) + '%' : '0%'
 			},
 			// 成交价修改后，计算成交单价，数据才需要 计算规则：成交价/账号数/时间（成交单价为元/账号/年，所以时间要换算成年的单位去计算）
 			calcFinalValue(row) {
 				const { authority, periodOfUse, options, accountNum, finalPrice } = row
-				if (authority && periodOfUse && accountNum && finalPrice) {
+				if (!authority && periodOfUse && accountNum && finalPrice) {
-					row.finalValue = (finalPrice / accountNum / periodOfUse * (!options ? 
+					row.finalValue = (finalPrice / accountNum / periodOfUse).toFixed(2)
-					365 :
-					options === 1 ?
-						12 :
-						1)).toFixed(2)
 				}
 				// 折扣率
 				this.calcDiscount(row)
 			},
 			// 计算成交价。计算规则：成交单价*账号数*时间（成交单价为元/账号/年，所以时间要换算成年的单位去计算）
 			calcFinalPrice(row) {
-				const { finalValue, accountNum, periodOfUse, options } = row
+				const { finalValue, accountNum, periodOfUse, finalPrice } = row
-				if (finalValue && accountNum) {
+				if (periodOfUse) {
-					row.finalPrice = ((!options ?
+					if (accountNum) {
-					finalValue / 365 * periodOfUse :
+					    // 有成交单价，则成交价=成交单价*账号数*时间
-					options === 1 ?
+					    if (finalValue) {
-						finalValue / 12 * periodOfUse :
+							row.finalPrice = Math.round(finalValue * periodOfUse * accountNum)
-						finalValue * periodOfUse) * accountNum).toFixed(2)
+					    } else if (!finalValue && finalPrice) {
+							// 有成交价，没有成交单价，则成交单价=成交价/账号数/时间
+							row.finalValue = (finalPrice / periodOfUse / accountNum).toFixed(2)
+							this.calculateDiscount(e, row)
+					    }
+					} else if (finalValue && finalValue && !row.authority) {
+					    // 有成交价、成交单价，没有数量，则数量=成交价/时间/成交单价
+					    row.accountNum = Math.floor(finalPrice / periodOfUse / finalValue)
 					}
+				}
+				this.dealSettlePrice(row)
 			},
 			// 确定
 			submit() {

pages/index/index.vue

@@ -49,6 +49,12 @@
 							value: e.partnerId
 						})
 					})
+					console.log(22, result)
+					if (result.length === 1) {
+						const val = result[0].value
+						this.partnerId = val
+						uni.setStorageSync('partnerId', val)
+					}
 					this.list = result
 				}).catch(e => {})
 			},

pages/login/login.vue

@@ -29,7 +29,7 @@
 </template>
 
 <script>
-	import { login } from '@/apis/modules/user.js'
+	import { login, userBinding } from '@/apis/modules/user.js'
 	export default {
 		data() {
 			return {
@@ -39,7 +39,10 @@
 					value: 1
 				}],
 				isLogin: true, // 是否已登录
-				getPhone: true // 是否已授权手机号
+				getPhone: true ,// 是否已授权手机号
+				sessionKey: '',
+				openId: '',
+				unionid: '',
 			}
 		},
 		onShow() {
@@ -50,7 +53,7 @@
 			// 检查登录状态
 			checkLogin() {
 				if (uni.getStorageSync('token')) {
-					this.$util.to('../index/index')
+					this.$util.to('../main/main')
 				} else {
 					this.isLogin = false
 					this.getPhone = false
@@ -64,16 +67,23 @@
 						lang: 'zh_CN',
 						desc: '登录',
 						success: ({ userInfo }) => {
-							console.log(33, userInfo)
 							uni.setStorageSync('userName', userInfo.nickName)
 							uni.setStorageSync('avatar', userInfo.avatarUrl)
 							uni.login({
 								success: ({ code }) => {
 									if (code) {
-										this.isLogin = true
 										login({ code }).then(({ data }) => {
-											this.sessionKey = data.sessionKeyOpenId.session_key
+											const e = data.sessionKey
-											// uni.setStorageSync('token', userInfo.avatarUrl)
+											this.sessionKey = e.session_key
+											this.openId = e.openid
+											this.unionid = e.unionid
+											uni.setStorageSync('sessionKey', e.session_key)
+											if (data.state === 'login') {
+												this.$util.to('../main/main')
+												uni.setStorageSync('token', data.token)
+											} else {
+												this.isLogin = true
+											}
 										}).catch(e => {})
 									} else {
 										that.$util.errMsg('登录失败！')
@@ -91,12 +101,19 @@
 			},
 			onGetPhoneNumber(e){
 				const { encryptedData, iv } = e.detail
-				//获取手机号有两种方法，1.前端使用js完成；2.使用接口完成
+				// 获取手机号有两种方法，1.前端使用js完成；2.使用接口完成
 				const WXBizDataCrypt = require('@/libs/WXBizDataCrypt')
 				const accountInfo = uni.getAccountInfoSync() // 获取小程序appid
 				const pc = new WXBizDataCrypt(accountInfo.miniProgram.appId , this.sessionKey)
 				const data = pc.decryptData(encryptedData , iv)
-				console.log(222, data)
+				userBinding({
+					openId: this.openId,
+					phone: data.phoneNumber,
+					unionid: this.unionid
+				}).then(({ token }) => {
+					uni.setStorageSync('token', token)
+					this.$util.to('../main/main')
+				}).catch(e => {})
 			},
 			toAgreement(id) {
 				this.$util.to('../detail/detail?id=' + id)

pages/main/main.vue

@@ -0,0 +1,97 @@
+<template>
+	<view class="page">
+		<view class="team">
+			<uni-data-picker class="picker-input" placeholder="切换团队" popup-title="切换团队" preload :clear-icon="false" :localdata="list" v-model="partnerId" @change="teamChange"></uni-data-picker>
+		</view>
+		
+		<image class="banner" src="../../static/image/index/index1.png" mode="widthFix"></image>
+		<ul class="entry">
+			<li @click="$util.to('../clients/clients')">
+				<image class="icon" src="../../static/image/index/index3.png" mode="widthFix"></image>
+				<view class="text">客户</view>
+			</li>
+			<li @click="$util.to('../plans/plans')">
+				<image class="icon" src="../../static/image/index/index4.png" mode="widthFix"></image>
+				<view class="text">方案</view>
+			</li>
+			<li @click="$util.to('../orders/orders')">
+				<image class="icon" src="../../static/image/index/index5.png" mode="widthFix"></image>
+				<view class="text">订单</view>
+			</li>
+			<li @click="$util.to('../products/products')">
+				<image class="icon" src="../../static/image/index/index6.png" mode="widthFix"></image>
+				<view class="text">产品</view>
+			</li>
+		</ul>
+	</view>
+</template>
+
+<script>
+	import { getTeamsByAccountId } from '@/apis/modules/client.js'
+	export default {
+		data() {
+			return {
+				partnerId: this.$util.getBmId() || '',
+				list: [],
+			}
+		},
+		onShow() {
+			this.getInfo()
+		},
+		methods: {
+			// 获取团队
+			getInfo() {
+				getTeamsByAccountId().then(({ data }) => {
+					const result = []
+					data.map(e => {
+						result.push({
+							text: e.partnerClassificationName,
+							value: e.partnerId
+						})
+					})
+					// 默认选择第一个团队
+					if (result.length) {
+						const val = result[0].value
+						this.partnerId = val
+						uni.setStorageSync('partnerId', val)
+						uni.setStorageSync('partnerClassificationName', result[0].text)
+					}
+					this.list = result
+				}).catch(e => {})
+			},
+			// 团队选择回调
+			teamChange() {
+				uni.setStorageSync('partnerId', this.partnerId)
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page {
+	min-height: 100%;
+	padding: 30rpx 22rpx;
+	background: url(../../static/image/index/index2.png) 0 0/100% 100% no-repeat;
+}
+.team {
+	width: 200rpx;
+	margin-bottom: 30rpx;
+}
+.banner {
+	width: 100%;
+}
+.entry {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	margin-top: 10rpx;
+	text-align: center;
+	.icon {
+		width: 78rpx;
+	}
+	.text {
+		font-size: 28rpx;
+		color: #333;
+	}
+}
+</style>

pages/orderDetail/orderDetail.vue

@@ -5,7 +5,7 @@
 			<view class="form-list">
 				<view class="line">
 					<view class="name">商务经理</view>
-					<view class="val"></view>
+					<view class="val">{{ $util.getBmName() }}</view>
 				</view>
 				<view class="line req">
 					<view class="name">客户名称</view>
@@ -52,17 +52,18 @@
 			</view>
 		</view>
 		
-		<view class="block pro-wrap" v-for="c in courseList">
+		<template v-for="c in courseList">
+			<view v-if="c.list.length" class="block pro-wrap">
 				<view class="l-title">{{ c.name }}</view>
 				<uni-icons class="arrow" type="top" size="20" color="#007EFF"></uni-icons>
 				<ul class="pro-list">
 					<li v-for="(item, i) in c.list">
 						<view class="name">
 							<view class="left">
-							<image class="icon" src="../../static/image/course1.png" mode=""></image>
+								<image v-if="item.miniProgramPictureAddress" class="icon" :src="item.miniProgramPictureAddress" mode="widthFix"></image>
 								{{ item.productName }}
 							</view>
-						<uni-icons class="del" type="trash" size="25" color="#ADADAD" @click="delCourse(i)"></uni-icons>
+							<uni-icons v-if="!isDetail" class="del" type="trash" size="25" color="#ADADAD" @click="delCourse(c, i)"></uni-icons>
 						</view>
 						<view class="info">
 							<view class="line">
@@ -93,6 +94,7 @@
 					</li>
 				</ul>
 			</view>
+		</template>
 		
 		<view class="bottom">
 			<view v-if="!orderId" class="add-btn" @click="toAdd">
@@ -114,7 +116,7 @@
 						总采购成本:
 						<text class="num num1">{{ purchase }}</text>元
 						总产品利润:
-						<text class="num">{{ profit }}</text>元
+						<text class="num"> {{ profit }}</text> 元
 					</view>
 				</view>
 				<view v-if="!isDetail" class="btn" @click="submit">提交</view>
@@ -151,16 +153,18 @@
 				form: {
 					// orderNumber: '', // 编号
 					provinceId: '', // 省份id
+					provinceName: '',
 					orderContact: '', // 联系人
 					email: '',
 					customerId: '', // 客户id
 					customerName: '',
 					orderType: '',
 					cityId: '',
+					cityName: '',
 					phone: '',
 					orderAmount: 0,
 					customerName: '',
-					businessManager: ''
+					businessManagerId: this.$util.getBmId()
 				},
 				courseList: {},
 				courses: [], // 缓存的产品列表
@@ -216,8 +220,7 @@
 			// 获取详情
 			getInfo() {
 				getDetail({
-					// orderId: this.orderId
+					orderId: this.orderId
-					orderId: 121
 				}).then(({ orderDetails }) => {
 					const order = orderDetails
 					this.contract = order.contractInformation
@@ -246,6 +249,7 @@
 				console.log(111, list)
 				// 3个分类的课程分别push到不同数组(0->理论 1-实训 2 数据产品) 
 				list.map(e => {
+					e.serviceFee = (e.settlementPrice * 0.1).toFixed(2)
 					const type = e.productType
 					!type ?
 						courses.theory.list.push(e) :
@@ -253,10 +257,6 @@
 							courses.practice.list.push(e) :
 							courses.data.list.push(e)
 				})
-				// 没有数据的课程，直接删除
-				courses.practice.list.length || delete courses.practice
-				courses.theory.list.length || delete courses.theory
-				courses.data.list.length || delete courses.data
 				console.log(222, courses)
 				this.courseList = courses
 			},
@@ -296,6 +296,10 @@
 					const e = result.customer
 					form.customerId = e.customerId
 					form.customerName = e.customerName
+					form.provinceId = e.provinceId
+					form.cityId = e.cityId
+					form.provinceName = e.provinceName
+					form.cityName = e.cityName
 					form.phone = e.phone
 					form.email = e.email
 					form.name = e.name
@@ -311,13 +315,13 @@
 					this.$util.errMsg('请先选择客户！')
 			},
 			// 删除课程
-			delCourse(i) {
+			delCourse(c, i) {
 				const that = this
 				uni.showModal({
 					title: '提示',
 					content: '确定要删除吗？',
 					success(res) {
-						res.confirm && that.courses.splice(i, 1)
+						res.confirm && c.list.splice(i, 1)
 					}
 				})
 			},

pages/orders/orders.vue

@@ -138,7 +138,7 @@
 		methods: {
 			getList() {
 				list({
-					businessManagerId: 111,
+					businessManagerId: this.$util.getBmId(),
 					keywords: this.keyword,
 					pageNum: this.page,
 					pageSize: this.pageSize,

pages/plans/plans.vue

@@ -9,7 +9,7 @@
 			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
 		</ul>
 		
-		<ul class="list">
+		<ul v-if="list.length" class="list">
 			<li v-for="(item, i) in list">
 				<view class="name">{{ item.name }}</view>
 				<view class="content">
@@ -31,6 +31,7 @@
 				</view>
 			</li>
 		</ul>
+		<empty v-else></empty>
 	</view>
 </template>
 
@@ -38,11 +39,11 @@
 	export default {
 		data() {
 			return {
-				curTab: 0,
+				curTab: '',
 				tabs: [
 					{
 						name: '不限',
-						id: 0
+						id: ''
 					},
 					{
 						name: '标准方案',
@@ -117,8 +118,10 @@
 			},
 			// tab切换
 			tabChange(tab) {
-				this.curTab = tab.id
+				const { id } = tab
-				this.list = this.all.filter(e => e.type === tab.id)
+				const { all } = this
+				this.curTab = id
+				this.list = id ? all.filter(e => e.type === id) : all
 			},
 			// 跳转详情
 			toDetail(id) {