From a08260f2023c01df2a2cb84de8f494e1e323b8bf Mon Sep 17 00:00:00 2001
From: songliang <songliang@kingsome.cn>
Date: Tue, 1 Nov 2022 14:10:23 +0800
Subject: [PATCH] ...

---
 webapp/controller/ShopController.class.php | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/webapp/controller/ShopController.class.php b/webapp/controller/ShopController.class.php
index 1768027b..f3fbe003 100644
--- a/webapp/controller/ShopController.class.php
+++ b/webapp/controller/ShopController.class.php
@@ -31,7 +31,8 @@ class ShopController extends BaseAuthedController {
     {
         $row = SqlHelper::ormSelect(
             $this->_getSelfMysql(),
-            't_shop_goods'
+            't_shop_goods',
+            array(),
         );
         $this->_rspData(array(
             'goods_list' => $row ? $row : array(),
@@ -42,7 +43,8 @@ class ShopController extends BaseAuthedController {
     {
         $row = SqlHelper::ormSelect(
             $this->_getSelfMysql(),
-            't_shop_names'
+            't_shop_names',
+            array(),
         );
         $this->_rspData(array(
             'shop_name_list' => $row ? $row : array(),
@@ -52,6 +54,7 @@ class ShopController extends BaseAuthedController {
     public function buyGoodsNew()
     {
         $id = getReqVal('id', 0);
+        $token_type = getReqVal('token_type', '');
         $num = getReqVal('goods_num', 0);
         
         $row = SqlHelper::ormSelectOne(
@@ -62,8 +65,10 @@ class ShopController extends BaseAuthedController {
             )
         );
         $this->_rspData(array(
-            'p1' => $id,
-            'p2' => $row ? $row : array(),
+            'id' => $id,
+            'token_type' => $token_type,
+            'num' => $num,
+            'row' => $row ? $row : array(),
         ));
     }