kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
yanran200730
2022-05-24 11:14:29 +08:00
parent 72d814c913
commit e01eb4fe28
15 changed files with 168 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/saas/AppCountryAlbum/components/Organize.vue
View File

@@ -85,6 +85,7 @@
<span>张</span>
</div>
</div>
<AiEmpty v-if="!list.length && isMore"></AiEmpty>
</div>
</div>
</div>
@@ -100,6 +101,7 @@
photoTotal: {},
date: '',
list: [],
isMore: false,
attendanceCount: {}
}
},
@@ -157,6 +159,8 @@
num: res.data[v]
}
})
this.isMore = true
}
})
},

25
src/saas/AppCountryAlbum/components/watermark/Watermark1.vue
View File

@@ -85,7 +85,7 @@
this.week = new Date().getDay()
}, 1000)
this.getLocation()
// this.getLocation()
uni.$on('change', e => {
this.configList = e
@@ -98,32 +98,21 @@
methods: {
...mapActions(['injectJWeixin']),
getLocation () {
this.injectJWeixin(['getLocation']).then(res => {
console.log(res)
wx.getLocation({
type: 'wgs84',
success: function (res) {
var lat = res.latitude
var lng = res.longitude
console.log(lat, lng)
},
error: res => {
console.log(res)
var latitude = res.latitude
var longitude = res.longitude
var speed = res.speed
var accuracy = res.accuracy
}
})
})
// uni.getLocation({
// type: 'wgs84',
// success: res => {
// console.log(res)
// this.$http.get('https://apis.map.qq.com/ws/geocoder/v1/?location=39.984154,116.307490&key=3RZBZ-LZUCF-CT6J5-NWKZH-FCWOQ-UUFKY&get_poi=1').then(res => {
// console.log(res)
// })
// },
// fail: error => {
// console.log(error)
// }
// })
},
linkTo (url) {

32
src/saas/AppCountryAlbum/components/watermark/Watermark2.vue
View File

@@ -9,7 +9,7 @@
<span v-if="isShowWeather">{{ weather }}</span>
</div>
<p v-if="isShowDate">{{ date }} {{ weekCn }}</p>
<div class="text" v-if="isShowMatters">
<div class="text" v-if="isShowMatters && matters">
<span>{{ matters }}</span>
<image src="./../../images/quotes.png" />
</div>
@@ -76,6 +76,7 @@
const title = v.filter(v => v.type === '5')[0]
const name = v.filter(v => v.type === '6')[0]
const matters = v.filter(v => v.type === '7')[0]
this.isShowWeather = weather.status === '1'
this.isShowDate = date.status === '1'
this.isShowTitle = title.status === '1'
@@ -84,7 +85,10 @@
this.isShowMatters = matters.status === '1'
this.title = title.defaultValue || ''
this.name = name.defaultValue || ''
this.date = date.defaultValue || this.$dayjs(new Date).format('YYYY-MM-DD')
this.time = time.defaultValue || this.$dayjs().format('HH:mm')
this.matters = matters.defaultValue || ''
this.week = date.defaultValue ? this.$dayjs(date.defaultValue).day() : new Date().getDay()
}
},
deep: true
@@ -92,15 +96,23 @@
},
created () {
this.configList = JSON.parse(JSON.stringify(this.config))
this.date = this.$dayjs(new Date).format('YYYY-MM-DD')
this.time = this.$dayjs().format('HH:mm')
this.configList = JSON.parse(JSON.stringify(this.config)).map(v => {
if (v.fieldType === '7') {
v.defaultValue = this.$dayjs().format('YYYY-MM-DD')
this.week = new Date().getDay()
}
if (v.fieldType === '6') {
v.defaultValue = this.$dayjs().format('HH:mm')
}
this.timer = setInterval(() => {
this.date = this.$dayjs().format('YYYY-MM-DD')
this.time = this.$dayjs().format('HH:mm')
this.week = new Date().getDay()
}, 1000)
return v
})
// this.timer = setInterval(() => {
// this.date = this.$dayjs().format('YYYY-MM-DD')
// this.time = this.$dayjs().format('HH:mm')
// this.week = new Date().getDay()
// }, 1000)
uni.$on('change', e => {
this.configList = e
@@ -142,7 +154,7 @@
image {
position: absolute;
bottom: 14px;
top: -6px;
left: 0;
width: 28px;
height: 24px;

13
src/saas/AppCountryAlbum/components/watermark/Watermark3.vue
View File

@@ -73,7 +73,18 @@
},
created () {
this.configList = JSON.parse(JSON.stringify(this.config))
this.configList = JSON.parse(JSON.stringify(this.config)).map(v => {
if (v.fieldType === '7') {
v.defaultValue = this.$dayjs().format('YYYY-MM-DD')
this.week = new Date().getDay()
}
if (v.fieldType === '6') {
v.defaultValue = this.$dayjs().format('HH:mm')
}
return v
})
this.date = this.$dayjs(new Date).format('YYYY-MM-DD')
this.time = this.$dayjs().format('HH:mm')

12
src/saas/AppCountryAlbum/components/watermark/Watermark4.vue
View File

@@ -69,7 +69,17 @@
},
created () {
this.configList = JSON.parse(JSON.stringify(this.config))
this.configList = JSON.parse(JSON.stringify(this.config)).map(v => {
if (v.fieldType === '7') {
v.defaultValue = this.$dayjs().format('YYYY-MM-DD')
this.week = new Date().getDay()
}
if (v.fieldType === '6') {
v.defaultValue = this.$dayjs().format('HH:mm')
}
return v
})
this.date = this.$dayjs(new Date).format('YYYY-MM-DD')
this.time = this.$dayjs().format('HH:mm')
this.week = new Date().getDay()

20
src/saas/AppCountryAlbum/components/watermark/Watermark5.vue
View File

@@ -67,10 +67,10 @@
configList: {
handler: function (v) {
if (v.length) {
const title = v.filter(v => v.type === '3')[0]
const address = v.filter(v => v.type === '4')[0]
const date = v.filter(v => v.type === '4')[0]
const time = v.filter(v => v.type === '4')[0]
const title = v.filter(v => v.type === '5')[0]
const address = v.filter(v => v.type === '3')[0]
const date = v.filter(v => v.type === '1')[0]
const time = v.filter(v => v.type === '0')[0]
this.isShowAddress = address.status === '1'
this.isShowDate = date.status === '1'
this.isShowTime = time.status === '1'
@@ -82,7 +82,17 @@
},
created () {
this.configList = JSON.parse(JSON.stringify(this.config))
this.configList = JSON.parse(JSON.stringify(this.config)).map(v => {
if (v.fieldType === '7') {
v.defaultValue = this.$dayjs().format('YYYY-MM-DD')
this.week = new Date().getDay()
}
if (v.fieldType === '6') {
v.defaultValue = this.$dayjs().format('HH:mm')
}
return v
})
this.date = this.$dayjs(new Date).format('YYYY-MM-DD')
this.time = this.$dayjs().format('HH:mm')

13
src/saas/AppCountryAlbum/components/watermark/Watermark7.vue
View File

@@ -64,7 +64,6 @@
if (v.length) {
const address = v.filter(v => v.type === '3')[0]
const title = v.filter(v => v.type === '5')[0]
console.log(address)
this.isShowAddress = address.status === '1'
this.title = title.defaultValue || ''
}
@@ -74,7 +73,17 @@
},
created () {
this.configList = JSON.parse(JSON.stringify(this.config))
this.configList = JSON.parse(JSON.stringify(this.config)).map(v => {
if (v.fieldType === '7') {
v.defaultValue = this.$dayjs().format('YYYY-MM-DD')
this.week = new Date().getDay()
}
if (v.fieldType === '6') {
v.defaultValue = this.$dayjs().format('HH:mm')
}
return v
})
this.date = this.$dayjs(new Date).format('YYYY-MM-DD')
this.time = this.$dayjs().format('HH:mm')