From 6943211e44eaedbdd2a013690c5f34ce12c7d33c Mon Sep 17 00:00:00 2001
From: huliyong <2783385703@qq.com>
Date: Tue, 27 May 2025 00:37:44 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=B4=AD=E7=89=A9=E8=BD=A6):=20=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E8=B4=AD=E7=89=A9=E8=BD=A6=E5=8A=9F=E8=83=BD=E5=8F=8A?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E8=AE=A2=E5=8D=95=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增购物车页面及API接口
- 在商品详情页添加加入购物车功能
- 修改订单创建流程支持购物车多商品结算
- 调整UI样式和交互细节
- 修复订单状态判断逻辑
---
 api/api.js                                         |   2 +-
 api/model/cart.js                                  |  34 +++
 api/model/index.js                                 |  13 ++
 components/base/kefu.vue                           |   3 +-
 components/base/tabbar.vue                         |   7 +
 components/productItem.vue                         |  10 +
 pages/index/cart.vue                               | 167 +++++++++++----
 pages/index/order.vue                              |  21 +-
 pages_order/components/product/submit.vue          |   4 +-
 pages_order/order/createOrder.vue                  |  50 ++---
 pages_order/order/firmOrder.vue                    | 229 +++++++++++++++------
 pages_order/order/orderDetail.vue                  |  41 ++--
 pages_order/order/pictureOrder.vue                 |   2 +-
 pages_order/order/voiceOrder.vue                   |   2 +-
 pages_order/product/productDetail.vue              |  20 +-
 pages_order/product/productList.vue                |   4 +-
 .../components/uv-number-box/props.js              |   2 +-
 17 files changed, 452 insertions(+), 159 deletions(-)
 create mode 100644 api/model/cart.js

diff --git a/api/api.js b/api/api.js
index 061bea8..e8723cd 100644
--- a/api/api.js
+++ b/api/api.js
@@ -5,7 +5,7 @@ import utils from '../utils/utils.js'
 let limit = {}
 let debounce = {}
 
-const models = ['login', 'index']
+const models = ['login', 'index', 'cart']
 
 const config = {
 	// 示例
diff --git a/api/model/cart.js b/api/model/cart.js
new file mode 100644
index 0000000..16c83ce
--- /dev/null
+++ b/api/model/cart.js
@@ -0,0 +1,34 @@
+
+
+// 登录相关接口
+
+const api = {
+	// 获取购物车信息列表带分页
+	getCartPageList: {
+		url: '/cat/getCartPageList',
+		method: 'GET', 
+		limit : 500,
+	},
+	// 加入购物车
+	addCart: {
+		url: '/cat/addCart',
+		method: 'GET', 
+		limit : 500,
+	},
+	// 删除购物车信息
+	deleteCart: {
+		url: '/cat/deleteCart',
+		method: 'POST',
+		auth: true,
+	},
+	// 修改购物车信息数量
+	updateCartNum: {
+		url: '/cat/updateCartNum',
+		method: 'POST',
+		auth: true, 
+		limit : 500,
+		showLoading : true,
+	},
+}
+
+export default api
\ No newline at end of file
diff --git a/api/model/index.js b/api/model/index.js
index 9fe5cdc..bf6a19b 100644
--- a/api/model/index.js
+++ b/api/model/index.js
@@ -32,6 +32,12 @@ const api = {
 		method: 'POST',
 		limit : 1000,
 	},
+	// 商城-加入购物车之后一次下多个订单
+	createSumOrder: {
+		url: '/order/createSumOrder',
+		method: 'POST',
+		limit : 1000,
+	},
 	// 支付订单
 	payOrder: {
 		url: '/index/payOrder',
@@ -43,6 +49,12 @@ const api = {
 		method: 'POST',
 		limit : 1000,
 	},
+	// 取消快捷订单
+	cancelOrderFast: {
+		url: '/index/cancelOrder',
+		method: 'POST',
+		limit : 1000,
+	},
 	// 获取快捷下单信息
 	getOrderInfo: {
 		url: '/index/getOrderInfo',
@@ -135,6 +147,7 @@ const api = {
         method: 'POST',
         limit : 1000,
     },
+	
 }
 
 export default api
\ No newline at end of file
diff --git a/components/base/kefu.vue b/components/base/kefu.vue
index 52cf33c..c4333b9 100644
--- a/components/base/kefu.vue
+++ b/components/base/kefu.vue
@@ -41,13 +41,14 @@
 <style lang="scss">
 	.float-button {
 		position: fixed;
-		bottom: 150px;
+		bottom: 180px;
 		/* 距离底部的距离 */
 		right: 10px;
 		/* 距离右侧的距离 */
 		width: 50px;
 		/* 按钮的宽度 */
 		height: 50px;
+		z-index: 99;
 
 		/* 按钮的高度 */
 		/* 其他样式 */
diff --git a/components/base/tabbar.vue b/components/base/tabbar.vue
index f743fa4..5bb46ac 100644
--- a/components/base/tabbar.vue
+++ b/components/base/tabbar.vue
@@ -38,6 +38,13 @@
 						"title": "商品列表",
 						key: 'category',
 					},
+					{
+						"selectedIconPath": "/static/image/tabbar/cart-a.png",
+						"iconPath": "/static/image/tabbar/cart.png",
+						"pagePath": "/pages/index/cart",
+						"title": "购物车",
+						key: 'cart',
+					},
 					{
 						"selectedIconPath": "/static/image/tabbar/center-a.png",
 						"iconPath": "/static/image/tabbar/center.png",
diff --git a/components/productItem.vue b/components/productItem.vue
index b21911a..cda73b2 100644
--- a/components/productItem.vue
+++ b/components/productItem.vue
@@ -18,6 +18,10 @@
 	        type="primary" 
 	        shape="circle" 
 	        text="立即购买"></uv-button>
+			
+			<view class="tips">
+				已售{{ item.payNum }}
+			</view>
 	    </view>
 	</view>
 </template>
@@ -97,12 +101,18 @@
 	    display: flex;
 	    justify-content: center;
 	    align-items: center;
+		flex-direction: column;
 	    :deep(.uv-button) {
 	        transition: transform 0.2s;
 	        &:active {
 	            transform: scale(0.95);
 	        }
 	    }
+		.tips{
+			font-size: 24rpx;
+			color: #999;
+			margin-top: 16rpx;
+		}
 	}
 
     @keyframes pulse {
diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index 65e5f46..bf4cacd 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -2,7 +2,13 @@
 	<view class="page">
 		<navbar/>
 
-		<view class="user">
+		<!-- 未登录提示 -->
+		<view class="not-login" v-if="!isLogin">
+			<view class="tips">登录后查看您的购物车</view>
+			<view class="login-btn" @click="$utils.toLogin">立即登录</view>
+		</view>
+
+		<view class="user" v-if="isLogin">
 			<uv-checkbox-group 
 			shape="circle"
 			v-model="checkboxValue">
@@ -10,15 +16,16 @@
 				<uv-swipe-action>
 					<view
 					v-for="(item, index) in list"
-					:key="index">
+					:key="item.id">
 						<view style="margin-top: 20rpx;"></view>
 						<uv-swipe-action-item 
+						@click="e => deleteCart(e, item)"
 						:options="options">
 							<view class="item">
 								<view class="checkbox">
 									<uv-checkbox
 										:name="item.id"
-										activeColor="#FA5A0A"
+										activeColor="#eb3300"
 										size="40rpx"
 										icon-size="35rpx"
 									></uv-checkbox>
@@ -26,26 +33,35 @@
 								
 								<image 
 								class="image"
-								src="https://img95.699pic.com/photo/50058/1378.jpg_wh860.jpg" 
+								:src="item.image &&
+								item.image.split(',')[0]" 
 								mode=""></image>
 								
 								<view class="info">
 									<view class="title">
 										<view class="">
-											{{ item.title }}
-										</view>
-										<view class="">
-											<uv-number-box v-model="item.num" 
-											@change="valChange"></uv-number-box>
+											{{ item.name }}
 										</view>
 									</view>
 									<view class="unit">
-										规格：{{ item.unit }}
-										<uv-icon name="arrow-down"></uv-icon>
+										材质：{{ item.material }}
+										<!-- <uv-icon name="arrow-down"></uv-icon> -->
 									</view>
-									<view class="price">
-										￥<text>{{ item.price }}</text>元
+									
+									<view 
+									style="display: flex;
+									justify-content: space-between;
+									align-items: center;">
+										<view class="price">
+											￥<text>{{ item.price }}</text>元/{{item.unit}}
+										</view>
+										
+										<view class="">
+											<uv-number-box v-model="item.selectNum" 
+											@change="e => valChange(item, e)"></uv-number-box>
+										</view>
 									</view>
+									
 								</view>
 							</view>
 						</uv-swipe-action-item>
@@ -53,6 +69,13 @@
 				</uv-swipe-action>
 			</uv-checkbox-group>
 			
+			<uv-empty
+			v-if="list.length == 0"
+			text="空空如也"
+			textSize="30rpx"
+			iconSize="200rpx"
+			icon="list"></uv-empty>
+			
 			<view class="action">
 				<view class="icon">
 					<image src="/static/image/cart/1.png" mode=""></image>
@@ -71,52 +94,41 @@
 						共{{ checkboxValue.length }}件，已享受更低优惠
 					</view>
 				</view>
-				<view class="btn">
+				<view class="btn"
+				@click="submit">
 					去结算
 				</view>
 			</view>
 		</view>
 		
-		<kefu/>
+		<kefu></kefu>
 
-		<tabber select="3" />
+		<tabber select="cart" />
 	</view>
 </template>
 
 <script>
 	import tabber from '@/components/base/tabbar.vue'
+	import mixinsList from '@/mixins/list.js'
 	export default {
+		mixins : [mixinsList],
 		components: {
 			tabber,
 		},
 		data() {
 			return {
+				isLogin: false,
 				value : 0,
 				checkboxValue : [],
 				options: [
 					{
 						text: '删除',
 						style: {
-							backgroundColor: '#FA5A0A'
+							backgroundColor: '#f40'
 						}
 					}, 
 				],
-				list : [
-					{
-						id : 1,
-						title : '桌布租赁',
-						num : 1,
-						price : 299,
-						unit : '120*40*75【桌子尺寸】',
-					},
-					{
-						id : 2,
-						title : '桌布租赁',
-						num : 1,
-						price : 299,
-						unit : '120*40*75【桌子尺寸】',
-					},
-				],
+				mixinsListApi : '',
 			}
 		},
 		computed: {
@@ -127,15 +139,72 @@
 				let price = 0
 				this.list.forEach(n => {
 					if(this.checkboxValue.includes(n.id)){
-						price += n.price * n.num
+						price += n.price * n.selectNum
 					}
 				})
-				return price
+				return Number(price).toFixed(2)
 			},
 		},
+        onLoad(){
+            this.checkLogin()
+        },
+		onShow() {
+			this.checkLogin()
+		},
 		methods: {
-			valChange(){
+			// 检查是否登录
+			checkLogin() {
+				const token = uni.getStorageSync('token')
+				this.isLogin = !!token
 				
+				if (this.isLogin) {
+					this.mixinsListApi = 'getCartPageList'
+					this.getData()
+				}
+			},
+			getDataThen(list, total, result){
+				result.records = list.map(res => {
+					return {
+						...res.shop,
+						cartId : res.id,
+						selectNum : res.num,
+					}
+				})
+			},
+			valChange(item, e) {
+				this.$api('updateCartNum', {
+					id: item.id,
+					num: e.value,
+				})
+			},
+			// 立即下单
+			submit(){
+				if(this.checkboxValue.length == 0){
+					uni.showToast({
+						title: '请选择商品',
+						icon: 'none',
+					})
+					return
+				}
+				
+				let arr = []
+				
+				this.list.forEach(n => {
+					if(this.checkboxValue.includes(n.id)){
+						arr.push(n)
+					}
+				})
+				
+				this.$store.commit('setPayOrderProduct', arr)
+				
+				this.$utils.navigateTo('/pages_order/order/createOrder')
+			},
+			deleteCart(e, item){
+				this.$api('deleteCart', {
+					ids : item.cartId
+				}, res => {
+					this.getData()
+				})
 			},
 		}
 	}
@@ -148,6 +217,31 @@
 			width: 100%;
 		}
 	}
+	
+	.not-login {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		height: 400rpx;
+		background-color: #fff;
+		margin: 20rpx;
+		border-radius: 16rpx;
+		
+		.tips {
+			font-size: 32rpx;
+			color: #666;
+			margin-bottom: 30rpx;
+		}
+		
+		.login-btn {
+			background-color: $uni-color;
+			color: #fff;
+			padding: 20rpx 80rpx;
+			border-radius: 40rpx;
+			font-size: 30rpx;
+		}
+	}
 
 	.user {
 		.item{
@@ -203,6 +297,7 @@
 			justify-content: center;
 			align-items: center;
 			overflow: hidden;
+			z-index: 999;
 			.icon{
 				position: relative;
 				width: 80rpx;
diff --git a/pages/index/order.vue b/pages/index/order.vue
index a93401f..261a6d3 100644
--- a/pages/index/order.vue
+++ b/pages/index/order.vue
@@ -12,7 +12,7 @@
                 <!-- 顶部 -->
                 <view class="top">
                     <view class="service">
-                        <text>{{ item.title }}</text>
+                        <text>{{ item.createTime }}</text>
                         <!-- <text>{{ item.type_dictText }}</text> -->
                     </view>
                     <view class="status">
@@ -20,19 +20,21 @@
                     </view>
                 </view>
                 <!-- 中 -->
-                <view class="content">
+                <view class="content"
+				v-for="(shop, i) in item.children"
+				:key="i">
                     <view class="left">
-                        <image mode="aspectFill" :src="item.image"></image>
+                        <image mode="aspectFill" :src="shop.image && shop.image.split(',')[0]"></image>
                     </view>
                     <view class="right">
                         <view class="text-hidden-1">
-                            客户姓名：{{ item.name }}
+                            客户姓名：{{ shop.title }}
                         </view>
                         <view class="text-hidden-1">
-                            下单时间：{{ item.createTime }}
+                            材质：{{ shop.material }}
                         </view>
                         <view class="text-hidden-1">
-                            联系电话：{{ item.phone }}
+                            数量：{{ shop.num }}
                         </view>
                     </view>
                 </view>
@@ -111,6 +113,9 @@ export default {
             this.getData()
         }
     },
+	onPullDownRefresh() {
+		this.getData()
+	},
     methods: {
         getData() {
             let queryParams = {
@@ -120,6 +125,7 @@ export default {
                 queryParams.state = this.state
             }
             this.$api('getOrderPageBean', queryParams, res => {
+				uni.stopPullDownRefresh()
                 if (res.code == 200) {
                     this.orderList = res.result
                 }
@@ -141,9 +147,6 @@ export default {
                 url: '/pages_order/order/orderDetail?id=' + id
             })
         },
-        getOrderList() {
-
-        },
     }
 }
 </script>
diff --git a/pages_order/components/product/submit.vue b/pages_order/components/product/submit.vue
index c777a14..db3e858 100644
--- a/pages_order/components/product/submit.vue
+++ b/pages_order/components/product/submit.vue
@@ -22,11 +22,11 @@
 		</button>
 
 		<view class="submit-btn">
-			<!-- <view class="l"
+			<view class="l"
 			@click="!disabled && $emit('addCart')"
 			:class="{'disabled': disabled}">
 				{{ disabled ? '库存不足' : '加入购物车' }}
-			</view> -->
+			</view>
 			<view class="r" 
 			@click="!disabled && $emit('submit')"
 			:class="{'disabled': disabled}">
diff --git a/pages_order/order/createOrder.vue b/pages_order/order/createOrder.vue
index 4290c16..cbf11e7 100644
--- a/pages_order/order/createOrder.vue
+++ b/pages_order/order/createOrder.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<!-- 导航栏 -->
-		<navbar :title="titleMap[type]" leftClick @leftClick="$utils.navigateBack" bgColor="#E3441A" color="#fff" />
+		<navbar :title="titleMap[type]" leftClick @leftClick="$utils.navigateBack" bgColor="#DC2828" color="#fff" />
 
 		<view class="bac"></view>
 
@@ -351,35 +351,35 @@
 
 				// if(this.type != 'give'){
 
-				// 	let list = []
-				// 	this.payOrderProduct.forEach(n => {
-				// 		list.push({
-				// 			num: n.selectNum || 1,
-				// 			shopId: n.shopId || n.id,
-				// 		})
-				// 	})
-				// 	data = {
-				// 		addressId,
-				// 		payType : this.payMethod,
-				// 		list: JSON.stringify(list),
-				// 		remark: this.remark || '', // 添加备注字段
-				// 	}
-					
-				// 	api = 'createOrder'
-
-				// 	this.deleteCart(this.payOrderProduct.map(n => n.id).join(','))
-
-				// } else {
+					let list = []
+					this.payOrderProduct.forEach(n => {
+						list.push({
+							num: n.selectNum || 1,
+							shopId: n.id,
+						})
+					})
 					data = {
 						addressId,
-						num: this.payOrderProduct[0].selectNum || 1,
-						productId: this.payOrderProduct[0].id,
 						payType : this.payMethod,
-                        // isGive : this.isGive,
-                        // memberNum : 1,
+						list: JSON.stringify(list),
 						// remark: this.remark || '', // 添加备注字段
 					}
-					api = 'createOrder'
+					
+					api = 'createSumOrder'
+
+					this.deleteCart(this.payOrderProduct.map(n => n.cartId).join(','))
+
+				// } else {
+					// data = {
+					// 	addressId,
+					// 	num: this.payOrderProduct[0].selectNum || 1,
+					// 	productId: this.payOrderProduct[0].id,
+					// 	payType : this.payMethod,
+     //                    // isGive : this.isGive,
+     //                    // memberNum : 1,
+					// 	// remark: this.remark || '', // 添加备注字段
+					// }
+					// api = 'createOrder'
 				// }
 				
 				if(this.coupon.id){
diff --git a/pages_order/order/firmOrder.vue b/pages_order/order/firmOrder.vue
index 3a84e12..6a4a24a 100644
--- a/pages_order/order/firmOrder.vue
+++ b/pages_order/order/firmOrder.vue
@@ -8,29 +8,48 @@
         
         <!-- 商品信息 -->
         <view class="content-wrapper">
-            <view class="section-wrapper">
-                <view class="section-title">
-                    <view class="title-bar"></view>
-                    <text>商品信息</text>
-                </view>
-                
-                <view class="product-card">
-                    <image class="product-image" :src="productInfo.image && 
-					productInfo.image.split(',')[0]" mode="aspectFit"></image>
-                    <view class="product-details">
-                        <view class="product-name">{{productInfo.name || ''}}</view>
-                        <view class="product-tags">
-                            <text class="tag">{{productInfo.categoryName || ''}}</text>
-                            <text class="tag">快速下单</text>
-                        </view>
-                        <view class="product-price">
-                            <text class="price-value">¥{{productInfo.price || ''}}</text>
-                            <text class="price-unit">元/{{productInfo.unit || ''}}</text>
-                        </view>
-                    </view>
-                </view>
-            </view>
+			
+			<uv-checkbox-group
+			shape="circle"
+			v-model="checkboxValue">
+			
+				<view class="section-wrapper">
+					<view class="section-title">
+						<view class="title-bar"></view>
+						<text>商品信息</text>
+					</view>
+					
+					<view class="product-card" v-for="(info, index) in productInfo.commonShop">
+						
+						<view class="checkbox">
+							<uv-checkbox
+								:name="info.id"
+								activeColor="#eb3300"
+								size="40rpx"
+								icon-size="35rpx"
+							></uv-checkbox>
+						</view>
+						
+						<image class="product-image" :src="info.image && 
+						info.image.split(',')[0]" mode="aspectFill"></image>
+						<view class="product-details">
+							<view class="product-name">{{info.name || ''}}</view>
+							<view class="product-tags">
+								<text class="tag">快速下单</text>
+							</view>
+							<view class="product-price">
+								<text class="price-value">¥{{info.price || ''}}</text>
+								<text class="price-unit">元/{{info.unit || ''}}</text>
+							</view>
+							<view class="selectNum">
+								<uv-number-box v-model="info.selectNum"></uv-number-box>
+							</view>
+						</view>
+					</view>
+				</view>
             
+			</uv-checkbox-group>
+			
             <!-- 个人信息 -->
             <view class="section-wrapper">
                 <view class="section-title">
@@ -49,7 +68,7 @@
                                 {{address.address}} {{address.addressDetails}}
                             </view>
                             <view class="address-action">
-                                <text class="address-tip">已添加过的地址</text>
+                                <text class="address-tip">选择其他已添加过的地址</text>
                                 <view class="arrow-right"></view>
                             </view>
                         </view>
@@ -71,7 +90,8 @@
         
         <!-- 底部按钮 -->
         <view class="order-submit">
-            <button class="submit-btn" @click="submitOrder">快捷下单</button>
+			<button class="submit-btn-close" @click="cancelOrderFast">取消</button>
+            <button class="submit-btn" @click="submitOrder">快捷下单（￥{{ totalPrice }}）</button>
         </view>
         
         <!-- 地址选择弹窗 -->
@@ -96,7 +116,10 @@
 		},
 		data() {
 			return {
-			    productInfo: {}, // 商品信息
+				checkboxValue : [],
+			    productInfo: {
+					commonShop : [],
+				}, // 信息
 			    orderId: '', // 订单ID
                 address: {
                     name: '请选择地址',
@@ -109,6 +132,20 @@
                 shouldSubmitOrder: false // 标记是否应该在获取地址后自动提交订单
 			};
 		},
+		computed: {
+			totalPrice(){
+				if (!this.checkboxValue.length || !this.productInfo.commonShop) {
+					return 0
+				}
+				let price = 0
+				this.productInfo.commonShop.forEach(n => {
+					if(this.checkboxValue.includes(n.id)){
+						price += n.price * (n.selectNum || 1)
+					}
+				})
+				return Number(price).toFixed(2)
+			},
+		},
 		onLoad(options) {
 		    // 获取订单ID
 		    if (options.orderId) {
@@ -125,10 +162,12 @@
 		    getOrderInfo() {
 		        this.$api('getOrderInfo', res => {
 		            if (res.code === 200 && res.result[0]) {
-		                // 如果返回商品信息，则设置商品信息
-		                if (res.result[0].commonShop) {
-		                    this.productInfo = res.result[0].commonShop;
-		                }
+		                // 如果返回商品信息，则设置商品信息 commonShop
+		                this.productInfo = res.result[0];
+						
+						this.productInfo.commonShop.forEach(n => {
+							this.checkboxValue.push(n.id)
+						})
 		            }
 		        });
 		    },
@@ -234,28 +273,52 @@
                 uni.showLoading({
                     title: '提交订单中...'
                 });
-                
-		        // 创建订单
-		        this.$api('createOrder', {
+				
+				let list = []
+				
+				this.productInfo.commonShop.forEach(n => {
+					if(this.checkboxValue.includes(n.id)){
+						list.push({
+							num: n.selectNum || 1,
+							shopId: n.id,
+						})
+					}
+				})
+				
+				let data = {
 		            addressId: this.address.id,
-		            productId: this.productInfo.id,
-                    num : 1,
 		            payType: 1, // 默认微信支付
-		            orderId: this.orderId
-		        }, res => {
+		            orderId: this.orderId,
+					list: JSON.stringify(list),
+				}
+				
+				/*
+				{
+				    addressId: this.address.id,
+				    productId: this.productInfo.id,
+				    num : 1,
+				    payType: 1, // 默认微信支付
+				    orderId: this.orderId
+				}
+				*/ 
+                
+		        // 创建订单
+		        this.$api('createSumOrder', data, res => {
                     uni.hideLoading();
 		            if (res.code === 200) {
-		                uni.showToast({
-		                    title: '下单成功',
-		                    icon: 'success',
-		                    duration: 1500,
-		                    success: () => {
-		                        setTimeout(() => {
-		                            // 跳转到订单列表页
-		                            this.$utils.redirectTo('/pages_order/order/orderList');
-		                        }, 1500);
-		                    }
-		                });
+		                uni.requestPaymentWxPay(res)
+		                .then(e => {
+		                    uni.showToast({
+		                        title: '下单成功',
+		                        icon: 'none'
+		                    })
+		                
+		                    this.paySuccess(res)
+		                }).catch(n => {
+		                    setTimeout(uni.redirectTo, 700, {
+		                        url: '/pages/index/order'
+		                    })
+		                })
 		            } else {
 		                uni.showToast({
 		                    title: res.message || '下单失败',
@@ -263,7 +326,32 @@
 		                });
 		            }
 		        });
-		    }
+		    },
+            paySuccess(res){
+				setTimeout(uni.redirectTo, 700, {
+					url: '/pages/index/order'
+				})
+            },
+			cancelOrderFast(){
+				uni.showModal({
+					title: '确认取消吗？',
+					success : res => {
+						if(res.confirm){
+							this.$api('cancelOrderFast', {
+								orderId : this.orderId
+							}).then(res => {
+								uni.showToast({
+									title: '取消成功',
+									icon: 'none',
+									success() {
+										uni.navigateBack(-1)
+									}
+								})
+							})
+						}
+					}
+				})
+			},
 		}
 	}
 </script>
@@ -282,6 +370,7 @@
         margin-bottom: 20rpx;
         border-radius: 12rpx;
         overflow: hidden;
+		width: 100%;
         background-color: #fff;
     }
     
@@ -309,10 +398,16 @@
     .product-card {
         display: flex;
         padding: 30rpx;
+		
+		.checkbox{
+			display: flex;
+			justify-content: center;
+			align-items: center;
+		}
         
         .product-image {
-            width: 180rpx;
-            height: 180rpx;
+            width: 200rpx;
+            height: 200rpx;
             margin-right: 30rpx;
             background-color: #f9f9f9;
             border-radius: 8rpx;
@@ -323,34 +418,33 @@
             display: flex;
             flex-direction: column;
             justify-content: space-between;
+			gap: 6rpx;
             
             .product-name {
-                font-size: 32rpx;
+                font-size: 28rpx;
                 font-weight: 500;
                 color: #333;
-                margin-bottom: 15rpx;
             }
             
             .product-tags {
                 display: flex;
-                margin-bottom: 20rpx;
                 
                 .tag {
                     font-size: 24rpx;
                     color: #D03F25;
                     padding: 4rpx 12rpx;
                     background-color: rgba(208, 63, 37, 0.1);
-                    border-radius: 4rpx;
+                    border-radius: 14rpx;
                     margin-right: 15rpx;
                 }
             }
             
             .product-price {
-                font-size: 28rpx;
+                font-size: 26rpx;
                 color: #666;
                 
                 .price-value {
-                    font-size: 40rpx;
+                    font-size: 30rpx;
                     font-weight: 600;
                     color: #D03F25;
                 }
@@ -428,24 +522,33 @@
     }
     
     .order-submit {
-        position: fixed;
-        bottom: 0;
-        left: 0;
-        right: 0;
+		display: flex;
         padding: 20rpx 30rpx;
         background-color: #fff;
         box-shadow: 0 -2rpx 10rpx rgba(0, 0, 0, 0.05);
-        
+		gap: 20rpx;
+        .submit-btn-close{
+            height: 90rpx;
+            line-height: 90rpx;
+            text-align: center;
+            background-color: rgba($uni-color, 0.2);
+			border: 1rpx solid $uni-color;
+            color: $uni-color;
+            font-size: 32rpx;
+            border-radius: 45rpx;
+            border: none;
+			flex: 1;
+		}
         .submit-btn {
-            width: 100%;
             height: 90rpx;
             line-height: 90rpx;
             text-align: center;
-            background-color: #D03F25;
+            background-color: $uni-color;
             color: #fff;
             font-size: 32rpx;
             border-radius: 45rpx;
             border: none;
+			flex: 4;
         }
     }
     
diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue
index 83969ef..878ccb2 100644
--- a/pages_order/order/orderDetail.vue
+++ b/pages_order/order/orderDetail.vue
@@ -42,32 +42,34 @@
             <view class="flex" style="display: flex;">
                 <view style="width: 8rpx;height: 30rpx;
 				background: #FD5100;border-radius: 6rpx;" />
-                <view class="head-title">服务项目</view>
+                <view class="head-title">产品</view>
             </view>
 
             <view class="flex">
-                <view class="server-item">
+                <view class="server-item"
+				v-for="(shop, i) in order.children"
+				:key="i">
                     <view class="img-box">
-                        <image :src="order.image" mode="aspectFill"></image>
+                        <image :src="shop.image && shop.image.split(',')[0]" mode="aspectFill"></image>
                     </view>
 
                     <view class="server-info">
 
                         <view class="server-title">
-                            {{ order.title }}
+                            {{ shop.title }}
                             <!-- <view class="coupon">领券立减</view> -->
                         </view>
 
                         <view class="current-price">
-                            价格：<text class="unit">￥</text>{{ order.price }}
+                            价格：<text class="unit">￥</text>{{ shop.price }}
                         </view>
 
                         <view class="sales-volume" style="margin-top: 5px;">
-                            <view class="desc">产品材质：{{ order.material }}</view>
+                            <view class="desc">产品材质：{{ shop.material }}</view>
                         </view>
 
                         <view class="sales-volume" style="margin-top: 5px;">
-                            <view class="desc">产品数量：{{ order.num }}</view>
+                            <view class="desc">产品数量：{{ shop.num }}</view>
                         </view>
                     </view>
 
@@ -132,6 +134,14 @@
                         订单信息
                     </view>
                 </view>
+                <view class="min_tips">
+                    <view class="">
+                        总金额
+                    </view>
+                    <view class="">
+                        ￥{{ order.price }}
+                    </view>
+                </view>
                 <view class="min_tips">
                     <view class="">
                         订单编号
@@ -153,22 +163,25 @@
 
             <!-- 下单须知 -->
             <view class="line">
-                <view class="t min_tips">
+                <!-- <view class="t min_tips">
                     <view class="">
                         下单须知
                     </view>
                 </view>
                 <view class="min_tips" style="line-height: 40rpx;">
                     {{ order.projectExplain }}
-                </view>
-                <view class="btns">
+                </view> -->
+                <!-- <view class="btns">
                     <view @click="clickService" class="btn">
                         联系客服
                     </view>
-                </view>
+                </view> -->
             </view>
 
         </view>
+		
+		<kefu></kefu>
+		
         <!-- 联系客服弹框 -->
         <customerServicePopup ref="customerServicePopup" />
     </view>
@@ -255,11 +268,11 @@ export default {
         display: flex;
         justify-content: center;
         align-items: center;
-        font-size: 40rpx;
+        font-size: 32rpx;
 
         image {
-            width: 100rpx;
-            height: 100rpx;
+            width: 80rpx;
+            height: 80rpx;
             margin-right: 20rpx;
         }
     }
diff --git a/pages_order/order/pictureOrder.vue b/pages_order/order/pictureOrder.vue
index 6f5b816..1e3dc40 100644
--- a/pages_order/order/pictureOrder.vue
+++ b/pages_order/order/pictureOrder.vue
@@ -163,7 +163,7 @@
                     uni.hideLoading();
                     this.isUploading = false;
                     
-                    if (res.code === 0) {
+                    if (res.code == 200) {
                         // 下单成功
                         uni.showToast({
                             title: '下单成功',
diff --git a/pages_order/order/voiceOrder.vue b/pages_order/order/voiceOrder.vue
index 0057ecd..39d5519 100644
--- a/pages_order/order/voiceOrder.vue
+++ b/pages_order/order/voiceOrder.vue
@@ -418,7 +418,7 @@
 					uni.hideLoading();
 					this.isUploading = false;
 					
-					if (res.code === 200) {
+					if (res.code == 200) {
 						// 下单成功
 						uni.showToast({
 							title: '下单成功',
diff --git a/pages_order/product/productDetail.vue b/pages_order/product/productDetail.vue
index 936b700..4047837 100644
--- a/pages_order/product/productDetail.vue
+++ b/pages_order/product/productDetail.vue
@@ -60,7 +60,7 @@
 		</view>
 
 		<!-- 分享和租赁按钮 -->
-		<submit @submit="submit" />
+		<submit @submit="submit" @addCart="addCart"/>
 
 		<!-- 选择规格 -->
 		<!-- <submitUnitSelect ref="submitUnitSelect" /> -->
@@ -89,12 +89,13 @@
 				productDetail: {
 					image: 'https://cdn.uviewui.com/uview/swiper/swiper3.png,https://cdn.uviewui.com/uview/swiper/swiper2.png',
 					content: '',
-				}
+				},
+				id : 0,
 			}
 		},
 		onLoad(args) {
-			console.log(args);
 			if(args.id) {
+				this.id = args.id
 				this.getProductDetail(args.id)
 			}
 		},
@@ -109,6 +110,19 @@
 					}
 				})
 			},
+			addCart(){
+				this.$api('addCart', {
+					shopId : this.id,
+					num : 1,
+				}).then(res => {
+					if(res.code == 200){
+						uni.showToast({
+							title: '加入成功',
+							icon: 'none'
+						})
+					}
+				})
+			},
 			// 联系客服
 			share() {
 				var that = this
diff --git a/pages_order/product/productList.vue b/pages_order/product/productList.vue
index 1d231c1..809bb9e 100644
--- a/pages_order/product/productList.vue
+++ b/pages_order/product/productList.vue
@@ -51,12 +51,12 @@
 		},
 		methods: {
 			handleSearch(value){
-				this.queryParams.name = this.keyword
+				this.queryParams.title = this.keyword
 				this.getData()
 			},
 			searchChange(){
 				if(!this.keyword){
-					this.queryParams.name = this.keyword
+					this.queryParams.title = this.keyword
 					this.getData()
 				}
 			},
diff --git a/uni_modules/uv-number-box/components/uv-number-box/props.js b/uni_modules/uv-number-box/components/uv-number-box/props.js
index 64b633b..6d7e886 100644
--- a/uni_modules/uv-number-box/components/uv-number-box/props.js
+++ b/uni_modules/uv-number-box/components/uv-number-box/props.js
@@ -81,7 +81,7 @@ export default {
 		// 按钮大小，宽高等于此值，单位px，输入框高度和此值保持一致
 		buttonSize: {
 			type: [String, Number],
-			default: 30
+			default: 50
 		},
 		// 输入框和按钮的背景颜色
 		bgColor: {