Commit 67562e01 authored by 李俊赕's avatar 李俊赕

standard-edit

parent 41b4fb7c
...@@ -2,10 +2,15 @@ ...@@ -2,10 +2,15 @@
// launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数 // launchtype项可配置值为local或remote, local代表前端连本地云函数,remote代表前端连云端云函数
"version": "0.0", "version": "0.0",
"configurations": [{ "configurations": [{
"type": "uniCloud", "default" :
"default": { {
"launchtype": "remote" "launchtype" : "remote"
} },
"mp-weixin" :
{
"launchtype" : "local"
},
"type" : "uniCloud"
} }
] ]
} }
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
</view> </view>
</view> </view>
</swiper-item> </swiper-item>
<swiper-item class="swiper-item" v-for="(item, index) in tabs" :key="index"> <swiper-item class="swiper-item" v-for="(src, index) in currentItem.images" :key="index">
{{item.title}} <!-- {{item.title}} -->
<cover-image bindtap="previewImage(item,index)" class="icon" mode="aspectFit" :src="src"></cover-image> <cover-image bindtap="previewImage(item,index)" class="icon" mode="aspectFit" :src="src"></cover-image>
</swiper-item> </swiper-item>
...@@ -30,15 +30,18 @@ ...@@ -30,15 +30,18 @@
<script> <script>
export default { export default {
name:'photo-standard' name:"photo-standard",
props:{ props:{
item:{ currentItem:{
type:'Object', type: Object,
detault:()=>{ default () {
return null return {
images: [],
} }
} }
}, },
},
data() { data() {
return { return {
list: [{ list: [{
...@@ -61,7 +64,7 @@ ...@@ -61,7 +64,7 @@
height:0, height:0,
} }
}, },
onLoad(e) { created() {
// getApp().trackPage('照片预览页') // getApp().trackPage('照片预览页')
// console.log(e, 'e') // console.log(e, 'e')
// if (e.img) { // if (e.img) {
...@@ -76,8 +79,6 @@ ...@@ -76,8 +79,6 @@
getSwiperHeight(){ getSwiperHeight(){
const globalData = getApp().globalData const globalData = getApp().globalData
this.height = globalData.screenHeight*2 - globalData.navHeight - 200 this.height = globalData.screenHeight*2 - globalData.navHeight - 200
console.log(this.height,'height')
console.log(globalData.screenHeight,'globalData.screenHeight')
}, },
previewImage(index){ previewImage(index){
uni.previewImage({ uni.previewImage({
...@@ -91,14 +92,14 @@ ...@@ -91,14 +92,14 @@
}, },
// swiper-item左右移动,通知tabs的滑块跟随移动 // swiper-item左右移动,通知tabs的滑块跟随移动
transition(e) { transition(e) {
console.log(e.detail,'e.detail-transition') // console.log(e.detail,'e.detail-transition')
let dx = e.detail.dx; let dx = e.detail.dx;
this.$refs.uTabs.setDx(dx); this.$refs.uTabs.setDx(dx);
}, },
// 由于swiper的内部机制问题,快速切换swiper不会触发dx的连续变化,需要在结束时重置状态 // 由于swiper的内部机制问题,快速切换swiper不会触发dx的连续变化,需要在结束时重置状态
// swiper滑动结束,分别设置tabs和swiper的状态 // swiper滑动结束,分别设置tabs和swiper的状态
animationfinish(e) { animationfinish(e) {
console.log(e.detail,'e.detail-animationfinish') // console.log(e.detail,'e.detail-animationfinish')
let current = e.detail.current; let current = e.detail.current;
this.$refs.uTabs.setFinishCurrent(current); this.$refs.uTabs.setFinishCurrent(current);
this.swiperCurrent = current; this.swiperCurrent = current;
......
...@@ -21,15 +21,15 @@ ...@@ -21,15 +21,15 @@
<cover-view class="bottom-box"> <cover-view class="bottom-box">
<cover-image class="icon" src='/static/photo/icon-back.png' mode="" @click="goBack"></cover-image> <cover-image class="icon" src='/static/photo/icon-back.png' mode="" @click="goBack"></cover-image>
<cover-image class='icon-take icon' src='/static/photo/icon-take.png' @click="takePhoto"> </cover-image> <cover-image class='icon-take icon' src='/static/photo/icon-take.png' @click="takePhoto"> </cover-image>
<cover-image class='icon' src='/static/photo/icon-standard.png' @click="showStandard"> </cover-image> <cover-image class='icon' src='/static/photo/icon-standard.png' @click="standardShow = true"> </cover-image>
</cover-view> </cover-view>
<canvas canvas-id="canvas" class="canvas" :style="{'width':750 + 'rpx','height': cameraHeight + 'rpx'}"></canvas> <canvas canvas-id="canvas" class="canvas" :style="{'width':750 + 'rpx','height': cameraHeight + 'rpx'}"></canvas>
<page-container class="page-mask" v-show="standardShow"> <view class="page-mask" v-if="standardShow">
<standard :item="currentItem"></standard> <photo-standard :currentItem="currentItem" />
<cover-view class="btn-close"> <cover-view class="btn-close" @click="standardShow = false">
<cover-image class="icon icon-close" mode="aspectFit" src="/static/photo/icon-close.png"></cover-image> <cover-image class="icon icon-close" mode="aspectFit" src="/static/photo/icon-close.png"></cover-image>
</cover-view> </cover-view>
</page-container> </view>
</view> </view>
</template> </template>
...@@ -42,31 +42,15 @@ ...@@ -42,31 +42,15 @@
import standard from '@/components/photo/standard.vue' import standard from '@/components/photo/standard.vue'
export default { export default {
components:{ components:{
standard:standard, 'photo-standard':standard,
}, },
data() { data() {
return { return {
// title: '',
// ctx: null,
// path: "",
// image: "",
// showImage: false,
// canvas: null,
// longitude: '正在获取中...',
// latitude: '正在获取中...',
// address: '正在获取中...',
// date: '',
// width: '',
// height: '',
// markPath: '',
// canvasWidth: 0,
// canvasHeight: 0,
// restuleImage: '',
currentItem:{ currentItem:{
images:['https://qn-static.banshouhui.com/live_mark.png','https://qn-static.banshouhui.com/live_mark.png'] name:'111',
images:['https://qn-static.banshouhui.com/live_mark.png','https://qn-static.banshouhui.com/live_mark.png','https://qn-static.banshouhui.com/live_mark.png'],
}, },
standardShow:true, standardShow:false,
waterInfo: { waterInfo: {
longitude: '', // 经度 longitude: '', // 经度
latitude: '', // 维度 latitude: '', // 维度
...@@ -96,6 +80,7 @@ ...@@ -96,6 +80,7 @@
this.waterInfo.date = this.getTime() this.waterInfo.date = this.getTime()
this.getLocation() this.getLocation()
this.getMarkPath() this.getMarkPath()
console.log(standard,'standard')
// this.getSystemInfo() // this.getSystemInfo()
// uni.setNavigationBarColor({ // uni.setNavigationBarColor({
// frontColor: '#FFFFFF', // frontColor: '#FFFFFF',
...@@ -113,6 +98,7 @@ ...@@ -113,6 +98,7 @@
}, },
onShow() { onShow() {
this.initData() this.initData()
// this.standardShow = true
// this.cameraHeight = globalData.rpxScreenHeight // this.cameraHeight = globalData.rpxScreenHeight
// uni.authorize({ // uni.authorize({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment