Commit 4ef5bba2 authored by 李超鹏's avatar 李超鹏

Merge remote-tracking branch 'origin/dev-photo-v2' into dev-photo-v2

parents 2972153b 8784c284
This diff is collapsed.
......@@ -50,13 +50,7 @@
}, {
name: '之约'
}],
swiperList:[{
title:'记录的距离大家零点九零杰拉德杰拉德建立的连接就111111111111',
},{
title:'记录的距离大家零点九零杰拉德杰拉德建立的连接就222222',
},{
title:'记录的距离大家零点九零杰拉德杰拉德建立的连接就333333',
},],
swiperList:[],
// 因为内部的滑动机制限制,请将tabs组件和swiper组件的current用不同变量赋值
current: 0, // tabs组件的current值,表示当前活动的tab选项
swiperCurrent: 0, // swiper组件的current值,表示当前那个swiper-item是活动的
......
......@@ -124,8 +124,8 @@
{
"path": "pages/photo/setting",
"style": {
"navigationBarTitleText": "水印设置",
"navigationBarBackgroundColor":"#FFFFFF",
"navigationBarTitleText": "水印设置",
"navigationBarBackgroundColor":"#FFFFFF",
"backgroundColor":"#F4F5F7"
// "navigationBarBackgroundColor": "#333333",
// "navigationBarTextStyle": "#FFFFFF",
......@@ -288,6 +288,10 @@
"name": "照片预览", //模式名称
"path": "pages/photo/preview", //启动页面,必选
"query": "standardId=1&img=https://papers.co/wallpaper/papers.co-bk57-art-illust-girl-pink-tomboy-red-6-wallpaper.jpg" //启动参数,在页面的onLoad函数里面得到
},{
"name": "授权登录",
"path": "pages/login/wxlogin",
"query": ""
}]
}
}
This diff is collapsed.
......@@ -74,8 +74,6 @@
methods: {
getRelationDictionaryV2: function() {
this.$u.cloudApi.getRelationDictionaryV2().then(res => {
console.log('V2:')
console.log(res)
if (res && res.result) {
this.classifyList = res.result
this.param.classifyId = res.result[0].id
......@@ -123,6 +121,12 @@
handleClick() {
// 点击下一步设置全局拍照品牌品类
const globalData = getApp().globalData
if (!globalData.token) {
uni.navigateTo({
url:'/pages/login/wxlogin'
})
return
}
let keys = ['brandId', 'brandName', 'classifyId', 'systemId']
keys.map(key => {
globalData.photo.product[key] = this[key] || this.param[key]
......
<template>
<view class="backView">
<view class="backView">
<u-loading style="position: absolute;top: 50%;" :show="loading" size="36" mode="flower"></u-loading>
<view class="topView">
<view :class="['topItemView', {'active':activeTop===ikey}]" @click="handleTopItemChange(ikey,item)" v-for="(item,ikey) in dataList" :key="ikey">
<text
......@@ -11,14 +12,14 @@
<view class="right-view-title">拍照项有:</view>
<template v-for="(item,ikey) in rightList">
<view class="rightItemView" @click="rightItemClick(item,ikey)" :key="ikey">
<view :class="['rightContentView', {'active':item.images.length > 0}]">
<view :class="['rightContentView', {'active':item.imageList.length > 0 || item.images.length > 0}]">
<text class="ph-lst-item-index">{{ ikey + 1 }}</text>
<text class="">{{item.name}} ({{item.image_count}}张)</text>
<text class="">{{item.name}}</text>
<image class="ph-list-item-arrow" src="/static/photo/arrow.png"></image>
<!-- <text class="rightContent u-m-t-14 u-m-l-30 u-p-b-30">{{item.describe}}</text> -->
</view>
<view class="rightImageView" v-if="item.images">
<image class="rightImage" v-for="(image, index) in item.images" :src="image" :key="image"
<view class="rightImageView" v-if="item.imageList.length > 0 || item.images.length > 0">
<image class="rightImage" v-for="(image, index) in (item.imageList.length > 0 ? item.imageList : item.images)" :src="image" :key="image"
@click.stop="handleClickImage(item, index)" mode=""></image>
</view>
</view>
......@@ -41,7 +42,7 @@
brand: '',
brandId: '',
dataList: [],
loading: true
}
},
onLoad(e) {
......@@ -70,25 +71,17 @@
},
onShow() {
console.log('onShow 里的rightList:')
console.log(this.rightList)
},
methods: {
getListData: function() {
getListData: function() {
this.loading = true
let that = this
this.$u.cloudApi.getGroupStandardV2({
'token': getApp().globalData.token,
'classify_id': this.classifyId,
'system_id': this.systemId,
'brand_id': this.brandId
}).then(res => {
console.log('获取规范标准数据:')
console.log(res)
}).then(res => {
this.loading = false
if (res && res.result) {
that.handleData(res.result)
}
......@@ -120,14 +113,13 @@
// 点击图片
handleClickImage(item, index) {
uni.previewImage({
urls: item.images,
urls: item.imageList.length > 0 ? item.imageList : item.images,
current:index
})
},
//右侧点击
rightItemClick: function(item, ikey) {
console.log(item,'item')
const photo = getApp().globalData.photo
photo.currentItem = item
uni.navigateTo({
......
<template>
<view>
<view class="contentView">
<image class="pic" :src="files[0]" mode="aspectFill" @click="showPreviewFn"></image>
<image class="pic" :src="files[0]" mode="aspectFit" @click="showPreviewFn"></image>
</view>
<view class="bottomView">
<image class="btn" :src="btn_remake" @click="remakePhoto"></image>
......@@ -137,15 +137,17 @@
// photo.currentItem.
// 当前项的图片显示
// 拍照项张数目增加 等于10张
if(photo.currentItemLength<10){
uni.navigateBack({
delta:1
})
}else{
uni.redirectTo({
url:"pages/photo/list"
})
}
let timer = setTimeout(()=>{
if(photo.currentItemLength<10){
uni.navigateBack({
delta:1
})
}else{
uni.redirectTo({
url:"pages/photo/list"
})
}
},2000)
} else {
uni.showToast({
title:'图片上传失败'
......
<template>
<view class="backView">
<u-loading style="position: absolute;top: 50%;" :show="loading" size="36" mode="flower"></u-loading>
<view class="itemView firstItem">
<view class="itemTitleView">
<text class="itemTitle">保存原图</text>
......@@ -12,33 +13,34 @@
<text class="itemTitle">水印标题</text>
<text class="itemNotice">{{result['lower_right']['title_text'] || '点击可编辑更改'}}</text>
</view>
<switch class="itemSwitch" disabled :checked="result['lower_right']['title_text']"
@change="itemChange({},-1)" color="#007AFF" />
<switch class="itemSwitch" disabled :checked="result['lower_right']['title_text'] != ''"
@click="handleClickTitleSwitch" color="#007AFF" />
</view>
<view class="itemView" v-for="(item,ikey) in itemList" :key="ikey">
<view class="itemTitleView" @click="itemClick(item,ikey)">
<text class="itemTitle">{{item['watemark_text'] || '自定义' + (ikey + 1)}}</text>
<text class="itemNotice">{{item['watemark_value'] || '点击可编辑更改'}}</text>
</view>
<switch class="itemSwitch" :disabled="!item['enable']" :checked="item['enable']"
@change="itemChange(item, ikey)" color="#007AFF" />
<switch class="itemSwitch" :checked="item['enable']" @change="itemChange(item, ikey)" color="#007AFF" />
</view>
<view class="shadowBackView" v-if="isPopShow">
<u-popup border-radius="10" v-model="isPopShow" safe-area-inset-bottom :mask-close-able="false" mode="center"
width="690rp" height="600rpx">
<view class="popCenterView">
<text class="popTitle">设置自定义项</text>
<view class="inputBackView">
<view class="ph-pop-left-view">
<view class="leftInputView">
<input class="leftInput" type="text" v-model="currenItem['watemark_text']" @input="leftInput()"
:disabled="currenItem.type === 'title_text'" placeholder="请输入" maxlength="10" />
<input class="leftInput" type="text" v-model="currenItem['watemark_text']"
@input="leftInput()" :disabled="currenItem.type === 'title_text'" placeholder="请输入"
maxlength="10" />
</view>
<view class="ph-pop-tip-view" v-if="showTipLeft">*必填项</view>
</view>
<view class="ph-pop-mid-view">:</view>
<view>
<view class="rightInputView">
<input class="rightInput" type="text" v-model="currenItem['watemark_value']" @input="rightInput()"
placeholder="请输入内容" maxlength="30" />
<input class="rightInput" type="text" v-model="currenItem['watemark_value']"
@input="rightInput()" placeholder="请输入内容" maxlength="30" />
</view>
<view class="ph-pop-tip-view" v-if="showTipRight">*必填项</view>
</view>
......@@ -54,7 +56,7 @@
</view>
</view>
</view>
</view>
</u-popup>
</view>
</template>
......@@ -76,9 +78,10 @@
'watemark_text': '',
'watemark_value': ''
},
editingItem: {},
showTipLeft: false,
showTipRight: false
editingItem: {},
showTipLeft: false,
showTipRight: false,
loading: true
}
},
computed: {
......@@ -108,66 +111,58 @@
getItemList: function() {
// this.systemId = '79550af260555cc20afb34156c94b32c' // 测试数据
uni.showLoading();
this.$u.cloudApi.getUserWatermark({
this.loading = true
this.$u.cloudApi.getUserWatermark({
'token': getApp().globalData.token,
'system_id': this.systemId
}).then(res => {
console.log(res)
if (res && res.result) {
this.result = res.result
}
this.$nextTick(function() {
uni.hideLoading();
})
this.loading = false
})
},
saveUserWatermark: function() {
uni.showLoading();
this.loading = true
this.$u.cloudApi.saveUserWatermark({
'token': getApp().globalData.token,
'watermark': this.result
}).then(res => {
console.log(res)
if (res.result == true) {
const photo = getApp().globalData.photo
photo.waterSetting = this.result
}
this.$nextTick(function() {
uni.hideLoading();
})
if (res.result == true) {
const photo = getApp().globalData.photo
photo.waterSetting = this.result
}
this.loading = false
})
},
//保存原图 开关
handleOrigineChange: function(e) {
this.result['has_origin'] = !this.result['has_origin']
this.result['has_origin'] = !this.result['has_origin']
this.saveUserWatermark()
},
handleClickTitleSwitch: function(e) {
var string = this.result['lower_right']['title_text'] ? '水印标题不可关闭' : '请先编辑该自定义项'
uni.showToast({
icon: 'none',
title: string
})
},
//自定义 开关
itemChange: function(item, ikey) {
if (ikey === -1) { // 水印标题
// if (this.result['lower_right']['title_text']) {
// 修改
this.saveUserWatermark()
// } else {
// // 弹出修改框
// this.itemClick(item, ikey)
// }
} else { // 其他自定义
// if (item['watemark_value']) {
if (item['watemark_value']) {
// 修改
item['enable'] = !item['enable']
this.saveUserWatermark()
// } else {
// // 弹出修改框
// this.itemClick(item, ikey)
// }
} else {
uni.showToast({
icon: 'none',
title: '请先编辑该自定义项'
})
}
},
......@@ -191,26 +186,26 @@
//左侧输入框
leftInput: function(e) {
if (this.currenItem['watemark_text']) {
this.showTipLeft = false
}
if (this.currenItem['watemark_text']) {
this.showTipLeft = false
}
},
//右侧输入框
rightInput: function(e) {
if (this.currenItem['watemark_value']) {
this.showTipRight = false
if (this.currenItem['watemark_value']) {
this.showTipRight = false
}
},
//自定义弹窗 关闭
popCancelClick: function() {
this.currenItem = {
'watemark_text': '',
'watemark_value': ''
this.isPopShow = false
this.currenItem = {
'watemark_text': '',
'watemark_value': ''
}
this.isPopShow = false
},
//自定义弹窗 保存
......@@ -226,12 +221,12 @@
}
this.saveUserWatermark()
} else {
// 提示
if (!this.currenItem['watemark_text']) {
this.showTipLeft = true
}
if (!this.currenItem['watemark_value']) {
this.showTipRight = true
// 提示
if (!this.currenItem['watemark_text']) {
this.showTipLeft = true
}
if (!this.currenItem['watemark_value']) {
this.showTipRight = true
}
}
......@@ -323,10 +318,6 @@
.popCenterView {
background-color: #FFFFFF;
width: 690rpx;
height: 600rpx;
margin-top: 300rpx;
border-radius: 12rpx;
display: flex;
flex-direction: column;
......@@ -341,13 +332,13 @@
.inputBackView {
margin-top: 52rpx;
width: 100%;
width: 100%;
height: 90rpx;
display: flex;
flex-direction: row;
align-items: center;
justify-content: space-between;
display: flex;
justify-content: space-between;
display: flex;
align-items: flex-start;
}
......@@ -355,7 +346,7 @@
width: 220rpx;
height: 72rpx;
border: 2rpx solid #666666;
display: flex;
align-items: center;
justify-content: center;
......@@ -364,17 +355,18 @@
.leftInput {
width: 180rpx;
height: 32rpx;
}
.ph-pop-left-view {
margin-left: 30rpx;
}
.ph-pop-tip-view {
color:#F56C6C;
}
.ph-pop-mid-view {
margin-top: 20rpx;
}
.ph-pop-left-view {
margin-left: 30rpx;
}
.ph-pop-tip-view {
color: #F56C6C;
}
.ph-pop-mid-view {
margin-top: 20rpx;
}
.rightInputView {
......
......@@ -13,10 +13,11 @@
<camera class="camera-box" v-if="cameraChange&&!standardShow" :device-position="cameraInfo.devicePosition"
:flash="cameraInfo.flash" :style="{'height':cameraHeight + 'rpx'}" @error="cameraError">
<cover-view class="mark-box">
<cover-view class="txt u-m-t-30">经度:{{waterInfo.longitude || '正在获取中...'}}</cover-view>
<cover-view class="txt u-m-t-10">维度:{{waterInfo.latitude || '正在获取中...'}}</cover-view>
<cover-view class="txt big" >{{titleTxt}}</cover-view>
<cover-view class="txt" v-for="(txt,index) in settingTxtArr" :key="index">{{txt || '获取中'}}</cover-view>
<!-- <cover-view class="txt u-m-t-10">维度:{{waterInfo.latitude || '正在获取中...'}}</cover-view>
<cover-view class="txt u-m-t-10">地址:{{waterInfo.address || '正在获取中...'}}</cover-view>
<cover-view class="txt u-m-t-10">时间:{{waterInfo.date || '正在获取中...'}}</cover-view>
<cover-view class="txt u-m-t-10">时间:{{waterInfo.date || '正在获取中...'}}</cover-view> -->
</cover-view>
<cover-image class="mark-water" mode="aspectFit" :src="waterInfo.markImage"></cover-image>
</camera>
......@@ -83,6 +84,7 @@
cameraHeight: 1000, // (4 / 3 * 750) 图片比例4:3
ratio: 0,
cameraChange: true,
waterSetting:null,
}
},
onLoad(e) {
......@@ -95,13 +97,45 @@
this.getMarkPath()
this.currentItem = photo.currentItem
},
compute: {
waterSetting() {
// photo.waterSetting
const photo = getApp().globalData.photo
console.log(photo.waterSetting,'photo.waterSetting')
return photo.waterSetting || null
computed: {
titleTxt(){
const waterSetting = this.waterSetting
let txt = ''
if(!waterSetting || !waterSetting.lower_right){
return ''
}
txt = waterSetting.lower_right && waterSetting.lower_right.title_text || ''
console.log(txt,'title_text','waterSetting',waterSetting)
return txt
},
settingTxtArr(){
let arr = []
// 包含经纬度
const waterInfo = this.waterInfo
arr = ['经度嘟嘟嘟激励大家了杰拉德杰拉德了大量聚集的决定立即登录: ' + waterInfo.longitude, '纬度: ' + waterInfo.latitude, '地址: ' + waterInfo.address, '时间: ' +
waterInfo.date
]
let settingTxtArr = []
const typeArr = ['经度', '纬度', '地址', '时间']
const waterSetting = this.waterSetting
if (!waterSetting || !waterSetting.lower_right || !waterSetting.lower_right.body) {
return arr
}
const settingArr = waterSetting.lower_right.body
settingArr.map(item => {
const idx = typeArr.indexOf(item.watemark_type)
if (item.enable && (idx > -1 || (item.watemark_value && item.watemark_text))) {
if (idx > -1) {
settingTxtArr.push(arr[idx])
} else {
settingTxtArr.push(item.watemark_text + ': ' + item.watemark_value)
}
}
})
console.log(settingTxtArr,'settingTxtArr')
return settingTxtArr
}
},
watch: {
'authSetting.camera'(val) {
......@@ -126,7 +160,7 @@
methods: {
goBack() {
uni.navigateBack({
delta:2
delta: 1
})
// uni.redirectTo({
// url: '/pages/photo/list'
......@@ -141,10 +175,10 @@
},
updateTime() {
this.waterInfo.date = this.getTime()
let timer = setTimeout(() => {
clearTimeout(timer);
this.updateTime()
}, 1000)
// let timer = setTimeout(() => {
// clearTimeout(timer);
// this.updateTime()
// }, 1000)
},
setCameraInfo(type) {
// 设置相机前置后置、闪关灯等
......@@ -168,6 +202,7 @@
const globalData = getApp().globalData
this.navHeight = globalData.navHeight
this.ratio = globalData.screenHeight / globalData.rpxScreenHeight
this.waterSetting = getApp().globalData.photo.waterSetting
// this.cameraHeight = globalData.rpxScreenHeight
},
baiduLocation() {
......@@ -291,16 +326,6 @@
})
},
getDrawTxtArr() {
// 获取绘制数组
let arr = []
// 包含经纬度
const waterInfo = this.waterInfo
arr = ['经度: ' + waterInfo.longitude, '维度: ' + waterInfo.latitude, '地址: ' + waterInfo.address, '时间: ' +
waterInfo.date
]
return arr
},
/* ---------------------- 拍照流程 ---------------------- */
// 第一步:拍照
takePhoto() {
......@@ -317,34 +342,48 @@
title: '数据处理中...',
icon: 'loading'
})
const waterSetting = this.waterSetting
const globalTempPath = getApp().globalData.photo.tempPath
const ratio = this.ratio
let canvasWidth = this.cameraWidth * ratio
let canvasHeight = this.cameraHeight * ratio
const waterInfo = this.waterInfo
this.showImage = true
const drawTxtArr = this.getDrawTxtArr()
const settingTxtArr = this.settingTxtArr
//将原图画到canvas上面
let canvas = uni.createCanvasContext("canvas", this)
canvas.rect(0, 0, canvasWidth, canvasHeight)
canvas.drawImage(tempPath, 0, 0, canvasWidth, canvasHeight)
// this.canvas.draw()
//加入 水印文字
canvas.setFontSize(14)
canvas.setFillStyle('#f2f2f2')
let h = 1
let txtHeight = 18
for (let i = 0; i < drawTxtArr.length; i++) {
const txt = drawTxtArr[i]
canvas.fillText(txt, 10, canvasHeight - txtHeight * h++);
let h = 1
//加入 水印文字
for (let i = settingTxtArr.length-1; i >=0; i--) {
txtHeight = 18
canvas.setFontSize(14)
canvas.setFillStyle('#f2f2f2')
let txt = settingTxtArr[i]
if(txt.length>14){
canvas.fillText(txt.substr(0,14), 10, canvasHeight - txtHeight * h++);
canvas.fillText(txt.substr(14,14), 10, canvasHeight - txtHeight * h++);
}else{
canvas.fillText(txt, 10, canvasHeight - txtHeight * h++);
}
// canvas.fillText(txt, 10, canvasHeight - txtHeight * h++);
}
const title = this.titleTxt
if(title){
txtHeight = 20
canvas.setFontSize(20)
canvas.setFillStyle('#f2f2f2')
canvas.fillText(title, 10, canvasHeight - txtHeight * h++);
}
// canvas.fillText('经度: ' + waterInfo.longitude, 10, canvasHeight - txtHeight * h++);
// canvas.fillText('维度: ' + waterInfo.latitude, 10, canvasHeight - txtHeight * h++);
// canvas.fillText('地址: ' + waterInfo.address, 10, canvasHeight - txtHeight * h++);
// canvas.fillText('时间: ' + waterInfo.date, 10, canvasHeight - txtHeight * h++);
//加入 水印图片
canvas.drawImage(this.tempImgs.markImage, canvasWidth / 2 - 100, canvasHeight / 2 - 25, 200, 50)
if(this.waterSetting && this.waterSetting.mid_text){
//加入 水印图片
canvas.drawImage(this.tempImgs.markImage, canvasWidth / 2 - 100, canvasHeight / 2 - 25, 200, 50)
}
// canvas.drawImage(this.tempImgs.markImage, canvasWidth / 2 - 100, canvasHeight / 2 - 25, 200, 50)
canvas.draw(false,
setTimeout(() => {
uni.canvasToTempFilePath({
......@@ -455,11 +494,18 @@
.mark-box {
position: absolute;
left: 0;
bottom: 20rpx;
bottom: 0;
padding: 20rpx;
.txt {
margin-top:5rpx;
line-height: 40rpx;
white-space: normal;
font-size: 28rpx;
color: #fff;
.big{
font-size: 32rpx;
}
}
}
......
......@@ -4,7 +4,7 @@ const app = getApp();
function appLogin() {
return new Promise(function (resolve, reject) {
uni.login({
success: res => {
success(res) {
if (!res.code) {
uni.hideLoading();
uni.showModal({
......@@ -17,7 +17,7 @@ function appLogin() {
fail() {
uni.hideLoading();
uni.showModal({
content: '登录失败',
content: '小程序登录失败',
showCancel: false
});
reject();
......@@ -28,51 +28,51 @@ function appLogin() {
// 小程序授权
function authorization(data) {
return new Promise(function (resolve, reject) {
data = data || {}
const res = await app.$u.api.loginWechatAuth(data)
if (res && res.status) {
let data = res.data
app.setUserData(data)
uni.hideLoading();
resolve(res);
} else () {
uni.hideLoading();
uni.showModal({
title: '请求失败',
content: err.message,
showCancel: false
});
reject();
},
return new Promise(async function (resolve, reject) {
const res = await app.$vm.$u.api.loginWechatAuth(data)
if (res) {
if (res.code == 200 && res.data) {
app.setUserData(res.data)
resolve(res);
} else {
uni.showModal({
title: '用户登录失败',
content: res.message,
showCancel: false
});
reject(res);
}
} else {
uni.showModal({
title: '请求失败',
content: res.message
});
}
});
}
// 小程序注册
function signup(data) {
return new Promise(function (resolve, reject) {
const res = await app.$u.api.loginWechatAuth(data)
api.request('login/signup-login', {
method: "post",
data: {
code: data.code,
encryptedData: data.encryptedData,
iv: data.iv
},
success: function (res) {
if (res && res.status) {
let data = res.data
app.setUserData(data)
resolve(res);
}else{
if(!res.status && res.message==='用户授权信息失效,请重新授权'){
api.setAuthToken('')
}
resolve(res);
}
return new Promise(async function (resolve, reject) {
const res = await app.$vm.$u.api.loginWechatAuth(data)
if (res) {
if (res.code == 200 && res.data) {
app.setUserData(res.data)
resolve(res);
} else {
uni.showModal({
title: '用户授权失败',
content: res.message,
showCancel: false
});
reject(res);
}
});
} else {
uni.showModal({
title: '请求失败',
content: res.message
});
}
});
}
......
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