新增数据及页面

components/cartPopup.vue

@@ -1,13 +1,22 @@
 <template>
 	<u-popup :show="show" mode="bottom" @close="close" @open="open" :round="10">
 		<view class="my-popup padding">
-			<view class="w-full padding-bottom-lg" v-for="(item, index) in carList" :key="index">
+			<view class="container-sel">
+				<radio :checked="allSelected" color="#E51C23" @click="selectAll">全选
+				</radio>
+				<view class="dflex">
+					<u-tag text="清空购物车" type="info" color="#000" borderColor="#fff" size="mini" icon="trash" plain
+						@click="clearCart"></u-tag>
+				</view>
+			</view>
+			<radio class="w-full padding-bottom-lg" color="#E51C23" v-for="(item, index) in localCarList" :key="index"
+				:name="item.name" :checked="item.selected" @click="radioChange(item)">
 				<my-goods :item="item" ref="my-goods">
 					<view class="num-step">
 						<u-number-box v-model="item.goods_num" :min="1" @change="changeValue($event, item.id)" />
 					</view>
 				</my-goods>
-			</view>
+			</radio>
 		</view>
 	</u-popup>
 </template>
@@ -24,26 +33,67 @@
 		data() {
 			return {
 				show: false,
-				value: 1,
-				// data: {
-				// 	src: '../../static/x0.jpg',
-				// 	title: '标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题',
-				// 	spec: '180cm',
-				// 	price: '53.30'
-				// }
+				allSelected: false,
+				localCarList: []
 			};
 		},
 		methods: {
 			open() {},
 			setShow(v) {
 				this.show = v;
+				// 检查 localCarList 是否存在且至少有一个元素
+				if (this.localCarList && this.localCarList.length > 0) {
+					// 检查 localCarList 的第一个元素是否有 selected 属性
+					if (!this.localCarList[0].hasOwnProperty('selected')) {
+						// 如果没有 selected 属性，使用 map 方法添加 selected 属性
+						this.localCarList = this.carList.map(item => ({
+							...item,
+							selected: true
+						}));
+					}
+				} else {
+					// 如果 localCarList 不存在或没有元素，直接使用 map 方法添加 selected 属性
+					this.localCarList = this.carList.map(item => ({
+						...item,
+						selected: true
+					}));
+				}
+
+				if (this.localCarList.length > 0) {
+					this.allSelected = this.localCarList.every(car => car.selected)
+				}
+
+				console.log('this.localCarList', this.localCarList)
 			},
 			close() {
 				this.show = false;
 			},
 			changeValue(value, index) {
-				this.$emit('numChanged',value.value, index)
+				this.$emit('numChanged', value.value, index)
 				console.log('更新后的数量=======:', value, '索引=========:', index)
+			},
+			selectAll() {
+				this.allSelected = !this.allSelected
+				this.localCarList.forEach(item => {
+					item.selected = this.allSelected
+				})
+				this.$emit('selected-changed', this.localCarList)
+				console.log('this.localCarList111111111111111', this.localCarList)
+			},
+			clearCart() {
+				this.localCarList = []
+				this.allSelected = false
+				this.$emit('selected-changed', this.localCarList)
+			},
+			radioChange(e) {
+				console.log(e)
+				e.selected = !e.selected
+				// 检查是否所有车辆都被选中了
+				this.allSelected = this.localCarList.every(car => car.selected)
+				this.$emit('selected-changed', this.localCarList);
+				// 打印结果
+				console.log('this.allSelected', this.allSelected);
+
 			}
 		}
 	}
@@ -60,5 +110,13 @@
 			width: 200rpx;
 			padding-top: 40rpx;
 		}
+
+		.container-sel {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			margin: 10px 0;
+		}
+
 	}
 </style>

components/specPopup.vue

@@ -11,14 +11,14 @@
 		</view>
 		<uni-section title="规格">
 			<view class="spec-box padding-lr-sm">
-				<view class="spec-item padding-lr-sm" :class="{'on-spec': spec.selected}" :key="spec.id" @click="selectSpec1(spec)"
-					v-for="spec in specs1">{{ spec.name }}</view>
+				<view class="spec-item padding-lr-sm" :class="{'on-spec': spec.selected}" :key="spec.id"
+					@click="selectSpec1(spec)" v-for="spec in specs1">{{ spec.name }}</view>
 			</view>
 		</uni-section>
 		<uni-section title="口味">
 			<view class="spec-box padding-lr-sm">
-				<view class="spec-item padding-lr-sm" :class="{'on-spec': spec.selected}" :key="spec.id" @click="selectSpec2(spec)"
-					v-for="spec in specs2">{{ spec.name }}</view>
+				<view class="spec-item padding-lr-sm" :class="{'on-spec': spec.selected}" :key="spec.id"
+					@click="selectSpec2(spec)" v-for="spec in specs2">{{ spec.name }}</view>
 			</view>
 		</uni-section>
 		<uni-section title="购买数量">
@@ -139,7 +139,7 @@
 			},
 			open() {
 				console.log('cardMsg', this.cardMsg)
-				this.$refs.popup.open('bottom');
+				this.$refs.popup.open('bottom')
 			},
 			toShop() {
 				this.shopMsg.id = this.cardMsg.id
@@ -150,7 +150,9 @@
 				this.$refs.popup.close();
 			},
 			toBuy() {
-
+				uni.navigateTo({
+					url: `/pages/order/submitOrder/submitOrder`
+				})
 			}
 		}
 	}

pages.json

@@ -1,21 +1,35 @@
 {
 	"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
 		{
-			"path" : "pages/login/login",
+			"path" : "pages/classify/classify",
 			"style" : 
 			{
-				"navigationBarTitleText" : "登录"
+				"navigationBarTitleText" : "首页",
+				"enablePullDownRefresh" : false
 			}
 		},
 		{
-			"path" : "pages/classify/classify",
+			"path" : "pages/order/orderPaid/orderPaid",
 			"style" : 
 			{
-				"navigationBarTitleText" : "首页",
+				"navigationBarTitleText" : "订单详情"
+			}
+		},
+		{
+			"path" : "pages/order/submitOrder/submitOrder",
+			"style" : 
+			{
+				"navigationBarTitleText" : "提交订单",
 				"enablePullDownRefresh" : false
 			}
 		},
-		
+		{
+			"path" : "pages/login/login",
+			"style" : 
+			{
+				"navigationBarTitleText" : "登录"
+			}
+		},
 		{
 			"path" : "pages/login/qrCode",
 			"style" : 
@@ -72,15 +86,6 @@
 				"enablePullDownRefresh" : false
 			}
 		},
-		
-		{
-			"path" : "pages/order/submitOrder/submitOrder",
-			"style" : 
-			{
-				"navigationBarTitleText" : "提交订单",
-				"enablePullDownRefresh" : false
-			}
-		},
 		{
 			"path" : "pages/user/user",
 			"style" : 

pages/classify/classify.vue

@@ -16,7 +16,7 @@
 					</view>
 				</view>
 				<u-col span="3">
-					<view class="icon-container-r">
+					<view class="icon-container-r" @click="onMyInfo">
 						<u-icon label="我的" labelPos="bottom" size="32" :name="iconPeople"></u-icon>
 					</view>
 				</u-col>
@@ -64,14 +64,15 @@
 		</specPopup>
 		<view class="cart-bottom padding-sm dflex-b">
 			<view class="cart padding-lr">
-				<uni-badge size="small" :text="100" absolute="rightTop">
+				<uni-badge size="small" :text="buyCount" absolute="rightTop">
 					<u-icon name="shopping-cart-fill" size="28" color="#FF873D" @click="showCart"></u-icon>
 				</uni-badge>
 				<text class="cart-total">总计：￥{{total}}</text>
 			</view>
-			<view class="balance dflex-c background-gradient">去结算</view>
+			<view class="balance dflex-c background-gradient" @click="toBuy">去结算</view>
 		</view>
-		<cartPopupVue ref="cartPopup" :carList="carList" @numChanged="numChanged" />
+		<cartPopupVue ref="cartPopup" :carList="carList" @selected-changed="handleSelectedChanged"
+			@numChanged="numChanged" />
 
 	</view>
 </template>
@@ -100,55 +101,63 @@
 					{
 						id: 1,
 						goods_name: "小乳酸菌牛奶酸奶",
-						goods_price: "5.20",
+						goods_price: 5.20,
 						goods_type: '大份',
 						goods_num: 1,
 						src: '../../static/x0.jpg',
+
 					},
 					{
 						id: 2,
 						goods_name: "饮料整箱饮品",
-						goods_price: "5.20",
+						goods_price: 5.20,
 						goods_type: '大份',
 						goods_num: 1,
 						src: '../../static/x1.jpg',
+
 					},
 					{
 						id: 3,
 						goods_name: "饮品早餐酸乳益生菌",
-						goods_price: "5.20",
+						goods_price: 5.20,
 						goods_type: '小份',
 						goods_num: 1,
 						src: '../../static/x0.jpg',
+
 					},
 					{
 						id: 4,
 						goods_name: "酸奶饮料",
-						goods_price: "5.20",
+						goods_price: 5.20,
 						goods_type: '小份',
 						goods_num: 1,
 						src: '../../static/x1.jpg',
+
 					},
 					{
 						id: 5,
 						goods_name: "小乳酸菌",
-						goods_price: "5.20",
+						goods_price: 5.20,
 						goods_type: '小份',
 						goods_num: 1,
 						src: '../../static/x0.jpg',
+
 					},
 					{
 						id: 6,
 						goods_name: "酸乳益生菌",
-						goods_price: "5.20",
+						goods_price: 5.20,
 						goods_type: '大份',
 						goods_num: 1,
 						src: '../../static/x1.jpg',
+
 					}
 				],
 				total: 0,
 				carList: [],
-				cardMsg: {}
+				cardMsg: {},
+				selectedList: [],
+				buyCount: 0
 			}
 		},
 		created() {
@@ -162,32 +171,42 @@
 				this.$refs.specPopup.open();
 				//this.$refs.specPopup.change(true);
 			},
+			handleSelectedChanged(selectedItems) {
+				console.log('选中的数据:', selectedItems)
+				this.carList = selectedItems
+				// this.buyCount = this.carList.length
+				this.totalPrice();
+			},
 			handleUpdateShopMsg(shopMsg) {
-			  console.log('接收到的购物信息：', shopMsg);
-			  const specString = shopMsg.spec + ',' + shopMsg.specs;
-			  const item = this.goods.find(item => item.id === shopMsg.id);
-			
-			  if (item) {
-			    // 检查购物车列表中是否已存在相同id和规格的商品
-			    const existingCartItem = this.carList.find(cartItem => cartItem.id === item.id && cartItem.goods_type === specString);
-			
-			    if (existingCartItem) {
-			      // 如果已存在，则增加商品数量
-			      existingCartItem.goods_num += shopMsg.num;
-			    } else {
-			      // 如果不存在，则复制item并添加到购物车列表，同时设置商品数量和规格
-			      const newItem = { ...item };
-			      newItem.goods_num = shopMsg.num;
-			      newItem.goods_type = specString;
-			      this.carList.push(newItem);
-			    }
-			
-			    // 您可以在这里执行其他逻辑，比如保存到本地存储或发送到服务器
-			  }
-			
-			  console.log('购物车列表更新：', this.carList);
-			  this.totalPrice();
+				console.log('接收到的购物信息：', shopMsg);
+				const specString = shopMsg.spec + ',' + shopMsg.specs;
+				const item = this.goods.find(item => item.id === shopMsg.id);
+
+				if (item) {
+					// 检查购物车列表中是否已存在相同id和规格的商品
+					const existingCartItem = this.carList.find(cartItem => cartItem.id === item.id && cartItem
+						.goods_type === specString);
+
+					if (existingCartItem) {
+						// 如果已存在，则增加商品数量
+						existingCartItem.goods_num += shopMsg.num;
+					} else {
+						// 如果不存在，则复制item并添加到购物车列表，同时设置商品数量和规格
+						const newItem = {
+							...item
+						};
+						newItem.goods_num = shopMsg.num;
+						newItem.goods_type = specString;
+						this.carList.push(newItem);
+					}
+
+					// 您可以在这里执行其他逻辑，比如保存到本地存储或发送到服务器
+				}
+				
+				console.log('购物车列表更新：', this.carList);
+				this.totalPrice();
 			},
+			//数量的加减
 			numChanged(value, index) {
 				console.log('更新后的数量????????????:', value, '索引:', index);
 				// 假设 carList 是一个 Map，其中 id 是键
@@ -200,13 +219,29 @@
 				}
 				this.totalPrice()
 			},
+			//计算selected为true的
 			totalPrice() {
 				let total = 0;
 				for (let i = 0; i < this.carList.length; i++) {
-					total += this.carList[i].goods_price * this.carList[i].goods_num;
-					//goods_num += this.carList[i].goods_num
+					// 检查商品是否有 selected 属性
+					if (this.carList[i].hasOwnProperty('selected')) {
+						// 如果 selected 属性存在，只有当它为 true 时才计算
+						if (this.carList[i].selected) {
+							let priceInCents = Math.round(this.carList[i].goods_price * 100);
+							let quantity = this.carList[i].goods_num;
+							total += priceInCents * quantity;
+						}
+					} else {
+						// 如果 selected 属性不存在，直接计算所有商品
+						let priceInCents = Math.round(this.carList[i].goods_price * 100);
+						let quantity = this.carList[i].goods_num;
+						total += priceInCents * quantity;
+					}
 				}
-				this.total = total
+
+				// 将总价格转换回浮点数（以元为单位）
+				this.total = (total / 100).toFixed(2);
+
 				console.log('total', this.total);
 			},
 			showCart() {
@@ -221,6 +256,16 @@
 				uni.navigateTo({
 					url: `/pages/goodDetail/goodDetail`
 				})
+			},
+			toBuy() {
+				uni.navigateTo({
+					url: `/pages/order/submitOrder/submitOrder`
+				})
+			},
+			onMyInfo() {
+				uni.navigateTo({
+					url: `/pages/order/myOrder/myOrder`
+				})
 			}
 		}
 	}

pages/goodDetail/goodDetail.vue

@@ -73,7 +73,7 @@
 			<view style="width: 60px;">
 				<u-icon :name="shoppingCart" label="购物车" labelPos="bottom" size="32"></u-icon>
 			</view>
-			<view class="go-cart dflex-c">加入购物车</view>
+			<view class="go-cart dflex-c" >加入购物车</view>
 			<view class="go-buy dflex-c background-gradient">立即购买</view>
 		</view>
 		

pages/login/login.vue

@@ -184,14 +184,12 @@
 							}
 						})
 						//更新用户信息
-						const openId = uni.getStorageSync('openId');
 						const id = uni.getStorageSync('appUserId');
 
 						const userInfo = {
 							"id": id,
 							"nickName": res.userInfo.nickName,
 							"profilePhoto": res.userInfo.avatarUrl,
-							"openId": openId
 						}
 						const result = this.$request('post',
 							'/system/appUser/editAppUser', userInfo)

pages/order/orderPaid/orderPaid.vue

@@ -0,0 +1,272 @@
+<template>
+	<view class="order-detail">
+		<topNavBar title="订单详情" />
+		<view class="order-state padding-sm dflex-b w-full">
+			<view class="state-left">
+				<view class="state-info">待支付 </view>
+				<view class="order-code">剩余 09:59 逾期未支付将自动取消</view>
+			</view>
+			<uni-icons type="right" size="24" color="#FFF"></uni-icons>
+		</view>
+		<view class="gap"></view>
+		<view class="padding-sm dflex-b bg-main" @click="show = true">
+			<view class="dflex">
+				<view class="w-full dflex-wrap-w send-label">
+					取餐时间
+				</view>
+			</view>
+			<u-icon slot="icon" size="20" name="arrow-right" label="04:00" labelPos="left"></u-icon>
+		</view>
+		<view class="gap"></view>
+		<view class="padding-sm dflex-b bg-main">
+			<view class="dflex">
+				<view class="w-full dflex-wrap-w send-label">
+					取餐方式
+				</view>
+			</view>
+			<view>
+				<radio style="transform: scale(0.85)" value="r1" :checked="true" color="#ff0000" class="radio">店内用餐
+				</radio>
+			</view>
+		</view>
+
+		<view class="gap"></view>
+		<view class="goods-order-list padding-lr-sm">
+			<view class="shop dflex-b ">
+				<view class="shop-check">
+					<text class="send-label">店铺名称</text>
+				</view>
+				<view class="total-goods">共计2件商品</view>
+			</view>
+			<view class="goods-cart">
+				<view class="goods-cont dflex-b padding-tb-16">
+					<view class="goods-cart-info dflex-b">
+						<view class="pic"></view>
+						<view class="goods-cart-right">
+							<view class="cart-title">商品名称商品名称</view>
+							<view class="order-spec">
+								<text>500g</text>
+							</view>
+							<view class="cart-row-info dflex-s">
+								<view class="cart-price">
+									￥<text>12.30</text>
+								</view>
+								<view class="goods-num">×1</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="goods-cont dflex-b padding-tb-16">
+					<view class="goods-cart-info dflex-b">
+						<view class="pic"></view>
+						<view class="goods-cart-right">
+							<view class="cart-title">商品名称商品名称</view>
+							<view class="order-spec">
+								<text>500g</text>
+							</view>
+							<view class="cart-row-info dflex-s">
+								<view class="cart-price">
+									￥<text>12.30</text>
+								</view>
+								<view class="goods-num">×1</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="gap"></view>
+		<!-- 金额明细 -->
+		<view class="bg-main">
+			<view class="dflex-b padding-lr padding-tb-sm">
+				<view class="flex1 send-label">总金额</view>
+				<view class=""><text style="font-size: 24rpx;">￥</text>46.32</view>
+			</view>
+		</view>
+		<view class="gap"></view>
+		<view class="bar-space"></view>
+		<view class="cart-bottom padding-sm dflex-b">
+			<view class="go-cart dflex-c">取消订单</view>
+			<view class="go-buy dflex-c background-gradient">去支付</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.order-state {
+		background-color: #F96C22;
+		box-sizing: border-box;
+		color: #FFF;
+
+		.state-info {
+			font-size: 14px;
+			padding-bottom: 4px;
+		}
+
+		.order-code {
+			font-size: 12px;
+		}
+	}
+
+	.addr-label {
+		padding: 6upx 0;
+		border-radius: 3px;
+		background-color: #F6390D;
+		color: #fff;
+		width: 120upx;
+		text-align: center;
+		flex-shrink: 0;
+		margin-right: 14upx;
+	}
+
+	.order-spec {
+		padding-bottom: 10upx;
+	}
+
+	.shop {
+		padding-top: 20upx;
+	}
+
+	.goods-num {
+		font-size: 16px;
+		padding-left: 20upx;
+	}
+
+	.sub-coupon {
+		padding-top: 20upx;
+		padding-bottom: 0;
+		color: #000;
+
+		.coupon-name {
+			font-weight: normal;
+		}
+
+		.mj-tag {
+			background-color: #F6390D;
+
+			>text {
+				color: #FFF;
+			}
+		}
+	}
+
+	.total-goods {
+		font-size: 12px;
+		color: #999;
+	}
+
+	.submit-bar {
+		height: 100upx;
+		width: 100%;
+		background-color: #FFF;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+
+		.submit-total {
+			font-size: 16px;
+			font-weight: 700;
+			color: #F6390D;
+		}
+
+		.submit-btn {
+			background-image: $base-bg-gradient-color;
+			height: 70upx;
+			width: 200upx;
+			color: #FFF;
+			font-size: 14px;
+			font-weight: 700;
+			border-radius: 35upx;
+		}
+	}
+
+	.order-btn {
+		height: 76upx;
+		border-radius: 38px;
+		background-image: $base-bg-gradient-color;
+		text-align: center;
+		line-height: 76upx;
+		color: #FFF;
+		font-size: 14px;
+		width: 90%;
+		position: fixed;
+		left: 5%;
+		bottom: 30upx;
+		z-index: 99;
+	}
+
+	.order-info {
+		background-color: #FFF;
+		box-sizing: border-box;
+	}
+
+	.row-cell {
+		padding-bottom: 20upx;
+
+		.cell-right {
+			font-size: 12px;
+			color: #999;
+		}
+	}
+
+	.row-cell:last-child {
+		padding-bottom: 0;
+	}
+
+	.pic {
+		margin-right: 20upx;
+		height: 160rpx;
+		width: 160rpx;
+		background-color: #EEE;
+	}
+
+	.send-label {
+		font-size: 14px;
+		font-weight: 700;
+	}
+
+	.cart-bottom {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		height: 130rpx;
+		box-sizing: border-box;
+		background-color: #FFF;
+		z-index: 10;
+		box-shadow: 0px -4px 16px 0px rgba(0, 0, 0, 0.15);
+
+		.go-cart {
+			height: 80%;
+			box-sizing: border-box;
+			border: solid 1px #FF0000;
+			font-size: 14px;
+			color: #FF0000;
+			border-radius: 50upx;
+			margin: 0 10px;
+			width: 45%;
+		}
+
+		.go-buy {
+			height: 80%;
+			width: 45%;
+			background-color: #FF0000;
+			color: #FFF;
+			border-radius: 50upx;
+			font-size: 14px;
+		}
+	}
+</style>

pages/order/submitOrder/submitOrder.vue

@@ -9,20 +9,32 @@
 				</u-cell>
 			</u-cell-group>
 		</view> -->
-		<view class="padding-sm dflex-b bg-main" @click="toaddr">
+		<view class="padding-sm dflex-b bg-main" @click="show = true">
 			<view class="dflex">
-				<view class="addr-label">配送至</view>
-				<view class="w-full dflex-wrap-w">
-					<view>
-						<text>张三</text>
-						<text class="margin-left">18599999999</text>
-					</view>
-					<view class="margin-bottom-xs">
-						<text>广西壮族自治区-柳州市-鱼峰区 xxxx</text>
-					</view>
+				<!-- <view class="addr-label">配送至</view> -->
+				<view class="w-full dflex-wrap-w send-label">
+					取餐时间
 				</view>
 			</view>
-			<u-icon slot="icon" size="20" name="arrow-right"></u-icon>
+			<u-icon slot="icon" size="20" name="arrow-right" :label="value" labelPos="left"></u-icon>
+			<!-- <view class="iconfont iconjiantou-01 fs-sm"></view> -->
+		</view>
+		<u-datetime-picker :show="show" v-model="value" mode="time" @confirm="onConfirm"
+			@cancel="onCancel"></u-datetime-picker>
+		<view class="gap"></view>
+		<view class="padding-sm dflex-b bg-main">
+			<view class="dflex">
+				<!-- <view class="addr-label">配送至</view> -->
+				<view class="w-full dflex-wrap-w send-label">
+					取餐方式
+				</view>
+			</view>
+			<view>
+				<radio style="margin: 0 10px; transform: scale(0.85)" value="r1" :checked="true" color="#ff0000" class="radio">店内用餐
+				</radio >
+				<radio style="transform: scale(0.85)" value="r1" :checked="true" color="#ff0000" class="radio">打包带走
+				</radio>
+			</view>
 			<!-- <view class="iconfont iconjiantou-01 fs-sm"></view> -->
 		</view>
 		<view class="gap"></view>
@@ -33,12 +45,12 @@
 				</view>
 			</view>
 			<view class="goods-cart w-full">
-				<view class="goods-cont padding-tb" v-for="index in 3" :key="index">
+				<view class="goods-cont padding-tb" v-for="index in 1" :key="index">
 					<my-goods :data="data">
 						<view class="good-num">×1</view>
 					</my-goods>
 				</view>
-				
+
 			</view>
 		</view>
 		<!-- 金额明细 -->
@@ -47,7 +59,7 @@
 				<view class="flex1">总金额</view>
 				<view class=""><text style="font-size: 24rpx;">￥</text>46.32</view>
 			</view>
-			<view class="dflex-b padding-lr padding-tb-sm">
+			<!-- <view class="dflex-b padding-lr padding-tb-sm">
 				<view class="flex1">运费 (总重:4.960 kg )</view>
 				<view class="ft-base">￥10.00</view>
 			</view>
@@ -56,12 +68,12 @@
 				<view class="margin-right-xl">备注</view>
 				<input class="flex1 padding-sm" type="text" v-model="order_desc" placeholder="请填写买家备注"
 					placeholder-class="placeholder" />
-			</view>
+			</view> -->
 		</view>
 		<view class="gap"></view>
 		<my-gap :height="130" />
 		<view class="submit-bar padding-sm dflex-b">
-			<view class="submit-btn dflex-c">提交订单</view>
+			<view class="submit-btn dflex-c background-gradient" @click="toBuy">立即下单</view>
 		</view>
 	</view>
 </template>
@@ -70,24 +82,41 @@
 	export default {
 		data() {
 			return {
-				data:{
-					src:'../../static/x0.jpg',
-					title:'标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题',
-					spec:'180cm',
-					price:'53.30'
-				}
+				data: {
+					src: '../../static/x0.jpg',
+					title: '标题标题标题标题标题标题标题标题标题标题标题标题标题标题标题',
+					spec: '180cm',
+					price: '53.30'
+				},
+				show: false,
+				value: '',
 			}
 		},
 		methods: {
-			
+			sendTypeChange(v) {
+				console.log(v)
+			},
+			onConfirm(v) {
+				console.log('vvvvvvvvvvvvvvv', v)
+				this.value = v.value
+				this.show = false
+			},
+			onCancel() {
+				this.show = false
+			},
+			toBuy() {
+				uni.navigateTo({
+					url: `/pages/order/orderPaid/orderPaid`
+				})
+			}
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
-	.addr-label{
+	.addr-label {
 		padding: 6upx 0;
-		border-radius:3px;
+		border-radius: 3px;
 		background-color: #F6390D;
 		color: #fff;
 		width: 120upx;
@@ -95,45 +124,57 @@
 		flex-shrink: 0;
 		margin-right: 14upx;
 	}
-	.order-spec{
+
+	.order-spec {
 		padding-bottom: 10upx;
 	}
-	.shop{
+
+	.shop {
 		padding-top: 20upx;
 	}
-	.goods-num{
+
+	.goods-num {
 		font-size: 16px;
 		padding-left: 20upx;
 	}
-	.goods-cont{
+
+	.goods-cont {
 		width: 100%;
 		box-sizing: border-box;
 	}
-	.total-goods{
+
+	.total-goods {
 		font-size: 12px;
 		color: #999;
 	}
-	.submit-bar{
+
+	.submit-bar {
 		height: 130rpx;
 		width: 100%;
 		background-color: #FFF;
 		position: fixed;
 		left: 0;
 		bottom: 0;
-		box-shadow: 0px -4px 16px 0px rgba(0,0,0,0.15);
+		box-shadow: 0px -4px 16px 0px rgba(0, 0, 0, 0.15);
 		z-index: 10;
-		.submit-btn{
+
+		.submit-btn {
 			background-color: #0581FE;
 			height: 100%;
 			width: 100%;
 			color: #FFF;
 			font-size: 14px;
 			// font-weight: 700;
-			border-radius:35upx ;
+			border-radius: 35upx;
 		}
 	}
-	.good-num{
+
+	.good-num {
 		font-size: 12px;
 		padding-top: 40rpx;
 	}
-</style>
+	.send-label{
+		font-size: 14px;
+		font-weight: 700;
+	}
+</style>