修改一些图片和icon

pages/personalCenter/personalCenter.vue

@@ -3,7 +3,7 @@
 		<view class="user-box">
 			<view class="icon-name-box">
 				<view class="icon-box">
-					<cover-image class="icon" :src="user.userIcon"></cover-image>
+					<cover-image class="icon" :src="user.userIcon" @click="onIconOpen"></cover-image>
 				</view>
 				<view class="name-box">
 					<view class="name" v-if="isLogin">
@@ -158,7 +158,7 @@
 				<u-row gutter="20">
 					<u-col span="3" v-for="icon in iconList" :key="icon.name" @click="currentIcon = icon">
 						<view class="icon-item" :class="{'icon-active': icon.name === currentIcon.name}">
-							<cover-image class="icon" :src="icon.src"></cover-image>
+							<cover-image class="icon" :src="icon.url"></cover-image>
 						</view>
 					</u-col>
 				</u-row>
@@ -226,6 +226,9 @@
 		src: ''
 	})
 	function onIconOpen() {
+		if (!isLogin) {
+			return
+		}
 		currentIcon.value = iconList.value[0]
 		iconVisible.value = true
 	}
@@ -233,7 +236,7 @@
 		updateIcon({userIcon: currentIcon.value.name}).then(res => {
 			if (res && res.message === 'success') {
 				msgSuccess('修改成功')
-				authStore.setUserIcon(currentIcon.value.src)
+				authStore.setUserIcon(currentIcon.value.url)
 				iconVisible.value = false
 			} else {
 				msgError('修改失败')

pages/researchReport/reportHome/reportHome.vue

@@ -5,7 +5,7 @@
 				<view class="menus-item-box" @click="toReportList(key, data.value)" v-for="(data,key) in categoryList"
 					:key="key">
 					<view class="icon-box">
-						<view class="iconfont icon-hetong"></view>
+						<view class="iconfont" :class="iconList[key]? iconList[key] : 'icon-hetong'"></view>
 					</view>
 					<view class="text-box">
 						{{ key }}
@@ -51,7 +51,7 @@
 			<view class="list-box">
 				<view class="list-item-box" v-for="item in list" :key="item.id" @click="onClickReport(item)">
 					<view class="image-box">
-						<image :src="item.imgUrl" mode="aspectFill"></image>
+						<image :src="item.cover" mode="aspectFill"></image>
 					</view>
 					<view class="info-box">
 						<view class="title">
@@ -59,14 +59,53 @@
 						</view>
 						<view class="time">
 							<span class="iconfont icon-time"></span>
-							<span>{{item.time}}</span>
+							<span>{{item.viewDate}}</span>
 						</view>
 						<view class="func">
-							<view v-if="item.free > 0" class="button free">免费</view>
+							<view v-if="item.viewMode==='1'" class="func-box" style="justify-content: flex-end;">
+								<view class="button free" >免费</view>
+							</view>
+							<view v-else-if="item.viewMode==='2' && isMember" class="func-box">
+								<view class="price">￥{{ item.price }}元</view>
+								<view class="button member-free">会员免费</view>
+							</view>
+							<view v-else-if="item.viewMode==='2' && !isMember" class="func-box">
+								<view style="flex: 0 0 auto;display: flex;align-items: center;">
+									<view class="member-free">
+										会员免费
+									</view>
+									<view class="not-member-price">
+										非会员：￥{{item.price}}元
+									</view>
+								</view>
+								<view :class="['button', item.hasBuy ? 'free' : 'buy']">
+									{{item.hasBuy ? '已购买' : '立即购买'}}
+								</view>
+							</view>
+							<view v-else-if="item.viewMode==='3' && item.price===item.priceMember" class="func-box">
+								<view class="price">￥{{ item.price }}元</view>
+								<view :class="['button', item.hasBuy ? 'free' : 'buy']">
+									{{item.hasBuy ? '已购买' : '立即购买'}}
+								</view>
+							</view>
+							<view v-else-if="item.viewMode==='3' && item.price!==item.priceMember" class="func-box">
+								<view style="flex: 0 0 auto;display: flex;align-items: center;">
+									<view class="member-free">
+										{{`会员：${item.priceMember}元`}}
+									</view>
+									<view class="not-member-price">
+										非会员：￥{{item.price}}元
+									</view>
+								</view>
+								<view :class="['button', item.hasBuy ? 'free' : 'buy']">
+									{{item.hasBuy ? '已购买' : '立即购买'}}
+								</view>
+							</view>
+							<!-- <view v-if="item.free > 0" class="button free">免费</view>
 							<view v-else-if="item.memberFree > 0" class="button member-free">会员免费</view>
 							<view v-else :class="['button', item.status > 0 ? 'free' : 'buy']">
 								{{item.status > 0 ? '已购买' : '立即购买'}}
-							</view>
+							</view> -->
 						</view>
 					</view>
 				</view>
@@ -88,17 +127,17 @@
 			<view class="list-box">
 				<view class="list-item-box" v-for="item in list2" :key="item.id" @click="onClickReport(item)">
 					<view class="image-box">
-						<image :src="item.imgUrl" mode="aspectFill"></image>
+						<image :src="item.cover" mode="aspectFill"></image>
 					</view>
 					<view class="info-box">
 						<view class="title">
 							{{item.title}}
 						</view>
 						<view class="time">
-							<span>购买时间:&nbsp;{{item.time}}</span>
+							<span>购买时间:&nbsp;{{item.buyDate}}</span>
 						</view>
 						<view class="func">
-							<view class="price">实付款：{{item.price}}元</view>
+							<view class="price">实付款：{{item.buyPrice}}元</view>
 						</view>
 					</view>
 				</view>
@@ -154,7 +193,11 @@
 	const list2 = ref([]);
 	const listCount = ref(0);
 	const listCount2 = ref(0);
-
+	const iconList = {
+		"二手住宅市场": "icon-hetong",
+		"住宅租赁市场": "icon-chengshi",
+		"房地产中介行业": "icon-zhongjie"
+	}
 	const customButtonStyle = {
 		height: '40rpx',
 		lineHeight: '40rpx',
@@ -297,7 +340,7 @@
 </script>
 
 <style lang="scss" scoped>
-	$image-width: 230rpx;
+	$image-width: 200rpx;
 
 	.container {
 		height: 100vh;
@@ -381,6 +424,13 @@
 						font-size: $uni-font-size-2;
 						font-weight: bold;
 
+						.func-box {
+							display: flex;
+							justify-content: space-between;
+							width: 100%;
+							align-items: center;
+						}
+
 						.button {
 							text-align: center;
 							width: 130rpx;