测试
This commit is contained in:
@@ -120,7 +120,7 @@
|
|||||||
import Watermark6 from './components/watermark/Watermark6'
|
import Watermark6 from './components/watermark/Watermark6'
|
||||||
import Watermark7 from './components/watermark/Watermark7'
|
import Watermark7 from './components/watermark/Watermark7'
|
||||||
import Watermark8 from './components/watermark/Watermark8'
|
import Watermark8 from './components/watermark/Watermark8'
|
||||||
import { mapActions } from 'vuex'
|
import { mapActions, mapState } from 'vuex'
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
name: 'Watermark',
|
name: 'Watermark',
|
||||||
@@ -174,7 +174,8 @@
|
|||||||
if (this.currIndex < 0 || !this.watermarkList.length) return []
|
if (this.currIndex < 0 || !this.watermarkList.length) return []
|
||||||
|
|
||||||
return this.watermarkList[this.currIndex].itemList
|
return this.watermarkList[this.currIndex].itemList
|
||||||
}
|
},
|
||||||
|
...mapState(['wxwork'])
|
||||||
},
|
},
|
||||||
|
|
||||||
onLoad (query) {
|
onLoad (query) {
|
||||||
@@ -215,7 +216,7 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
methods: {
|
methods: {
|
||||||
...mapActions(['injectJWeixin']),
|
...mapActions(['injectJWeixin', 'agentSign']),
|
||||||
|
|
||||||
toClipping () {
|
toClipping () {
|
||||||
uni.navigateTo({
|
uni.navigateTo({
|
||||||
@@ -325,6 +326,10 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
getLocation () {
|
getLocation () {
|
||||||
|
this.agentSign({
|
||||||
|
corpId: this.wxwork.config.corpId,
|
||||||
|
suiteId: this.wxwork.config.suiteId
|
||||||
|
}).then(() => {
|
||||||
this.injectJWeixin(['getLocation']).then(() => {
|
this.injectJWeixin(['getLocation']).then(() => {
|
||||||
wx.getLocation({
|
wx.getLocation({
|
||||||
type: 'wgs84',
|
type: 'wgs84',
|
||||||
@@ -359,6 +364,7 @@
|
|||||||
}).catch(e => {
|
}).catch(e => {
|
||||||
alert(JOSN.stringify(e))
|
alert(JOSN.stringify(e))
|
||||||
})
|
})
|
||||||
|
})
|
||||||
},
|
},
|
||||||
|
|
||||||
dataURLtoFile (dataurl, filename) {
|
dataURLtoFile (dataurl, filename) {
|
||||||
|
|||||||
Reference in New Issue
Block a user