From 43e1199ca0c75787fb6b52bef7d595abd115ceab Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期四, 02 一月 2025 21:44:58 +0800
Subject: [PATCH] 修改bug
---
ruoyi-ui/src/views/self/memo.vue | 20 ++++++---
ruoyi-ui/src/assets/images/护理查体.png | 0
ruoyi-ui/src/views/healthy/Examination.vue | 2
ruoyi-ui/src/views/travel/index.vue | 5 +-
ruoyi-ui/src/views/contacts/index.vue | 2
ruoyi-ui/src/views/meeting/webcast.vue | 5 +-
ruoyi-ui/src/views/device/memo.vue | 2
ruoyi-ui/src/views/economy/index.vue | 2
ruoyi-ui/src/views/secret/index.vue | 8 +++-
ruoyi-ui/src/views/wish/index.vue | 4 +
ruoyi-ui/src/views/doctor/index.vue | 2
ruoyi-ui/src/views/honor/index.vue | 4 +
ruoyi-ui/src/views/self/show.vue | 21 ++++++++--
ruoyi-ui/src/assets/images/生活习惯.png | 0
ruoyi-ui/src/views/pet/petnote.vue | 2
ruoyi-ui/src/views/genealogy/index.vue | 2
ruoyi-ui/src/views/healthy/healthYear.vue | 2
ruoyi-ui/src/views/marry/index.vue | 2
ruoyi-ui/src/views/note/memo.vue | 2
ruoyi-ui/src/views/bignote/index.vue | 2
ruoyi-ui/vue.config.js | 2
ruoyi-ui/src/assets/images/基本情况.png | 0
ruoyi-ui/src/views/secret/memo.vue | 2
ruoyi-ui/src/views/pet/index.vue | 2
ruoyi-ui/src/views/collection/index.vue | 2
ruoyi-ui/src/views/healthy/index.vue | 2
ruoyi-ui/src/views/device/index.vue | 2
ruoyi-ui/src/views/clean/index.vue | 2
ruoyi-ui/src/views/selfeconomy/index.vue | 4 +
ruoyi-ui/src/views/note/index.vue | 2
ruoyi-ui/src/views/selfeconomy/memo.vue | 2
31 files changed, 70 insertions(+), 41 deletions(-)
diff --git "a/ruoyi-ui/src/assets/images/\345\237\272\346\234\254\346\203\205\345\206\265.png" "b/ruoyi-ui/src/assets/images/\345\237\272\346\234\254\346\203\205\345\206\265.png"
index 852c4d6..317ef22 100644
--- "a/ruoyi-ui/src/assets/images/\345\237\272\346\234\254\346\203\205\345\206\265.png"
+++ "b/ruoyi-ui/src/assets/images/\345\237\272\346\234\254\346\203\205\345\206\265.png"
Binary files differ
diff --git "a/ruoyi-ui/src/assets/images/\346\212\244\347\220\206\346\237\245\344\275\223.png" "b/ruoyi-ui/src/assets/images/\346\212\244\347\220\206\346\237\245\344\275\223.png"
index fa646d1..43771c9 100644
--- "a/ruoyi-ui/src/assets/images/\346\212\244\347\220\206\346\237\245\344\275\223.png"
+++ "b/ruoyi-ui/src/assets/images/\346\212\244\347\220\206\346\237\245\344\275\223.png"
Binary files differ
diff --git "a/ruoyi-ui/src/assets/images/\347\224\237\346\264\273\344\271\240\346\203\257.png" "b/ruoyi-ui/src/assets/images/\347\224\237\346\264\273\344\271\240\346\203\257.png"
index 91adf43..b939e9b 100644
--- "a/ruoyi-ui/src/assets/images/\347\224\237\346\264\273\344\271\240\346\203\257.png"
+++ "b/ruoyi-ui/src/assets/images/\347\224\237\346\264\273\344\271\240\346\203\257.png"
Binary files differ
diff --git a/ruoyi-ui/src/views/bignote/index.vue b/ruoyi-ui/src/views/bignote/index.vue
index a0b98b1..8384fbe 100644
--- a/ruoyi-ui/src/views/bignote/index.vue
+++ b/ruoyi-ui/src/views/bignote/index.vue
@@ -602,7 +602,7 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
fileList:[],
fileList1:[],
uploadFileList: [],
diff --git a/ruoyi-ui/src/views/clean/index.vue b/ruoyi-ui/src/views/clean/index.vue
index 42bbb05..2bb68dc 100644
--- a/ruoyi-ui/src/views/clean/index.vue
+++ b/ruoyi-ui/src/views/clean/index.vue
@@ -631,7 +631,7 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','m4a'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','m4a','.M4A'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/collection/index.vue b/ruoyi-ui/src/views/collection/index.vue
index 4c6a2d8..9a9dc82 100644
--- a/ruoyi-ui/src/views/collection/index.vue
+++ b/ruoyi-ui/src/views/collection/index.vue
@@ -699,7 +699,7 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
fileList:[],
fileList1:[],
uploadFileList: [],
diff --git a/ruoyi-ui/src/views/contacts/index.vue b/ruoyi-ui/src/views/contacts/index.vue
index ba8b7cf..e73bf67 100644
--- a/ruoyi-ui/src/views/contacts/index.vue
+++ b/ruoyi-ui/src/views/contacts/index.vue
@@ -682,7 +682,7 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/device/index.vue b/ruoyi-ui/src/views/device/index.vue
index c0cc85f..6ae214d 100644
--- a/ruoyi-ui/src/views/device/index.vue
+++ b/ruoyi-ui/src/views/device/index.vue
@@ -628,7 +628,7 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/device/memo.vue b/ruoyi-ui/src/views/device/memo.vue
index 934a537..ad4c923 100644
--- a/ruoyi-ui/src/views/device/memo.vue
+++ b/ruoyi-ui/src/views/device/memo.vue
@@ -402,7 +402,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[
],
fileList1:[],
diff --git a/ruoyi-ui/src/views/doctor/index.vue b/ruoyi-ui/src/views/doctor/index.vue
index 264cb3f..3774cc1 100644
--- a/ruoyi-ui/src/views/doctor/index.vue
+++ b/ruoyi-ui/src/views/doctor/index.vue
@@ -646,7 +646,7 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
'.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng',
- '.m4a'],
+ '.m4a','.M4A'],
fileList:[],
fileList1:[],
uploadFileList: [],
diff --git a/ruoyi-ui/src/views/economy/index.vue b/ruoyi-ui/src/views/economy/index.vue
index c17ae39..1a9030f 100644
--- a/ruoyi-ui/src/views/economy/index.vue
+++ b/ruoyi-ui/src/views/economy/index.vue
@@ -591,7 +591,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/genealogy/index.vue b/ruoyi-ui/src/views/genealogy/index.vue
index 08f94c2..4680d8f 100644
--- a/ruoyi-ui/src/views/genealogy/index.vue
+++ b/ruoyi-ui/src/views/genealogy/index.vue
@@ -203,7 +203,7 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ fot:[".jpg",".jif",'.M4A'],
fileList:[],
fileListOther:[],
dsb:true,
diff --git a/ruoyi-ui/src/views/healthy/Examination.vue b/ruoyi-ui/src/views/healthy/Examination.vue
index 9f275e9..b149fb3 100644
--- a/ruoyi-ui/src/views/healthy/Examination.vue
+++ b/ruoyi-ui/src/views/healthy/Examination.vue
@@ -362,7 +362,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/healthy/healthYear.vue b/ruoyi-ui/src/views/healthy/healthYear.vue
index 09755ab..18fff17 100644
--- a/ruoyi-ui/src/views/healthy/healthYear.vue
+++ b/ruoyi-ui/src/views/healthy/healthYear.vue
@@ -1289,7 +1289,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/healthy/index.vue b/ruoyi-ui/src/views/healthy/index.vue
index c4a7f37..6eca37c 100644
--- a/ruoyi-ui/src/views/healthy/index.vue
+++ b/ruoyi-ui/src/views/healthy/index.vue
@@ -410,7 +410,7 @@
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/honor/index.vue b/ruoyi-ui/src/views/honor/index.vue
index ec9b827..800a31b 100644
--- a/ruoyi-ui/src/views/honor/index.vue
+++ b/ruoyi-ui/src/views/honor/index.vue
@@ -613,7 +613,7 @@
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[],
fileList1:[],
uploadFileList: [],
@@ -872,6 +872,7 @@
// // alert(this.$store.state.user.clanId)
// this.listRoot = []
let clanId = this.$store.state.user.clanId
+ if(clanId!=null){
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -889,6 +890,7 @@
this.loading1 = false;
}
);
+ }
},
// 纭鍒嗕韩
subShare(row) {
diff --git a/ruoyi-ui/src/views/marry/index.vue b/ruoyi-ui/src/views/marry/index.vue
index 6adaecd..2d3a5e0 100644
--- a/ruoyi-ui/src/views/marry/index.vue
+++ b/ruoyi-ui/src/views/marry/index.vue
@@ -623,7 +623,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/meeting/webcast.vue b/ruoyi-ui/src/views/meeting/webcast.vue
index 70863c1..16ecd89 100644
--- a/ruoyi-ui/src/views/meeting/webcast.vue
+++ b/ruoyi-ui/src/views/meeting/webcast.vue
@@ -280,7 +280,7 @@
submitDataScope: function() {
let ul = this.fileList[0].url
this.formDat.avatar = ul,
- alert(this.formDat.avatar)
+ // alert(this.formDat.avatar)
this.$refs["elForm"].validate(valid => {
if (valid && this.formDat.roomId > 0) {
addWebcast(this.formDat).then(response => {
@@ -297,6 +297,7 @@
// for(let i = 0; i < this.fileListOther.length; i++){
// this.handleRemoveFile(this.fileListOther[0]);
// }
+ this.fileList = []
this.getList();
});
}else{
@@ -343,7 +344,7 @@
_this.fileList.push({name:response.data.fileName, url:response.data.url})
console.log(this.fileList)
// _this.fileList2.push({name:response.data.fileName, url:response.data.url})
- alert('ok')
+ // alert('ok')
})
},
diff --git a/ruoyi-ui/src/views/note/index.vue b/ruoyi-ui/src/views/note/index.vue
index acef4df..67271a4 100644
--- a/ruoyi-ui/src/views/note/index.vue
+++ b/ruoyi-ui/src/views/note/index.vue
@@ -613,7 +613,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/note/memo.vue b/ruoyi-ui/src/views/note/memo.vue
index 4694e93..310c961 100644
--- a/ruoyi-ui/src/views/note/memo.vue
+++ b/ruoyi-ui/src/views/note/memo.vue
@@ -407,7 +407,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[
],
fileList1:[],
diff --git a/ruoyi-ui/src/views/pet/index.vue b/ruoyi-ui/src/views/pet/index.vue
index 3908ab7..314d317 100644
--- a/ruoyi-ui/src/views/pet/index.vue
+++ b/ruoyi-ui/src/views/pet/index.vue
@@ -564,7 +564,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList1:[ ],
fileList2:[ ],
diff --git a/ruoyi-ui/src/views/pet/petnote.vue b/ruoyi-ui/src/views/pet/petnote.vue
index 17cbe1f..2cc88d3 100644
--- a/ruoyi-ui/src/views/pet/petnote.vue
+++ b/ruoyi-ui/src/views/pet/petnote.vue
@@ -341,7 +341,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[
],
diff --git a/ruoyi-ui/src/views/secret/index.vue b/ruoyi-ui/src/views/secret/index.vue
index 6e61327..14767cb 100644
--- a/ruoyi-ui/src/views/secret/index.vue
+++ b/ruoyi-ui/src/views/secret/index.vue
@@ -636,7 +636,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[
],
@@ -908,6 +908,7 @@
// // alert(this.$store.state.user.clanId)
// this.listRoot = []
let clanId = this.$store.state.user.clanId
+ if(clanId!=null){
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -925,7 +926,8 @@
this.loading1 = false;
}
);
- },
+ }
+ },
// 纭鍒嗕韩
subShare(row) {
const shareList = {}
@@ -946,8 +948,10 @@
// ------------------------------------------------------------------
getInfo(){
+
console.log('-----------------')
getInfo().then(response=>{
+
console.log(response.user.roles[0].roleId,'roleID')
this.userId = response.user.roles[0].roleId
})
diff --git a/ruoyi-ui/src/views/secret/memo.vue b/ruoyi-ui/src/views/secret/memo.vue
index 9f57582..3cd3025 100644
--- a/ruoyi-ui/src/views/secret/memo.vue
+++ b/ruoyi-ui/src/views/secret/memo.vue
@@ -402,7 +402,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[
],
fileList1:[],
diff --git a/ruoyi-ui/src/views/self/memo.vue b/ruoyi-ui/src/views/self/memo.vue
index 5be49cd..128f77c 100644
--- a/ruoyi-ui/src/views/self/memo.vue
+++ b/ruoyi-ui/src/views/self/memo.vue
@@ -118,7 +118,7 @@
<template v-if="!isEditing" >
<el-input v-if="individualList.maritalStatus===0" placeholder="鏈"></el-input>
<el-input v-if="individualList.maritalStatus===1" placeholder="宸插"></el-input>
- <el-input v-if="individualList.maritalStatus===2" placeholder="鏈"></el-input>
+ <el-input v-if="individualList.maritalStatus===2" placeholder="绂诲"></el-input>
</template>
<template v-else>
@@ -785,7 +785,7 @@
// 鏃ユ湡鑼冨洿
dateRange: [],
// 鏁版嵁鑼冨洿閫夐」
- fot:[".jpg",".jif"],
+ fot:[".jpg",".jif",'.M4A'],
fileList:[],
fileListOther:[],
//涓嬫媺瀹炵幇
@@ -1028,6 +1028,7 @@
// // alert(this.$store.state.user.clanId)
// this.listRoot = []
let clanId = this.$store.state.user.clanId
+ if(clanId!=null){
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -1045,6 +1046,7 @@
this.loading1 = false;
}
);
+ }
},
/** 鏌ヨ璁板綍鍒楄〃 */
@@ -1160,17 +1162,19 @@
}, //涓汉鍩烘湰淇℃伅
submitForm() {
- if(this.inds=='1')
+ if(this.inds=='1'||this.inds=='濂�')
this.individualList.sex = 1;
else
this.individualList.sex = 0;
- if(this.mrs=='0')
+ if(this.mrs=='0'||this.mrs=='鏈')
this.individualList.maritalStatus = 0
- else if(this.mrs == '1')
+ else if(this.mrs == '1'||this.mrs=='宸插')
this.individualList.maritalStatus = 1
else
this.individualList.maritalStatus = 2
+
+
//alert(123)
// alert(10)
// let ul = this.fileList.map(function (elem){
@@ -1189,13 +1193,15 @@
// 寮哄埗鏇存柊鐩稿叧缁勪欢
// this.individualList={...this.individualList}
-
- // this.open = false;
+ // alert(this.individualList.sex)
+
+ // // this.open = false;
this.dsb = true
this.btn=false
this.isShow_2=false
this.isShow=true
this.isEditing = false
+ //this.getList()
})
} else {
this.$modal.msgSuccess("淇敼澶辫触");
diff --git a/ruoyi-ui/src/views/self/show.vue b/ruoyi-ui/src/views/self/show.vue
index db42d36..4e3a151 100644
--- a/ruoyi-ui/src/views/self/show.vue
+++ b/ruoyi-ui/src/views/self/show.vue
@@ -155,7 +155,7 @@
>瀵煎叆妯℃澘涓嬭浇</el-button>
</el-col>
- <el-col :span="1.5">
+ <el-col :span="1.5" v-if="userId != 2">
<el-upload
action=""
@@ -689,7 +689,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList1:[],
fileList:[],
@@ -974,7 +974,7 @@
};
},
created() {
-
+ this.getInfo()
this.getList();
this.getList1();
},
@@ -996,15 +996,24 @@
this.queryParams2.pageNo = 1
this.total1 = 0
},
+
+ getInfo(){
+ console.log('-----------------')
+ getInfo().then(response=>{
+ console.log(response.user.roles[0].roleId,'roleID')
+ this.userId = response.user.roles[0].roleId
+ })
+ },
+
handleClose2(){
this.$refs.table1.clearSelection()
},
getList1() {
this.loading1 = true;
let userId = this.$store.state.user.userId
- // alert(userId)
+
- showShareUser(userId, 2062).then(response=>{
+ showShareUser(userId, 2010).then(response=>{
console.log("===========ddddddddddddd")
console.log(response.data)
console.log("--------------------")
@@ -1017,6 +1026,7 @@
// // alert(this.$store.state.user.clanId)
// this.listRoot = []
let clanId = this.$store.state.user.clanId
+ if(clanId!=null){
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -1034,6 +1044,7 @@
this.loading1 = false;
}
);
+ }
},
// 涓嬭浇浠栦汉缁欐垜鍒嗕韩鐨勬暟鎹�
handleDown(row){
diff --git a/ruoyi-ui/src/views/selfeconomy/index.vue b/ruoyi-ui/src/views/selfeconomy/index.vue
index 3fb47e4..c5b8b70 100644
--- a/ruoyi-ui/src/views/selfeconomy/index.vue
+++ b/ruoyi-ui/src/views/selfeconomy/index.vue
@@ -667,7 +667,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
fileList:[
],
@@ -953,6 +953,7 @@
// // alert(this.$store.state.user.clanId)
// this.listRoot = []
let clanId = this.$store.state.user.clanId
+ if(clanId!=null){
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -970,6 +971,7 @@
this.loading1 = false;
}
);
+ }
},
// 纭鍒嗕韩
subShare(row) {
diff --git a/ruoyi-ui/src/views/selfeconomy/memo.vue b/ruoyi-ui/src/views/selfeconomy/memo.vue
index 8a2ad78..47d1ed5 100644
--- a/ruoyi-ui/src/views/selfeconomy/memo.vue
+++ b/ruoyi-ui/src/views/selfeconomy/memo.vue
@@ -402,7 +402,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.M4A'],
fileList:[
],
fileList1:[],
diff --git a/ruoyi-ui/src/views/travel/index.vue b/ruoyi-ui/src/views/travel/index.vue
index c915e83..f4c9c1f 100644
--- a/ruoyi-ui/src/views/travel/index.vue
+++ b/ruoyi-ui/src/views/travel/index.vue
@@ -748,7 +748,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
fileList:[
],
@@ -1102,7 +1102,7 @@
let clanId = this.$store.state.user.clanId
-
+ if(clanId!=null){
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -1120,6 +1120,7 @@
this.loading1 = false;
}
);
+ }
},
// 纭鍒嗕韩
subShare(row) {
diff --git a/ruoyi-ui/src/views/wish/index.vue b/ruoyi-ui/src/views/wish/index.vue
index 7344ffe..7316654 100644
--- a/ruoyi-ui/src/views/wish/index.vue
+++ b/ruoyi-ui/src/views/wish/index.vue
@@ -656,7 +656,7 @@
// 鏁版嵁鑼冨洿閫夐」
// 鏁版嵁鑼冨洿閫夐」
fot:['.bmp','.jpg','.jpeg','.png','.tif','.gif','.pcx','.tga','.exif','.fpx',
- '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a'],
+ '.svg','.psd','.cdr','.pcd','.dxf','.ufo','.eps','.ai','.aw','.WMF','.webp','.apng','.m4a','.M4A'],
fileList:[],
fileList1:[],
@@ -913,6 +913,7 @@
// // alert(this.$store.state.user.clanId)
// this.listRoot = []
let clanId = this.$store.state.user.clanId
+ if(clanId!=null){
getAllInfo(clanId).then(response => {
this.listRoot = response.data;
const kon = {}
@@ -930,6 +931,7 @@
this.loading1 = false;
}
);
+ }
},
// 纭鍒嗕韩
subShare(row) {
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index 13484d0..2806fcf 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -37,7 +37,7 @@
// detail: https://cli.vuewww.bendudu.comjs.org/config/#devserver-proxy
[process.env.VUE_APP_BASE_API]: {
// target: `https://10.39.18.174:8080/`,
- // target: `https://192.168.1.5:8080/`,
+ // target: `https://192.168.1.5:8080/`,
target: 'https://www.bendudu.com:8080/',
changeOrigin: true,
pathRewrite: {
--
Gitblit v1.9.1