fe / yoho-activity-platform · Commits

Go to a project

Authored by 陈峰
Commit ea61bdce95b032a2ab607f48e5335a4be333051d 2 parents aadaf86a a3cd4e36

Merge branch 'feature/platform-admin' into 'master' 

process.json



See merge request !4
Inline Side-by-side
Showing 6 changed files with 9 additions and 8 deletions
... ... @@ -11,8 +11,8 @@
<link rel="stylesheet" media="all" href="//{{devHost}}:5001/common.css?t={{startTime}}">
<link rel="stylesheet" media="all" href="//{{devHost}}:5001/{{module}}.{{page}}.css?t={{startTime}}">
{{^}}
<link rel="stylesheet" media="all" href="/yoho-activity-platform/{{version}}/common.css?t={{startTime}}">
<link rel="stylesheet" media="all" href="/yoho-activity-platform/{{version}}/{{module}}.{{page}}.css?t={{startTime}}">
<link rel="stylesheet" media="all" href="/yoho-activity-platform/{{version}}/css/common.css?t={{startTime}}">
<link rel="stylesheet" media="all" href="/yoho-activity-platform/{{version}}/css/{{module}}.{{page}}.css?t={{startTime}}">
{{/if}}
</head>
... ... @@ -50,7 +50,7 @@
<script src="//{{devHost}}:5001/{{module}}.{{page}}.js"></script>
{{^}}
<script src="/yoho-activity-platform/{{version}}/libs.js?t={{startTime}}"></script>
<script src="/yoho-activity-platform/{{version}}/{{module}}.{{page}}.js?t={{startTime}}"></script>
<script src="/yoho-activity-platform/{{version}}/js/{{module}}.{{page}}.js?t={{startTime}}"></script>
{{/if}}
</body>
</html>
... ...
... ... @@ -11,7 +11,7 @@
<link rel="stylesheet" media="all" href="//{{devHost}}:5001/common.css?t={{startTime}}">
{{^}}
<link rel="stylesheet" media="all"
href="/yoho-activity-platform/{{version}}/common.css?t={{startTime}}">
href="/yoho-activity-platform/{{version}}/css/common.css?t={{startTime}}">
{{/if}}
</head>
<body class="nav-md">
... ...
... ... @@ -11,7 +11,7 @@
<link rel="stylesheet" media="all" href="//{{devHost}}:5001/common.css?t={{startTime}}">
{{^}}
<link rel="stylesheet" media="all"
href="/yoho-activity-platform/{{version}}/common.css?t={{startTime}}">
href="/yoho-activity-platform/{{version}}/css/common.css?t={{startTime}}">
{{/if}}
</head>
<body class="nav-md">
... ...
... ... @@ -11,7 +11,7 @@
<link rel="stylesheet" media="all" href="//{{devHost}}:5001/common.css?t={{startTime}}">
{{^}}
<link rel="stylesheet" media="all"
href="/yoho-activity-platform/{{version}}/common.css?t={{startTime}}">
href="/yoho-activity-platform/{{version}}/css/common.css?t={{startTime}}">
{{/if}}
</head>
<body class="nav-md">
... ...
... ... @@ -23,7 +23,7 @@
<div class="col-md-3 left_col">
<div class="left_col scroll-view">
<div class="navbar nav_title" style="border: 0;">
<a class="site_title"><i class="fa fa-paw"></i> <span>YOHO!活动平台</span></a>
<a class="site_title"><span>YOHO!活动平台</span></a>
</div>
<div class="clearfix"></div>
... ...
... ... @@ -17,7 +17,8 @@
"migration-script": "node ./build/migration/update.js --script",
"migration": "node ./build/migration/update.js",
"lint-js": "lint-js",
"precommit": "lint-commit"
"precommit": "lint-commit",
"publish": "npm run build && pm2 start process.json"
},
"config": {
"lintJs": [
... ...