Merge pull request '优化样式' (#70) from dengjie into dev

Reviewed-on: http://git.hchyun.com/feashow/pupil/pulls/70
2023-01-30 16:15:38 +00:00
parent 71cf2cd646 6445aa4783
commit 4977c34b5f
10 changed files with 113 additions and 227 deletions
--- a/components/myAvatar/myAvatar.vue
+++ b/components/myAvatar/myAvatar.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="my_avatar">
 		<view style="border-radius: 50rpx;">
-			<u-avatar :src="avatar" size="100rpx" shape="circle"></u-avatar>
+			<u-avatar :src="avatar" size="100rpx" shape="circle" @click="changeAvatar()"></u-avatar>
 		</view>
 		<view style="margin-top: 10rpx;margin-bottom: 4rpx;">
 			<u--image v-if="member=='2'" :src="normal" width="84rpx" height="30rpx">
@@ -10,15 +10,21 @@
 			</u--image>
 		</view>
 		<view style="display: flex;align-items: center;">
-			<text>{{nickname}}</text>
+			<text @click="changeAvatar()">{{nickname}}</text>
 			<u--image v-if="showEdit==true" src="/static/my/wd_icon_bj.png" width="22rpx" height="22rpx"
 				@click="changeAvatar()">
 			</u--image>
 		</view>
+		<view style="margin:0 20rpx;">
+			<u-overlay :show="!isLoad">
+				<login @success="reOnLoad()" @fail="failToLoad()"></login>
+			</u-overlay>
+		</view>
 	</view>
 </template>

 <script>
+	import login from 'pages/my/login/login'
 	export default {
 		name: "myAvatar",
 		props: {
@@ -27,6 +33,9 @@
 				default: ''
 			}
 		},
+		components: {
+			login
+		},
 		data() {
 			return {
 				member: false,
@@ -35,6 +44,7 @@
 				nickname: '用户',
 				normal: '/static/my/wo_icon_pthy.png',
 				VIP: '/static/my/wo_icon_vip.png',
+				isLoad: true,
 			};
 		},
 		created() {
@@ -42,6 +52,14 @@
 				this.showEdit = false
 			}
 			this.getUser()
+			if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
+				this.isLoad = false
+				// uni.navigateTo({
+				// 	url: '../../pages/my/login/login'
+				// })
+				return
+			}
+			this.isLoad = true
 		},
 		options: {
 			styleIsolation: 'shared', // 解除样式隔离
@@ -56,12 +74,33 @@
 			//获取头像昵称和普通会员和VIP会员
 			getUser() {
 				this.$apiServe.getUser().then(res => {
-					console.log('个人信息==', res.data.data);
+					console.log('个人信息==', res.data);
+					if (res.data.msg == "登录超时，请重新登录") {
+						this.isLoad = false
+					}
 					var data = res.data.data
 					this.avatar = data.avatar
 					this.nickname = data.nickname
 					this.member = data.member
 				}).finally(_ => {})
+			},
+			reOnLoad() {
+				if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
+					this.$toast.warn('登录失败请重试')
+					this.isLoad = false
+					// uni.navigateTo({
+					// 	url: '../../pages/my/login/login'
+					// })
+					return
+				}
+				this.isLoad = true
+				this.$refs.myavatar.getUser()
+			},
+			failToLoad() {
+				// uni.navigateBack({
+				// 	url: '/pages/my/my'
+				// })
+				this.$toast.warn('登录失败请重试')
 			}
 		}
 	}
--- a/components/productsBtn/productsBtn.vue
+++ b/components/productsBtn/productsBtn.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view class="products_box">
 			<u-grid :border="false" col="2">
-				<u-grid-item v-for="(item,index) in productList" :key="index">
+				<u-grid-item v-for="(item,index) in productList" :key="index" @click="toDetailPage(item)">
 					<u-image src="/static/products/sy_bb.png" width="354rpx" height="539rpx" :lazy-load="true">
 					</u-image>
 					<view class="bgContent">
@@ -29,16 +29,12 @@
 							</view>
 						</view>
 					</view>
-
 					<u-button v-if="type==1" type="success" text="取消收藏" color="#0EBB5B" @click="cancelCollect(item)">
 					</u-button>
 					<u-button v-if="type==2" type="success" text="移除" color="#0EBB5B" @click="deleteProduct(item)">
 					</u-button>
 				</u-grid-item>
 			</u-grid>
-			<!-- 	<u-modal :show="showM" :content="content" showCancelButton closeOnClickOverlay="false" @confirm="confirm"
-				@cancel="cancel">
-			</u-modal> -->
 			<view style="font-size: 24rpx;color: #A3A3A3;text-align: center;padding: 26rpx 0;"
 				v-if="type==1&&productList.length==0">
 				暂无更多收藏记录</view>
@@ -133,6 +129,12 @@
 					}
 				})
 			},
+			//点击图片跳转到详情页
+			toDetailPage(item) {
+				uni.navigateTo({
+					url: '/pages/detail/productsDetail/productsDetail?id=' + item.id
+				})
+			}
 		}
 	}
 </script>
--- a/packageMy/bindCompany/bindCompany.vue
+++ b/packageMy/bindCompany/bindCompany.vue
@@ -6,40 +6,20 @@
 		<u-modal :show="showM" closeOnClickOverlay="false" confirmText="确定" @confirm="confirm">
 			<rich-text :nodes="content"></rich-text>
 		</u-modal>
-		<view style="margin:0 20rpx;">
-			<u-overlay :show="!isLoad">
-				<login @success="reOnLoad()" @fail="failToLoad()"></login>
-			</u-overlay>
-		</view>
 	</view>
 </template>

 <script>
-	import login from 'pages/my/login/login'
 	export default {
-		components: {
-			login
-		},
 		data() {
 			return {
 				name: '',
 				phone: '',
 				showM: false,
 				content: `您的申请已提交<br>
-								   请静待人工审核`,
-				isLoad: true,
+								   请静待人工审核`
 			}
 		},
-		onLoad() {
-			if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-				this.isLoad = false
-				// uni.navigateTo({
-				// 	url: '../../pages/my/login/login'
-				// })
-				return
-			}
-			this.isLoad = true
-		},
 		methods: {
 			handleSureClick() {
 				let name = this.$refs.nameAndphone.model.userInfo.name
@@ -63,22 +43,7 @@
 				// uni.switchTab({
 				// 	url: '/pages/my/my'
 				// })
-			},
-			reOnLoad() {
-				if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-					this.$toast.warn('登录失败请重试')
-					this.isLoad = false
-					// uni.navigateTo({
-					// 	url: '../../pages/my/login/login'
-					// })
-					return
-				}
-				this.isLoad = true
-			},
-			failToLoad() {
-				this.$toast.warn('登录失败请重试')
 			}
-
 		}
 	}
 </script>
--- a/packageMy/browseHistory/browseHistory.vue
+++ b/packageMy/browseHistory/browseHistory.vue
@@ -1,52 +1,16 @@
 <template>
 	<view>
 		<productsBtn :type="2" ref="browseHistory"></productsBtn>
-		<!-- <view style="margin:0 20rpx;">
-			<u-overlay :show="!isLoad">
-				<login @success="reOnLoad()" @fail="failToLoad()"></login>
-			</u-overlay>
-		</view> -->
 	</view>
 </template>

 <script>
-	import login from 'pages/my/login/login'
 	export default {
-		components: {
-			login
-		},
 		data() {
 			return {
-				type: '',
-				isLoad: true,
+				type: ''
 			}
 		},
-		onLoad() {
-			if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-				this.isLoad = false
-				// uni.navigateTo({
-				// 	url: '../../pages/my/login/login'
-				// })
-				return
-			}
-			this.isLoad = true
-		},
-		methods: {
-			reOnLoad() {
-				if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-					this.$toast.warn('登录失败请重试')
-					this.isLoad = false
-					// uni.navigateTo({
-					// 	url: '../../pages/my/login/login'
-					// })
-					return
-				}
-				this.isLoad = true
-				this.$refs.browseHistory.getHistoryOrCollection()
-			},
-			failToLoad() {
-				this.$toast.warn('登录失败请重试')
-			}
-		}
+		methods: {}
 	}
 </script>
--- a/packageMy/changeAvatar/changeAvatar.vue
+++ b/packageMy/changeAvatar/changeAvatar.vue
@@ -14,11 +14,6 @@
 			<view style="height: 230rpx;"></view>
 			<u-button type="success" text="确定" color="#0EBB5B" @click="handleSubmit()"></u-button>
 		</view>
-		<view style="margin:0 20rpx;">
-			<u-overlay :show="!isLoad">
-				<login @success="reOnLoad()" @fail="failToLoad()"></login>
-			</u-overlay>
-		</view>
 	</view>
 </template>

@@ -26,11 +21,7 @@
 	import {
 		apiService
 	} from '../../service/request'
-	import login from 'pages/my/login/login'
 	export default {
-		components: {
-			login
-		},
 		data() {
 			return {
 				avatar: '',
@@ -39,26 +30,17 @@
 					userInfo: {
 						name: ''
 					},
-				},
-				isLoad: true,
+				}
 			}
 		},
 		onLoad() {
 			this.getUser()
-			if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-				this.isLoad = false
-				// uni.navigateTo({
-				// 	url: '../../pages/my/login/login'
-				// })
-				return
-			}
-			this.isLoad = true
 		},
 		methods: {
 			//获取头像昵称
 			getUser() {
 				this.$apiServe.getUser().then(res => {
-					// console.log('头像昵称', res.data);
+					console.log('头像昵称', res.data);
 					var data = res.data.data
 					this.avatar = data.avatar
 					this.model.userInfo.name = data.nickname
@@ -114,23 +96,6 @@
 						url: '/pages/my/my'
 					})
 				}).finally(_ => {})
-			},
-			reOnLoad() {
-				if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-					this.$toast.warn('登录失败请重试')
-					this.isLoad = false
-					// uni.navigateTo({
-					// 	url: '../../pages/my/login/login'
-					// })
-					return
-				}
-				this.isLoad = true
-			},
-			failToLoad() {
-				// uni.navigateBack({
-				// 	url: '/pages/my/my'
-				// })
-				this.$toast.warn('登录失败请重试')
 			}
 		}
 	}
--- a/packageMy/memberCenter/memberCenter.vue
+++ b/packageMy/memberCenter/memberCenter.vue
@@ -13,26 +13,16 @@
 		<u-modal :show="showM" closeOnClickOverlay="false" confirmText="确定" @confirm="confirm">
 			<rich-text :nodes="content"></rich-text>
 		</u-modal>
-		<!-- <view style="margin:0 20rpx;">
-			<u-overlay :show="!isLoad">
-				<login @success="reOnLoad()" @fail="failToLoad()"></login>
-			</u-overlay>
-		</view> -->
 	</view>
 </template>

 <script>
-	import login from 'pages/my/login/login'
 	export default {
-		components: {
-			login
-		},
 		data() {
 			return {
 				name: '',
 				phone: '',
 				showM: false,
-				isLoad: true,
 				//会员中心的用户名旁边不显示edit图标
 				show: false,
 				content: `请保持手机畅通<br>
@@ -40,16 +30,6 @@
 				commitment: '承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置承诺声明预留文字位置'
 			}
 		},
-		onLoad() {
-			if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-				this.isLoad = false
-				// uni.navigateTo({
-				// 	url: '../../pages/my/login/login'
-				// })
-				return
-			}
-			this.isLoad = true
-		},
 		methods: {
 			// 联系客服模态框
 			handleSureClick() {
@@ -75,20 +55,6 @@
 				// uni.switchTab({
 				// 	url: '/pages/my/my'
 				// })
-			},
-			reOnLoad() {
-				if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-					this.$toast.warn('登录失败请重试')
-					this.isLoad = false
-					// uni.navigateTo({
-					// 	url: '../../pages/my/login/login'
-					// })
-					return
-				}
-				this.isLoad = true
-			},
-			failToLoad() {
-				this.$toast.warn('登录失败请重试')
 			}
 		}
 	}
--- a/packageMy/myCollection/myCollection.vue
+++ b/packageMy/myCollection/myCollection.vue
@@ -1,51 +1,17 @@
 <template>
 	<view>
 		<productsBtn :type="1"></productsBtn>
-		<!-- 	<view style="margin:0 20rpx;">
-			<u-overlay :show="!isLoad">
-				<login @success="reOnLoad()" @fail="failToLoad()"></login>
-			</u-overlay>
-		</view> -->
 	</view>
 </template>

 <script>
-	import login from 'pages/my/login/login'
 	export default {
-		components: {
-			login
-		},
 		data() {
 			return {
 				type: '',
 				isLoad: true,
 			}
 		},
-		onLoad() {
-			if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-				this.isLoad = false
-				// uni.navigateTo({
-				// 	url: '../../pages/my/login/login'
-				// })
-				return
-			}
-			this.isLoad = true
-		},
-		methods: {
-			reOnLoad() {
-				if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-					this.$toast.warn('登录失败请重试')
-					this.isLoad = false
-					// uni.navigateTo({
-					// 	url: '../../pages/my/login/login'
-					// })
-					return
-				}
-				this.isLoad = true
-			},
-			failToLoad() {
-				this.$toast.warn('登录失败请重试')
-			}
-		}
+		methods: {}
 	}
 </script>
--- a/packageMy/myRelease/myRelease.vue
+++ b/packageMy/myRelease/myRelease.vue
@@ -47,11 +47,6 @@
 				</view>
 			</view>
 		</view>
-		<view style="margin:0 20rpx;">
-			<u-overlay :show="!isLoad">
-				<login @success="reOnLoad()" @fail="failToLoad()"></login>
-			</u-overlay>
-		</view>
 		<view style="font-size: 24rpx;color: #A3A3A3;text-align: center;padding: 26rpx 0;"
 			v-if="needsList.length==0&&tabCurrent == 0">
 			暂无更多记录</view>
@@ -65,14 +60,9 @@
 	import {
 		dateFormatXwDetail
 	} from '../../utills/date.js'
-	import login from 'pages/my/login/login'
 	export default {
-		components: {
-			login
-		},
 		data() {
 			return {
-				isLoad: true,
 				// id: '',
 				// showM: false,
 				content: '您确定删除吗?',
@@ -89,15 +79,6 @@
 		},
 		onLoad() {
 			this.getIdeasAndNeeds()
-			console.log(uni.getStorageSync('loginToken'));
-			if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-				this.isLoad = false
-				// uni.navigateTo({
-				// 	url: '../../pages/my/login/login'
-				// })
-				return
-			}
-			this.isLoad = true
 		},
 		methods: {
 			//获取创意发布
@@ -162,21 +143,6 @@
 						}
 					}
 				})
-			},
-			reOnLoad() {
-				if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
-					this.$toast.warn('登录失败请重试')
-					this.isLoad = false
-					// uni.navigateTo({
-					// 	url: '../../pages/my/login/login'
-					// })
-					return
-				}
-				this.isLoad = true
-				this.getIdeasAndNeeds()
-			},
-			failToLoad() {
-				this.$toast.warn('登录失败请重试')
 			}
 		}
 	}
--- a/packageSearch/search-products/search-products.vue
+++ b/packageSearch/search-products/search-products.vue
@@ -39,8 +39,8 @@
 		data() {
 			return {
 				queryParam: {
-						pageSize: 10,
-						pageNum: 1
+					pageSize: 10,
+					pageNum: 1
 				},
 				queryTitle: null,
 				productList: []
@@ -59,6 +59,12 @@
 				this.$apiServe.getProductList(data).then(res => {
 					this.productList = res.data.data
 				}).finally(_ => {})
+			},
+			//点击图片跳转到详情页
+			toDetailPage(item) {
+				uni.navigateTo({
+					url: '/pages/detail/productsDetail/productsDetail?id=' + item.id
+				})
 			}
 		}
 	}
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -4,7 +4,7 @@
 		<u-navbar :autoBack="false" title="我的"></u-navbar>
 		<u--image src="/static/my/wo_icon_bj1.png" width="750rpx" height="349rpx">
 		</u--image>
-		<myAvatar></myAvatar>
+		<myAvatar ref="myavatar"></myAvatar>
 		<view class="table">
 			<u-cell-group>
 				<u-cell size="large" title="绑定公司" icon="/static/my/wo_icon_bd.png" :isLink="true" value="未绑定公司"
@@ -30,18 +30,47 @@
 				</view>
 			</u-modal>
 		</view>
-
+		<view style="margin:0 20rpx;">
+			<u-overlay :show="!isLoad">
+				<login @success="reOnLoad()" @fail="failToLoad()"></login>
+			</u-overlay>
+		</view>
 	</view>
 </template>
 <script>
-	import loginVue from './login/login.vue'
+	import login from 'pages/my/login/login'
 	export default {
+		components: {
+			login
+		},
 		data() {
 			return {
 				showM: false,
 				phone: '138 1222 222',
+				isLoad: true,
 			}
 		},
+		onTabItemTap() {
+			this.$refs.myavatar.getUser()
+			if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
+				this.isLoad = false
+				// uni.navigateTo({
+				// 	url: '../../pages/my/login/login'
+				// })
+				return
+			}
+			this.isLoad = true
+		},
+		onLoad() {
+			if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
+				this.isLoad = false
+				// uni.navigateTo({
+				// 	url: '../../pages/my/login/login'
+				// })
+				return
+			}
+			this.isLoad = true
+		},
 		methods: {
 			//跳转到绑定公司页面
 			bindCompany() {
@@ -95,6 +124,24 @@
 			},
 			close() {
 				this.showM = false
+			},
+			reOnLoad() {
+				if (!uni.getStorageSync('loginToken') || uni.getStorageSync('loginToken').length === 0) {
+					this.$toast.warn('登录失败请重试')
+					this.isLoad = false
+					// uni.navigateTo({
+					// 	url: '../../pages/my/login/login'
+					// })
+					return
+				}
+				this.isLoad = true
+				this.$refs.myavatar.getUser()
+			},
+			failToLoad() {
+				// uni.navigateBack({
+				// 	url: '/pages/my/my'
+				// })
+				this.$toast.warn('登录失败请重试')
 			}
 		}
 	}