From dce7d15ab1d3ebecd46358d07287ce3a33d80605 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 10 Feb 2022 09:20:43 +0800
Subject: [PATCH] bugList

---
 pages/goods/goods.vue | 58 ++++++++++++++++++-------------------------
 1 file changed, 24 insertions(+), 34 deletions(-)

diff --git a/pages/goods/goods.vue b/pages/goods/goods.vue
index c1785af..eef576f 100644
--- a/pages/goods/goods.vue
+++ b/pages/goods/goods.vue
@@ -46,7 +46,8 @@
 			</view>
 			<view class="btn">
 				<view class="joinCart" @tap="joinCart">加入购物车</view>
-				<view class="buy" @tap="buy">立即购买</view>
+				<view v-if="good.num>0" class="buy" @tap="buy">立即购买</view>
+				<view v-else class="buy">库存不足</view>
 			</view>
 		</view>
 		<!-- share弹窗 -->
@@ -102,16 +103,12 @@
 				</view>
 			</view>
 		</view>
-		<!-- 规格-模态层弹窗 -->
+		<!-- 立即购买-模态层弹窗 -->
 		<view class="popup spec" :class="specClass" @touchmove.stop.prevent="discard" @tap="hideSpec">
 			<!-- 遮罩层 -->
 			<view class="mask"></view>
 			<view class="layer" @tap.stop="discard">
 				<view class="content">
-					<!-- <view class="title">选择规格：</view>
-					<view class="sp">
-						<view v-for="(item,index) in goodsData.spec" :class="[index==selectSpec?'on':'']" @tap="setSelectSpec(index)" :key="index">{{item}}</view>
-					</view> -->
 					<view class="length">
 						<view class="text">数量</view>
 						<view class="number">
@@ -336,12 +333,11 @@
 		methods: {
 			getGood(id) {
 				this.$u.api.getGood(id).then(res => {
-					let good = res.data
+					let good = res.data;
+					good._num = 1;//购买数
 					if (good.content) {
 						good.content = richTextUtil.formatRichText(good.content);
-						good._num = 1;//购买数
 					}
-					// console.log(good)
 					this.good = good
 				})
 			},
@@ -399,13 +395,6 @@
 			buy() {
 				this.action = 'buy';
 				this.specClass = 'show'
-				// this.showSpec()
-				// if(this.selectSpec==null){
-				// 	return this.showSpec(()=>{
-				// 		this.toConfirmation();
-				// 	});
-				// }
-				// this.toConfirmation();
 			},
 			//商品评论
 			toRatings() {
@@ -524,24 +513,25 @@
 			},
 			//关闭规格弹窗
 			confirm() {
-				this.specClass = 'none';
-				//回调
-
-				// this.selectSpec&&this.specCallback&&this.specCallback();
-				// this.specCallback = false;
-				// setTimeout(() => {
-				// 	this.specClass = 'none';
-				// }, 200);
-				if (this.action == 'buy') {
-
-					this.toConfirmation()
-				} else {
-					this.$u.api.addtoCart(this.good.id, this.good._num).then(res => {
-						uni.showToast({
-							title: "已加入购物车"
-						});
-					})
-
+				debugger;
+				let num = parseInt(this.good._num);
+				if(num>this.good.num){
+					uni.showToast({
+						icon:'error',
+						title: "库存不足！"
+					});
+				}else{
+					this.specClass = 'none';
+					if (this.action == 'buy') {
+					
+						this.toConfirmation()
+					} else {
+						this.$u.api.addtoCart(this.good.id, this.good._num).then(res => {
+							uni.showToast({
+								title: "已加入购物车"
+							});
+						})
+					}
 				}
 			},
 			discard() {