Skip to content

C
cloud-platform-ui
Commit f5a45cbf authored by hanfeng's avatar hanfeng
Browse files
Options

Merge remote-tracking branch 'origin/base-modify' into base-modify-hf

parents 754210c9 e0fb6fa7
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1037 additions and 229 deletions
config/dev.env.js
View file @ f5a45cbf
module.exports = {
NODE_ENV: '"development"',
<<<<<<< HEAD
<<<<<<< HEAD
BASE_API:'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
=======
BASE_API:'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
=======
BASE_API:'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://xxtest.upyuns.com"',//'"https://dev.dfangche.com"',//'"https://xxfcmgmt.upyuns.com"（正）',//http://10.1.37.192:9527（何）, //https://xxtest.upyuns.com（测）,10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
>>>>>>> 4ae432b1473866a6dc59f10c1ec4b5c66a9ad5cc
APP_ORIGIN: '"https://wallstreetcn.com"'
}
config/sit.env.js
View file @ f5a45cbf
module.exports = {
NODE_ENV: '"sit"',
BASE_API: '"https://xxtest.upyuns.com"',
BASE_API: '"https://dev.dfangche.com"',
APP_ORIGIN: '"https://wallstreetcn.com"'
};
src/views/cunponManagements/cunponManagement.vue
View file @ f5a45cbf
......@@ -39,6 +39,7 @@
<span v-if="scope.row.channel==1">租车</span>
<span v-if="scope.row.channel==2">旅游</span>
<span v-if="scope.row.channel==3">营地</span>
<span v-if="scope.row.channel==4">会员</span>
</template>
</el-table-column>
<el-table-column align="center" label="金额">
......@@ -119,6 +120,7 @@
<el-radio-group v-model="formdata.valid_type_name" size="medium">
<el-radio-button label="绝对时效" :disabled="formdata.valid_type_name=='相对时效'&&isUpdate"></el-radio-button>
<el-radio-button label="相对时效" :disabled="formdata.valid_type_name=='绝对时效'&&isUpdate"></el-radio-button>
<el-radio-button label="永久时效" :disabled="formdata.valid_type_name=='永久时效'&&isUpdate"></el-radio-button>
</el-radio-group>
<div style="display:inline-block" v-show="formdata.valid_type_name=='绝对时效'">
<el-date-picker v-model="formdata.validStartTimeStr" type = "date" placeholder = "开始时间" :disabled="isUpdate" :picker-options="pickerOptionsStart"></el-date-picker>
......@@ -328,6 +330,10 @@
{
id:3,
val:'营地'
},
{
id:4,
val:'会员'
}
],
BASE_API: process.env.BASE_API,
......@@ -448,7 +454,7 @@
console.log(response)
var item = response.data;
item.user_type_name = item.userType==0?'普通用户':'会员用户';
item.valid_type_name = item.validType==1?'绝对时效':'相对时效';
item.valid_type_name = item.validType==1?'绝对时效':item.validType==2?'相对时效':'永久时效';
//相对时效的时间
if(item.validStartTime>0){
item.validStartTimeStr = getYMD(item.validStartTime);
......@@ -517,7 +523,7 @@
set[formName].validate(valid => {
if (valid) {
that.formdata.userType = that.formdata.user_type_name=='普通用户'?0:1;
that.formdata.validType = that.formdata.valid_type_name=='绝对时效'?1:2;
that.formdata.validType = that.formdata.valid_type_name=='绝对时效'?1:that.formdata.valid_type_name=='相对时效'?2:3;
if(that.formdata.valid_type_name=='绝对时效'){
that.formdata.validStartTime = new Date(this.formdata.validStartTimeStr).getTime();
that.formdata.validEndTime = new Date(this.formdata.validEndTimeStr).getTime();
......@@ -582,7 +588,7 @@
set[formName].validate(valid => {
if (valid) {
that.formdata.userType = that.formdata.user_type_name=='普通用户'?0:1;
that.formdata.validType = that.formdata.valid_type_name=='绝对时效'?1:2;
that.formdata.validType = that.formdata.valid_type_name=='绝对时效'?1:that.formdata.valid_type_name=='相对时效'?2:3;
if(that.formdata.valid_type_name=='绝对时效'){
that.formdata.validStartTime = new Date(that.formdata.validStartTimeStr).getTime();
......
src/views/order/memberOrderInfo/index.vue
View file @ f5a45cbf
......@@ -258,12 +258,12 @@
</el-col>
<el-col :span="8">
<el-form-item label="注册时间:">
<span>{{userDetails.createTime}}</span>
<span>{{!!userDetails.createTime ? timestamp(new Date(userDetails.createTime*1000)) : ''}}</span>
</el-form-item>
</el-col>
<el-col :span="9">
<el-form-item label="最近登录时间:">
<span>{{userDetails.lastTime}}</span>
<span>{{!!userDetails.lastTime ? timestamp(new Date(userDetails.lastTime)): ''}}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -308,12 +308,12 @@
</el-col>
<el-col :span="6">
<el-form-item label="充值次数:">
<span>{{userDetails.buyCount}}次</span>
<span>{{!!userDetails.buyCount ? userDetails.buyCount+'次' : ''}}</span>
</el-form-item>
</el-col>
<el-col :span="6">
<el-form-item label="加入时间:">
<span>{{userDetails.timeOfMembership}}</span>
<span>{{!!userDetails.timeOfMembership ? timestamp(new Date(userDetails.timeOfMembership)) :''}}</span>
</el-form-item>
</el-col>
</el-row>
......@@ -534,36 +534,17 @@ export default {
},
excel() {
this.listQuery.isExport = true;
// if (!!this.createTime && !!this.createTime[0]) {
// this.listQuery.startOrderTime = formatDate(this.createTime[0], 'yyyy-MM-dd')+ ' 00:00:00'
// this.listQuery.endOrderTime = formatDate(this.createTime[1], 'yyyy-MM-dd')+ ' 23:59:59'
// }
// if (!!this.aplyTime && !!this.aplyTime[0]) {
// this.listQuery.startPayTime = this.aplyTime[0].getTime()
// this.listQuery.endPayTime = this.aplyTime[1].getTime()
// }
// let endOrderTime = this.listQuery.endOrderTime
// let endPayTime = this.listQuery.endPayTime
// let facilitatePhone = this.listQuery.facilitatePhone
// let isExport = 'true'
// let leaderPhone = this.listQuery.leaderPhone
// let level = this.listQuery.level
// let name = this.listQuery.name
// let orderNo = this.listQuery.orderNo
// let phone = this.listQuery.phone
// let startOrderTime = this.listQuery.startOrderTime
// let startPayTime = this.listQuery.startPayTime
// let state = this.listQuery.state
// let type = this.listQuery.type
// window.location.href=process.env.BASE_API+'/api/order/orderMember/app/unauth/export'+'?isExport='+isExport
var u = navigator.userAgent, app = navigator.appVersion;
orderMemberExcel(this.listQuery,{responseType: 'arraybuffer'}).then(res => {
this.listQuery.isExport = false;
const content = res
const blob = new Blob([content], {type: "application/vnd.ms-excel"})
const fileName = this.timestamp(new Date())+'.xlsx'
if ('download' in document.createElement('a')) {
// 非IE下载
const fileName = this.timestamp(new Date())+'会员订单列表.xlsx'
if(u.indexOf('Edge') > -1){
window.navigator.msSaveBlob(blob, fileName)
console.log('ie');
}else{
const elink = document.createElement('a')
elink.download = fileName
elink.style.display = 'none'
......@@ -572,9 +553,7 @@ export default {
elink.click()
URL.revokeObjectURL(elink.href) // 释放URL 对象
document.body.removeChild(elink)
} else {
// IE10+下载
window.navigator.msSaveBlob(blob, fileName)
console.log('fei ie');
}
})
},
......
src/views/purseManage/discountRecord.vue
View file @ f5a45cbf
......@@ -58,7 +58,7 @@
</el-table-column>
<el-table-column align="center" label="收款账号">
<template scope="scope">
<span>{{scope.row.accountName}}</span>
<span>{{scope.row.accountNumber}}</span>
</template>
</el-table-column>
......
src/views/purseManage/incomeOverview.vue
View file @ f5a45cbf
......@@ -51,27 +51,27 @@
</el-table-column>
<el-table-column width="200" align="center" label="总提现">
<el-table-column align="center" label="总提现">
<template scope="scope">
<span>{{scope.row.withdrawals}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="提现中">
<el-table-column align="center" label="提现中">
<template scope="scope">
<span>{{scope.row.withdrawaling}}</span>
</template>
</el-table-column>
<el-table-column width="200" align="center" label="未入账">
<el-table-column align="center" label="未入账">
<template scope="scope">
<span>{{scope.row.unbooked}}</span>
</template>
</el-table-column>
<el-table-column align="center" label="当前余额">
<!-- <el-table-column align="center" label="当前余额">
<template scope="scope">
<span>{{scope.row.balance}}</span>
</template>
</el-table-column>
</el-table-column> -->
<!-- <el-table-column align="center" label="操作" fixed="right">
<template scope="scope">
<el-button
......
src/views/summit/model/reviewPopup.vue
View file @ f5a45cbf
......@@ -170,6 +170,10 @@ export default {
beforeAvatarUpload(file) {
var index = file.name.lastIndexOf('.')
var ext = file.name.substr(index + 1)
<<<<<<< HEAD
console.log(ext)
=======
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
if (ext != 'zip') {
this.$message.error('上传压缩包只能是 zip 格式!')
return false
......@@ -196,7 +200,11 @@ export default {
cre() {
let zipPic = []
this.list.forEach(element => {
<<<<<<< HEAD
zipPic.push(element.url)
=======
zipPic.push(element.response.data)
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
})
let mp4Vadio = []
this.vadio.forEach(element => {
......@@ -218,8 +226,11 @@ export default {
: zipPic.join(',') + ',' + this.oldList
: zipPic.join(',')
}
<<<<<<< HEAD
=======
// console.log(params);
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
save(params).then(res => {
this.responseResult(res)
})
......
src/views/summit/model/summitPopup.vue
View file @ f5a45cbf
......@@ -105,7 +105,16 @@
<el-form-item label="活动id:">
<!-- <el-input v-model="form.rid" placeholder="请输入签到/抽奖活动的id"></el-input> -->
<el-select v-model="form.rid" placeholder="请选择签到/抽奖活动id">
<<<<<<< HEAD
<el-option
v-for="(item,index) in optionsId"
:key="index"
:label="item"
:value="item"
></el-option>
=======
<el-option v-for="(item,index) in optionsId" :key="index" :label="item" :value="item"></el-option>
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
</el-select>
</el-form-item>
</el-col>
......@@ -146,7 +155,11 @@
<div>
<el-row>
<el-col>
<<<<<<< HEAD
<el-form-item label="房车介绍:">
=======
<el-form-item label="房车介绍:" style="margin-top:20px">
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
<el-upload
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
list-type="picture-card"
......@@ -278,7 +291,11 @@ export default {
created() {
activityIds().then(data => {
if (data.status == 200) {
<<<<<<< HEAD
this.optionsId = data.data;
=======
this.optionsId = data.data
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
}
})
},
......@@ -378,7 +395,11 @@ export default {
},
getState(status) {
if (this.$utils.isInteger(status)) {
<<<<<<< HEAD
console.log(status);
=======
console.log(status)
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
if (status == 0) {
return '默认'
} else {
......@@ -444,6 +465,12 @@ export default {
? (this.form.bmCloseTime = this.form.bmCloseTime)
: (this.form.bmCloseTime = this.form.bmCloseTime.getTime())
let pic = []
<<<<<<< HEAD
if (!!this.form.vehicleImgs) {
this.form.vehicleImgs.forEach(element => {
pic.push(element.url)
})
=======
if (this.fileList2 != '') {
console.log(this.fileList2);
this.fileList2.forEach(element => {
......@@ -455,6 +482,7 @@ export default {
});
console.log(pic);
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
this.form.vehicleImgs = pic.join(',')
}
......@@ -502,6 +530,14 @@ export default {
this.form.startTime = this.form.startTime.getTime()
this.form.bmCloseTime = this.form.bmCloseTime.getTime()
let pic = []
<<<<<<< HEAD
if (!!this.form.vehicleImgs) {
this.form.vehicleImgs.forEach(element => {
pic.push(element.url)
})
this.form.vehicleImgs = pic.join(',')
}
=======
if (this.fileList2 != '') {
this.fileList2.forEach(element => {
pic.push(element.response.data);
......@@ -514,6 +550,7 @@ export default {
// })
// this.form.vehicleImgs = pic.join(',')
// }
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
this.dataProcessing()
add(this.form).then(res => {
this.responseResult(res)
......@@ -523,7 +560,11 @@ export default {
dataProcessing() {
if (this.form.state === '默认') {
this.form.status = '0'
<<<<<<< HEAD
}else{
=======
} else {
>>>>>>> ed66af1f93f55e2551b0b09c15e1697c72ecb84b
this.form.status = this.statusRadio
}
this.form.processJson = JSON.stringify(this.processJson)
......
src/views/vehicle/bookRecord/index.vue
View file @ f5a45cbf
This diff is collapsed.
src/views/vehicle/vehicleInfo/index.vue
View file @ f5a45cbf
This diff is collapsed.
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 to comment