Commit 15ec0f4e authored by ZhuChunYang's avatar ZhuChunYang

新增原生登录链接

parent 7b8bde7c
...@@ -50,7 +50,7 @@ class ApplicationController extends BaseController ...@@ -50,7 +50,7 @@ class ApplicationController extends BaseController
if(Yii::$app->request->isPost){ if(Yii::$app->request->isPost){
Yii::$app->response->format = 'json'; Yii::$app->response->format = 'json';
$category_id = Yii::$app->request->get('category_id'); $category_id = Yii::$app->request->get('category_id');
$fields = ['category_id','name','sort','icon','type','native_url','h5_url','android_url','ios_url','app_store_url','advertise','description','redirect_type']; $fields = ['category_id','name','sort','icon','type','native_url','native_login_url','h5_url','android_url','ios_url','app_store_url','advertise','description','redirect_type'];
$params = array_merge(Yii::$app->request->post(),['category_id' => $category_id]); $params = array_merge(Yii::$app->request->post(),['category_id' => $category_id]);
$params = $this->initParams($params, $fields); $params = $this->initParams($params, $fields);
$coin_applicateion_form = new CoinApplicationForm(); $coin_applicateion_form = new CoinApplicationForm();
...@@ -70,7 +70,7 @@ class ApplicationController extends BaseController ...@@ -70,7 +70,7 @@ class ApplicationController extends BaseController
{ {
if (Yii::$app->request->isPost) { if (Yii::$app->request->isPost) {
Yii::$app->response->format = 'json'; Yii::$app->response->format = 'json';
$fields = ['category_id','id','name','sort','icon','type','native_url','h5_url','android_url','ios_url','app_store_url','advertise','description','redirect_type']; $fields = ['category_id','id','name','sort','icon','type','native_url','native_login_url','h5_url','android_url','ios_url','app_store_url','advertise','description','redirect_type'];
$params = $this->initParams(Yii::$app->request->post(), $fields); $params = $this->initParams(Yii::$app->request->post(), $fields);
$coin_applicateion_form = new CoinApplicationForm(); $coin_applicateion_form = new CoinApplicationForm();
$coin_applicateion_form->setScenario(CoinApplicationForm::SCENARIO_EDIT); $coin_applicateion_form->setScenario(CoinApplicationForm::SCENARIO_EDIT);
......
...@@ -24,6 +24,7 @@ class CoinApplicationForm extends BaseForm ...@@ -24,6 +24,7 @@ class CoinApplicationForm extends BaseForm
public $sort; public $sort;
public $type; public $type;
public $native_url; public $native_url;
public $native_login_url;
public $h5_url; public $h5_url;
public $android_url; public $android_url;
public $ios_url; public $ios_url;
...@@ -36,8 +37,8 @@ class CoinApplicationForm extends BaseForm ...@@ -36,8 +37,8 @@ class CoinApplicationForm extends BaseForm
public function scenarios() public function scenarios()
{ {
return [ return [
self::SCENARIO_ADD => ['category_id','name','sort','icon','type','native_url','h5_url','android_url','ios_url','app_store_url','advertise','description','redirect_type'], self::SCENARIO_ADD => ['category_id','name','sort','icon','type','native_url','native_login_url','h5_url','android_url','ios_url','app_store_url','advertise','description','redirect_type'],
self::SCENARIO_EDIT => ['category_id','id','name','sort','icon','type','native_url','h5_url','android_url','ios_url','app_store_url','advertise','description','redirect_type'], self::SCENARIO_EDIT => ['category_id','id','name','sort','icon','type','native_url','native_login_url','h5_url','android_url','ios_url','app_store_url','advertise','description','redirect_type'],
]; ];
} }
...@@ -45,20 +46,21 @@ class CoinApplicationForm extends BaseForm ...@@ -45,20 +46,21 @@ class CoinApplicationForm extends BaseForm
public function attributeLabels() public function attributeLabels()
{ {
return [ return [
'id' => 'ID', 'id' => 'ID',
'category_id' => '分类ID', 'category_id' => '分类ID',
'name' => '名称', 'name' => '名称',
'icon' => '图标', 'icon' => '图标',
'sort' => '排序', 'sort' => '排序',
'type' => '类型', 'type' => '类型',
'native_url' => '原生链接', 'native_url' => '原生链接',
'h5_url' => 'h5链接', 'native_login_url' => '原生登录链接',
'android_url' => '安卓链接', 'h5_url' => 'h5链接',
'ios_url' => 'ios企业版链接', 'android_url' => '安卓链接',
'app_store_url' => 'ios商店版链接', 'ios_url' => 'ios企业版链接',
'advertise' => '宣传语', 'app_store_url' => 'ios商店版链接',
'description' => '介绍', 'advertise' => '宣传语',
'redirect_type' => '跳转方式', 'description' => '介绍',
'redirect_type' => '跳转方式',
]; ];
} }
......
...@@ -53,6 +53,12 @@ ...@@ -53,6 +53,12 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">原生登录链接</label>
<div class="layui-input-block">
<input class="layui-input" name="native_login_url" value="">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">h5链接</label> <label class="layui-form-label">h5链接</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input class="layui-input" name="h5_url" value=""> <input class="layui-input" name="h5_url" value="">
......
...@@ -55,6 +55,12 @@ ...@@ -55,6 +55,12 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">原生登录链接</label>
<div class="layui-input-block">
<input class="layui-input" name="native_login_url" value="<?= $item['native_login_url'] ?>">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">h5链接</label> <label class="layui-form-label">h5链接</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input class="layui-input" name="h5_url" value="<?= $item['h5_url'] ?>"> <input class="layui-input" name="h5_url" value="<?= $item['h5_url'] ?>">
......
...@@ -76,7 +76,7 @@ class ApplicationBusiness ...@@ -76,7 +76,7 @@ class ApplicationBusiness
{ {
$app_cate_Model = CoinAppCate::find(); $app_cate_Model = CoinAppCate::find();
$data = $app_cate_Model->JoinWith(['application'], false) $data = $app_cate_Model->JoinWith(['application'], false)
->select('cate_id,app_id,name,icon,type,native_url,h5_url,android_url,ios_url,app_store_url,redirect_type,'.CoinAppCate::tableName().'.sort') ->select('cate_id,app_id,name,icon,type,native_url,native_login_url,h5_url,android_url,ios_url,app_store_url,redirect_type,'.CoinAppCate::tableName().'.sort')
->orderBy(CoinAppCate::tableName().'.sort asc')->asArray()->all(); ->orderBy(CoinAppCate::tableName().'.sort asc')->asArray()->all();
$icon_Items = array_column($data,'icon'); $icon_Items = array_column($data,'icon');
$icon_Items = array_unique($icon_Items); $icon_Items = array_unique($icon_Items);
......
...@@ -52,9 +52,6 @@ class LotteryService ...@@ -52,9 +52,6 @@ class LotteryService
{ {
$ch = new Curl(); $ch = new Curl();
$jsonrpc = self::jsonRpcBuild($params, $method); $jsonrpc = self::jsonRpcBuild($params, $method);
if($method == 'Chain33.SignRawTx'){
//var_dump($jsonrpc);die;
}
$ch->setHeader('Content-Type', 'application/json'); $ch->setHeader('Content-Type', 'application/json');
$ch->setRawPostData($jsonrpc); $ch->setRawPostData($jsonrpc);
$result = $ch->post(self::urlLotteryBuild(), false); $result = $ch->post(self::urlLotteryBuild(), false);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment