Skip to content

肖康 / cloudSystem

Go to a project
Commit 5f081d86 by liangjianmin
Options

js

parents df2859e4 15551653
Expand all
Inline Side-by-side
Showing with 17 additions and 10 deletions
src/ajax/index.js
......@@ -15,7 +15,7 @@ export let NODE_ENVS = "/";
switch (envs) {
case 'development':
//开发环境
NODE_ENVS = 'http://192.168.2.164:8080';
NODE_ENVS = 'http://192.168.2.251:8080';
break;
case 'test':
//测试环境
......
src/assets/css/list/inquireDetail.less
......@@ -71,7 +71,7 @@
.quote {
position: relative;
padding-top: 20px;
padding-right: 17px;
padding-left: 17px;
background: #FFFFFF;
......@@ -151,6 +151,7 @@
padding-top: 3px;
padding-bottom: 20px;
padding-left: 17px;
padding-right: 17px;
background: #FFFFFF;
.ic {
......@@ -163,8 +164,8 @@
.tab {
border: 1px solid #E5EBF6;
margin-bottom: 10px;
padding-bottom: 10px;
border-bottom:0px;
li {
width: 102px;
height: 42px;
......
src/assets/css/list/inquireDetail.min.css
.inquireDetail .inquiry-information{position:relative;background:#FFFFFF;border-radius:4px;border:1px solid #E5EBF6;padding-top:20px;padding-left:17px;margin-bottom:20px;padding-bottom:15px}.inquireDetail .inquiry-information:after{position:absolute;top:20px;left:0;width:5px;height:21px;background:#1969F9;content:'';display:block}.inquireDetail .inquiry-information .tit{font-size:16px;color:#333333;font-weight:bold}.inquireDetail .inquiry-information .input-box{margin-top:14px;margin-bottom:20px}.inquireDetail .inquiry-information .input-box .fl{margin-bottom:10px}.inquireDetail .inquiry-information .input-box .p-text{font-size:14px;color:#333333;vertical-align:middle;margin-right:10px}.inquireDetail .inquiry-information .input-box input{height:38px;background:#F1F4FA;border-radius:2px;vertical-align:middle;box-sizing:border-box;text-indent:12px;font-size:14px;color:#333333;cursor:not-allowed}.inquireDetail .inquiry-information .text span{font-size:16px;color:#333333;font-weight:bold}.inquireDetail .inquiry-information .text em{font-size:16px;color:#CC8200;font-weight:bold}.inquireDetail .quote{position:relative;padding-top:20px;padding-left:17px;background:#FFFFFF}.inquireDetail .quote:after{position:absolute;top:20px;left:0;width:5px;height:21px;background:#1969F9;content:'';display:block}.inquireDetail .quote .tit{font-size:16px;color:#333333;font-weight:bold}.inquireDetail .quote .btn-nav{margin-top:17px;margin-bottom:20px}.inquireDetail .quote .btn-nav .update{height:26px;line-height:26px;text-align:center;background:#FFEEDD;border:1px solid #FF870D;border-radius:2px;color:#FF870D;font-size:14px;cursor:pointer;width:66px}.inquireDetail .quote .btn-nav .update i{margin-left:3px}.inquireDetail .quote .btn-nav .update:hover{background:#FCA955;color:#fff}.inquireDetail .quote .btn-nav .updatex{height:26px;line-height:26px;text-align:center;background:#FFEEDD;border:1px solid #FF870D;border-radius:2px;color:#FF870D;font-size:14px;cursor:pointer;width:66px}.inquireDetail .quote .btn-nav .updatex:hover{background:#FCA955;color:#fff}.inquireDetail .assistant{padding-top:3px;padding-bottom:20px;padding-left:17px;background:#FFFFFF}.inquireDetail .assistant .ic{width:248px;height:44px;background:url("../../images/x.png") no-repeat center;background-size:cover;display:block}.inquireDetail .assistant .tab{border:1px solid #E5EBF6;margin-bottom:10px}.inquireDetail .assistant .tab li{width:102px;height:42px;background:#F1F4FA;border-radius:2px 2px 0px 0px;font-size:14px;color:#646b78;cursor:pointer}.inquireDetail .assistant .tab li.curr{position:relative;top:1px;background:#FFFFFF;font-size:16px;color:#333333;border-bottom:1px solid #FFFFFF}.inquireDetail .dcg{display:block;width:66px;height:26px;border-radius:2px;text-align:center;line-height:26px;border:1px solid #1969F9;background:#E5EEFF;color:#1969F9;margin-right:10px;font-size:14px;transition:all .5s}.inquireDetail .dcg:hover{background:#1969F9;cursor:pointer;color:#fff}.inquireDetail .dcg.disabled{background:#ccc;color:#fff;border-color:#ccc;cursor:not-allowed}.inquireDetail .dcg.heti{width:56px;background:#fff}.inquireDetail .dcg.heti:hover{background:#E5EEFF;color:#1969F9}.inquireDetail .dcg.xjk{position:relative;left:-11px;border-left:1px solid #1969F9}.inquireDetail .dcg.xjk:hover{border-left:1px solid #1969F9}.inquireDetail .dcg.delbtn{border:1px solid #FC1F00;background:#FFE7E3;color:#FC1F00}.inquireDetail .dcg.delbtn:hover{background:#FF715D;color:#fff}.xx .el-form-item__label{white-space:nowrap}.xx .dialog-footer{text-align:center !important}.xx .updatebox{position:relative}.xx .updatebox .selectdw{height:36px;width:36px;position:absolute;top:1px;right:2px}.xx .updatebox .selectdw .el-select{width:36px;height:37px;border-left:1px solid #C0C4CC}.xx .updatebox .selectdw .el-select input{border:0px;padding:0px;height:31px;width:36px;font-size:14px;color:#333;text-align:center}.xx .updatebox .selectdw .el-select .el-input__prefix,.xx .updatebox .selectdw .el-select .el-input__suffix{display:none !important}.price-more .more-search-btn{width:70px;height:26px;background:#F1F4FA;border-radius:2px;border:1px solid #BEC9DF;font-size:12px;color:#1969F9;text-align:center;transition:all .5s;position:relative;cursor:pointer}.price-more .more-search-btn:hover{border:1px solid #1969F9}
\ No newline at end of file
.inquireDetail .inquiry-information{position:relative;background:#FFFFFF;border-radius:4px;border:1px solid #E5EBF6;padding-top:20px;padding-left:17px;margin-bottom:20px;padding-bottom:15px}.inquireDetail .inquiry-information:after{position:absolute;top:20px;left:0;width:5px;height:21px;background:#1969F9;content:'';display:block}.inquireDetail .inquiry-information .tit{font-size:16px;color:#333333;font-weight:bold}.inquireDetail .inquiry-information .input-box{margin-top:14px;margin-bottom:20px}.inquireDetail .inquiry-information .input-box .fl{margin-bottom:10px}.inquireDetail .inquiry-information .input-box .p-text{font-size:14px;color:#333333;vertical-align:middle;margin-right:10px}.inquireDetail .inquiry-information .input-box input{height:38px;background:#F1F4FA;border-radius:2px;vertical-align:middle;box-sizing:border-box;text-indent:12px;font-size:14px;color:#333333;cursor:not-allowed}.inquireDetail .inquiry-information .text span{font-size:16px;color:#333333;font-weight:bold}.inquireDetail .inquiry-information .text em{font-size:16px;color:#CC8200;font-weight:bold}.inquireDetail .quote{position:relative;padding-top:20px;padding-right:17px;padding-left:17px;background:#FFFFFF}.inquireDetail .quote:after{position:absolute;top:20px;left:0;width:5px;height:21px;background:#1969F9;content:'';display:block}.inquireDetail .quote .tit{font-size:16px;color:#333333;font-weight:bold}.inquireDetail .quote .btn-nav{margin-top:17px;margin-bottom:20px}.inquireDetail .quote .btn-nav .update{height:26px;line-height:26px;text-align:center;background:#FFEEDD;border:1px solid #FF870D;border-radius:2px;color:#FF870D;font-size:14px;cursor:pointer;width:66px}.inquireDetail .quote .btn-nav .update i{margin-left:3px}.inquireDetail .quote .btn-nav .update:hover{background:#FCA955;color:#fff}.inquireDetail .quote .btn-nav .updatex{height:26px;line-height:26px;text-align:center;background:#FFEEDD;border:1px solid #FF870D;border-radius:2px;color:#FF870D;font-size:14px;cursor:pointer;width:66px}.inquireDetail .quote .btn-nav .updatex:hover{background:#FCA955;color:#fff}.inquireDetail .assistant{padding-top:3px;padding-bottom:20px;padding-left:17px;padding-right:17px;background:#FFFFFF}.inquireDetail .assistant .ic{width:248px;height:44px;background:url("../../images/x.png") no-repeat center;background-size:cover;display:block}.inquireDetail .assistant .tab{border:1px solid #E5EBF6;padding-bottom:10px;border-bottom:0px}.inquireDetail .assistant .tab li{width:102px;height:42px;background:#F1F4FA;border-radius:2px 2px 0px 0px;font-size:14px;color:#646b78;cursor:pointer}.inquireDetail .assistant .tab li.curr{position:relative;top:1px;background:#FFFFFF;font-size:16px;color:#333333;border-bottom:1px solid #FFFFFF}.inquireDetail .dcg{display:block;width:66px;height:26px;border-radius:2px;text-align:center;line-height:26px;border:1px solid #1969F9;background:#E5EEFF;color:#1969F9;margin-right:10px;font-size:14px;transition:all .5s}.inquireDetail .dcg:hover{background:#1969F9;cursor:pointer;color:#fff}.inquireDetail .dcg.disabled{background:#ccc;color:#fff;border-color:#ccc;cursor:not-allowed}.inquireDetail .dcg.heti{width:56px;background:#fff}.inquireDetail .dcg.heti:hover{background:#E5EEFF;color:#1969F9}.inquireDetail .dcg.xjk{position:relative;left:-11px;border-left:1px solid #1969F9}.inquireDetail .dcg.xjk:hover{border-left:1px solid #1969F9}.inquireDetail .dcg.delbtn{border:1px solid #FC1F00;background:#FFE7E3;color:#FC1F00}.inquireDetail .dcg.delbtn:hover{background:#FF715D;color:#fff}.xx .el-form-item__label{white-space:nowrap}.xx .dialog-footer{text-align:center !important}.xx .updatebox{position:relative}.xx .updatebox .selectdw{height:36px;width:36px;position:absolute;top:1px;right:2px}.xx .updatebox .selectdw .el-select{width:36px;height:37px;border-left:1px solid #C0C4CC}.xx .updatebox .selectdw .el-select input{border:0px;padding:0px;height:31px;width:36px;font-size:14px;color:#333;text-align:center}.xx .updatebox .selectdw .el-select .el-input__prefix,.xx .updatebox .selectdw .el-select .el-input__suffix{display:none !important}.price-more .more-search-btn{width:70px;height:26px;background:#F1F4FA;border-radius:2px;border:1px solid #BEC9DF;font-size:12px;color:#1969F9;text-align:center;transition:all .5s;position:relative;cursor:pointer}.price-more .more-search-btn:hover{border:1px solid #1969F9}
\ No newline at end of file
src/components/menu.vue
......@@ -490,7 +490,7 @@
height: 40px;
overflow-y: hidden;
position: relative;
width: calc(100vw - 640px);
width: calc(100vw - 660px);
&::-webkit-scrollbar {
width: 5px;
......
src/views/List/inquireDetail.vue
......@@ -172,9 +172,15 @@
</el-table-column>
<el-table-column fixed prop="goods_name" label="报价型号" width="200"></el-table-column>
<el-table-column fixed prop="brand_name" label="报价品牌" width="200"></el-table-column>
<<<<<<< HEAD
<el-table-column fixed prop="status" label="状态" width="100">
<template slot-scope="scope">
<span v-if="scope.row.status==1" class="f-green">比价中</span>
=======
<el-table-column label="状态" width="100">
<template slot-scope="scope" >
<span v-if="scope.row.status==1" class="f-green">比价中</span>
>>>>>>> 1555165385e9ecdf25cc0c7a89d09c34be75a679
<span v-else-if="scope.row.status==2" class="f-yellow1">已选中</span>
<span v-else-if="scope.row.status==3">已确认</span>
<span v-else-if="scope.row.status==4" class="f-green" >已成单</span>
......
view/app.04625af3627c2f334096.js → view/app.d28bf90e1cdb3e9af010.js
......@@ -1070,7 +1070,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony import */ var _nod
/***/ (function(module, exports, __webpack_require__) {
"use strict";
eval("\n\nvar _interopRequireDefault = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/interopRequireDefault */ \"./node_modules/@babel/runtime/helpers/interopRequireDefault.js\").default;\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\nexports.http = exports.NODE_ENVS = void 0;\n\nvar _axios = _interopRequireDefault(__webpack_require__(/*! axios */ \"./node_modules/axios/index.js\"));\n\nvar _qs = _interopRequireDefault(__webpack_require__(/*! qs */ \"./node_modules/qs/lib/index.js\"));\n\nvar _tool = _interopRequireDefault(__webpack_require__(/*! ../tool */ \"./src/tool/index.js\"));\n\n/**\r\n * 封装axios的通用请求\r\n * @param {string} method get\\post\\put\\delete\r\n * @param {string} url 请求的接口URL\r\n * @param {object} param 传的参数，没有则传空对象\r\n */\nconst envs = \"test\";\nlet NODE_ENVS = \"/\";\nexports.NODE_ENVS = NODE_ENVS;\n\nswitch (envs) {\n case 'development':\n //开发环境\n exports.NODE_ENVS = NODE_ENVS = 'http://192.168.2.164:8080';\n break;\n\n case 'test':\n //测试环境\n exports.NODE_ENVS = NODE_ENVS = 'http://cloud.liexindev.net';\n break;\n\n case 'production':\n //线上环境\n exports.NODE_ENVS = NODE_ENVS = '/';\n break;\n}\n\nconst http = (method, url, param, loading) => {\n //axios.defaults.withCredentials = true; // 携带cookie\n //loading 默认加载loading 传1 不加载\n param = param && typeof param === 'object' ? param : {};\n let token = _tool.default.getCookie('token') || '';\n const config = {\n url: `${NODE_ENVS}${url}`,\n method: method,\n transformRequest: [function (param) {\n return _qs.default.stringify(param);\n }],\n loading: loading ? false : true\n }; //param.token=token\n\n if (url != \"/auth/cp\" && url != \"/auth/login\") {\n config.headers = {\n 'Authorization': 'Bearer ' + token\n };\n } // post请求时需要设定Content-Type\n\n\n if (method == 'post' || method == 'POST') {\n config.data = param;\n } else if (method === 'get' || method == 'GET') {\n config.params = param;\n }\n\n return (0, _axios.default)(config);\n};\n\nexports.http = http;\n\n//# sourceURL=webpack:///./src/ajax/index.js?");
eval("\n\nvar _interopRequireDefault = __webpack_require__(/*! ./node_modules/@babel/runtime/helpers/interopRequireDefault */ \"./node_modules/@babel/runtime/helpers/interopRequireDefault.js\").default;\n\nObject.defineProperty(exports, \"__esModule\", {\n value: true\n});\nexports.http = exports.NODE_ENVS = void 0;\n\nvar _axios = _interopRequireDefault(__webpack_require__(/*! axios */ \"./node_modules/axios/index.js\"));\n\nvar _qs = _interopRequireDefault(__webpack_require__(/*! qs */ \"./node_modules/qs/lib/index.js\"));\n\nvar _tool = _interopRequireDefault(__webpack_require__(/*! ../tool */ \"./src/tool/index.js\"));\n\n/**\r\n * 封装axios的通用请求\r\n * @param {string} method get\\post\\put\\delete\r\n * @param {string} url 请求的接口URL\r\n * @param {object} param 传的参数，没有则传空对象\r\n */\nconst envs = \"test\";\nlet NODE_ENVS = \"/\";\nexports.NODE_ENVS = NODE_ENVS;\n\nswitch (envs) {\n case 'development':\n //开发环境\n exports.NODE_ENVS = NODE_ENVS = 'http://192.168.2.251:8080';\n break;\n\n case 'test':\n //测试环境\n exports.NODE_ENVS = NODE_ENVS = 'http://cloud.liexindev.net';\n break;\n\n case 'production':\n //线上环境\n exports.NODE_ENVS = NODE_ENVS = '/';\n break;\n}\n\nconst http = (method, url, param, loading) => {\n //axios.defaults.withCredentials = true; // 携带cookie\n //loading 默认加载loading 传1 不加载\n param = param && typeof param === 'object' ? param : {};\n let token = _tool.default.getCookie('token') || '';\n const config = {\n url: `${NODE_ENVS}${url}`,\n method: method,\n transformRequest: [function (param) {\n return _qs.default.stringify(param);\n }],\n loading: loading ? false : true\n }; //param.token=token\n\n if (url != \"/auth/cp\" && url != \"/auth/login\") {\n config.headers = {\n 'Authorization': 'Bearer ' + token\n };\n } // post请求时需要设定Content-Type\n\n\n if (method == 'post' || method == 'POST') {\n config.data = param;\n } else if (method === 'get' || method == 'GET') {\n config.params = param;\n }\n\n return (0, _axios.default)(config);\n};\n\nexports.http = http;\n\n//# sourceURL=webpack:///./src/ajax/index.js?");
/***/ }),
......
view/index.html
......@@ -6,12 +6,12 @@
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="http://yunxin.liexindev.net/favicon.ico">
<title>cloudsystem</title>
<link href="http://yunxin.liexindev.net/js/0.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/1.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/10.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/11.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/12.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/13.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/14.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/15.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/16.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/17.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/18.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/19.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/2.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/20.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/21.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/22.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/23.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/24.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/25.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/26.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/27.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/28.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/3.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/4.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/5.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/6.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/7.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/8.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/9.js" rel="prefetch"><link href="http://yunxin.liexindev.net/app.04625af3627c2f334096.js" rel="preload" as="script"></head>
<link href="http://yunxin.liexindev.net/js/0.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/1.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/10.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/11.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/12.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/13.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/14.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/15.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/16.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/17.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/18.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/19.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/2.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/20.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/21.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/22.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/23.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/24.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/25.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/26.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/27.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/28.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/3.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/4.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/5.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/6.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/7.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/8.js" rel="prefetch"><link href="http://yunxin.liexindev.net/js/9.js" rel="prefetch"><link href="http://yunxin.liexindev.net/app.d28bf90e1cdb3e9af010.js" rel="preload" as="script"></head>
<body>
<noscript>
<strong>网络异常,请稍后加载</strong>
</noscript>
<div id="app"></div>
<!-- built files will be auto injected -->
<script type="text/javascript" src="http://yunxin.liexindev.net/app.04625af3627c2f334096.js"></script></body>
<script type="text/javascript" src="http://yunxin.liexindev.net/app.d28bf90e1cdb3e9af010.js"></script></body>
</html>
view/js/15.js
This diff could not be displayed because it is too large.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment