companyProjecet.git

			@@ -4,6 +4,8 @@

			use app\api\model\product\Product as ProductModel;
			use app\api\model\plus\article\Article;
			use app\api\model\supplier\Category;
			use app\common\enum\supplier\SupplierType;
			use app\common\model\page\Page as PageModel;
			use app\api\model\plus\coupon\Coupon;
			use app\api\model\plus\seckill\Product as SeckillProductModel;
			@@ -14,7 +16,7 @@
			use app\api\model\plus\bargain\Active as BargainActiveModel;
			use app\api\model\plus\live\Room as RoomModel;
			use app\api\model\plus\release\Project;

			use app\api\model\supplier\Supplier as SupplierModel;
			/**
			* 首页模型
			*/
			@@ -32,7 +34,7 @@
			/**
			* DIY页面详情
			*/
			public static function getPageData($user, $page_id = null,$city_supplier_ids='')
			public static function getPageData($user, $page_id = null,$city_supplier_ids='',$latitude=0,$longitude=0)
			{
			// 页面详情
			$detail = $page_id > 0 ? parent::detail($page_id) : parent::getDefault();
			@@ -88,6 +90,11 @@
			$items[$key]['data'] = $model->getLiveList($item);
			} else if ($item['type'] === 'previewProduct') {
			$items[$key]['data'] = $model->getPreviewList($user, $item);
			} else if ($item['type'] === 'groupBuy') {
			// 团购组件
			//$items[$key]['data'] = $model->getGroupBuyList($user, $item, $city_supplier_ids, $latitude, $longitude);
			$items[$key]['style']['server_score_image']=$items[$key]['style']['server_score_image']==self::$base_url . 'image/diy/product/01.png'?'':$items[$key]['style']['server_score_image'];
			//$items[$key]['category']=(new Category())->getALL(['category_type'=>SupplierType::GROUPBUYING]);
			}
			}
			return ['page' => $items['page'], 'items' => $items];
			@@ -114,6 +121,7 @@
			'list_rows' => $item['params']['auto']['showNum'],
			'audit_status' => 10,
			'city_supplier_ids' => $city_supplier_ids,
			'is_gift_pack' => 0,
			], $user);
			}
			if ($productList->isEmpty()) return [];
			@@ -125,6 +133,7 @@
			'product_id' => $product['product_id'],
			'product_name' => $product['product_name'],
			'selling_point' => $product['selling_point'],
			'is_price_negotiable' => $product['is_price_negotiable'],
			'image' => $product['image'][0]['file_path'],
			'product_image' => $product['image'][0]['file_path'],
			'product_price' => $show_sku['product_price'],
			@@ -265,4 +274,37 @@
			}
			return $data;
			}
			public function getSupplierList($item)
			{
			$model = new SupplierModel();
			$list = $model->getList([
			'list_rows' => $item['params']['showNum']
			]);
			return $list->isEmpty() ? [] : $list->toArray()['data'];
			}

			/**
			* 团购组件：获取团购商户列表
			*/
			private function getGroupBuyList($user, $item, $city_supplier_ids = '', $latitude = 0, $longitude = 0)
			{
			// 获取团购数据
			$model = new SupplierModel();
			$params = [
			'list_rows' => isset($item['params']['showNum']) ? $item['params']['showNum'] : 10,
			'sortType' => isset($item['params']['merchantSort']) ? $item['params']['merchantSort'] : 'all',
			'product_num' => isset($item['params']['product_num']) ? $item['params']['product_num'] : 3,
			'city_supplier_ids' => $city_supplier_ids,
			'latitude' => $latitude,
			'longitude' => $longitude,
			];

			// 如果有分类筛选
			if (isset($item['params']['category_id']) && $item['params']['category_id']) {
			$params['category_id'] = $item['params']['category_id'];
			}

			$list = $model->getGroupBuyList($params);
			return empty($list['data']) ? [] : $list['data'];
			}
			}