From 527b811ff6eb3665583ab2104803261a3c3480e5 Mon Sep 17 00:00:00 2001
From: fanfan <franceesfan@163.com>
Date: Thu, 24 Oct 2024 19:15:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/gamll/dailyReport.vue | 159 ++++++++++++++++++------------------
 pages/gamll/mall.vue        |  11 ++-
 2 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/pages/gamll/dailyReport.vue b/pages/gamll/dailyReport.vue
index c9f376f..869c16f 100644
--- a/pages/gamll/dailyReport.vue
+++ b/pages/gamll/dailyReport.vue
@@ -1,29 +1,36 @@
 <template>
-	<view>
-		<view class="park" :style="{backgroundImage:`url(${indexBackgroundImage})`}">
-			<view style="margin-top:870rpx;overflow: hidden;height: 830rpx;">
-				<view class="report" v-if="list.length>0">
-					<view class="report-box" v-for="(a,index) in list" @click="onClickReport(a)">
+	<view class="park" :style="{backgroundImage:`url(${indexBackgroundImage})`}">
+		<view class="park-navbar">
+			<u-navbar title="" :border-bottom="false" :background="background"></u-navbar>
+		</view>
+		<view style="margin-top:714rpx;overflow: hidden;height: 800rpx;">
+			<view class="report" v-if="list.length>0">
+				<view class="report-content" v-for="(a,index) in list">
+					<view class="report-box report-box1">
 						{{a.channel_name}}
 					</view>
+					<view class="report-box" @click="onClickReport(a,1)">
+						预览
+					</view>
+					<view class="report-box" @click="onClickReport(a,2)">
+						复制
+					</view>
 				</view>
 			</view>
-
-			<!-- <view class="wenan">
-				好东西就要分享给大家让生活更美好
-			</view> -->
 		</view>
-		<!-- 催单弹框 -->
-		<view class="dia" v-if="cdDia" catchtouchmove="true">
-			<view class="diaMain">
-				<!-- 	<view class="ld" @click="cdDia=false">
-					<u-icon name="close" color="#999" size="32"></u-icon>
-				</view> -->
-				<view class="report-name">今天 {{today}}，{{fromData.header_content}}</view>
-				<view class="cdInfo">
+	</view>
+	<!-- 催单弹框 -->
+	<view class="dia" v-if="cdDia" @touchmove.stop.prevent="">
+		<view class="diaMain">
+			<view class="ld" @click="cdDia=false">
+				<u-icon name="close" color="#999" size="32"></u-icon>
+			</view>
+			<view class="report-name">今天 {{today}}，{{fromData.header_content}}</view>
+			<!-- <view class="cdInfo"> -->
+				<scroll-view class="cdInfo" scroll-y="true">
 					<view class="report-line" v-for="(item) in shortList">
 						<view class="">
-							{{item.goods_name}}
+							{{'★'+item.goods_name}}
 						</view>
 						<view class="">
 							市场价:{{item.cost_price_min}}
@@ -38,16 +45,8 @@
 							{{item.jd_short_url}}
 						</view>
 					</view>
-				</view>
-				<view class="reportCopy">
-					<view class="reportbut" style="color: rgb(96, 98, 102);" @click="cdDia=false">
-						取消
-					</view>
-					<view class="reportbut" @click="copyData">
-						复制
-					</view>
-				</view>
-			</view>
+				</scroll-view>
+			<!-- </view> -->
 		</view>
 	</view>
 </template>
@@ -79,21 +78,26 @@
 				let day = now.getDate()
 				this.today = year + '年' + month + '月' + day + '日'
 			},
-			onClickReport(item) {
+			onClickReport(item, type) {
 				this.fromData = item
 				uni.showLoading({
-					title: '加载中'
+					title: type==1?'加载中':'复制中'
 				});
-				this.getJDShortLinks(item.id)
+				this.getJDShortLinks(item.id, type)
 				this.getCurrentDate()
 			},
-			getJDShortLinks(id) {
+			getJDShortLinks(id, type) {
 				help.JDShortLinks({
 					id: id
 				}).then(result => {
 					if (result.status == 200) {
 						this.shortList = result.data.goodsList
-						this.cdDia = true
+						if (type == 1) {
+							this.cdDia = true
+						}
+						if (type == 2) {
+							this.copyData()
+						}
 						uni.hideLoading();
 					}
 				})
@@ -103,7 +107,7 @@
 				let text = ''
 				that.shortList.forEach(function(obj) {
 					text +=
-						obj.goods_name +
+						 '★'+obj.goods_name +
 						'\n' +
 						'市场价:' +
 						obj.goods_price_min +
@@ -115,10 +119,11 @@
 						obj.goods_no +
 						'\n' +
 						obj.jd_short_url +
-						';\n'
+						'\n'+
+						' \n'
 				})
 				uni.setClipboardData({
-					data: '今天' + that.today + '，' + this.fromData.header_content + '\n' + text,
+					data: '今天' + that.today + '，' + this.fromData.header_content + '\n' + ' \n' + text,
 					success: () => {
 						// 可以添加用户友好的提示，例如使用uni.showToast提示复制成功
 						uni.showToast({
@@ -164,29 +169,11 @@
 		align-items: center;
 		justify-content: center;
 
-		.reportCopy {
-			height: 80rpx;
-			width: 100%;
-			border-top: 1rpx solid #f7f7f7;
-			display: flex;
-
-			.reportbut {
-				width: 50%;
-				line-height: 80rpx;
-				text-align: center;
-				font-size: 28rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				color: rgb(41, 121, 255);
-				;
-			}
-		}
-
 		.report-name {
 			font-size: 28rpx;
 			color: #000;
 			font-weight: 700;
-			margin: 20rpx 24rpx;
+			margin: 40rpx 0 16rpx 0;
 		}
 
 		.report-line {
@@ -194,7 +181,7 @@
 			color: #000;
 			padding-top: 16rpx;
 			margin-top: 16rpx;
-			border-top: 1rpx dashed #999;
+			// border-top: 1rpx dashed #999;
 		}
 
 		.report-line:nth-child(1) {
@@ -204,12 +191,13 @@
 		}
 
 		.diaMain {
-			width: 600rpx;
-			max-height: 900rpx;
+			width: 680rpx;
+			min-height: 500rpx;
 			background: #fff;
 			border-radius: 12rpx 12rpx 12rpx 12rpx;
 			opacity: 1;
 			position: relative;
+			padding: 24rpx;
 			overflow: hidden;
 
 			.ld {
@@ -221,49 +209,62 @@
 			}
 
 			.cdInfo {
-				overflow: hidden;
-				max-height: 620rpx;
-				overflow-y: auto;
+				height: 1000rpx;
 				font-size: 28rpx;
 				font-family: PingFang SC, PingFang SC;
 				font-weight: 400;
 				color: #727272;
 				line-height: 38rpx;
-				margin: 0 24rpx 20rpx 24rpx;
+				margin-top: 20rpx;
 			}
 		}
 	}
 
 	.park {
-		overflow: hidden;
 		width: 100%;
 		background-size: 100% auto;
-		min-height: 100vh;
-		padding-bottom: 68rpx;
+		height: 1720rpx;
 		background-size: cover;
 
 		.report {
 			box-shadow: 0 5rpx 10rpx 5rpx #fff;
-			// box-shadow: 5rpx 5rpx 5rpx #fff,5rpx -5rpx 5rpx #fff,-5rpx 5rpx 5rpx #fff,-5rpx -5rpx 5rpx #fff;
 			border-radius: 8rpx;
 			margin: 20rpx 50rpx 0rpx 50rpx;
 			padding: 12rpx;
 			max-height: 570rpx;
 			overflow-y: auto;
 
-			.report-box {
-				display: inline-block;
-				background: #3d84f2;
-				height: 60rpx;
-				padding: 0 24rpx;
-				color: #fff;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 400;
-				font-size: 26rpx;
-				color: #fff;
-				line-height: 60rpx;
-				border-radius: 16rpx;
-				margin: 12rpx;
+			.report-content {
+				overflow: hidden;
+				display: flex;
+				justify-content: center;
+
+				.report-box {
+					display: inline-block;
+					background: #3d84f2;
+					height: 60rpx;
+					text-align: center;
+					width: 120rpx;
+					padding: 0 24rpx;
+					color: #fff;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 400;
+					font-size: 26rpx;
+					color: #fff;
+					line-height: 60rpx;
+					border-radius: 16rpx;
+					margin: 12rpx 18rpx;
+				}
+
+				.report-box1 {
+					width: 200rpx;
+					max-width: 200rpx;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					overflow: hidden;
+					-webkit-line-clamp: 1;
+					border-radius: 32rpx !important;
+				}
 			}
 		}
 
diff --git a/pages/gamll/mall.vue b/pages/gamll/mall.vue
index 8621124..c5ee598 100644
--- a/pages/gamll/mall.vue
+++ b/pages/gamll/mall.vue
@@ -1,8 +1,8 @@
 <template>
 	<view class="park" :style="{backgroundImage:`url(${indexBackgroundImage})`}">
-		<!-- <view class="park-navbar">
-			<u-navbar title="供应商入驻" :border-bottom="false" :background="background"></u-navbar>
-		</view> -->
+		<view class="park-navbar">
+			<u-navbar title="" :border-bottom="false" :background="background"></u-navbar>
+		</view>
 		<view class="park-but">
 			<view class="but" @click="handleSortType(10)" :style="{ color: (formData.type==10)?'#794007':'#fff' }">
 				公司
@@ -531,15 +531,14 @@
 		overflow: hidden;
 		width: 100%;
 		background-size: 100% auto;
-		min-height: 100vh;
-		padding-bottom: 68rpx;
+		height: 3720rpx;
 		background-size: cover;
 
 		.park-but {
 			overflow: hidden;
 			display: flex;
 			justify-content: space-between;
-			margin: 330rpx 60rpx 110rpx 60rpx;
+			margin: 200rpx 60rpx 110rpx 60rpx;
 
 			.but {
 				width: 200rpx;