|
@@ -5,7 +5,7 @@
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script>
|
|
<script>
|
|
- import { clzConfirm,saveBase64ToAliOss } from '@/libs/tools'
|
|
|
|
|
|
+ import { clzConfirm,saveBase64ToAliOss,saveImgToAliOss } from '@/libs/tools'
|
|
import {getTaskDetail,savePointTask} from '@/api/task'
|
|
import {getTaskDetail,savePointTask} from '@/api/task'
|
|
import {getTaskTargetById} from '@/api/taskTarget'
|
|
import {getTaskTargetById} from '@/api/taskTarget'
|
|
import { photoPaiZhao, getVideoUrl } from '@/api/store';
|
|
import { photoPaiZhao, getVideoUrl } from '@/api/store';
|
|
@@ -43,8 +43,16 @@
|
|
this.getStoreVideoUrl(JSON.parse(data.msg))
|
|
this.getStoreVideoUrl(JSON.parse(data.msg))
|
|
}
|
|
}
|
|
// 抓拍图片
|
|
// 抓拍图片
|
|
- if(data.action == 'takePhotos'){
|
|
|
|
- this.takePhotos(JSON.parse(data.msg))
|
|
|
|
|
|
+ if (data.action == 'takePhotos') {
|
|
|
|
+ console.log('takePhotos');
|
|
|
|
+ // 截图
|
|
|
|
+ if (this.types == 'video') {
|
|
|
|
+ this.takePhotos(JSON.parse(data.msg));
|
|
|
|
+ }
|
|
|
|
+ // 拍照
|
|
|
|
+ if (this.types == 'scene') {
|
|
|
|
+ this.camerPhotos();
|
|
|
|
+ }
|
|
}
|
|
}
|
|
// 保存编辑后的图片
|
|
// 保存编辑后的图片
|
|
if(data.action == 'saveEditImg'){
|
|
if(data.action == 'saveEditImg'){
|
|
@@ -108,6 +116,26 @@
|
|
})
|
|
})
|
|
}
|
|
}
|
|
},
|
|
},
|
|
|
|
+ // 摄像机拍照
|
|
|
|
+ camerPhotos() {
|
|
|
|
+ const _this = this;
|
|
|
|
+ uni.chooseImage({
|
|
|
|
+ count: 1, //最多可以选择的图片张数,默认9
|
|
|
|
+ sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图,默认二者都有
|
|
|
|
+ sourceType: ['camera'], //album 从相册选图,camera 使用相机,默认二者都有
|
|
|
|
+ success: function(res) {
|
|
|
|
+ // tempFilePaths 图片的本地文件路径列表,tempFiles 图片的本地文件列表,每一项是一个 File 对象
|
|
|
|
+ uni.showLoading({
|
|
|
|
+ title:'正在保存图片...',
|
|
|
|
+ mask: true
|
|
|
|
+ })
|
|
|
|
+ saveImgToAliOss(res.tempFilePaths[0], function(ret) {
|
|
|
|
+ _this.wv.evalJS("vm.takePhotoSuccess('" + ret.data + "')");
|
|
|
|
+ uni.hideLoading()
|
|
|
|
+ });
|
|
|
|
+ }
|
|
|
|
+ });
|
|
|
|
+ },
|
|
// 上传编辑后的图片到阿里云
|
|
// 上传编辑后的图片到阿里云
|
|
uploadImg(formData) {
|
|
uploadImg(formData) {
|
|
const _this = this;
|
|
const _this = this;
|
|
@@ -129,7 +157,9 @@
|
|
// 获取视频列表
|
|
// 获取视频列表
|
|
getVideoList(){
|
|
getVideoList(){
|
|
let list = this.$store.state.vuex_storeVideoList
|
|
let list = this.$store.state.vuex_storeVideoList
|
|
- this.wv.evalJS("vm.setVideoList('"+JSON.stringify(list)+"')")
|
|
|
|
|
|
+ if(list.length){
|
|
|
|
+ this.wv.evalJS("vm.setVideoList('"+JSON.stringify(list)+"')")
|
|
|
|
+ }
|
|
},
|
|
},
|
|
// 获取视频地址
|
|
// 获取视频地址
|
|
getStoreVideoUrl(item){
|
|
getStoreVideoUrl(item){
|