From 8d7d86cd7eaedd5f2e04a4e3ea04147d80d9866e Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 29 Dec 2023 15:18:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E4=BA=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/request.js                       |  5 ++---
 libs/share.js                           |  6 +++---
 other/activityDetail/activityDetail.vue | 12 ++++++++++--
 pages/person/person.vue                 | 19 ++++++++++---------
 pages/supplier/supplier.vue             |  7 +++++--
 team/auth/auth.vue                      | 24 ++++++++++++++++++++----
 6 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/config/request.js b/config/request.js
index df4cc58..aea2d7a 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,9 +5,8 @@
  */
 
 export default {
-  // baseURL: 'https://huorantech.cn/',
-  baseURL: 'http://192.168.31.217:10010/',
-  // baseURL: 'http://124.71.79.122/',
+  // baseURL: 'http://192.168.31.217:10010/',
+  baseURL: 'http://124.71.79.122/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
   },
diff --git a/libs/share.js b/libs/share.js
index a8d0166..f8dc185 100644
--- a/libs/share.js
+++ b/libs/share.js
@@ -3,7 +3,7 @@ export default{
     onShareAppMessage() {
         // 设置转发的参数
         return {
-            title: "职站商城",
+            title: "GPAC",
             // path: '',
             imageUrl: "",
             success: function(res) {
@@ -19,7 +19,7 @@ export default{
     // 分享到朋友圈
     onShareTimeline:function(res){
         return {
-          title: '职站商城',
+          title: 'GPAC',
           // imageUrl:'/static/image/phone.png',
           query:''      
         }
@@ -27,7 +27,7 @@ export default{
     // 收藏
     onAddToFavorites:function(res) {
         return {
-          title: '职站商城',
+          title: 'GPAC',
           // imageUrl:'/static/image/phone.png',
           query: '',
         }
diff --git a/other/activityDetail/activityDetail.vue b/other/activityDetail/activityDetail.vue
index 20c326f..4d4f943 100644
--- a/other/activityDetail/activityDetail.vue
+++ b/other/activityDetail/activityDetail.vue
@@ -44,7 +44,7 @@
 		<view v-if="!curTab" class="detail">
 			<mp-html :content="form.description"/>
 		</view>
-		<view v-else class="list">
+		<view v-else-if="curTab === 2" class="list">
 			<view v-for="(item, i) in list" :key="i" class="item" @click="toDetail(item)">
 				<view class="top">
 					<image class="avatar" :src="item.userAvatars || Common.avatar"></image>
@@ -54,7 +54,7 @@
 		</view>
 		
 		<view class="btns">
-			<view class="btn share">分享</view>
+			<button class="share" open-type="share">分享</button>
 			<view :class="['btn sign', {signed: form.signed, disabled: !form.signing}]" @click="presign">{{ form.signed ? '取消报名' : '立刻报名' }}</view>
 		</view>
 		
@@ -257,6 +257,7 @@
 .banner {
 	.pic {
 		width: 100%;
+		max-height: 500rpx;
 	}
 }
 .info {
@@ -333,9 +334,16 @@
 		text-align: center;
 	}
 	.share {
+		width: 200rpx;
+		margin: 0;
+		font-size: 28rpx;
+		color: #fff;
+		text-align: center;
 		background-color: #75b4ff;
+		border-radius: 0;
 		border-top-left-radius: 40rpx;
 		border-bottom-left-radius: 40rpx;
+		border: 0;
 	}
 	.sign {
 		background-color: $uni-primary;
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 8982df8..9605e5a 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -203,6 +203,7 @@
 			// #ifdef MP-WEIXIN
 			this.headerTop = uni.getMenuButtonBoundingClientRect().top + 8 + 'px'
 			// #endif
+			this.platformId = uni.getStorageSync('platformId')
 			this.per = true
 			this.getInfo()
 			if (this.platformId !== 7) {
@@ -216,15 +217,15 @@
 				const { result } = await viewUserDetails({
 					openId: this.openId
 				})
-				// status为false，说明用户被删除了，则退出登录
-				// if (result.status === false) {
-				// 	this.$util.errMsg(result.message)
-				// 	setTimeout(() => {
-				// 		uni.clearStorageSync()
-				// 		this.$util.to('/pages/login/login')
-				// 	}, 1500)
-				// 	return false
-				// }
+				// status为true，说明用户被删除了，则退出登录
+				if (result.status === true) {
+					this.$util.errMsg(result.message)
+					setTimeout(() => {
+						uni.clearStorageSync()
+						this.$util.to('/pages/login/login')
+					}, 1500)
+					return false
+				}
 				
 				if (result.hrUserInfo) {
 					if (!result.hrUserInfo.userAvatars) result.hrUserInfo.userAvatars = Common.avatar // 没有头像则显示默认头像
diff --git a/pages/supplier/supplier.vue b/pages/supplier/supplier.vue
index d4d088a..e98c498 100644
--- a/pages/supplier/supplier.vue
+++ b/pages/supplier/supplier.vue
@@ -114,6 +114,7 @@
 			}
 		},
 		onShow() {
+			this.active = ''
 			this.keyword = ''
 			this.per = true
 			this.typeVisible = false
@@ -138,6 +139,7 @@
 					pageSize: this.pageSize,
 					platformSource: 6,
 					keyWord: this.keyword,
+					supplierClassificationId: this.active,
 				}).then(async ({ data }) => {
 					this.list = this.reachBottom > 0 ? [...this.list, ...data.records] : data.records
 					this.page++ // 每次获取了数据后page+1
@@ -155,9 +157,10 @@
 				this.classifications = list[0].children
 			},
 			// 分类点击回调
-			classificationClick(item, query) {
+			classificationClick(item) {
 				this.active = item.id
-				query && this.initList()
+				this.typeVisible = false
+				this.initList()
 			},
 			// 关闭分类弹框
 			closeType() {
diff --git a/team/auth/auth.vue b/team/auth/auth.vue
index f6e01a0..cbe6f28 100644
--- a/team/auth/auth.vue
+++ b/team/auth/auth.vue
@@ -37,7 +37,7 @@
 </template>
 
 <script>
-	import { creditCodeAuthentication, businessLicensePictureVerification, updateTeamInfo, organizationCertification, kindergartenWeChatApplication } from '@/apis/modules/user.js'
+	import { enterpriseCertificationStatus, creditCodeAuthentication, businessLicensePictureVerification, updateTeamInfo, organizationCertification, kindergartenWeChatApplication } from '@/apis/modules/user.js'
 	import OSS from '@/libs/Oss/upload'
 	export default {
 		data() {
@@ -67,8 +67,21 @@
 			const pages = getCurrentPages()
 			const { options } = pages[pages.length - 1]
 			this.platformId = +options.platformId
+			this.getEnterInfo()
 		},
 		methods: {
+			// 企业认证信息
+			async getEnterInfo() {
+				const res = await enterpriseCertificationStatus(this.openId)
+				if (res.data) {
+					const { data } = res
+					this.businessLicensePicture = data.businessLicensePicture || ''
+					this.licenseForRunningSchool = data.licenseForRunningSchool || ''
+					this.form.companyName = data.companyName || ''
+					this.form.creditCode = data.creditCode || ''
+					this.form.legalPerson = data.legalPerson || ''
+				}
+			},
 			// 上传营业执照
 			uploadBusinessLicense() {
 				const that = this
@@ -114,10 +127,13 @@
 				uni.requestSubscribeMessage({
 					tmplIds: ['ZB6wTenlv13mivxXwi-DWwjgVoNJ6eUr1vBvNdQGbJw'],
 					success: (res) => {
-						that.$util.sucMsg('提交成功，请重新登录！')
+						uni.setStorageSync('platformId', that.platformId)
+						const name = that.platformId == 6 ? '供应商' : '幼儿园'
+						that.$util.sucMsg(`您已成功提交${name}认证，现在为您切换到${name}端。`)
 						setTimeout(() => {
-							uni.clearStorageSync()
-							that.$util.to('/pages/login/login')
+							uni.switchTab({
+								url: '/pages/person/person'
+							})
 						}, 1500)
 					},
 					fail: function(err) {