合并分支 'Branch_liuzhen' 到 'master'

前台菜单、底部数据写活，帮买服务、产品维修、关于我们页面渲染



查看合并请求 !8

+<?php
+
+namespace app\admin\controller;
+
+use app\common\controller\Backend;
+
+/**
+ * 友情链接管理
+ *
+ * @icon fa fa-link
+ */
+class Link extends Backend
+{
+    
+    /**
+     * Link模型对象
+     * @var \app\admin\model\Link
+     */
+    protected $model = null;
+
+    public function _initialize()
+    {
+        parent::_initialize();
+        $this->model = new \app\admin\model\Link;
+
+    }
+    
+    /**
+     * 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
+     * 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
+     * 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
+     */
+    
+
+}

+<?php
+
+return [
+    'Name'       => '名称',
+    'Href'       => '链接地址',
+    'Createtime' => '创建时间',
+    'Updatetime' => '修改时间'
+];

+<?php
+
+namespace app\admin\model;
+
+use think\Model;
+
+
+class Link extends Model
+{
+
+    
+
+    
+
+    // 表名
+    protected $name = 'link';
+    
+    // 自动写入时间戳字段
+    protected $autoWriteTimestamp = 'int';
+
+    // 定义时间戳字段名
+    protected $createTime = 'createtime';
+    protected $updateTime = 'updatetime';
+    protected $deleteTime = false;
+
+    // 追加属性
+    protected $append = [
+
+    ];
+    
+
+    
+
+
+
+
+
+
+
+}

+<?php
+
+namespace app\admin\validate;
+
+use think\Validate;
+
+class Link extends Validate
+{
+    /**
+     * 验证规则
+     */
+    protected $rule = [
+    ];
+    /**
+     * 提示消息
+     */
+    protected $message = [
+    ];
+    /**
+     * 验证场景
+     */
+    protected $scene = [
+        'add'  => [],
+        'edit' => [],
+    ];
+    
+}

+<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">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Href')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-href" data-rule="required;url" class="form-control" name="row[href]" type="text" value="">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

+<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
+
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Name')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-name" data-rule="required" class="form-control" name="row[name]" type="text" value="{$row.name|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group">
+        <label class="control-label col-xs-12 col-sm-2">{:__('Href')}:</label>
+        <div class="col-xs-12 col-sm-8">
+            <input id="c-href" data-rule="required;url" class="form-control" name="row[href]" type="text" value="{$row.href|htmlentities}">
+        </div>
+    </div>
+    <div class="form-group layer-footer">
+        <label class="control-label col-xs-12 col-sm-2"></label>
+        <div class="col-xs-12 col-sm-8">
+            <button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
+            <button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
+        </div>
+    </div>
+</form>

+<div class="panel panel-default panel-intro">
+    {:build_heading()}
+
+    <div class="panel-body">
+        <div id="myTabContent" class="tab-content">
+            <div class="tab-pane fade active in" id="one">
+                <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('link/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('link/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('link/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
+                        
+                    </div>
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('link/edit')}" 
+                           data-operate-del="{:$auth->check('link/del')}" 
+                           width="100%">
+                    </table>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>

@@ -5,6 +5,7 @@ namespace app\common\controller;
 use app\common\library\Auth;
 use think\Config;
 use think\Controller;
+use think\Db;
 use think\Hook;
 use think\Lang;
 use think\Loader;
@@ -111,6 +112,9 @@ class Frontend extends Controller
 
         // 配置信息后
         Hook::listen("config_init", $config);
+        // 友情链接
+        $link = Db::name('link')->select();
+        $this->assign('link',$link);
         // 加载当前控制器语言包
         $this->loadlang($controllername);
         $this->assign('site', $site);

@@ -2,7 +2,7 @@
 
 return array (
   'name' => '电子器件商城后台',
-  'beian' => '',
+  'beian' => '京ICP备17000000号',
   'cdnurl' => '',
   'version' => '1.0.1',
   'timezone' => 'Asia/Shanghai',

+<?php
+
+
+namespace app\index\controller;
+
+use app\common\controller\Frontend;
+
+class About extends Frontend
+{
+
+    protected $noNeedLogin = ['*'];
+    protected $noNeedRight = ['*'];
+
+    public function _initialize()
+    {
+        parent::_initialize(); // TODO: Change the autogenerated stub
+        $this->view->assign('is_search', 0);
+        $this->view->assign('is_active', 5);
+        $this->view->assign('title', '关于我们');
+    }
+
+    public function index() {
+        $about_model = new \app\index\model\About();
+        $about = $about_model->where('id',1)->find();
+        $this->view->assign('about',$about);
+        return $this->view->fetch();
+    }
+}
\ No newline at end of file

@@ -22,6 +22,14 @@ class Goods extends Frontend
     protected $noNeedLogin = ['*'];
     protected $noNeedRight = ['*'];
 
+    public function _initialize()
+    {
+        parent::_initialize(); // TODO: Change the autogenerated stub
+        $this->view->assign('is_search', 1);
+        $this->view->assign('is_active', 2);
+        $this->view->assign('title', '采购中心');
+    }
+
     /**
      * 采购中心页面
      * @return mixed

+<?php
+
+
+namespace app\index\controller;
+
+use app\common\controller\Frontend;
+
+class Helpbuy extends Frontend
+{
+
+    protected $noNeedLogin = ['*'];
+    protected $noNeedRight = ['*'];
+
+    public function _initialize()
+    {
+        parent::_initialize(); // TODO: Change the autogenerated stub
+        $this->view->assign('is_search', 0);
+        $this->view->assign('is_active', 3);
+        $this->view->assign('title', '帮买服务');
+    }
+
+    public function index() {
+        $helpbuy_model = new \app\index\model\Helpbuy();
+        $helpbuy = $helpbuy_model->where('id',1)->find();
+        $this->view->assign('helpbuy',$helpbuy);
+        return $this->view->fetch();
+    }
+}
\ No newline at end of file

+<?php
+
+
+namespace app\index\controller;
+
+use app\common\controller\Frontend;
+
+class Maintain extends Frontend
+{
+
+    protected $noNeedLogin = ['*'];
+    protected $noNeedRight = ['*'];
+
+    public function _initialize()
+    {
+        parent::_initialize(); // TODO: Change the autogenerated stub
+        $this->view->assign('is_search', 0);
+        $this->view->assign('is_active', 4);
+        $this->view->assign('title', '产品维修');
+    }
+
+    public function index() {
+        $maintain_model = new \app\index\model\Maintain();
+        $maintainer_model = new \app\index\model\Maintainer();
+        $maintain = $maintain_model->where('id',1)->find();
+        $maintainer = $maintainer_model->select();
+        $this->view->assign('maintain',$maintain);
+        $this->view->assign('maintainer',$maintainer);
+        return $this->view->fetch();
+    }
+}
\ No newline at end of file

+<?php
+
+
+namespace app\index\model;
+
+
+use think\Model;
+
+class About extends Model
+{
+
+}
\ No newline at end of file

+<?php
+
+
+namespace app\index\model;
+
+
+use think\Model;
+
+class Helpbuy extends Model
+{
+
+}
\ No newline at end of file

+<?php
+
+
+namespace app\index\model;
+
+use think\Model;
+
+class Maintain extends Model
+{
+
+}
\ No newline at end of file

+<?php
+
+
+namespace app\index\model;
+
+use think\Model;
+
+class Maintainer extends Model
+{
+
+}
\ No newline at end of file

+<!DOCTYPE html>
+<html lang="zh">
+{include file="public/head"}
+<style>
+    body{
+        background: rgba(249,249,249,1);
+    }
+    .content{
+        width: 100%;
+        font-size: 0;
+        background: rgba(249,249,249,1);
+    }
+    .content .titleImgContent{
+        width: 100%;
+        height: 146px;
+    }
+    .content .titleImgContent img{
+        width: 100%;
+        height: 100%;
+    }
+
+    /*富文本区域样式*/
+    .content .contentBox{
+        width: 100%;
+        font-size: 18px;
+        font-family: PingFang SC;
+        font-weight: 400;
+        line-height: 25px;
+        color: rgba(91,94,99,1);
+        background: rgba(249,249,249,1);
+    }
+    .content .contentBox .contentMain{
+        width: 1200px;
+        /*height: 975px;*/
+        padding: 25px 0 59px 0;
+        margin: 0 auto;
+    }
+
+    /*在线客服按钮样式*/
+    .rightButtons{
+        position: fixed;
+        width: 64px;
+        height: 65px;
+        top: 400px;
+        right: 0;
+        background: rgba(0,159,142,1);
+    }
+    .rightButtons a{
+        display: block;
+        width: 64px;
+        height: 64px;
+        text-align: center;
+        font-size: 12px;
+        font-family: PingFang SC;
+        font-weight:500;
+        color: rgba(255,255,255,1);
+    }
+    .rightButtons a img{
+        display: block;
+        margin: 10px auto 8px auto;
+    }
+</style>
+<body>
+{include file="public/header"}
+<!--主要内容-->
+<div class="content">
+    {include file="public/nav"}
+    <!--标题图片-->
+    <div class="titleImgContent">
+        <img src="__CDN__/assets/store/images/aboutUsImg.png" alt="img">
+    </div>
+
+    <!--富文本内容-->
+    <div class="contentBox">
+        <div class="contentMain">
+            {$about.content}
+        </div>
+    </div>
+</div>
+
+<!--右侧功能按钮-->
+<div class="rightButtons">
+    <a href="tencent://message/?uin={$site.service_qq}&Site=baidu.com&Menu=yes">
+        <img src="__CDN__/assets/store/images/onlineService.png" alt="onlineService">
+        在线客服
+    </a>
+</div>
+{include file="public/footer"}
+</body>
+</html>
\ No newline at end of file

@@ -332,28 +332,7 @@
 {include file="public/header"/}
 <!--主要内容-->
 <div class="content">
-    <div class="navBarBox">
-        <ul>
-            <li><a href="{:url('index/index')}">首页</a></li>
-            <li class="active"><a href="{:url('goods/index')}">采购中心</a></li>
-            <li><a href="">帮买服务</a></li>
-            <li><a href="">产品维修</a></li>
-            <li><a href="">关于我们</a></li>
-            <!--搜索框-->
-            <li class="searchBoxLi">
-                <div class="searchBox">
-                    <input id="searchVal" type="text" class="search" placeholder="请输入型号、参数查找元器件" />
-                    <span class="input-group-btn">
-                        <button class="btn" onclick="search()">
-                           <img src="__CDN__/assets/store/images/search_icon_top.png" alt="user">
-                           搜索
-                        </button>
-                    </span>
-                </div>
-            </li>
-        </ul>
-    </div>
-
+    {include file="public/nav"}
     <!--轮播图-->
     <div class="bannerBox">
         <div id="banner-container" class="swiper-container">

+<!DOCTYPE html>
+<html lang="zh">
+{include file="public/head"}
+<style>
+    body{
+        background: rgba(249,249,249,1);
+    }
+    .content{
+        width: 100%;
+        font-size: 0;
+        background: rgba(249,249,249,1);
+    }
+    .content .titleImgContent{
+        width: 100%;
+        height: 146px;
+    }
+    .content .titleImgContent img{
+        width: 100%;
+        height: 100%;
+    }
+
+    /*富文本区域样式*/
+    .content .contentBox{
+        width: 100%;
+        font-size: 18px;
+        font-family: PingFang SC;
+        font-weight: 400;
+        line-height: 25px;
+        color: rgba(91,94,99,1);
+        background: rgba(249,249,249,1);
+    }
+    .content .contentBox .contentMain{
+        width: 1200px;
+        /*height: 975px;*/
+        padding: 25px 0 59px 0;
+        margin: 0 auto;
+    }
+
+    /*在线客服按钮样式*/
+    .rightButtons{
+        position: fixed;
+        width: 64px;
+        height: 65px;
+        top: 400px;
+        right: 0;
+        background: rgba(0,159,142,1);
+    }
+    .rightButtons a{
+        display: block;
+        width: 64px;
+        height: 64px;
+        text-align: center;
+        font-size: 12px;
+        font-family: PingFang SC;
+        font-weight:500;
+        color: rgba(255,255,255,1);
+    }
+    .rightButtons a img{
+        display: block;
+        margin: 10px auto 8px auto;
+    }
+</style>
+<body>
+{include file="public/header"}
+<!--主要内容-->
+<div class="content">
+    {include file="public/nav"}
+    <!--标题图片-->
+    <div class="titleImgContent">
+        <img src="__CDN__/assets/store/images/helpBuyImg.png" alt="img">
+    </div>
+    <!--富文本内容-->
+    <div class="contentBox">
+        <div class="contentMain">
+            {$helpbuy.content}
+        </div>
+    </div>
+</div>
+
+<!--右侧功能按钮-->
+<div class="rightButtons">
+    <a href="tencent://message/?uin={$site.service_qq}&Site=baidu.com&Menu=yes">
+        <img src="__CDN__/assets/store/images/onlineService.png" alt="onlineService">
+        在线客服
+    </a>
+</div>
+{include file="public/footer"}
+</body>
+</html>
\ No newline at end of file

@@ -137,15 +137,15 @@
                 <img src="__CDN__/assets/store/images/shopping.png" alt="user">
                 采购中心
             </a>
-            <a href="helpBuy.html" class="btn btn-warning">
+            <a href="{:url('helpbuy/index')}" class="btn btn-warning">
                 <img src="__CDN__/assets/store/images/order.png" alt="user">
                 帮买服务
             </a>
-            <a href="productMaintenance.html" class="btn btn-warning">
+            <a href="{:url('maintain/index')}" class="btn btn-warning">
                 <img src="__CDN__/assets/store/images/repair.png" alt="user">
                 产品维修
             </a>
-            <a href="aboutUs.html" class="btn btn-warning">
+            <a href="{:url('about/index')}" class="btn btn-warning">
                 <img src="__CDN__/assets/store/images/aboutUs.png" alt="user">
                 关于我们
             </a>

+<!DOCTYPE html>
+<html lang="zh">
+{include file="public/head"}
+<style>
+    li{
+        list-style-type: none;
+    }
+    .content{
+        width: 100%;
+        font-size: 0;
+        background: rgba(249,249,249,1);
+    }
+    .content .titleImgContent{
+        width: 100%;
+        height: 146px;
+    }
+    .content .titleImgContent img{
+        width: 100%;
+        height: 100%;
+    }
+
+    /*主要内容区域样式*/
+    .content .contentBox{
+        width: 100%;
+        font-size: 18px;
+        font-family: PingFang SC;
+        font-weight: 400;
+        line-height: 25px;
+        color: rgba(91,94,99,1);
+        background: rgba(249,249,249,1);
+        margin-bottom: 193px;
+    }
+    .content .contentBox .workerShowBox{
+        width: 100%;
+        height: 306px;
+        margin-bottom: 12px;
+        background: rgba(255,255,255,1);
+    }
+    .content .contentBox .workerShowBox .workerShowMain{
+        width: 1200px;
+        height: 306px;
+        margin: 0 auto;
+    }
+    .content .contentBox .workerShowBox .workerShowMain .workerShowList{
+        position: relative;
+        height: 234px;
+    }
+    .content .contentBox .workerShowBox .workerShowMain .workerShowList .swiper-container{
+        width: 1100px;
+        height: 100%;
+    }
+    .content .contentBox .workerShowBox .workerShowMain .workerShowList .swiper-container .swiper-wrapper .swiper-slide{
+        padding: 0 5px;
+    }
+    .content .contentBox .workerShowBox .workerShowMain .workerShowList .swiper-container .swiper-wrapper .swiper-slide p{
+        width: 100%;
+        height: 20px;
+        line-height: 20px;
+        text-align: center;
+        margin-top: 10px;
+        font-size: 14px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: rgba(6,18,30,1);
+    }
+    .swiper-scrollbar{
+        height: 0!important;
+    }
+    .swiper-button-next, .swiper-button-prev{
+        width: 26px;
+        height: 26px;
+        background-size: 26px;
+        -webkit-background-size: 26px;
+    }
+    .swiper-button-next, .swiper-container-rtl .swiper-button-prev{
+        background-image: url("images/right_icon.png");
+    }
+    .swiper-button-prev, .swiper-container-rtl .swiper-button-next{
+        background-image: url("images/left_icon.png");
+    }
+
+    /*title样式*/
+    .titleBox{
+        width: 1200px;
+        height: 62px;
+        line-height: 62px;
+        margin-bottom: 10px;
+    }
+    .titleBox span:first-child{
+        display: inline-block;
+        float: left;
+        width: 6px;
+        height: 20px;
+        margin-top: 21px;
+        background: rgba(0,159,142,1);
+        border-radius: 2px;
+    }
+    .titleBox span:last-child{
+        height: 22px;
+        line-height: 22px;
+        float: left;
+        margin-top: 20px;
+        padding-left: 12px;
+        font-size: 16px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: rgba(0,159,142,1);
+    }
+
+    /*维修师傅详细介绍样式*/
+    .content .contentBox .personalShowBox{
+        width: 100%;
+        background: rgba(255,255,255,1);
+    }
+    .content .contentBox .personalShowBox .personalShowMain{
+        width: 1200px;
+        min-height: 100px;
+        margin: 0 auto;
+        padding-bottom: 50px;
+    }
+
+    /*在线客服按钮样式*/
+    .rightButtons{
+        position: fixed;
+        width: 64px;
+        top: 400px;
+        right: 0;
+        background: rgba(0,159,142,1);
+    }
+    .rightButtons span{
+        display: block;
+        width: 48px;
+        margin: 0 auto;
+        border-top: 1px solid rgba(255,255,255,1);
+    }
+    .rightButtons a{
+        display: block;
+        width: 64px;
+        height: 64px;
+        text-align: center;
+        font-size: 12px;
+        font-family: PingFang SC;
+        font-weight:500;
+        color: rgba(255,255,255,1);
+    }
+    .rightButtons a img{
+        display: block;
+        margin: 10px auto 8px auto;
+    }
+
+    /*我要维修弹窗样式*/
+    .modal-dialog{
+        width: 423px;
+        height: 709px;
+    }
+    .modal-header{
+        height: 80px;
+        border: 0;
+    }
+    .modal-body{
+        padding: 10px 24px 20px 24px;
+        max-height: none;
+    }
+    .modal-title{
+        height: 50px;
+        line-height: 50px;
+        text-align: center;
+        font-size: 20px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color: rgba(6,18,30,1);
+    }
+    form{
+        font-size: 14px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        color:rgba(61,68,77,1);
+    }
+    form .form-group{
+        width: 100%;
+        height: 54px;
+        margin: 0 0 12px 0;
+    }
+    form .desBox{
+        height: 124px;
+    }
+    form .form-group .form-control{
+        width: 100%;
+        height: 100%;
+        box-shadow: none;
+    }
+    form .form-group:nth-child(3),form .form-group:nth-child(5){
+        position: relative;
+    }
+    form .form-group:nth-child(3) span{
+        display: inline-block;
+        position: absolute;
+        top: 15px;
+        right: 20px;
+        font-size: 16px;
+        font-family: PingFang SC;
+        font-weight: 400;
+        color: rgba(140,145,152,1);
+    }
+    form .form-group:nth-child(5) span{
+        display: inline-block;
+        position: absolute;
+        top: 35px;
+        left: 12px;
+        font-size: 16px;
+        font-family: PingFang SC;
+        font-weight: 400;
+        line-height: 22px;
+        color: rgba(140,145,152,1);
+    }
+    form p{
+        height: 22px;
+        padding-left: 9px;
+        font-size: 16px;
+        font-family: PingFang SC;
+        font-weight: 500;
+        line-height: 22px;
+        color: rgba(6,18,30,1);
+    }
+    form button{
+        width: 100%;
+        height: 51px;
+        border: 0!important;
+        background: rgba(0,159,142,1)!important;
+        border-radius: 2px!important;
+        font-size: 18px!important;
+        font-family: PingFang SC;
+        font-weight: 400!important;
+        color: rgba(255,255,255,1)!important;
+    }
+    form .imgBox{
+        margin-bottom: 20px;
+    }
+
+    /*placeholser样式*/
+    :-moz-placeholder { /* Mozilla Firefox 4 to 18 */
+        font-size: 16px!important;
+        font-family: PingFang SC!important;
+        font-weight: 500!important;
+        color: rgba(6,18,30,1)!important;
+    }
+    ::-moz-placeholder { /* Mozilla Firefox 19+ */
+        font-size: 16px!important;
+        font-family: PingFang SC!important;
+        font-weight: 500!important;
+        color: rgba(6,18,30,1)!important;
+    }
+    input:-ms-input-placeholder, textarea:-ms-input-placeholder {
+        font-size: 16px!important;
+        font-family: PingFang SC!important;
+        font-weight: 500!important;
+        color: rgba(6,18,30,1)!important;
+    }
+    input::-webkit-input-placeholder, textarea::-webkit-input-placeholder {
+        font-size: 16px!important;
+        font-family: PingFang SC!important;
+        font-weight: 500!important;
+        color: rgba(6,18,30,1)!important;
+    }
+    /*上传图片重置*/
+    .imgFileUploade{
+        padding: 0 0 16px 0;
+    }
+</style>
+<body>
+{include file="public/header"}
+<!--主要内容-->
+<div class="content">
+    {include file="public/nav"}
+    <!--标题图片-->
+    <div class="titleImgContent">
+        <img src="__CDN__/assets/store/images/repairImg.png" alt="img">
+    </div>
+    <!--主要内容-->
+    <div class="contentBox">
+        <!--维修师傅展示-->
+        <div class="workerShowBox">
+            <div class="workerShowMain">
+                <div class="titleBox">
+                    <span></span>
+                    <span>维修师傅简介</span>
+                </div>
+                <div class="workerShowList">
+                    <div class="swiper-container">
+                        <div class="swiper-wrapper">
+                            {volist name="maintainer" id="vo"}
+                            <div class="swiper-slide">
+                                <img src="{$vo.thumbnail}" alt="img">
+                                <p>{$vo.name}</p>
+                            </div>
+                            {/volist}
+                        </div>
+                    </div>
+                    <!-- 如果需要导航按钮 -->
+                    <div class="swiper-button-prev"></div>
+                    <div class="swiper-button-next"></div>
+                </div>
+            </div>
+        </div>
+
+        <!--维修师傅个人介绍-->
+        <div class="personalShowBox">
+            <div class="personalShowMain">
+                <div class="titleBox">
+                    <span></span>
+                    <span>维修服务</span>
+                </div>
+                <div id="personalShowText">
+                    {$maintain.content}
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<!--右侧功能按钮-->
+<div class="rightButtons">
+    <a href="tencent://message/?uin={$site.service_qq}&Site=baidu.com&Menu=yes">
+        <img src="__CDN__/assets/store/images/onlineService.png" alt="onlineService">
+        在线客服
+    </a>
+    <span></span>
+    <a href="javascript:void(0);" onclick="showModel()">
+        <img src="__CDN__/assets/store/images/wrench_icon.png" alt="onlineService">
+        我要维修
+    </a>
+</div>
+
+<!--我要维修模态窗-->
+<div class="modal fade" id="repairInfoModal" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">
+                    <img src="__CDN__/assets/store/images/close_icon.png" alt="close">
+                </button>
+                <h4 class="modal-title" id="myModalLabel">
+                    我要维修
+                </h4>
+            </div>
+            <div class="modal-body">
+                <form>
+                    <div class="form-group">
+                        <input type="text" class="form-control" id="userName" placeholder="姓名">
+                    </div>
+                    <div class="form-group">
+                        <input type="text" class="form-control" id="phoneNum" placeholder="手机号">
+                    </div>
+                    <div class="form-group">
+                        <select id="address" class="form-control" placeholder="地址">
+                            <option>1</option>
+                            <option>2</option>
+                            <option>3</option>
+                            <option>4</option>
+                            <option>5</option>
+                        </select>
+                        <span>选择省/市/区</span>
+                    </div>
+                    <div class="form-group">
+                        <input type="text" class="form-control" id="addressDetail" placeholder="详细地址">
+                    </div>
+                    <div class="form-group desBox">
+                        <textarea  class="form-control" id="demandDes" placeholder="需求描述" onfocus="textareaFocus()" onblur="textareaBlur()"></textarea>
+                        <span id="textareaTips" onclick="textareaTipsClick()">告诉我们如何为你提供帮助</span>
+                    </div>
+                    <p>上传图片</p>
+                    <div class="uploadBox imgBox" style="width: 100%;height: 100px">
+                        <!--<img src="images/repairModalImg.png" alt="img">-->
+                    </div>
+                    <button type="button" class="btn btn-submit" onclick="sendRepairInfo()">发送</button>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>
+{include file="public/footer"}
+<script>
+    $(function () {
+        getPersonalIntroduction();
+        initSwiper();
+        initUploadImg();
+    });
+
+    //上传图片
+    function initUploadImg() {
+        var initUploadImg = new ImgUploadeFiles('.imgBox',function(e){
+            this.init({
+                MAX : 3, //限制个数
+                MH : 5800, //像素限制高度
+                MW : 5900, //像素限制宽度
+                callback : function(arr){
+                    console.log(arr)
+                }
+            });
+        });
+    }
+
+    //初始化swiper
+    function initSwiper() {
+        var mySwiper = new Swiper ('.swiper-container', {
+            loop: true,
+            slidesPerView: 6,
+            // 如果需要分页器
+            // pagination: '.swiper-pagination',
+            // 如果需要前进后退按钮
+            nextButton: '.swiper-button-next',
+            prevButton: '.swiper-button-prev',
+            // 如果需要滚动条
+            // scrollbar: '.swiper-scrollbar',
+        })
+    }
+
+    //我要维修
+    function showModel() {
+        $('#repairInfoModal').modal();
+    }
+
+    //发送维修信息
+    function sendRepairInfo() {
+
+    }
+
+    //文本域获得焦点
+    function textareaFocus() {
+        $('#textareaTips').hide();
+    }
+
+    //文本域失去焦点
+    function textareaBlur() {
+        if($('#demandDes').val() == ''){
+            $('#textareaTips').show();
+        }
+    }
+
+    //文本域提示点击
+    function textareaTipsClick() {
+        $('#demandDes').click();
+    }
+</script>
+</body>
+</html>
\ No newline at end of file

@@ -36,43 +36,17 @@
         <!--底部小导航-->
         <div class="bottomNav">
             <a href="{:url('index/index')}">首页</a>
-            <a href="purchasingCenter.html">采购中心</a>
-            <a href="helpBuy.html">帮买服务</a>
-            <a href="productMaintenance.html">产品维修</a>
-            <a href="aboutUs.html">关于我们</a>
+            <a href="{:url('goods/index')}">采购中心</a>
+            <a href="{:url('helpbuy/index')}">帮买服务</a>
+            <a href="{:url('maintain/index')}">产品维修</a>
+            <a href="{:url('about/index')}">关于我们</a>
         </div>
         <!--友链-->
         <div class="friendshipLinks">
-            <a href="">友情链接：</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站</a>
-            <a href="">友情链接：</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站名称</a>
-            <a href="">链接网站</a>
-            <a href="">友情链接申请QQ：(218908309)</a>
+            <a href="javascript:;">友情链接：</a>
+            {volist name="link" id="vo"}
+            <a href="{$vo.href}" target="_blank">{$vo.name}</a>
+            {/volist}
         </div>
         <!--分割线-->
         <div class="dividingLine">
@@ -80,7 +54,7 @@
         </div>
         <!--备案信息-->
         <div class="recordInfo">
-            ©2019 天津百荣科技有限公司 ALL RIGHTS RESERVED 京ICP备17000000号 增值电信业务经营许可证：京AC-255555555
+            ©2019 天津百荣科技有限公司 ALL RIGHTS RESERVED {$site.beian}
         </div>
     </div>
 </footer>
\ No newline at end of file

 <div class="navBarBox">
     <ul>
-        <li><a href="{:url('index/index')}">首页</a></li>
-        <li><a href="{:url('goods/index')}">采购中心</a></li>
-        <li><a href="">帮买服务</a></li>
-        <li><a href="">产品维修</a></li>
-        <li><a href="">关于我们</a></li>
+        <li class="{eq name='is_active' value='1'}active{/eq}"><a href="{:url('index/index')}">首页</a></li>
+        <li class="{eq name='is_active' value='2'}active{/eq}"><a href="{:url('goods/index')}">采购中心</a></li>
+        <li class="{eq name='is_active' value='3'}active{/eq}"><a href="{:url('helpbuy/index')}">帮买服务</a></li>
+        <li class="{eq name='is_active' value='4'}active{/eq}"><a href="{:url('maintain/index')}">产品维修</a></li>
+        <li class="{eq name='is_active' value='5'}active{/eq}"><a href="{:url('about/index')}">关于我们</a></li>
         {eq name="is_search" value="1"}
         <!--搜索框-->
         <li class="searchBoxLi">