Merge branch 'dev-xpy' into dev

app/controller/api/store/product/Other.php

@@ -522,8 +522,8 @@ class Other extends BaseController
                         $value['bill_end_time'] = $billEndTime ? date('Y-m-d H:i:s', $billEndTime) : '';
                         //'0平台未结算1已结算2失效
                         $value['status_name'] = $this->statusName[$value['status']];
-                        if (strpos($value['goods_img'], 'http') === false){
-                            $value['goods_img'] = "http:".$value['goods_img'];
+                        if (strpos($tb_list['goods_img'], 'http') === false){
+                            $value['goods_img'] = "http:".$tb_list['goods_img'];
                         }
                         $value['yanglao'] = $yanglao;
                         $value = array_merge($value,$tb_list);