Pārlūkot izejas kodu

奖品添加修改

bianjunhui 2 gadi atpakaļ
vecāks
revīzija
a889054fda

+ 3 - 0
application/admin/controller/Category.php

@@ -48,6 +48,9 @@ class Category extends Backend
     {
         //设置过滤方法
         $this->request->filter(['strip_tags']);
+        if ($this->request->request('keyField')) {
+            return $this->selectpage();
+        }
         if ($this->request->isAjax()) {
             $search = $this->request->request("search");
             $type = $this->request->request("type");

+ 1 - 1
application/admin/controller/Prize.php

@@ -52,7 +52,7 @@ class Prize extends Backend
         if(!empty($param1['custom'])){
                 $where1['type'] = $param1['custom']['type'];
         }else{
-                $where1 = "id > 0";
+                $where1 = " 1=1 ";
         }
         $list = $this->model
             ->with('category')

+ 8 - 1
application/admin/controller/Raprize.php

@@ -91,7 +91,14 @@ class Raprize extends Backend
         $ra_id=session('ra_id');
 
         $params['r_id']=$ra_id;
-
+        $raffle = \app\admin\model\Raffle::getById($ra_id);
+        $params['r_name']=$raffle->name;
+        $category=\app\common\model\Category::getById($params['t_type']);
+        $params['t_type_name']=$category->name;
+        $prize=\app\admin\model\Prize::getById($params['p_id']);
+        $params['p_name']=$prize->name;
+        $params['price']=$prize->price;
+        $params['money']=$prize->money;
         if ($this->dataLimit && $this->dataLimitFieldAutoFill) {
             $params[$this->dataLimitField] = $this->auth->id;
         }

+ 5 - 47
application/admin/view/raprize/edit.html

@@ -1,33 +1,14 @@
 <form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
-
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('R_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-r_id" data-rule="required" data-source="r/index" class="form-control selectpage" name="row[r_id]" type="text" value="{$row.r_id|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('R_name')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-r_name" class="form-control" name="row[r_name]" type="text" value="{$row.r_name|htmlentities}">
-        </div>
-    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('T_type')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-t_type" class="form-control" name="row[t_type]" type="number" value="{$row.t_type|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('P_id')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-p_id" data-rule="required" data-source="p/index" class="form-control selectpage" name="row[p_id]" type="text" value="{$row.p_id|htmlentities}">
+            <input id="c-t_type" data-rule="required" data-source="category/index"  class="form-control selectpage" name="row[t_type]" type="text" value="{$row.t_type}">
         </div>
     </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('P_name')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-p_name" class="form-control" name="row[p_name]" type="text" value="{$row.p_name|htmlentities}">
+            <input id="c-p_id" data-rule="required" data-source="prize/index" class="form-control selectpage" name="row[p_id]" type="text" value="{$row.p_id}">
         </div>
     </div>
     <div class="form-group">
@@ -44,40 +25,17 @@
             <ul class="row list-inline faupload-preview" id="p-image"></ul>
         </div>
     </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-price" class="form-control" name="row[price]" type="text" value="{$row.price|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Money')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-money" class="form-control" name="row[money]" type="text" value="{$row.money|htmlentities}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Description')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-description" class="form-control" name="row[description]" type="text" value="{$row.description|htmlentities}">
-        </div>
-    </div>
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Probability')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-probability" class="form-control" name="row[probability]" type="text" value="{$row.probability|htmlentities}">
+            概率1%,填写10
         </div>
     </div>
     <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
+        <label class="control-label col-xs-12 col-sm-2">{:__('状态')}:</label>
         <div class="col-xs-12 col-sm-8">
-            
-            <div class="radio">
-            {foreach name="statusList" item="vo"}
-            <label for="row[status]-{$key}"><input id="row[status]-{$key}" name="row[status]" type="radio" value="{$key}" {in name="key" value="$row.status"}checked{/in} /> {$vo}</label> 
-            {/foreach}
-            </div>
-
+            {:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
         </div>
     </div>
     <div class="form-group layer-footer">

+ 7 - 1
public/assets/js/backend/raprize.js

@@ -28,7 +28,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                     [
                         {checkbox: true},
                         {field: 'id', title: __('Id')},
-                        {field: 't_type', title: __('T_type')},
+                        {field: 't_type_name', title: __('T_type')},
                         {field: 'p_name', title: __('P_name'), operate: 'LIKE'},
                         {field: 'price', title: __('金额(积分)'), operate: 'LIKE'},
                         {field: 'money', title: __('Money'), operate: 'LIKE'},
@@ -52,6 +52,12 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
             Controller.api.bindevent();
         },
         edit: function () {
+            $("#c-p_id").data("params", function(){
+                return {
+                    custom: {
+                        type: $("#c-t_type").val()}
+                };
+            });
             Controller.api.bindevent();
         },
         api: {