From 8bad9a7c96c1fe452419c231cc0f16247fe8114b Mon Sep 17 00:00:00 2001
From: jia <1451658316@qq.com>
Date: Mon, 4 Sep 2023 15:51:04 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E4=BB=A5=E5=8F=8A=E4=BE=9B=E5=BA=94?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WaterfallsFlowItemo.vue                   | 21 ++---
 pages/moreProject/moreProject.vue             | 80 +++++++++++++------
 pages/supply_chains/supply_chains.vue         |  4 +-
 3 files changed, 69 insertions(+), 36 deletions(-)

diff --git a/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue b/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue
index ed6fb5f..d48faf1 100644
--- a/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue
+++ b/components/WaterfallsFlowItem/WaterfallsFlowItemo.vue
@@ -4,7 +4,7 @@
 		<image :src="item.image" mode="widthFix" class="item-img" />
 
 		<view class="title">{{item.store_name}}</view>
-	<!-- 	<view class="tag">
+		<!-- 	<view class="tag">
 			<view class="tag-one">
 				自营商品
 			</view>
@@ -83,7 +83,7 @@
 		display: -webkit-box;
 		-webkit-line-clamp: 2;
 		-webkit-box-orient: vertical;
-		padding: 0 5px;
+		
 		margin-left: 21rpx;
 	}
 
@@ -132,15 +132,18 @@
 
 	.relase {
 		display: flex;
-
 		margin-left: 21rpx;
 		margin-top: 12rpx;
-
+		height: 26rpx;
+		line-height: 26rpx;
 		.relase-one {
+			// font-style: italic;
+			transform: skewX(-15deg);
 			font-size: 26rpx;
 			font-family: SF Pro Display-Regular Italic, SF Pro Display;
 			font-weight: 600;
 			color: #FF6D20;
+			
 		}
 
 		.relase-two {
@@ -157,7 +160,8 @@
 		margin-bottom: 10rpx;
 		color: #F84221;
 		font-size: 44rpx;
-        font-weight: 600;
+		font-weight: 600;
+
 		span {
 			color: #F84221;
 			font-size: 30rpx;
@@ -166,7 +170,7 @@
 
 		text {
 			color: #F84221;
-			font-size: 37rpx;	
+			font-size: 37rpx;
 			font-weight: 400;
 		}
 	}
@@ -189,10 +193,9 @@
 		color: #737373;
 
 		.info-img {
-			width: 10px;
-			height: 21px;
+			width: 21rpx;
+			height: 21rpx;
 			margin-top: 5rpx;
-			margin-right: 11rpx;
 
 			image {
 				width: 100%;
diff --git a/pages/moreProject/moreProject.vue b/pages/moreProject/moreProject.vue
index 112e06f..666b762 100644
--- a/pages/moreProject/moreProject.vue
+++ b/pages/moreProject/moreProject.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="gather">
 		<block v-if="isShow">
-			<view class="special_work com" v-if="userInfoData.mer_info.type_id === 12">
+			<view class="special_work com" v-if="userInfoData.mer_info.type_code === 'TypeSupplyChain'">
 				<view class="special_work com" v-if="true">
 					<view class="title">市级供应链</view>
 					<view class="content">
@@ -62,7 +62,7 @@
 				</view>
 			</view>
 
-			<view class="business com" v-if="userInfoData.mer_info.type_id === 10">
+			<view class="business com" v-if="userInfoData.mer_info.type_code === 'TypeStore'">
 				<view class="business com" v-if="true">
 					<view class="special_work com">
 						<view class="title">我的店铺</view>
@@ -155,7 +155,7 @@
 				</view>
 			</view>
 
-			<view class="business com" v-if="userInfoData.mer_info.type_id!=null&&userInfoData.mer_info.type_id === 11">
+			<view class="business com" v-if="userInfoData.mer_info.type_code === 'TypeCloudWarehouse'">
 				<view class="business com" v-if="true">
 					<view class="special_work com">
 						<view class="title">里海云仓</view>
@@ -226,8 +226,53 @@
 				</view>
 			</view>
 
+<view class="business com" v-if="userInfoData.mer_info.type_code === 'TypeFeaturedCultural'|| userInfoData.mer_info.type_code === 'TypeFamousSpecialties'|| userInfoData.mer_info.type_code === 'TypeLocalCuisine' ">
+				<view class="business com" v-if="true">
+					<view class="special_work com">
+						<view class="title">我的店铺</view>
+						<view class="content ">
+						
+							<view class="examine" @click="navigator(`/pages/users/embody/embody?mer_id=${mer_id}`)">
+								<image class="icon_img" :src="`${prefix}txgl.png`" mode="aspectFill">
+								</image>
+								<text class="text">提现管理</text>
+							</view>
 
+							<view class="examine"
+								@click="navigator(`/pages/chat/customer_list/index?type=1&mer_id=${mer_id}`)">
+								<image class="icon_img" :src="`${prefix}kfjl.png`" mode="aspectFill">
+								</image>
+								<text class="text">客服记录</text>
+							</view>
+							<view class="examine"
+								@click="navigator(`/pages/admin/order_cancellation/index?mer_id=${mer_id}`)">
+								<image class="icon_img" :src="`${prefix}ddhx.png`" mode="aspectFill">
+								</image>
+								<text class="text">订单核销</text>
+							</view>
+							<view class="examine"
+								@click="navigator(`/pages/admin/order/index?mer_id=${mer_id}&type_id=${userInfoData.mer_info.type_id}`)">
+								<image class="icon_img" :src="`${prefix}ddgl.png`" mode="aspectFill">
+								</image>
+								<text class="text">订单管理</text>
+							</view>
+							<view class="examine" @click="navigator(`/pages/product/list/index?mer_id=${mer_id}`)">
+								<image class="icon_img" :src="`${prefix}spgl.png`" mode="aspectFill">
+								</image>
+								<text class="text">商品管理</text>
+							</view>
+							<view class="examine"
+								@click="navigator(`/pages/product/basicSet?mer_id=${mer_id}`, '商户设置')">
+								<image class="icon_img" :src="`${prefix}shsz.png`" mode="aspectFill">
+								</image>
+								<text class="text">商户设置</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
 
+  
 		</block>
 		<!-- <m-tabbar native>
       <template v-slot:tabbar_index_2>
@@ -270,7 +315,7 @@
 	import {
 		getDiy
 	} from '@/api/api.js'
-	
+
 	export default {
 		components: {
 			mTabbar,
@@ -292,7 +337,7 @@
 				isShow: false,
 				bgColor: '',
 				isFshow: false,
-				street:''
+				street: ''
 			};
 		},
 		computed: {
@@ -317,30 +362,15 @@
 		},
 		mounted() {
 			this.appLocation()
-			// #ifdef  H5
-// 监听页面滚动事件
-			window.addEventListener("scroll", this.scrolling);
-			// #endif
 			
 
-		},
-		// #ifdef APP-PLUS
-		onPageScroll(e) {
-			// this.scrollTop = e.scrollTop;
-			console.log(e.scrollTop)
-			if (e.scrollTop > 0) {
-				this.isFshow = true
-			} else {
-				this.isFshow = false
-			}
 
 		},
-		// #endif
 
 		methods: {
-      
-      
-      appLocation() {
+
+
+			appLocation() {
 				uni.getLocation({
 					type: 'wgs84',
 					timeout: '10',
@@ -373,7 +403,7 @@
 					}
 				});
 			},
-			
+
 			scrolling() {
 				// 滚动条距文档顶部的距离
 				let scrollTop =
@@ -521,7 +551,7 @@
 		// padding: 17.54rpx;
 		width: 694.74rpx;
 		// margin-top: 52.63rpx;
-    padding-top: 32rpx;
+		padding-top: 32rpx;
 		border-radius: 17.54rpx;
 		// box-shadow: 0px 0px 6px 1px rgba(0, 0, 0, 0.16);
 
diff --git a/pages/supply_chains/supply_chains.vue b/pages/supply_chains/supply_chains.vue
index 2aa8485..4f7fae3 100644
--- a/pages/supply_chains/supply_chains.vue
+++ b/pages/supply_chains/supply_chains.vue
@@ -280,7 +280,7 @@ this.list()
 		onReachBottom() {
 			if (this.status == 'nomore') return;
 			this.status = 'loading';
-		
+			
 			this.where.page = ++this.where.page;
 			this.list()
 		},
@@ -833,7 +833,7 @@ this.list()
 			}
 
 			.list-title-info {
-				width: 98rpx;
+				// width: 98rpx;
 				height: 30rpx;
 				background: #FFFFFF;
 				padding: 2rpx 2rpx;