Merge branch 'master' of http://git.bocai108.com:10180/Ethan/Home-Data

application/admin/controller/AdminControl.php

@@ -242,7 +242,7 @@ class AdminControl extends Controller
                 'children' => array(
                     'Information' => array(
                         'text' => '企业信息管理',
-                        'url' => url('Server/index'),
+                        'url' => url('Information/index'),
                     ),
                 ),
             ),

application/admin/controller/Information.php

@@ -0,0 +1,73 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jun.peng
+ * Date: 2019/6/19
+ * Time: 9:28
+ */
+
+namespace app\admin\controller;
+
+use map\Map;
+use think\Lang;
+use app\admin\model\IncInfo as IncInfoModel;
+
+/**
+ * Class Information
+ * @package app\admin\controller
+ * 企业信息管理
+ */
+class Information extends AdminControl
+{
+
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        Lang::load(APP_PATH . 'admin/lang/' . config('default_lang') . '/inc_info.lang.php');
+    }
+
+    public function index() {
+        $allpower = $this->qxhans();
+        $this->assign('allpower',$allpower);
+        if (!request()->isPost()) {
+            $incData = IncInfoModel::get(1);
+            $this->assign('IncData',  $incData);
+            $this->setAdminCurItem('index');
+            return $this->fetch();
+        } else {
+            $update_array = array();
+            $update_array['inc_name'] = $_POST['inc_name'];
+            $update_array['inc_phone'] = $_POST['inc_phone'];
+            $update_array['inc_email'] = $_POST['inc_email'];
+            $update_array['inc_weixin'] = $_POST['inc_weixin'];
+            $update_array['inc_qq'] = $_POST['inc_qq'];
+            $update_array['inc_address'] = $_POST['inc_address'];
+
+            //获取地址经纬度
+            $map = Map::getLngLat($_POST['inc_address']);
+            $update_array['inc_location'] = json_encode($map['location']);
+            $imgurl = USER_SITE_ROOT . '/images/';
+            $file = request()->file('inc_logo');
+
+            if($file){
+                $imgname = "logo";//官网logo
+                $file = $file->setSaveName($imgname);//设置保存文件名
+                $imgo = $file->move($imgurl, $savename = false, $replace = true);
+                if($imgo){
+                    $update_array['inc_logo'] = $imgname.'.png';
+                }
+            }
+
+            $result = IncInfoModel::updateIncInfo($update_array);
+            if ($result === true) {
+                $this->log(lang('ds_edit') . lang('dis_dump'), 1);
+                $this->success('修改成功', 'Information/index');
+            } else {
+                $this->log(lang('ds_edit') . lang('dis_dump'), 0);
+                $this->error(lang('修改失败'));
+            }
+        }
+    }
+
+}

application/admin/controller/User.php

@@ -6,6 +6,7 @@ use think\Validate;
 use think\Lang;
 use app\admin\model\Userinfo;
 use app\common\model\User as UserModel;
+use  app\admin\model\CapitalMovements;
 
 class User extends AdminControl
 {
@@ -77,6 +78,17 @@ class User extends AdminControl
         return $this->fetch();
     }
 
+    public function  usercapitalmovements(){
+        $uid = intval(input('uid'),0);
+        $model_user = new CapitalMovements();
+        $list = $model_user->where(['user_id'=>$uid])->order('capitalMovements_id','desc')->paginate(10);
+
+        $this->assign('list', $list);
+        $this->assign('show_page', $list->render());
+
+        return $this->fetch();
+    }
+
 
     public function recharge()
     {

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

@@ -0,0 +1,13 @@
+<?php
+
+$lang['inc_name'] = '公司名称';
+$lang['inc_phone'] = '联系电话';
+$lang['inc_email'] = '联系邮箱';
+$lang['inc_qq'] = '联系qq';
+$lang['inc_weixin'] = '联系微信';
+$lang['inc_address'] = '详细地址';
+$lang['inc_logo'] = '公司logo';
+
+
+
+?>

application/admin/model/IncInfo.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jun.peng
+ * Date: 2019/6/19
+ * Time: 10:37
+ */
+
+namespace app\admin\model;
+
+use think\Model;
+
+//企业信息
+class IncInfo extends Model
+{
+    protected $name = 'inc_info';
+
+    /**
+     * 更新信息
+     *
+     * @param array $param 更新数据
+     * @return bool 布尔类型的返回结果
+     */
+    public static function updateIncInfo($param)
+    {
+        if (empty($param)) {
+            return false;
+        }
+        if (is_array($param)) {
+            $result = self::where('id', 1)->update($param);
+            return true;
+        } else {
+            return false;
+        }
+    }
+}

application/admin/model/SaleGroup.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jun.peng
+ * Date: 2019/6/19
+ * Time: 10:37
+ */
+
+namespace app\admin\model;
+
+use think\Model;
+
+//销售 人员 分组
+class SaleInfo extends Model
+{
+    protected $name = 'sale_group';
+}

application/admin/model/SaleInfo.php

@@ -0,0 +1,17 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jun.peng
+ * Date: 2019/6/19
+ * Time: 10:37
+ */
+
+namespace app\admin\model;
+
+use think\Model;
+
+//销售 人员 信息
+class SaleInfo extends Model
+{
+    protected $name = 'sale_info';
+}

application/admin/view/information/index.html

@@ -0,0 +1,84 @@
+
+{extend name="layout:home" /}
+
+{block name="container"}
+<form class="layui-form layui-form-pane" method="post" action="" enctype="multipart/form-data">
+    <div class="layui-tab layui-tab-card">
+        {include file="layout/admin_items" /}
+        <div class="layui-tab-content page-tab-content">
+            <div class="layui-tab-item layui-show ">
+
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{$Think.lang.inc_name}</label>
+                    <div class="layui-input-inline">
+                        <input type="text" class="layui-input field-name" name="inc_name" id="inc_name" value="{$IncData.inc_name|default=''}" lay-verify="" autocomplete="off" placeholder="{$Think.lang.ds_please_enter}{$Think.lang.site_name}" required />
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{$Think.lang.inc_phone}</label>
+                    <div class="layui-input-inline">
+                        <input type="text" class="layui-input field-name" name="inc_phone" id="inc_phone" value="{$IncData.inc_phone|default=''}" lay-verify="" autocomplete="off" placeholder="{$Think.lang.ds_please_enter}{$Think.lang.icp_number}" required />
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{$Think.lang.inc_email}</label>
+                    <div class="layui-input-inline">
+                        <input type="text" class="layui-input field-name" name="inc_email" id="inc_email" value="{$IncData.inc_email|default=''}" lay-verify="" autocomplete="off" placeholder="{$Think.lang.ds_please_enter}{$Think.lang.site_phone}" required />
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{$Think.lang.inc_qq}</label>
+                    <div class="layui-input-inline">
+                        <input type="text" class="layui-input field-name" name="inc_qq" id="inc_qq" value="{$IncData.inc_qq|default=''}" lay-verify="" autocomplete="off" placeholder="{$Think.lang.ds_please_enter}{$Think.lang.flow_static_code}" required />
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{$Think.lang.inc_weixin}</label>
+                    <div class="layui-input-inline">
+                        <input type="text" class="layui-input field-name" name="inc_weixin" id="inc_weixin" value="{$IncData.inc_weixin|default=''}" lay-verify="" autocomplete="off" placeholder="{$Think.lang.ds_please_enter}{$Think.lang.fax}" required />
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{$Think.lang.inc_address}</label>
+                    <div class="layui-input-inline">
+                        <input type="text" class="layui-input field-name" name="inc_address" id="inc_address" value="{$IncData.inc_address|default=''}" lay-verify="" autocomplete="off" placeholder="{$Think.lang.ds_please_enter}{$Think.lang.fax}" required />
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">{$Think.lang.inc_logo}</label>
+                    <div class="layui-input-inline">
+                        <input type="file" name="inc_logo" />
+                    </div>
+                </div>
+
+                <div class="layui-form-item">
+                    <div class="layui-input-block">
+                        <input type="submit" class="layui-btn layui-btn-normal" lay-submit value="{:lang('ds_submit')}"/>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</form>
+<script>
+    layui.use('form', function () {
+        var form = layui.form;
+    });
+</script>
+<script>
+    //Demo
+    layui.use('form', function () {
+        var form = layui.form;
+
+        //监听提交
+        form.on('submit(formDemo)', function (data) {
+            layer.msg(JSON.stringify(data.field));
+            return false;
+        });
+    });
+</script>
+
+{/block}
+
+
+

application/admin/view/user/index.html

@@ -90,6 +90,7 @@
                     <a onclick="recharge({$user.user_id}, 1)" class="layui-btn layui-btn-xs">充值</a>
                     <a onclick="recharge({$user.user_id}, 2)" class="layui-btn layui-btn-xs">扣款</a>
                     <a onclick="userInfo({$user.user_id})" class="layui-btn layui-btn-xs">详情</a>
+                    <a onclick="userInfomoney({$user.user_id})" class="layui-btn layui-btn-xs">流水</a>
                 </td>
             </tr>
             {/volist}
@@ -130,6 +131,18 @@
         });
     }
 
+    function userInfomoney(uid){
+        var url = '/admin/user/usercapitalmovements?uid='+uid;
+        parent.layer.open({
+            type: 2,
+            title: '流水记录',
+            area: ["1200px","500px"],
+            fixed: false, //不固定
+            content: url
+        });
+
+    }
+
 
     function hiddenTips() {
         $("#layui-layer2").attr("style", "display: none")

application/admin/view/user/usercapitalmovements.html

@@ -0,0 +1,42 @@
+{extend name="layout:home" /}
+{block name="container"}
+<div class="layui-tab layui-tab-card">
+    <div class="layui-tab-content page-tab-content">
+        <table class="layui-table lay-even">
+            <thead>
+            <tr>
+                <th>交易id</th>
+                <th>创建时间</th>
+                <th>修改时间</th>
+                <th>金额</th>
+                <th>类型</th>
+                <th>剩余金额</th>
+                <th>操作人</th>
+                <th>描述</th>
+            </tr>
+            </thead>
+            <tbody>
+            {if $list}
+            {volist name="list" id="user"}
+            <tr>
+                <td>{$user.capitalMovements_identity}</td>
+                <td>{$user.capitalMovements_create}</td>
+                <td>{$user.capitalMovements_update}</td>
+                <td>{$user.capitalMovements_money}</td>
+                <td>{$user.capitalMovements_type==1? '增加':'减少'}</td>
+                <td>{$user.capitalMovements_cash}</td>
+                <td>{$user.capitalMovements_operator}</td>
+                <td>{$user.capitalMovements_describe}</td>
+            </tr>
+            {/volist}
+            {else}
+            <td>无数据</td>
+            {/if}
+            </tbody>
+        </table>
+        {$show_page}
+    </div>
+</div>
+
+
+{/block}

application/home/controller/Index.php

@@ -7,6 +7,7 @@ use think\Cache;
 use think\Request;
 use think\Controller;
 use think\Validate;
+use app\admin\model\IncInfo as IncInfoModel;
 
 /**
  * 主页管理类
@@ -34,10 +35,15 @@ class Index extends Common
     public function index()
     {
         $getHomeInformation = model('homeinformation')->getHomeInformation();
-        $this->assign('information', $getHomeInformation);
 
+        $incData = IncInfoModel::get(1);
+        $this->assign('information', $getHomeInformation);
+        $this->assign('incData', $incData);
+        $location = json_decode($incData->inc_location);
+        $this->assign('lng', $location->lng);
+        $this->assign('lat', $location->lat);
         return $this->fetch();
-    }//end index()
+    }
 
     public function isLogin()
     {

application/home/view/layout/footer.html

@@ -12,19 +12,19 @@
                     <h4 style="color: #fff">联系我们</h4>
                     <div style="margin-top: 15px; font-family: initial;">
                         <span style="color: #fff">电话/微信：</span>
-                        <span style="color: #fff">1234556777</span>
+                        <span style="color: #fff">{$incData.inc_phone}</span>
                     </div>
                     <div style="margin-top: 5px; font-family: initial;">
                         <span style="color: #fff">邮箱：</span>
-                        <span style="color: #fff">jdasd@jmdnas.com</span>
+                        <span style="color: #fff">{$incData.inc_email}</span>
                     </div>
                     <div style="margin-top: 5px; font-family: initial;">
                         <span style="color: #fff">QQ：</span>
-                        <span style="color: #fff">817272823</span>
+                        <span style="color: #fff">{$incData.inc_qq}</span>
                     </div>
                     <div style="margin-top: 5px; font-family: initial;">
                         <span style="color: #fff">地址：</span>
-                        <span style="color: #fff">成都市</span>
+                        <span style="color: #fff">{$incData.inc_address}</span>
                     </div>
                 </div>
                 <div style="width:500px;height:200px;border-bottom:#ccc solid 1px;" id="dituContent"></div>
@@ -33,7 +33,7 @@
         <div style="border-bottom: 1px solid #707070; margin-top: 20px; margin-bottom: 10px; width: 99999999999px; margin-left: -99999px;"></div>
         <!-- copyright -->
         <div style="text-align: center">
-            <p style="color: #9597A2; font-family: initial;">成都市的打卡的有限公司&nbsp;&nbsp;&nbsp;&nbsp;上海虹口区东岸大拉独立192号</p>
+            <p style="color: #9597A2; font-family: initial;">{$incData.inc_address}</p>
             <p style="color: #9597A2; font-family: initial; margin-top: -15px;">增值电信业务经营许可证：<span
                     style="color: #2B7CD2">川B2-99329239 川A4-3821883</span>&nbsp;&nbsp;&nbsp;&nbsp;kdjad@2921
                 jdasjdsdsaakdk kdkdsak <span style="color: #2B7CD2">&nbsp;&nbsp;&nbsp;&nbsp;免费声明</span></p>
@@ -130,7 +130,7 @@
     //创建地图函数：
     function createMap() {
         var map = new BMap.Map("dituContent");//在百度地图容器中创建一个地图
-        var point = new BMap.Point(104.070632, 30.588746);//定义一个中心点坐标
+        var point = new BMap.Point({$lng}, {$lat});//定义一个中心点坐标
         map.centerAndZoom(point, 18);//设定地图的中心点和坐标并将地图显示在地图容器中
         window.map = map;//将map变量存储在全局
     }

extend/map/Map.php

@@ -0,0 +1,81 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Jun.peng
+ * Date: 2019/6/19
+ * Time: 15:53
+ */
+namespace map;
+
+class Map
+{
+    //根据地址获取经纬度
+    public static function getLngLat($address)
+    {
+        // http://api.map.baidu.com/geocoder/v2/?address=北京市海淀区上地十街10号&output=json&ak=您的ak&callback=showLocation //GET请求
+        $data = [
+            'address' => $address,
+            'ak' => 'EglSDP3UNYtT2GsjGsoBFrHYBfixPrDv',
+            'output' => 'json',
+        ];
+        //转化为网址形式
+        $url = 'http://api.map.baidu.com/geocoder/v2/?' . http_build_query($data);
+        $res = self::doCurl($url);
+        $res = json_decode($res,true);
+        return $res['result'];
+    }
+
+    //根据经纬度或者地址获取百度地图
+    public static function staticimage($center)
+    {
+        if (!$center) {
+            return '';
+        }
+        $data = [
+            'ak' => 'EglSDP3UNYtT2GsjGsoBFrHYBfixPrDv',
+            'width' => '100',
+            'height' => '200',
+            'center' => $center,
+            'markers' => $center,
+        ];
+        $url = 'http://api.map.baidu.com/geocoder/v2/?' . http_build_query($data);
+        $res = self::doCurl($url);
+        return $res;
+    }
+
+    public static function doCurl($url, $type = 0, $data = [])
+    {
+        $ch = curl_init(); //初始化
+//设置选项
+        curl_setopt($ch, CURLOPT_URL, $url);
+        curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+        curl_setopt($ch, CURLOPT_HEADER, 0);
+        if ($type == 1) {
+            //post
+            curl_setopt($ch, CURLOPT_PORT, 1);
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $data);
+        }
+//执行获取内容
+        $output = curl_exec($ch);
+//释放curl句柄
+        curl_close($ch);
+        return $output;
+    }
+
+
+    /**
+     * 【腾讯地图】
+     * 【根据详细地址获取经纬度】
+     *  20170920
+     *
+     * @param $address
+     * @return array
+     */
+    public static function getPoint($address)
+    {
+        $url = "https://apis.map.qq.com/ws/geocoder/v1/?address=" . $address . "&key=5ULBZ-2M4LJ-QS3FO-F6SSW-X3CRK-WABPO";
+        $res = self::doCurl($url);
+
+        return $res;
+    }
+}

public/index.php

@@ -13,5 +13,6 @@
 
 // 定义应用目录
 define('APP_PATH', __DIR__ . '/../application/');
+define('EXTEND_PATH', __DIR__ .'/../extend/');
 // 加载框架引导文件
 require __DIR__ . '/../thinkphp/start.php';