更改购物车，添加商品改价及时更新，订单列表

common/api/order/index.js

@@ -8,4 +8,30 @@ export const APIuserorder = (data) => {
 		method: 'get',
 		data: data
 	})
+}
+
+//生成订单
+export const APIcreateOrder = (data) => {
+	return request({
+		url: url + '/user/order/createOrder',
+		method: 'post',
+		data: data
+	})
+}
+
+//删除订单
+export const APIputuserorder = (data) => {
+	return request({
+		url: url + '/user/order/' + data,
+		method: 'put'
+	})
+}
+
+//订单列表
+export const orderhistoryOrder = (data) => {
+	return request({
+		url: url + '/user/order/historyOrder',
+		method: 'get',
+		data: data
+	})
 }

pages/order/index.vue

@@ -62,7 +62,7 @@
 						</view>
 						<view class="shop-info">
 							<view class="shop-item">
-								<view class="cover" v-for="(item1,index1) in item.detailList" :key="index1">
+								<view class="cover" v-for="(item1,index1) in item.goods" :key="index1">
 									<u-image width="112" height="112" radius="20" :src='item1.productImg'
 										v-if="item1.productId!=-999"></u-image>
 									<u-image width="112" height="112" radius="20"

pages/product/components/shoppingCartes.vue

@@ -12,7 +12,7 @@
 				</view>
 				<scroll-view scroll-y class="scroll-view">
 					<view class="list-wrap">
-						<view class="shop-item" v-for="(item,index) in props.cartList" :key="item.id">
+						<view class="shop-item" v-for="(item,index) in cartList" :key="item.id">
 							<view class="shop-item-content">
 								<view class="cover" v-if="item.productId!=-999">
 									<up-image :src="item.coverImg" width="80" radius="10" height="80"></up-image>

stores/pay.js

@@ -11,8 +11,13 @@ import {
 	APIpayltPayVip
 } from '@/common/api/pay.js'
 
+import {
+	APIcreateOrder
+} from '@/common/api/order/index.js'
+
 export const Memberpay = defineStore('memberpay', {
 	actions: {
+		//会员充值
 		actionspayltPayVip(data) {
 			return new Promise(async (resolve, reject) => {
 				try {
@@ -51,16 +56,14 @@ export const Memberpay = defineStore('memberpay', {
 							orderInfo: res.tradeNo, // 微信支付商户号
 							// #endif
 							success: (res) => {
-								console.log(res)
 								uni.hideLoading()
-								let pages = getCurrentPages()
 								// #ifdef MP-WEIXIN
 								uni.showToast({
 									title: "支付成功"
 								})
+								console.log('支付成功')
 								resolve(res)
 								// #endif
-
 								// #ifdef MP-ALIPAY
 								if (res.resultCode == '9000') {
 									uni.showToast({
@@ -75,35 +78,127 @@ export const Memberpay = defineStore('memberpay', {
 								// #endif
 							},
 							fail: (res) => {
-								uni.hideLoading()
+								setTimeout(() => {
+									uni.hideLoading()
+								}, 1000)
 								reject(false)
 							}
 						});
 					}
 				} catch (e) {
-					uni.hideLoading()
+					uni.showToast({
+						title: "支付失败"
+					})
+					setTimeout(() => {
+						uni.hideLoading()
+					}, 1000)
 					reject(false)
 				}
 			})
 		},
 
-		actionsltPayOrder() {
+		//下单支付 
+		actionsltPayOrder(data) {
 			return new Promise(async (resolve, reject) => {
-				let res = await APIpayltPayOrder({
-					shopId: uni.cache.get('shopId'),
-					checkOrderPay: {},
-					// #ifdef MP-WEIXIN
-					payType: 'wechatPay',
-					openId: uni.cache.get('userInfo').wechatOpenId,
-					// #endif
-					// #ifdef MP-ALIPAY
-					payType: 'aliPay',
-					openId: uni.cache.get('alipayOpenId').wechatOpenId,
-					// #endif
-					returnUrl: '',
-					buyerRemark: '',
+				try {
+					let res = await APIpayltPayOrder({
+						shopId: uni.cache.get('shopId'),
+						checkOrderPay: data.checkOrderPay,
+						// #ifdef MP-WEIXIN
+						payType: 'wechatPay',
+						openId: uni.cache.get('userInfo').wechatOpenId,
+						// #endif
+						// #ifdef MP-ALIPAY
+						payType: 'aliPay',
+						openId: uni.cache.get('alipayOpenId').wechatOpenId,
+						// #endif
+						returnUrl: '',
+						buyerRemark: data.buyerRemark,
+					})
+					if (res) {
+						uni.showLoading({
+							title: '加载中',
+							mask: true
+						})
+						uni.requestPayment({
+							// #ifdef MP-WEIXIN
+							provider: 'wxpay', //支付类型-固定值
+							partnerid: res.appId, // 微信支付商户号
+							timeStamp: res.timeStamp, // 时间戳（单位：秒）
+							nonceStr: res.nonceStr, // 随机字符串
+							package: res.package, // 固定值
+							signType: res.signType, //固定值
+							paySign: res.paySign, //签名
+							// #endif
+							// #ifdef MP-ALIPAY
+							provider: 'alipay', //支付类型-固定值
+							orderInfo: res.tradeNo, // 微信支付商户号
+							// #endif
+							success: (res) => {
+								uni.hideLoading()
+								// #ifdef MP-WEIXIN
+								uni.showToast({
+									title: "支付成功"
+								})
+								console.log('支付成功')
+								resolve(res)
+								// #endif
+								// #ifdef MP-ALIPAY
+								if (res.resultCode == '9000') {
+									uni.showToast({
+										title: "支付成功"
+									})
+									resolve(res)
+								} else {
+									uni.showToast({
+										title: "支付失败"
+									})
+								}
+								// #endif
+							},
+							fail: (res) => {
+								setTimeout(() => {
+									uni.hideLoading()
+								}, 1000)
+								reject(false)
+							}
+						});
+					}
+				} catch (e) {
+					uni.showToast({
+						title: "支付失败"
+					})
+					setTimeout(() => {
+						uni.hideLoading()
+					}, 1000)
+					reject(false)
+				}
+			})
+		},
+
+		// 生成订单
+		actionscreateOrder(data) {
+			return new Promise(async (resolve, reject) => {
+				let res = await APIcreateOrder({
+					orderId: data.orderId, //多次下单时使用
+					shopId: uni.cache.get('shopId'), //店铺Id
+					userId: uni.cache.get('userInfo').id || '', //
+					seatNum: data.seatNum, //用餐人数
+					packFee: data.packFee, //打包费
+					originAmount: data.originAmount, //订单原金额（包含打包费） 不含折扣价格 不含餐位费
+					tableCode: uni.cache.get('tableCode'), //台桌编码
+					dineMode: 'dine-in', //堂食 dine-in 外带 take-out 外卖 take-away
+					remark: data.remark, //备注
+					placeNum: data.placeNum, //当前订单下单次数
+					waitCall: data.waitCall //是否等叫 0 否 1 等叫
 				})
+				if (res) {
+					resolve(res)
+				} else {
+					reject(false)
+				}
 			})
 		}
+
 	}
 });