From 192786c6e3c502c889f118f042bbc979b729b0f8 Mon Sep 17 00:00:00 2001
From: weipengfei <2187978347@qq.com>
Date: Wed, 13 Mar 2024 14:08:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                 |   2 +-
 components/recommend/index.vue          |  14 +-
 pages.json                              |  18 ++
 pages/cloud_warehouse/home/home.vue     | 346 ++++++++++++++++++++++++
 pages/cloud_warehouse/market/market.vue | 306 +++++++++++++++++++++
 pages/gather/gather.vue                 |  12 +-
 pages/users/login/login_copy.vue        |   2 +-
 store/modules/app.js                    |  12 +-
 8 files changed, 700 insertions(+), 12 deletions(-)
 create mode 100644 pages/cloud_warehouse/home/home.vue
 create mode 100644 pages/cloud_warehouse/market/market.vue

diff --git a/App.vue b/App.vue
index 8d1df25..bdd538d 100644
--- a/App.vue
+++ b/App.vue
@@ -117,7 +117,7 @@
 				that.$Cache.set('MP_VERSION_ISNEW', false)
 			}
 			// #endif
-			that.getConfigData()
+			that.getConfigData();
 		},
 		onShow() {
 			let that = this
diff --git a/components/recommend/index.vue b/components/recommend/index.vue
index 5317a33..b4d1a17 100644
--- a/components/recommend/index.vue
+++ b/components/recommend/index.vue
@@ -6,7 +6,7 @@
 
 		<!-- nav导航 -->
 		<view class="nav">
-			<view class="nav-item">
+			<view class="nav-item" @click="navTo('/pages/cloud_warehouse/home/home')">
 				<view class="nav-item-up">
 					<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/1c050202403121539159687.png" mode=""></image>
 				</view>
@@ -15,7 +15,7 @@
 					<view class="nav-item-down-desc">供销物资市场</view>
 				</view>
 			</view>
-			<view class="nav-item">
+			<view class="nav-item" @click="navTo('/pages/cloud_warehouse/market/market')">
 				<view class="nav-item-up">
 					<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/9d4d720240312153933187.png" mode=""></image>
 				</view>
@@ -77,6 +77,7 @@
 	import {
 		HTTP_REQUEST_URL
 	} from '@/config/app';
+import { Toast } from "../../libs/uniApi";
 	export default {
 		components: {
 			WaterfallsFlow
@@ -137,6 +138,15 @@
 			changeTab(e) {
 				this.currTabs = e;
 			},
+      
+      navTo(url){
+        uni.navigateTo({
+          url: url,
+          fail: () => {
+            Toast('暂未开放')
+          }
+        })
+      },
 
 			goDetail(item) {
 				goShopDetail(item, this.uid).then(res => {
diff --git a/pages.json b/pages.json
index 1bf1877..9aaa692 100644
--- a/pages.json
+++ b/pages.json
@@ -272,6 +272,24 @@
 						"bounce": "none"
 					}
 				}
+			},
+			{
+			  "path" : "home/home",
+			  "style" : 
+			  {
+			    "navigationBarTitleText" : "里海云仓",
+			    "enablePullDownRefresh" : false,
+          "navigationStyle": "custom"
+			  }
+			},
+			{
+			  "path" : "market/market",
+			  "style" : 
+			  {
+			    "navigationBarTitleText" : "供销云市场",
+			    "enablePullDownRefresh" : false,
+          "navigationStyle": "custom"
+			  }
 			}]
 		}, {
 			"root": "pages/users",
diff --git a/pages/cloud_warehouse/home/home.vue b/pages/cloud_warehouse/home/home.vue
new file mode 100644
index 0000000..6ed5010
--- /dev/null
+++ b/pages/cloud_warehouse/home/home.vue
@@ -0,0 +1,346 @@
+<style lang="scss" scoped>
+	page {
+		background-color: #f8fafb !important;
+	}
+
+	.wholeSale {
+    background-color: #f8fafb !important;
+		.wholeSale-header {
+			margin-bottom: 20rpx;
+			// background-color: #40AE36;
+
+			.scrollview {
+				display: flex;
+				align-items: center;
+				height: 98rpx;
+				padding-left: 32rpx;
+
+				.scrollview-item {
+					margin-right: 30rpx;
+					font-size: 28rpx;
+					color: #FFFFFF;
+				}
+
+				.scrollview-active {
+					position: relative;
+					font-weight: bold;
+					font-size: 36rpx;
+					color: #FFFFFF;
+
+					&::after {
+						content: "";
+						display: inline-block;
+						position: absolute;
+						bottom: -6rpx;
+						left: 50%;
+						transform: translateX(-50%);
+						width: 100%;
+						height: 6rpx;
+						background-color: #FFFFFF;
+					}
+				}
+			}
+		}
+
+		.wholeSale-con {
+			margin: 0 30rpx;
+      
+      .wholeSale-nav{
+        display: flex;
+        align-items: center;
+				margin-bottom: 40rpx;
+        .icon{
+          margin-right: 20rpx;
+        }
+      }
+      
+			.search_content {
+				// margin-bottom: 40rpx;
+        flex: 1;
+				height: 70rpx;
+				padding: 2px 2px 2px 21.05rpx;
+				border-radius: 80rpx;
+				background: #EDEFF2;
+				position: relative;
+				box-sizing: border-box;
+
+				.search_content_wrap {
+					width: 100%;
+
+					.icon-sousuo {
+						font-size: 26.32rpx;
+						font-weight: bold;
+						color: #c8c7c6;
+						margin-right: 17.54rpx;
+					}
+
+					input {
+						width: 80%;
+					}
+				}
+
+				.search_btn {
+					width: 106rpx;
+					height: 60rpx;
+					line-height: 60rpx;
+					background: #40AE36;
+					border-radius: 100px;
+					font-size: 28rpx;
+					color: #fff;
+				}
+			}
+
+			.category {
+				width: 100%;
+				overflow: auto;
+				margin-bottom: 20rpx;
+
+				.category-wrap {
+					display: flex;
+					padding-bottom: 20rpx;
+
+					.category-item {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						margin-right: 38rpx;
+
+						text {
+							margin-top: 16rpx;
+							font-size: 24rpx;
+							color: #666666;
+							white-space: nowrap;
+						}
+					}
+
+					.category-item-active {
+						position: relative;
+
+						&::after {
+							content: "";
+							display: inline-block;
+							position: absolute;
+							bottom: -6rpx;
+							width: 100%;
+							height: 6rpx;
+							background-color: #40AE36;
+							border-radius: 4rpx;
+						}
+					}
+				}
+			}
+
+			.cate {
+				width: 100%;
+				overflow: auto;
+				margin-bottom: 30rpx;
+
+				.cate-wrap {
+					display: flex;
+					padding-bottom: 8rpx;
+
+					.cate-item {
+
+						text {
+							padding: 4rpx 16rpx;
+							white-space: nowrap;
+							font-size: 30rpx;
+							color: #333;
+						}
+					}
+
+					.cate-item-active {
+						text {
+							color: #40AE36;
+							font-weight: bold;
+						}
+					}
+				}
+			}
+
+			.comprehensive {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding: 0 50rpx;
+
+				[class^=comprehensive-] {
+					display: flex;
+					align-items: center;
+
+					text {
+						margin-right: 12rpx;
+						font-size: 26rpx;
+						color: #666666;
+					}
+
+					image {
+						width: 28rpx;
+						height: 28rpx;
+					}
+
+					.loudou {
+						width: 24rpx;
+						height: 24rpx;
+					}
+				}
+			}
+		}
+	}
+</style>
+<template>
+	<view class="wholeSale">
+
+		<!-- 顶部 -->
+		<view class="wholeSale-header">
+			<!-- 适配不同机 -->
+			<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
+      <view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
+        <view style="display: flex;font-weight: bold;"><u-icon style="margin-right: 20rpx;" name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>里海云仓</view>
+      </view>
+		</view>
+
+		<!-- 内容 -->
+		<view class="wholeSale-con">
+      <view class="wholeSale-nav">
+        <!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
+        <!-- 搜索 -->
+        <navigator url="/pages/columnGoods/goods_search/index" hover-class="none"
+        	class="search_content flex_a_c_j_sb">
+        	<view class="flex_a_c search_content_wrap">
+        		<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+        		<input type="text" placeholder="搜索您需要批发进货的产品名称" placeholder-style="font-size: 30rpx;color:#999;"
+        			disabled style="pointer-events: none;">
+        	</view>
+        	<!-- <button class="search_btn">搜索</button> -->
+        </navigator>
+      </view>
+
+			<!-- 商品大分类 -->
+			<view class="category">
+				<scroll-view scroll-x="true">
+					<view class="category-wrap">
+						<block v-for="(item,index) in store_category" :key="index">
+							<view class="category-item" :class="{'category-item-active': index==cate_change}" @click="changeCate(index)">
+								<u-image width="108rpx" :src="item.pic" height="108rpx" shape="circle" :lazy-load="true">
+									<template v-slot:loading>
+										<u-loading-icon color="#999" size="15" />
+									</template>
+								</u-image>
+								<text>{{item.cate_name}}</text>
+							</view>
+						</block>
+					</view>
+				</scroll-view>
+			</view>
+
+			<!-- 商品小分类 -->
+			<view class="cate">
+				<scroll-view scroll-x="true">
+					<view class="cate-wrap">
+						<block v-for="(item,index) in store_category_children" :key="index">
+							<view class="cate-item" :class="{'cate-item-active':index == cate_change_children}" @click="changeChildrenCate(index)">
+								<text>{{item.cate_name}}</text>
+							</view>
+						</block>
+					</view>
+				</scroll-view>
+			</view>
+
+			<!-- 综合查询 -->
+			<view class="comprehensive">
+				<view class="comprehensive-price">
+					<text>价格</text>
+					<image src="@/static/new_define/priceChange.png"></image>
+				</view>
+				<view class="comprehensive-sales_num">
+					<text>销量</text>
+				</view>
+				<view class="comprehensive-discount">
+					<text>抵扣</text>
+					<image class="loudou" src="@/static/new_define/loudou.png"></image>
+				</view>
+			</view>
+
+			<!-- 流水瀑布 -->
+			<WaterfallsFlow :wfList='hostProduct' @itemTap="goDetail" :type="0" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
+  import {
+    getStoreCategory
+  } from "@/api/store.js"
+	export default {
+		components: {
+			WaterfallsFlow
+		},
+		data() {
+			return {
+        hostProduct: [],
+        store_category: [], //商品大分类
+        store_category_children: [], //商品小分类
+        cate_change: 0,
+        cate_change_children: 0,
+        where:{
+          page: 1,
+          limit: 20,
+          
+        }
+			}
+		},
+    onLoad(option){
+      this.getStoreCategory();
+    },
+		methods: {
+      navBack(){ 
+        uni.navigateBack();
+      },
+			tabsChange(e) {
+				this.tabsCurr = e;
+			},
+      changeCate(e){
+        this.cate_change = e;
+        this.cate_change_children = 0;
+      },
+      changeChildrenCate(e){
+        this.cate_change_children = e;
+      },
+      getStoreCategory(){
+        getStoreCategory(259).then(res=>{
+          this.store_category = res.data;
+          this.store_category_children = this.store_category[0].children || [];
+          this.store_category_children.unshift({
+            cate_name: '全部'
+          })
+        })
+      },
+			goDetail(item) {
+				goShopDetail(item, this.uid).then(res => {
+					if (this.isLogin) {
+						initiateAssistApi(item.activity_id).then(res => {
+							let id = res.data.product_assist_set_id;
+							uni.hideLoading();
+							uni.navigateTo({
+								url: '/pages/activity/assist_detail/index?id=' + id
+							});
+						}).catch((err) => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						});
+					} else {
+						toLogin();
+					}
+				})
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/cloud_warehouse/market/market.vue b/pages/cloud_warehouse/market/market.vue
new file mode 100644
index 0000000..debf87f
--- /dev/null
+++ b/pages/cloud_warehouse/market/market.vue
@@ -0,0 +1,306 @@
+<style lang="scss" scoped>
+	page {
+		background-color: #f8fafb !important;
+	}
+
+	.wholeSale {
+    background-color: #f8fafb !important;
+		.wholeSale-header {
+			margin-bottom: 20rpx;
+			// background-color: #40AE36;
+
+			.scrollview {
+				display: flex;
+				align-items: center;
+				height: 98rpx;
+				padding-left: 32rpx;
+
+				.scrollview-item {
+					margin-right: 30rpx;
+					font-size: 28rpx;
+					color: #FFFFFF;
+				}
+
+				.scrollview-active {
+					position: relative;
+					font-weight: bold;
+					font-size: 36rpx;
+					color: #FFFFFF;
+
+					&::after {
+						content: "";
+						display: inline-block;
+						position: absolute;
+						bottom: -6rpx;
+						left: 50%;
+						transform: translateX(-50%);
+						width: 100%;
+						height: 6rpx;
+						background-color: #FFFFFF;
+					}
+				}
+			}
+		}
+
+		.wholeSale-con {
+			margin: 0 30rpx;
+      
+      .wholeSale-nav{
+        display: flex;
+        align-items: center;
+				margin-bottom: 40rpx;
+        .icon{
+          margin-right: 20rpx;
+        }
+      }
+      
+			.search_content {
+				// margin-bottom: 40rpx;
+        flex: 1;
+				height: 70rpx;
+				padding: 2px 2px 2px 21.05rpx;
+				border-radius: 80rpx;
+				background: #EDEFF2;
+				position: relative;
+				box-sizing: border-box;
+
+				.search_content_wrap {
+					width: 100%;
+
+					.icon-sousuo {
+						font-size: 26.32rpx;
+						font-weight: bold;
+						color: #c8c7c6;
+						margin-right: 17.54rpx;
+					}
+
+					input {
+						width: 80%;
+					}
+				}
+
+				.search_btn {
+					width: 106rpx;
+					height: 60rpx;
+					line-height: 60rpx;
+					background: #40AE36;
+					border-radius: 100px;
+					font-size: 28rpx;
+					color: #fff;
+				}
+			}
+
+			.category {
+				width: 100%;
+				overflow: auto;
+				margin-bottom: 20rpx;
+
+				.category-wrap {
+					display: flex;
+					padding-bottom: 20rpx;
+
+					.category-item {
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						margin-right: 38rpx;
+
+						text {
+							margin-top: 16rpx;
+							font-size: 24rpx;
+							color: #666666;
+							white-space: nowrap;
+						}
+					}
+
+					.category-item-active {
+						position: relative;
+            .category-item-img{
+              border: 2px solid #40AE36;
+              border-radius: 50%;
+            }
+            text{
+              background-color: #40AE36;
+              color: #fff;
+              padding: 2rpx 10rpx 6rpx 10rpx;
+              border-radius: 50rpx;
+            }
+					}
+				}
+			}
+
+			.cate {
+				width: 100%;
+				overflow: auto;
+				margin-bottom: 30rpx;
+
+				.cate-wrap {
+					display: flex;
+					padding-bottom: 8rpx;
+
+					.cate-item {
+
+						text {
+							padding: 4rpx 16rpx;
+							white-space: nowrap;
+							font-size: 30rpx;
+							color: #333;
+						}
+					}
+
+					.cate-item-active {
+						text {
+							color: #40AE36;
+							font-weight: bold;
+						}
+					}
+				}
+			}
+
+			.comprehensive {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				padding: 0 50rpx;
+
+				[class^=comprehensive-] {
+					display: flex;
+					align-items: center;
+
+					text {
+						margin-right: 12rpx;
+						font-size: 26rpx;
+						color: #666666;
+					}
+
+					image {
+						width: 28rpx;
+						height: 28rpx;
+					}
+
+					.loudou {
+						width: 24rpx;
+						height: 24rpx;
+					}
+				}
+			}
+		}
+	}
+</style>
+<template>
+	<view class="wholeSale">
+
+		<!-- 顶部 -->
+		<view class="wholeSale-header">
+			<!-- 适配不同机 -->
+			<view style="height: var(--status-bar-height);background-color: #40af37;"></view>
+      <view style="display: flex;padding: 20rpx 28rpx;background-color: #40af37;color: #fff;">
+        <view style="display: flex;font-weight: bold;"><u-icon style="margin-right: 20rpx;" name="arrow-left" size="20" color="#fff" @click="navBack"></u-icon>供销综合云市场</view>
+      </view>
+		</view>
+
+		<!-- 内容 -->
+		<view class="wholeSale-con">
+      <view class="wholeSale-nav">
+        <!-- <u-icon class="icon" name="arrow-left" size="20" @click="navBack"></u-icon> -->
+        <!-- 搜索 -->
+        <navigator url="/pages/columnGoods/goods_search/index" hover-class="none"
+        	class="search_content flex_a_c_j_sb">
+        	<view class="flex_a_c search_content_wrap">
+        		<view class="iconfont icon-sousuo" style="font-size: 39rpx;"></view>
+        		<input type="text" placeholder="搜索您需要批发进货的产品名称" placeholder-style="font-size: 30rpx;color:#999;"
+        			disabled style="pointer-events: none;">
+        	</view>
+        	<!-- <button class="search_btn">搜索</button> -->
+        </navigator>
+      </view>
+
+			<!-- 商品大分类 -->
+			<view class="category">
+				<scroll-view scroll-x="true">
+					<view class="category-wrap">
+						<block v-for="(item,index) in store_category" :key="index">
+							<view class="category-item" :class="{'category-item-active': index==cate_change}" @click="changeCate(index)">
+								<u-image class="category-item-img" width="108rpx" :src="item.background" height="108rpx" shape="circle" :lazy-load="true">
+									<template v-slot:loading>
+										<u-loading-icon color="#999" size="15" />
+									</template>
+								</u-image>
+								<text>{{item.category_name}}</text>
+							</view>
+						</block>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		goShopDetail
+	} from '@/libs/order.js'
+	import WaterfallsFlow from '@/components/WaterfallsFlow/WaterfallsFlow.vue'
+  import {
+    merClassifly
+  } from "@/api/store.js"
+	export default {
+		components: {
+			WaterfallsFlow
+		},
+		data() {
+			return {
+        hostProduct: [],
+        store_category: [], //商品大分类
+        store_category_children: [], //商品小分类
+        cate_change: 0,
+        cate_change_children: 0,
+        where:{
+          page: 1,
+          limit: 20,
+          
+        }
+			}
+		},
+    onLoad(option){
+      this.merClassifly();
+    },
+		methods: {
+      navBack(){ 
+        uni.navigateBack();
+      },
+			tabsChange(e) {
+				this.tabsCurr = e;
+			},
+      changeCate(e){
+        this.cate_change = e;
+      },
+      merClassifly(){
+        merClassifly(259).then(res=>{
+          this.store_category = res.data;
+        })
+      },
+			goDetail(item) {
+				goShopDetail(item, this.uid).then(res => {
+					if (this.isLogin) {
+						initiateAssistApi(item.activity_id).then(res => {
+							let id = res.data.product_assist_set_id;
+							uni.hideLoading();
+							uni.navigateTo({
+								url: '/pages/activity/assist_detail/index?id=' + id
+							});
+						}).catch((err) => {
+							uni.showToast({
+								title: err,
+								icon: 'none'
+							})
+						});
+					} else {
+						toLogin();
+					}
+				})
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/gather/gather.vue b/pages/gather/gather.vue
index d8a40a7..eecc21b 100644
--- a/pages/gather/gather.vue
+++ b/pages/gather/gather.vue
@@ -132,7 +132,6 @@
 </style>
 <template>
 	<view class="gather">
-
 		<!--顶部定位-->
 		<view class="gather-header">
 			<view style="height: var(--status-bar-height);"></view>
@@ -191,7 +190,8 @@
 						<view class="examine" @click="editFlag ? removeMenu(item) : clickMenu(item)">
 							<image class="icon_img" :src="item.pic" mode="aspectFit">
 							</image>
-							<u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon>
+							<!-- <u-icon v-if="editFlag" class="icon" name="minus-circle-fill" color="red"></u-icon> -->
+              <view v-if="editFlag" class="icon" style="background-color: red;">隐藏</view>
 							<text class="text">{{ item.name }}</text>
 						</view>
 					</u-transition>
@@ -216,7 +216,8 @@
 				<u-transition v-for="(item, index) in AllMenuList" :key="item.name" show>
 					<view class="examine" @click="pushMenu(item)">
 						<image class="icon_img" :src="item.pic" mode="aspectFit"> </image>
-						<u-icon class="icon" name="plus-circle-fill"></u-icon>
+						<!-- <u-icon class="icon" name="plus-circle-fill"></u-icon> -->
+            <view class="icon">添加</view>
 						<text class="text">{{ item.name }}</text>
 					</view>
 				</u-transition>
@@ -665,6 +666,11 @@
 					position: absolute;
 					top: -5rpx;
 					right: 25rpx;
+          background-color: green;
+          color: #fff;
+          border-radius: 50rpx;
+          font-size: 22rpx;
+          padding: 5rpx 10rpx;
 				}
 
 				.text {
diff --git a/pages/users/login/login_copy.vue b/pages/users/login/login_copy.vue
index 2e3c706..d36799b 100644
--- a/pages/users/login/login_copy.vue
+++ b/pages/users/login/login_copy.vue
@@ -1,7 +1,7 @@
 <template>
 	<div :style="viewColor">
 		<div class="register absolute" v-if="!auth_token">
-			<div class="login">
+			<div class="login" style="background-size: 100% 100%;background-repeat: no-repeat;">
 				<div class="shading">
 					<div class="pictrue acea-row row-center-wrapper" style="background-color: transparent !important;">
 						<image src="@/static/images/logo1.png" />
diff --git a/store/modules/app.js b/store/modules/app.js
index d79ff6c..f746db1 100644
--- a/store/modules/app.js
+++ b/store/modules/app.js
@@ -13,18 +13,16 @@ import {
 import {
 	LOGIN_STATUS,
 	UID,
+  USER_INFO
 } from '../../config/cache';
 import Cache from '../../utils/cache';
-import {
-	USER_INFO
-} from '../../config/cache';
-
 const state = {
 	location: Cache.get('LOCATION_DATA', true) || {},
+  address: Cache.get('address') || {},
 	token: Cache.get(LOGIN_STATUS) || null,
 	uuid: uni.getStorageSync('uuid') || "",
 	backgroundColor: "#fff",
-	userInfo: null,
+	userInfo: (typeof Cache.get('USER_INFO') == 'string' ? JSON.parse(Cache.get('USER_INFO')) : Cache.get('USER_INFO'))||{},
 	uid: Cache.get(UID) || null,
 	globalData: uni.getStorageSync('GLOBAL_DATA') || {},
 	homeActive: false,
@@ -38,6 +36,10 @@ const mutations = {
   setLocation(state, data) {
   	state.location = data
   	Cache.set('LOCATION_DATA', data);
+  },
+  SET_ADDRESS(state, data) {
+  	state.address = data
+  	Cache.set('address', data);
   },
 	LOGIN(state, opt) {
 		state.token = opt.token;