1. 修复bug

src/myComponents/uploadFile.vue

@@ -0,0 +1,77 @@
+<template>
+    <div>
+        <input type="file" @change="uploadFileFun" multiple id="selectFile">
+        <span id="progress1"></span>
+
+        <span @click="downloadFileFun">download</span>
+        <span id="progress2"></span>
+
+    </div>
+</template>
+<script>
+export default {
+    name: "UploadFile",
+    data(){
+        return {
+            status: null
+        }
+    },
+    methods: {
+        uploadFileFun(e) {
+            let file = e.target.files[0]
+            let xhr = new XMLHttpRequest()
+            let formData = new FormData()
+            formData.append('file', file)
+            formData.append('bucket', 'tourism')
+            
+            // 跟踪上传进度
+            xhr.upload.onprogress = function(event) {
+                let progress1 = document.querySelector('#progress1')
+                const percent = Math.floor((event.loaded / event.total) * 100)
+                progress1.innerHTML = percent + '%'
+                console.log(`Uploaded ${event.loaded} of ${event.total}, ${percent}%`)
+            }
+
+            // 跟踪完成：无论成功与否
+            xhr.onloadend = function() {
+                if (xhr.status == 200) {
+                console.log("success")
+                } else {
+                console.log("error " + this.status)
+                }
+            }
+
+            xhr.open("POST", "/tourism-merchant-api/thirdapi/upload/single/minio")
+            xhr.send(formData)
+        },
+        downloadFileFun() {
+            const xhr = new XMLHttpRequest()
+
+            xhr.onprogress = function(event) {
+                if (event.lengthComputable) {
+                    const progress2 = document.querySelector('#progress2')
+                    const percent = Math.floor((event.loaded / event.total) * 100)
+                    progress2.innerHTML = percent + '%'
+                    console.log(`Received ${event.loaded} of ${event.total} bytes`)
+                } else {
+                console.log(`Received ${event.loaded} bytes`) // 没有 Content-Length
+                }
+            }
+
+            // 跟踪完成：无论成功与否
+            xhr.onloadend = function() {
+                if (xhr.status == 200) {
+                console.log("success")
+                } else {
+                console.log("error " + this.status)
+                }
+            }
+
+            xhr.open("GET", "http://localhost/ceshi.jpg")
+            xhr.send()
+        }
+    }
+}
+</script>
+<style>
+</style>

src/views/system/user/profile/resetPwd.vue

@@ -18,7 +18,7 @@
 
 <script>
 import { updateUserPwd } from "@/api/system/user";
-
+import store from '@/store'
 export default {
   data() {
     const equalToPassword = (rule, value, callback) => {
@@ -57,6 +57,9 @@ export default {
         if (valid) {
           updateUserPwd(this.user.oldPassword, this.user.newPassword).then(response => {
             this.$modal.msgSuccess("修改成功");
+            store.dispatch('LogOut').then(() => {
+              location.href = '/login';
+            })
           });
         }
       });

src/views/tourism/membershipManagement/electronicMembership/detailsBox/memberInformationDetails.vue

@@ -49,7 +49,7 @@
               </span>
             </el-form-item>
             <el-form-item label="会员卡号：">
-              <span style="display: block;min-width: 250px;">{{ form.name }}</span>
+              <span style="display: block;min-width: 250px;">{{ form.memberCode }}</span>
             </el-form-item>
           </div>
           <div style="display: flex;">

src/views/tourism/productManagement/formBox/scenicAreaTicketsForm.vue

@@ -54,12 +54,14 @@
           </el-form-item>
           <el-tabs v-model="activeName">
             <el-tab-pane label="产品介绍" name="first">
-              <el-form-item label-width="0" label="0" prop="performSnapshot">
+              <el-form-item label-width="0" label="" prop="performSnapshot"></el-form-item>
+              <el-form-item label-width="0" label="">
                 <editor ref="editor" v-model="form.performSnapshot" :fileSize="20" :min-height="200" />
               </el-form-item>
             </el-tab-pane>
             <el-tab-pane label="购票须知" name="second">
-              <el-form-item label-width="0" label="" prop="performNotice">
+              <el-form-item label-width="0" label="" prop="performNotice"></el-form-item>
+              <el-form-item label-width="0" label="">
                 <editor ref="editor" v-model="form.performNotice" :fileSize="20" :min-height="200" />
               </el-form-item>
             </el-tab-pane>
@@ -270,6 +272,25 @@ export default {
       this.actionUrlLoading = false
     },
   },
+  watch: {
+    'form.performNotice'() {
+      if(this.form.performNotice == '<p><br></p>') {
+        this.form.performNotice = null
+      }
+      if(this.$refs["form"]) {
+        this.$refs["form"].validateField('performNotice');
+      }
+      
+    },
+    'form.performSnapshot'() {
+      if(this.form.performSnapshot == '<p><br></p>') {
+        this.form.performSnapshot = null
+      }
+      if(this.$refs["form"]) {
+        this.$refs["form"].validateField('performSnapshot');
+      }
+    }
+  }
 };
 </script>
 

src/views/tourism/productManagement/formBox/scenicAreaTicketsSpecsForm.vue

@@ -167,11 +167,11 @@
               <div class="form-title"><span>退票规则</span></div>
               <el-form-item label="退票政策" prop="backStatus">
                 <el-radio-group v-model="form.backStatus">
-                  <el-radio :label="1">允许退票</el-radio>
-                  <el-radio :label="2">不允许退票</el-radio>
+                  <el-radio :label="0">允许退票</el-radio>
+                  <el-radio :label="1">不允许退票</el-radio>
                 </el-radio-group>
               </el-form-item>
-              <el-form-item label="提前退票" v-if="form.backStatus==1" prop="backStatusRadio">
+              <el-form-item label="提前退票" v-if="form.backStatus==0" prop="backStatusRadio">
                 <div style="display: flex;align-items: center;">
                   <el-radio-group v-model="form.backStatusRadio" @input="radioInputss">
                     <el-radio label="-1">不限</el-radio>

src/views/tourism/productManagement/scenicAreaTickets.vue

@@ -45,14 +45,14 @@
                   type="text"
                   icon="el-icon-edit"
                   @click="handleUpdate(scope.row)"
-                  v-hasPermi="configPermi.edit"
+                  v-hasPermi="configPermi.editBase"
                 >修改基本信息</el-button>
                 <el-button
                   size="mini"
                   type="text"
                   icon="el-icon-edit"
                   @click="handleUpdateSpecs(scope.row)"
-                  v-hasPermi="configPermi.edit"
+                  v-hasPermi="configPermi.editGuige"
                 >规格信息</el-button>
                 <el-button
                   size="mini"

src/views/tourism/scenicAreaManagement/navigationManagement/formBox/pointTypeForm.vue

@@ -47,7 +47,7 @@
         <el-form-item label="点位图标" prop="iconPath">
           <div
           style="width: 120px;"
-          v-loading="actionUrlLoading"
+          v-loading="actionUrlLoading1"
           element-loading-text="上传中..."
           element-loading-spinner="el-icon-loading"
           element-loading-background="rgba(0, 0, 0, 0.8)"
@@ -159,6 +159,7 @@ export default {
       this.loadingText = "拼命加载数据中..."
       this.loading = true
       this.actionUrlLoading = false
+      this.actionUrlLoading1 = false
       this.model = model
       this.formStatus = 0
       if(model=='ADD') { // 新增
@@ -316,7 +317,7 @@ export default {
     /**  上传图片  */
     handleAvatarSuccess1(res, file) {
       console.log("res, file",res, file)
-      this.actionUrlLoading = false
+      this.actionUrlLoading1 = false
       if(res.code != 200) {
         this.$set(this.form,'iconPath',null) 
       }else {

src/views/tourism/scenicAreaManagement/navigationManagement/formBox/scenicGuideForm.vue

@@ -163,7 +163,10 @@ export default {
       this.model = model
       this.formStatus = 0
       if(model=='ADD') { // 新增
-        this.$set(this,'form',row)
+        this.$set(this,'form',{
+          ...row,
+          imgUrl: []
+        })
         this.formStatus = 1
         this.$nextTick(()=>{
           if(this.form.longitude&&this.form.latitude){
@@ -325,7 +328,12 @@ export default {
       console.log("res, file",response, file, fileList)
       this.actionUrlLoading = false
       if(response.code == 200) {
-        this.form.imgUrl.push(response.data.url)
+        if(this.form.imgUrl) {
+          this.form.imgUrl.push(response.data.url)
+        }else {
+          this.form.imgUrl = [response.data.url]
+        }
+       
       }
     },
     beforeAvatarUpload(file) {
@@ -337,7 +345,7 @@ export default {
         this.$message.error(`上传图片图片只能是 ${typeList} 格式!`);
       }
       if (!isLt2M) {
-        this.$message.error('上传图片图片大小不能超过 2MB!');
+        this.$message.error('上传图片图片大小不能超过 1MB!');
       }
 
       let isSize = new Promise(function (resolve, reject) {

src/views/tourism/scenicAreaManagement/navigationManagement/scenicGuide.vue

@@ -173,7 +173,7 @@ export default {
         { key: 2, label: `类型`, visible: true },
         { key: 3, label: `打卡距离`, visible: true },
         { key: 4, label: `可用状态`, visible: true },
-        { key: 4, label: `创建时间`, visible: true },
+        { key: 5, label: `创建时间`, visible: true },
       ],
     };
   },