From c43148cdd60b65852b91cda3934e675f7ffafe61 Mon Sep 17 00:00:00 2001
From: jianglong <jianglong@123.com.cn>
Date: Fri, 28 Apr 2023 13:40:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/resource_details/resource_details.vue | 37 ++++++++++++++++-------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/pages/resource_details/resource_details.vue b/pages/resource_details/resource_details.vue
index 9e4fa97..a899244 100644
--- a/pages/resource_details/resource_details.vue
+++ b/pages/resource_details/resource_details.vue
@@ -15,15 +15,16 @@
 
 			<bubble-tips top="200rpx"></bubble-tips>
 
-			<product-swiper :imgUrls="swiperList" :video="resourceDetail.image"></product-swiper>
+			<product-swiper :imgUrls="swiperList" ></product-swiper>
 	
 
 			<view class="goods-info bg-white">
 				<view class="info-header flex">
 					<view class="price flex flex-1">
 						<view class="primary m-r-10">
-							<price-format :first-size="46" :second-size="32" :subscript-size="32"
-								:price="resourceDetail.price_str" :weight="500"></price-format>
+							<text style="font-weight: 500" class="price-format">
+								<text style="font-size: 46rpx;margin-right: 1rpx" >{{resourceDetail.price_str}}</text>
+							</text>
 						</view>
 					</view>
 					<!-- <image class="icon-share" src="/static/images/icon_share.png" @tap="showShareBtn = true"></image> -->
@@ -32,8 +33,10 @@
 					<view class="name lg bold">{{ resourceDetail.title }}</view>
 				</view>
 				<view class="flex row-between xs lighter" style="padding: 0 24rpx 20rpx">
+					<text>区域: {{ resourceDetail.address }}</text>
 					<text>下载量: {{ resourceDetail.download }}</text>
 					<text>浏览量: {{ resourceDetail.visit }}</text>
+					
 				</view>
 			</view>
 
@@ -42,15 +45,15 @@
 			</view>
 			
 			<view class="details m-t-20 bg-white" id="details">
-				<view class="title lg">商品详情</view>
+				<view class="title lg">资料简介</view>
 				<view class="content">
-					<u-parse :html="goodsDetail.content" :lazy-load="true" :show-with-animation="true"></u-parse>
+					<u-parse :html="resourceDetail.content" :lazy-load="true" :show-with-animation="true"></u-parse>
 				</view>
 			</view>
 			<view class="footer flex bg-white fixed">
 				
 				<template>
-					<view class="right-buy br60 white m-r-20 m-l-10 md" @tap="showSpecFun(2)">{{ showtxt }}</view>
+					<view class="right-buy br60 white m-r-20 m-l-10 md" @tap="showSpecFun(2)">{{ btnText.red }}</view>
 				</template>
 				
 			</view>
@@ -62,7 +65,7 @@
 			</view>
 			<goods-column></goods-column>
 		</view>
-		<
+	
 		<share-popup :show="showShareBtn" @close="showShareBtn = false" :goods-id="id" :img-url="goodsDetail.image"
 			:summary="goodsDetail.remark" :share-title="goodsDetail.name"></share-popup>
 		<!-- 悬浮按钮 -->
@@ -74,7 +77,7 @@
 team_min_price
 <script>
 	import {
-		resourceDetail,
+		getResourceDetail,
 		getGoodsDetail,
 		addCart
 	} from '@/api/store';
@@ -123,6 +126,7 @@ team_min_price
 				team: {},
 				teamFound: [],
 				showtxt:[],
+				resourceDetail:{},
 				navStyle: {
 					backBg: 0.4,
 					backgroundBg: 0,
@@ -196,7 +200,7 @@ team_min_price
 				const {
 					data,
 					code
-				} = await resourceDetail({
+				} = await getResourceDetail({
 					id: this.id
 				});
 				if (code == 1) {
@@ -210,18 +214,17 @@ team_min_price
 						path,
 						price_str,
 						type,
-						goodsType
+						goodsType,
+						address
 					} = data;
-					
-					if (found) {
-						found = arraySlice(found, [], 2);
-					}
+				
 					this.intro = intro || {}
 					this.image = image
 					this.resourceDetail = data;
-					this.swiperList = image;
+					this.swiperList = [{id:data.id,uri:image}];
+					console.log(this.swiperList)
 					this.goodsType = goodsType;
-
+					console.log(goodsType)
 					this.$nextTick(() => {
 						// 滚动到顶部，防止h5端出现问题
 						uni.pageScrollTo({
@@ -279,7 +282,6 @@ team_min_price
 					}
 				})
 			},
-
 			onConfirm(e) {
 				const {
 					team: {
@@ -318,6 +320,7 @@ team_min_price
 				const {
 					goodsType
 				} = this;
+				console.log(goodsType,222333)
 				switch (goodsType) {
 					case 0:
 						return {