Skip to content

严立 / cd-bid

Go to a project
Commit 953814e5 by 严立
Options

兼容 IE11

parent 741c565f
Expand all
Inline Side-by-side
Showing with 60 additions and 38 deletions
build/webpack.base.conf.js
...@@ -8,8 +8,6 @@ function resolve (dir) { ...@@ -8,8 +8,6 @@ function resolve (dir) {
return path.join(__dirname, '..', dir) return path.join(__dirname, '..', dir)
} }
module.exports = { module.exports = {
context: path.resolve(__dirname, '../'), context: path.resolve(__dirname, '../'),
entry: { entry: {
...@@ -39,10 +37,13 @@ module.exports = { ...@@ -39,10 +37,13 @@ module.exports = {
{ {
test: /\.js$/, test: /\.js$/,
loader: 'babel-loader', loader: 'babel-loader',
options:{
presets: ['es2015']
},
include: [ include: [
resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client'), resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client'),
resolve('src'), resolve('test'), resolve('node_modules/element-ui/src'), resolve('src'), resolve('test'), resolve('node_modules/element-ui/src'),
resolve('src'), resolve('test'), resolve('node_modules/element-ui/packages/input/src'), resolve('src'), resolve('test'), resolve('node_modules/element-ui/packages'),
] ]
}, },
{ {
......
config/index.js
...@@ -21,9 +21,10 @@ module.exports = { ...@@ -21,9 +21,10 @@ module.exports = {
}, },
// Various Dev Server settings // Various Dev Server settings
host: 'localhost', // can be overwritten by process.env.HOST host: '127.0.0.1', // can be overwritten by process.env.HOST
port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
autoOpenBrowser: false, autoOpenBrowser: false,
disableHostCheck: true,
errorOverlay: true, errorOverlay: true,
notifyOnErrors: true, notifyOnErrors: true,
poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions-
......
package.json
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
"build": "node build/build.js" "build": "node build/build.js"
}, },
"dependencies": { "dependencies": {
"babel-preset-es2015": "^6.24.1",
"miment": "0.0.9", "miment": "0.0.9",
"vue": "^2.6.11", "vue": "^2.6.11",
"vue-router": "^3.3.4" "vue-router": "^3.3.4"
......
src/assets/NotoSansHans-Light.ttf 0 → 100644
No preview for this file type
src/assets/NotoSansHans-Light.woff 0 → 100644
No preview for this file type
src/common/css/reset.css
/*声明 WebFont*/ /*声明 WebFont*/
@font-face { @font-face {
font-family: 'siyuanyahei'; font-family: 'siyuanyahei';
src: url('../../assets/NotoSansHans-Light.ttf');
font-weight: normal;
font-style: normal;
}
@font-face {
font-family: 'siyuanyahei';
src: url('../../assets/NotoSansHans-Light.otf'); src: url('../../assets/NotoSansHans-Light.otf');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }
@font-face {
font-family: 'siyuanyahei';
src: url('../../assets/NotoSansHans-Light.woff');
font-weight: normal;
font-style: normal;
}
html,body, div, span, applet, object, iframe, html,body, div, span, applet, object, iframe,
h1, h2, h3, h4, h5, h6, p, blockquote, pre, h1, h2, h3, h4, h5, h6, p, blockquote, pre,
a, abbr, acronym, address, big, cite, code, a, abbr, acronym, address, big, cite, code,
......
src/common/js/host.js
let output = { let output = {
// 开发路径 // 开发路径
base: 'http://bid-server.meiqicloud.com/', // base: 'http://bid-server.meiqicloud.com/',
resources: 'http://bid-web.meiqicloud.com/', // resources: 'http://bid-web.meiqicloud.com/',
agentSignIn: 'http://bid-vue.meiqicloud.com/' // agentSignIn: 'http://bid-vue.meiqicloud.com/'
// 正式路径 // 正式路径
// base: '/Api/', base: '/Api/',
// resources: 'http://bid-web.meiqicloud.com', resources: 'http://bid-web.meiqicloud.com',
// agentSignIn: 'http://bid-vue.meiqicloud.com/' agentSignIn: 'http://bid-vue.meiqicloud.com/'
} }
output.uploadFile = output.base + 'bid/common/webupload/upload' output.uploadFile = output.base + 'bid/common/webupload/upload'
......
src/common/js/request/request.js
...@@ -38,7 +38,6 @@ let output = { ...@@ -38,7 +38,6 @@ let output = {
funcData = iDataform(funcData, 'url') funcData = iDataform(funcData, 'url')
let funcPromise = new Promise(function (funcResolve, funcReject) { let funcPromise = new Promise(function (funcResolve, funcReject) {
let funcXMLHttpRequest = new XMLHttpRequest() let funcXMLHttpRequest = new XMLHttpRequest()
funcXMLHttpRequest.timeout = funcConfigure.timeout
funcXMLHttpRequest.open(funcConfigure.method, funcUrl + funcData, true) funcXMLHttpRequest.open(funcConfigure.method, funcUrl + funcData, true)
// 请求之前修改 // 请求之前修改
...@@ -78,16 +77,13 @@ let output = { ...@@ -78,16 +77,13 @@ let output = {
if (funcConfigure.method === 'post') { if (funcConfigure.method === 'post') {
// 设置数据类型 // 设置数据类型
funcData = iDataform(funcData, funcConfigure.sendType) funcData = iDataform(funcData, funcConfigure.sendType)
let funcPromise = new Promise(function (funcResolve, funcReject) { let funcPromise = new Promise(function (funcResolve, funcReject) {
let funcXMLHttpRequest = new XMLHttpRequest() let funcXMLHttpRequest = new XMLHttpRequest()
funcXMLHttpRequest.timeout = funcConfigure.timeout
funcXMLHttpRequest.open(funcConfigure.method, funcUrl, true) funcXMLHttpRequest.open(funcConfigure.method, funcUrl, true)
// 请求之前修改 // 请求之前修改
iHeader(funcXMLHttpRequest, funcConfigure) iHeader(funcXMLHttpRequest, funcConfigure)
iInterceptors.request(funcXMLHttpRequest, funcConfigure, funcUrl) iInterceptors.request(funcXMLHttpRequest, funcConfigure, funcUrl)
funcXMLHttpRequest.send(funcData) funcXMLHttpRequest.send(funcData)
funcXMLHttpRequest.onreadystatechange = function () { funcXMLHttpRequest.onreadystatechange = function () {
if (funcXMLHttpRequest.readyState !== 4) { if (funcXMLHttpRequest.readyState !== 4) {
......
src/components/currency-footer.vue
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<div class="global-maxwidth row con-b align-s"> <div class="global-maxwidth row con-b align-s">
<div class="company-info"> <div class="company-info">
<div class="logo"> <div class="logo">
<el-image :src="imageLogo" fit="fit"></el-image> <img src="../assets/logo@2x.png" alt="">
</div> </div>
<div> <div>
<p>地址：厦门市思明区吕岭路1733号创想中心1801单元</p> <p>地址：厦门市思明区吕岭路1733号创想中心1801单元</p>
......
src/components/currency-header.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="global-maxwidth row con-b"> <div class="global-maxwidth row con-b">
<div class="about row align-c"> <div class="about row align-c">
<el-dropdown> <el-dropdown>
<span class="global-cursor" @click="$router.push('/about')">关注我们</span> <span class="global-cursor">关注我们</span>
<el-dropdown-menu class="about-code" slot="dropdown"> <el-dropdown-menu class="about-code" slot="dropdown">
<el-dropdown-item> <el-dropdown-item>
<img src="../assets/code.png" alt=""> <img src="../assets/code.png" alt="">
...@@ -334,7 +334,7 @@ ...@@ -334,7 +334,7 @@
} }
span:nth-child(2) { span:nth-child(2) {
width: 38px; width: 52px;
padding-left: 14px; padding-left: 14px;
font-size: @fontSize00; font-size: @fontSize00;
color: #333333; color: #333333;
......
src/components/notice-progress.vue
...@@ -229,6 +229,7 @@ ...@@ -229,6 +229,7 @@
* @returns * @returns
*/ */
onDocument: function () { onDocument: function () {
console.log('onDocument')
// 公告为预览状态禁止操作 // 公告为预览状态禁止操作
if (this.$route.query.preview) return if (this.$route.query.preview) return
this.$emit('document') this.$emit('document')
......
src/components/notice-project.vue
...@@ -40,7 +40,11 @@ ...@@ -40,7 +40,11 @@
<el-table-column prop="object" label="标的" min-width="140"></el-table-column> <el-table-column prop="object" label="标的" min-width="140"></el-table-column>
<el-table-column prop="requirement" label="参数要求" min-width="230"></el-table-column> <el-table-column prop="requirement" label="参数要求" min-width="230"></el-table-column>
<el-table-column prop="quantity" label="数量" min-width="120" align="center"></el-table-column> <el-table-column prop="quantity" label="数量" min-width="120" align="center"></el-table-column>
<el-table-column prop="budget" label="限价（元）" min-width="180" align="center"></el-table-column> <el-table-column prop="budget" label="限价（元）" min-width="180" align="center">
<template slot-scope="scope">
<span>{{scope.row.budget === 0 ? '无' : scope.row.budget}}</span>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
......
src/main.js
...@@ -25,7 +25,4 @@ let output = new Vue({ ...@@ -25,7 +25,4 @@ let output = new Vue({
'components': { App }, 'components': { App },
'template': '<App/>' 'template': '<App/>'
}) })
console.log('test')
console.log(window.XMLHttpRequest)
export default output export default output
\ No newline at end of file
src/view/home.vue
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<componentHeader></componentHeader> <componentHeader></componentHeader>
<componentNavigation></componentNavigation> <componentNavigation></componentNavigation>
<div class="home-banner"> <div class="home-banner">
<el-carousel v-if="listBanner.length > 0" class="home-carousel" trigger="click" height="400px" :autoplay="false"> <el-carousel v-if="listBanner.length > 0" class="home-carousel" trigger="click" height="400px" :autoplay="true">
<el-carousel-item v-for="(item, index) in listBanner" :key="index"> <el-carousel-item v-for="(item, index) in listBanner" :key="index">
<img :src="listBanner[index].url" alt="" :class="item.isLink ? 'global-cursor' : ''" @click="onBanner(item)"> <img :src="listBanner[index].url" alt="" :class="item.isLink ? 'global-cursor' : ''" @click="onBanner(item)">
</el-carousel-item> </el-carousel-item>
......
src/view/personal/supplier-home.vue
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
</div> </div>
<div class="row con-b align-c"> <div class="row con-b align-c">
<span class="global-color-grey">{{item.projectNumber}}</span> <span class="global-color-grey">{{item.projectNumber}}</span>
<span class="global-color-green">{{item.isWin ? '中标' : ''}}</span> <span class="global-color-green">{{item.isWin ? '成交' : ''}}</span>
</div> </div>
</div> </div>
<div class="bid-item-bottom row con-b align-c"> <div class="bid-item-bottom row con-b align-c">
......
src/view/personal/supplier-notice.vue
...@@ -66,7 +66,11 @@ ...@@ -66,7 +66,11 @@
<el-table-column prop="object" label="标的"></el-table-column> <el-table-column prop="object" label="标的"></el-table-column>
<el-table-column prop="requirement" label="参数要求"></el-table-column> <el-table-column prop="requirement" label="参数要求"></el-table-column>
<el-table-column prop="quantity" label="数量" align="center"></el-table-column> <el-table-column prop="quantity" label="数量" align="center"></el-table-column>
<el-table-column prop="budget" label="限价（元）" align="center"></el-table-column> <el-table-column prop="budget" label="限价（元）" align="center">
<template slot-scope="scope">
<span>{{scope.row.budget === 0 ? '无' : scope.row.budget}}</span>
</template>
</el-table-column>
<el-table-column align="center"> <el-table-column align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div class="global-cursor row"> <div class="global-cursor row">
...@@ -224,7 +228,11 @@ ...@@ -224,7 +228,11 @@
<el-table-column prop="object" label="标的" min-width="200"></el-table-column> <el-table-column prop="object" label="标的" min-width="200"></el-table-column>
<el-table-column prop="requirement" label="参数要求" min-width="300"></el-table-column> <el-table-column prop="requirement" label="参数要求" min-width="300"></el-table-column>
<el-table-column prop="quantity" label="数量" width="120"></el-table-column> <el-table-column prop="quantity" label="数量" width="120"></el-table-column>
<el-table-column prop="budget" label="限价（元）" min-width="100"></el-table-column> <el-table-column prop="budget" label="限价（元）" min-width="100">
<template slot-scope="scope">
<span>{{scope.row.budget === 0 ? '无' : scope.row.budget}}</span>
</template>
</el-table-column>
</el-table> </el-table>
</div> </div>
<div> <div>
......
src/view/public/bid-buy.vue
...@@ -191,6 +191,7 @@ ...@@ -191,6 +191,7 @@
} }
}, },
queryPayCode: function () { queryPayCode: function () {
console.log('payway', this.payCode[Number(this.payway)])
if (this.payCode[Number(this.payway)]) { if (this.payCode[Number(this.payway)]) {
clearInterval(this.payTimer) clearInterval(this.payTimer)
this.queryPayState() this.queryPayState()
...@@ -356,8 +357,8 @@ ...@@ -356,8 +357,8 @@
clearInterval(this.payTimer) clearInterval(this.payTimer)
}, },
onChangeRadio: function (funcRadio) { onChangeRadio: function (funcRadio) {
// this.payway = funcRadio this.payway = funcRadio
// this.queryPayCode() this.queryPayCode()
}, },
} }
} }
......
src/view/public/bid-notice.vue
...@@ -759,8 +759,6 @@ ...@@ -759,8 +759,6 @@
} }
this.tableQuote.push(funcItem) this.tableQuote.push(funcItem)
} }
// console.log(JSON.stringify(funcSelection))
}, },
onQuoteNote: function (funcItem, funcIndex) { onQuoteNote: function (funcItem, funcIndex) {
...@@ -787,14 +785,12 @@ ...@@ -787,14 +785,12 @@
if (!iRuleAtom.isMoney(funcValue)) { if (!iRuleAtom.isMoney(funcValue)) {
funcItem.tip = '请输入正确金额格式' funcItem.tip = '请输入正确金额格式'
this.tableQuote[funcIndex].price = '' this.tableQuote[funcIndex].price = ''
console.log(JSON.stringify(this.tableQuote))
return return
} }
if (!funcValue) { if (!funcValue) {
funcItem.tip = '请输入报价金额' funcItem.tip = '请输入报价金额'
this.tableQuote[funcIndex].price = '' this.tableQuote[funcIndex].price = ''
console.log(JSON.stringify(this.tableQuote))
return return
} }
...@@ -807,7 +803,6 @@ ...@@ -807,7 +803,6 @@
if (funcValue > this.maxQuote) { if (funcValue > this.maxQuote) {
funcItem.tip = '不能超过一百亿元' funcItem.tip = '不能超过一百亿元'
this.tableQuote[funcIndex].price = '' this.tableQuote[funcIndex].price = ''
console.log(JSON.stringify(this.tableQuote))
return return
} }
...@@ -829,7 +824,12 @@ ...@@ -829,7 +824,12 @@
funcChildEnd = funcChildEnd + 1 funcChildEnd = funcChildEnd + 1
} }
this.tableQuote[funcChildStart].price = Number(funcPrice) + Number(funcItem.price) this.tableQuote[funcChildStart].price = Number(funcPrice) + Number(funcItem.price)
// console.log(JSON.stringify(this.tableQuote)) // 在主包价格设置完成后进行一次预算判断
if (this.tableQuote[funcChildStart].price > this.tableQuote[funcChildStart].budget && this.tableQuote[funcChildStart].budget !== 0) {
this.tableQuote[funcChildStart].tip = '超过 ' + this.tableQuote[funcChildStart].budget + ' 元限价'
} else {
this.tableQuote[funcChildStart].tip = ''
}
} }
}, },
...@@ -839,7 +839,6 @@ ...@@ -839,7 +839,6 @@
* @returns * @returns
*/ */
onQuoteSubmit: function () { onQuoteSubmit: function () {
console.log(JSON.stringify(this.tableQuote))
if (this.tableQuote.length === 0) { if (this.tableQuote.length === 0) {
this.$message.error('请填写完整报价信息') this.$message.error('请填写完整报价信息')
return return
......
src/view/public/policy-list.vue
...@@ -131,7 +131,7 @@ ...@@ -131,7 +131,7 @@
} }
span:nth-child(1) { span:nth-child(1) {
max-width: 870px; width: 870px;
flex-grow: 1; flex-grow: 1;
} }
......
src/view/public/question-list.vue
...@@ -217,7 +217,7 @@ ...@@ -217,7 +217,7 @@
} }
span:nth-child(1) { span:nth-child(1) {
max-width: 90%; width: 870px;
padding-right: 80px; padding-right: 80px;
flex-grow: 1; flex-grow: 1;
} }
......
src/view/public/trends-list.vue
...@@ -130,7 +130,7 @@ ...@@ -130,7 +130,7 @@
} }
span:nth-child(1) { span:nth-child(1) {
max-width: 870px; width: 870px;
flex-grow: 1; flex-grow: 1;
} }
......
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