Browse Source

贵族字段隐藏/充值平台调整

zhangxiaobin 1 year ago
parent
commit
66e10f00f3

+ 2 - 2
application/admin/view/noble/level/add.html

@@ -108,7 +108,7 @@
         </div>
     </div>
 
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Lxrys')}:</label>
         <div class="col-xs-12 col-sm-8">
 
@@ -158,7 +158,7 @@
             </select>
 
         </div>
-    </div>
+    </div>-->
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Zlys')}:</label>

+ 2 - 2
application/admin/view/noble/level/edit.html

@@ -113,7 +113,7 @@
             <ul class="row list-inline faupload-preview" id="p-tqgq"></ul>
         </div>
     </div>
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Lxrys')}:</label>
         <div class="col-xs-12 col-sm-8">
 
@@ -163,7 +163,7 @@
             </select>
 
         </div>
-    </div>
+    </div>-->
 
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Zlys')}:</label>

+ 2 - 1
application/api/controller/Money.php

@@ -92,7 +92,7 @@ class Money extends Common
                 $this->error('请先实名认证');
             }
         }
-        if ($params_from == "ios") {
+        if ($params_from == 2) {
             $jewel = $recharInfo['jewel'];
         } else {
             $jewel = $recharInfo['jewel_full'];
@@ -129,6 +129,7 @@ class Money extends Common
         $data["jewel"] = $jewel;
         $data["pay_type"] = $payType;//支付渠道:1=微信,2=支付宝,3=衫德
         $data["business_no"] = $businessNo;//商户号
+        $data["platform"] = $params_from;//1=安卓,2=ios
         $data["createtime"] = $time;
         //$orderid = $recharOrderMode->execute("INSERT INTO `hx_rechar_order` (`user_id` , `order_no` , `money` , `jewel` , `createtime`) VALUES ($user_id , $out_trade_no , $money , " . $jewel . " , $time)");
         $orderid = $recharOrderMode->insertGetId($data);

+ 1 - 1
application/api/controller/Noble.php

@@ -175,7 +175,7 @@ class Noble extends Api
 
             if($res1 && $res2 && $res3 && $res4) {
                 Db::commit();
-                $this->onNobleEffect($noblelevelInfo,$this->auth->id,$this->auth->nickname);
+                //$this->onNobleEffect($noblelevelInfo,$this->auth->id,$this->auth->nickname);
                 $this->onNobleAttire($noblelevelInfo,$this->auth->id,$nextMonth,$time);
 
                 // +exp

+ 3 - 3
public/assets/js/backend/noble/level.js

@@ -37,10 +37,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'info_image', title: __('个人资料框'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
                         // {field: 'jctx', title: __('Jctx'), operate: 'LIKE'},
                         {field: 'tqgq', title: __('Tqgq'), operate: false, events: Table.api.events.image, formatter: Table.api.formatter.image},
-                        {field: 'lxrys', title: __('Lxrys'), operate: 'LIKE'},
+                        //{field: 'lxrys', title: __('Lxrys'), operate: 'LIKE'},
                         // {field: 'qfdh', title: __('Qfdh'), operate: 'LIKE'},
-                        {field: 'qftz', title: __('Qftz'), searchList: {"0":__('Qftz 0'),"1":__('Qftz 1')}, formatter: Table.api.formatter.normal},
-                        {field: 'gptz', title: __('Gptz'), searchList: {"0":__('Gptz 0'),"1":__('Gptz 1')}, formatter: Table.api.formatter.normal},
+                        /*{field: 'qftz', title: __('Qftz'), searchList: {"0":__('Qftz 0'),"1":__('Qftz 1')}, formatter: Table.api.formatter.normal},
+                        {field: 'gptz', title: __('Gptz'), searchList: {"0":__('Gptz 0'),"1":__('Gptz 1')}, formatter: Table.api.formatter.normal},*/
                         // {field: 'zszj', title: __('Zszj'), operate: 'LIKE'},
                         {field: 'zlys', title: __('Zlys'), operate: 'LIKE'},
                         // {field: 'diylw', title: __('Diylw'), searchList: {"0":__('Diylw 0'),"1":__('Diylw 1')}, formatter: Table.api.formatter.normal},