产品方案、订单客户等

apis/modules/client.js

@@ -6,7 +6,11 @@ export const queryCustomer = (data) => {
 }
 
 export const list = (data) => {
-  return post('nakadai/nakadai/customer/GetCustomerListBasedOnBusinessManagerId', data)
+  return post('nakadai/applets/customer/getCustomerListBasedOnBusinessManagerId', data)
+}
+
+export const all = (data) => {
+  return post('nakadai/applets/customer/allClientsOfTheTeam', data)
 }
 
 export const queryCustomerDetails = (data) => {
@@ -39,4 +43,8 @@ export const updateCustomer = (data) => {
 
 export const getProductsSubscribedByCustomers = (data) => {
   return get('nakadai/nakadai/customer/getProductsSubscribedByCustomers', data)
+}
+
+export const getTeamsByAccountId = (data) => {
+  return post('nakadai/applets/customer/getTeamsByAccountId', data)
 }

apis/modules/order.js

@@ -19,4 +19,8 @@ export const getDetail = (data) => {
 
 export const renew = (data) => {
   return post('nakadai/nakadai/orderOther/renew', data)
+}
+
+export const list = (data) => {
+  return post('nakadai/applets/order/getOrderBasedOnBusinessManagerId', data)
 }

apis/request.js

@@ -12,7 +12,7 @@ const request = options => {
 		})
 	}
 	const header = Object.assign({}, config.headers, {
-		token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjUzODc2NDczLCJleHAiOjE2NTM5MTk2NzMsImFjY291bnRJZCI6IjEifQ.sX2qEUJk_EzltbrLOos_ZFuyj_5OrXFhvq_qahbIfmc'
+		token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjU0MTM1MDg4LCJleHAiOjE2NTQxNzgyODgsImFjY291bnRJZCI6IjEifQ.wSb1OgO7vfJoRRNe9tHirTAiTd7vHQLsKFU58cQTe84'
 	})
 	return new Promise((resolve, reject)=>{
 		const { url } = options

manifest.json

@@ -49,7 +49,7 @@
     /* 快应用特有相关 */
     "mp-weixin" : {
         /* 小程序特有相关 */
-        "appid" : "wx3a64f97291b0b976",
+        "appid" : "wx77a8a2a23138998b",
         "setting" : {
             "urlCheck" : false
         },

pages.json

@@ -1,5 +1,11 @@
 {
 	"pages": [
+		{
+			"path": "pages/index/index",
+			"style": {
+				"navigationBarTitleText": "首页"
+			}
+		},
         {
             "path" : "pages/login/login",
             "style" :                                                                                    
@@ -16,19 +22,19 @@
                 "enablePullDownRefresh": true
             }
         },
-        {
-            "path" : "pages/products/products",
+		{
+            "path" : "pages/clients/clients",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "产品",
+                "navigationBarTitleText": "客户列表",
                 "enablePullDownRefresh": true
             }
         },
-		{
-            "path" : "pages/clients/clients",
+        {
+            "path" : "pages/products/products",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "客户列表",
+                "navigationBarTitleText": "产品",
                 "enablePullDownRefresh": true
             }
         },
@@ -40,12 +46,6 @@
                 "enablePullDownRefresh": true
             }
         },
-		{
-			"path": "pages/index/index",
-			"style": {
-				"navigationBarTitleText": "首页"
-			}
-		},
 		{
 		    "path" : "pages/clientDetail/clientDetail",
 		    "style" :                                                                                    
@@ -158,15 +158,6 @@
                 "enablePullDownRefresh": false
             }
         }
-        ,{
-            "path" : "pages/agreement/agreement",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
     ],
 	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式（list 的索引项）

pages/addCourse/addCourse.vue

@@ -11,7 +11,7 @@
 		<ul class="list">
 			<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>
+				<image v-if="item.miniProgramPictureAddress" class="icon" :src="item.miniProgramPictureAddress" mode="widthFix"></image>
 				{{ item.productName }}
 			</li>
 		</ul>
@@ -167,7 +167,7 @@
 					marketPrice: e.marketPrice, // 市场单价
 					finalPrice: this.orderType === 2 ? 0 : '', // 成交价
 					discountRate: '', // 折扣率
-					accountNum: '', // 账号数
+					accountNum: e.productType === 2 ? '' : 1, // 账号数
 					totalAmount: '', // 总价
 					isEnable: 1, // 启用否：1启用，0禁用
 					ship: 0, // 发货否（0未发货，1已发货，默认不发货）

pages/agreement/agreement.vue

@@ -1,45 +0,0 @@
-<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

@@ -11,29 +11,33 @@
 			</view>
 		</uni-card>
 		
-		<ul class="list">
-			<li v-for="item in list" @click="toDetail(item)">
-				<view class="name">{{ item.customerName }}</view>	
-				<view class="info">
-					<view class="left">
-						<view class="text">联系人：{{ item.orderContact }}</view>
-						<view class="text">账号：{{ item.account }}</view>
-						<view class="text">产品到期时间：{{ item.expireDate.replace(' 00:00:00', '') }}</view>
-						<view class="text">商务经理：{{ item.account }}</view>
+		<template v-if="list.length">
+			<ul class="list">
+				<li v-for="item in list" @click="toDetail(item)">
+					<view class="name">{{ item.customerName }}</view>	
+					<view class="info">
+						<view class="left">
+							<view class="text">联系人：{{ item.orderContact }}</view>
+							<view class="text">账号：{{ item.account }}</view>
+							<view class="text">产品到期时间：{{ item.expireDate.replace(' 00:00:00', '') }}</view>
+							<view class="text">商务经理：{{ item.account }}</view>
+						</view>
+						<view class="type">
+							{{ menuList[0].detailList.find(e => e.value === item.customerType).title }}客户
+						</view>
 					</view>
-					<view class="type">
-						{{ menuList[0].detailList.find(e => e.value === item.customerType).title }}客户
-					</view>
-				</view>
-			</li>
-		</ul>
-		<uni-load-more :status="status" />
+				</li>
+			</ul>
+			<uni-load-more :status="status" />
+		</template>
+		<empty v-else></empty>
+		
 		<uni-icons class="plus" type="plus-filled" size="60" color="#007eff" @click="$util.to('../clientDetail/clientDetail')"></uni-icons>
 	</view>
 </template>
 
 <script>
-	import { list } from '@/apis/modules/client.js'
+	import { list, all } from '@/apis/modules/client.js'
 	import slFilter from '@/components/sl-filter/sl-filter.vue'
 	export default {
 		data() {
@@ -112,7 +116,8 @@
 		},
 		methods: {
 			getList() {
-				list({
+				const method = this.curTab ? all : list
+				method({
 					businessManagerId: 112,
 					customerType: this.customerType,
 					keywords: this.keyword,
@@ -140,6 +145,7 @@
 			// tab切换
 			tabChange(tab) {
 				this.curTab = tab.id
+				this.initList()
 			},
 			// 跳转详情
 			toDetail(item) {
@@ -165,30 +171,31 @@
 	}
 }
 .list {
-	margin-top: 10px;
+	margin-top: 20rpx;
 	background-color: #fff;
 	li {
-		padding: 10px 20px;
-		border-bottom: 2px solid #f1f1f1;
+		padding: 20rpx 40rpx;
+		border-bottom: 1px solid #f1f1f1;
 	}
-	.name {
-		font-size: 16px;
+	.num {
+		font-size: 32rpx;
 		color: #333;
 	}
 	.info {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		margin-top: 10px;
+		margin-top: 10rpx;
 	}
 	.text {
-		font-size: 13px;
-		line-height: 24px;
+		padding: 8rpx 0;
+		font-size: 26rpx;
 		color: #ccc;
 	}
 	.type {
-		font-size: 14px;
-		color: $uni-primary;
+		font-size: 28rpx;
+		color: #ff7b2d;
+		white-space: nowrap;
 	}
 }
 </style>

pages/detail/detail.vue

@@ -1,14 +1,6 @@
 <template>
-	<view>
-		<uni-card :is-shadow="false" :border="false" is-full>
-			<view class="tool">
-				<view class="download" @click="toPage">下载</view>
-			</view>
-			
-			<view class="content">
-				
-			</view>
-		</uni-card>
+	<view class="page">
+		<web-view :webview-styles="webviewStyles" :src="src"></web-view>
 	</view>
 </template>
 
@@ -16,20 +8,45 @@
 	export default {
 		data() {
 			return {
-				// 跳转
-				toPage() {
-					this.$util.to('../send/send')
-				}
-			};
+				files: [
+					'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220530/docx/1531155187057057792.docx',
+					'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220530/docx/1531156166884220928.docx',
+					'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220601/docx/1531930503312596992.docx', // 人工智能
+					'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220601/docx/1531930756791164928.docx', // 大数据
+					'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220601/docx/1531929864150999040.docx', // 金融科技
+				],
+				src: '',
+				webviewStyles: {
+					progress: {
+						color: '#FF3333'
+					}
+				},
+			}
+		},
+		onShow() {
+			const pages = getCurrentPages()
+			const { options } = 
+			this.src = `http://view.xdocin.com/xdoc?_xdoc=${this.files[pages[pages.length - 1].options.id]}`
+		},
+		methods: {
+			
 		}
 	}
 </script>
 
 <style scoped lang="scss">
-.tool {
-	.download {
-		font-size: 13px;
-		color: #1f83ff;
-	}
+.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/editCourse/editCourse.vue

@@ -125,6 +125,9 @@
 				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 // 使用期限
 				// 计算市场价（课程才需要）
@@ -168,7 +171,7 @@
 				const unit = row.options // 使用期限单位
 				const useUnit = row.periodOfUse // 使用期限
 				let sPrice = ''
-				if (row.settlementMethod === '0') {
+				if (row.settlementMethod == 0) {
 					// 结算单价。计算规则：结算单价（**元/年）*购买时长（单位年）*数量(课程为1，数据为账号数量)
 					const priceUnit = row.settlementPriceUnit
 					sPrice = ((!unit ? 
@@ -235,8 +238,8 @@
 						break
 					}
 					if (e.accountNum === '') {
-						// msg = '请输入数量！'
-						// break
+						msg = '请输入数量！'
+						break
 					}
 					if (e.finalPrice === '') {
 						msg = '请输入成交价！'

pages/index/index.vue

@@ -1,5 +1,9 @@
 <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')">
@@ -14,7 +18,7 @@
 				<image class="icon" src="../../static/image/index/index5.png" mode="widthFix"></image>
 				<view class="text">订单</view>
 			</li>
-			<li>
+			<li @click="$util.to('../products/products')">
 				<image class="icon" src="../../static/image/index/index6.png" mode="widthFix"></image>
 				<view class="text">产品</view>
 			</li>
@@ -23,30 +27,34 @@
 </template>
 
 <script>
+	import { getTeamsByAccountId } from '@/apis/modules/client.js'
 	export default {
 		data() {
 			return {
-				text: ''
+				partnerId: uni.getStorageSync('partnerId') || '',
+				list: [],
 			}
 		},
-		onLoad() {
-			
+		onShow() {
+			this.getInfo()
 		},
 		methods: {
-			login1() {
-				uni.login({
-				  provider: 'weixin',
-				  success: function (loginRes) {
-				    console.log(loginRes);
-				    // 获取用户信息
-				    uni.getUserInfo({
-				      provider: 'weixin',
-				      success: function (infoRes) {
-				        console.log('用户昵称为：' + JSON.stringify(infoRes));
-				      }
-				    });
-				  }
-				});
+			// 获取团队
+			getInfo() {
+				getTeamsByAccountId().then(({ data }) => {
+					const result = []
+					data.map(e => {
+						result.push({
+							text: e.partnerClassificationName,
+							value: e.partnerId
+						})
+					})
+					this.list = result
+				}).catch(e => {})
+			},
+			// 团队选择回调
+			teamChange() {
+				uni.setStorageSync('partnerId', this.partnerId)
 			}
 		}
 	}
@@ -58,6 +66,10 @@
 	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%;
 }

pages/login/login.vue

@@ -21,8 +21,8 @@
 			<view class="agree">
 				<uni-data-checkbox class="check" multiple v-model="agree" :localdata="agreeData"></uni-data-checkbox>
 				同意
-				<text @click="toAgreement(1)">《用户服务协议》</text>
-				<text @click="toAgreement(2)">《用户隐私协议》</text>
+				<text @click="toAgreement(0)">《用户服务协议》</text>
+				<text @click="toAgreement(1)">《用户隐私协议》</text>
 			</view>
 		</view>
 	</view>
@@ -72,7 +72,7 @@
 									if (code) {
 										this.isLogin = true
 										login({ code }).then(({ data }) => {
-											// this.sessionKey = 
+											this.sessionKey = data.sessionKeyOpenId.session_key
 											// uni.setStorageSync('token', userInfo.avatarUrl)
 										}).catch(e => {})
 									} else {
@@ -89,20 +89,17 @@
 					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);
+			onGetPhoneNumber(e){
+				const { encryptedData, iv } = e.detail
+				//获取手机号有两种方法，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)
 			},
 			toAgreement(id) {
-				this.$util.to('../agreement/agreement?id=' + id)
+				this.$util.to('../detail/detail?id=' + id)
 			}
 		}
 	}

pages/orderDetail/orderDetail.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page">
+	<view :class="['page', { show: isDetail }]">
 		<view class="block">
 			<view class="l-title">基本信息</view>
 			<view class="form-list">
@@ -52,7 +52,7 @@
 			</view>
 		</view>
 		
-		<view class="block pro-wrap" v-for="c in courses">
+		<view class="block pro-wrap" v-for="c in courseList">
 			<view class="l-title">{{ c.name }}</view>
 			<uni-icons class="arrow" type="top" size="20" color="#007EFF"></uni-icons>
 			<ul class="pro-list">
@@ -117,7 +117,7 @@
 						<text class="num">{{ profit }}</text>元
 					</view>
 				</view>
-				<view class="btn" @click="submit">提交</view>
+				<view v-if="!isDetail" class="btn" @click="submit">提交</view>
 			</view>
 		</view>
 		
@@ -162,7 +162,7 @@
 					customerName: '',
 					businessManager: ''
 				},
-				courseList: [],
+				courseList: {},
 				courses: [], // 缓存的产品列表
 				purchase: 0,
 				profit: 0,
@@ -243,6 +243,7 @@
 						list: []
 					}
 				}
+				console.log(111, list)
 				// 3个分类的课程分别push到不同数组(0->理论 1-实训 2 数据产品) 
 				list.map(e => {
 					const type = e.productType
@@ -256,6 +257,7 @@
 				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
 			},
 			// 获取客户列表
@@ -382,6 +384,9 @@
 	height: calc(100vh - 300rpx);
 	overflow: auto;
 }
+.show {
+	height: calc(100vh - 130rpx);
+}
 .pro-wrap {
 	position: relative;
 	padding: 0;

pages/orders/orders.vue

@@ -5,34 +5,33 @@
 		</ul>
 		
 		<uni-card :is-shadow="false" :border="false" padding="0" is-full>
-			<uni-search-bar class="search" radius="5" placeholder="请输入姓名、订单号" clearButton="auto" cancelButton="none" />
+			<uni-search-bar class="search" radius="5" placeholder="请输入姓名、订单号" v-model="keyword" clearButton="auto" cancelButton="none" />
 		</uni-card>
 		
 		<view class="filter">
 			<sl-filter :independence="true" :menuList="menuList" @result="result"></sl-filter>
 		</view>
 		
-		<uni-card :is-shadow="false" :border="false" is-full>
-			<view class="list-wrap">
-				<ul class="list">
-					<li @click="toDetail({})">
-						<view class="num">1652163515968</view>
-						<view class="info">
-							<view class="left">
-								<view class="text">客户名称：海文</view>
-								<view class="text">订单金额：海文</view>
-								<view class="text">订单内容：海文</view>
-								<view class="text">下单日期：海文</view>
-							</view>
-							<view class="type">
-								待审核发货
-							</view>
+		<template v-if="list.length">
+			<ul class="list">
+				<li v-for="item in list" @click="toDetail(item)">
+					<view class="num">{{ item.orderNumber }}</view>
+					<view class="info">
+						<view class="left">
+							<view class="text">客户名称：{{ item.customerName }}</view>
+							<view class="text">订单金额：{{ item.orderAmount }}元</view>
+							<view class="text">订单内容：{{ item.orderContent }}</view>
+							<view class="text">下单日期：{{ item.createTime }}</view>
 						</view>
-					</li>
-				</ul>
-				<!-- <empty></empty> -->
-			</view>
-		</uni-card>
+						<view :class="['type', 'type' + item.orderStatus]">
+							{{ menuList[0].detailList.find(e => e.value === item.orderStatus).title }}
+						</view>
+					</view>
+				</li>
+			</ul>
+			<uni-load-more :status="status" />
+		</template>
+		<empty v-else></empty>
 		
 		<uni-icons class="plus" type="plus-filled" size="60" color="#007eff" @click="$util.to('../orderDetail/orderDetail')"></uni-icons>
 	</view>
@@ -40,8 +39,8 @@
 
 <script>
 	import { queryCustomer } from '@/apis/modules/client.js'
+	import { list } from '@/apis/modules/order.js'
 	import slFilter from '@/components/sl-filter/sl-filter.vue'
-	import empty from '@/components/empty/empty.vue'
 	export default {
 		data() {
 			return {
@@ -65,17 +64,17 @@
 				    {
 				        'title': '排序',
 				        'detailTitle': '请选择排序（按下单日期）',
-				        'key': 'key_3',
+				        'key': 'sort',
 				        'isSort': true,
 				        'isMutiple': false,
 				        'detailList': [
 				            {
-				                'title': '顺序',
-				                'value': 1
+				                'title': '倒序',
+				                'value': 'desc'
 				            },
 				            {
-				                'title': '倒序',
-				                'value': 2
+				                'title': '顺序',
+				                'value': 'asc'
 				            }
 				        ]
 				    }
@@ -95,7 +94,8 @@
 				isFilter: 0, // 是否是在筛选。0->否,1->是
 				status: 'more', // 上拉加载状态 more|loading|noMore
 				searchTimer: null,
-				customerType: '',
+				orderStatus: '',
+				sort: 'desc',
 				keyword: '',
 				list: [],
 				page: 1,
@@ -104,13 +104,11 @@
 		},
 		components: {
 			slFilter,
-			empty
 		},
 		watch: {
-			keyword (newName, oldName) {
+			keyword () {
 				clearTimeout(this.searchTimer)
 				this.searchTimer = setTimeout(() => {
-					this.isFilter = 1
 					this.initList()
 				}, 500)
 			}
@@ -135,35 +133,37 @@
 			try {
 				uni.removeStorageSync('courses')
 			} catch (e) {}
-			// this.getList()
+			this.initList()
 		},
 		methods: {
 			getList() {
-				queryCustomer({
-					countries: '中国',
-					provinceId: '',
-					cityId: '',
-					searchContent: this.keyword,
-					page: this.page,
-					size: this.pageSize
-				}).then(({ message }) => {
+				list({
+					businessManagerId: 111,
+					keywords: this.keyword,
+					pageNum: this.page,
+					pageSize: this.pageSize,
+					sort: this.sort,
+					orderStatus: this.orderStatus
+				}).then(({ data }) => {
 					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
-					this.list = (this.reachBottom >= 0 && !this.isFilter) ? [...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
-					this.isFilter = 0 // 获取数据后筛选状态重置为0
 				}).catch(e => {})
 			},
 			initList() {
 				this.page = 1
+				this.reachBottom = 0
 				this.getList()
 			},
 			// 筛选确定回调
 			result(val) {
-				console.log(val)
-				this.customerType = val.customerType
+				console.log(33, val)
+				this.orderStatus = val.orderStatus !== '' ? val.orderStatus : 0
+				this.sort = val.sort || 'desc'
+				this.initList()
 			},
 			// tab切换
 			tabChange(tab) {
@@ -181,27 +181,36 @@
 .filter {
 	margin-bottom: 10px;
 }
-.list-wrap {
-	min-height: calc(100vh - 400rpx);
-}
 .list {
+	margin-top: 20rpx;
+	background-color: #fff;
+	li {
+		padding: 20rpx 40rpx;
+		border-bottom: 1px solid #f1f1f1;
+	}
 	.num {
-		font-size: 16px;
+		font-size: 32rpx;
 		color: #333;
 	}
 	.info {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		margin-top: 10px;
+		margin-top: 10rpx;
 	}
 	.text {
-		font-size: 13px;
+		padding: 8rpx 0;
+		font-size: 26rpx;
 		color: #ccc;
 	}
 	.type {
-		font-size: 14px;
+		margin-left: 20rpx;
+		font-size: 28rpx;
 		color: #ff7b2d;
+		white-space: nowrap;
+	}
+	.type1 {
+		color: #bdbdbd;
 	}
 }
 </style>

pages/plans/plans.vue

@@ -9,28 +9,28 @@
 			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
 		</ul>
 		
-			<ul class="list">
-				<li>
-					<view class="name">金融科技实验方案</view>
-					<view class="block">
-						<view class="info">
-							<view class="line">
-								<view class="label">产品</view>
-								<view class="val">程序设计、量化投资</view>
-							</view>
-							<view class="line">
-								<view class="label">更新日期</view>
-								<view class="val">201212</view>
-							</view>
-							<view class="line">
-								<view class="label">适用专业</view>
-								<view class="val">金融、大数据</view>
-							</view>
+		<ul class="list">
+			<li v-for="(item, i) in list">
+				<view class="name">{{ item.name }}</view>
+				<view class="content">
+					<view class="info">
+						<view class="line">
+							<view class="label">产品</view>
+							<view class="val" v-html="item.product"></view>
+						</view>
+						<view class="line">
+							<view class="label">更新日期</view>
+							<view class="val">{{ item.date }}</view>
+						</view>
+						<view class="line">
+							<view class="label">适用专业</view>
+							<view class="val">{{ item.major }}</view>
 						</view>
-						<view class="detail" @click="toDetail">详情</view>
 					</view>
-				</li>
-			</ul>
+					<view class="detail" @click="toDetail(i + 2)">详情</view>
+				</view>
+			</li>
+		</ul>
 	</view>
 </template>
 
@@ -45,16 +45,69 @@
 						id: 0
 					},
 					{
-						name: '金融科技',
+						name: '标准方案',
 						id: 1
 					},
 					{
-						name: '大数据实验室',
+						name: '智信云方案',
 						id: 2
 					}
+				],
+				list: [],
+				all: [
+					{
+						type: 1,
+						name: '人工智能实验室建设方案-2020.1',
+						product: `python程序设计实验教学系统<br>
+								  Docker技术实验教学系统<br>
+								  JAVA语言程序设计实验教学系统<br>
+						          大数据开发实验教学系统<br>
+						          Openstack云计算实验教学系统`,
+						date: '2022-06-02',
+						major: '人工智能方向'
+					},
+					{
+						type: 1,
+						name: '大数据管理与应用专业建设方案',
+						product: `python程序设计实验教学系统<br>
+								量化投资实验教学系统<br>
+								区块链数字货币交易实验系统<br>
+								大数分析实验教学系统<br>
+								数据可视化实验教学系统<br>
+								大数据实证科研平台<br>
+								全球宏观经济<br>
+								数据库，全球金融交易数据库 `,
+						date: '2022-06-02',
+						major: '大数据方向'
+					},
+					{
+						type: 1,
+						name: '金融科技实验室建设方案V2.0',
+						product: `python程序设计实验教学系统<br>
+								量化投资实验教学系统<br>
+								区块链数字货币交易实验教学系统<br>
+								大数据采集实验教学系统<br>
+								大数据分析实验教学系统<br>
+								金融建模实验教学系统<br>
+								互联网小贷实验教学系统<br>
+								互联网支付实验教学系统<br>
+								R语言实验教学系统<br>
+								供应链金融实验教学系统<br>
+								Python数据清洗实验教学系统<br>
+								数据可视化实验教学系统<br>
+								金融随机过程实验教学系统<br>
+								银行综合系统<br>
+								大数据实证科研平台<br>
+								财经数据库`,
+						date: '2022-06-02',
+						major: '金融科技，大数据方向'
+					}
 				]
 			}
 		},
+		onShow() {
+			this.list = JSON.parse(JSON.stringify(this.all))
+		},
 		methods: {
 			search(res) {
 				uni.showToast({
@@ -65,10 +118,11 @@
 			// tab切换
 			tabChange(tab) {
 				this.curTab = tab.id
+				this.list = this.all.filter(e => e.type === tab.id)
 			},
 			// 跳转详情
-			toDetail() {
-				this.$util.to('../detail/detail')
+			toDetail(id) {
+				this.$util.to('../detail/detail?id=' + id)
 			}
 		}
 	}
@@ -88,38 +142,41 @@
 .list {
 	background-color: #fff;
 	li {
-		padding: 20px;
-		border-bottom: 2px solid #f8f8f8;
+		padding: 40rpx;
+		border-bottom: 1px solid #f8f8f8;
 	}
 	.name {
-		font-size: 14px;
+		font-size: 28rpx;
 		color: #333;
 	}
 	.line {
 		display: flex;
-		margin-bottom: 10px;
+		margin-bottom: 20rpx;
 	}
-	.block {
+	.content {
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		margin-top: 10px;
+		margin-top: 20rpx;
 	}
 	.info {
-		margin: 5px 0;
+		margin: 10rpx 0;
 	}
 	.label {
-		width: 70px;
-		font-size: 12px;
+		width: 140rpx;
+		font-size: 24rpx;
 		color: #898989;
 	}
 	.val {
-		font-size: 12px;
+		font-size: 24rpx;
+		line-height: 1.8;
 		color: #898989;
 	}
 	.detail {
-		font-size: 13px;
+		margin-left: 20rpx;
+		font-size: 26rpx;
 		color: #1f83ff;
+		white-space: nowrap;
 	}
 }
 </style>

pages/products/products.vue

@@ -14,8 +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>
+					<image v-if="item.miniProgramPictureAddress" class="icon" :src="item.miniProgramPictureAddress" mode="widthFix"></image>
 					{{ item.productName }}
 				</view>
 				<view class="info">