app-ht(v0.0.1 build 4)

1. A增加维修厂地址 2. A 删除多余的icon

app-ht(v0.0.1 build 4)
1. A增加维修厂地址 2. A 删除多余的icon
xu
1 parent da06162f
Showing 6 changed files with 11 additions and 6 deletions Show diff stats
app-ht/config/params.php
app-ht/modules/maintainer/controllers/UserController.php
app-ht/modules/maintainer/views/user/info.php
app-ht/views/layouts/iframe.php
app-ht/views/layouts/login.php
app-ht/views/layouts/main.php
 <?php
 return [
-    'VERSION'             => 'v0.0.1 build 3',
+    'VERSION'             => 'v0.0.1 build 4',
 ];
 \ No newline at end of file
@@ -120,6 +120,7 @@ class UserController extends BaseController
             'username'      => $userModel->user_name,
             'name'          => $userModel->name,
             'status'        => $userModel->status,
+            'address'       => $userProfile->address,
             'status_label'  => User::getStatusLabels($userModel->status),
             'emergencyContact' => $userProfile->emergency_contact,
             'emergencyPerson' => $userProfile->emergency_person,
@@ -50,10 +50,14 @@ $this-&gt;params[&#39;breadcrumbs&#39;][] =  $this-&gt;title;
             </tr>
             <tr>
                 <th>紧急联系人</th>
-                <td><?=$user['emergencyContact']; ?></td>
+                <td><?=$user['emergencyPerson']; ?></td>
  
                 <th>紧急联系电话</th>
-                <td><?=$user['emergencyPerson']; ?></td>
+                <td><?=$user['emergencyContact']; ?></td>
+            </tr>
+            <tr>
+                <th>维修厂地址</th>
+                <td colspan="3"><?=$user['address']; ?></td>
             </tr>
             <tr>
                 <th>营业执照</th>
@@ -22,7 +22,7 @@ function isShowContentHeader(View $view)
 <!DOCTYPE html>
 <html lang="<?= Yii::$app->language ?>">
 <head>
-    <link rel="shortcut icon" href="<?=$baseUrl?>/favicon.ico" />
+
     <meta charset="<?= Yii::$app->charset ?>">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -13,7 +13,7 @@ AppAsset::register($this);
     <!DOCTYPE html>
     <html lang="<?= Yii::$app->language ?>">
     <head>
-        <link rel="shortcut icon" href="<?=Yii::$app->request->baseUrl?>/favicon.ico" />
+
         <meta charset="<?= Yii::$app->charset ?>">
         <meta http-equiv="X-UA-Compatible" content="IE=edge">
         <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -13,7 +13,7 @@ $appendTimestamp = Yii::$app-&gt;assetManager-&gt;appendTimestamp;
 <!DOCTYPE html>
 <html lang="<?= Yii::$app->language ?>">
 <head>
-    <link rel="shortcut icon" href="<?=$baseUrl?>/favicon.ico" />
+
     <meta charset="<?= Yii::$app->charset ?>">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta http-equiv="Expires" content="0">
1	1	<?php
2	2	return [
3		- 'VERSION' => 'v0.0.1 build 3',
	3	+ 'VERSION' => 'v0.0.1 build 4',
4	4	];
5	5	\ No newline at end of file
...	...
...	...	@@ -120,6 +120,7 @@ class UserController extends BaseController
120	120	'username' => $userModel->user_name,
121	121	'name' => $userModel->name,
122	122	'status' => $userModel->status,
	123	+ 'address' => $userProfile->address,
123	124	'status_label' => User::getStatusLabels($userModel->status),
124	125	'emergencyContact' => $userProfile->emergency_contact,
125	126	'emergencyPerson' => $userProfile->emergency_person,
...	...
...	...	@@ -50,10 +50,14 @@ $this->params['breadcrumbs'][] = $this->title;
50	50	</tr>
51	51	<tr>
52	52	<th>紧急联系人</th>
53		- <td><?=$user['emergencyContact']; ?></td>
	53	+ <td><?=$user['emergencyPerson']; ?></td>
54	54
55	55	<th>紧急联系电话</th>
56		- <td><?=$user['emergencyPerson']; ?></td>
	56	+ <td><?=$user['emergencyContact']; ?></td>
	57	+ </tr>
	58	+ <tr>
	59	+ <th>维修厂地址</th>
	60	+ <td colspan="3"><?=$user['address']; ?></td>
57	61	</tr>
58	62	<tr>
59	63	<th>营业执照</th>
...	...
...	...	@@ -22,7 +22,7 @@ function isShowContentHeader(View $view)
22	22	<!DOCTYPE html>
23	23	<html lang="<?= Yii::$app->language ?>">
24	24	<head>
25		- <link rel="shortcut icon" href="<?=$baseUrl?>/favicon.ico" />
	25	+
26	26	<meta charset="<?= Yii::$app->charset ?>">
27	27	<meta http-equiv="X-UA-Compatible" content="IE=edge">
28	28	<meta name="viewport" content="width=device-width, initial-scale=1">
...	...
...	...	@@ -13,7 +13,7 @@ AppAsset::register($this);
13	13	<!DOCTYPE html>
14	14	<html lang="<?= Yii::$app->language ?>">
15	15	<head>
16		- <link rel="shortcut icon" href="<?=Yii::$app->request->baseUrl?>/favicon.ico" />
	16	+
17	17	<meta charset="<?= Yii::$app->charset ?>">
18	18	<meta http-equiv="X-UA-Compatible" content="IE=edge">
19	19	<meta name="viewport" content="width=device-width, initial-scale=1">
...	...
...	...	@@ -13,7 +13,7 @@ $appendTimestamp = Yii::$app->assetManager->appendTimestamp;
13	13	<!DOCTYPE html>
14	14	<html lang="<?= Yii::$app->language ?>">
15	15	<head>
16		- <link rel="shortcut icon" href="<?=$baseUrl?>/favicon.ico" />
	16	+
17	17	<meta charset="<?= Yii::$app->charset ?>">
18	18	<meta http-equiv="X-UA-Compatible" content="IE=edge">
19	19	<meta http-equiv="Expires" content="0">
...	...