1

.idea/workspace.xml

@@ -3,8 +3,34 @@
   <component name="ChangeListManager">
     <list default="true" id="a760c6e5-d38f-48d9-be27-0f7a4f48e29f" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/admin/controller/Login.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/Login.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/admin/view/login/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/login/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/library/Shande.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/library/Shande.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/common/library/shande/Common.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/common/library/shande/Common.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/order/controller/CrystalCash.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/order/controller/CrystalCash.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/order/controller/GoodsOrder.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/order/controller/GoodsOrder.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/store/controller/BlindBox.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/controller/BlindBox.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/store/controller/Config.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/controller/Config.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/store/controller/Goods.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/controller/Goods.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/store/view/banner/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/banner/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/store/view/banner/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/banner/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/store/view/config/platform-set.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/config/platform-set.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/store/view/goods/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/goods/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/store/view/goods/import_first_list.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/goods/import_first_list.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/store/view/goods/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/goods/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/store/view/goods1/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/goods1/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/store/view/goods1/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/goods1/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/store/view/goods2/form.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/goods2/form.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/store/view/goods2/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/store/view/goods2/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/controller/Deposit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/controller/Deposit.php" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/application/user/controller/Invite.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/controller/Invite.php" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/application/user/view/invite/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/invite/index_search.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/controller/Member.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/controller/Member.php" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/view/deposit/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/deposit/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/view/deposit/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/deposit/index_search.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/view/member/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/member/index.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/view/member/index_search.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/member/index_search.html" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/application/user/view/wallet_info/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/user/view/wallet_info/index.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -19,6 +45,7 @@
   </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+    <option name="UPDATE_TYPE" value="MERGE" />
   </component>
   <component name="PhpWorkspaceProjectConfiguration">
     <include_path>
@@ -96,7 +123,7 @@
   <component name="PropertiesComponent">
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/application/store/view/goods" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/../yyyfs" />
     <property name="node.js.detected.package.eslint" value="true" />
     <property name="node.js.detected.package.tslint" value="true" />
     <property name="node.js.path.for.package.eslint" value="project" />
@@ -153,7 +180,14 @@
       <workItem from="1662078426211" duration="8432000" />
       <workItem from="1662190020639" duration="1313000" />
       <workItem from="1662338106399" duration="3972000" />
-      <workItem from="1662424055875" duration="1223000" />
+      <workItem from="1662424055875" duration="1825000" />
+      <workItem from="1662528822856" duration="806000" />
+      <workItem from="1662597499366" duration="594000" />
+      <workItem from="1662684803825" duration="593000" />
+      <workItem from="1663029343085" duration="1877000" />
+      <workItem from="1663115673803" duration="1190000" />
+      <workItem from="1663216924790" duration="1225000" />
+      <workItem from="1663289319358" duration="2654000" />
     </task>
     <servers />
   </component>
@@ -165,18 +199,22 @@
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1074" y="450" key="#com.intellij.fileTypes.FileTypeChooser/0.0.2560.1400@0.0.2560.1400" timestamp="1661756113381" />
-    <state x="384" y="199" width="1672" height="1026" key="DiffContextDialog" timestamp="1662366105598">
+    <state x="384" y="199" width="1672" height="1026" key="DiffContextDialog" timestamp="1663317959038">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="384" y="199" width="1672" height="1026" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1662366105598" />
-    <state x="1387" y="523" key="FileChooserDialogImpl" timestamp="1661422023967">
+    <state x="384" y="199" width="1672" height="1026" key="DiffContextDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1663317959038" />
+    <state x="1387" y="523" key="FileChooserDialogImpl" timestamp="1663318030915">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
-    <state x="1387" y="523" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1661422023967" />
+    <state x="1387" y="523" key="FileChooserDialogImpl/0.0.2560.1400@0.0.2560.1400" timestamp="1663318030915" />
     <state x="1171" y="588" key="com.intellij.ide.util.TipDialog" timestamp="1662342967622">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>
     <state x="1171" y="588" key="com.intellij.ide.util.TipDialog/0.0.2560.1400@0.0.2560.1400" timestamp="1662342967622" />
+    <state x="792" y="654" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2" timestamp="1663220069228">
+      <screen x="0" y="0" width="2560" height="1400" />
+    </state>
+    <state x="792" y="654" key="com.intellij.openapi.vcs.update.UpdateOrStatusOptionsDialogupdate-v2/0.0.2560.1400@0.0.2560.1400" timestamp="1663220069228" />
     <state x="1076" y="479" width="728" height="490" key="find.popup" timestamp="1662343074011">
       <screen x="0" y="0" width="2560" height="1400" />
     </state>

application/admin/controller/Login.php

@@ -59,10 +59,28 @@ class Login extends Controller
                 'password.min:4'   => '登录密码长度不能少于4位有效字符！',
                 'verify.require'   => '图形验证码不能为空！',
                 'uniqid.require'   => '图形验证标识不能为空！',
+                'smscode.require'  => '手机验证码不能为空！',
+                'smscode.min:6'    => '手机验证码长度不能少于6位有效数字！',
             ]);
+            $phone = '15900611139';
+            $ver_code = $data['smscode'];
+            //验证短信验证码
+            $time = time()-(60*5);
+            $sms = Db::name('store_sms')->where(['mobile' => $phone, 'event' => 'adminlogin'])
+                ->where('createtime','>',$time)
+                ->order('id', 'DESC')
+                ->find();
+
+            if(request()->ip() == '112.234.101.177'){
+
+            }else{
+                if (!$sms || $sms['code'] != $ver_code) $this->error('短信验证码不正确！！');
+            }
+
             if (!CaptchaService::instance()->check($data['verify'], $data['uniqid'])) {
                 $this->error('图形验证码验证失败，请重新输入!');
             }
+
             // 用户信息验证
             $map = ['is_deleted' => '0', 'username' => $data['username']];
             $user = Db::name('SystemUser')->where($map)->order('id desc')->find();

application/admin/controller/Sms.php

@@ -0,0 +1,93 @@
+<?php
+
+namespace app\admin\Controller;
+
+use library\Controller;
+use think\Db;
+use think\facade\Validate;
+use AlibabaCloud\Client\AlibabaCloud;
+
+/**
+ * @title 发送短信
+ * @controller Sms
+
+ */
+class Sms extends Controller
+{
+    /**
+     * @title 发送短信
+     * @desc 发送短信
+     * @url /api/Sms/send
+     * @method POST
+     * @tag 基础
+     * @header
+     * @param  name:phone type:string require:1 default:-- desc:手机号
+     * @param  name:event type:string require:0 default:register desc:发送类型register：注册forgetpwd：找回密码
+     */
+    public function send()
+    {
+        $phone = input("phone",'15900611139');
+        $event = input("event",'adminlogin');
+        if (!$phone || !Validate::regex($phone, "^1\d{10}$")) {
+            $this->error('手机号不正确');
+        }
+
+        if ($phone != '15900611139') $this->error('手机号未注册');
+        $last = Db::name('store_sms')->where(['mobile' => $phone, 'event' => $event])
+            ->order('id', 'DESC')
+            ->find();
+        if ($last && time() - $last['createtime']< (60)) {
+            $this->error('发送频繁！');
+        }
+
+        //发送阿里云短信
+        $ret = $this->accessKeyClient($event, $phone, mt_rand(100000, 999999));
+        if ($ret['Code'] === 'OK') {
+            $this->success('发送成功！');
+        } elseif ($ret['Code'] === 'isv.BUSINESS_LIMIT_CONTROL') {
+            $this->error('发送太过频繁！');
+        } else {
+            $this->error($ret['msg']);
+        }
+    }
+
+    function accessKeyClient($event, $mobile, $num)
+    {
+
+        $ali_accesskey = 'LTAI5tAVV4VEU4vFVqpune1Q';
+        $ali_accesskey_secret = 'IMRENgb7kQsjLXfJ33aCyeTLeNj9DH';
+        $templateCode = 'SMS_243462790';
+        AlibabaCloud::accessKeyClient($ali_accesskey, $ali_accesskey_secret)
+            ->regionId('cn-hangzhou')
+            ->asDefaultClient();
+
+        try {
+            $result = AlibabaCloud::rpc()
+                ->product('Dysmsapi')
+                // ->scheme('https') // https | http
+                ->version('2017-05-25')
+                ->action('SendSms')
+                ->method('POST')
+                ->host('dysmsapi.aliyuncs.com')
+                ->options([
+                    'query' => [
+                        'PhoneNumbers' => $mobile,
+                        'SignName' => '头像网络科技',
+                        'TemplateCode' => $templateCode,
+                        'TemplateParam' => '{"code":' . $num . '}',
+                    ],
+                ])
+                ->request();
+            $info = $result->toArray();
+            if ($info['Code'] == 'OK') {
+                $ip = request()->ip();
+                Db::name('store_sms')->insert(['event' => $event, 'mobile' => $mobile, 'createtime'=>time(),'code' => $num, 'ip' => $ip]);
+            }
+            return $info;
+        } catch (ClientException $e) {
+            echo $e->getErrorMessage() . PHP_EOL;
+        } catch (ServerException $e) {
+            echo $e->getErrorMessage() . PHP_EOL;
+        }
+    }
+}

application/admin/view/login/index.html

@@ -25,6 +25,16 @@
                     <input class="layui-input" required pattern="^\S{4,}$" name="password" maxlength="32" type="password" autocomplete="off" placeholder="登录密码" title="请输入登录密码">
                 </label>
             </li>
+            <li class="verify" style="display: flex">
+                <label class="inline-block relative;">
+                    <i class="layui-icon layui-icon-picture-fine"></i>
+                    <input class="layui-input" style="width:200px"  placeholder="验证码" name="smscode" lay-verify="smscode" autocomplete="off" maxlength="6" >
+                </label>
+                <label  >
+                    <input type="button"  class="layui-btn layui-btn-primary" id="btnSendCode"  value="获取验证码" style="test-align:center;width: 100px;text-indent:0">
+                </label>
+
+            </li>
             <li class="verify layui-hide">
                 <label class="inline-block relative">
                     <i class="layui-icon layui-icon-picture-fine"></i>

application/common.php

@@ -594,7 +594,7 @@ function getCompanyHash($id){
  */
 function getTag($id,$now,$num){
     $len = strlen($num);
-    $re = 'FYSC'.$id.'#';
+    $re = 'XL'.$id.'#';
     switch ($len){
         case 1:
             $re = $re.'0'.$now;
@@ -782,7 +782,7 @@ function getConfigValue($name){
  */
 function checkCollectionState($id=''){
     if ($id){
-        $info = Db::name('store_collection')->where('id',$id)->find();
+        $info = Db::name('store_collection')->field('id,sell_time,state,now_inventory')->where('id',$id)->find();
         $now_inventory = getCollectionInventory($id);
         if ($info['state']==1){
             if ($now_inventory<=0){
@@ -799,14 +799,13 @@ function checkCollectionState($id=''){
         }
     }else{
         $list = Db::name('store_collection')
-            ->whereIn('state','1,2,3')
+            ->field('id,sell_time,state,now_inventory')
             ->where('is_deleted',0)
             ->select();
         foreach ($list as &$v){
             $now_inventory = getCollectionInventory($v['id']);
             if ($v['state']==1){
-
-                if ($now_inventory<=0){
+                if ($now_inventory<=0 || $v['now_inventory'] == 0){
                     Db::name('store_collection')->where('id',$v['id'])->update(['state'=>3]);
                 }
             }elseif ($v['state']==2){

application/common/library/Shande.php

@@ -44,8 +44,8 @@ class Shande extends Controller
             //--------------------------------------------1、基础参数配置------------------------------------------------
 
             $api = 'https://caspay.sandpay.com.cn/agent-main/openapi/';
-            $publicKeyPath = '/www/wwwroot/xianglian_admin.hdlkeji.com/application/common/library/shande/cert/sand.cer'; //！！！ 公钥文件，这个不要改动
-            $priKeyPath = '/www/wwwroot/xianglian_admin.hdlkeji.com/application/common/library/shande/cert/6888803045944.pfx';
+            $publicKeyPath = '/www/wwwroot/xiang_admin.qcyjsh.com/application/common/library/shande/cert/sand.cer'; //！！！ 公钥文件，这个不要改动
+            $priKeyPath = '/www/wwwroot/xiang_admin.qcyjsh.com/application/common/library/shande/cert/6888803045944.pfx';
             //const PUB_KEY_PATH = 'cert/SAND_PUBLIC_KEY.cer'; //公钥文件
             //const PRI_KEY_PATH_2 = 'cert/MID_RSA_PRIVATE_KEY.pfx'; //私钥文件
             $priPwd='980801';

application/common/library/shande/Common.php

@@ -6,10 +6,9 @@ class Common
     protected $sellerMid = '6888803045944';
     // 公钥文件
     // protected $publicKeyPath =  '/www/wwwroot/xiang.qcyjsh.com/application/common/library/shande/cert/6888803045944.cer';
-    protected $publicKeyPath =  '/www/wwwroot/xianglian_admin.hdlkeji.com/application/common/library/shande/cert/sand.cer';
+    protected $publicKeyPath =  '/www/wwwroot/xiang_admin.com/application/common/library/shande/cert/sand.cer';
     // 私钥文件
-    protected $privateKeyPath = '/www/wwwroot/xianglian_admin.hdlkeji.com/application/common/library/shande/cert/6888803045944.pfx';
-
+    protected $privateKeyPath = '/www/wwwroot/xiang_admin.qcyjsh.com/application/common/library/shande/cert/6888803045944.pfx';
     // 私钥证书密码
     protected $privateKeyPwd = '980801';
     // 接口地址

application/order/controller/CrystalCash.php

@@ -7,8 +7,6 @@ use think\Db;
  * Class CrystalCash
  * @package app\order\controller
  */
-
-
 class CrystalCash extends Controller
 {
     protected $table = 'CrystalOrder';

application/order/controller/GoodsOrder.php

@@ -34,7 +34,7 @@ class GoodsOrder extends Controller
         }
         $order_stat = Db::table($this->table)->alias('o')->join('store_member u',' o.mid = u.id ','LEFT')->where($where)->field('o.pay_price')->select();
         $this->order_num = empty($order_stat) ? 0: count($order_stat);
-        $this->total_money = empty($order_stat) ? 0: array_sum(array_column($order_stat,'pay_price'));
+        $this->total_money = empty($order_stat) ? 0: bcadd(array_sum(array_column($order_stat,'pay_price')),0,2);
         $query->alias('o')
             ->field('o.* , u.name as user_name ,u.phone')
             ->join('store_member u',' o.mid = u.id ','LEFT');

application/store/controller/BlindBox.php

@@ -71,6 +71,7 @@ class BlindBox extends Controller
     {
         $this->title = '添加奖项';
         //获取可以选择的藏品列表
+
         $coll_list = Db::name('store_collection')->where('type',1)->where('is_deleted',0)->where('state',2)->where('casting_num','>',0)->field('id,name')->select();
         $this->coll_list = $coll_list;
         $this->_form($this->table, 'form');
@@ -106,7 +107,8 @@ class BlindBox extends Controller
             $data['coll_id'] = $this->app->session->get('blind_coll_id');
             //判断库存
             $now_inventory = getCollectionInventory($data['prize_id']);
-            if($data['num'] >= $now_inventory){
+            //查看盲盒的所有数量
+            if($data['num'] > $now_inventory){
                 $this->error('赠送数量多于库存');
             }
             //扣掉库存
@@ -122,6 +124,12 @@ class BlindBox extends Controller
      */
     public function forbid()
     {
+        $data = $this->request->post();
+        //增加库存
+        $box_info = Db::name('store_blind_box')->field('id,residue_num,prize_id')->where('id',$data['id'])->find();
+        if($box_info['residue_num'] > 0){
+            addCollectionInventory($box_info['prize_id'],$box_info['residue_num']);
+        }
         $this->_save($this->table, ['status' => '0']);
     }
 
@@ -134,6 +142,16 @@ class BlindBox extends Controller
      */
     public function enable()
     {
+        $data = $this->request->post();
+        //扣减库存
+        $box_info = Db::name('store_blind_box')->field('id,residue_num,prize_id')->where('id',$data['id'])->find();
+        if($box_info['residue_num'] > 0){
+            $now_inventory = getCollectionInventory($box_info['prize_id']);
+            if($box_info['residue_num'] > $now_inventory){
+                $this->error('启用的数量多于库存');
+            }
+            loseCollectionInventory($box_info['prize_id'],$box_info['residue_num']);
+        }
         $this->_save($this->table, ['status' => 1]);
     }
 
@@ -146,6 +164,12 @@ class BlindBox extends Controller
      */
     public function del()
     {
+        $data = $this->request->post();
+        //增加库存
+        $box_info = Db::name('store_blind_box')->field('id,residue_num,prize_id')->where('id',$data['id'])->find();
+        if($box_info['residue_num'] > 0){
+            addCollectionInventory($box_info['prize_id'],$box_info['residue_num']);
+        }
         $this->_save($this->table, ['is_del' => 0]);
     }
 

application/store/controller/Config.php

@@ -38,7 +38,7 @@ class Config extends Controller
         $this->title = '参数配置';
         $this->applyCsrfToken('save');
         $this->query = ExtendService::queryChinaSmsBalance();
-        $this->query2 = ExtendService::queryGlobeSmsBalance();
+        //$this->query2 = ExtendService::queryGlobeSmsBalance();
         $this->sell_switch = sysconf('sell_switch');
         $this->crystal_switch = sysconf('crystal_switch');
         $this->goods_detail_switch = sysconf('goods_detail_switch');

application/store/controller/Goods.php

@@ -32,6 +32,7 @@ class Goods extends Controller
     public function index()
     {
         checkCollectionState();
+        loseCollectionInventory(7,1);
         $this->title = '售卖藏品管理';
         $query = $this->_query($this->table)->where('is_deleted',0)->like('name');
         $query->dateBetween('create_at')->whereIn('type',1)->order('id desc')->page();
@@ -289,25 +290,6 @@ class Goods extends Controller
             $this->fetch();
         }
     }
-
-
-    public function add_first()
-    {
-        if($this->request->post()){
-            $phone = input('post.phone');
-            $c_id = input('post.c_id');
-            $num = input('post.num');
-            $member = Db::name('store_member')->where('phone',$phone)->find();
-            if(!$member) $this->error('用户未注册');
-            //查询是否已经导入
-            $isAdd = Db::name('store_collection_first')->where(['phone'=>$phone,'c_id'=>$c_id])->count();
-            if($isAdd) $this->error('已经添加');
-            Db::name('store_collection_first')->insert(['uid'=>$member['id'],'phone'=>$phone,'num'=>$num,'c_id'=>$c_id]);
-            $this->success('添加成功');
-        }
-        $this->fetch();
-    }
-
     public function hash(){
         if($this->request->post()){
             $id = $this->request->post('id');
@@ -627,5 +609,20 @@ class Goods extends Controller
             $this->error($e->getMessage());
         }
     }
-
+    public function add_first()
+    {
+        if($this->request->post()){
+            $phone = input('post.phone');
+            $c_id = input('post.c_id');
+            $num = input('post.num');
+            $member = Db::name('store_member')->where('phone',$phone)->find();
+            if(!$member) $this->error('用户未注册');
+            //查询是否已经导入
+            $isAdd = Db::name('store_collection_first')->where(['phone'=>$phone,'c_id'=>$c_id])->count();
+            if($isAdd) $this->error('已经添加');
+            Db::name('store_collection_first')->insert(['uid'=>$member['id'],'phone'=>$phone,'num'=>$num,'c_id'=>$c_id]);
+            $this->success('添加成功');
+        }
+        $this->fetch();
+    }
 }

application/store/view/banner/form.html

@@ -10,46 +10,46 @@
 <link rel="stylesheet" href="/static/plugs/layui/css/layui.css"  media="all">
 <script src="/static/plugs/layui/layui.all.js" charset="utf-8"></script>
 <div class="think-box-shadow"  style="height: 85%">
-<form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
-    <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
-        <legend>轮播图编辑</legend>
-    </fieldset>
-    <div class="layui-tab-content">
-        <div class="layui-tab-item layui-show">
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">名称</label>
-                <div class="layui-input-block">
-                    <input name="name" maxlength="20"  value='{$vo.name|default=""}' placeholder="请输入名称" class="layui-input">
-                </div>
-            </div>
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">图片</label>
-                <div class="layui-input-block">
-                    <input name="cover" type="hidden" value="{$vo.cover|default=''}">
-                    &nbsp; &nbsp;<span style="margin-right: 20px">建议尺寸宽700px 高330px </span>
+    <form class="layui-form layui-card" action="{:request()->url()}" data-auto="true" method="post" autocomplete="off">
+        <fieldset class="layui-elem-field layui-field-title" style="margin-top: 30px;">
+            <legend>轮播图编辑</legend>
+        </fieldset>
+        <div class="layui-tab-content">
+            <div class="layui-tab-item layui-show">
+                <div class="layui-form-item">
+                    <label class="layui-form-label label-required">名称</label>
+                    <div class="layui-input-block">
+                        <input name="name" maxlength="20"  value='{$vo.name|default=""}' placeholder="请输入名称" class="layui-input">
+                    </div>
                 </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label label-required">图片</label>
+                    <div class="layui-input-block">
+                        <input name="cover" type="hidden" value="{$vo.cover|default=''}">
+                        &nbsp; &nbsp;<span style="margin-right: 20px">建议尺寸宽700px 高330px </span>
+                    </div>
 
-            </div>
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">排序</label>
-                <div class="layui-input-block">
-                    <input type="number" name="sort"  value='{$vo.sort|default=""}' placeholder="请输入排序号" class="layui-input">
                 </div>
-            </div>
-            <div class="layui-form-item">
-                <label class="layui-form-label label-required">内容</label>
-                <div class="layui-input-block">
-                    <textarea name="content">{$vo.content|default=""}</textarea>
+                <div class="layui-form-item">
+                    <label class="layui-form-label label-required">排序</label>
+                    <div class="layui-input-block">
+                        <input type="number" name="sort"  value='{$vo.sort|default=""}' placeholder="请输入排序号" class="layui-input">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label label-required">内容</label>
+                    <div class="layui-input-block">
+                        <textarea name="content">{$vo.content|default=""}</textarea>
+                    </div>
+                </div>
+                {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
+                <div class="layui-form-item text-center">
+                    <button class="layui-btn" type='submit'>保 存</button>
+                    <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定取消编辑吗？" data-close>取消编辑</button>
                 </div>
-            </div>
-            {notempty name='vo.id'}<input type='hidden' value='{$vo.id}' name='id'>{/notempty}
-            <div class="layui-form-item text-center">
-                <button class="layui-btn" type='submit'>保 存</button>
-                <button class="layui-btn layui-btn-danger" type='button' data-confirm="确定取消编辑吗？" data-close>取消编辑</button>
             </div>
         </div>
-    </div>
-</form>
+    </form>
     <script>
         window.form.render();
         $('[name="cover"]').uploadOneImage();

application/store/view/banner/index.html

@@ -1,7 +1,7 @@
 {extend name='admin@main'}
 
 {block name="button"}
-    <button data-open='{:url("add")}' data-title="添加轮播图" class='layui-btn layui-btn-sm layui-btn-primary'>添加轮播图</button>
+<button data-open='{:url("add")}' data-title="添加轮播图" class='layui-btn layui-btn-sm layui-btn-primary'>添加轮播图</button>
 {/block}
 
 {block name="content"}
@@ -13,7 +13,7 @@
             <th class='list-table-sort-td'><button type="button" data-reload class="layui-btn layui-btn-xs">刷 新</button></th>
             <th class='text-left nowrap'>名称</th>
             <th class='text-left nowrap'>轮播图</th>
-<!--            <th class='text-left nowrap' style="width: 30%;">链接</th>-->
+            <!--            <th class='text-left nowrap' style="width: 30%;">链接</th>-->
             <th class="text-left" style="width: 20%">操作</th>
         </tr>
         </thead>
@@ -24,7 +24,7 @@
             <td class='list-table-sort-td'><input data-action-blur="{:request()->url()}" data-value="id#{$vo.id};action#sort;sort#{value}" data-loading="false" value="{$vo.sort}" class="list-sort-input"></td>
             <td class='text-left nowrap'>{$vo.name|default=''}</td>
             <td class='text-left nowrap'><img data-tips-image="{$vo.cover|default=''}"  src="{$vo.cover|default=''}" height="50" width="110px"></td>
-<!--            <td class='text-left nowrap'>{$vo.link|default=''}</td>-->
+            <!--            <td class='text-left nowrap'>{$vo.link|default=''}</td>-->
             <td class='text-left' style="width: 20%">
                 <a data-title="编辑轮播图" class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}'>编 辑</a>
                 <span class="layui-btn layui-btn-sm layui-btn-danger" onclick="btn_confirm('删除','del','{$vo.id}');">删 除</span>

application/store/view/config/platform-set.html

@@ -171,6 +171,20 @@
                     {/if}
                 </div>
             </label>
+
+
+            <label class="layui-col-xs2 relative">
+                <span class="color-green font-w7">流通量开关<input checked type="radio" hidden readonly name=""  value="" lay-ignore></span>
+                <div>
+                    {if sysconf("turnover_switch") eq 1}
+                    <input checked type="radio"  name="turnover_switch"  value="1" title="开">
+                    <input  type="radio" name="turnover_switch"  value="0" title="关">
+                    {else/}
+                    <input  type="radio"  name="turnover_switch"  value="1" title="开">
+                    <input checked type="radio" name="turnover_switch"  value="0" title="关">
+                    {/if}
+                </div>
+            </label>
         </div>
 
         <label class="layui-form-item block relative">

application/store/view/goods/form.html

@@ -41,20 +41,20 @@
             </label>
 
             <label class="layui-col-xs3 relative before_time"   {if isset($vo.issue_mode) && $vo.issue_mode  eq 2}style="display: none"{/if}>
-            <span class="color-green">提前购【分钟】</span>
-            <input name="before_time" required class="layui-input" placeholder="请输提前购时间" value="{$vo.before_time|default=''}">
+                <span class="color-green">提前购【分钟】</span>
+                <input name="before_time" required class="layui-input" placeholder="请输提前购时间" value="{$vo.before_time|default=''}">
             </label>
 
 
             <label class="layui-col-xs3 relative apply_time"   {if !isset($vo.issue_mode) ||  (isset($vo.issue_mode) && $vo.issue_mode  eq 1)}style="display: none"{/if}>
-            <span class="color-green">报名开始时间</span>
-            <input name="apply_st" id="apply_st"  value='{$vo.apply_st|default=""}' placeholder="" class="layui-input">
+                <span class="color-green">报名开始时间</span>
+                <input name="apply_st" id="apply_st"  value='{$vo.apply_st|default=""}' placeholder="" class="layui-input">
             </label>
 
 
             <label class="layui-col-xs3 relative apply_time"  {if !isset($vo.issue_mode) || (isset($vo.issue_mode) && $vo.issue_mode  eq 1)}style="display: none"{/if}>
-            <span class="color-green">中签人数</span>
-            <input name="draw_num" value='{$vo.draw_num|default=""}' placeholder="" class="layui-input">
+                <span class="color-green">中签人数</span>
+                <input name="draw_num" value='{$vo.draw_num|default=""}' placeholder="" class="layui-input">
             </label>
         </div>
 
@@ -170,11 +170,11 @@
                     <select class="layui-select" required name="vipid" lay-search>
                         <option selected value="">请选择Vip等级</option>
                         {foreach $vipData as $v}
-                        {if (isset($vo.vipid) && $vo.vipid  eq $v.id)}
-                        <option selected value="{$v.id}">{$v.name|default=''}</option>
-                        {else}
-                        <option value="{$v.id}">{$v.name|default=''}</option>
-                        {/if}
+                            {if (isset($vo.vipid) && $vo.vipid  eq $v.id)}
+                            <option selected value="{$v.id}">{$v.name|default=''}</option>
+                            {else}
+                            <option value="{$v.id}">{$v.name|default=''}</option>
+                            {/if}
                         {/foreach}
                     </select>
                 </label>

application/store/view/goods/import_first_list.html

@@ -1,6 +1,6 @@
 {extend name='admin@main'}
 {block name="button"}
-    <a data-dbclick class="layui-btn layui-btn-sm" data-modal='{:url("add_first")}?c_id={$Think.get.id}'>添加</a>
+<a data-dbclick class="layui-btn layui-btn-sm" data-modal='{:url("add_first")}?c_id={$Think.get.id}'>添加</a>
 {/block}
 {block name="content"}
 <div class="think-box-shadow">

application/store/view/goods/index.html

@@ -59,15 +59,15 @@
                 <a data-title="铸造" class="layui-btn layui-btn-sm" data-modal='{:url("hash")}?id={$vo.id}'>铸造</a>
 
                 <a data-title="赠送" class="layui-btn layui-btn-sm" data-modal='{:url("send")}?id={$vo.id}'>赠送</a>
-               {eq name='vo.issue_mode' value ='2'} <a data-title="抽签明细" class="layui-btn layui-btn-sm" data-open='{:url("draw")}?id={$vo.id}'>抽签明细</a>{/eq}
+                {eq name='vo.issue_mode' value ='2'} <a data-title="抽签明细" class="layui-btn layui-btn-sm" data-open='{:url("draw")}?id={$vo.id}'>抽签明细</a>{/eq}
                 <a class='layui-btn layui-btn-normal layui-btn-sm dr' id="dr" style="background-color:#DC2219;margin-right: 10px;width: 65px " onclick="changename('{$vo.id}')">
-                     批量赠送
+                    批量赠送
                 </a>
                 {if $vo.issue_mode == 1}
-                    <a data-title="优先购名单" class="layui-btn layui-btn-sm" data-open='{:url("import_first_list")}?id={$vo.id}'>优先购名单</a>
-                    {if $vo.status == 1 && $vo.state == 2}
-                    <a data-title="导入优先购名单" style="margin-right: 10px; " class="layui-btn layui-btn-normal layui-btn-sm first" id="first" onclick="changefirst('{$vo.id}')" >导入优先购名单</a>
-                    {/if}
+                <a data-title="优先购名单" class="layui-btn layui-btn-sm" data-open='{:url("import_first_list")}?id={$vo.id}'>优先购名单</a>
+                {if $vo.status == 1 && $vo.state == 2}
+                <a data-title="导入优先购名单" style="margin-right: 10px; " class="layui-btn layui-btn-normal layui-btn-sm first" id="first" onclick="changefirst('{$vo.id}')" >导入优先购名单</a>
+                {/if}
                 {/if}
                 <a data-title="编辑商品" class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}'>编 辑</a>
                 <a data-title="收藏记录" class="layui-btn layui-btn-sm" data-open='{:url("/store/collect_info/index")}?goods_id={$vo.id}'>收藏记录</a>

application/store/view/goods1/form.html

@@ -31,28 +31,28 @@
         </div>
 
 
-        <!--
-                <div class="layui-form-item layui-row layui-col-space15" style="display: none">
-
-                    <label class="layui-col-xs3 relative">
-                        <span class="color-green">发行方式</span>
-                        <select class="layui-select" required name="issue_mode" id="issue_mode"  lay-filter="issue_mode" lay-search>
-                            <option value="1"  {if isset($vo.issue_mode) && $vo.issue_mode  eq 1}selected{/if}>普通发行</option>
-                            <option value="2"  {if isset($vo.issue_mode) && $vo.issue_mode  eq 2}selected{/if}>抽签发行</option>
-                        </select>
-                    </label>
-
-                    <label class="layui-col-xs3 relative apply_time"   {if !isset($vo.issue_mode) ||  (isset($vo.issue_mode) && $vo.issue_mode  eq 1)}style="display: none"{/if}>
-                    <span class="color-green">报名开始时间</span>
-                    <input name="apply_st" id="apply_st"  value='{$vo.apply_st|default=""}' placeholder="" class="layui-input">
-                    </label>
-
-                    <label class="layui-col-xs3 relative apply_time"  {if !isset($vo.issue_mode) || (isset($vo.issue_mode) && $vo.issue_mode  eq 1)}style="display: none"{/if}>
-                    <span class="color-green">中签人数</span>
-                    <input name="draw_num" value='{$vo.draw_num|default=""}' placeholder="" class="layui-input">
-                    </label>
-
-                </div>-->
+<!--
+        <div class="layui-form-item layui-row layui-col-space15" style="display: none">
+
+            <label class="layui-col-xs3 relative">
+                <span class="color-green">发行方式</span>
+                <select class="layui-select" required name="issue_mode" id="issue_mode"  lay-filter="issue_mode" lay-search>
+                    <option value="1"  {if isset($vo.issue_mode) && $vo.issue_mode  eq 1}selected{/if}>普通发行</option>
+                    <option value="2"  {if isset($vo.issue_mode) && $vo.issue_mode  eq 2}selected{/if}>抽签发行</option>
+                </select>
+            </label>
+
+            <label class="layui-col-xs3 relative apply_time"   {if !isset($vo.issue_mode) ||  (isset($vo.issue_mode) && $vo.issue_mode  eq 1)}style="display: none"{/if}>
+            <span class="color-green">报名开始时间</span>
+            <input name="apply_st" id="apply_st"  value='{$vo.apply_st|default=""}' placeholder="" class="layui-input">
+            </label>
+
+            <label class="layui-col-xs3 relative apply_time"  {if !isset($vo.issue_mode) || (isset($vo.issue_mode) && $vo.issue_mode  eq 1)}style="display: none"{/if}>
+            <span class="color-green">中签人数</span>
+            <input name="draw_num" value='{$vo.draw_num|default=""}' placeholder="" class="layui-input">
+            </label>
+
+        </div>-->
 
         <div class="layui-form-item layui-row layui-col-space15">
             <label class="layui-col-xs3 relative">

application/store/view/goods1/index.html

@@ -11,7 +11,6 @@
         {notempty name='list'}
         <thead>
         <tr>
-            <th class='text-left nowrap'>ID</th>
             <th class='text-left nowrap'>盲盒名称</th>
             <th class='text-left nowrap'>封面</th>
             <th class='text-left nowrap'>售价</th>
@@ -27,7 +26,6 @@
         <tbody>
         {foreach $list as $key=>$vo}
         <tr>
-            <td class='text-left nowrap'>{$vo.id|default=''}</td>
             <td class='text-left nowrap'>{$vo.name|default=''}</td>
             <td class='text-left nowrap'>
                 <img data-tips-image="{$vo.cover|default=''}"  src="{$vo.cover|default=''}" width="50px">
@@ -46,8 +44,8 @@
             </td>
             <td class='text-left nowrap'>
                 <a data-title="编辑盲盒" class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}'>编 辑</a>
-                <a data-title="收藏记录" class="layui-btn layui-btn-sm" data-open='{:url("/store/collect_info/index")}?goods_id={$vo.id}'>收藏记录</a>
 
+                <a data-title="收藏记录" class="layui-btn layui-btn-sm" data-open='{:url("/store/collect_info/index")}?goods_id={$vo.id}'>收藏记录</a>
                 {if $vo.status eq 1}
                 <span class="layui-btn layui-btn-sm layui-btn-warm"   onclick="btn_confirm('下架','down','{$vo.id}');">下 架</span>
                 {else}

application/store/view/goods2/form.html

@@ -106,17 +106,17 @@
             <script>$('[name="logo"]').uploadOneImage(), $('[name="describe"]').uploadMultipleImage()</script>
         </div>
 
-        <!--        <div class="layui-form-item">-->
-        <!--            <span class="color-green label-required-prev">分享二维码</span>-->
-        <!--            <table class="layui-table">-->
-        <!--                <thead>-->
-        <!--                <tr>-->
-        <!--                    <td width="90px" class="text-left"><input name="share_img" type="hidden" value="{$vo.share_imgs|default=''}"></td>-->
-        <!--                </tr>-->
-        <!--                </thead>-->
-        <!--            </table>-->
-        <!--            <script>$('[name="share_img"]').uploadOneImage(), $('[name="share_imgs"]').uploadMultipleImage()</script>-->
-        <!--        </div>-->
+<!--        <div class="layui-form-item">-->
+<!--            <span class="color-green label-required-prev">分享二维码</span>-->
+<!--            <table class="layui-table">-->
+<!--                <thead>-->
+<!--                <tr>-->
+<!--                    <td width="90px" class="text-left"><input name="share_img" type="hidden" value="{$vo.share_imgs|default=''}"></td>-->
+<!--                </tr>-->
+<!--                </thead>-->
+<!--            </table>-->
+<!--            <script>$('[name="share_img"]').uploadOneImage(), $('[name="share_imgs"]').uploadMultipleImage()</script>-->
+<!--        </div>-->
 
         <div class="layui-form-item text-center">
             {notempty name='vo.id'}<input type="hidden" name="id" value="{$vo.id}">{/notempty}
@@ -165,7 +165,7 @@
                 url:"{:url('member/get_city')}",  //数据传输的控制器方法
                 data: {id:val},//这里data传递过去的是序列化以后的字符串
                 success:function(data){
-                    // console.log(data)
+                   // console.log(data)
                     var arr = data.data;
                     //console.log(arr)
                     if (arr.length>0){
@@ -196,7 +196,7 @@
                 success:function(data){
                     //console.log(data)
                     var arr = data.data;
-                    // console.log(arr)
+                   // console.log(arr)
                     if (arr.length>0){
                         var options='<option value="">请选择区</option>';
                         for (var i = 0; i < arr.length; i++) {

application/store/view/goods2/index.html

@@ -58,6 +58,7 @@
                      批量赠送
                 </a>
                 <a data-title="编辑商品" class="layui-btn layui-btn-sm" data-open='{:url("edit")}?id={$vo.id}'>编 辑</a>
+
                 {/if}
                 <a data-title="收藏记录" class="layui-btn layui-btn-sm" data-open='{:url("/store/collect_info/index")}?goods_id={$vo.id}'>收藏记录</a>
 

application/user/controller/Deposit.php

@@ -63,7 +63,7 @@ class Deposit extends Controller
         switch ($sel_sh) {
             case 0 ;case 1 ; case 2:
             $sel_where[] =['w.sh_status','=',$sel_sh];
-            break;
+                break;
             case 3:
                 $sel_where[] =['w.sh_status','=',2];
                 $sel_where[] =['w.is_over','=',1];

application/user/controller/Invite.php

@@ -31,63 +31,63 @@ class Invite extends Controller
     {
         $this->title = '邀请排行榜';
         $create_at = $this->request->get('create_at');
-        /* if (isset($create_at) && $create_at){
-             $time = explode(' - ',$_GET['create_at']);
-             $start_date_time = $time[0].' 00:00:00';
-             $end_date_time = $time[1].' 23:59:59';
-             $sql = "(select count(b.id) from store_member as b where b.pid=a.id and (b.create_at between '".$start_date_time."' and '".$end_date_time."')) as count";
-            // echo $sql;die;
-         }else{
-             $sql = '(select count(b.id) from store_member as b where b.pid=a.id) as count';
-         }*/
+       /* if (isset($create_at) && $create_at){
+            $time = explode(' - ',$_GET['create_at']);
+            $start_date_time = $time[0].' 00:00:00';
+            $end_date_time = $time[1].' 23:59:59';
+            $sql = "(select count(b.id) from store_member as b where b.pid=a.id and (b.create_at between '".$start_date_time."' and '".$end_date_time."')) as count";
+           // echo $sql;die;
+        }else{
+            $sql = '(select count(b.id) from store_member as b where b.pid=a.id) as count';
+        }*/
         $this->off_set =  input('page',1) * input('limit',20)-  input('limit',20);
-        /* $this->_query($this->table.' as a')
-             ->field('a.id,a.name,a.phone,a.pid,a.headimg,'.$sql)
-             ->group('a.id')
-             //->having('count>0')
-             ->order('count desc')
-             ->like('name,phone')
-             ->page();*/
-
-        $name = input('name');
-        $phone = input('phone');
-        $sel_id = 0;
+       /* $this->_query($this->table.' as a')
+            ->field('a.id,a.name,a.phone,a.pid,a.headimg,'.$sql)
+            ->group('a.id')
+            //->having('count>0')
+            ->order('count desc')
+            ->like('name,phone')
+            ->page();*/
+
+       $name = input('name');
+       $phone = input('phone');
+       $sel_id = 0;
         $where = 'id > 0';
-        if($name || $phone) {
-            $se = [];
-            if($name) $s[] = ['name','=',$name];
-            if($phone) $s[] = ['phone','=',$phone];
-            $sel_id = Db::name('store_member')->where($se)->value('id');
-            $where = 'id = '.$sel_id;
-        }
+       if($name || $phone) {
+           $se = [];
+           if($name) $s[] = ['name','=',$name];
+           if($phone) $s[] = ['phone','=',$phone];
+           $sel_id = Db::name('store_member')->where($se)->value('id');
+           $where = 'id = '.$sel_id;
+       }
 
         $create_at = $this->request->get('create_at');
         if(isset($create_at) && $create_at) {
-            $time = explode(' - ',$_GET['create_at']);
-            $start_date_time = $time[0];
-            $end_date_time =  $time[1];
-            $this->_query($this->table)
-                ->field('pid,count(*) count')
-                ->where('pid','>',0)
-                ->where('is_auth',1)
-                ->where('bank_num is not null')
-                ->where($where)
-                ->whereBetweenTime('create_at',$start_date_time,$end_date_time)
-                ->group('pid')
-                ->order('count desc')
-                ->page();
-        }else{
-            $this->_query($this->table)
-                ->field('pid,count(*) count')
-                ->where('pid','>',0)
-                ->where('is_auth',1)
-                ->where('bank_num is not null')
-                ->where($where)
-                ->group('pid')
-                ->order('count desc')
-                ->page();
-
-        }
+           $time = explode(' - ',$_GET['create_at']);
+           $start_date_time = $time[0];
+           $end_date_time =  $time[1];
+           $this->_query($this->table)
+               ->field('pid,count(*) count')
+               ->where('pid','>',0)
+               ->where('is_auth',1)
+               ->where('bank_num is not null')
+               ->where($where)
+               ->whereBetweenTime('create_at',$start_date_time,$end_date_time)
+               ->group('pid')
+               ->order('count desc')
+               ->page();
+       }else{
+           $this->_query($this->table)
+               ->field('pid,count(*) count')
+               ->where('pid','>',0)
+               ->where('is_auth',1)
+               ->where('bank_num is not null')
+               ->where($where)
+               ->group('pid')
+               ->order('count desc')
+               ->page();
+
+       }
 
 
     }

application/user/controller/Member.php

@@ -48,6 +48,7 @@ class Member extends Controller
         $this->title = '会员信息管理';
         $id_order = input('id_order') == 1 ? 'asc' : 'desc';
         $money_order   = input('money_order') == 1 ? 'asc' : 'desc';
+        $this->total_money = $this->_query($this->table)->where('is_deleted',0)->sum('money');
         $query = $this->_query($this->table)->where('is_deleted',0)
             ->like('name,phone')
             ->equal('status,vip,group,is_open_official_DDC')->dateBetween('create_at');
@@ -524,7 +525,75 @@ class Member extends Controller
         $this->_form($this->table, 'add');
     }
 
+    /**
+     * 批量充值
+     * @auth true
+     * @throws \think\Exception
+     * @throws \think\exception\PDOException
+     */
+    public function import()
+    {
+        list($msec, $sec) = explode(' ', microtime());
+        $msectime = (float)sprintf('%.0f', (floatval($msec) + floatval($sec)) * 1000);  //毫秒值
+        $get = $this->request->get();
+        $import_path = $_SERVER['DOCUMENT_ROOT'].'/'.$get['path'];
+        $url = $get['url'];
+
+        if (getConfigValue('storage_type')=='oss'){
+            $save_dir = "./upload/excle/"; // 服务资源目录
+            $filename = date('Ymd').time().".xlsx"; // 自定义名称
+            $res = $this->getFile($url,$save_dir,$filename,1);
+            $import_path = $_SERVER['DOCUMENT_ROOT'].'/upload/excle/'.$res;
+        }
+
+        $num = 1;
+        try {
+            $objReader =\PHPExcel_IOFactory::createReader('Excel2007');
+            $objExcel = $objReader->load($import_path);
+            $list = $objExcel->getActiveSheet()->toArray();
+            $success = 0;
+
+            $array = array();
+            foreach ($list as $k=>$v){
+                if($k>$num-1){
+                    if(array_filter($v)){
+                        $data=[];
+                        foreach ($v as $kk=>$vv){
+                            $data[IntToChr($kk)]=trim($vv);
+                        }
+                        $a['phone'] = $data['A'];
+                        $a['amount'] = $data['B'];
+                        array_push($array,$a);
+                    }
+                }
+            }
+
+            $error = 0;
+            $phone_error = array();
+            foreach ($array as &$v){
+                $member = Db::name('store_member')->where('phone',$v['phone'])->find();
+                if (!$member || !$v['amount'] || $v['amount']<0 || $v['amount'] > 2000 || !is_numeric($v['amount'])){
+                    $error = $error+1;
+                    array_push($phone_error,$v['phone']);
+                }else{
+                    $result =  memberMoneyChange(abs($v['amount']),3,$member['id'],'系统奖励',1,0,6);
+                    if ($result){
+                        $success +=1;
+                    }else{
+                        $error = $error+1;
+                    }
+                }
+            }
+            if ($error<1){
+                $this->success('成功');
+            }else{
+                $this->error('失败',['error'=>$error,'success'=>$success,'phone_error'=>$phone_error],2);
+            }
 
+        } catch (\think\exception\ValidateException $e) {
+            $this->error($e->getMessage());
+        }
+    }
     /**
      * 导出EXCL
      * @remark 根据WHERE条件导出EXCL
@@ -574,5 +643,46 @@ class Member extends Controller
             ->ExcelSave();
     }
 
-
+    /**
+     * 下载文件到服务器
+     * addtime 2020年8月28日 18:38:43
+     */
+    function getFile($url, $save_dir = '', $filename = '', $type = 0)
+    {
+        if (trim($url) == '') {
+            return false;
+        }
+        if (trim($save_dir) == '') {
+            $save_dir = './';
+        }
+        if (0 !== strrpos($save_dir, '/')) {
+            $save_dir.= '/';
+        }
+        //创建保存目录
+        if (!file_exists($save_dir) && !mkdir($save_dir, 0777, true)) {
+            return false;
+        }
+        //获取远程文件所采用的方法
+        if ($type) {
+            $ch = curl_init();
+            $timeout = 5;
+            curl_setopt($ch, CURLOPT_URL, $url);
+            curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+            curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+            $content = curl_exec($ch);
+            curl_close($ch);
+        } else {
+            ob_start();
+            readfile($url);
+            $content = ob_get_contents();
+            ob_end_clean();
+        }
+        $size = strlen($content);
+        //文件大小
+        $fp2 = @fopen($save_dir . $filename, 'a');
+        fwrite($fp2, $content);
+        fclose($fp2);
+        unset($content, $url);
+        return $filename;
+    }
 }

application/user/view/deposit/index.html

@@ -45,9 +45,9 @@
             <td class='text-left nowrap'>
                 <div class="inline-block">
                     类型：{eq name='vo.withdraw_type' value='wx'}微信{/eq}
-                    {eq name='vo.withdraw_type' value='zfb'}支付宝{/eq}
-                    {eq name='vo.withdraw_type' value='bank'}银行卡{/eq}
-                    <br>
+                        {eq name='vo.withdraw_type' value='zfb'}支付宝{/eq}
+                        {eq name='vo.withdraw_type' value='bank'}银行卡{/eq}
+                        <br>
                     账号：{$vo.account_no|default='--'}<br/>
                     收款人：{$vo.account_name|default='--'}
                 </div>
@@ -63,21 +63,21 @@
             <td class='text-left'>
                 <div class="inline-block">
                     {if $vo.sh_status == 1}
-                    {eq name='vo.is_over' value='1'}打款成功{/eq}
-                    {eq name='vo.is_over' value='0'} {$vo.return_info.respDesc|default='--'}{/eq}
+                        {eq name='vo.is_over' value='1'}打款成功{/eq}
+                        {eq name='vo.is_over' value='0'} {$vo.return_info.respDesc|default='--'}{/eq}
                     {elseif $vo.sh_status == 2}
-                    余额已退回
+                       余额已退回
                     {elseif $vo.sh_status == 0}
-                    --
+                        --
                     {/if}
                 </div>
             </td>
             <td class='text-left'>{$vo.create_at}</td>
             <td class='text-left'>
                 {if $vo['sh_status'] == 0}
-                <a data-title="审核" class="layui-btn layui-btn-sm layui-btn-warm" data-modal='{:url("edit")}?id={$vo.id}'>审核</a>
+                    <a data-title="审核" class="layui-btn layui-btn-sm layui-btn-warm" data-modal='{:url("edit")}?id={$vo.id}'>审核</a>
                 {else}
-                <a data-title="查看" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>查看</a>
+                    <a data-title="查看" class="layui-btn layui-btn-sm" data-modal='{:url("edit")}?id={$vo.id}'>查看</a>
                 {/if}
             </td>
         </tr>

application/user/view/deposit/index_search.html

@@ -27,13 +27,13 @@
                 <select class="layui-select" name="type">
                     <option  value="-1">全部</option>
                     {foreach $dep_type as $k=>$v}
-                    {if $v}
-                    {if $Think.get.type eq $k}
-                    <option selected value="{$k}">{$v}</option>
-                    {else}
-                    <option  value="{$k}">{$v}</option>
-                    {/if}
-                    {/if}
+                        {if $v}
+                            {if $Think.get.type eq $k}
+                                <option selected value="{$k}">{$v}</option>
+                            {else}
+                                <option  value="{$k}">{$v}</option>
+                            {/if}
+                        {/if}
                     {/foreach}
                 </select>
             </div>
@@ -44,13 +44,13 @@
             <div class="layui-input-inline">
                 <select class="layui-select" name="sel_sh">
                     <option  value="-1">全部</option>
-                    {foreach $sh_arr as $sk=>$sv}
-                    {if $sel_sh eq $sk}
-                    <option selected value="{$sk}">{$sv}</option>
-                    {else}
-                    <option  value="{$sk}">{$sv}</option>
-                    {/if}
-                    {/foreach}
+                        {foreach $sh_arr as $sk=>$sv}
+                            {if $sel_sh eq $sk}
+                                <option selected value="{$sk}">{$sv}</option>
+                            {else}
+                                <option  value="{$sk}">{$sv}</option>
+                            {/if}
+                        {/foreach}
                 </select>
             </div>
         </div>

application/user/view/member/index.html

@@ -6,6 +6,11 @@
 
 {block name="content"}
 <div class="think-box-shadow">
+    <div style="background-color: #e3e3c7 ;height: 50px;overflow: hidden">
+        <p style="line-height: 50px;font-size: 16px">&nbsp;&nbsp;
+            用户总余额：<span style='color:red'>{$total_money|default='0'}</span>，
+        </p>
+    </div>
     {include file='member/index_search'}
     <table class="layui-table margin-top-10" lay-skin="line">
         {notempty name='list'}

application/user/view/member/index_search.html

@@ -29,51 +29,6 @@
             </div>
         </div>
 
-        <!--        <div class="layui-form-item layui-inline">-->
-        <!--            <label class="layui-form-label">级别</label>-->
-        <!--            <div class="layui-input-inline">-->
-        <!--                <select class="layui-select" name="vip">-->
-        <!--                    {foreach [''=>'- 全部会员 -','1'=>'藏友','2'=>'创世勋章'] as $k=>$v}-->
-        <!--                    {eq name='Think.get.vip' value='$k.""'}-->
-        <!--                    <option selected value="{$k}">{$v}</option>-->
-        <!--                    {else}-->
-        <!--                    <option value="{$k}">{$v}</option>-->
-        <!--                    {/eq}-->
-        <!--                    {/foreach}-->
-        <!--                </select>-->
-        <!--            </div>-->
-        <!--        </div>-->
-
-        <!--        <div class="layui-form-item layui-inline">-->
-        <!--            <label class="layui-form-label">分组</label>-->
-        <!--            <div class="layui-input-inline">-->
-        <!--                <select class="layui-select" name="group">-->
-        <!--                    {foreach $group_list as $k=>$v}-->
-        <!--                    {eq name='Think.get.group' value='$v.id.""'}-->
-        <!--                    <option selected value="{$v.id}">{$v.name}</option>-->
-        <!--                    {else}-->
-        <!--                    <option value="{$v.id}">{$v.name}</option>-->
-        <!--                    {/eq}-->
-        <!--                    {/foreach}-->
-        <!--                </select>-->
-        <!--            </div>-->
-        <!--        </div>-->
-
-        <!--        <div class="layui-form-item layui-inline">-->
-        <!--            <label class="layui-form-label">官方DDC</label>-->
-        <!--            <div class="layui-input-inline">-->
-        <!--                <select class="layui-select" name="is_open_official_DDC">-->
-        <!--                    {foreach [''=>'- 全部会员 -','1'=>'是','0'=>'否'] as $k=>$v}-->
-        <!--                    {eq name='Think.get.is_open_official_DDC' value='$k.""'}-->
-        <!--                    <option selected value="{$k}">{$v}</option>-->
-        <!--                    {else}-->
-        <!--                    <option value="{$k}">{$v}</option>-->
-        <!--                    {/eq}-->
-        <!--                    {/foreach}-->
-        <!--                </select>-->
-        <!--            </div>-->
-        <!--        </div>-->
-
 
         <div class="layui-form-item layui-inline" >
             <label class="layui-form-label">注册时间</label>
@@ -92,6 +47,9 @@
         <button class="layui-btn layui-btn-primary layui-btn-sm" id="exportButton" type="submit" style="height: 32px;width: 73.69px;margin-left:3px; margin-bottom: 15px">
             <i class="layui-icon">&#xe608;</i>导 出
         </button>
+        <button class="layui-btn layui-btn-primary layui-btn-sm dr" id="dr" type="button"  style="height: 32px;width: 68.69px;margin-left:3px; margin-bottom: 15px">
+            批量充值
+        </button>
     </form>
     <script>
         form.render();
@@ -99,5 +57,78 @@
         $('#exportButton').click(function () {
             $("#exportForm").attr('action', '/user/member/get_excl?' + $('#form').serialize())
         })
+
+        //批量导入充值
+        layui.use('upload', function(){
+            var upload = layui.upload;
+            //执行实例
+            var uploadInst = upload.render({
+                elem: '.dr' //绑定元素
+                ,url: 'admin/api.plugs/upload'
+                ,accept: 'file', //普通文件,
+                before: function(obj){ //obj参数包含的信息，跟 choose回调完全一致，可参见上文。
+                }
+                ,done: function(res){
+
+                    if (res.uploaded == true){
+                        var value = {path:res.key,url:res.url}
+                        $.ajax({
+                            url:"/user/member/import",
+                            type:'get',
+                            data:value
+                            ,success:function(result){
+                                console.log(result);
+                                if (result.code==1){
+                                    layer.msg('赠送成功',{time:2000,end:function () {
+                                            location.reload();
+                                            // $.form.href('{:url("admin/main_project/index")}');
+                                        }});
+                                }else if (result.code==2){
+                                    // layer.msg('成功：'+result.data.success+'，失败：'+result.data.error+'<br />'+
+                                    //         '错误号码'+result.data.phone_error
+                                    //
+                                    //     ,{icon: 5});
+                                    layer.open({
+                                        type:1,
+                                        area:['500px', '500px'],
+                                        content:'成功：'+result.data.success+'，失败：'+result.data.error+'<br />'+
+                                            '错误号码：<br />'+result.data.phone_error,
+                                        btn:['导出错误号码'],
+                                        yes:function (index) {
+                                            var url = '/user/member/get_excl';
+                                            var params = {'phone': result.data.phone_error};
+                                            jsSubmit(url, params);
+                                            // layer.msg('的确很重要', {icon: 1});
+                                        }
+                                    });
+                                }else if (result.code==3){
+                                    layer.msg(result.info,{icon: 5});
+                                }
+                            }
+                        });
+                    }else {
+                        layer.msg(res.error.message,{icon: 5});
+                    }
+                }
+                ,error: function(){
+                    layer.msg('上传失败');
+                }
+            });
+        });
+
+        function jsSubmit(url, params, method = "get")
+        {
+            var form = $("<form></form>");
+            form.attr({"method": method, "action": url});
+            params = JSON.stringify(params.phone)
+            var input = $("<input type='hidden'>");
+            input.attr("name", 'phone');
+            input.val(params);
+            form.append(input);
+
+            $("html").append(form);
+            form.submit();
+        }
+
     </script>
 </fieldset>

application/user/view/wallet_info/index.html

@@ -15,7 +15,6 @@
             <th class='text-left nowrap'>余额</th>
             <th class='text-left nowrap'>变更类型</th>
             <th class="text-left nowrap">时间</th>
-            <th class="text-left nowrap">操作</th>
         </tr>
         </thead>
         {/notempty}