From 051abca66db233f5dbde3f69aa706422e1ac9fd9 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期三, 18 十月 2023 16:41:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
admin/src/views/business/miniproSetting.vue | 28 ++++++++++++++++------------
1 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/admin/src/views/business/miniproSetting.vue b/admin/src/views/business/miniproSetting.vue
index 8bf034e..a869a4d 100644
--- a/admin/src/views/business/miniproSetting.vue
+++ b/admin/src/views/business/miniproSetting.vue
@@ -10,22 +10,22 @@
<el-input v-model="form.serverPhone" placeholder="璇疯緭鍏ユ湇鍔＄數璇�"></el-input>
</el-form-item>
<el-form-item label="鎶奸噾閲戦">
- <el-input v-model="form.rentDeposit" placeholder="璇疯緭鍏ユ娂閲戦噾棰�"></el-input>
+ <el-input v-model="form.rentDeposit" type="number" placeholder="璇疯緭鍏ユ娂閲戦噾棰�"></el-input>
<div class="tips">璇疯緭鍏ラ渶瑕佺即绾崇殑鎶奸噾閲戦(鍗曚綅锛氬厓)</div>
</el-form-item>
<el-form-item label="钀ヤ笟鏃堕棿">
- <el-time-select placeholder="寮�濮嬫椂闂�" v-model="form.businessStarttime"></el-time-select>
+ <el-time-picker placeholder="寮�濮嬫椂闂�" value-format="HH:mm" :picker-options="option" v-model="form.businessStarttime"></el-time-picker>
鑷�
- <el-time-select placeholder="缁撴潫鏃堕棿" v-model="form.businessEndtime"></el-time-select>
+ <el-time-picker placeholder="缁撴潫鏃堕棿" value-format="HH:mm" :picker-options="option" v-model="form.businessEndtime"></el-time-picker>
</el-form-item>
<el-form-item label="鍏嶈垂楠戣鏃堕暱">
- <el-input v-model="form.freeRentTime" placeholder="璇疯緭鍏ュ悕绉�"></el-input>
+ <el-input v-model="form.freeRentTime" type="number" 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" placeholder="鏈�灏忓��"></el-input>
- 鎴栭珮浜�<el-input style="width: 80px;" v-model="form.warnMax" placeholder="鏈�澶у��"></el-input>
+ 浣庝簬<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>
浼氭兂閽夐拤缇ゅ彂閫侀璀�
</div>
<div class="tips">褰撹溅杈嗘弧杞借秴杩囦互涓婇厤缃椂锛屾彁绀虹鐞嗗憳</div>
@@ -34,9 +34,8 @@
<el-input v-model="form.warnDingdingUrl" placeholder="璇疯緭鍏ラ璀﹂拤閽夌兢鍦板潃"></el-input>
</el-form-item>
<el-form-item label="绉熻祦娴佺▼瑙嗛" prop="name">
- <!-- :before-upload="beforeAvatarUpload" -->
- <el-upload class="avatar-uploader" action="https://jsonplaceholder.typicode.com/posts/" :show-file-list="false"
- accept=".mp4" :on-success="handleAvatarSuccess">
+ <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>
@@ -56,9 +55,9 @@
placeholder="璇疯緭鍏ュ仠姝㈡湇鍔℃彁绀�"></el-input>
</el-form-item>
<el-form-item label="鍋滄鏈嶅姟鏃堕棿">
- <el-time-select placeholder="寮�濮嬫椂闂�" v-model="form.stopServeStarttime"></el-time-select>
+ <el-time-picker placeholder="寮�濮嬫椂闂�" value-format="HH:mm" :picker-options="option" v-model="form.stopServeStarttime"></el-time-picker>
鑷�
- <el-time-select placeholder="缁撴潫鏃堕棿" v-model="form.stopServeEndtime"></el-time-select>
+ <el-time-picker placeholder="缁撴潫鏃堕棿" value-format="HH:mm" :picker-options="option" v-model="form.stopServeEndtime"></el-time-picker>
<div class="tips">鍋滄鏈嶅姟寮�濮嬫椂闂磋嚦缁撴潫鏃堕棿</div>
</el-form-item>
</template>
@@ -77,6 +76,10 @@
components: { TableLayout },
data() {
return {
+ uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal',
+ option: {
+ format: 'HH:mm'
+ },
// 鎼滅储
form: {
businessEndtime: '',
@@ -106,7 +109,8 @@
},
methods: {
handleAvatarSuccess(res, file) {
- this.imageUrl = URL.createObjectURL(file.raw);
+ console.log(res.data.url);
+ this.form.rentTipsVideo = res.data.url;
},
// beforeAvatarUpload(file) {
// console.log(file.type);
--
Gitblit v1.9.3