From 433cdbe421dc687a7c52d7662018068a3f42cd01 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 30 Jan 2024 17:08:54 +0800
Subject: [PATCH] fix

---
 config/request.js                             |  2 +-
 other/follow/follow.vue                       |  2 +-
 other/procureDetail/procureDetail.vue         |  2 +-
 .../registeredActivity/registeredActivity.vue |  1 +
 other/vouchers/vouchers.vue                   |  9 ++++----
 pages/index/index.vue                         | 16 ++++++++-----
 pages/login/login.vue                         | 23 +++++++++++--------
 pages/person/person.vue                       |  5 ++--
 team/auth/auth.vue                            |  4 +++-
 9 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/config/request.js b/config/request.js
index d57d2ba..aea2d7a 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,7 +5,7 @@
  */
 
 export default {
-  // baseURL: 'http://192.168.31.51:10010/',
+  // baseURL: 'http://192.168.31.217:10010/',
   baseURL: 'http://124.71.79.122/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
diff --git a/other/follow/follow.vue b/other/follow/follow.vue
index 4246f1c..3fa52f9 100644
--- a/other/follow/follow.vue
+++ b/other/follow/follow.vue
@@ -22,7 +22,7 @@
 						</view>
 						<view class="actions">
 							<view class="star" @click.stop="collect(item)">
-								<uni-icons class="star-icon" color="#ffcf47" :type="item.whetherAttention ? 'star' : 'star-filled'" size="25" @click.stop="collect(item)"></uni-icons>
+								<uni-icons class="star-icon" color="#ffcf47" :type="item.whetherAttention ? 'star-filled' : 'star'" size="25" @click.stop="collect(item)"></uni-icons>
 								{{ item.whetherAttention ? '取消关注' : '关注' }}
 							</view>
 							<view class="order" @click.stop="toOrder(item)">我想采购</view>
diff --git a/other/procureDetail/procureDetail.vue b/other/procureDetail/procureDetail.vue
index b513e93..c407974 100644
--- a/other/procureDetail/procureDetail.vue
+++ b/other/procureDetail/procureDetail.vue
@@ -17,7 +17,7 @@
 				<view v-for="(item, i) in info.orderItemDtos" :key="i" class="item">
 					<view class="prod">
 						<view class="name">{{ item.prodName}}</view>
-						<view class="price">￥{{ item.price }}</view>
+						<view class="price">{{ item.price ? '￥' + item.price : '面议' }}</view>
 					</view>
 					<text class="count">{{ item.prodCount }}件</text>
 				</view>
diff --git a/other/registeredActivity/registeredActivity.vue b/other/registeredActivity/registeredActivity.vue
index 1b21fdf..2e6ff5c 100644
--- a/other/registeredActivity/registeredActivity.vue
+++ b/other/registeredActivity/registeredActivity.vue
@@ -38,6 +38,7 @@
 					</uni-swipe-action-item>
 				</uni-swipe-action>
 			</view>
+			<empty v-else text="暂无数据"></empty>
 		</view>
 		
 		<uni-popup ref="popup" type="dialog">
diff --git a/other/vouchers/vouchers.vue b/other/vouchers/vouchers.vue
index 3e40551..920b0af 100644
--- a/other/vouchers/vouchers.vue
+++ b/other/vouchers/vouchers.vue
@@ -2,11 +2,11 @@
 	<view class="page">
 		<ul class="tab-wrap">
 			<scroll-view scroll-x :scroll-left="scrollLeft" class="tab tab-scroll">
-				<li v-for="(tab, i) in tabs" :key="i" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
+				<li v-for="(tab, i) in tabs" :key="i" :class="{active: curTab === tab.id}" @click="tabChange(tab.id)">{{ tab.name }}</li>
 			</scroll-view>
 		</ul>
 		
-		<view class="list">
+		<view v-if="list.length && curTab === 1" class="list">
 			<view v-for="(item, i) in list" :key="i" class="item">
 				<view class="texts">
 					<view class="name">{{ item.competitionName }}</view>
@@ -15,6 +15,7 @@
 				<view :class="['use', {ing: item.status}]" @click.stop="use(item)">{{ item.status === 1 ? '电子入场券' : '使用' }}</view>
 			</view>
 		</view>
+		<empty v-else text="暂无数据"></empty>
 		
 		<uni-popup ref="popup" type="dialog">
 			<view class="sign-popup">
@@ -151,8 +152,8 @@
 				this.info = result
 			},
 			// tab切换
-			tabChange(tab) {
-				this.curTab = tab.id
+			tabChange(id) {
+				this.curTab = id
 				this.initList()
 			},
 			// 展示电子券
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 28a6104..80e1186 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -3,6 +3,7 @@
 		<view class="page">
 			<!-- <view class="bg"></view> -->
 			<view class="search-wrap" :style="{paddingRight: menuBtnInfo.width + 8 + 'px',  paddingTop: menuBtnInfo.top + 'px'}">
+				<image class="logo" src="http://124.71.79.122/images/logo2.png" mode="widthFix"></image>
 				<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="initList" />
 			</view>
 			
@@ -10,7 +11,7 @@
 				<uni-swiper-dot class="swiper" v-if="banners.length" :current="curBanner" :info="banners" field="id" mode="round" :dotsStyles="dotsStyles">
 					<swiper class="swiper-box" autoplay @change="bannerChange">
 						<swiper-item v-for="(item, i) in banners" :key="i">
-							<image class="pic" :src="item.coverUrl"></image>
+							<image class="pic" :src="item.coverUrl" @click="toLink(item, 1)"></image>
 						</swiper-item>
 					</swiper>
 				</uni-swiper-dot>
@@ -26,7 +27,7 @@
 				<uni-swiper-dot class="swiper" v-if="hots.length" :current="curHot" :info="hots" field="id" mode="round" :dotsStyles="dotsStyles1">
 					<swiper class="swiper-box" autoplay @change="hotChange">
 						<swiper-item v-for="(item, i) in hots" :key="i">
-							<image class="hot" :src="item.coverUrl" @click="toLink(item)"></image>
+							<image class="hot" :src="item.coverUrl" @click="toLink(item, 0)"></image>
 						</swiper-item>
 					</swiper>
 				</uni-swiper-dot>
@@ -134,7 +135,6 @@
 		},
 		onShow() {
 			// #ifdef MP-WEIXIN
-			console.log(33, uni.getMenuButtonBoundingClientRect())
 			this.menuBtnInfo = uni.getMenuButtonBoundingClientRect()
 			// .top + 8 + 'px'
 			// #endif
@@ -255,9 +255,9 @@
 				this.curHot = e.detail.current;
 			},
 			// 跳转链接
-			toLink(item) {
-				// details 1: 详情，2：链接
-				if (item.details === '1') {
+			toLink(item, type) {
+				// details 1: 详情，2：链接 (爆款才有详情，banner只有链接)
+				if (item.details === '1' && !type) {
 					this.$util.to('/other/hotDetail/hotDetail?id=' + item.id)
 				} else {
 					// link 1小程序内链接，2外连接
@@ -355,6 +355,10 @@
 /deep/.search-wrap {
 	padding-bottom: 30rpx;
 	background-color: $uni-primary;
+	.logo {
+		width: 70rpx;
+		margin: 0 10rpx 0 10rpx;
+	}
 	.uni-searchbar {
 		padding: 0 10rpx !important;
 	}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 72f13c7..9c441df 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<view class="wrap">
-			<!-- <image class="logo" src="@/static/image/logo.png" mode="widthFix"></image> -->
+			<image class="logo" src="http://124.71.79.122/images/logo1.png" mode="widthFix"></image>
 			<view class="hello">幼教产业B2B产业平台登录</view>
 			<template v-if="isLogin">
 				<button class="btn phone" open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber">
@@ -59,9 +59,9 @@
 			<view class="avatar-wrap">
 				<button class="avatar-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
 				    <image class="avatar" :src="avatar ? avatar : Common.avatar" mode=""></image>
+					<view class="btn">选择头像</view>
 				</button>
-				<view class="text">请选择头像</view>
-				<view class="btn" @click="showPlatform">下一步</view>
+				<view class="next" @click="showPlatform">下一步</view>
 			</view>
 		</uni-popup>
 	</view>
@@ -92,6 +92,7 @@
 				teamName: '',
 				// avatar: Common.avatar,
 				avatar: '',
+				clickNum: 0,
 			}
 		},
 		onShow() {
@@ -320,13 +321,13 @@
 .wrap {
 	position: relative;
 	height: 60vh;
-	padding: 214rpx 74rpx 28rpx;
+	padding: 190rpx 74rpx 28rpx;
 	margin: 0 61rpx;
 	text-align: center;
 	background-color: #fff;
 	border-radius: 20rpx;
 	.logo {
-		width: 393rpx;
+		width: 200rpx;
 	}
 	.hello {
 		margin: 36rpx 0;
@@ -460,13 +461,13 @@
 }
 .avatar-wrap {
 	padding: 30rpx 0;
+	text-align: center;
 	.avatar-btn {
 		padding: 0;
-		line-height: 0;
+		line-height: normal;
 		border: 0 !important;
 		background-color: transparent;
 		outline: none;
-		border-radius: 50%;
 		&:after {
 			display: none;
 		}
@@ -483,16 +484,20 @@
 		text-align: center;
 		color: #7d7d7d;
 	}
-	
 	.btn {
 		width: 300rpx;
 		padding: 20rpx 0;
-		margin: 30rpx auto 0;
+		margin: 5rpx auto 0;
 		font-size: 28rpx;
 		color: #fff;
 		text-align: center;
 		background-color: $uni-primary;
 		border-radius: 20px;
 	}
+	.next {
+		margin-top: 30rpx;
+		font-size: 26rpx;
+		color: #9e9e9e;
+	}
 }
 </style>
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 320b465..da181a8 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -181,7 +181,6 @@
 				},
 				enterInfo: {},
 				headerTop: 0,
-				auditStatus: '',
 				isMember: true, // 成员标识
 				curAccount: {
 					account: ''
@@ -209,6 +208,7 @@
 			// #endif
 			this.platformId = uni.getStorageSync('platformId')
 			this.per = true
+			this.enterInfo = {}
 			this.enterDisabled = 0
 			this.getInfo()
 			this.getEnterInfo()
@@ -238,7 +238,7 @@
 				// 团队信息
 				const org = result.organizationInfoList.filter(e => !e.isEnable)
 				if (org && org.length) {
-					if (this.teams) {
+					if (org.length) {
 						/**
 						 * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
 						 * 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队
@@ -304,7 +304,6 @@
 			async getEnterInfo() {
 				const { data } = await enterpriseCertificationStatus(this.openId)
 				if (data) {
-					this.auditStatus = Common.authenticationStatus.find(e => e.id === data.authenticationStatus).name
 					this.enterInfo = data
 				}
 			},
diff --git a/team/auth/auth.vue b/team/auth/auth.vue
index 04f3df0..f44634d 100644
--- a/team/auth/auth.vue
+++ b/team/auth/auth.vue
@@ -195,7 +195,9 @@
 					uni.hideLoading()
 					this.publicNotice()
 				} catch(e) {
-					uni.hideLoading()
+					setTimeout(() => {
+						uni.hideLoading()
+					}, 1500)
 					this.submiting = false
 				}
 			},