diff --git a/app-ht/config/params.php b/app-ht/config/params.php
index ee76965..2041c72 100644
--- a/app-ht/config/params.php
+++ b/app-ht/config/params.php
@@ -3,5 +3,5 @@ return [
     'adminEmail'            => 'tech@jiwork.com',
     'DINGTALKL_URL'         => 'https://tdd.jiwork.com/', //在钉钉端用系统扫码之后跳转到钉钉对应的界面，里面要指定钉钉的网址
     'BAIDU_MAP_BROWSER_KEY' => 'UzLG5fpQtralY2hXO3wvVFzvlCmw6Rue',
-    'VERSION'               => 'v1.8.6 build 6',
+    'VERSION'               => 'v0.0.1 build 1',
 ];
\ No newline at end of file
diff --git a/app-ht/modules/manufacturer/controllers/ManufacturerController.php b/app-ht/modules/manufacturer/controllers/ManufacturerController.php
index 389ec13..19e2438 100644
--- a/app-ht/modules/manufacturer/controllers/ManufacturerController.php
+++ b/app-ht/modules/manufacturer/controllers/ManufacturerController.php
@@ -6,6 +6,7 @@ use Yii;
 use yii\data\Pagination;
 use domain\manufacturer\Manufacturer;
 use domain\manufacturer\ManufacturerRepository;
+use common\models\SysUser       as SysUserModel;
 use app\ht\controllers\BaseController;
 
 /**
@@ -116,9 +117,80 @@ class ManufacturerController extends BaseController
         } else {
             Yii::$app->session->setFlash('error', '添加失败');
         }
-        return $this->render('create');
+        $info = ManufacturerRepository::selectInfoById($result, true);
+
+        return $this->render('edit', ["isCreateSuccess" => true, "info" => $info]);
+    }
+
+    /**
+     * 编辑厂商
+     * @return string
+     */
+    public function actionEdit()
+    {
+        $manufacturerId = $this->request->get("mid");
+        $info = ManufacturerRepository::selectInfoById($manufacturerId, true);
+        return $this->render('edit', ["isCreateSuccess" => false, "info" => $info]);
     }
 
+    /**
+     * 创建厂商
+     * @return string
+     */
+    public function actionDoEdit()
+    {
+        $request = Yii::$app->request;
+        $name = $request->post("name");
+        $phone = $request->post("phone");
+        $username = $request->post("username");
+        $password = $request->post("password");
+        $mid = $request->post("mid");
+        if (empty($mid)) {
+            Yii::$app->session->setFlash('error', '厂商编号不能为空');
+            $params = $this->dataList(1);
+            return $this->render('index', $params);
+        }
+        $manufacturer = ManufacturerRepository::selectInfoById($mid,true);
+        if (empty($manufacturer)) {
+            Yii::$app->session->setFlash('error', '该厂商不存在');
+            $params = $this->dataList(1);
+            return $this->render('index', $params);
+        }
+        if (empty($name)) {
+            Yii::$app->session->setFlash('error', '厂商名称不能为空');
+            return $this->render('edit', ["isCreateSuccess" => false, "info" => $manufacturer]);
+        }
+        if (empty($phone)) {
+            Yii::$app->session->setFlash('error', '厂商电话不能为空');
+            return $this->render('edit', ["isCreateSuccess" => false, "info" => $manufacturer]);
+        }
+        if (empty($username)) {
+            Yii::$app->session->setFlash('error', '账号不能为空');
+            return $this->render('edit', ["isCreateSuccess" => false, "info" => $manufacturer]);
+        }
+        if (empty($password)) {
+            Yii::$app->session->setFlash('error', '密码不能为空');
+            return $this->render('edit', ["isCreateSuccess" => false, "info" => $manufacturer]);
+        }
+        if (isset($manufacturer["name"]) && $name != $manufacturer["name"]) {
+            if (ManufacturerRepository::findOne(["name" => $name])) {
+                Yii::$app->session->setFlash('error', '修改的用户名已经存在');
+                return $this->render('edit', ["isCreateSuccess" => false, "info" => $manufacturer]);
+            }
+            if (SysUserModel::findOne(["username" => $username])) {
+                Yii::$app->session->setFlash('error', '账号已经存在');
+                return $this->render('edit', ["isCreateSuccess" => false, "info" => $manufacturer]);
+            }
+        }
+        $result = Manufacturer::update($mid, $request->post());
+        if ($result) {
+            Yii::$app->session->setFlash('success', '编辑成功');
+        } else {
+            Yii::$app->session->setFlash('error', '编辑失败');
+        }
+        $manufacturer = ManufacturerRepository::selectInfoById($mid,true);
+        return $this->render('edit', ["isCreateSuccess" => false, "info" => $manufacturer]);
+    }
 
     /**
      * 删除商品
diff --git a/app-ht/modules/manufacturer/views/manufacturer/edit.php b/app-ht/modules/manufacturer/views/manufacturer/edit.php
new file mode 100644
index 0000000..43c1ded
--- /dev/null
+++ b/app-ht/modules/manufacturer/views/manufacturer/edit.php
@@ -0,0 +1,110 @@
+<?php
+
+use yii\helpers\Url;
+if ($isCreateSuccess) {
+    $this->title = '创建账号';
+} else {
+    $this->title = '编辑厂商';
+}
+$this->params['breadcrumbs'][] = '厂商管理';
+$this->params['breadcrumbs'][] = ['label' => '厂商管理', 'url' => ['/manufacturer/manufacturer/index']];
+$this->params['breadcrumbs'][] =  $this->title;
+
+?>
+
+<form action="<?php echo Url::toRoute(['/manufacturer/manufacturer/do-add']); ?>" name="myFrom" id="myFrom" method="post" enctype="multipart/form-data">
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <div style="margin-bottom: 15px;text-align: right;">
+                <a href="<?=Url::toRoute("/manufacturer/manufacturer/create")?>" class="btn btn-success"> + 创建厂商账号</a>
+            </div>
+            <div class="form-group col-sm-12" style="text-align: center">
+                <?php if ($isCreateSuccess) { ?>
+                <h3>厂商创建成功！</h3>
+                <?php } else { ?>
+                <h3>编辑厂商</h3>
+                <?php } ?>
+            </div>
+            <div class="form-group col-sm-12">
+                <label for="skillName" class="col-sm-4 control-label text-right">厂商名称：</label>
+                <div class="col-sm-4 text-left">
+                    <input type="text" value="<?= isset($info["name"]) ? $info["name"] : "" ?>" name="name" placeholder="请填写厂商名称"  class="form-control">
+                </div>
+            </div>
+            <div class="form-group col-sm-12">
+                <label for="skillName" class="col-sm-4 control-label text-right">厂商电话：</label>
+                <div class="col-sm-4 text-left">
+                    <input type="text" value="<?= isset($info["phone"]) ? $info["phone"] : "" ?>" name="phone" placeholder="请填写联系电话" class="form-control"  >
+                </div>
+            </div>
+            <div class="form-group col-sm-12">
+                <label for="skillName" class="col-sm-4 control-label text-right">账号：</label>
+                <div class="col-sm-4 text-left">
+                    <input type="text" value="<?= isset($info["username"]) ? $info["username"] : "" ?>" name="username" placeholder="请填写账号名称" class="form-control"  >
+                </div>
+            </div>
+            <div class="form-group col-sm-12">
+                <label for="skillName" class="col-sm-4 control-label text-right">密码：</label>
+                <div class="col-sm-4 text-left">
+                    <input type="password" value="1234567" name="password" placeholder="请填写密码" class="form-control"  >
+                </div>
+            </div>
+        </div>
+
+        <div class="panel-footer text-center">
+            <input type="hidden" value="<?= isset($info["id"]) ? $info["id"] : "" ?>" name="mid" class="form-control"">
+            <button type="button" class="btn btn-primary ladda-button" data-style="slide-up" id="save">确&nbsp;&nbsp;定</button>&nbsp;&nbsp;&nbsp;&nbsp;
+            <a class="btn btn-default" href="<?=Url::toRoute("/manufacturer/manufacturer/index")?>">返&nbsp;&nbsp;&nbsp;&nbsp;回</a>
+        </div>
+    </div>
+
+</form>
+
+<script>
+    // 表单提交验证
+    seajs.use("base/1.0.0/unit/validate/custom-1.0.0",function  () {
+        var validator = $("#myFrom").validate({
+            //debug:true,
+            rules: {
+            }
+        });
+    });
+
+    $("#save").bind("click", function () {
+        var getUrl = '<?=Url::toRoute("/manufacturer/manufacturer/do-edit")?>';
+        $('#myFrom').attr('action', getUrl);
+        var a = $("input[name='name']").val();
+        var b = $("input[name='phone']").val();
+        var c = $("input[name='username']").val();
+        var d = $("input[name='password']").val();
+        if (a == ""){
+            alert("用户名称不能为空");
+            return false;
+        }
+        if (!new RegExp("^0?(13|15|18|14|17)[0-9]{9}$").test(b)){
+            alert("请填写正确的手机号码");
+            return false;
+        }
+        if (c == ""){
+            alert("账号不能为空");
+            $("input[name='username']").focus();
+            return false;
+        }
+        if (d == ""){
+            alert("密码不能为空");
+            return false;
+        }
+        if (d.length < 7 || d.length > 20){
+            alert("密码应该在7位到20位之间");
+            return false;
+        }
+        var cb = $("#myFrom").validate().form();
+        if (!cb){
+            return;
+        }
+        var submit = $('#myFrom').submit();
+        var l = $.ladda(this);
+        l.start();
+        return false;
+    });
+</script>
\ No newline at end of file
diff --git a/app-ht/modules/manufacturer/views/manufacturer/index.php b/app-ht/modules/manufacturer/views/manufacturer/index.php
index 38e30cf..f354a41 100644
--- a/app-ht/modules/manufacturer/views/manufacturer/index.php
+++ b/app-ht/modules/manufacturer/views/manufacturer/index.php
@@ -70,8 +70,8 @@ $this->params['breadcrumbs'][] =  $this->title;
                         <td style="padding:12px;"><?= date("Y-m-d H:i:s", $item['created_at'])?></td>
                         <td style="padding:12px;">
                             <button class="btn btn-danger btn-sm btn_del" aid="<?=$item['id'] ?>">删除</button>&nbsp;|&nbsp;
-                            <button class="btn btn-info btn-sm btn_auth_success" aid="<?=$item['id'] ?>">编辑</button>  &nbsp;|&nbsp;
-                            <button class="btn btn-success btn-sm btn_auth_fail" aid="<?=$item['id'] ?>">查看</button>
+                            <a class="btn btn-info btn-sm btn_auth_success" href="<?=Url::toRoute(["/manufacturer/manufacturer/edit", "mid" => $item['id']])?>" aid="<?=$item['id'] ?>">编辑</a>  &nbsp;|&nbsp;
+                            <a class="btn btn-success btn-sm btn_auth_fail" href="<?=Url::toRoute(["/manufacturer/manufacturer/edit", "mid" => $item['id']])?>" aid="<?=$item['id'] ?>">查看</a>
                         </td>
                     </tr>
                 <?php endforeach; ?>
@@ -98,7 +98,7 @@ $this->params['breadcrumbs'][] =  $this->title;
 <script>
     $(document).ready(function () {
         $(".btn_del").bind("click",function () {
-            if (confirm("确定要删除商品吗？对应工程师商品列表中也会一并删除，请谨慎操作")){
+            if (confirm("确定要删除该厂商吗？对应厂商的登录账号也会一并删除，请谨慎操作")){
                 var data_id = $.trim($(this).attr("aid"));
                 if (data_id == null || data_id == ""){
                     alert("丢失参数，暂时无法删除，请刷新后再试");
diff --git a/domain/manufacturer/Manufacturer.php b/domain/manufacturer/Manufacturer.php
index b91e4b9..171d6c2 100644
--- a/domain/manufacturer/Manufacturer.php
+++ b/domain/manufacturer/Manufacturer.php
@@ -48,6 +48,7 @@ class Manufacturer
                 $saveResult = $profile->save();
             }
             if($saveResult) {
+                $saveResult = $manufacturerModel->id;
                 $transaction->commit();
             } else {
                 $transaction->rollBack();
@@ -55,7 +56,6 @@ class Manufacturer
             return $saveResult;
         } catch (Exception $e) {
             $transaction->rollBack();
-            var_dump($e->getTraceAsString());
             return false;
         }
     }
@@ -68,15 +68,27 @@ class Manufacturer
     static function update($id, $item)
     {
         $manufacturerModel = ManufacturerModel::findOne($id);
+        if (empty($manufacturerModel)) {
+            return false;
+        }
+        $sysUserModel = SysUserModel::findOne($manufacturerModel->sys_user_id);
+        if (empty($sysUserModel)) {
+            return false;
+        }
         if (isset($item['name']) && !empty($item['name'])) {
             $manufacturerModel->name = $item['name'];
         }
         if (isset($item['phone'])) {
             $manufacturerModel->phone = $item["phone"]; // 厂商电话
         }
+
         $manufacturerModel->save();
 
-        return $manufacturerModel;
+        $sysUserModel->username = $item['username'];
+        $sysUserModel->password = $item['password'];
+        $resultSave = $sysUserModel->save();
+
+        return $resultSave;
     }
 
     /**
diff --git a/domain/manufacturer/ManufacturerRepository.php b/domain/manufacturer/ManufacturerRepository.php
index 6aeea31..06a2ead 100644
--- a/domain/manufacturer/ManufacturerRepository.php
+++ b/domain/manufacturer/ManufacturerRepository.php
@@ -2,7 +2,7 @@
 
 namespace domain\manufacturer;
 
-use common\models\SysUser;
+use common\models\SysUser                   as SysUserModel;
 use domain\manufacturer\models\Manufacturer as ManufacturerModel;
 
 
@@ -27,7 +27,7 @@ class ManufacturerRepository
                                 "su.username",
                                 "su.password_hash"
                             ]);
-        $manufacturerFind->leftJoin(SysUser::tableName() . " su", "su.id = m.sys_user_id");
+        $manufacturerFind->leftJoin(SysUserModel::tableName() . " su", "su.id = m.sys_user_id");
 
         if (!empty($where)) {
             $manufacturerFind->where($where);
@@ -53,7 +53,7 @@ class ManufacturerRepository
     static function getPageCount($map = '')
     {
         $manufacturerFind = ManufacturerModel::find()->alias("m");
-        $manufacturerFind->leftJoin(SysUser::tableName() . " su", "su.id = m.sys_user_id");
+        $manufacturerFind->leftJoin(SysUserModel::tableName() . " su", "su.id = m.sys_user_id");
         if (!empty($map)) {
             $manufacturerFind->where($map);
         }
@@ -75,4 +75,37 @@ class ManufacturerRepository
         }
         return $manufacturer;
     }
+
+    /**
+     * @param $id
+     * @param bool|false $asArr
+     * @return null|static
+     */
+    static function selectInfoById($id, $asArr = false)
+    {
+        if (empty($id)) {
+            return $asArr ? [] : null;
+        }
+        $manufacturer = ManufacturerModel::find();
+        $manufacturer->alias("mf");
+        $manufacturer->select(["mf.*", "su.username"]);
+        $manufacturer->leftJoin(SysUser::tableName() . " su", "su.id = mf.sys_user_id");
+        $manufacturer->where("mf.id = " . $id);
+        if ($asArr && $manufacturer) {
+            $manufacturer = $manufacturer->asArray();
+        }
+        $resultData = $manufacturer->one();
+        return $resultData;
+    }
+
+    /**
+     * @param $id
+     * @param bool|false $asArr
+     * @return null|static
+     */
+    static function findOne($condition)
+    {
+        $manufacturer = ManufacturerModel::findOne($condition);
+        return $manufacturer;
+    }
 }
\ No newline at end of file
--
libgit2 0.21.0