From 34b6e0548fb7f3d88842914db89d7cd603a5e531 Mon Sep 17 00:00:00 2001
From: xuxy <1059738716@qq.com>
Date: 星期四, 01 八月 2024 23:11:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'

---
 store/index.js |  135 +++++++++++++++++++++++++++++++++++++++------
 1 files changed, 117 insertions(+), 18 deletions(-)

diff --git a/store/index.js b/store/index.js
index 5000bdd..528e0f9 100644
--- a/store/index.js
+++ b/store/index.js
@@ -29,7 +29,8 @@
 			'flower': 0,
 			'shopping': 0,
 			'follow': 0,
-			'delivery': 0
+			'delivery': 0,
+			'order': 0
 		},
 		defaultaddress: {}
 	},
@@ -107,6 +108,16 @@
 			console.log('sign_add', key)
 			state.sign[key] = 1
 		},
+		// sign_add_value: async function({
+		// 	commit,
+		// 	state
+		// }, {
+		// 	key,
+		// 	value
+		// }) {
+		// 	console.log('sign_add', key)
+		// 	state.sign[key] = value || 0
+		// },
 		sign_clear: async function({
 			commit,
 			state
@@ -368,8 +379,8 @@
 			state
 		}, data) {
 			{
-				const resp = await http.request('post', '/api/login/customer' + (data
-					.phoneNumber ? '/phone' : ''), {
+				const resp = await http.request('post', '/api/login/customer' + ((data.phoneNumber || data
+					.tel) ? '/phone' : ''), {
 					data: {
 						username: (data.phoneNumber || data.tel) ? (data.phoneNumber ||
 							data.tel) : data.username,
@@ -399,29 +410,117 @@
 		},
 		submitShopping: async function({
 			commit,
-			dispatch
+			dispatch,
+			state
 		}, data) {
-			const resp = await http.request('post', '/api/customer/flower/cart/change-num', {
-				data: {
-					id: data.id,
-					num: 1
-				}
-			})
-			if (resp && resp.code === 0) {
-				message.showToast('添加购物车成功')
-				dispatch('sign_add', 'shopping')
-			} else {
-
+			if (!state.currentInfo.id) {
+				message.showToast('请先登录')
+				return
 			}
-			return resp
+			//输入要添加多少个
+			// const res = await message.confirm('', {
+			// 	editable: true,
+			// 	title: '请输入购买数目'
+			// })
+			// if (res.content && res.confirm) {
+			// var t = res.content
+			var t = 1
+			if (!isNaN(parseInt(t)) && t >= 0) {
+				if ((t) === 0) {
+					message.showLoading()
+					const resp = await http.request('get', '/api/customer/flower/cart/delete', {
+						params: {
+							id: data.id,
+						}
+					})
+					message.hideLoading()
+					if (resp && resp.code === 0) {
+						message.showToast('操作成功')
+						dispatch('sign_add', 'shopping')
+						return {
+							code: 0,
+							data: 0
+						}
+					}
+				} else {
+					if (parseInt(t) <= 0) {
+
+					} else {
+						//提示没有库存
+						if (!data.stock) {
+							message.showToast('没有库存了,更新失败')
+
+							return {
+								code: 1,
+								data: parseInt(t)
+							}
+						} else {
+							if (data.stock == 0) {
+								message.showToast('库存为0,更新失败')
+
+								return {
+									code: 1,
+									data: parseInt(t)
+								}
+							} else if (data.stock > 0 && data.stock < (
+									parseInt(t))) {
+								message.showToast('超过库存,更新失败')
+
+								return {
+									code: 1,
+									data: parseInt(t)
+								}
+							}
+						}
+						// console.log('data',)
+					}
+					message.showLoading()
+
+					const resp = await http.request('post', '/api/customer/flower/cart/change-num', {
+						data: {
+							id: data.id,
+							num: parseInt(t)
+						}
+					})
+					message.hideLoading()
+
+					if (resp && resp.code === 0) {
+						message.showToast('添加购物车成功')
+						dispatch('sign_add', 'shopping')
+						return {
+							code: 0,
+							data: parseInt(t)
+						}
+					}
+				}
+
+				// return {
+				// 	code: 1,
+				// 	data: 0
+				// }
+			}
+			//  else {
+			// 	console.log('res.content', res.content)
+			// 	message.showToast('输入数目需要大于0')
+			// }
+
+
+			return {
+				code: 1,
+				data: 0
+			}
 		},
 		countShopping: async function({
 			commit,
 			dispatch,
 			state
 		}, data) {
-			if(state.currentInfo.id){
-				const resp = await http.request('get', '/api/customer/flower/cart/flower/count', {})
+			if (state.currentInfo.id) {
+				const resp = await http.request('get', '/api/customer/flower/cart/flower/count', {
+					params: {
+						// flowerId: data || null
+					}
+				})
 				if (resp && resp.code === 0) {
 					return resp.data || 0
 				} else {

--
Gitblit v1.9.3