Skip to content

C
cloud-platform-ui
Commit 634cccdf authored by guoyou's avatar guoyou
Browse files
Options

查看可用车型,峰会管理,租车设置

parent de9a9209
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1232 additions and 666 deletions
config/dev.env.js
View file @ 634cccdf
module.exports = {
NODE_ENV: '"development"',
BASE_API: '"https://xxtest.upyuns.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://dev.dfangche.com"',//'"https://xxtest.upyuns.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(小威)
APP_ORIGIN: '"https://wallstreetcn.com"'
}
src/api/order/rentVehicle.js
View file @ 634cccdf
......@@ -74,7 +74,7 @@ export function getStep(orderNo) {
export function inquire(query) {
return fetch({
url: '/vehicle/vehicleInfo/rent/usable-vehicle',
url: '/rent/back-stage/usable-vehicle',
method: 'get',
params:query
});
......
src/router/index.js
View file @ 634cccdf
......@@ -294,6 +294,12 @@ export const asyncRouterMap = [{
component: _import('vehicleType/vehicleTypeLabel'),
name: '车型标签设置',
authority: 'vehicleTypeLabel'
},
{
path: 'priceList',
component: _import('vehicleType/priceList'),
name: '租车价格表',
authority: 'priceList'
}
]
},
......@@ -553,10 +559,10 @@ export const asyncRouterMap = [{
authority: 'summit',
children: [
{
path: 'summitList',
component: _import('summit/summitList/index'),
path: 'index',
component: _import('summit/index'),
name: '峰会列表',
authority: 'summitList'
authority: 'index'
}
]
},
......
src/views/order/createOrder/index.vue
View file @ 634cccdf
......@@ -39,7 +39,7 @@
value-format="timestamp"
@change="changeTime"
:picker-options="pickerOptions"
>></el-date-picker>
></el-date-picker>
<el-button
class="filter-item"
......
src/views/summit/index.vue
View file @ 634cccdf
This diff is collapsed.
src/views/summit/model/applyPage.vue 0 → 100644
View file @ 634cccdf
<template>
<el-dialog title="报名页面" :visible.sync="dialogVisible" class="order-details">
<UE
:editorId="activeName"
:defaultMsg="versionRow.content"
:config="config"
ref="ue"
@ready="editorReadyEvent"
></UE>
</el-dialog>
</template>
<script>
import UE from "../../modal/Ueditor"; //百度ue富文本
export default {
props: [],
components: {
UE
},
created() {},
data() {
return {
dialogVisible: true,
activeName: "first",
versionRow: {
content: ""
},
config: {
initialFrameWidth: null,
initialFrameHeight: 350
}
};
},
methods: {
editorReadyEvent(instance) {
let t = this;
instance.addListener("contentChange", () => {
if (t.activeName == "first") {
t.versionRow.content = instance.getContent();
}
});
}
}
};
</script>
\ No newline at end of file
src/views/summit/model/enrollDataPopup.vue
View file @ 634cccdf
......@@ -17,7 +17,7 @@
<el-form-item label="已签到">
<el-select class="filter-item" v-model="query.qdStatus" placeholder="签到状态">
<el-option :key="undefined" label="所有" :value="undefined"></el-option>
<el-option v-for="(val, key, index) in typeList " :key="val.id" :label="val.name"
<el-option v-for="(val,index) in typeList " :key="index" :label="val.name"
:value="val.id"></el-option>
</el-select>
</el-form-item>
......
src/views/summit/model/reviewPopup.vue
View file @ 634cccdf
......@@ -11,73 +11,94 @@
:show-file-list="false"
:on-success="handleAvatarSuccess"
:on-progress="uploadProcess"
list-type="picture">
<el-progress v-show="imgFlag == true" type="circle" :percentage="percent"
style="margin-top: 20px"></el-progress>
<img v-if="$utils.isString(form.banner) && !$utils.isEmpty(form.banner) && !imgFlag"
list-type="picture"
>
<el-progress
v-show="imgFlag == true"
type="circle"
:percentage="percent"
style="margin-top: 20px"
></el-progress>
<img
v-if="$utils.isString(form.banner) && !$utils.isEmpty(form.banner) && !imgFlag"
:src="form.banner"
style="width:300px;max-height:300px;">
<i v-else-if="!imgFlag" class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i>
style="width:300px;max-height:300px;"
/>
<i
v-else-if="!imgFlag"
class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"
></i>
</el-upload>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-col>
<el-form-item label="峰会图片:">
<el-upload
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
list-type="picture-card"
:file-list="list"
:on-success="handlePictureCardPreview"
:on-remove="handleRemove">
:on-remove="handleRemove"
>
<i class="el-icon-plus"></i>
</el-upload>
<!-- <img width="100%" :src="form.picturePath" alt="">-->
<!-- <img width="100%" :src="form.picturePath" alt="">-->
</el-form-item>
</el-col>
</el-row>
<el-col :span="8">
<el-row>
<el-col>
<el-form-item label="峰会视频:">
<el-upload
:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
list-type="picture-card"
:headers="getHeaderWithToken"
:on-preview="handlePreview"
:on-remove="handleRemove">
:on-remove="handleRemove"
>
<i class="el-icon-plus"></i>
</el-upload>
<video v-if="$utils.isString(form.videoPath) && !$utils.isEmpty(form.videoPath) && !imgFlag"
<video
v-if="$utils.isString(form.videoPath) && !$utils.isEmpty(form.videoPath) && !imgFlag"
:src="form.videoPath"
style="width:300px;max-height:300px;"/>
<i v-else-if="!imgFlag" class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"></i>
style="width:300px;max-height:300px;"
/>
<!-- <i
v-else-if="!imgFlag"
class="el-icon-plus avatar-uploader-icon"
style="lineHeight:100px;width:300px;height: 100px;border: 1px dashed #ccc;"
></i>-->
</el-form-item>
</el-col>
</el-form>
<div slot="footer" class="dialog-footer1">
<el-col>
<el-form-item>
<el-button class="button" @click="cancelHandel">取 消</el-button>
<el-button class="button" type="primary" @click="cre">确 定</el-button>
</div>
</el-form-item>
</el-col>
</el-row>
<!-- <el-row slot="footer" class="dialog-footer1">
</el-row>-->
</el-form>
</el-dialog>
</template>
<script>
import ElRow from "element-ui/packages/row/src/row";
import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue";
import ElCol from "element-ui/packages/col/src/col";
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
import {getToken} from 'src/utils/auth';
import {mapGetters} from 'vuex';
import {
one,
save
} from 'src/api/summit/activityShow';
import ElRow from "element-ui/packages/row/src/row";
import ElInput from "../../../../node_modules/element-ui/packages/input/src/input.vue";
import ElCol from "element-ui/packages/col/src/col";
import ElFormItem from "../../../../node_modules/element-ui/packages/form/src/form-item.vue";
import { getToken } from "src/utils/auth";
import { mapGetters } from "vuex";
import { one, save } from "src/api/summit/activityShow";
export default {
export default {
props: ["reviewRow"],
name: 'reviewPopup',
name: "reviewPopup",
components: {
ElFormItem,
ElCol,
......@@ -88,80 +109,75 @@
return {
imgDialogVisible: false,
dialogVisible: false,
dialogImageUrl:undefined,
dialogImageUrl: undefined,
result: false,
imgFlag: false,
BASE_API: process.env.BASE_API,
percent: 0,//上传进度
imgFlag: false,
list:[],
percent: 0, //上传进度
list: [],
form: {
id: undefined,
banner: undefined,
activityId: undefined,
banner: undefined,
videoPath: undefined,
picturePath: undefined,
}
picturePath: undefined
}
};
},
watch: {
dialogVisible(newValue, oldValue) {
if (!newValue) {
this.$emit("reviewDialogEvent", this.result);
}
},
}
},
computed: {
...mapGetters([
'elements'
]),
...mapGetters(["elements"]),
getHeaderWithToken() {
return {Authorization: getToken()};
},
return { Authorization: getToken() };
}
},
watch: {
dialogVisible(newValue, oldValue) {
if (!newValue) {
this.$emit("summitDialogEvent", this.result);
}
},
}
},
mounted() {
this.getOrderInfo();
},
methods:{
methods: {
getOrderInfo() {
one(this.reviewRow.id).then(res => {
this.form=res.data
this.dialogVisible=true
this.imgDialogVisible=true;
})
this.form = res.data;
this.dialogVisible = true;
this.imgDialogVisible = true;
});
},
cre() {
console.log(this.form.picturePath)
console.log(this.form.picturePath);
save(this.form).then(res => {
this.responseResult(res)
})
this.responseResult(res);
});
},
responseResult(res) {
if (res.status === 200) {
this.$notify({
title: '成功',
message: '操作成功',
type: 'success',
title: "成功",
message: "操作成功",
type: "success",
duration: 2000
});
this.setSummitDialogEvent(true)
this.setSummitDialogEvent(true);
} else {
this.$notify({
title: '失败',
message: '操作失败！',
type: 'error',
title: "失败",
message: "操作失败！",
type: "error",
duration: 2000
});
}
......@@ -170,13 +186,12 @@
* 弹框-取消
* */
cancelHandel() {
this.setSummitDialogEvent(false)
this.setSummitDialogEvent(false);
},
setSummitDialogEvent(e) {
this.cleanForm();
this.result = e
this.dialogVisible = false
this.result = e;
this.dialogVisible = false;
},
/**
* 封面图上传
......@@ -194,8 +209,7 @@
this.percent = Math.floor(event.percent);
},
handlePreview(file) {
this.form.videoPath=file.data
this.form.videoPath = file.data;
this.imgDialogVisible = true;
},
handleRemove(file, fileList) {
......@@ -203,83 +217,84 @@
console.log(file, fileList);
},
handlePictureCardPreview(res,file) {
this.list.push({url: res.data})
handlePictureCardPreview(res, file) {
this.list.push({ url: res.data });
// this.imgDialogVisible = true;
},
cleanForm(){
this.form= {
cleanForm() {
this.form = {
id: undefined,
banner: undefined,
activityId: undefined,
banner: undefined,
videoPath: undefined,
picturePath: undefined
};
}
}
}
}
};
</script>
<style>
.label-text {
.label-text {
margin-left: 10px;
margin-right: 20px;
}
}
.label-title {
.label-title {
margin-top: 10px;
}
}
.orderDetail tr th {
.orderDetail tr th {
background: #eef1f6;
}
}
.orderDetail tr td, .orderDetail tr th {
.orderDetail tr td,
.orderDetail tr th {
width: 500px;
text-align: center;
border: 1px solid #dfe6ec;
margin-left: 100px;
margin-right: 100px;
padding: 10px;
}
}
.label-value {
.label-value {
margin-left: 80px;
margin-right: 100px;
}
}
#license-img {
#license-img {
width: 50px;
height: 50px;
}
}
.order-details .el-form-item {
.order-details .el-form-item {
margin-bottom: 10px !important;
}
}
.el-dialog__footer .dialog-footer1 {
.el-dialog__footer .dialog-footer1 {
position: relative;
text-align: center;
}
}
.fhjj {
.fhjj {
width: 500px;
}
}
.content {
.content {
margin-left: 4%;
}
}
.height {
.height {
margin-bottom: 2%;
}
}
. el-form-item__content {
. el-form-item__content {
margin-left: 5% !important;
}
}
.status {
.status {
margin-top: 4%;
}
}
</style>
src/views/summit/model/summitPopup.vue
View file @ 634cccdf
This diff is collapsed.
src/views/summit/summitList/index.vue
View file @ 634cccdf
......@@ -105,7 +105,7 @@
class="demo-ruleForm"
>
<el-form-item label="标题:" prop="title">
<el-input v-model="ruleForm.title"></el-input>
<el-input v-model="ruleForm.title" style="width:350px" placeholder="请输入峰会标题"></el-input>
</el-form-item>
<el-form-item label="封面图:" prop="title">
<el-upload
......@@ -128,20 +128,54 @@
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item label="报名截止:" prop="title">
<el-date-picker
v-model="ruleForm.value1"
type="datetime"
placeholder="请选择日期时间"
style="width:350px"
></el-date-picker>
</el-form-item>
<el-form-item label="举办地点:" prop="title">
<el-input v-model="ruleForm.title" style="width:350px" placeholder="请输入峰会举办地点"></el-input>
<el-input v-model="ruleForm.title" style="width:100px" placeholder="经度"></el-input>
<el-input v-model="ruleForm.title" style="width:100px" placeholder="纬度"></el-input>
</el-form-item>
<el-form-item label="状态:" prop="title">
<el-radio-group v-model="ruleForm.radio3">
<el-radio-button label="默认"></el-radio-button>
<el-radio-button label="自定义"></el-radio-button>
</el-radio-group>
</el-form-item>
<el-form-item label="活动id:" prop="title">
<el-input v-model="ruleForm.title" style="width:350px" placeholder="请输入签到/抽奖活动的id"></el-input>
<el-button type="primary">生成二维码</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="submitForm('ruleForm')">确定</el-button>
<el-button @click="bulkUploadMember = false">取消</el-button>
</el-form-item>
</el-form>
</el-dialog>
<reviewPopup :reviewRow='reviewRow'></reviewPopup>
</div>
</div>
</template>
<script>
import reviewPopup from '../model/reviewPopup';
export default {
components:{
reviewPopup
},
created() {},
data() {
return {
reviewRow:{},
imageUrl: "",
//快捷筛选
listQuery: {
......@@ -154,7 +188,7 @@ export default {
// 表格数据
list: [],
summitTitle: "创建峰会",
bulkUploadMember: true,
bulkUploadMember: false,
ruleForm: {
title: "" //标题
}, //创建峰会表单
......@@ -183,7 +217,7 @@ export default {
cleaningQuery() {},
//创建峰会
creatSummit() {
bulkUploadMember = true;
this.bulkUploadMember = true;
},
//下架
soldOut() {},
......
src/views/vehicleType/priceList.vue 0 → 100644
View file @ 634cccdf
This diff is collapsed.
src/views/xxOfficialWebsite/modal/popup.vue
View file @ 634cccdf
......@@ -48,7 +48,7 @@
<el-row>
<el-col :span="8">
<el-form-item label="发布人" prop="publisher">
<el-input v-model="form.publisher" type="text"placeholder="请输入发布人"></el-input>
<el-input v-model="form.publisher" type="text" placeholder="请输入发布人"></el-input>
</el-form-item>
</el-col>
</el-row>
......
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