后台大调整

application/admin/controller/Userwallet.php

@@ -70,7 +70,7 @@ class Userwallet extends Backend
     }
 
     /**
-     * 充值金币
+     * 充值
      */
     public function updatemoney(){
         $id = input('id');

application/admin/controller/unishop/Order.php

@@ -64,7 +64,7 @@ class Order extends Backend
                 ->where($where)
                 ->order($sort, $order)
                 ->limit($offset, $limit)
-                ->field('order.*,user.username')
+                ->field('order.*,user.username,user.nickname')
                 ->select();
 
             $list = collection($list)->toArray();
@@ -72,6 +72,7 @@ class Order extends Backend
                 $item['id'] = (string)$item['id']; // 整形数字太大js会失准
                 $item['user'] = [];
                 $item['user']['username'] = $item['username'] ? $item['username'] : __('Tourist');
+                $item['user']['nickname'] = $item['nickname'] ? $item['nickname'] : __('Tourist');
 
                 $item['have_paid_status'] = $item['have_paid'];
                 $item['have_delivered_status'] = $item['have_delivered'];

application/admin/lang/zh-cn/user/user.php

@@ -25,10 +25,10 @@ return [
     'Wxmini_openid' => '微信openid',
     'Introcode'     => '邀请码',
     'Intro_uid'     => '直推上级UID',
-    'Is_vipprice'   => '是否会员价',
+    'Is_vipprice'   => '会员价',
     'Is_vipprice 1' => '是',
     'Is_vipprice 0' => '否',
-    'Is_hexiao'     => '是否核销',
+    'Is_hexiao'     => '核销权限',
     'Is_hexiao 1'   => '是',
     'Is_hexiao 0'   => '否'
 ];

application/admin/view/basedata/index.html

@@ -7,8 +7,8 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('basedata/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
-                        <!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('basedata/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
+                        <!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('basedata/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                        <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('basedata/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('basedata/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
                         -->
 

application/admin/view/unishop/evaluate/index.html

@@ -7,10 +7,10 @@
                 <div class="widget-body no-padding">
                     <div id="toolbar" class="toolbar">
                         <a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
-                        <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('unishop/evaluate/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
+                       <!-- <a href="javascript:;" class="btn btn-success btn-add {:$auth->check('unishop/evaluate/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
                         <a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('unishop/evaluate/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
                         <a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('unishop/evaluate/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
-
+-->
                         <div class="dropdown btn-group {:$auth->check('unishop/evaluate/multi')?'':'hide'}">
                             <a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
                             <ul class="dropdown-menu text-left" role="menu">

application/admin/view/unishop/order/edit.html

@@ -5,7 +5,7 @@
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('User_id')}:</label>
         <div class="col-xs-12 col-sm-8">
-            <input id="c-user_id" disabled data-rule="required" data-source="user/user/index" data-field="username" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id}">
+            <input id="c-user_id" disabled data-rule="required" data-source="user/user/index" data-field="nickname" class="form-control selectpage" name="row[user_id]" type="text" value="{$row.user_id}">
         </div>
     </div>
     <div class="form-group">
@@ -26,12 +26,12 @@
             <input id="c-discount_price" class="form-control" step="0.01" name="row[discount_price]" type="number" value="{$row.discount_price}">
         </div>
     </div>-->
-    <div class="form-group">
+    <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Delivery_price')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-delivery_price" class="form-control" step="0.01" name="row[delivery_price]" type="number" value="{$row.delivery_price}">
         </div>
-    </div>
+    </div>-->
     <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Total_price')}:</label>
         <div class="col-xs-12 col-sm-8">
@@ -88,7 +88,7 @@
         </div>
     </div>-->
 
-    <div class="form-group">
+   <!-- <div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Pay time')}:</label>
         <div class="col-xs-12 col-sm-8">
             <input id="c-have_paid" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[have_paid]" type="text" value="{:$row.have_paid?datetime($row.have_paid):''}">
@@ -106,7 +106,7 @@
         <div class="col-xs-12 col-sm-8">
             <input id="c-have_received" class="form-control datetimepicker" data-date-format="YYYY-MM-DD HH:mm:ss" data-use-current="true" name="row[have_received]" type="text" value="{:$row.have_received?datetime($row.have_received):''}">
         </div>
-    </div>
+    </div>-->
     <!--<div class="form-group">
         <label class="control-label col-xs-12 col-sm-2">{:__('Commented time')}:</label>
         <div class="col-xs-12 col-sm-8">

application/admin/view/unishop/order/product.html

@@ -1,28 +1,11 @@
 <form id="add-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">{:__('Consignee name')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-username" disabled class="form-control" type="text" value="{$order.address.name}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Consignee mobile')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-mobile" disabled class="form-control" type="text" value="{$order.address.mobile}">
-        </div>
-    </div>
-    <div class="form-group">
-        <label class="control-label col-xs-12 col-sm-2">{:__('Consignee address')}:</label>
-        <div class="col-xs-12 col-sm-8">
-            <input id="c-address" disabled class="form-control" type="text" value="{$order.addressText}">
-        </div>
-    </div>
+
     <ul class="list-group">
         <li class="list-group-item">
             订单金额：￥{$order.order_price}
         </li>
         <li class="list-group-item">
-            实付金额：￥{$order.total_price}元 (包含:<!--优惠￥{$order.discount_price}，-->物流费用￥{$order.delivery_price})
+            实付金额：￥{$order.total_price}元
         </li>
     </ul>
 

application/config.php

@@ -314,7 +314,7 @@ return [
 
     //redis
     'redis'                  => [
-        'host'      => '127.0.0.1',
+        'host'      => '122.51.218.69',
         'port'      => 6379,
         'redis_pwd' => 'huxiu001',
         'redis_selectdb' => 11,
@@ -368,9 +368,8 @@ return [
     //分配给admin管理员的网站配置
     'newconfiggroup' =>    [
         'siteconfig' => '全站配置',
-        'takecash' => '提现配置',
         'hexiao' => '核销配置',
-        'fenxiao' => '分销配置',
+        'intro' => '分销配置',
     ],
 
     //腾讯cos
@@ -393,10 +392,10 @@ return [
 
     ],*/
 
-    //开放平台的  水饺正式
+    //开放平台的
     'wechat_app_login' => [
-        'appid'  => 'wx1b91bcadaa2adb53',
-        'secret' => '96cae827c8a3941cdd61ad4cc1376e17',
+        'appid'  => '',
+        'secret' => '',
     ],
 
     //微信小程序 水饺正式

application/extra/site.php

@@ -60,7 +60,7 @@ return array (
     7 => '31',
   ),
   'hexiao_order_money_bili' => '10',
-  'user_default_avatar' => '/uploads/20240522/47eb7f0430d48a73346b1630692e20ae.png',
+  'user_default_avatar' => '/assets/img/avatar.png',
   'intro_takecash_min_money' => '1',
   'intro_takecash_max_money' => '10000',
   'intro_takecash_plat_bili' => '6',

public/assets/js/backend/payorder.js

@@ -37,14 +37,14 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {field: 'order_amount', title: __('Order_amount'), operate:'BETWEEN'},
                         {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
                         {field: 'notifytime', title: __('Notifytime'), operate:'RANGE', addclass:'datetimerange', autocomplete:false, formatter: Table.api.formatter.datetime},
-//                        {field: 'pay_type', title: __('Pay_type'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
+                        {field: 'pay_type', title: __('Pay_type'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
 //                        {field: 'platform', title: __('Platform'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
                         {field: 'order_status', title: __('Order_status'), searchList: {"0":__('Order_status 0'),"1":__('Order_status 1')}, formatter: Table.api.formatter.status},
 //                        {field: 'table_name', title: __('Table_name'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
 //                        {field: 'table_id', title: __('Table_id')},
 //                        {field: 'args', title: __('Args'), operate: 'LIKE', table: table, class: 'autocontent', formatter: Table.api.formatter.content},
 
-                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
+//                        {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
                     ]
                 ]
             });

public/assets/js/backend/unishop/order.js

@@ -102,7 +102,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                         {checkbox: true},
 //                        {field: 'id', title: __('Id'),visible:false},
                         {field: 'user_id', title: __('User_id')},
-                        {field: 'user.username', title: __('User name')},
+                        {field: 'user.nickname', title: '昵称'},
                         {field: 'out_trade_no', title: __('Out_trade_no')},
                         {field: 'order_price', title: __('Order_price'), operate:'BETWEEN'},
 //                        {field: 'discount_price', title: __('Discount_price'), operate:'BETWEEN'},

public/assets/js/backend/userwallet.js

@@ -42,8 +42,8 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
                             buttons:[
                                 {
                                     name:'updatemoney',
-                                    text:'充值金币',
-                                    title:'充值金币',
+                                    text:'充值',
+                                    title:'充值',
                                     icon:'fa fa-exclamation-circle',
                                     classname:'btn btn-xs btn-info btn-dialog',
                                     url:'userwallet/updatemoney/id/{ids}?dialog=1',