From f5b2074af07c57e83b018fd9757db6b58f38f72e Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Wed, 6 Sep 2023 10:42:00 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                              |  22 +-
 pages/nongKe/food/index.vue             |   2 +-
 pages/nongKe/food/indexa.vue            | 326 ++++++++++++++++++++++++
 pages/nongKe/specialty/index.vue        |   2 +-
 pages/nongKe/supply_chain/supplierA.vue |   5 +-
 pages/nongKe/tourism/index.vue          |   2 +-
 pages/short_video/nvueSwiper/index.nvue |   2 +-
 7 files changed, 350 insertions(+), 11 deletions(-)
 create mode 100644 pages/nongKe/food/indexa.vue

diff --git a/pages.json b/pages.json
index 54f013d..f70167c 100644
--- a/pages.json
+++ b/pages.json
@@ -278,6 +278,14 @@
 						"navigationStyle": "custom"
 					}
 
+				}, {
+					"path": "specialty/indexa",
+					"style": {
+						"navigationBarTitleText": "名优特产",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+
 				}, {
 					"path": "food/index",
 					"style": {
@@ -286,6 +294,14 @@
 						"navigationStyle": "custom"
 					}
 
+				}, {
+					"path": "food/indexa",
+					"style": {
+						"navigationBarTitleText": "当地美食",
+						"enablePullDownRefresh": false,
+						"navigationStyle": "custom"
+					}
+
 				}, {
 					"path": "tourism/index",
 					"style": {
@@ -1531,11 +1547,11 @@
 				"iconPath": "static/tabbar_icon/d.png",
 				"selectedIconPath": "static/tabbar_icon/d-a.png",
 				"text": "发布",
-			    "visible":false
+				"visible": false
 			},
 			{
 				"pagePath": "pages/supply_chains/supply_chains",
-				
+
 				"iconPath": "static/tabbar_icon/c.png",
 				"selectedIconPath": "static/tabbar_icon/c-a.png",
 				"text": "供应"
@@ -1554,7 +1570,7 @@
 			"pagePath": "pages/plant_release/index",
 			"iconPath": "static/tabbar_icon/d.png",
 			// "selectedIconPath": "static/tabbar_icon/d-a.png",
-			
+
 			"text": "发布"
 		}
 
diff --git a/pages/nongKe/food/index.vue b/pages/nongKe/food/index.vue
index 7ca88a8..b44fcd1 100644
--- a/pages/nongKe/food/index.vue
+++ b/pages/nongKe/food/index.vue
@@ -57,7 +57,7 @@
 							<view class="li head" style="display: flex;">
 								<text class="com_name">{{item.mer_name}}</text>
 								<text
-									style="font-weight: normal; font-size: 10rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
+									style="font-weight: normal;font-size: 19.28rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
 							</view>
 							<view class="li">
 								<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
diff --git a/pages/nongKe/food/indexa.vue b/pages/nongKe/food/indexa.vue
new file mode 100644
index 0000000..03faba3
--- /dev/null
+++ b/pages/nongKe/food/indexa.vue
@@ -0,0 +1,326 @@
+<template>
+	<view class="box">
+		<view class="head">
+			<view style="height: var(--status-bar-height);"></view>
+			<!-- <u--image style="position: absolute;" :showLoading="true" src="/static/images/MYTC/BG.png" width="750rpx"
+				height="748.25rpx" @click="click"></u--image> -->
+			<view class="head_tit">
+				<view class="head_tit_l">
+					<view class="iconfont icon-xiangzuo"></view>
+					<view style="font-size: 40rpx;font-weight: 700;margin-left: 30rpx; transform: skewX(-10deg);">
+						当地美食
+					</view>
+				</view>
+				<view class="head_tit_r" style="font-size: 29.79rpx;">
+					江阳区 <text style="margin-left: 10rpx;" class="iconfont icon-xiangxia"></text>
+					<view class="" style="font-size: 22.78rpx;">
+						晴天30℃
+					</view>
+				</view>
+			</view>
+
+			<view class="head_serch">
+				<view style="position: relative;">
+					<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
+						v-model="keyword" class="serch_cls"></u-search>
+					<u--image @tap="searchSubmit" class="img_cls" :showLoading="true" src="/static/images/GXSC/SS.png"
+						width="115.65rpx" height="56.82rpx"></u--image>
+				</view>
+			</view>
+
+			<view class="foodType">
+				<view class="foodLi" v-for="(item,index) in lists" :key="index">
+					<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg" width="70rpx"
+						height="70rpx"></u--image>
+					<view class="" style="text-align: center;">
+						早餐
+					</view>
+				</view>
+
+			</view>
+
+		</view>
+
+		<view class="store" style="background-color: white;">
+			<view class="goods_list">
+				<view class="goods_cards" @click="goStore(item.mer_id)" v-for="(item,index) in storeList" :key="index">
+					<view class="left">
+						<u--image :showLoading="true" :src="item.mer_avatar" width="157.71rpx"
+							height="157.71rpx"></u--image>
+					</view>
+					<view class="right">
+						<view class="li heads" style="display: flex;">
+							<text class="flag">特产</text>
+							<text class="com_name">{{item.mer_name}}</text>
+							<text
+								style="font-weight: normal; font-size: 10rpx;color: #737373;padding:0 10rpx; border-radius: 10rpx; border: 1px solid #737373;">{{item.type_name}}</text>
+						</view>
+						<view class="li">
+							<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
+								src="/static/images/GXSC/PF.png" width="20.85rpx" height="19.85rpx"></u--image>
+							<text style="margin-left: 10rpx;color: #FF6D20; ">5.0</text>
+							<text>月销2000+</text>
+							<text>20分钟</text>
+							<text>1.1km</text>
+						</view>
+						<view class="li" style="align-items: center;">
+							<u--image :showLoading="true" src="/static/images/GXSC/DH.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text> {{item.service_phone}}</text>
+						</view>
+						<view class="li" style="align-items: center;">
+							<u--image :showLoading="true" src="/static/images/GXSC/SJ.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text>{{item.mer_take_time[0]}}-{{item.mer_take_time[1]}}</text>
+						</view>
+						<view class="li" style="align-items: center;">
+							<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="33.85rpx"
+								height="33.85rpx"></u--image>
+							<text class="address">{{item.mer_address}}</text>
+						</view>
+
+						<view class="">
+							<u-scroll-list>
+								<view v-for="(item, index) in list" :key="index" style="margin-right: 20rpx;">
+									<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
+										width="164.72rpx" height="164.72rpx"></u--image>
+									<view class="goods_tit_a">
+										笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
+									</view>
+									<view style="color: red;">
+										$10.00
+									</view>
+
+									<!-- <image :src="item.thumb"></image> -->
+								</view>
+								<!-- <view v-for="(item, index) in list" :key="index">
+									<image :src="item.thumb"></image>
+								</view> -->
+							</u-scroll-list>
+						</view>
+						<!-- <view class="">
+							<u-scroll-list>
+								<view v-for="(item, index) in list" :key="index" class="goods_card_a">
+									<u--image :showLoading="true" src="https://cdn.uviewui.com/uview/album/1.jpg"
+										width="164.72rpx" height="164.72rpx" @click="click"></u--image>
+									<view class="goods_tit_a">
+										笑口常开地方就是的开发建设的开发建设的,v空间和客户可怜见立刻就
+									</view>
+									<view class="goods_price">
+										$10.00
+									</view>
+								</view>
+							</u-scroll-list>
+						</view>
+ -->
+
+
+					</view>
+
+				</view>
+
+			</view>
+
+
+
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		storeMerchantList,
+	} from '@/api/store.js';
+	export default {
+		data() {
+			return {
+				keyword: "",
+				list: [1, 1, 1, 11, 1, 11, 11],
+				lists: [1, 1, 1, 1, 1],
+				storeList: [1, 1, 1, 1, 1, 1, 1, 1, 1]
+			}
+		},
+		onLaunch() {
+			console.log(46545)
+			// storeMerchantList().then(res => {
+			// 	// this.count = res.data.count
+			// 	// this.storeList = this.storeList.concat(res.data.list)
+			// 	// this.loading = false
+			// 	// this.loadingIcon = false
+			// 	console.log(res)
+			// })
+
+		},
+		onShow() {
+			// console.log(46545)
+			storeMerchantList().then(res => {
+				// this.count = res.data.count
+				this.storeList = res.data.list
+				// this.loading = false
+				// this.loadingIcon = false
+				// console.log(res)
+			})
+		},
+		methods: {},
+		onPullDownRefresh() {
+			uni.stopPullDownRefresh()
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.head {
+		// background-color: #F94621;
+		// background: url('/static/images/MYTC/BG.png') no-repeat;
+		padding: 20rpx;
+		border-radius: 0rpx 0rpx 31.54rpx 31.54rpx;
+
+		.head_tit {
+			display: flex;
+			justify-content: space-between;
+			// color: white;
+			// margin-bottom: 20rpx;
+
+			.head_tit_l {
+				display: flex;
+				align-items: center;
+			}
+
+			.head_tit_r {
+				// display: flex;
+				// align-items: center;
+			}
+		}
+
+		.head_serch {
+			margin: 20rpx 0;
+		}
+
+		.foodType {
+			display: flex;
+
+			.foodLi {}
+		}
+
+
+		.head_content {
+			.head_content_card {
+				background: linear-gradient(to bottom, #FCB9AD, #FFFBF9, #FFFFFF);
+				border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+				overflow: hidden;
+				padding: 20rpx 10rpx;
+
+				.goods_card {
+					margin-right: 20rpx;
+				}
+
+				.goods_tit {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
+
+				.goods_price {
+					color: #F84221;
+					font-size: 29.79rpx;
+				}
+
+			}
+		}
+	}
+
+	.store {
+		.goods_list {
+			margin-top: 20rpx;
+
+			.goods_cards {
+				margin-top: 20rpx;
+				height: auto;
+				background-color: white;
+				padding: 20rpx;
+				border-radius: 20rpx;
+				display: flex;
+				// align-items: center;
+
+				.left {
+					margin-right: 20rpx;
+					width: 158rpx;
+					height: 158rpx;
+					// background-color: red;
+					border-radius: 20rpx;
+					overflow: hidden;
+				}
+
+				.right {
+					// box-sizing: border-box;
+					width: 75vw;
+					overflow: hidden;
+					// background-color: red;
+
+					.heads {
+						font-weight: bold;
+
+						.flag {
+							background: linear-gradient(to bottom, #F84221, #FF6D20);
+							width: 66.59rpx;
+							height: 36.8rpx;
+							text-align: center;
+							font-size: 22.78rpx;
+							color: white;
+							border-radius: 10.51rpx 10.51rpx 10.51rpx 10.51rpx;
+						}
+
+					}
+
+					.goods_card_a {
+						margin-right: 20rpx;
+					}
+
+					.goods_price_a {
+						color: #F84221;
+					}
+
+					.goods_tit_a {
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+
+					.li {
+						display: flex;
+						font-size: 26.29rpx;
+						margin-bottom: 10rpx;
+
+						align-items: center;
+						color: #737373;
+
+						text {
+							margin: 0 10rpx 0;
+						}
+					}
+				}
+			}
+		}
+
+		.address {
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			width: 200px;
+		}
+
+	}
+
+	.img_cls {
+		position: absolute;
+		top: 50%;
+		right: 7rpx;
+		transform: translateY(-50%);
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/nongKe/specialty/index.vue b/pages/nongKe/specialty/index.vue
index 2b54dbe..8ed58d4 100644
--- a/pages/nongKe/specialty/index.vue
+++ b/pages/nongKe/specialty/index.vue
@@ -60,7 +60,7 @@
 							<view class="li head" style="display: flex;">
 								<text class="com_name">{{item.mer_name}}</text>
 								<text
-									style="font-weight: normal; font-size: 10rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
+									style="font-weight: normal;font-size: 19.28rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
 							</view>
 							<view class="li">
 								<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
diff --git a/pages/nongKe/supply_chain/supplierA.vue b/pages/nongKe/supply_chain/supplierA.vue
index 1836928..81d380f 100644
--- a/pages/nongKe/supply_chain/supplierA.vue
+++ b/pages/nongKe/supply_chain/supplierA.vue
@@ -19,9 +19,6 @@
 
 					</view>
 					<view style="position: relative;">
-						<!-- <text class='iconfont icon-sousuo'></text>
-			<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
-				:value='sotreParam.keyword' @confirm="searchSubmit"></input> -->
 						<u-search borderColor="#FF6D20" bgColor="white" :showAction="false" placeholder="搜索店铺名称"
 							v-model="sotreParam.keyword" class="serch_cls"></u-search>
 						<u--image @tap="searchSubmit" class="img_cls" :showLoading="true"
@@ -58,7 +55,7 @@
 							<view class="li head" style="display: flex;">
 								<text class="com_name">{{item.mer_name}}</text>
 								<text
-									style="font-weight: normal; font-size: 10rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
+									style="font-weight: normal;font-size: 19.28rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
 							</view>
 							<view class="li">
 								<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
diff --git a/pages/nongKe/tourism/index.vue b/pages/nongKe/tourism/index.vue
index 7f1c0f4..6de73cb 100644
--- a/pages/nongKe/tourism/index.vue
+++ b/pages/nongKe/tourism/index.vue
@@ -60,7 +60,7 @@
 							<view class="li head" style="display: flex;">
 								<text class="com_name">{{item.mer_name}}</text>
 								<text
-									style="font-weight: normal; font-size: 10rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
+									style="font-weight: normal;font-size: 19.28rpx;color: red;padding:0 10rpx; border-radius: 10rpx; border: 1px solid red;">{{item.type_name}}</text>
 							</view>
 							<view class="li">
 								<u--image v-for="item,index in [1,1,,1,1,1]" :key="index" :showLoading="true"
diff --git a/pages/short_video/nvueSwiper/index.nvue b/pages/short_video/nvueSwiper/index.nvue
index 955dc8d..50968b1 100644
--- a/pages/short_video/nvueSwiper/index.nvue
+++ b/pages/short_video/nvueSwiper/index.nvue
@@ -19,7 +19,7 @@
 		<view class="header">
 			<view class="tool-bar">
 				<view class='xiangzuo' @tap='goBack'>
-					<image src="@/static/images/icon-back.png" mode="aspectFit"></image>
+					<!-- <image src="@/static/images/icon-back.png" mode="aspectFit"></image> -->
 				</view>
 			</view>
 			<!-- <view class="tool-bar">

From e5fc681415c03518c1ac8d3b0961c862d7801e8f Mon Sep 17 00:00:00 2001
From: THK3121 <thk121969318@163.com>
Date: Wed, 6 Sep 2023 11:59:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=88=E8=B4=A7=E5=90=8E=E6=AC=BE?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/supply_procurement/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pages/users/supply_procurement/index.vue b/pages/users/supply_procurement/index.vue
index 032effd..c23819d 100644
--- a/pages/users/supply_procurement/index.vue
+++ b/pages/users/supply_procurement/index.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="conent">
 		<view class="con_kuo"
-			@click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&product_type=98&cate_id=${id}`)">
+			@click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=1&type_id=12&isDetail=1&credit_buy=0&product_type=98&cate_id=${id}`)">
 			<image class="con_img" src="@/static/images/bg1.png" mode=""></image>
 			<image class="con_ico" src="@/static/images/bgic1.png" mode=""></image>
 			<view class="con_text">
@@ -10,7 +10,7 @@
 			</view>
 		</view>
 		<view class="con_kuo"
-			@click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=2&type_id=12&isDetail=1&product_type=98&cate_id=${id}`)">
+			@click="navigator(`/pages/nongKe/supply_chain/supplierA?tit=2&type_id=12&isDetail=1&credit_buy=1&product_type=98&cate_id=${id}`)">
 			<image class="con_img" src="@/static/images/bg2.png" mode=""></image>
 			<image class="con_ico" src="@/static/images/bgic2.png" mode=""></image>
 			<view class="con_text">