登录、客户等

apis/modules/client.js

@@ -5,6 +5,10 @@ export const queryCustomer = (data) => {
   return post('nakadai/nakadai/customer/queryCustomer', data)
 }
 
+export const list = (data) => {
+  return post('nakadai/nakadai/customer/GetCustomerListBasedOnBusinessManagerId', data)
+}
+
 export const queryCustomerDetails = (data) => {
   return get('nakadai/nakadai/customer/queryCustomerDetails', data)
 }

apis/modules/product.js

@@ -1,10 +1,6 @@
 import request from '@/apis/request.js'
 const { get, post } = request
 
-export const curriculumList = (data) => {
-  return post('nakadai/nakadai/curriculum/curriculumList', data)
-}
-
 export const AppletsDataProductList = (data) => {
   return post('nakadai/nakadai/dataProduct/AppletsDataProductList', data)
 }

apis/modules/user.js

@@ -0,0 +1,6 @@
+import request from '@/apis/request.js'
+const { get, post } = request
+
+export const login = (data) => {
+  return get('users/users/user/weChatAppletCallback', data)
+}

apis/request.js

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

libs/WXBizDataCrypt.js

@@ -0,0 +1,35 @@
+var crypto = require('crypto')
+
+function WXBizDataCrypt(appId, sessionKey) {
+  this.appId = appId
+  this.sessionKey = sessionKey
+}
+
+WXBizDataCrypt.prototype.decryptData = function (encryptedData, iv) {
+  // base64 decode
+  var sessionKey = new Buffer(this.sessionKey, 'base64')
+  encryptedData = new Buffer(encryptedData, 'base64')
+  iv = new Buffer(iv, 'base64')
+
+  try {
+     // 解密
+    var decipher = crypto.createDecipheriv('aes-128-cbc', sessionKey, iv)
+    // 设置自动 padding 为 true，删除填充补位
+    decipher.setAutoPadding(true)
+    var decoded = decipher.update(encryptedData, 'binary', 'utf8')
+    decoded += decipher.final('utf8')
+    
+    decoded = JSON.parse(decoded)
+
+  } catch (err) {
+    throw new Error('Illegal Buffer')
+  }
+
+  if (decoded.watermark.appid !== this.appId) {
+    throw new Error('Illegal Buffer')
+  }
+
+  return decoded
+}
+
+module.exports = WXBizDataCrypt

pages.json

@@ -1,11 +1,19 @@
 {
 	"pages": [
+        {
+            "path" : "pages/login/login",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "登录",
+                "enablePullDownRefresh": false
+            }
+        },
         {
             "path" : "pages/orders/orders",
             "style" :                                                                                    
             {
                 "navigationBarTitleText": "订单列表",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": true
             }
         },
         {
@@ -24,20 +32,12 @@
                 "enablePullDownRefresh": true
             }
         },
-		{
-		    "path" : "pages/clientDetail/clientDetail",
-		    "style" :                                                                                    
-		    {
-		        "navigationBarTitleText": "客户详情",
-		        "enablePullDownRefresh": false
-		    }
-		},
         {
-            "path" : "pages/orderDetail/orderDetail",
+            "path" : "pages/addCourse/addCourse",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "订单详情",
+                "navigationBarTitleText": "选择产品",
-                "enablePullDownRefresh": false
+                "enablePullDownRefresh": true
             }
         },
 		{
@@ -46,11 +46,19 @@
 				"navigationBarTitleText": "首页"
 			}
 		},
+		{
+		    "path" : "pages/clientDetail/clientDetail",
+		    "style" :                                                                                    
+		    {
+		        "navigationBarTitleText": "客户详情",
+		        "enablePullDownRefresh": false
+		    }
+		},
         {
-            "path" : "pages/login/login",
+            "path" : "pages/orderDetail/orderDetail",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "登录",
+                "navigationBarTitleText": "订单详情",
                 "enablePullDownRefresh": false
             }
         },
@@ -62,14 +70,6 @@
                 "enablePullDownRefresh": false
             }
         },
-        {
-            "path" : "pages/addMember/addMember",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "添加成员",
-                "enablePullDownRefresh": false
-            }
-        },
         {
             "path" : "pages/addStaff/addStaff",
             "style" :                                                                                    
@@ -149,22 +149,23 @@
                 "navigationBarTitleText": "详情",
                 "enablePullDownRefresh": false
             }
-        }
+        },
-        ,{
+        {
-            "path" : "pages/addCourse/addCourse",
+            "path" : "pages/editCourse/editCourse",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "选择产品",
+                "navigationBarTitleText": "编辑产品",
                 "enablePullDownRefresh": false
             }
         }
         ,{
-            "path" : "pages/editCourse/editCourse",
+            "path" : "pages/agreement/agreement",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "编辑产品",
+                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
+            
         }
     ],
 	"condition": { //模式配置，仅开发期间生效

pages/addCourse/addCourse.vue

@@ -12,9 +12,10 @@
 			<li v-for="item in list">
 				<uni-data-checkbox class="check" multiple v-model="item.check" :localdata="item.checkData"></uni-data-checkbox>
 				<image class="icon" src="../../static/image/course1.png" mode="widthFix"></image>
-				{{ item.curriculumName }}
+				{{ 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="checkChange"></uni-data-checkbox>
@@ -24,7 +25,7 @@
 </template>
 
 <script>
-	import { curriculumList } from '@/apis/modules/course.js'
+	import { AppletsDataProductList } from '@/apis/modules/product.js'
 	import { renew } from '@/apis/modules/order.js'
 	export default {
 		data() {
@@ -34,7 +35,7 @@
 				curTab: '',
 				tabs: [
 					{
-						name: '不限',
+						name: '全部',
 						id: ''
 					},
 					{
@@ -47,9 +48,11 @@
 					},
 					{
 						name: '数据产品',
-						id: 3
+						id: 2
 					}
 				],
+				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
+				status: 'more', // 上拉加载状态 more|loading|noMore
 				searchTimer: null,
 				orderStatus: '',
 				productStatus: '',
@@ -80,11 +83,20 @@
 		},
 		// 下拉刷新
 		onPullDownRefresh() {
-			this.getList()
+			this.initList()
 			setTimeout(() => {
 				uni.stopPullDownRefresh()
 			}, 1500)
 		},
+		// 上拉加载
+		onReachBottom() {
+			console.log(4444)
+			if (this.reachBottom >= 0) {
+				this.reachBottom = 1
+				this.status = 'loading'
+				this.getList()
+			}
+		},
 		onShow() {
 			const pages = getCurrentPages()
 			const { options } = pages[pages.length - 1]
@@ -95,13 +107,14 @@
 		methods: {
 			// 获取课程列表
 			getList() {
-				curriculumList({
+				AppletsDataProductList({
-					curriculumName: this.keyword,
+					sort: '',
-					isEnable: 0,
+					keywords: '',
-					pageNum: 1,
+					productType: this.curTab,
-					pageSize: 10000
+					pageNum: this.page,
-				}).then(({ page }) => {
+					pageSize: this.pageSize
-					const { records } = page
+				}).then(({ data }) => {
+					const { records } = data
 					const list = this.courses
 					// 添加选择框字段
 					records.map(e => {
@@ -111,18 +124,30 @@
 						}
 						e.check = []
 						// 筛选已经勾选的产品
-						if (list.find(n => n.dataOrCourseId == e.cid)) {
+						if (list.find(n => n.dataOrCourseId == e.id)) {
 							checkData.disable = true // 已经选择了的则禁止选择
 							e.check = [1]
 						}
 						e.checkData = [checkData]
 					})
-					this.list = records
+					
+					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
+					this.list = this.reachBottom > 0 ? [...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
 				}).catch(e => {})
 			},
+			initList() {
+				this.page = 1
+				this.reachBottom = 0
+				this.getList()
+			},
 			// tab切换
 			tabChange(tab) {
 				this.curTab = tab.id
+				this.initList()
 			},
 			// 全选
 			checkChange(e) {
@@ -132,8 +157,8 @@
 			// 生成产品参数
 			createParam(e) {
 				return {
-					dataOrCourseId: e.cid, // id
+					dataOrCourseId: e.id, // id
-					productName: e.curriculumName, // 名称
+					productName: e.productName, // 名称
 					periodOfUse: '', // 使用期限
 					startTime: this.$util.formatDate(new Date(), 'yyyy-MM-dd'), // 开始
 					endTime: '', // 终止
@@ -146,12 +171,14 @@
 					totalAmount: '', // 总价
 					isEnable: 1, // 启用否：1启用，0禁用
 					ship: 0, // 发货否（0未发货，1已发货，默认不发货）
-					authority: 1, // 区分权限 0为数据平台权限，1为课程权限
+					authority: e.productType === 2 ? 0 : 1, // 区分权限 0为数据平台权限，1为课程权限
+					productType: e.productType, // 课程分类 (0->理论 1-实训 2 数据产品) 
 					options: 1,
 					settlementPrice: '', // 结算价
 					settlementMethod: e.settlementMethod, // 结算方式，0为单价，1为分成
 					settlementPriceUnit: e.settlementPrice, // 结算单价
 					businessProportion: e.businessProportion, // 商务占比
+					serviceFee: 0 // 平台服务费（前端计算后展示，不入库）
 				}
 			},
 			// 确定
@@ -197,8 +224,7 @@
 
 <style scoped lang="scss">
 .page {
-	height: calc(100vh - 140rpx);
+	padding-bottom: 130rpx;
-	overflow: auto;
 }
 .list {
 	li {

pages/addMember/addMember.vue

@@ -1,62 +0,0 @@
-<template>
-	<view class="container">
-		<uni-section title="基本信息" type="line">
-			<view class="form">
-				<uni-forms ref="baseForm" :modelValue="form">
-					<uni-forms-item label="姓名" name="contact" required>
-						<uni-easyinput v-model="form.contact" placeholder="请输入姓名" />
-					</uni-forms-item>
-					<uni-forms-item label="手机号" name="contact" required>
-						<uni-easyinput v-model="form.contact" placeholder="请输入手机号" />
-					</uni-forms-item>
-				</uni-forms>
-				<button type="primary" @click="submit('valiForm')">提交</button>
-			</view>
-		</uni-section>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				form: {
-					name: '',
-					provience: '',
-					city: '',
-					industryId: '',
-					age: '',
-					introduction: '',
-					sex: 2,
-					hobby: [5],
-					datetimesingle: 1627529992399
-				}
-			}
-		},
-		onLoad() {
-			console.log(getApp())
-		},
-		methods: {
-			onchange(e) {
-				console.log('---------onchange:', e);
-			},
-			submit(ref) {
-				this.$refs[ref].validate().then(res => {
-					console.log('success', res);
-					uni.showToast({
-						title: `校验通过`
-					})
-				}).catch(err => {
-					console.log('err', err);
-				})
-			},
-		}
-	}
-</script>
-
-<style scoped>
-.form {
-	padding: 15px;
-	background-color: #fff;
-}
-</style>

pages/agreement/agreement.vue

@@ -0,0 +1,45 @@
+<template>
+	<view class="page">
+		<web-view :webview-styles="webviewStyles" :src="src"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				src: '',
+				webviewStyles: {
+					progress: {
+						color: '#FF3333'
+					}
+				},
+			}
+		},
+		onShow() {
+			const pages = getCurrentPages()
+			const { options } = 
+			this.src = `http://view.xdocin.com/xdoc?_xdoc=${pages[pages.length - 1].options.id == 1 ? 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220530/docx/1531155187057057792.docx' : 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220530/docx/1531156166884220928.docx'}`
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page {
+	padding: 60rpx 40rpx;
+	background-color: #fff;
+}
+.title {
+	margin-bottom: 30rpx;
+	font-size: 38rpx;
+	text-align: center;
+	color: #333;
+}
+.content {
+	white-space: pre-wrap;
+	font-size: 28rpx;
+}
+</style>

pages/clients/clients.vue

@@ -16,13 +16,13 @@
 				<view class="name">{{ item.customerName }}</view>	
 				<view class="info">
 					<view class="left">
-						<view class="text">联系人：海文</view>
+						<view class="text">联系人：{{ item.orderContact }}</view>
-						<view class="text">账号：海文</view>
+						<view class="text">账号：{{ item.account }}</view>
-						<view class="text">产品到期时间：海文</view>
+						<view class="text">产品到期时间：{{ item.expireDate.replace(' 00:00:00', '') }}</view>
-						<view class="text">商务经理：海文</view>
+						<view class="text">商务经理：{{ item.account }}</view>
 					</view>
 					<view class="type">
-						试用客户
+						{{ menuList[0].detailList.find(e => e.value === item.customerType).title }}客户
 					</view>
 				</view>
 			</li>
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-	import { queryCustomer } from '@/apis/modules/client.js'
+	import { list } from '@/apis/modules/client.js'
 	import slFilter from '@/components/sl-filter/sl-filter.vue'
 	export default {
 		data() {
@@ -112,18 +112,17 @@
 		},
 		methods: {
 			getList() {
-				queryCustomer({
+				list({
-					countries: '中国',
+					businessManagerId: 112,
-					provinceId: '',
+					customerType: this.customerType,
-					cityId: '',
+					keywords: this.keyword,
-					searchContent: this.keyword,
+					pageNum: this.page,
-					page: this.page,
+					pageSize: this.pageSize
-					size: this.pageSize
+				}).then(({ data }) => {
-				}).then(({ message }) => {
 					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
-					this.list = this.reachBottom > 0 ? [...this.list, ...message.list] : message.list
+					this.list = this.reachBottom > 0 ? [...this.list, ...data.records] : data.records
 					this.page++ // 每次获取了数据后page+1
-					const noMore = this.list.length === message.totalCount // 是否加载完所有数据
+					const noMore = this.list.length === data.total // 是否加载完所有数据
 					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
 					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
 				}).catch(e => {})
@@ -136,6 +135,7 @@
 			// 筛选确定回调
 			result(val) {
 				this.customerType = val.customerType
+				this.initList()
 			},
 			// tab切换
 			tabChange(tab) {

pages/login/login.vue

@@ -3,36 +3,107 @@
 		<view class="wrap">
 			<image class="logo" src="../../static/image/logo.png" mode=""></image>
 			<view class="hello">Hi，城市合伙人请登录</view>
-			<view class="btn wechat">
+			<button v-if="isLogin && !getPhone" class="btn phone" open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber">
-				<image src="../../static/image/wechat.png" mode="widthFix"></image>
-				微信授权登录
-			</view>
-			<view class="btn phone">
 				<image src="../../static/image/phone.png" mode="widthFix"></image>
-				手机账号登录
+				绑定手机
-			</view>
+			</button>
+			<template v-else>
+				<view class="btn wechat" @click="login">
+					<image src="../../static/image/wechat.png" mode="widthFix"></image>
+					微信授权登录
+				</view>
+				<view class="btn phone">
+					<image src="../../static/image/phone.png" mode="widthFix"></image>
+					手机账号登录
+				</view>
+			</template>
+			
 			<view class="agree">
 				<uni-data-checkbox class="check" multiple v-model="agree" :localdata="agreeData"></uni-data-checkbox>
 				同意
-				<text>《或然科技城市合伙人服务协议》</text>
+				<text @click="toAgreement(1)">《用户服务协议》</text>
+				<text @click="toAgreement(2)">《用户隐私协议》</text>
 			</view>
 		</view>
 	</view>
 </template>
 
 <script>
+	import { login } from '@/apis/modules/user.js'
 	export default {
 		data() {
 			return {
 				agree: [],
 				agreeData: [{
 					text: '',
-					value: 0
+					value: 1
 				}],
+				isLogin: true, // 是否已登录
+				getPhone: true // 是否已授权手机号
 			}
 		},
+		onShow() {
+			// 先授权用户信息，再授权手机号
+			this.checkLogin()
+		},
 		methods: {
-			
+			// 检查登录状态
+			checkLogin() {
+				if (uni.getStorageSync('token')) {
+					this.$util.to('../index/index')
+				} else {
+					this.isLogin = false
+					this.getPhone = false
+				}
+			},
+			// 授权用户信息
+			login() {
+				if (this.agree.length) {
+					const that = this
+					uni.getUserProfile({
+						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 = 
+											// uni.setStorageSync('token', userInfo.avatarUrl)
+										}).catch(e => {})
+									} else {
+										that.$util.errMsg('登录失败！')
+									}
+								}
+							})			
+						},
+						fail(res) {
+							that.$util.errMsg('登录授权失败！')
+						}
+					})
+				} else {
+					this.$util.errMsg('请先阅读勾选协议！')
+				}
+			},
+			onGetPhoneNumber(e){  
+				var encryptedData =e.detail.encryptedData;
+					var iv = e.detail.iv;
+					//获取手机号有两种方法，1.前端使用js完成；2.使用接口完成（语言不限可自行百度），这边我说一种，使用js获取
+					//WXBizDataCrypt是js文件，路径记得用对，下面有js文件源码
+					var WXBizDataCrypt = require('@/libs/WXBizDataCrypt'); //路径要对应，你新建的WXBizDataCrypt.js文件路径
+					const accountInfo = uni.getAccountInfoSync(); //获取小程序appid
+					let appid = accountInfo.miniProgram.appId
+					return console.log(11, appid)
+					var pc = new WXBizDataCrypt(appid , this.sessionKey);
+					var data = pc.decryptData(encryptedData , iv);
+			},
+			toAgreement(id) {
+				this.$util.to('../agreement/agreement?id=' + id)
+			}
 		}
 	}
 </script>
@@ -83,6 +154,7 @@
 	.phone {
 		color: #007EFF;
 		border: 1px solid #007EFF;
+		background-color: #fff;
 		image {
 			width: 40rpx;
 		}
@@ -106,6 +178,9 @@
 		.checklist-box {
 			margin: 0;
 		}
+		.checkbox__inner {
+			border-radius: 50% !important;
+		}
 	}
 }
 </style>

pages/orderDetail/orderDetail.vue

@@ -52,11 +52,11 @@
 			</view>
 		</view>
 		
-		<view class="block pro-wrap">
+		<view class="block pro-wrap" v-for="c in courses">
-			<view class="l-title">实训课程产品</view>
+			<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 courses">
+				<li v-for="(item, i) in c.list">
 					<view class="name">
 						<view class="left">
 							<image class="icon" src="../../static/image/course1.png" mode=""></image>
@@ -162,6 +162,7 @@
 					customerName: '',
 					businessManager: ''
 				},
+				courseList: [],
 				courses: [], // 缓存的产品列表
 				purchase: 0,
 				profit: 0,
@@ -191,6 +192,7 @@
 				this.getInfo()
 			} else if (store) {
 				// 新增取缓存，取了删除
+				this.handleProduct(store)
 				this.courses = store
 				try {
 					uni.removeStorageSync('courses')
@@ -221,8 +223,41 @@
 					this.contract = order.contractInformation
 					this.form = order.order
 					this.courses = order.orderOther
+					this.handleProduct(order.orderOther)
+					this.calcTotal()
 				}).catch(e => {})
 			},
+			// 转换产品列表
+			handleProduct(list) {
+				const courses = {
+					practice: {
+						name: '实训课程产品',
+						list: []
+					},
+					theory: {
+						name: '理论课程产品',
+						list: []
+					},
+					data: {
+						name: '数据产品',
+						list: []
+					}
+				}
+				// 3个分类的课程分别push到不同数组(0->理论 1-实训 2 数据产品) 
+				list.map(e => {
+					const type = e.productType
+					!type ?
+						courses.theory.list.push(e) :
+						type === 1 ?
+							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
+				this.courseList = courses
+			},
 			// 获取客户列表
 			getCustomer() {
 				queryCustomer({

pages/products/products.vue

@@ -14,6 +14,7 @@
 		<ul class="list">
 			<li v-for="item in list">
 				<view class="pro-name">
+					<!-- <image v-if="item.id != 13" class="icon" :src="require('../../static/image/product/' + item.id + '.png)" mode="widthFix"></image> -->
 					<image class="icon" src="../../static/image/course1.png" mode="widthFix"></image>
 					{{ item.productName }}
 				</view>
@@ -46,7 +47,7 @@
 </template>
 
 <script>
-	import { AppletsDataProductList } from '@/apis/modules/course.js'
+	import { AppletsDataProductList } from '@/apis/modules/product.js'
 	import slFilter from '@/components/sl-filter/sl-filter.vue'
 	export default {
 		data() {