Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform-ui into base-modify

config/dev.env.js

 module.exports = {
     NODE_ENV: '"development"',
-  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(小威)
     APP_ORIGIN: '"https://wallstreetcn.com"'
 }

src/api/admin/userManagement/index.js

@@ -99,15 +99,32 @@ export function postions(obj) {
   });
 }
 
+// 身份列表
+export function jobs(obj) {
+  return fetch({
+    url: '/api/admin/postion/admin/jobs',
+    method: 'get',
+    data: obj
+  });
+}
+
 // 添加员工
 export function addEditor(obj) {
   return fetch({
-    url: '/api/admin/postion/admin/add',
+    url: '/api/admin/postion/admin/addUserPostion',
     method: 'post',
     data: obj
   });
 }
 
+// 编辑员工
+export function editorUpd(obj) {
+  return fetch({
+    url: '/api/admin/postion/admin/updUserPostion',
+    method: 'post',
+    data: obj
+  });
+}
 //删除员工
 export function deleteStaffs(id) {
   return fetch({

src/api/summit/activity.js

@@ -38,4 +38,11 @@ export function activityIds() {
     url: '/api/summit/imxr/ids',
     method: 'get'
   })
+}
+
+export function remove(id) {
+  return fetch({
+    url: '/api/summit/activity/remove/' + id,
+    method: 'delete'
+  })
 }
\ No newline at end of file

src/views/order/rentVehicleInfo/index.vue

@@ -398,8 +398,9 @@
             <span class="label-text">拍照取证*:</span>
             <br />
             <img
-              v-for="item in otherImg"
+              v-for="(item,index) in otherImg"
               :src="item"
+              :key="index"
               style="width: 100px; height: 100px;margin-left:110px;"
             />
             <!-- 	<img src="../../../../dist/static/img/success.8304acb.png" style="width: 100px; height: 100px;margin-left:110px;"/>

src/views/summit/model/reviewPopup.vue

@@ -41,7 +41,7 @@
 							list-type="picture-card"
 							:file-list="list"
 							:on-success="handlePictureCardPreview"
-							:on-remove="handleRemove"
+							:on-remove="handleRemoveZip"
 							:before-upload="beforeAvatarUpload"
 						>
 							<i class="el-icon-plus"></i>
@@ -64,11 +64,11 @@
 						>
 							<i class="el-icon-plus"></i>
 						</el-upload>
-						<video
+						<!-- <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"
@@ -78,8 +78,8 @@
 				</el-col>
 				<el-col>
 					<el-form-item>
+						<el-button class="button" type="primary" @click="cre">确 定</el-button>
 						<el-button class="button" @click="cancelHandel">取 消</el-button>
-						<!-- <el-button class="button" type="primary" @click="cre">确 定</el-button> -->
 					</el-form-item>
 				</el-col>
 			</el-row>
@@ -117,12 +117,14 @@ export default {
 			imgFlag: false,
 			BASE_API: process.env.BASE_API,
 			percent: 0, //上传进度
-			list: [],
+			list: [], //压缩包
+			oldList: '',
+			oldVadio: '',
+			vadio: [], //视频
+			activeId: '', //峰会id
 			form: {
 				id: undefined,
 				banner: undefined,
-				activityId: undefined,
-				banner: undefined,
 				videoPath: undefined,
 				picturePath: undefined
 			}
@@ -151,44 +153,74 @@ export default {
 	// },
 	mounted() {
 		this.getOrderInfo()
+		console.log(this.reviewRow)
 	},
 	methods: {
-		vidioSuccess(res) {
-			this.$notify({
-				title: '提示',
-				message: res.message,
-				type: 'success',
-				duration: 2000
-			})
+		vidioSuccess(res, file, fileList) {
+			if (res.status == 200) {
+				this.$notify({
+					title: '提示',
+					message: res.message,
+					type: 'success',
+					duration: 2000
+				})
+				this.vadio = fileList
+			}
 		},
 		beforeAvatarUpload(file) {
-			// const zip = file.type === 'application/zip'
-			// if (!zip) {
-			// 	this.$message.error('上传头像图片只能是 zip 格式!')
-			// }
-			// return zip
+			var index = file.name.lastIndexOf('.')
+			var ext = file.name.substr(index + 1)
+			if (ext != 'zip') {
+				this.$message.error('上传压缩包只能是 zip 格式!')
+				return false
+			}
+			return true
 		},
 		videoUpload(file) {
-			console.log(file.type)
-
 			const isJPG = file.type === 'video/mp4'
 			if (!isJPG) {
-				this.$message.error('上传头像图片只能是 mp4 格式!')
+				this.$message.error('上传压缩包只能是 mp4 格式!')
 			}
 			return isJPG
 		},
 		getOrderInfo() {
-			console.log(this.reviewRow.id)
-
 			one(this.reviewRow.id).then(res => {
 				this.form = res.data
+				this.activeId = res.data.id //峰会id
+				this.oldList = res.data.picturePath || '' //压缩包
+				this.oldVadio = res.data.videoPath || '' //视频
 				this.dialogVisible = true
 				this.imgDialogVisible = true
 			})
 		},
 		cre() {
-			console.log(this.form.picturePath)
-			save(this.form).then(res => {
+			let zipPic = []
+			this.list.forEach(element => {
+				zipPic.push(element.response.data)
+			})
+			let mp4Vadio = []
+			this.vadio.forEach(element => {
+				mp4Vadio.push(element.response.data)
+			})
+
+			let params = {
+				id: this.activeId, //回顾id
+				banner: this.form.banner,
+				activityId: this.reviewRow.id, //峰会id
+				videoPath: this.oldVadio
+					? mp4Vadio == ''
+						? this.oldVadio
+						: mp4Vadio.join(',') + ',' + this.oldVadio
+					: mp4Vadio.join(','),
+				picturePath: this.oldList
+					? zipPic == ''
+						? this.oldList
+						: zipPic.join(',') + ',' + this.oldList
+					: zipPic.join(',')
+			}
+			// console.log(params);
+			
+			save(params).then(res => {
 				this.responseResult(res)
 			})
 		},
@@ -241,20 +273,22 @@ export default {
 			this.form.videoPath = file.data
 			this.imgDialogVisible = true
 		},
+		handleRemoveZip(file, fileList) {
+			this.list = fileList
+		},
 		handleRemove(file, fileList) {
-			// console.log(file)
-			console.log(file, fileList)
+			this.vadio = fileList
 		},
 
-		handlePictureCardPreview(res, file) {
-			this.$notify({
-				title: '提示',
-				message: res.message,
-				type: 'success',
-				duration: 2000
-			})
-			this.list.push({ url: res.data })
-			// this.imgDialogVisible = true;
+		handlePictureCardPreview(res, file, fileList) {
+			if (res.status == 200) {
+				this.$notify({
+					title: '提示',
+					message: '上传成功',
+					type: 'success'
+				})
+				this.list = fileList
+			}
 		},
 		cleanForm() {
 			this.form = {

src/views/summit/model/summitPopup.vue

@@ -105,12 +105,7 @@
 								<el-form-item label="活动id:">
 									<!-- <el-input v-model="form.rid" placeholder="请输入签到/抽奖活动的id"></el-input> -->
 									<el-select v-model="form.rid" placeholder="请选择签到/抽奖活动id">
-										<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>
 									</el-select>
 								</el-form-item>
 							</el-col>
@@ -151,20 +146,16 @@
 					<div>
 						<el-row>
 							<el-col>
-								<el-form-item label="房车介绍:">
+								<el-form-item label="房车介绍:" style="margin-top:20px">
 									<el-upload
-										class="upload-demo"
-										:headers="getHeaderWithToken"
 										:action="BASE_API+'/api/universal/file/app/unauth/admin/upload'"
-										:on-remove="handleRemove"
+										list-type="picture-card"
 										:file-list="fileList2"
 										:on-success="handleBannerSuccess"
-										list-type="picture"
+										:on-remove="handleRemove"
+										:headers="getHeaderWithToken"
 									>
-										<div slot="tip" class="el-upload__tip">
-											<span style="color: red;">建议尺寸：1080*644px</span>
-										</div>
-										<el-button size="small" type="primary">点击上传</el-button>
+										<i class="el-icon-plus"></i>
 									</el-upload>
 								</el-form-item>
 								<el-form-item label="峰会流程:">
@@ -205,8 +196,8 @@
 				<el-row>
 					<el-col>
 						<el-button class="button" @click="cancelHandel">取 消</el-button>
-						<el-button class="button" type="primary" v-if="titleNme=='创建峰会'" @click="create('form')">确 定</el-button>
-						<el-button class="button" type="primary" v-if="titleNme=='编辑峰会'" @click="update1()">确 定</el-button>
+						<el-button class="button" type="primary" v-if="titleNme=='创建峰会'" @click="create('form')">确定</el-button>
+						<el-button class="button" type="primary" v-if="titleNme=='编辑峰会'" @click="update1()">确定</el-button>
 					</el-col>
 				</el-row>
 			</el-form>
@@ -287,7 +278,7 @@ export default {
 	created() {
 		activityIds().then(data => {
 			if (data.status == 200) {
-				this.optionsId = data.data;
+				this.optionsId = data.data
 			}
 		})
 	},
@@ -306,11 +297,14 @@ export default {
 		}
 	},
 	methods: {
-		handleBannerSuccess(res, file) {
-			this.fileList2.push({ url: res.data })
-			this.form.vehicleImgs = this.fileList2
+		handleBannerSuccess(res, file, fileList) {
+			console.log(fileList);
+			this.fileList2 = fileList
+			// this.form.vehicleImgs = this.fileList2
+		},
+		handleRemove(res, file, fileList) {
+			this.fileList2 = file
 		},
-		handleRemove() {},
 		getOrderInfo() {
 			this.title = this.titleNme
 			if (this.title === '编辑峰会') {
@@ -384,7 +378,7 @@ export default {
 		},
 		getState(status) {
 			if (this.$utils.isInteger(status)) {
-				console.log(status);
+				console.log(status)
 				if (status == 0) {
 					return '默认'
 				} else {
@@ -450,10 +444,17 @@ export default {
 					? (this.form.bmCloseTime = this.form.bmCloseTime)
 					: (this.form.bmCloseTime = this.form.bmCloseTime.getTime())
 				let pic = []
-				if (!!this.form.vehicleImgs) {
-					this.form.vehicleImgs.forEach(element => {
-						pic.push(element.url)
-					})
+				if (this.fileList2 != '') {
+					console.log(this.fileList2);
+					this.fileList2.forEach(element => {
+						if (!!element.response) {
+							pic.push(element.response.data)
+						}else{
+							pic.push(element.url);
+						}
+					});
+					console.log(pic);
+					
 					this.form.vehicleImgs = pic.join(',')
 				}
 
@@ -501,12 +502,18 @@ export default {
 				this.form.startTime = this.form.startTime.getTime()
 				this.form.bmCloseTime = this.form.bmCloseTime.getTime()
 				let pic = []
-				if (!!this.form.vehicleImgs) {
-					this.form.vehicleImgs.forEach(element => {
-						pic.push(element.url)
-					})
+				if (this.fileList2 != '') {
+					this.fileList2.forEach(element => {
+						pic.push(element.response.data);
+					});
 					this.form.vehicleImgs = pic.join(',')
 				}
+				// if (!!this.form.vehicleImgs) {
+				// 	this.form.vehicleImgs.forEach(element => {
+				// 		pic.push(element.url)
+				// 	})
+				// 	this.form.vehicleImgs = pic.join(',')
+				// }
 				this.dataProcessing()
 				add(this.form).then(res => {
 					this.responseResult(res)
@@ -516,7 +523,7 @@ export default {
 		dataProcessing() {
 			if (this.form.state === '默认') {
 				this.form.status = '0'
-			}else{
+			} else {
 				this.form.status = this.statusRadio
 			}
 			this.form.processJson = JSON.stringify(this.processJson)

src/views/vehicle/vehicleInfo/index.vue

@@ -1541,11 +1541,11 @@
             },
             queryVehicleModelSearch(queryString, cb) {
                 let selectArry = [];
-                let iitem = {
-                    value: "全部",
-                    name: "全部"
-                };
-                selectArry.push(iitem);
+              //   let iitem = {
+              //   value: "全部",
+              //   name: "全部"
+              // };
+              //   selectArry.push(iitem);
                 this.allVehicleList.map(function (item) {
                     item.value = item.name;
                     selectArry.push(item);