From 0c66182b6e11ed4f6c5b4dcfdb279c4162772a41 Mon Sep 17 00:00:00 2001 From: wangkesi Date: Fri, 12 Oct 2018 11:03:29 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build/dev-server.js | 117 ++++++++++++++++++------------------ src/view/goods-classify.vue | 21 ++++--- src/view/home.vue | 25 ++++---- 3 files changed, 84 insertions(+), 79 deletions(-) diff --git a/build/dev-server.js b/build/dev-server.js index 782dc6f..553c4f2 100644 --- a/build/dev-server.js +++ b/build/dev-server.js @@ -1,89 +1,92 @@ -require('./check-versions')() +require("./check-versions")(); -var config = require('../config') +var config = require("../config"); if (!process.env.NODE_ENV) { - process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV) + process.env.NODE_ENV = JSON.parse(config.dev.env.NODE_ENV); } -var opn = require('opn') -var path = require('path') -var express = require('express') -var webpack = require('webpack') -var proxyMiddleware = require('http-proxy-middleware') -var webpackConfig = require('./webpack.dev.conf') +var opn = require("opn"); +var path = require("path"); +var express = require("express"); +var webpack = require("webpack"); +var proxyMiddleware = require("http-proxy-middleware"); +var webpackConfig = require("./webpack.dev.conf"); // default port where dev server listens for incoming traffic -var port = process.env.PORT || config.dev.port +var port = process.env.PORT || config.dev.port; // automatically open browser, if not set will be false -var autoOpenBrowser = !!config.dev.autoOpenBrowser +var autoOpenBrowser = !!config.dev.autoOpenBrowser; // Define HTTP proxies to your custom API backend // https://github.com/chimurai/http-proxy-middleware -var proxyTable = config.dev.proxyTable +var proxyTable = config.dev.proxyTable; -var app = express() -var compiler = webpack(webpackConfig) +var app = express(); +var compiler = webpack(webpackConfig); -var devMiddleware = require('webpack-dev-middleware')(compiler, { - publicPath: webpackConfig.output.publicPath, - quiet: true -}) +var devMiddleware = require("webpack-dev-middleware")(compiler, { + publicPath: webpackConfig.output.publicPath, + quiet: true +}); -var hotMiddleware = require('webpack-hot-middleware')(compiler, { - log: () => {} -}) +var hotMiddleware = require("webpack-hot-middleware")(compiler, { + log: () => {} +}); // force page reload when html-webpack-plugin template changes -compiler.plugin('compilation', function (compilation) { - compilation.plugin('html-webpack-plugin-after-emit', function (data, cb) { - hotMiddleware.publish({ action: 'reload' }) - cb() - }) -}) +compiler.plugin("compilation", function(compilation) { + compilation.plugin("html-webpack-plugin-after-emit", function(data, cb) { + hotMiddleware.publish({ action: "reload" }); + cb(); + }); +}); // proxy api requests -Object.keys(proxyTable).forEach(function (context) { - var options = proxyTable[context] - if (typeof options === 'string') { - options = { target: options } - } - app.use(proxyMiddleware(options.filter || context, options)) -}) +Object.keys(proxyTable).forEach(function(context) { + var options = proxyTable[context]; + if (typeof options === "string") { + options = { target: options }; + } + app.use(proxyMiddleware(options.filter || context, options)); +}); // handle fallback for HTML5 history API -app.use(require('connect-history-api-fallback')()) +app.use(require("connect-history-api-fallback")()); // serve webpack bundle output -app.use(devMiddleware) +app.use(devMiddleware); // enable hot-reload and state-preserving // compilation error display -app.use(hotMiddleware) +app.use(hotMiddleware); // serve pure static assets -var staticPath = path.posix.join(config.dev.assetsPublicPath, config.dev.assetsSubDirectory) -app.use(staticPath, express.static('./static')) +var staticPath = path.posix.join( + config.dev.assetsPublicPath, + config.dev.assetsSubDirectory +); +app.use(staticPath, express.static("./static")); -var uri = 'http://localhost:' + port +var uri = "http://localhost:" + port; -var _resolve +var _resolve; var readyPromise = new Promise(resolve => { - _resolve = resolve -}) + _resolve = resolve; +}); -console.log('> Starting dev server...') +console.log("> Starting dev server..."); devMiddleware.waitUntilValid(() => { - console.log('> Listening at ' + uri + '\n') - // when env is testing, don't need open it - if (autoOpenBrowser && process.env.NODE_ENV !== 'testing') { - opn(uri) - } - _resolve() -}) + console.log("> Listening at " + uri + "\n"); + // when env is testing, don't need open it + if (autoOpenBrowser && process.env.NODE_ENV !== "testing") { + opn(uri); + } + _resolve(); +}); -var server = app.listen(port) +var server = app.listen(port, "0.0.0.0"); module.exports = { - ready: readyPromise, - close: () => { - server.close() - } -} + ready: readyPromise, + close: () => { + server.close(); + } +}; diff --git a/src/view/goods-classify.vue b/src/view/goods-classify.vue index 91a9b42..e95993f 100644 --- a/src/view/goods-classify.vue +++ b/src/view/goods-classify.vue @@ -288,11 +288,13 @@ export default { } .ellipsis { overflow: hidden; + line-height: 1.1; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; word-wrap: break-word; - height: 0.32rem; + // height: 0.32rem; + // padding-top:0.01rem; white-space: normal; word-break: break-all; } @@ -411,29 +413,30 @@ export default { flex-direction: column; } .title { - font-size: 0.31rem; + font-size: 0.3rem; color: #333; width: 100%; padding: 0; - height: 0.3rem; - line-height: 0.3rem; - padding-top: 0.03rem; + // height: 0.3rem; + // line-height: 0.3rem; + // padding-top: 0.03rem; } .rule { font-size: 0.22rem; color: #999; width: 100%; - padding: 0.1rem 0 0; - height: 0.22rem; + // padding: 0.1rem 0 0; + // height: 0.22rem; overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; word-wrap: break-word; - margin-top: 0.16rem; + // margin-top: 0.16rem; + margin-top: 0.1rem; white-space: normal; word-break: break-all; - line-height: 1; + // line-height: 1; } .full { height: 0.2rem; diff --git a/src/view/home.vue b/src/view/home.vue index 71b81a0..8553c2d 100644 --- a/src/view/home.vue +++ b/src/view/home.vue @@ -483,34 +483,33 @@ export default { .home .page-content .new-card .card-list li .right h3 { font-size: 0.33rem; font-weight: 400; - padding-top: 0.03rem; - height: 0.3rem; + padding-top: 0.03rem; + line-height: 1.2; color: rgba(51, 51, 51, 1); margin-bottom: 0.13rem; text-overflow: ellipsis; overflow: hidden; - display: -webkit-box; - white-space: normal; + display: -webkit-box; + white-space: normal; word-break: break-all; -webkit-box-orient: vertical; -webkit-line-clamp: 1; - line-height: 1; word-wrap: break-word; } .home .page-content .new-card .card-list li .right .text { - font-size: 0.24rem; - height: 0.24rem; + font-size: 0.24rem; + height: 0.24rem; font-weight: 400; line-height: 1; color: rgba(153, 153, 153, 1); - margin-bottom: 0.16rem; - text-overflow: ellipsis; + margin-bottom: 0.16rem; + text-overflow: ellipsis; overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; - word-wrap: break-word; - white-space: normal; + word-wrap: break-word; + white-space: normal; word-break: break-all; } .home .page-content .new-card .card-list li .right .card-name { @@ -522,8 +521,8 @@ export default { text-overflow: ellipsis; overflow: hidden; display: -webkit-box; - -webkit-box-orient: vertical; - white-space: normal; + -webkit-box-orient: vertical; + white-space: normal; word-break: break-all; -webkit-line-clamp: 1; word-wrap: break-word;