From a1f2032a973319773fe8fbbda9218f39c83ad46f Mon Sep 17 00:00:00 2001 From: xu Date: Fri, 22 Nov 2019 14:15:09 +0800 Subject: [PATCH] app-api 1. U 删除部分冗余文件 app-ht 1. U 删除部分冗余文件 --- app-api/web/i/ic_first_order.png | Bin 106835 -> 0 bytes app-api/web/i/ic_gold.png | Bin 6044 -> 0 bytes app-api/web/i/ic_invoice_sample.jpg | Bin 70486 -> 0 bytes app-api/web/i/ic_silver.png | Bin 5281 -> 0 bytes app-api/web/i/login_bg.png | Bin 172511 -> 0 bytes app-api/web/i/stop.png | Bin 35633 -> 0 bytes app-ht/modules/system/controllers/AddressController.php | 134 -------------------------------------------------------------------------------------------------------------------------------------- app-ht/modules/system/controllers/AdministratorsController.php | 203 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- app-ht/modules/system/controllers/ConfigController.php | 172 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- app-ht/modules/system/views/administrators/index.php | 211 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- app-ht/modules/system/views/config/set_config.php | 78 ------------------------------------------------------------------------------ app-ht/modules/system/views/config/set_customer_service.php | 78 ------------------------------------------------------------------------------ app-ht/web/images/iphone-6-p.png | Bin 10077 -> 0 bytes app-ht/web/images/water_realname.png | Bin 13720 -> 0 bytes 14 files changed, 0 insertions(+), 876 deletions(-) delete mode 100644 app-api/web/i/ic_first_order.png delete mode 100644 app-api/web/i/ic_gold.png delete mode 100644 app-api/web/i/ic_invoice_sample.jpg delete mode 100644 app-api/web/i/ic_silver.png delete mode 100644 app-api/web/i/login_bg.png delete mode 100644 app-api/web/i/stop.png delete mode 100644 app-ht/modules/system/controllers/AddressController.php delete mode 100644 app-ht/modules/system/controllers/AdministratorsController.php delete mode 100644 app-ht/modules/system/controllers/ConfigController.php delete mode 100644 app-ht/modules/system/views/administrators/index.php delete mode 100644 app-ht/modules/system/views/config/set_config.php delete mode 100644 app-ht/modules/system/views/config/set_customer_service.php delete mode 100644 app-ht/web/images/iphone-6-p.png delete mode 100644 app-ht/web/images/water_realname.png diff --git a/app-api/web/i/ic_first_order.png b/app-api/web/i/ic_first_order.png deleted file mode 100644 index 11e9853..0000000 Binary files a/app-api/web/i/ic_first_order.png and /dev/null differ diff --git a/app-api/web/i/ic_gold.png b/app-api/web/i/ic_gold.png deleted file mode 100644 index 3868cfc..0000000 Binary files a/app-api/web/i/ic_gold.png and /dev/null differ diff --git a/app-api/web/i/ic_invoice_sample.jpg b/app-api/web/i/ic_invoice_sample.jpg deleted file mode 100644 index 7117a93..0000000 Binary files a/app-api/web/i/ic_invoice_sample.jpg and /dev/null differ diff --git a/app-api/web/i/ic_silver.png b/app-api/web/i/ic_silver.png deleted file mode 100644 index 576783a..0000000 Binary files a/app-api/web/i/ic_silver.png and /dev/null differ diff --git a/app-api/web/i/login_bg.png b/app-api/web/i/login_bg.png deleted file mode 100644 index 6b2403a..0000000 Binary files a/app-api/web/i/login_bg.png and /dev/null differ diff --git a/app-api/web/i/stop.png b/app-api/web/i/stop.png deleted file mode 100644 index d15dca2..0000000 Binary files a/app-api/web/i/stop.png and /dev/null differ diff --git a/app-ht/modules/system/controllers/AddressController.php b/app-ht/modules/system/controllers/AddressController.php deleted file mode 100644 index 9510c47..0000000 --- a/app-ht/modules/system/controllers/AddressController.php +++ /dev/null @@ -1,134 +0,0 @@ -request; - - $city = $request->get('city'); - $district = $request->get('district'); - $keyword = $request->get('keyword'); - $type = isset($_GET['type']) ? $_GET['type'] : null; - - /** - * 获取地址类型label - */ - $typeLables = AddressModel::typeLabels(); - - /** - * 查询过滤处理 - */ - $get = []; - $get['city'] = empty($city) ? "" : $city; - $get['district'] = empty($district) ? "" : $district; - $get['keyword'] = empty($keyword) ? "" : $keyword; - $get['type'] = ($type == "") ? null : $type; - - $query = AddressModel::find() - ->select('a.*, su.province, su.city, su.district') - ->from(AddressModel::tableName() . 'a') - ->orderBy('a.id DESC') - ->leftJoin(AddressProfileModel::tableName() . 'su', "a.id = su.address_id"); - - if (!empty($city)) { - $query->andWhere(['like', 'su.city', $city]); - } - if (!empty($district)) { - $query->andWhere(['like', 'su.district', $district]); - } - if (!empty($keyword)) { - $query->orWhere(['like', 'a.address', $keyword]); - $query->orWhere(['like', 'a.title', $keyword]); - $query->orWhere(['like', 'a.detail', $keyword]); - } - if ($get['type'] !== null) { - $query->andWhere(['=', 'a.type', $type]); - } - - /** - * 分页处理 - */ - $pageSize = $request->get("pageSize") ? (int)$request->get("pageSize") : 50; - $pages = new Pagination(['totalCount' => $query->count(), 'pageSize' => $pageSize]); - $query->offset($pages->offset)->limit($pages->limit)->all(); - $model = $query->asArray()->all(); - - return $this->render('index', array( - 'address' => $model, - 'pages' => $pages, - 'typeLables' => $typeLables, - 'gets' => $get - )); - } - - /** - * 地址详情页 - */ - public function actionUpdate($id) - { - $model = $this->findModel($id); - return $this->render('update', [ - 'model' => $model, - ]); - } - - /** - * 执行更新操作 - */ - public function actionDoUpdate() - { - $req = Yii::$app->request; - $id = (int)$req->post('id'); - $address = $req->post('address'); - $title = $req->post('title'); - $detail = $req->post('detail'); - $longitude = $req->post('longitude'); - $latitude = $req->post('latitude'); - - $model = $this->findModel($id); - $model->address = $address; - $model->detail = $detail; - $model->title = $title; - $model->longitude = $longitude; - $model->latitude = $latitude; - - $res = $model->save(); - if ($res) { - Yii::$app->session->setFlash('success', '保存地址成功'); - return $this->renderJson(array("status" => 1, "msg" => "操作成功")); - } else { - return $this->renderJson(array("status" => 0, "msg" => "操作失败")); - } - } - - /** - * 根据主键查找模型 - */ - protected function findModel($id) - { - $obj = Yii::createObject(AddressModel::className()); - if (($model = $obj::findOne($id)) !== null) { - return $model; - } else { - throw new NotFoundHttpException('访问页面不存在'); - } - } -} \ No newline at end of file diff --git a/app-ht/modules/system/controllers/AdministratorsController.php b/app-ht/modules/system/controllers/AdministratorsController.php deleted file mode 100644 index 8850c52..0000000 --- a/app-ht/modules/system/controllers/AdministratorsController.php +++ /dev/null @@ -1,203 +0,0 @@ -request; - $engineerName = $request->get('engineerName'); - $engineerPhone = $request->get('engineerPhone'); - - /** - * 查询过滤处理 - */ - $get = []; - $get['engineerName'] = empty($engineerName) ? "" : $engineerName; - $get['engineerPhone'] = empty($engineerPhone) ? "" : $engineerPhone; - - $query = EngineerAdministratorsModel::find() - ->alias("a") - ->select(['a.*', 'ep.nickname', 'e.phone','concat(ep.firstname, ep.lastname) as realname']) - ->leftJoin(EngineerModel::tableName() . ' e', "a.engineer_id = e.id") - ->leftJoin(EngineerProfileModel::tableName() . ' ep', "e.id = ep.engineer_id") - ->orderBy('a.id DESC'); - - if (!empty($engineerName)) { - $query->andWhere(['or', ['like', 'concat(ep.firstname, ep.lastname)', $engineerName], ['like', 'ep.nickname', $engineerName]]); - } - if (!empty($engineerPhone)) { - $query->andWhere(['like', 'e.phone', $engineerPhone]); - } - - /** - * 分页处理 - */ - $pageSize = $request->get("pageSize") ? (int)$request->get("pageSize") : 30; - $pages = new Pagination(['totalCount' => $query->count(), 'pageSize' => $pageSize]); - $dataList = $query->offset($pages->offset)->limit($pages->limit)->asArray()->all(); - return $this->render('index', array( - 'dataList' => $dataList, - 'pages' => $pages, - 'gets' => $get - )); - } - - /** - * 根据主键查找模型 - */ - protected function findModel($id) - { - $user = Yii::createObject(EngineerAdministratorsModel::className()); - if (($model = $user::findOne($id)) !== null) { - return $model; - } else { - throw new NotFoundHttpException('访问页面不存在'); - } - } - - /** - * is_order_notify 是否接收订单通知：0-否 1-是 - * 启用或禁用 - */ - public function actionEnableOrderNotify($id) - { - $model = $this->findModel($id); - $model->is_order_notify = ($model->is_order_notify == 1) ? 0 : 1; - $model->save(); - - Yii::$app->session->setFlash('success', '设置成功'); - - return $this->redirect(['index']); - } - - /** - * is_order_share 是否可以分享订单：0-否 1-是 - * 启用或禁用 - */ - public function actionEnableOrderShare($id) - { - $model = $this->findModel($id); - $model->is_order_share = ($model->is_order_share == 1) ? 0 : 1; - $model->save(); - - Yii::$app->session->setFlash('success', '设置成功'); - - return $this->redirect(['index']); - } - - /** - * is_cs_notify 是否可以接收客服通知：0-否 1-是 - * 启用或禁用 - */ - public function actionEnableCsNotify($id) - { - $model = $this->findModel($id); - $model->is_cs_notify = ($model->is_cs_notify == 1) ? 0 : 1; - $model->save(); - - Yii::$app->session->setFlash('success', '设置成功'); - - return $this->redirect(['index']); - } - - /** - * is_activity_notify 是否可以接收营销活动通知：0-否 1-是 - * 启用或禁用 - */ - public function actionEnableActivityNotify($id) - { - $model = $this->findModel($id); - $model->is_activity_notify = ($model->is_activity_notify == 1) ? 0 : 1; - $model->save(); - - Yii::$app->session->setFlash('success', '设置成功'); - - return $this->redirect(['index']); - } - - /** - * 删除工程师 - */ - public function actionDelete($id) - { - $result = EngineerAdministratorsModel::deleteAll(["id" => $id]); - - Yii::$app->session->setFlash('success', '删除成功'); - - return $this->redirect(['index']); - } - - /** - * 添加工程师 - */ - public function actionDoAdd() - { - $engineerId = Yii::$app->request->post("engineer_id"); - $engineer = Yii::$app->request->post("engineer"); - if ($engineerId) { - $hasExists = EngineerAdministratorsModel::findOne(["engineer_id" => $engineerId]); - if (empty($hasExists)) { - $addResult = EngineerAdministrators::Create(["engineer_id" => $engineerId]); - if ($addResult) { - Yii::$app->session->setFlash('success', '添加成功'); - } else { - Yii::$app->session->setFlash('error', '添加失败'); - } - } else { - Yii::$app->session->setFlash('error', "工程师($engineer)添加失败，因为之前已经添加"); - } - } else { - Yii::$app->session->setFlash('error', '添加失败'); - } - return $this->redirect(['index']); - } - - /** 搜索可收信息工程师 - * @return string - */ - public function actionSearchEngineer() - { - $e = new stdClass(); - $e->success = false; - $e->list = []; - $req = Yii::$app->request; - $keyword = $req->post('query'); - - $keyword = str_replace(array(" ", "　", "\t", "\n", "\r"), '', $keyword); - $engineerModel = EngineerModel::find(); - $engineerModel->leftJoin('engineer_profile', "engineer.id = engineer_profile.engineer_id"); - $engineerModel->select(['engineer.id as id', 'engineer.phone as phone', 'engineer_profile.nickname as nickname', 'concat(engineer_profile.firstname,engineer_profile.lastname) as name']); - if (!empty($keyword)) { - $engineerModel->where(['or', ['like', 'engineer.phone', $keyword], ['like', 'engineer_profile.nickname', $keyword], ['like', 'concat(engineer_profile.firstname,engineer_profile.lastname)', $keyword]]); - } - $engineerModel->andWhere(['engineer.subscribe' => 1]); - $engineerModel->andWhere("ifnull(engineer.phone,'') <> ''"); - $engineerModel->asArray(); - $engineerModel->limit(10); - $engineerList = $engineerModel->all(); - $e->success = true; - - $e->list = $engineerList; - return $this->renderJson($e); - } -} \ No newline at end of file diff --git a/app-ht/modules/system/controllers/ConfigController.php b/app-ht/modules/system/controllers/ConfigController.php deleted file mode 100644 index 1b3f78e..0000000 --- a/app-ht/modules/system/controllers/ConfigController.php +++ /dev/null @@ -1,172 +0,0 @@ -render('set_config', [ - 'model' => $datas['model'], - 'engineers' => $datas['engineers'], - 'selectedEngineers' => $datas['selectedEngineers'] - ]); - } - - /** - * 执行设置接收通知人员 - */ - public function actionDoSetConfig() - { - $post = Yii::$app->request->post(); - $setModel = SystemConfigModel::findOne(['config_key' => SystemConfigModel::APPEAL_NOTICE_MEMBERS]); - if (!empty($post['engineers'])) { - $phones = []; - foreach ($post['engineers'] as $engineerPhone) { - $phones[] = ['phone' => $engineerPhone]; - } - if ($phones) { - if (empty($setModel)) { - $setModel = new SystemConfigModel(); - $setModel->config_key = SystemConfigModel::APPEAL_NOTICE_MEMBERS; - } - $setModel->values = json_encode($phones); - $setModel->updated_at = time(); - if ($setModel->save()) { - Yii::$app->session->setFlash('success', '设置成功'); - } else { - Yii::$app->session->setFlash('error', '设置失败'); - } - } - } - - $datas = self::getData(); - - return $this->render('set_config', [ - 'model' => $datas['model'], - 'engineers' => $datas['engineers'], - 'selectedEngineers' => $datas['selectedEngineers'] - ]); - } - - /** - * 设置接收通知人员 - */ - public function actionSetCustomerService() - { - $datas = self::getSysUserData(); - - return $this->render('set_customer_service', [ - 'model' => $datas['model'], - 'customers' => $datas['customers'], - 'selectedCustomers' => $datas['selectedCustomers'] - ]); - } - - /** - * 执行设置客服人员 - */ - public function actionDoSetCustomerService() - { - $post = Yii::$app->request->post(); - $setModel = SystemConfigModel::findOne(['config_key' => SystemConfigModel::DISPATCH_CUSTOMER_SERVICE]); - if (!empty($post['customers'])) { - $phones = []; - foreach ($post['customers'] as $customerID) { - $phones[] = ['sys_user_id' => $customerID]; - } - if ($phones) { - if (empty($setModel)) { - $setModel = new SystemConfigModel(); - $setModel->config_key = SystemConfigModel::DISPATCH_CUSTOMER_SERVICE; - } - $setModel->values = json_encode($phones); - $setModel->updated_at = time(); - if ($setModel->save()) { - Yii::$app->session->setFlash('success', '设置成功'); - } else { - Yii::$app->session->setFlash('error', '设置失败'); - } - } - } - - $datas = self::getSysUserData(); - - return $this->render('set_customer_service', [ - 'model' => $datas['model'], - 'customers' => $datas['customers'], - 'selectedCustomers' => $datas['selectedCustomers'] - ]); - } - - /** - * 获取数据 - * @return array - */ - private function getData() - { - $model = SystemConfigModel::findOne(['config_key' => SystemConfigModel::APPEAL_NOTICE_MEMBERS]); - - $selectedEngineers = isset($model->values) && $model->values ? json_decode($model->values, true) : []; - $selectPhones=[]; - foreach ($selectedEngineers as $e) { - $selectPhones[] = $e['phone']; - } - $selectedEngineers = $selectPhones; - $engineerModel = EngineerModel::find(); - $engineerModel->alias("e"); - $engineerModel->select(["e.phone", "ep.nickname", "concat(firstname, lastname) as realname"]); - $engineerModel->leftJoin("engineer_profile ep", "e.id = ep.engineer_id"); - $engineerModel->where("phone <> ''"); - $engineerModel->andWhere(['e.role' => EngineerRole::getAdminAppealNoticeRoles()]); - $engineerModel->asArray(); - $engineers = $engineerModel->all(); - - return [ - 'model' => $model, - 'engineers' => $engineers, - 'selectedEngineers' => $selectedEngineers - ]; - } - - /** - * 获取数据 - * @return array - */ - private function getSysUserData() - { - $model = SystemConfigModel::findOne(['config_key' => SystemConfigModel::DISPATCH_CUSTOMER_SERVICE]); - - $selectedCustomers = isset($model->values) && $model->values ? json_decode($model->values, true) : []; - $selectSysUsers=[]; - foreach ($selectedCustomers as $e) { - $selectSysUsers[] = $e['sys_user_id']; - } - $selectedSysUsers = $selectSysUsers; - $customers = SysUserModel::find() - ->alias("su") - ->select(["sup.mobile", "sup.realname", "su.id as sys_user_id", "su.username"]) - ->leftJoin("sys_user_profile sup", "su.id = sup.sys_user_id") - ->asArray()->all(); - - return [ - 'model' => $model, - 'customers' => $customers, - 'selectedCustomers' => $selectedSysUsers - ]; - } -} \ No newline at end of file diff --git a/app-ht/modules/system/views/administrators/index.php b/app-ht/modules/system/views/administrators/index.php deleted file mode 100644 index cc1c3d7..0000000 --- a/app-ht/modules/system/views/administrators/index.php +++ /dev/null @@ -1,211 +0,0 @@ -title = "设置收信息工程师"; -$this->params['breadcrumbs'][] = '系统管理'; -$this->params['breadcrumbs'][] = $this->title; - -CssFiles::register($this, 'exts/base/1.0.0/ui/switch/switch-1.0.0.css'); -CssFiles::register($this, 'exts/base/1.0.0/ui/select2/select2-1.0.0.css'); -CssFiles::register($this, 'exts/base/1.0.0/ui/select2/select2-bootstrap-1.0.0.css'); - -?> - - - -
-
-
- - - - - - - - -
- 可接收信息工程师： - - - - -      - 重    置 -
-
-
-
-
-
-
- - - - - - - - - - -
- 工程师姓名： - - " placeholder="请录入工程师名称"/> - - 手机号码： - - " placeholder="请录入工程师手机"/> - -      - 重    置 -
-
-
-
-
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - -
ID工程师信息是否接收订单通知是否可以分享订单是否可以接收客服通知是否可以接收营销活动通知添加时间操作
- 昵称：
- 真实姓名：
- 手机号码：
- 		- data-id="" /> - - data-id=""/> - - data-id=""/> - - data-id=""/> - - - -
- - -
-
-
- -

- 没有找到数据 -

- -
- -
-
- $pages, - ]); ?> -
-
-
-
- - \ No newline at end of file diff --git a/app-ht/modules/system/views/config/set_config.php b/app-ht/modules/system/views/config/set_config.php deleted file mode 100644 index 3ca60c0..0000000 --- a/app-ht/modules/system/views/config/set_config.php +++ /dev/null @@ -1,78 +0,0 @@ -title = "设置申述通知人员"; -$this->params['breadcrumbs'][] = '系统管理'; -$this->params['breadcrumbs'][] = $this->title; - -CssFiles::register($this, 'exts/base/1.0.0/ui/select2/select2-1.0.0.css'); -CssFiles::register($this, 'exts/base/1.0.0/ui/select2/select2-bootstrap-1.0.0.css'); - -?> - - - -
-
-
-

设置申述通知人员

-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- 通知人员： - - -
-      - 重    置 -
-
- -
- -
- - - \ No newline at end of file diff --git a/app-ht/modules/system/views/config/set_customer_service.php b/app-ht/modules/system/views/config/set_customer_service.php deleted file mode 100644 index ecd2675..0000000 --- a/app-ht/modules/system/views/config/set_customer_service.php +++ /dev/null @@ -1,78 +0,0 @@ -title = "设置客服人员"; -$this->params['breadcrumbs'][] = '系统管理'; -$this->params['breadcrumbs'][] = $this->title; - -CssFiles::register($this, 'exts/base/1.0.0/ui/select2/select2-1.0.0.css'); -CssFiles::register($this, 'exts/base/1.0.0/ui/select2/select2-bootstrap-1.0.0.css'); - -?> - - - -
-
-
-

设置客服人员

-
-
- - - - - - - - - - - - - - - - - - - - - - - - -
- 客服人员： - - -
-      - 重    置 -
-
- -
- -
- - - \ No newline at end of file diff --git a/app-ht/web/images/iphone-6-p.png b/app-ht/web/images/iphone-6-p.png deleted file mode 100644 index 6621870..0000000 Binary files a/app-ht/web/images/iphone-6-p.png and /dev/null differ diff --git a/app-ht/web/images/water_realname.png b/app-ht/web/images/water_realname.png deleted file mode 100644 index 1feee90..0000000 Binary files a/app-ht/web/images/water_realname.png and /dev/null differ -- libgit2 0.21.0