From 1c67b26a0604662e2960082a41099c778aa94af4 Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Thu, 28 Nov 2024 16:57:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                            |   1 +
 config.js                                          |   2 +-
 .../components/list/gourmet/productSelectList.vue  | 143 +++++++++++++++++++++
 pages_order/gourmet/gourmetDetail.vue              |  15 ++-
 4 files changed, 156 insertions(+), 5 deletions(-)
 create mode 100644 pages_order/components/list/gourmet/productSelectList.vue

diff --git a/App.vue b/App.vue
index ceafdfd..db7e381 100644
--- a/App.vue
+++ b/App.vue
@@ -8,6 +8,7 @@
 			
 			if(uni.getStorageSync('token')){
 				this.$store.commit('getMemberInfo')
+				this.$store.commit('getUserInfo')
 			}
 		},
 		onHide: function() {
diff --git a/config.js b/config.js
index c90bc52..5a305c9 100644
--- a/config.js
+++ b/config.js
@@ -7,7 +7,7 @@ import uvUI from '@/uni_modules/uv-ui-tools'
 Vue.use(uvUI);
 
 // 当前环境
-const type = 'prod'
+const type = 'dev'
 
 
 // 环境配置
diff --git a/pages_order/components/list/gourmet/productSelectList.vue b/pages_order/components/list/gourmet/productSelectList.vue
new file mode 100644
index 0000000..dcc0a6d
--- /dev/null
+++ b/pages_order/components/list/gourmet/productSelectList.vue
@@ -0,0 +1,143 @@
+<template>
+	<view class="page">
+		<view class="box d">
+
+
+			<uv-checkbox-group shape="circle" v-model="checkboxValue">
+				<view v-for="(item, index) in list" 
+				:key="index" 
+				@click="" class="item">
+					<view class="checkbox">
+						<uv-checkbox 
+						:name="item.id" 
+						activeColor="#FA5A0A" 
+						size="40rpx" @click.stop
+						icon-size="35rpx"></uv-checkbox>
+					</view>
+
+					<image class="image"
+					:src="item.image" mode="">
+					</image>
+
+					<view class="info">
+						<view class="title">
+							<view class="text-ellipsis">{{ item.name }}</view>
+							<!-- <view style="flex-shrink: 0;">
+								数量：{{ item.num }}
+							</view> -->
+						</view>
+						<view class="unit">
+							{{ item.nameSub }}
+						</view>
+
+						<view class="price-box">
+							<view class="price">
+								现价<text>￥{{ item.price }}</text>元
+							</view>
+							<view class="del">
+								原价￥{{ item.oldPrice }}
+							</view>
+						</view>
+						<view class="unit">
+							<uv-number-box v-model="item.selectNum" :max="item.num">
+							</uv-number-box>
+						</view>
+					</view>
+				</view>
+			</uv-checkbox-group>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props : {
+			list : {
+				default : []
+			},
+		},
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.page {
+		.d {
+			.item {
+				background-color: #fff;
+				display: flex;
+				padding: 30rpx;
+				width: 690rpx;
+
+				.checkbox {
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					flex-shrink: 0;
+				}
+
+				.image {
+					width: 200rpx;
+					height: 200rpx;
+					border-radius: 20rpx;
+					flex-shrink: 0;
+				}
+
+				.info {
+					flex: 1;
+					.title {
+						display: flex;
+						padding: 6rpx 20rpx;
+						justify-content: space-between;
+						.text-ellipsis {
+							width: 410rpx;
+							// width: 280rpx;
+							overflow: hidden; //超出的文本隐藏
+							text-overflow: ellipsis; //溢出用省略号显示
+							white-space: nowrap; //溢出不换行
+						}
+					}
+
+					.unit {
+						font-size: 24rpx;
+						padding: 6rpx 20rpx;
+						color: #717171;
+					}
+
+					.price-box{
+						display: flex;
+						align-items: end;
+						padding-left: 20rpx;
+						.price{
+							color: $uni-price-color;
+							margin-top: 6rpx;
+							font-size: 24rpx;
+							text{
+								font-size: 28rpx;
+								font-weight: 900;
+							}
+						}
+						.del{
+							font-size: 22rpx;
+							color: #888;
+							font-weight: 500;
+							text-decoration : line-through;
+							margin-top: auto;
+							margin-left: 10rpx;
+						}
+					}
+
+					.wan {
+						color: $uni-color;
+						font-size: 26rpx;
+						padding: 10rpx 20rpx;
+					}
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages_order/gourmet/gourmetDetail.vue b/pages_order/gourmet/gourmetDetail.vue
index 04da9f7..19587aa 100644
--- a/pages_order/gourmet/gourmetDetail.vue
+++ b/pages_order/gourmet/gourmetDetail.vue
@@ -55,7 +55,9 @@
 		<!-- 商城美食 -->
 		<view class="goodList"
 		v-if="tagIndex == 0">
-			<goodList :productList="list"/>
+			<productSelectList 
+			@getData="getData"
+			:list="list"/>
 		</view>
 		
 		<!-- 店铺介绍 -->
@@ -114,12 +116,13 @@
 	import mixinsSex from '@/mixins/sex.js'
 	import mixinsList from '@/mixins/list.js'
 	import commentList from '../components/list/comment/commentList.vue'
-	import goodList from '../components/list/gourmet/goodList.vue'
+	// import goodList from '../components/list/gourmet/goodList.vue'
+	import productSelectList from '../components/list/gourmet/productSelectList.vue'
 	export default {
 		mixins: [mixinsSex, mixinsList],
 		components: {
 			commentList,
-			goodList,
+			productSelectList,
 		},
 		data() {
 			return {
@@ -297,8 +300,12 @@
 			}
 		}
 		
+		.LabelOptions{
+			background-color: #fff;
+		}
+		
 		.goodList{
-			padding: 0 20rpx;
+			// padding: 0 20rpx;
 		}
 		
 		.goodInfo{