Skip to content

C
cloud-platform-ui
Commit 09061bc5 authored by libin's avatar libin
Browse files
Options

dev

parent f1227342
Hide whitespace changes
Inline Side-by-side
Showing with 311 additions and 71 deletions
config/dev.env.js
View file @ 09061bc5
module.exports = {
NODE_ENV: '"development"',
BASE_API: '"http://localhost:9527"',
BASE_API: '"http://10.1.37.246:8765"',//'"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"'
}
config/index.js
View file @ 09061bc5
......@@ -8,7 +8,7 @@ module.exports = {
index: path.resolve(__dirname, '../dist/index.html'),
assetsRoot: path.resolve(__dirname, '../dist'),
assetsSubDirectory: 'static',
assetsPublicPath: '/', //请根据自己路径配置更改
assetsPublicPath: '/', //请根据自己路径配置更改
productionSourceMap: false,
// Gzip off by default as many popular static hosts such as
// Surge or Netlify already gzip all static assets for you.
......
src/api/base_info/constant/index.js
View file @ 09061bc5
......@@ -25,28 +25,62 @@ function loadFromServer(type) {
headerAuthorization = getToken(); // 让每个请求携带token--['Authorization']为自定义key 请根据实际情况自行修改
}
// url : baseURL+"",//路径
let rs;
$.ajax({
type: 'get',
url: process.env.BASE_API + '/vehicle/constant/type/' + type,
async: false,
headers: {
Authorization: headerAuthorization
},
dataType: 'json',
data: {},
success: function (result) {
// 返回数据根据结果进行相应的处理
if (result.code === rsCode.RS_CODE_SUC) {
rs = result.data;
} else {
let rs = [];
if(type == 4){
$.ajax({
type: 'get',
// url: process.env.BASE_API + '/vehicle/constant/type/' + type,
url: process.env.BASE_API + '/vehicle/area/findAll',
async: false,
headers: {
Authorization: headerAuthorization
},
dataType: 'json',
data: {},
success: function (result) {
// 返回数据根据结果进行相应的处理
if (result.code === rsCode.RS_CODE_SUC) {
result.data.map(function(item){
rs.push(item);
})
} else {
console.log('请求常量信息出错。');
}
return rs;
},
error: function () {
console.log('请求常量信息出错。');
}
},
error: function () {
console.log('请求常量信息出错。');
}
});
});
} else {
$.ajax({
type: 'get',
url: process.env.BASE_API + '/vehicle/constant/type/' + type,
// url: process.env.BASE_API + '/vehicle/area/findAll',
async: false,
headers: {
Authorization: headerAuthorization
},
dataType: 'json',
data: {},
success: function (result) {
// 返回数据根据结果进行相应的处理
if (result.code === rsCode.RS_CODE_SUC) {
result.data.map(function(item){
rs.push(item);
})
} else {
console.log('请求常量信息出错。');
}
return rs;
},
error: function () {
console.log('请求常量信息出错。');
}
});
}
console.log(rs);
return rs;
}
......@@ -108,6 +142,23 @@ export function getConstantListByType(type) {
return constantMap;
}
export function getConstantListByTypeNew(type) {
if (!type) {
console.error('empty constant type');
return null;
}
let constantMap = store.getters.vehicleConstants(type);
if (constantMap == null || typeof (constantMap) == "undefined") {
let constants = loadFromServer(type);
if (!constants || constants.length === 0) {
return null;
}
constantMap = constants;
}
return constantMap;
}
/** 保险公司 */
export function getInsuranceCompany(code) {
if (code == null || typeof (code) == "undefined" || code === VEHICLE_CONSTANT_INSURANCE_COMPANY_UNKOWN) {
......@@ -129,5 +180,5 @@ export function getZone(code) {
}
export function getAllZone() {
return getConstantListByType(ZONE);
return getConstantListByTypeNew(ZONE);
}
src/api/tourManage.js
View file @ 09061bc5
......@@ -31,20 +31,21 @@ export function getOneGoodsById(query) {
}
/**
* 获取bannerList
// url: '/api/tour/admin/tourBanner/page',
*/
export function getBannerList(query) {
return fetch({
url: '/api/tour/admin/tourBanner/page',
url: '/api/app/admin/banner/page',
method: 'get',
params: query
});
}
/**
* 添加banner
* 添加banner '/api/tour/admin/tourBanner',
*/
export function addBanner(params) {
return fetch({
url: '/api/tour/admin/tourBanner',
url: '/api/app/admin/banner',
method: 'post',
data: params
});
......@@ -54,7 +55,7 @@ export function addBanner(params) {
*/
export function editBanner(params) {
return fetch({
url: '/api/tour/admin/tourBanner',
url: '/api/app/admin/banner',
method: 'put',
data: params
});
......@@ -66,7 +67,7 @@ export function editBanner(params) {
*/
export function delBanner(id) {
return fetch({
url: '/api/tour/admin/tourBanner/' + id,
url: '/api/app/admin/banner/' + id,
method: 'delete'
});
}
......@@ -146,3 +147,23 @@ export function getAllTourTag(query) {
params: query
});
}
/**
* 获取全部旅游标签
* @param query
*/
export function goodDel(id) {
return fetch({
url: '/api/tour/good/admin/goodDel/' + id,
method: 'get'
});
}
/**
* 上架、下架
* */
export function upStatusChange(query) {
return fetch({
url: '/api/tour/good/admin/upStatus',
method: 'get',
params: query
});
}
src/api/vehicle/vehicleInfo/index.js
View file @ 09061bc5
......@@ -24,6 +24,16 @@ export function addObj(obj) {
});
}
/*
* 删除一条车辆数据
* */
export function delObj(id) {
return fetch({
url: '/vehicle/vehicleInfo/del/' + id,
method: 'delete'
});
}
export function book(param) {
return fetch({
url: '/vehicle/vehicleInfo/book/4employee',
......@@ -53,3 +63,12 @@ export function getBookedInfo(vehicleId, yearMonth) {
method: 'get'
});
}
/*
* 根据id获取片区下省份
* */
export function getSysRegionByIds(ids) {
return fetch({
url: '/vehicle/sysRegion/getSysRegionByIds/' + ids,
method: 'get'
});
}
src/router/index.js
View file @ 09061bc5
......@@ -278,6 +278,27 @@ export const asyncRouterMap = [{
}
]
},
{
path: '/campsiteManage',
component: Layout,
name: '营地管理',
icon: 'setting',
authority: 'campsiteManage',
children: [
{
path: 'campsiteList',
component: _import('campsiteManage/index'),
name: '营地列表',
authority: 'campsiteList'
},
{
path: 'campsiteLabel',
component: _import('campsiteManage/campsiteLabel'),
name: '营地标签设置',
authority: 'campsiteLabel'
}
]
},
{
path: '/vehicle',
component: Layout,
......@@ -337,5 +358,32 @@ export const asyncRouterMap = [{
authority: 'tourLabel'
}
]
},
{
path: '/order',
component: Layout,
name: '订单管理',
icon: 'setting',
authority: 'order',
children: [
{
path: 'rentVehicleInfo',
component: _import('order/rentVehicleInfo/index'),
name: '租车订单管理',
authority: 'rentVehicleInfo'
},
{
path: 'tourOrderInfo',
component: _import('order/tourOrderInfo/index'),
name: '旅游订单管理',
authority: 'tourOrderInfo'
},
{
path: 'memberOrderInfo',
component: _import('order/memberOrderInfo/index'),
name: '会员订单管理',
authority: 'memberOrderInfo'
}
]
}
];
src/utils/dateUtils.js
View file @ 09061bc5
......@@ -35,3 +35,9 @@ export function convertDate2Str(object) {
}
}
}
export function timestamp2Date(timestamp) {
let date = new Date(timestamp);//时间戳为10位需*1000，时间戳为13位的话不需乘1000
return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
}
src/views/admin/user/index.vue
View file @ 09061bc5
......@@ -65,7 +65,7 @@
</el-form-item>
<el-form-item label="所属片区" prop="zoneId">
<el-select class="filter-item" v-model="form.zoneId" placeholder="请选择">
<el-option v-for="(val, key, index) in getAllZone()" :key="val.code" :label="val.val" :value="val.code"> </el-option>
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="所属分公司" prop="companyId">
......@@ -255,7 +255,11 @@ export default {
computed: {
...mapGetters([
'elements'
])
]),
getAllZoneList(){
this.allZoneArr = getAllZone();
return getAllZone();
},
},
methods: {
getAllZone,
......
src/views/baseInfo/bannerSetting.vue
View file @ 09061bc5
......@@ -6,7 +6,7 @@
</el-button>
</div>
<el-table :key='tableKey' :data="list" border fit highlight-current-row
style="width: 1300px">
style="width: 1500px">
<el-table-column
type="index"
align="center" label="序号" width="98">
......@@ -18,7 +18,13 @@
</el-table-column>
<el-table-column width="200" align="center" label="类型">
<template scope="scope">
<span>{{scope.row.type==0?"app首页":scope.row.type==1?"app旅游页":"租车"}}</span>
<span>{{scope.row.type==0?"app首页":scope.row.type==1?"app旅游页":scope.row.type==2?"租车":scope.row.type==3?"个人中心":scope.row.type==4?"小程序首页":scope.row.type==5?'发现':scope.row.type}}</span>
</template>
</el-table-column>
<!--location 1：推荐 2：拍拍 3：短视频 4：问答-->
<el-table-column width="200" align="center" label="位置">
<template scope="scope">
<span>{{scope.row.location==0?"所有页面":scope.row.location==1?"推荐":scope.row.location==2?"拍拍":scope.row.location==3?"短视频":scope.row.location==4?"问答": scope.row.location}}</span>
</template>
</el-table-column>
<el-table-column width="300" align="center" label="banner图">
......@@ -66,12 +72,23 @@
<el-radio class="radio" v-model="form.type" label="0">app首页</el-radio>
<el-radio class="radio" v-model="form.type" label="1">app旅游页</el-radio>
<el-radio class="radio" v-model="form.type" label="2">租车</el-radio>
<el-radio class="radio" v-model="form.type" label="3">个人中心</el-radio>
<el-radio class="radio" v-model="form.type" label="4">小程序首页</el-radio>
<el-radio class="radio" v-model="form.type" label="5">发现</el-radio>
</el-form-item>
<!--location 1：推荐 2：拍拍 3：短视频 4：问答-->
<el-form-item label="位置" prop="location" v-if="form.type == 5">
<el-radio class="radio" v-model="form.location" label="0">所有页面</el-radio>
<el-radio class="radio" v-model="form.location" label="1">推荐</el-radio>
<el-radio class="radio" v-model="form.location" label="2">拍拍</el-radio>
<el-radio class="radio" v-model="form.location" label="3">短视频</el-radio>
<el-radio class="radio" v-model="form.location" label="4">问答</el-radio>
</el-form-item>
<!--BASE_API + -->
<el-form-item label="banner图" prop="cover" :style="{display:'block'}">
<el-upload
class="avatar-uploader"
:action="'https://xxtest.upyuns.com/api/universal/file/admin/upload'"
:action="'https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload'"
:show-file-list="false"
:headers="getHeaderWithToken"
:on-success="handleAvatarSuccess">
......@@ -145,7 +162,8 @@
title: "",
url: "",
cover:"",
type: "0"
type: "0",
location: "0"
},
listQuery: {
pageNo: 1,
......@@ -164,6 +182,12 @@
message: '请选择banner类型',
trigger: 'blur'
},
location:{
type: "string",
required: true,
message: '请选择位置类型',
trigger: 'blur'
},
cover: {
type: 'string',
required: true,
......@@ -233,7 +257,8 @@
title: "",
cover: "",
url:"",
type: "0"
type: "0",
location: "0"
}
},
showImgDialog(drivingLicensePath) {
......@@ -252,6 +277,7 @@
listRs = response.data.data;
response.data.data.map(function(item){
item.type = item.type+"";
item.location = item.location?item.location+"": "0";
item.visible2 = false;
});
totalCountRs = response.data.totalCount;
......@@ -344,7 +370,7 @@
this.showLoadingBody = true;
return isJPG && isLt2M;
},
handleAvatarSuccess(res, file) {debugger
handleAvatarSuccess(res, file) {
this.form.cover = res.data;
this.showLoadingBody = false;
},
......
src/views/baseInfo/branchCompany/index.vue
View file @ 09061bc5
......@@ -113,19 +113,19 @@
</el-form-item>
<el-form-item label="所属地区" prop="zoneId">
<el-select class="filter-item" v-model="form.zoneId" placeholder="请选择">
<el-option v-for="(val, key, index) in getAllZone()" :key="val.code" :label="val.val" :value="val.code"> </el-option>
<el-select class="filter-item" v-model="form.zoneId" placeholder="请选择" @change="getProvinceRegions">
<el-option v-for="val in getAllZoneList" :key="val.id" :label="val.name" :value="val.id"> </el-option>
</el-select>
</el-form-item>
<el-form-item label="省份" prop="addrProvince">
<el-select v-model.number="form.addrProvince" placeholder="请选择省份（直辖市）" >
<el-select v-model.number="form.addrProvince" placeholder="请选择省份（直辖市）" @change="changeProvince">
<el-option v-for="item in provinceRegions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
<el-form-item label="城市" prop="addrCity">
<el-select v-model.number="form.addrCity" placeholder="请选择城市">
<el-select v-model.number="form.addrCity" placeholder="请选择城市" @change="changeCity">
<el-option v-for="item in cityRegions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
......@@ -179,6 +179,10 @@
putObj
} from 'api/base_info/branch_company';
import {
getSysRegionByIds
} from 'api/vehicle/vehicleInfo/';
import {
getSonRegionByCodes,
getRegionByCodes,
......@@ -211,6 +215,8 @@
leaderContactInfo: undefined,
updateTime: undefined
},
allZoneArr:[],//全部片区
provinceRegions: [],//片区下省份数据
rules: {
latitude: [
{
......@@ -366,9 +372,13 @@
'elements',
'companyStatusAndCode'
]),
provinceRegions() {
return getSonRegionByCodes(1);
getAllZoneList(){
this.allZoneArr = getAllZone();
return getAllZone();
},
// provinceRegions() {
// return getSonRegionByCodes(1);
// },
cityRegions() {
if (!this.$utils.isInteger(this.form.addrProvince)) {
return null;
......@@ -395,7 +405,42 @@
}
},
methods: {
getAllZone,
/**
* 根据片区获取省份数据
* */
getProvinceRegions() {
let that = this;
this.form.addrCity = undefined;
this.form.addrProvince = undefined;
this.form.addrTown = undefined;
if (!this.$utils.isInteger(this.form.zoneId)) {
return null;
}
this.allZoneArr.map(function(item){
if(item.id == that.form.zoneId){
getSysRegionByIds(item.provinceIds).then(response => {
let listRs = undefined;
if (!that.$utils.isEmpty(response.data)) {
listRs = response.data;
}
that.provinceRegions = listRs;
});
}
});
},
/**
* 改变省份，清空城市
* */
changeProvince(){
this.form.addrCity = undefined;
this.form.addrTown = undefined;
},
/**
* 改变城市，清空城镇
* */
changeCity(){
this.form.addrTown = undefined;
},
getValue(e){
this.listQuery.addrCity = undefined;
},
......@@ -527,7 +572,7 @@
});
},
choiceImg(){
this.$refs.filElem.dispatchEvent(new MouseEvent('click'))
this.$refs.filElem.dispatchEvent(new MouseEvent('click'))
},
getFile(event){
let formData = new FormData();
......
src/views/baseInfo/campsite/index.vue
View file @ 09061bc5
......@@ -428,7 +428,12 @@
},
getAddrStr(campsite) {
let regions = getRegionByCodes([campsite.addrProvince, campsite.addrCity, campsite.addrTown]);
return regions[0].name + ' ' + regions[1].name + ' ' + regions[2].name + ' ';
let address = [];
for(let i = 0; i < regions.length; i++){
address.push(regions[i].name);
}
return address.join(" ");
// return regions[0].name + ' ' + regions[1].name + ' ' + regions[2].name + ' ';
},
handleFilter() {
this.$refs.queryForm.validate(valid => {
......@@ -504,7 +509,7 @@
});
},
choiceImg(){
this.$refs.filElem.dispatchEvent(new MouseEvent('click'))
this.$refs.filElem.dispatchEvent(new MouseEvent('click'))
},
getFile(event){
let formData = new FormData();
......
src/views/baseInfo/companyInfo/chinaMap.vue
View file @ 09061bc5
......@@ -76,9 +76,9 @@
},
methods: {
initChart(target) {
let that = this;debugger
let that = this;
var markPointData = this.list;
markPointData.map(function(item){debugger
markPointData.map(function(item){
item.coord = [item.longitude, item.latitude];
});
var mydata = getSonRegionByCodes(1);
......
src/views/baseInfo/companyInfo/provinceMap.vue
View file @ 09061bc5
......@@ -474,7 +474,6 @@
}
},
mounted() {    // 滚动加载更多 
debugger
this.listQuery.addrProvince = this.$route.query.provinceId;
this.provinceName = this.$route.query.provinceName;
this.$nextTick(() => {
......
src/views/baseInfo/generalSetting.vue
View file @ 09061bc5
......@@ -58,7 +58,7 @@
<el-input type="number" v-model.number="dialogFrom.type" placeholder="1,2,3……"></el-input>
</el-form-item>
<el-form-item label="详情">
<Editor @input="handelIncrease" :value="dialogFrom.value"></Editor>
<Editor @input="handelIncrease" :value="dialogFrom.value" :myQuillEditor="'myQuillEditorContent'"></Editor>
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
......@@ -293,7 +293,7 @@
value: this.dialogFrom.value
};
editGeneral(params).then(response => {
if (response.code === rsCode.RS_CODE_SUC) {
if (response.status === 200) {
this.cleanDialogFrom();
this.dialogVisible = false;
this.$notify({
......
src/views/baseInfo/stockCrowd/index.vue
View file @ 09061bc5
......@@ -350,7 +350,7 @@
let allList = this.list;
this.nomore = false;
this.nodata = false;
this.send = !0;debugger
this.send = !0;
stockSearchPage(this.listQuery)
.then(res => {
if (res.code == 1) {
......@@ -408,7 +408,7 @@
this.nodata = true;
}
}
this.send = !1;debugger
this.send = !1;
});
},
}
......
src/views/branchCompany/stock/index.vue
View file @ 09061bc5
......@@ -84,7 +84,7 @@
<el-input v-model.number="form.price" placeholder="请输入股权单价"></el-input>
</el-form-item>
<el-form-item label="省份" prop="addrProvince">
<el-select v-model.number="form.addrProvince" placeholder="请选择省份（直辖市）">
<el-select v-model.number="form.addrProvince" placeholder="请选择省份（直辖市）" @change="changeProvince">
<el-option v-for="item in provinceRegions" :key="item.id" :label="item.name" :value="item.id"></el-option>
</el-select>
</el-form-item>
......@@ -104,7 +104,7 @@
<el-form-item label="公司图片" prop="drivingLicensePath" :style="{display:'block'}">
<el-upload
class="avatar-uploader"
:action="BASE_API + '/vehicle/branchCompany/stock/upload/companyPic'"
:action="BASE_API+ '/vehicle/branchCompany/stock/upload/companyPic'"
:show-file-list="false"
:headers="getHeaderWithToken"
:on-success="handleAvatarSuccess"
......@@ -275,6 +275,12 @@
}
},
methods: {
/**
* 改变省份，清空城市
* */
changeProvince(){
this.form.addrCity = undefined;
},
getCompanyPicUrl(companyPic) {
return process.env.BASE_API +
'/vehicle/branchCompany/stock/download/companyPic?realFileRelPath=' + encodeURI(companyPic);
......@@ -424,7 +430,7 @@
this.getList();
},
choiceImg(){
this.$refs.filElem.dispatchEvent(new MouseEvent('click'))
this.$refs.filElem.dispatchEvent(new MouseEvent('click'))
},
getFile(event){
let formData = new FormData();
......
src/views/login/index.vue
View file @ 09061bc5
......@@ -17,6 +17,9 @@
</el-form-item>
</el-form>
<div style="position: fixed; bottom: 50px; width: 100%; text-align: center;">
<a href="http://beian.miit.gov.cn" target="_blank" style="color: #62a8ea;">粤ICP备19072339号-1</a>
</div>
<el-dialog title="第三方验证" :visible.sync="showDialog">
邮箱登录成功,请选择第三方验证
<social-sign></social-sign>
......
src/views/modal/editorTool.vue
View file @ 09061bc5
<template>
<div>
<!-- 图片上传组件辅助-->
<!--<el-upload-->
<!--class="avatar-uploader"-->
<!--name="img"-->
<!--:headers="getHeaderWithToken"-->
<!--action="https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload"-->
<!--:show-file-list="false"-->
<!--:on-success="uploadSuccess"-->
<!--:on-error="uploadError"-->
<!--:before-upload="beforeUpload">-->
<!--</el-upload>-->
<el-upload
class="avatar-uploader"
:action="'https://xxtest.upyuns.com/api/universal/file/app/unauth/admin/upload'"
......@@ -23,7 +13,7 @@
<quill-editor
class="editor"
v-model="content"
ref="myQuillEditor"
:ref="myQuillEditor"
:options="editorOption"
@blur="onEditorBlur($event)" @focus="onEditorFocus($event)"
@change="onEditorChange($event)">
......@@ -65,10 +55,16 @@
value: {
type: String
},
myQuillEditor: {
type: String
},
/*图片大小*/
maxSize: {
type: Number,
default: 4000 //kb
},
activeName2:{
type: String
}
},
......@@ -85,6 +81,7 @@
return {
content: this.value,
quillUpdateImg: false, // 根据图片上传状态来确定是否显示loading动画，刚开始是false,不显示
quill: undefined,
editorOption: {
placeholder: "",
theme: "snow", // or 'bubble'
......@@ -114,7 +111,6 @@
}
}
},
serverUrl: this.baseServerUrl+"/fileUpload/uploadPic?filepath=artwork", // 这里写你要上传的图片服务器地址
header: {
// token: sessionStorage.token
} // 有的图片服务器要求请求头需要有token
......@@ -125,13 +121,22 @@
this.content = value;
}
},
mounted() {
let tt = this.$refs;
this.quill = tt[this.myQuillEditor].quill;
console.log(this.quill);
console.log(this.activeName2);
},
methods: {
onEditorBlur() {
//失去焦点事件
},
onEditorFocus() {
onEditorFocus(e) {
//获得焦点事件
// let tt = this.$refs;
// this.quill = tt[this.myQuillEditor].quill;
// console.log(this.quill);
},
onEditorChange() {
//内容改变事件
......@@ -148,8 +153,10 @@
console.log(file)
// res为图片服务器返回的数据
// 获取富文本组件实例
debugger
let quill = this.$refs.myQuillEditor.quill;
// let quill = this.$refs.myQuillEditor.quill;
let tt = this.$refs;
console.log(tt);
let quill = this.quill;//tt[this.myQuillEditor].quill;
// 如果上传成功
if (res.status == 200) {
// 获取光标所在位置
......
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