Merge branch 'dev'

app/api/controller/Config.php

@@ -18,7 +18,6 @@ class Config extends Base
         // 查询盒子类型数据
         $goodsTypeList = Db::name('goods_type')
             ->field('value, sort_order,is_show, name,pay_wechat,pay_balance,pay_currency,pay_currency2,pay_coupon,is_deduction')
-            // ->where('is_show', 1)
             ->order('sort_order')
             ->select()
             ->toArray();
@@ -26,7 +25,9 @@ class Config extends Base
         // 返回数据
         return $this->renderSuccess('获取成功', [
             'good_type' => $goodsTypeList,
-            'app_setting' => $app_setting
+            'app_setting' => $app_setting,
+            'version' => '100'
         ]);
     }
+ 
 }

app/api/route/app.php

@@ -212,6 +212,7 @@ Route::any('order_detail', 'Order/getOrderDetail');
 #============================
 Route::any('getFloatBall', 'Index/getFloatBall');
 
+ 
 // // getUserAccount
 // Route::any('getUserAccount', 'User/getUserAccount');
 // Route::any('createUser', 'User/createUser');