From 2e3adf807c3c198746d3d51fbab4d71bdf22af81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 十一月 2023 10:14:20 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
admin/src/views/business/miniproSetting.vue | 102 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 73 insertions(+), 29 deletions(-)
diff --git a/admin/src/views/business/miniproSetting.vue b/admin/src/views/business/miniproSetting.vue
index bac9511..18aa191 100644
--- a/admin/src/views/business/miniproSetting.vue
+++ b/admin/src/views/business/miniproSetting.vue
@@ -10,7 +10,7 @@
<el-input v-model="form.serverPhone" placeholder="璇疯緭鍏ユ湇鍔＄數璇�"></el-input>
</el-form-item>
<el-form-item label="鎶奸噾閲戦">
- <el-input v-model="form.rentDeposit" type="number" placeholder="璇疯緭鍏ユ娂閲戦噾棰�"></el-input>
+ <el-input v-model="form.rentDeposit" @change="changeVal(form.rentDeposit,1)" type="number" placeholder="璇疯緭鍏ユ娂閲戦噾棰�"></el-input>
<div class="tips">璇疯緭鍏ラ渶瑕佺即绾崇殑鎶奸噾閲戦(鍗曚綅锛氬厓)</div>
</el-form-item>
<el-form-item label="钀ヤ笟鏃堕棿">
@@ -21,20 +21,20 @@
v-model="form.businessEndtime"></el-time-picker>
</el-form-item>
<el-form-item label="鍏嶈垂楠戣鏃堕暱">
- <el-input v-model="form.freeRentTime" type="number" placeholder="璇疯緭鍏ュ厤璐归獞琛屾椂闀�"></el-input>
+ <el-input v-model="form.freeRentTime" type="number" @change="changeVal(form.freeRentTime,2)" placeholder="璇疯緭鍏ュ厤璐归獞琛屾椂闀�"></el-input>
<div class="tips">鍏嶈垂楠戣鏃堕暱锛屽崟浣嶏細鍒嗛挓</div>
</el-form-item>
<el-form-item label="婊¤浇棰勮(%)" prop="name">
<div style="display: flex;">
- 浣庝簬<el-input style="width: 80px;" v-model="form.warnMin" type="number" placeholder="鏈�灏忓��"></el-input>
- 鎴栭珮浜�<el-input style="width: 80px;" v-model="form.warnMax" type="number" placeholder="鏈�澶у��"></el-input>
+ 浣庝簬<el-input style="width: 80px;" v-model="form.warnMin" @change="changeVal(form.warnMin,3)" type="number" placeholder="鏈�灏忓��"></el-input>
+ 鎴栭珮浜�<el-input style="width: 80px;" v-model="form.warnMax" @change="changeVal(form.warnMax,4)" type="number" placeholder="鏈�澶у��"></el-input>
浼氭兂閽夐拤缇ゅ彂閫侀璀�
</div>
<div class="tips">褰撹溅杈嗘弧杞借秴杩囦互涓婇厤缃椂锛屾彁绀虹鐞嗗憳</div>
</el-form-item>
- <el-form-item label="棰勮閽夐拤缇ゅ湴鍧�">
- <el-input v-model="form.warnDingdingUrl" placeholder="璇疯緭鍏ラ璀﹂拤閽夌兢鍦板潃"></el-input>
- </el-form-item>
+<!-- <el-form-item label="棰勮閽夐拤缇ゅ湴鍧�">-->
+<!-- <el-input v-model="form.warnDingdingUrl" placeholder="璇疯緭鍏ラ璀﹂拤閽夌兢鍦板潃"></el-input>-->
+<!-- </el-form-item>-->
<el-form-item label="绉熻祦椤荤煡涓诲浘">
<div style="display: flex;">
<UploadAvatarImage
@@ -48,20 +48,33 @@
</el-form-item>
<el-form-item label="绉熻祦娴佺▼瑙嗛" prop="name">
<div style="display: flex;">
- <el-upload class="avatar-uploader" :action="uploadImgUrl" :show-file-list="false" accept=".mp4"
- :data="{ folder: 'bike', }" :on-success="handleAvatarSuccess">
- <video v-if="form.rentTipsVideo" :src="form.rentTipsVideo" class="avatar"></video>
- <!-- <img v-if="imageUrl" :src="imageUrl" > -->
- <i v-else class="el-icon-plus avatar-uploader-icon"></i>
- </el-upload>
+ <div style="width: 250px;height: 180px" v-if="form.rentTipsVideo">
+ <video controls :src="form.rentTipsVideo" style="width: 100%;height: 100%"></video>
+ </div>
+<!-- <el-upload class="avatar-uploader" :action="uploadImgUrl" :show-file-list="false" accept=".mp4"-->
+<!-- :data="{ folder: 'bike', }" :on-success="handleAvatarSuccess">-->
+<!-- <video v-if="form.rentTipsVideo" :src="form.rentTipsVideo" class="avatar"></video>-->
+<!-- <i v-else class="el-icon-plus avatar-uploader-icon"></i>-->
+<!-- </el-upload>-->
<div class="tips">
<div>
+ <el-upload
+ class="upload-demo"
+ ref="upload"
+ :action="uploadImgUrl"
+ :show-file-list="false"
+ accept=".mp4"
+ :data="{ folder: 'bike', }"
+ :on-success="handleAvatarSuccess">
+ <el-button slot="trigger" size="small" type="primary">涓婁紶瑙嗛</el-button>
+ <div slot="tip" class="el-upload__tip">鍙兘涓婁紶mp4鏍煎紡锛屽缓璁笉瓒呰繃50M</div>
+ </el-upload>
<el-button type="text" style="color: red;" @click="form.rentTipsVideo = ''">鍒犻櫎</el-button>
</div>
- <div>鍙兘涓婁紶mp4鏍煎紡锛屽缓璁笉瓒呰繃50M</div>
+<!-- <div>鍙兘涓婁紶mp4鏍煎紡锛屽缓璁笉瓒呰繃50M</div>-->
</div>
</div>
-
+
</el-form-item>
<el-form-item label="绉熻祦椤荤煡">
<RichEditor :content="{ content: form.leaseNotice }" @edit="form.leaseNotice = $event"></RichEditor>
@@ -113,13 +126,13 @@
export default {
name: 'BaseParam',
components: { TableLayout, UploadAvatarImage, RichEditor },
- data() {
+ data () {
return {
uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal',
option: {
format: 'HH:mm'
},
- uploadData: {folder: 'bike'},
+ uploadData: { folder: 'bike' },
leaseNoticeUrl: '',
isUploading: false,
value1: [],
@@ -141,28 +154,46 @@
stopServeTips: '',
warnDingdingUrl: '',
warnMax: '',
- warnMin: '',
+ warnMin: ''
}
}
},
- created() {
+ created () {
getMiniProgrammeDTO()
.then(res => {
- console.log(res);
this.form = res
this.value1 = [res.stopServeStarttime, res.stopServeEndtime]
})
},
methods: {
- handleAvatarSuccess(res, file) {
- console.log(res.data.url);
- this.form.rentTipsVideo = res.data.url;
+ changeVal (val, type) {
+ if (type === 1) {
+ if (this.form.rentDeposit < 0) {
+ this.form.rentDeposit = ''
+ }
+ } else if (type === 2) {
+ if (this.form.freeRentTime < 0) {
+ this.form.freeRentTime = ''
+ }
+ } else if (type === 3) {
+ if (this.form.warnMin < 0) {
+ this.form.warnMin = ''
+ }
+ } else if (type === 4) {
+ if (this.form.warnMax < 0) {
+ this.form.warnMax = ''
+ }
+ }
},
- uploadOutSuccess(file) {
- this.leaseNoticeUrl = file.imgurl;
- this.form.leaseNoticeUrl = file.imgurlfull;
+ handleAvatarSuccess (res, file) {
+ console.log(res.data.url)
+ this.form.rentTipsVideo = res.data.url
},
- selectDate(v) {
+ uploadOutSuccess (file) {
+ this.leaseNoticeUrl = file.imgurl
+ this.form.leaseNoticeUrl = file.imgurlfull
+ },
+ selectDate (v) {
this.form.stopServeStarttime = ''
this.form.stopServeEndtime = ''
if (v) {
@@ -182,13 +213,26 @@
// // }
// return isJPG;
// },
- saveSetting() {
+ saveSetting () {
+ const reg = /^[0-9][0-9]*|0\.\d*[0-9]\d*$/
+ if (!reg.test(this.form.rentDeposit)) {
+ return this.$tip.apiFailed({ message: '鎶奸噾閲戦蹇呴』澶т簬0' })
+ }
+ if (!reg.test(this.form.freeRentTime)) {
+ return this.$tip.apiFailed({ message: '鍏嶈垂楠戣鏃堕暱蹇呴』澶т簬0' })
+ }
+ if (!reg.test(this.form.warnMin)) {
+ return this.$tip.apiFailed({ message: '婊¤浇棰勮蹇呴』澶т簬0' })
+ }
+ if (!reg.test(this.form.warnMax)) {
+ return this.$tip.apiFailed({ message: '婊¤浇棰勮蹇呴』澶т簬0' })
+ }
updateById(this.form)
.then(res => {
this.$tip.apiSuccess('淇濆瓨鎴愬姛')
})
}
- },
+ }
}
</script>
--
Gitblit v1.9.3