From b60a483623c7e9a1ae523b4e21c0eecef2a56a75 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 11 Jan 2024 11:15:34 +0800
Subject: [PATCH] fix

---
 apis/modules/activity.js              |  3 +
 config/request.js                     |  4 +-
 other/clue/clue.vue                   | 14 ++--
 other/hotDetail/hotDetail.vue         | 97 +++++++++++++++++++++++++++
 other/procure/procure.vue             | 34 +++++-----
 other/procureDetail/procureDetail.vue |  2 +-
 pages.json                            |  8 +++
 pages/index/index.vue                 | 28 +++++++-
 pages/person/person.vue               |  3 +-
 9 files changed, 163 insertions(+), 30 deletions(-)
 create mode 100644 other/hotDetail/hotDetail.vue

diff --git a/apis/modules/activity.js b/apis/modules/activity.js
index c41df16..69ea964 100644
--- a/apis/modules/activity.js
+++ b/apis/modules/activity.js
@@ -27,4 +27,7 @@ export const categoryList = (id) => {
 }
 export const explosiveList = (data) => {
   return post(`nakadai/explosiveRecommendation/explosiveList`, data)
+}
+export const explosiveFind = (id) => {
+  return post(`nakadai/explosiveRecommendation/findById?id=${id}`)
 }
\ No newline at end of file
diff --git a/config/request.js b/config/request.js
index 0d7b444..d57d2ba 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,8 +5,8 @@
  */
 
 export default {
-  baseURL: 'http://192.168.31.51:10010/',
-  // baseURL: 'http://124.71.79.122/',
+  // baseURL: 'http://192.168.31.51:10010/',
+  baseURL: 'http://124.71.79.122/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
   },
diff --git a/other/clue/clue.vue b/other/clue/clue.vue
index b2f5f24..a1d7fb9 100644
--- a/other/clue/clue.vue
+++ b/other/clue/clue.vue
@@ -19,17 +19,17 @@
 							<view class="date">提交时间：{{ item.createTime }}</view>
 						</view> -->
 						<view class="pro-name">
-							<image class="icon" :src="item.logoUrl ? item.logoUrl : 'https://occupationlab.com/images/preschoolEdu/preSchool-icon.png'"></image>
-							{{ item.companyName }}
+							<image class="icon" :src="item.logo ? item.logo : Common.shopIcon"></image>
+							{{ item.purchasingPerson }}
 						</view>
 						<view class="info">
 							<view class="texts">
-								<view class="meta">采购内容：{{ item.oriPrice || 0 }}</view>
-								<view class="meta">数量：{{ item.totalStocks || 0 }}</view>
+								<view class="meta">采购内容：{{ item.content || '' }}</view>
+								<view class="meta">数量：{{ item.num || 0 }}个</view>
 								<view class="meta">编号：{{ item.orderNumber }}</view>
 								<view class="meta">提交时间：{{ item.createTime }}</view>
 							</view>
-							<view class="type">组织采购</view>
+							<view class="type">{{ item.orderType === 1 ? '个人采购' : '组织采购' }}</view>
 						</view>
 					</view>
 				</view>
@@ -42,11 +42,11 @@
 
 <script>
 	import { page } from '@/apis/modules/order.js'
-	import Goods from '@/config/goods.js'
+	import Common from '@/config/common'
 	export default {
 		data() {
 			return {
-				Goods,
+				Common,
 				keyword: '',
 				curTab: '',
 				tabs: [
diff --git a/other/hotDetail/hotDetail.vue b/other/hotDetail/hotDetail.vue
new file mode 100644
index 0000000..8e16335
--- /dev/null
+++ b/other/hotDetail/hotDetail.vue
@@ -0,0 +1,97 @@
+<template>
+	<view class="wrap">
+		<view class="banner">
+			<uni-swiper-dot class="swiper" v-if="coverUrl.length" :current="curBanner" :info="coverUrl" field="id" mode="round" :dotsStyles="dotsStyles">
+				<swiper class="swiper-box" autoplay>
+					<swiper-item v-for="(item, i) in coverUrl" :key="i">
+						<image class="pic" :src="item.url"></image>
+					</swiper-item>
+				</swiper>
+			</uni-swiper-dot>
+		</view>
+		
+		<view class="detail">
+			<view class="title">{{ info.productName }}</view>
+			<mp-html :content="info.description"/>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { explosiveFind } from '@/apis/modules/activity.js'
+	import Util from '@/libs/util'
+	export default {
+		data() {
+			return {
+				id: '',
+				curBanner: 0,
+				dotsStyles: {
+					backgroundColor: 'rgba(83, 200, 249,0.3)',
+					border: '1px rgba(83, 200, 249,0.3) solid',
+					color: '#fff',
+					selectedBackgroundColor: 'rgba(83, 200, 249,0.9)',
+					selectedBorder: '1px rgba(83, 200, 249,0.9) solid'
+				},
+				info: {
+					productName: '',
+					description: '',
+				},
+				coverUrl: [],
+				mpStyle: {
+					p: 'font-size: 25rpx !important;font-family: Microsoft Yahei !important;font-weight: 400 !important;color: #333 !important;',
+					span: 'font-size: 25rpx !important;font-family: Microsoft Yahei !important;font-weight: 400 !important;color: #333 !important;'
+				},
+			}
+		},
+		onShow() {
+			const pages = getCurrentPages()
+			const { options } = pages[pages.length - 1]
+			this.id = options.id
+			this.getInfo()
+		},
+		methods: {
+			// 获取详情
+			getInfo() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				explosiveFind(this.id).then(({ data }) => {
+					this.coverUrl = data.coverUrl.split(',').map((e, i) => {
+						return {
+							url: e,
+							id: i,
+						}
+					})
+					this.info = data
+					uni.hideLoading()
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.banner {
+	position: relative;
+	.pic {
+		width: 100%;
+		height: 420rpx;
+	}
+	swiper {
+		height: 420rpx;
+	}
+}
+.detail {
+	padding: 34rpx 32rpx;
+	margin: 20rpx;
+	border-radius: 20px;
+	background-color: #fff;
+	.title {
+		margin-bottom: 30rpx;
+		font-size: 30rpx;
+		color: #333;
+	}
+}
+</style>
diff --git a/other/procure/procure.vue b/other/procure/procure.vue
index 8ccba2d..51c1b7e 100644
--- a/other/procure/procure.vue
+++ b/other/procure/procure.vue
@@ -11,41 +11,39 @@
 			<template v-if="list.length">
 				<view class="list">
 					<view class="item" v-for="item in list" @click="toDetail(item)">
-						<view class="metas">
+						<!-- <view class="metas">
 							<view class="serial">编号：{{ item.orderNumber }}</view>
-							<view class="date">提交时间：</view>
-						</view>
+							<view class="date">提交时间：{{ item.createTime }}</view>
+						</view> -->
 						<view class="pro-name">
-							<image class="icon" :src="item.logoUrl ? item.logoUrl : 'https://occupationlab.com/images/preschoolEdu/preSchool-icon.png'"></image>
-							{{ item.companyName }}
+							<image class="icon" :src="item.logo ? item.logo : Common.shopIcon"></image>
+							{{ item.purchasingPerson }}
 						</view>
 						<view class="info">
 							<view class="texts">
-								<view class="meta">
-									采购内容：{{ item.oriPrice || 0 }}
-								</view>
-								<view class="meta">
-									数量：{{ item.totalStocks || 0 }}
-								</view>
+								<view class="meta">采购内容：{{ item.content || '' }}</view>
+								<view class="meta">数量：{{ item.num || 0 }}个</view>
+								<view class="meta">编号：{{ item.orderNumber }}</view>
+								<view class="meta">提交时间：{{ item.createTime }}</view>
 							</view>
-							<view class="type">组织采购</view>
+							<view class="type">{{ item.orderType === 1 ? '个人采购' : '组织采购' }}</view>
 						</view>
 					</view>
 				</view>
 				<uni-load-more :status="status" />
 			</template>
-			<empty v-else text="暂无线索"></empty>
+			<empty v-else text="暂无采购信息"></empty>
 		</view>
 	</view>
 </template>
 
 <script>
 	import { myOrder } from '@/apis/modules/order.js'
-	import Goods from '@/config/goods.js'
+	import Common from '@/config/common'
 	export default {
 		data() {
 			return {
-				Goods,
+				Common,
 				keyword: '',
 				curTab: '',
 				tabs: [
@@ -142,19 +140,21 @@
 	padding-bottom: 90px;
 }
 .list {
-	margin-top: 20rpx;
 	padding: 20rpx;
 	.item {
 		padding: 20rpx;
 		margin-bottom: 20rpx;
+		// border-bottom: 1px solid #f1f1f1;
 		background-color: #fff;
+		border-radius: 4px;
 	}
 	.metas {
-		display: flex;
+		// display: flex;
 		justify-content: space-between;
 		margin-bottom: 20rpx;
 	}
 	.serial {
+		margin-bottom: 10rpx;
 		font-size: 24rpx;
 		color: #333;
 	}
diff --git a/other/procureDetail/procureDetail.vue b/other/procureDetail/procureDetail.vue
index e897242..2f12160 100644
--- a/other/procureDetail/procureDetail.vue
+++ b/other/procureDetail/procureDetail.vue
@@ -3,7 +3,7 @@
 		<view class="block">
 			<view class="title">编号{{ id }}</view>
 			<view class="shop">
-				<image class="logo" :src="info.shopLogo || Common.shopIcon"></image>
+				<image class="logo" :src="info.shopLogo ? info.shopLogo : Common.shopIcon"></image>
 				{{ info.shopName }}
 				<view class="status">{{ info.authentication }}</view>
 			</view>
diff --git a/pages.json b/pages.json
index 9b16e98..89f5309 100644
--- a/pages.json
+++ b/pages.json
@@ -116,6 +116,14 @@
 						"navigationBarTitleText" : "商机线索",
 						"enablePullDownRefresh" : true
 					}
+				},
+				{
+					"path" : "hotDetail/hotDetail",
+					"style" : 
+					{
+						"navigationBarTitleText" : "爆款详情",
+						"enablePullDownRefresh" : false
+					}
 				}
             ]
 		},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 5c478d9..eccef2d 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -28,7 +28,7 @@
 				<uni-swiper-dot class="swiper" v-if="hots.length" :current="curBanner" :info="hots" field="id" mode="round" :dotsStyles="dotsStyles">
 					<swiper class="swiper-box" autoplay>
 						<swiper-item v-for="(item, i) in hots" :key="i">
-							<image class="hot" :src="item.coverUrl"></image>
+							<image class="hot" :src="item.coverUrl" @click="toLink(item)"></image>
 						</swiper-item>
 					</swiper>
 				</uni-swiper-dot>
@@ -233,6 +233,32 @@
 					this.hots = data.records
 				}).catch(e => {})
 			},
+			// 跳转链接
+			toLink(item) {
+				// details 1: 详情，2：链接
+				if (item.details === '1') {
+					this.$util.to('/other/hotDetail/hotDetail?id=' + item.id)
+				} else {
+					// link 1小程序内链接，2外连接
+					if (item.link === '1') {
+						const { selectLinkId, correspondingLinkId } = item
+						// selectLinkId 1商品，2活动，3供应商，4店铺
+						if (selectLinkId === '1') {
+							
+						} else if (selectLinkId === '2') {
+							this.$util.to('/other/activityDetail/activityDetail?id=' + correspondingLinkId)
+						} else if (selectLinkId === '3') {
+							this.$util.to('/other/supplierDetail/supplierDetail?teamId=' + correspondingLinkId)
+						}
+					} else {
+						location.href = item.jumpLink
+						// uni.openUrl({
+						// 	url: item.jumpLink
+						// })
+						// this.$util.to()
+					}
+				}
+			},
 			// keyword清除回调
 			clearKeyword() {
 				this.keyword = ''
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 48c628e..81addb1 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -48,8 +48,7 @@
 						<image src="https://occupationlab.com/images/preschoolEdu/icon4.png" />
 						<view class="text ell">我的发票</view>
 					</li> -->
-					<!--  v-if="!isSupplier" -->
-					<li @click="toPage('/other/procure/procure')">
+					<li v-if="!isSupplier" @click="toPage('/other/procure/procure')">
 						<image src="https://occupationlab.com/images/preschoolEdu/icon5.png" />
 						<view class="text ell">我的采购</view>
 					</li>