From 9a33def7de2b41adf38455b394cd877c6b0f9832 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 18 Dec 2023 16:14:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/modules/parner.js       |   3 +
 apis/modules/user.js         |  10 +-
 config/request.js            |   4 +-
 manifest.json                |   2 +-
 pages.json                   |   9 --
 pages/index/index.vue        |  15 ++-
 pages/login/login.vue        |   2 +-
 pages/reg/reg.vue            | 187 -----------------------------------
 pages/supplier/supplier.vue  |   2 +-
 team/auth/auth.vue           | 106 ++++++++++++++------
 team/certified/certified.vue |   6 +-
 team/teams/teams.vue         |   8 +-
 12 files changed, 111 insertions(+), 243 deletions(-)
 delete mode 100644 pages/reg/reg.vue

diff --git a/apis/modules/parner.js b/apis/modules/parner.js
index 21e03bb..d4ef5cf 100644
--- a/apis/modules/parner.js
+++ b/apis/modules/parner.js
@@ -44,4 +44,7 @@ export const getPartnerTeamRates = data => {
 // new
 export const getTeamsByPlatformId = data => {
   return get(`nakadai/kindergarten/platformTeamAccount/getTeamsByPlatformId`, data)
+}
+export const platformTeamAccountList = data => {
+  return post(`nakadai/kindergarten/platformTeamAccount/platformTeamAccountList`, data)
 }
\ No newline at end of file
diff --git a/apis/modules/user.js b/apis/modules/user.js
index fc588cb..4f94dfc 100644
--- a/apis/modules/user.js
+++ b/apis/modules/user.js
@@ -13,9 +13,17 @@ export const realNameAuthentication = (data) => {
 export const faceAuthentication = (data) => {
   return post(`users/users/autonym/faceAuthentication?imgFile=${data.imgFile}&side=${data.side}`)
 }
-export const authenticationOrNot = (data) => {
+export const authenticationOrNot = () => {
   return post(`users/users/autonym/authenticationOrNot`)
 }
+export const businessLicensePictureVerification = (imgFile) => {
+  return post(`users/users/autonym/businessLicensePictureVerification?imgFile=${imgFile}`)
+}
+export const creditCodeAuthentication = (data) => {
+  return post(`users/users/autonym/creditCodeAuthentication`, data)
+}
+
+
 
 export const queryProvince = () => {
   return get('nakadai/nakadai/province/queryProvince')
diff --git a/config/request.js b/config/request.js
index 5c6a6d8..ec962e7 100644
--- a/config/request.js
+++ b/config/request.js
@@ -6,8 +6,8 @@
 
 export default {
   // baseURL: 'https://huorantech.cn/',
-  baseURL: 'http://192.168.31.51:10010/',
-  // baseURL: 'http://121.37.12.51/',
+  baseURL: 'http://192.168.31.217:10010/',
+  // baseURL: '124.71.79.122/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
   },
diff --git a/manifest.json b/manifest.json
index 525c715..6d9af7a 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "职站商城",
+    "name" : "GPAC",
     "appid" : "__UNI__2E89BA6",
     "description" : "",
     "versionName" : "1.0.0",
diff --git a/pages.json b/pages.json
index 022a781..433dc1d 100644
--- a/pages.json
+++ b/pages.json
@@ -40,15 +40,6 @@
                 "enablePullDownRefresh": false
             }
         }
-        ,{
-            "path" : "pages/reg/reg",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "",
-                "enablePullDownRefresh": false
-            }
-            
-        }
     ],
 	"subPackages": [
 		{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d8bfaad..9d8478f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,14 +2,14 @@
 	<view :class="[{oh: !per}]">
 		<view class="page">
 			<view class="search-wrap">
-				<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="initList" />
+				<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="initList" @clear="clearKeyword" />
 				<view>
 					<uni-icons type="notification" size="20"></uni-icons>
 				</view>
 			</view>
 			
 			<view class="banner">
-				<image class="pic" src="@/static/image/info-bg.jpg" mode="widthFix"></image>
+				<image class="pic" src="https://occupationlab.com/images/preschoolEdu/index-banner.jpg" mode="widthFix"></image>
 			</view>
 			
 			
@@ -18,7 +18,7 @@
 					<view class="title">爆款推荐</view>
 				</view>
 				
-				<image class="hot" src="@/static/image/info-bg.jpg" mode="widthFix"></image>
+				<image class="hot" src="https://occupationlab.com/images/preschoolEdu/index-hot.jpg"></image>
 			</view>
 			
 			<view class="module">
@@ -174,6 +174,11 @@
 				}
 				this.$set(item, 'signing', signing)
 			},
+			// keyword清除回调
+			clearKeyword() {
+				this.keyword = ''
+				this.initList()
+			},
 			
 			// 跳转活动详情
 			toDetail(item) {
@@ -248,6 +253,10 @@
 		width: 100%;
 	}
 }
+.hot {
+	width: 100%;
+	height: 200rpx;
+}
 .module {
 	margin: 20rpx;
 	padding: 20rpx;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index a15453e..1412ae2 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -14,7 +14,7 @@
 					快捷登录
 				</view>
 			</template>
-				<view class="tips">如果没有账号会自动创建账号</view>
+			<view class="tips">如果没有账号会自动创建账号</view>
 			
 			<view class="agree">
 				<uni-data-checkbox class="check" multiple v-model="agree" :localdata="agreeData"></uni-data-checkbox>
diff --git a/pages/reg/reg.vue b/pages/reg/reg.vue
deleted file mode 100644
index a0611ea..0000000
--- a/pages/reg/reg.vue
+++ /dev/null
@@ -1,187 +0,0 @@
-<template>
-	<view class="page">
-		<image class="logo" src="@/static/image/logo.png" mode="widthFix"></image>
-		<view class="wrap">
-			<view class="hello">
-				{{ form.isTeam ? '或然科技城市合伙人，欢迎回来！' : form.isTeam === 0 ? '请认真填写您的姓名和意向开展业务的区域。创建成功后，我们将会有区域运营与您联系沟通后续事宜。' : '欢迎加入或然城市合伙人计划！请认真填写您的姓名和意向开展业务的区域。注册后，我们将会有区域运营与您联系沟通后续事宜。'}}
-			</view>
-			<view>
-				<uni-forms>
-					<uni-forms-item label="姓名">
-						<uni-easyinput type="text" v-model="form.userName" placeholder="请输入姓名" :disabled="exist" />
-					</uni-forms-item>
-					<uni-forms-item label="业务省份">
-						<view v-if="form.isTeam" class="location">{{ form.provinceName }}</view>
-						<uni-data-picker v-else placeholder="请选择省份" popup-title="请选择省份" preload :localdata="provinces" :map="{text: 'provinceName', value: 'provinceId'}" v-model="form.provinceId" @change="getCity"></uni-data-picker>
-					</uni-forms-item>
-					<uni-forms-item label="业务城市">
-						<view v-if="form.isTeam" class="location">{{ form.cityName }}</view>
-						<uni-data-picker v-else placeholder="请选择城市" popup-title="请选择城市" preload :localdata="cities" :map="{text: 'cityName', value: 'cityId'}" v-model="form.cityId"></uni-data-picker>
-					</uni-forms-item>
-				</uni-forms>
-				<view class="btns">
-					<button type="primary" @click="submit">{{ form.isTeam ? '登录' : form.isTeam === 0 ? '确定' : '注册' }}</button>
-					<button @click="back">取消</button>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import { queryPartnerAccount, queryProvince, queryCity, partnerAccountApplication, loginByOpenid, checkWorkNumOrAccount } from '@/apis/modules/user.js'
-	export default {
-		data() {
-			return {
-				openid: '',
-				phone: '',
-				my: false,
-				form: {
-					userName: '',
-					provinceId: '',
-					cityId: '',
-				},
-				accountRepeat: false,
-				provinces: [],
-				cities: [],
-				exist: false
-			}
-		},
-		onShow() {
-			const pages = getCurrentPages()
-			const { options } = pages[pages.length - 1]
-			this.openid = options.openid
-			this.phone = options.phone
-			this.my = options.my
-			this.getProvince()
-			this.checkLogin()
-		},
-		methods: {
-			// 检查登录状态
-			checkLogin() {
-				// 根据手机号获取是否注册过，如果有，则判断是否是队长（isTeam 1：队长，0：成员），如果没有返回team，则注册
-				queryPartnerAccount(this.phone).then(({ team, username }) => {
-					if (team) {
-						team.teamId && uni.setStorageSync('teamId', team.teamId)
-						this.form.userName = team.userName
-						if (team) this.exist = true
-						if (team.isTeam) {
-							this.form = team
-							this.getCity()
-						} else {
-							this.form.isTeam = 0
-							if (team.userName) this.form.userName = team.userName
-						}
-					} else if (username) { // 没有团队，只有username
-						this.form.userName = username
-					}
-				}).catch(e => {})
-			},
-			// 获取省份
-			getProvince() {
-				queryProvince().then(({ list }) => {
-					this.provinces = list
-				}).catch(res => {})
-			},
-			// 获取城市
-			getCity(val) {
-				if (this.form.provinceId) {
-					queryCity({
-						provinceId: this.form.provinceId
-					}).then(({ list }) => {
-						this.cities = list
-					}).catch(res => {})
-				} else {
-					this.cities = []
-				}
-				if (val) this.form.cityId = ''
-			},
-			// 提交
-			submit() {
-				const { form } = this
-				if (!form.userName) return this.$util.errMsg('请输入姓名！')
-				if (!form.provinceId) return this.$util.errMsg('请选择意向省份！')
-				if (!form.cityId) return this.$util.errMsg('请选择意向城市！')
-				form.phone = this.phone
-				form.appOpenId = this.openid
-				form.uniqueIdentification = Date.now()
-				if (form.isTeam) { // 队长，直接登录
-					loginByOpenid(this.openid).then(({ data }) => {
-						uni.setStorageSync('token', data.token)
-						this.toIndex()
-					}).catch(res => {})
-				} else { // 新用户，注册。or 成员，创建自己的团队
-					partnerAccountApplication(form).then(({ token, teamId }) => {
-						this.$util.sucMsg(form.isTeam === 0 ? '创建成功' : '注册成功')
-						// 如果返回了token，直接登录，并且把teamId存在缓存里，到了首页后直接选中该团队
-						if (token) {
-							teamId && uni.setStorageSync('teamId', teamId)
-							uni.setStorageSync('token', token)
-							setTimeout(() => {
-								this.toIndex()
-							}, 1500)
-						} else {
-							setTimeout(() => {
-								uni.redirectTo({
-									url: '../login/login'
-								})
-							}, 1500)
-						}
-					}).catch(res => {})
-				}
-			},
-			// 跳转到首页
-			toIndex() {
-				uni.reLaunch({
-					url: this.my ? '../person/person' : '../index/index'
-				})
-			},
-			// 返回
-			back() {
-				uni.navigateBack()
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-.page {
-	min-height: 100%;
-	text-align: center;
-	background: url(@/static/image/login1.png) 0 0/175rpx auto no-repeat,
-		url(@/static/image/login2.png) bottom right/123rpx auto no-repeat;
-	.logo {
-		width: 393rpx;
-		margin: 100rpx 0 60rpx;
-	}
-}
-.wrap {
-	position: relative;
-	padding: 60rpx;
-	margin: 0 61rpx;
-	text-align: center;
-	border-radius: 8rpx;
-	background-color: #fff;
-	.hello {
-		margin-bottom: 30rpx;
-		font-size: 28rpx;
-		color: #333;
-	}
-	.btns {
-		display: flex;
-		button {
-			width: 200rpx;
-			font-size: 30rpx;
-		}
-	}
-	.location {
-		padding-left: 10px;
-		line-height: 38px;
-		font-size: 14px;
-		color: #D5D5D5;
-		border: 1px solid #e5e5e5;
-		background-color: #F7F6F6;
-		border-radius: 4px;
-	}
-}
-</style>
diff --git a/pages/supplier/supplier.vue b/pages/supplier/supplier.vue
index 45da0e8..25cb42b 100644
--- a/pages/supplier/supplier.vue
+++ b/pages/supplier/supplier.vue
@@ -5,7 +5,7 @@
 				<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="searchConfirm" />
 			</view>
 			
-			<image class="banner" src="@/static/image/info-bg.jpg" mode="widthFix"></image>
+			<image class="banner" src="https://occupationlab.com/images/preschoolEdu/supplier-banner.jpg" mode="widthFix"></image>
 			
 			<view class="wrap">
 				<sideSelect :menus="menus" @menuClick="menuClick" />
diff --git a/team/auth/auth.vue b/team/auth/auth.vue
index df0dc30..a254939 100644
--- a/team/auth/auth.vue
+++ b/team/auth/auth.vue
@@ -1,35 +1,35 @@
 <template>
 	<view class="page">
+		<view class="block">
+			<view class="title">上传营业执照</view>
+			<image class="credential" :src="businessLicense" mode="widthFix" @click="uploadBusinessLicense"></image>
+		</view>
+		
+		<view v-if="isPreschool" class="block">
+			<view class="title">上传办学许可证</view>
+			<image class="credential" src="https://occupationlab.com/images/preschoolEdu/credentials2.png" mode="widthFix"></image>
+		</view>
+		
 		<view class="block">
 			<view class="form-list">
 				<view class="line with-arrow">
-					<view class="name">幼儿园名称</view>
-					<input type="text" placeholder="请输入幼儿园名称" />
+					<view class="name">{{ platformName }}名称</view>
+					<input type="text" :placeholder="'请输入' + platformName + '名称'" v-model="form.comapnyName" />
 					<uni-icons type="right" size="18" color="#ababab"></uni-icons>
 				</view>
 				<view class="line with-arrow">
 					<view class="name">统一社会信用代码</view>
-					<input type="text" placeholder="请输入证件号码" />
+					<input type="text" placeholder="请输入证件号码" v-model="form.creditCode" />
 					<uni-icons type="right" size="18" color="#ababab"></uni-icons>
 				</view>
 				<view class="line with-arrow">
 					<view class="name">法人</view>
-					<input type="text" placeholder="请输入法人" />
+					<input type="text" placeholder="请输入法人" v-model="form.legalPerson" />
 					<uni-icons type="right" size="18" color="#ababab"></uni-icons>
 				</view>
 			</view>
 		</view>
 		
-		<view class="block">
-			<view class="title">上传营业执照</view>
-			<image class="credential" :src="yy" mode="widthFix" @click="uploadYY"></image>
-		</view>
-		
-		<view class="block">
-			<view class="title">上传办学许可证</view>
-			<image class="credential" src="https://occupationlab.com/images/preschoolEdu/credentials2.png" mode="widthFix"></image>
-		</view>
-		
 		<view class="btn-wrap">
 			<view class="btn" @click="submit">认证信息</view>
 		</view>
@@ -37,43 +37,85 @@
 </template>
 
 <script>
-	import { my } from '@/apis/modules/parner.js'
+	import { creditCodeAuthentication, businessLicensePictureVerification } from '@/apis/modules/user.js'
 	import OSS from '@/libs/Oss/upload'
 	export default {
 		data() {
 			return {
-				img: '',
-				yy: 'https://occupationlab.com/images/preschoolEdu/credentials1.png'
+				form: {
+					comapnyName: '',
+					creditCode: '',
+					legalPerson: '',
+				},
+				platformId: uni.getStorageSync('platformId'),
+				businessLicense: 'https://occupationlab.com/images/preschoolEdu/credentials1.png'
 			}
 		},
+		computed: {
+			// 幼儿园
+			isPreschool() {
+				return this.platformId === 5
+			},
+			// 平台名字
+			platformName() {
+				return this.platformId === 6 ? '供应商' : this.platformId === 5 ? '幼儿园' : ''
+			},
+		},
 		onShow() {
-			// this.getInfo()
+			
 		},
 		methods: {
-			// 获取个人信息
-			getInfo() {
-				const { partnerId, teamId } = uni.getStorageSync('team')
-				my({
-					partnerId,
-					teamId
-				}).then(({ my }) => {
-					this.info = my.info
-				}).catch(e => {})
-			},
 			// 上传营业执照
-			uploadYY() {
+			uploadBusinessLicense() {
+				const that = this
+				uni.chooseImage({
+					success: (res) => {
+						const file = res.tempFilePaths[0];
+						OSS(file, async (name) => {
+							that.businessLicense = name
+							const { data } = await businessLicensePictureVerification(name)
+							if (data) {
+								that.form = {
+									comapnyName: data.name,
+									creditCode: data.reg_num,
+									legalPerson: data.person,
+									address: data.address,
+									business: data.business,
+									capital: data.capital,
+									establish_date: data.establish_date,
+									type: data.type,
+									valid_period: data.valid_period,
+								}
+							}
+						})
+					}
+				});
+			},
+			// 上传办学许可证
+			uploadBack() {
 				const that = this
 				uni.chooseImage({
 					success: (res) => {
 						const file = res.tempFilePaths[0];
-						OSS(file, (name) => {
-							that.yy = name
+						OSS(file, async (name) => {
+							that.reverseOfIDCard = name
 						})
 					}
 				});
 			},
 			submit() {
-				
+				const { form } = this
+				if (!form.comapnyName) return this.$util.errMsg(`请输入${platformName}名称！`)
+				if (!form.creditCode) return this.$util.errMsg('请输入统一社会信用代码！')
+				if (!form.legalPerson) return this.$util.errMsg('请输入法人！')
+				creditCodeAuthentication(form).then(res => {
+					this.$util.sucMsg('认证成功！')
+					setTimeout(() => {
+						uni.switchTab({
+							url: '/pages/person/person'
+						})
+					}, 1500)
+				}).catch(e => {})
 			},
 		}
 	}
diff --git a/team/certified/certified.vue b/team/certified/certified.vue
index 971cec0..0142ff5 100644
--- a/team/certified/certified.vue
+++ b/team/certified/certified.vue
@@ -8,15 +8,15 @@
 			<view class="form-list">
 				<view class="line">
 					<view class="name">幼儿园名称</view>
-					<view class="val">测试测试</view>
+					<view class="val">梅林一村幼儿园</view>
 				</view>
 				<view class="line">
 					<view class="name">统一社会信用代码</view>
-					<view class="val">测试测试</view>
+					<view class="val">124403004557455223O</view>
 				</view>
 				<view class="line">
 					<view class="name">法人</view>
-					<view class="val">测试测试</view>
+					<view class="val">谢韵</view>
 				</view>
 			</view>
 		</view>
diff --git a/team/teams/teams.vue b/team/teams/teams.vue
index c48205c..8642c95 100644
--- a/team/teams/teams.vue
+++ b/team/teams/teams.vue
@@ -32,11 +32,12 @@
 </template>
 
 <script>
-	import { teamList } from '@/apis/modules/parner.js'
+	import { platformTeamAccountList } from '@/apis/modules/parner.js'
 	export default {
 		data() {
 			return {
 				isTeam: uni.getStorageSync('team').isTeam == 1, // 成员不能显示邀请按钮
+				platformId: uni.getStorageSync('platformId'),
 				per: true, // 是否有权限
 				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
 				status: 'more', // 上拉加载状态 more|loading|noMore
@@ -80,12 +81,13 @@
 				uni.showLoading({
 					title: '加载中'
 				})
-				teamList({
+				platformTeamAccountList({
 					type: 1,
 					pageNum: this.page,
 					pageSize: this.pageSize,
 					keyWord: this.keyword,
-					partnerClassificationId: uni.getStorageSync('team').teamId
+					platformId: this.platformId,
+					classificationId: uni.getStorageSync('team').teamId
 				}).then(({ pageList }) => {
 					uni.hideLoading()
 					const { records } = pageList