diff --git a/application/api/controller/Goods.php b/application/api/controller/Goods.php
index 8b3a27c49..206f789b6 100644
--- a/application/api/controller/Goods.php
+++ b/application/api/controller/Goods.php
@@ -96,5 +96,37 @@ class Goods extends Common
$ret = GoodsService::GoodsFavor($params);
return json($ret);
}
+
+ /**
+ * 商品规格类型
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2018-12-14
+ * @desc description
+ */
+ public function SpecType()
+ {
+ // 开始处理
+ $params = $this->data_post;
+ $ret = GoodsService::GoodsSpecType($params);
+ return json($ret);
+ }
+
+ /**
+ * 商品规格信息
+ * @author Devil
+ * @blog http://gong.gg/
+ * @version 1.0.0
+ * @date 2018-12-14
+ * @desc description
+ */
+ public function SpecDetail()
+ {
+ // 开始处理
+ $params = $this->data_post;
+ $ret = GoodsService::GoodsSpecDetail($params);
+ return json($ret);
+ }
}
?>
\ No newline at end of file
diff --git a/application/service/GoodsService.php b/application/service/GoodsService.php
index 6cd642285..d58bf1672 100755
--- a/application/service/GoodsService.php
+++ b/application/service/GoodsService.php
@@ -1748,11 +1748,6 @@ class GoodsService
'key_name' => 'spec',
'error_msg' => '请选择规格',
],
- [
- 'checked_type' => 'is_array',
- 'key_name' => 'spec',
- 'error_msg' => '规格有误',
- ],
];
$ret = ParamsChecked($params, $p);
if($ret !== true)
@@ -1766,6 +1761,12 @@ class GoodsService
'goods_id' => intval($params['id']),
];
$value = [];
+
+ // 规格不为数组则为json字符串
+ if(!is_array($params['spec']))
+ {
+ $params['spec'] = json_decode($params['spec'], true);
+ }
foreach($params['spec'] as $v)
{
$value[] = $v['value'];
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
index deaf97352..6e79150b4 100755
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.acss
@@ -31,10 +31,11 @@
margin-top: 20rpx;
margin-right: 25rpx;
padding: 0 30rpx;
- background: #eee;
+ background-color: #f5f5f5;
color: #666;
line-height: 27px;
height: 27px;
+ border: 1px solid #d5d5d5;
}
.goods-attr-choose .item .attribute button image {
width: 20px;
@@ -42,17 +43,38 @@
vertical-align: middle;
margin-right: 10rpx;
}
+.spec-active {
+ background: #d2364c !important;
+ color: #fff !important;
+ border: 1px solid #b91d33 !important;
+}
+.spec-dont-choose {
+ color: #b4b3b3 !important;
+ background-color: #ffffff !important;
+ border: 1px solid #ebeaea !important;
+}
+.spec-dont-choose image {
+ opacity: 0.5;
+}
+.spec-items-disabled {
+ color: #d2cfcf !important;
+ background-color: #ffffff !important;
+ border: 1px dashed #d5d5d5 !important;
+}
+.spec-items-disabled image {
+ opacity: 0.3;
+}
.goods-attr-choose .item .attribute button,
.goods-popup-submit
{
border-radius: 50rpx;
- border: 0;
}
.goods-popup-submit {
height: 85rpx;
line-height: 85rpx;
font-size: 36rpx;
margin-top: 20rpx;
+ border: 0;
}
.goods-popup .goods-buy-number {
margin-bottom: 20rpx;
diff --git a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
index d922126f4..7a38adce9 100755
--- a/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
+++ b/public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
@@ -91,11 +91,7 @@
{{item.name}}
-
-