From d788c2c90d328c70961784f0a3f816f1fef48be2 Mon Sep 17 00:00:00 2001
From: Jerry Yan <792602257@qq.com>
Date: Thu, 16 Jan 2020 19:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyhproject/app/model/._Goods.php   | Bin 4096 -> 0 bytes
 hyhproject/app/model/._Shops.php   | Bin 4096 -> 0 bytes
 hyhproject/common/model/Orders.php |   2 ++
 3 files changed, 2 insertions(+)
 delete mode 100755 hyhproject/app/model/._Goods.php
 delete mode 100755 hyhproject/app/model/._Shops.php

diff --git a/hyhproject/app/model/._Goods.php b/hyhproject/app/model/._Goods.php
deleted file mode 100755
index 728d10b109a6fa8a87e4f2f0f84d4f41b985ae21..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vVpyZ>
z2GPN=0H|C5O$#HC4;7b6&d=3LEGWoH)yqjNE-5WeO-V^CNmULA2I(oSEQ$ruRezp<
z^o)Yh5Eu=C(GVC7fzc2c4S~@R7!85Z5Eu=C(GVC7fzc4a83Le=BfRq{7m|@#tWcC%
zoL^d$oT`wPUzDwonOBmUSCW~Zmza}NsgRSJR-%xUlbDwc><i;GbO=eH`XBCa83wuk
F{{h78D=Yv2

diff --git a/hyhproject/app/model/._Shops.php b/hyhproject/app/model/._Shops.php
deleted file mode 100755
index 69b4dc20bb988e8bb6f914609bf1b068b19c948b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4096
zcmZQz6=P>$Vqox1Ojhs@R)|o50+1L3ClDJkFz{^v(m+1nBL)UWIUt(=a103vVpyZ>
z4AH@`0H|C5O$#HC4;7b6&d=3LEGWoH)yqjNE-5WeO-V^CNmULA2I<+9R1^!MA1`JX
z0nwviGz3ONU^E0qLtr!nMnhmU1V%$(Gz3ONU^E0qLtr!naD@P<vkAgrAQzI6S*%c$
zTAW{6l$@%NmS2>ukeOGKnpcvUpO=`EQ>l=XnpUEal#`g34eSd;bq#3>)&Fp>$S}zL
G{|^AUw<?tY

diff --git a/hyhproject/common/model/Orders.php b/hyhproject/common/model/Orders.php
index 498b214..03999ae 100755
--- a/hyhproject/common/model/Orders.php
+++ b/hyhproject/common/model/Orders.php
@@ -323,6 +323,8 @@ class Orders extends Base{
 		// 验证商品规格是否已选
 		foreach ($carts['carts'] as $v) {
 			foreach ($v['list'] as $val) {
+                // 坑啊判断下会死嘛 ---- 20200116
+			    if($val['isSpec']!=1)continue;
 				$id = Db::name('goods_specs')->where(['shopId'=>$val['shopId'],'goodsId'=>$val['goodsId']])->column('id');
 				if($id && $val['goodsSpecId'] == ''){
 					return WSTReturn("请选择商品规格型号！");