From f8b9ccf70df347ed40cadb44202e92a9cd812c3d Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 09 十一月 2023 10:25:44 +0800
Subject: [PATCH] # 创建修改人

---
 admin/src/views/business/miniproSetting.vue |  106 +++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 86 insertions(+), 20 deletions(-)

diff --git a/admin/src/views/business/miniproSetting.vue b/admin/src/views/business/miniproSetting.vue
index 8bf034e..bac9511 100644
--- a/admin/src/views/business/miniproSetting.vue
+++ b/admin/src/views/business/miniproSetting.vue
@@ -10,22 +10,24 @@
         <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" format='HH:mm'
+          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" format='HH:mm'
+          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>
@@ -33,15 +35,36 @@
       <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
+            :file="{ 'imgurlfull': form.leaseNoticeUrl, 'imgurl': leaseNoticeUrl }"
+            :uploadData="uploadData" tipsLabel="" @uploadSuccess="uploadOutSuccess" @uploadEnd="isUploading=false"
+            @uploadBegin="isUploading=true" />
+            <div class="tips">
+              <el-button type="text" style="color: red;" @click="form.leaseNoticeUrl = ''">鍒犻櫎</el-button>
+            </div>
+        </div>
+      </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">
-          <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 class="tips">鍙兘涓婁紶mp4鏍煎紡锛屽缓璁笉瓒呰繃50M</div>
+        <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 class="tips">
+            <div>
+              <el-button type="text" style="color: red;" @click="form.rentTipsVideo = ''">鍒犻櫎</el-button>
+            </div>
+            <div>鍙兘涓婁紶mp4鏍煎紡锛屽缓璁笉瓒呰繃50M</div>
+          </div>
+        </div>
+        
+      </el-form-item>
+      <el-form-item label="绉熻祦椤荤煡">
+        <RichEditor :content="{ content: form.leaseNotice }" @edit="form.leaseNotice = $event"></RichEditor>
       </el-form-item>
       <el-form-item label="楠戣溅閫氱煡鍐呭">
         <el-input type="textarea" :autosize="{ minRows: 4, maxRows: 8 }" v-model="form.rentNotice"
@@ -56,14 +79,27 @@
             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="寮�濮嬫椂闂�" format='HH:mm' value-format="yyyy-MM-dd HH:mm:ss"
+            v-model="form.stopServeStarttime"></el-time-picker>
           鑷�
-          <el-time-select placeholder="缁撴潫鏃堕棿" v-model="form.stopServeEndtime"></el-time-select>
+          <el-time-picker placeholder="缁撴潫鏃堕棿" value-format="yyyy-MM-dd HH:mm:ss" format='HH:mm'
+            v-model="form.stopServeEndtime"></el-time-picker> -->
+            <el-date-picker
+              v-model="value1"
+              type="datetimerange"
+              @change="selectDate"
+              range-separator="鑷�"
+              start-placeholder="寮�濮嬫椂闂�"
+              end-placeholder="缁撴潫鏃堕棿"
+              format="yyyy-MM-dd HH:mm:ss"
+              value-format="yyyy-MM-dd HH:mm:ss"
+            ></el-date-picker>
           <div class="tips">鍋滄鏈嶅姟寮�濮嬫椂闂磋嚦缁撴潫鏃堕棿</div>
         </el-form-item>
       </template>
       <el-form-item label="">
-        <el-button type="primary" v-permissions="['system:dict:updateMiniProgrammeDTO']" @click="saveSetting">淇濆瓨閰嶇疆椤�</el-button>
+        <el-button type="primary" v-permissions="['system:dict:updateMiniProgrammeDTO']"
+          @click="saveSetting">淇濆瓨閰嶇疆椤�</el-button>
       </el-form-item>
     </el-form>
   </TableLayout>
@@ -72,15 +108,27 @@
 <script>
 import TableLayout from '@/layouts/TableLayout'
 import { getMiniProgrammeDTO, updateById } from '@/api/business/minproSetting'
+import UploadAvatarImage from '@/components/common/UploadAvatarImage.vue'
+import RichEditor from '@/components/common/RichEditor.vue'
 export default {
   name: 'BaseParam',
-  components: { TableLayout },
+  components: { TableLayout, UploadAvatarImage, RichEditor },
   data() {
     return {
+      uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/public/uploadLocal',
+      option: {
+        format: 'HH:mm'
+      },
+      uploadData: {folder: 'bike'},
+      leaseNoticeUrl: '',
+      isUploading: false,
+      value1: [],
       // 鎼滅储
       form: {
         businessEndtime: '',
         businessStarttime: '',
+        leaseNoticeUrl: '',
+        leaseNotice: '',
         freeRentTime: '',
         isStopServe: 0,
         projectName: '',
@@ -102,11 +150,25 @@
       .then(res => {
         console.log(res);
         this.form = res
+        this.value1 = [res.stopServeStarttime, res.stopServeEndtime]
       })
   },
   methods: {
     handleAvatarSuccess(res, file) {
-      this.imageUrl = URL.createObjectURL(file.raw);
+      console.log(res.data.url);
+      this.form.rentTipsVideo = res.data.url;
+    },
+    uploadOutSuccess(file) {
+      this.leaseNoticeUrl = file.imgurl;
+      this.form.leaseNoticeUrl = file.imgurlfull;
+    },
+    selectDate(v) {
+      this.form.stopServeStarttime = ''
+      this.form.stopServeEndtime = ''
+      if (v) {
+        this.form.stopServeStarttime = v[0]
+        this.form.stopServeEndtime = v[1]
+      }
     },
     // beforeAvatarUpload(file) {
     //   console.log(file.type);
@@ -132,7 +194,7 @@
 
 <style lang="scss" scoped>
 ::v-deep .el-form {
-  width: 800px;
+  width: 900px;
 }
 
 ::v-deep .table-content {
@@ -174,5 +236,9 @@
 
 .tips {
   color: #999;
+  display: flex;
+  justify-content: space-between;
+  flex-direction: column;
+  margin-left: 10px;
 }
 </style>

--
Gitblit v1.9.3