From 78ed60987acddc7fd4a81580ac27bb1dfce614d9 Mon Sep 17 00:00:00 2001
From: BigBoss <2280520255@qq.com>
Date: Wed, 10 Jun 2020 13:26:38 +0800
Subject: [PATCH] =?UTF-8?q?build=E4=B8=8B=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/BottomSheet/BottomSheet.vue | 5 ++---
 src/pages/confirmOrder/confirmOrder.vue    | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/components/BottomSheet/BottomSheet.vue b/src/components/BottomSheet/BottomSheet.vue
index 4dfd7e2..a1a9695 100644
--- a/src/components/BottomSheet/BottomSheet.vue
+++ b/src/components/BottomSheet/BottomSheet.vue
@@ -480,9 +480,8 @@ import store from '@/store'
 		methods: {
 			checkGlassInfo(){
 				const glassInfoArr = Object.values(this.glassInfo)
-				// console.log(glassInfoArr)
 				if(glassInfoArr.find(item => item == '0') !=='undefind'){
-					uni.showToast({
+					uni.showModal({
 						title:'请完善镜框数据~'
 					})
 				}
@@ -744,7 +743,7 @@ import store from '@/store'
 			  }
 			},
 			toComfirmOrder() {
-				
+				this.checkGlassInfo()
 				this.updateMylove()
 			  // 先处理验光部分的逻辑，如果ok在跳转
 			  let flag = 0
diff --git a/src/pages/confirmOrder/confirmOrder.vue b/src/pages/confirmOrder/confirmOrder.vue
index fa608ca..bfc6901 100644
--- a/src/pages/confirmOrder/confirmOrder.vue
+++ b/src/pages/confirmOrder/confirmOrder.vue
@@ -383,7 +383,7 @@ export default {
 		  const checkedGoods = []
 		  const sk_id_arr = []
 		  this.checkedCartLst.map(item => {
-			  checkedGoods.push(item.pid)
+			  checkedGoods.push(item.cart_id)
 			  sk_id_arr.push(item.sk_id)
 		  })
 		  store.dispatch('order/build', {
-- 
2.0.0