合并分支 '1iuzhen' 到 'master'

商品选择修改



查看合并请求 !237

@@ -152,7 +152,7 @@ class MemberSalesController extends HomeBaseController
         $default = 0;
         $default = 0;
         foreach ($typeInfo['options'] as $k=>$v) {
         foreach ($typeInfo['options'] as $k=>$v) {
             // 获取商品选项，用于前台渲染
             // 获取商品选项，用于前台渲染
-            if($v['id'] == 19) {
+            if($v['id'] == 58) {
                 $list = explode(',',$v['values']);
                 $list = explode(',',$v['values']);
                 foreach ($list as $kg=>$vg) {
                 foreach ($list as $kg=>$vg) {
                     $goodsInfo = [
                     $goodsInfo = [
@@ -398,7 +398,7 @@ class MemberSalesController extends HomeBaseController
         $goodsList = [];
         $goodsList = [];
         foreach ($orderInfo['options'] as $k=>$v) {
         foreach ($orderInfo['options'] as $k=>$v) {
             // 获取商品选项，用于前台渲染
             // 获取商品选项，用于前台渲染
-            if($v['id'] == 19) {
+            if($v['id'] == 58) {
                 $list = explode(',',$v['values']);
                 $list = explode(',',$v['values']);
                 foreach ($list as $kg=>$vg) {
                 foreach ($list as $kg=>$vg) {
                     $goodsInfo = [
                     $goodsInfo = [