供销综合市场页面修改

api/store.js

@@ -467,7 +467,9 @@ export function getGeocoder(data) {
  * 
  */
 export function getStoreTypeApi() {
-  return request.get('intention/type', {sift_store:0}, {
+	return request.get('intention/type', {
+		sift_store: 0
+	}, {
 		noAuth: true
 	});
 }
@@ -544,3 +546,19 @@ export function priceRuleApi(id) {
 		noAuth: true
 	});
 }
+/**
+ * 供销市场标签
+ * @returns {*}
+ */
+export function supMenuApi(data) {
+	return request.get('intention/cate', data);
+}
+/**
+ * 供销市场标签
+ * @returns {*}
+ */
+export function supAgoodsApi(data) {
+	return request.get('store/merchant/lst', data);
+}
+// /api/store / merchant / lst ? page = 1 & limit = 10 & order = & category_id = 22 & type_id = 10 & street_id = &
+// 	credit_buy =

pages.json

@@ -200,6 +200,15 @@
 						"navigationStyle": "custom"
 					}
 
+				}, {
+					"path": "supply_chain/supplierA",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "",
+						"navigationBarBackgroundColor": "#e93323",
+						"navigationStyle": "custom"
+					}
+
 				}, {
 					"path": "supply_chain/merchant",
 					"style": {
@@ -719,7 +728,8 @@
 						"enablePullDownRefresh": false
 					}
 
-				}]
+				}
+			]
 		},
 		{
 			"root": "pages/commissionedSales",

pages/nongKe/supply_chain/supplier.vue

@@ -1,27 +1,99 @@
 <template>
-	<view>
+	<view style="background-color: #F0F2F5;min-height: 100vh">
-	
+		<view style="height: var(--status-bar-height);"></view>
 		<view class='productList' :style="viewColor">
-			<view class='search acea-row row-between-wrapper' :class="'styleType'+store_street_theme">
+			<!-- 顶部 -->
-			
+			<view class="top">
+				<view style="display: flex;justify-content: space-around; align-items: center;">
 					<view class="back" @click='backjJump()'>
-					<view class="iconfont icon-xiangzuo"></view>
+						<view class="iconfont icon-xiangzuo" style="color: #333333;"></view>
+					</view>
+					<view class="">
+						供销综合云市场
+					</view>
+					<view style="position: relative;width: 289.14rpx;">
+						<!-- <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" style="position: absolute; top: 3px;right: 3px;"
+							:showLoading="true" src="/static/images/GXSC/SS.png" width="115.65rpx"
+							height="56.82rpx"></u--image>
+					</view>
+					<view class='iconfont search-right' @click='showMaoLocation(latitude,longitude)'>
+						<u--image :showLoading="true" src="/static/images/GXSC/DW.png" width="50.82rpx"
+							height="50.82rpx"></u--image>
+					</view>
+				</view>
+			</view>
+			<view class="content">
+				<view class="hot_serch">
+					<text>热搜:</text> <text>热a搜商品</text> <text>热搜商品</text>
+					<text>热搜sasas商品</text>
 				</view>
 
-				<view class='input acea-row row-between-wrapper'><text class='iconfont icon-sousuo'></text>
+				<view class="menu_cls">
-					<input placeholder='搜索店铺名称' placeholder-class='placeholder' confirm-type='search' name="search"
+
-						:value='sotreParam.keyword' @confirm="searchSubmit"></input>
+					<u-scroll-list>
+						<view class="menu_li" @click="navGo(item.merchant_category_id)" v-for="item,index in menuList"
+							:key="index">
+							<!-- {{item.merchant_category_id}} -->
+							<u--image :showLoading="true" :src="imgList[index]" width="94.63rpx" height="99.63rpx"
+								style="margin-bottom: 20rpx;"></u--image>
+							<text style="display: block;    width: 15vw;">{{item.category_name}}</text>
 						</view>
-		<!-- 		<view v-if="mer_location == 1" :class="'styleType'+store_street_theme" style="text-align: right;"
+					</u-scroll-list>
-					class='iconfont search-right' @click='showMaoLocation(latitude,longitude)'>
-					<view class="iconfont icon-dingwei"></view>
-					<view class="right-text" v-if="recommend_address">
-						{{recommend_address}}
 				</view>
-					<view class="iconfont icon-xiangyou" v-if="recommend_address"></view>
+				</u-scroll-list>
+				<view class="goods_list">
+					<view class="goods_card" @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>
+						<view class="right">
-			<view class="nav-wrapper" :class="'styleType'+store_street_theme">
+							<view class="li head">
+								<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>
+							</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: 20rpx;color: #FF6D20; ">5.0</text>
+								<text>月销2000+</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>
+
+					</view>
+
+				</view>
+
+
+			</view>
+
+			<!-- 热搜 -->
+
+
+
+			<!-- <view class="nav-wrapper" :class="'styleType'+store_street_theme">
 				<view class='nav acea-row row-middle' :class="'styleType'+store_street_theme">
 					<view v-for="item in downMenus" :key="item.key" class='item'
 						:class="{'font-colors':firstKey == item.key}" @click='set_where(item.key)'>
@@ -34,7 +106,11 @@
 
 				</view>
 			</view>
+			
+			 -->
+
 			<!-- 店铺 -->
+			<!-- 
 			<block>
 				<view class="store-wrapper">
 					<view class="store-item" v-for="(item,index) in storeList" :key="index">
@@ -170,9 +246,12 @@
 			<view class='loadingicon acea-row row-center-wrapper' v-if="loading">
 				<text class='loading iconfont icon-jiazai' :hidden='loading==false'></text>{{loadTitle}}
 			</view>
+		 -->
+
+
 		</view>
 		<view class='no-shop' v-if="!storeList.length && !loading && !loadingIcon" v-cloak>
-			<view class='pictrue' style="margin: 0 auto;">
+			<view class='pictrue' style="margin: 0 auto;background-color: #F5F5F5;">
 				<image src='../../../static/images/noCart.png'></image>
 				<text>暂无店铺，快去搜索其他店铺吧</text>
 			</view>
@@ -190,7 +269,8 @@
 <script>
 	import {
 		storeMerchantList,
-		getGeocoder
+		getGeocoder,
+		supMenuApi
 	} from '@/api/store.js';
 	import recommend from './component/recommend';
 	import rightSlider from './component/rightSlider';
@@ -217,6 +297,15 @@
 		},
 		data() {
 			return {
+				imgList: [
+					"/static/images/GXSC/BBY.png",
+					"/static/images/GXSC/JYPX.png",
+					"/static/images/GXSC/NFCP.png",
+					"/static/images/GXSC/SCFW.png",
+					"/static/images/GXSC/BBY.png",
+
+
+				],
 				price: 0,
 				stock: 0,
 				nows: false,
@@ -233,6 +322,7 @@
 				brandList: [],
 				downKey: 0,
 				downStatus: false,
+				menuList: [],
 				// 下拉菜单
 				downMenu: [{
 						title: '默认',
@@ -289,7 +379,7 @@
 			};
 		},
 		onLoad(options) {
-			console.log(options);
+			// console.log(options);
 			this.product_type = options.product_type ?? 0
 			if (options.street_id != undefined) {
 				this.sotreParam.street_id = options.street_id
@@ -305,6 +395,9 @@
 			this.storeMerchantList();
 			this.getClassfication();
 			this.getStoreType();
+			supMenuApi().then(res => {
+				this.menuList = res.data
+			})
 		},
 		computed: {
 			downMenus: function() {
@@ -325,6 +418,11 @@
 			}, mapGetters(['viewColor'])),
 		},
 		methods: {
+			navGo(id) {
+				uni.navigateTo({
+					url: `/pages/nongKe/supply_chain/supplierA?type_id=10&merchant_category_id=${id}`
+				})
+			},
 			go_details: function(product_type, product_id) {
 				if (product_type == 98) {
 					uni.navigateTo({
@@ -521,9 +619,9 @@
 					}
 				}
 			},
-			searchSubmit: function(e) {
+			searchSubmit: function() {
 				let that = this;
-				that.$set(that.sotreParam, 'keyword', e.detail.value);
+				that.$set(that.sotreParam, 'keyword', this.sotreParam.keyword);
 				this.set_where(this.firstKey)
 			},
 			// 右侧切换
@@ -616,49 +714,107 @@
 </script>
 
 <style lang="scss" scoped>
-	.productList .search {
+	* {
-		width: 100%;
+		margin: 0;
-		height: 146rpx;
+		padding: 0;
-		padding: 0 20rpx;
+	}
-		box-sizing: border-box;
+
+	.com_name {
+		font-size: 32rpx;
+		// background-color: red;
+		max-width: 40vw;
+		white-space: nowrap;
+		/* 防止文字换行 */
+		overflow: hidden;
+		/* 超出部分隐藏 */
+		text-overflow: ellipsis;
+		/* 使用省略号表示溢出的内容 */
+		width: 200px;
+		/* 可根据实际情况调整容器宽度 */
+	}
+
+	.productList {
+		// padding-top: 50rpx;
+		// padding: 0 20rpx 0;
+
+		.top {
+			padding-top: 20rpx;
+			background-color: white;
 			position: fixed;
-		left: 0;
+			z-index: 999;
+			width: 100%;
 			top: 0;
-		z-index: 9;
-		display: flex;
-		flex-wrap: nowrap;
-		background-color: #fff;
-		padding-top: 80rpx;
-        padding-bottom: 20rpx;
-		&.styleType1 {
-			background-color: var(--view-theme);
 		}
 
-		.search-right {
+		.content {
+			padding: 20rpx;
+		}
+
+		.menu_cls {
+			background-color: white;
+			// height: 199.77rpx;
+			border-radius: 21.03rpx 21.03rpx 21.03rpx 21.03rpx;
+			padding: 20rpx;
+
+			.menu_li {
+				margin-right: 50rpx;
+				// background-color: red;
+				width: 50vw;
+				// width: 120rpx;
+				// display: inline-block;
+			}
+
+
+		}
+
+		.goods_list {
+			margin-top: 20rpx;
+
+			.goods_card {
+				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;
+					border-radius: 20rpx;
+					overflow: hidden;
+				}
+
+				.right {
+					.head {
+						font-weight: bold;
+
+					}
+
+					.li {
+						display: flex;
+						font-size: 22rpx;
+						margin-bottom: 10rpx;
 						align-items: center;
-			justify-content: space-between;
+
-			max-width: max-content;
+						text {
-			flex: 1;
+							margin: 0 20rpx 0 5rpx;
-			padding-left: 20rpx;
+						}
+					}
+				}
+			}
 		}
 
-		.right-text {
+		.address {
+			white-space: nowrap;
 			overflow: hidden;
 			text-overflow: ellipsis;
-			white-space: nowrap;
+			width: 200px;
-			font-size: 28rpx;
+		}
-			width: max-content;
-			color: #fff;
-			padding: 0 10rpx;
 	}
 
-		.icon-xiangyou,
-		.icon-dingwei {
-			font-size: 30rpx;
-			color: #fff;
-		}
-	}
 
 	.search-right.styleType2 .right-text,
 	.search-right.styleType3 .right-text {
@@ -687,6 +843,20 @@
 		}
 	}
 
+	.hot_serch {
+		color: #B3B3B3;
+		display: flex;
+		justify-content: space-around;
+		margin: 20rpx 0;
+		flex-wrap: wrap;
+		// margin-top: 50rpx;
+		padding-top: 50rpx;
+
+		text {
+			margin: 10rpx;
+		}
+	}
+
 	.productList .search .input {
 		flex: 1;
 		height: 60rpx;
@@ -1109,7 +1279,7 @@
 
 	.no-shop {
 		background-color: #fff;
-		padding-bottom: calc(100% - 176rpx);
+		// padding-bottom: calc(100% - 176rpx);
 
 		.pictrue {
 			display: flex;
@@ -1123,6 +1293,7 @@
 			}
 		}
 	}
+
 	.guanbi {
 		width: 20px;
 		height: 20px;