Commit c8ecc865 authored by 李超鹏's avatar 李超鹏

update:update

scope:self-support
body:修改拍照页面问题、完工问题
parent 9cb25c04
const globalUrl = process.uniEnv || {}
const ucenterApiUrl = globalUrl.ucenterUrl.apiUrl
let certApiFun = function(vm){
let getCertList = async (params = {}) => await vm.$u.get(ucenterApiUrl+'/v1/settled/get-cert-list', params);
const certApi = {
getCertList
}
return certApi
}
module.exports = {
certApiFun
}
\ No newline at end of file
...@@ -64,6 +64,10 @@ let orderApiFun = function(vm){ ...@@ -64,6 +64,10 @@ let orderApiFun = function(vm){
* 获取拍照标准 * 获取拍照标准
*/ */
let orderStandard = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token+'/photo/standard', params); let orderStandard = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token+'/photo/standard', params);
/**
* 获取拍照标准单独项目
*/
let orderStandardItem = async (params = {}) => await vm.$u.get(prefix + vm.vuex_token+'/photo/standard/only', params);
/** /**
* 保存图片信息 * 保存图片信息
...@@ -147,6 +151,7 @@ let orderApiFun = function(vm){ ...@@ -147,6 +151,7 @@ let orderApiFun = function(vm){
traceAndAppointment, traceAndAppointment,
rejectOrder, rejectOrder,
orderStandard, orderStandard,
orderStandardItem,
saveImage, saveImage,
getWatermark, getWatermark,
saveWatermark, saveWatermark,
......
<!-- ******************* 文件上传 ******************* --> <!-- ******************* 文件上传 ******************* -->
<template> <template>
<view> <view>
<view class="file-box" v-if="!takeStatus"> <view class="file-box" v-if="!takeStatus">
<!-- <view class="u-flex"> <!-- <view class="u-flex">
<view class="txt u-flex-1">{{item.fieldsTitle}}</view> <view class="txt u-flex-1">{{item.fieldsTitle}}</view>
<u-icon name="arrow-right" color="#666" size="28"></u-icon> <u-icon name="arrow-right" color="#666" size="28"></u-icon>
</view> --> </view> -->
<view class="pics u-flex u-flex-wrap"> <view class="pics u-flex u-flex-wrap">
<view class="img-list" v-for="(item,index) in imgList" :key="index"> <view class="img-list" v-for="(item,index) in imgList" :key="index">
<u-image class="pic" width="160" height="160" :src="item.path" :border-radius="10" @click.stop="prviewImage(item.path,index)"></u-image> <u-image class="pic" width="160" height="160" :src="item.path" :border-radius="10" @click.stop="prviewImage(item.path,index)"></u-image>
<view class="icon-del-box" @click.stop="delFile(index)"> <view class="icon-del-box" @click.stop="delFile(index)">
<view class="icon-del"></view> <view class="icon-del"></view>
<view class="icon-del rotate"></view> <view class="icon-del rotate"></view>
</view> </view>
</view> </view>
<view class="img-list"> <view class="img-list">
<u-image class="pic" width="160rpx" height="160rpx" :border-radius="10" @click="selectUpload" :src="uploadImage"></u-image> <u-image class="pic" width="160rpx" height="160rpx" :border-radius="10" @click="selectUpload" :src="uploadImage"></u-image>
</view> </view>
<!-- <u-image class="pic" v-for="item in 6" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image> --> <!-- <u-image class="pic" v-for="item in 6" width="170rpx" height="170" src="'https://cdn.uviewui.com/uview/example/fade.jpg"></u-image> -->
</view> </view>
<u-action-sheet :list="list" v-model="maskShow" :cancel-btn="true" @click="uploadSelect"></u-action-sheet> <u-action-sheet :list="list" v-model="maskShow" :cancel-btn="true" @click="uploadSelect"></u-action-sheet>
</view> </view>
<take-photo v-else @close="closeTake"></take-photo> <take-photo v-else @close="closeTake" :currentItem="currentItemDate"></take-photo>
</view> </view>
</template> </template>
<script> <script>
import arrMixin from './arrMixin' import arrMixin from './arrMixin'
import baseFile from '@/components/upload/index'; import baseFile from '@/components/upload/index';
import takePhoto from '@/components/take/index.vue' import takePhoto from '@/components/take/index.vue'
export default { export default {
name: 'XhFiles', name: 'XhFiles',
components: { components: {
'take-photo': takePhoto 'take-photo': takePhoto
}, },
mixins: [arrMixin,baseFile], mixins: [arrMixin,baseFile],
props: { props: {
files: { files: {
type: Array, type: Array,
} },
partnerCompanyId: {
type: String,
default: '{}'
},
}, },
filters:{}, filters:{},
data() { data() {
return { return {
maskShow:false, maskShow:false,
list: [ list: [
{ {
...@@ -53,14 +57,15 @@ ...@@ -53,14 +57,15 @@
} }
], ],
takeStatus: false, takeStatus: false,
currentItemDate:{},
} }
}, },
computed: { computed: {
settings() { settings() {
return this.item.settings || [] return this.item.settings || []
}, },
uploadImage() { uploadImage() {
return process.uniEnv.qn_base_url + 'upload-file.png' return process.uniEnv.qn_base_url + 'upload-file.png'
}, },
}, },
mounted() { mounted() {
...@@ -72,12 +77,12 @@ ...@@ -72,12 +77,12 @@
} }
}, },
methods: { methods: {
selectUpload(){ selectUpload(){
if (this.imgList.length === 10) { if (this.imgList.length === 10) {
return this.$refs.uToast.show({ return this.$refs.uToast.show({
title: '图片已超出最大数量', title: '图片已超出最大数量',
type: 'error', type: 'error',
}) })
} }
// 弹窗展示 // 弹窗展示
this.maskShow = true this.maskShow = true
...@@ -106,23 +111,25 @@ ...@@ -106,23 +111,25 @@
} }
// 使用拍照工具拍摄 // 使用拍照工具拍摄
this.takeStatus = true this.takeStatus = true
this.getWatermark()
this.getPhotoStander()
}, },
setValue() { setValue() {
const dataValue = [] const dataValue = []
this.imgList.map(item=>{ this.imgList.map(item=>{
dataValue.push(item.path) dataValue.push(item.path)
}) })
this.valueChange(dataValue) this.valueChange(dataValue)
}, },
closeTake(val) { closeTake(val) {
if(val && val.length > 0){ if(val && val.length > 0){
val.forEach((item,index,array)=>{ val.forEach((item,index,array)=>{
item.path = item.key item.path = item.key
this.imgList.push(item) this.imgList.push(item)
}) })
this.setValue() this.setValue()
} }
this.takeStatus = false this.takeStatus = false
}, },
prviewImage(url, index) { prviewImage(url, index) {
uni.previewImage({ uni.previewImage({
...@@ -133,27 +140,71 @@ ...@@ -133,27 +140,71 @@
delFile(index) { delFile(index) {
this.imgList.splice(index, 1) this.imgList.splice(index, 1)
this.setValue() this.setValue()
},
getPhotoStander(){// 获取拍照规范接口
let self = this
// this.$u.api.orderStandardItem({}).then((res)=>{
// if (res.code == 200 && res.data.length>0) {
// self.currentItemDate = res.data[0]
// }else{
// console.log("获取完工项的拍照标准异常",res.data.message)
// }
// })
self.currentItemDate = {
"id": 154,
"partnerCompanyId": 10331001475,
"categoryId": 1100000216,
"brandId": null,
"type": "勘测部分",
"name": "勘测单",
"fieldName": "06",
"images": [
"https://cloud-bak.banshouhui.com/2-勘测单.jpg"
],
"mainPoint": [
"表格清晰,文字可辨",
"表格居中,不倾斜",
"全部填写完整,不能填写的部分划横杠。",
"涉及到用户签字部分,不允许我方人员代签,由用户或用户指定人进行签字确认。",
"涉及到物业的由现场物业人员签字确认。"
],
"note": "正面拍摄,完整看到单据 4 条边",
"orderImages": null
}
},
getWatermark(){
if(getApp().globalData.photo.waterSetting){
return
}
var data={partnerCompanyId:this.partnerCompanyId}
this.$u.api.getWatermark(data).then((res) => {
if (res.code == 200) {
getApp().globalData.photo.waterSetting = res.data
} else {
console.log("获取水印备注异常",res.data.message)
}
});
} }
} }
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.img-list { .img-list {
position: relative; position: relative;
margin: 8rpx; margin: 8rpx;
width: 160rpx; width: 160rpx;
height: 160rpx; height: 160rpx;
.pic{ .pic{
// margin-right: 15rpx; // margin-right: 15rpx;
// margin-bottom: 15rpx; // margin-bottom: 15rpx;
&:nth-child(3n){ &:nth-child(3n){
margin-right: 0; margin-right: 0;
} }
} }
.icon-del-box { .icon-del-box {
/* #ifndef APP-NVUE */ /* #ifndef APP-NVUE */
display: flex; display: flex;
...@@ -170,14 +221,14 @@ ...@@ -170,14 +221,14 @@
z-index: 2; z-index: 2;
transform: rotate(-45deg); transform: rotate(-45deg);
} }
.icon-del { .icon-del {
width: 30rpx; width: 30rpx;
height: 4rpx; height: 4rpx;
background-color: #fff; background-color: #fff;
border-radius: 2px; border-radius: 2px;
} }
.rotate { .rotate {
position: absolute; position: absolute;
transform: rotate(90deg); transform: rotate(90deg);
......
<template> <template>
<view class="backView"> <view class="backView">
<u-navbar title="设置" :title-size="26" title-color="#000" :custom-back="backTake"></u-navbar> <u-navbar title="设置" :title-size="26" title-color="#000" :custom-back="backTake"></u-navbar>
<view class="shadowBackView" style="background-color: transparent;z-index: 1" v-if="loading"> <view class="shadowBackView" style="background-color: transparent;z-index: 1" v-if="loading">
<u-loading style="position: fixed;top: 50%;" :show="loading" size="36" mode="flower"></u-loading> <u-loading style="position: fixed;top: 50%;" :show="loading" size="36" mode="flower"></u-loading>
</view> </view>
<view class="itemView firstItem"> <view class="itemView firstItem">
<view class="itemTitleView"> <view class="itemTitleView">
<text class="itemTitle">保存原图</text> <text class="itemTitle">保存原图</text>
<text class="itemNotice">拍照后另保存一张无水印的图片</text> <text class="itemNotice">拍照后另保存一张无水印的图片</text>
</view> </view>
<switch class="itemSwitch" :checked="result['hasOrigin']" @change="handleOrigineChange" color="#007AFF" /> <switch class="itemSwitch" :checked="result['hasOrigin']" @change="handleOrigineChange" color="#007AFF" />
</view> </view>
<view class="itemView" v-if="showTitleSwitch"> <view class="itemView" v-if="showTitleSwitch">
<view class="itemTitleView" @click="itemClick({},-1)"> <view class="itemTitleView" @click="itemClick({},-1)">
<text class="itemTitle">水印标题</text> <text class="itemTitle">水印标题</text>
<text class="itemNotice">{{result['lowerLeft']['title'] || '点击可编辑更改'}}</text> <text class="itemNotice">{{result['lowerLeft']['title'] || '点击可编辑更改'}}</text>
</view> </view>
<switch class="itemSwitch" disabled :checked="result['lowerLeft']['title'] != ''" <switch class="itemSwitch" disabled :checked="result['lowerLeft']['title'] != ''"
@click="handleClickTitleSwitch" color="#007AFF" /> @click="handleClickTitleSwitch" color="#007AFF" />
</view> </view>
<view class="itemView" v-for="(item,ikey) in itemList" :key="ikey"> <view class="itemView" v-for="(item,ikey) in itemList" :key="ikey">
<view class="itemTitleView" @click="itemClick(item,ikey)"> <view class="itemTitleView" @click="itemClick(item,ikey)">
<text class="itemTitle">{{item['watemarkText'] || '自定义' + (ikey + 1)}}</text> <text class="itemTitle">{{item['watemarkText'] || '自定义' + (ikey + 1)}}</text>
<text class="itemNotice">{{item['watemarkValue'] || '点击可编辑更改'}}</text> <text class="itemNotice">{{item['watemarkValue'] || '点击可编辑更改'}}</text>
</view> </view>
<switch class="itemSwitch" :checked="item['enable']" @change="itemChange(item, ikey)" color="#007AFF" /> <switch class="itemSwitch" :checked="item['enable']" @change="itemChange(item, ikey)" color="#007AFF" />
</view> </view>
<u-popup border-radius="10" v-model="isPopShow" safe-area-inset-bottom :mask-close-able="false" mode="center" <u-popup border-radius="10" v-model="isPopShow" safe-area-inset-bottom :mask-close-able="false" mode="center"
width="690rpx" height="600rpx" @close="handlePopClose"> width="690rpx" height="600rpx" @close="handlePopClose">
<view class="popCenterView"> <view class="popCenterView">
<text class="popTitle">设置自定义项</text> <text class="popTitle">设置自定义项</text>
<view class="inputBackView"> <view class="inputBackView">
<view class="ph-pop-left-view"> <view class="ph-pop-left-view">
<view class="leftInputView"> <view class="leftInputView">
<input class="leftInput" type="text" v-model="currenItem['watemarkText']" <input class="leftInput" type="text" v-model="currenItem['watemarkText']"
@input="leftInput()" :disabled="currenItem.type === '备注'" placeholder="请输入" @input="leftInput()" :disabled="currenItem.type === '备注'" placeholder="请输入"
maxlength="10" /> maxlength="10" />
</view> </view>
<view class="ph-pop-tip-view" v-if="showTipLeft">*必填项</view> <view class="ph-pop-tip-view" v-if="showTipLeft">*必填项</view>
</view> </view>
<view class="ph-pop-mid-view">:</view> <view class="ph-pop-mid-view">:</view>
<view> <view>
<view class="rightInputView"> <view class="rightInputView">
<input class="rightInput" type="text" v-model="currenItem['watemarkValue']" <input class="rightInput" type="text" v-model="currenItem['watemarkValue']"
@input="rightInput()" placeholder="请输入内容" maxlength="30" /> @input="rightInput()" placeholder="请输入内容" maxlength="30" />
</view> </view>
<view class="ph-pop-tip-view" v-if="showTipRight">*必填项</view> <view class="ph-pop-tip-view" v-if="showTipRight">*必填项</view>
</view> </view>
</view> </view>
<text class="popNoticeText u-m-t-20">示例:</text> <text class="popNoticeText u-m-t-20">示例:</text>
<text class="popNoticeText">工程队名称:蓝天工程队</text> <text class="popNoticeText">工程队名称:蓝天工程队</text>
<view class="popBtnView"> <view class="popBtnView">
<u-button :custom-style="customStyleCancel" hover-class="none" shape="circle" type="primary" @click="popCancelClick()"> <u-button :custom-style="customStyleCancel" hover-class="none" shape="circle" type="primary" @click="popCancelClick()">
取消 取消
</u-button> </u-button>
<u-button :custom-style="customStyleSave" shape="circle" type="primary" @click="popSaveClick()"> <u-button :custom-style="customStyleSave" shape="circle" type="primary" @click="popSaveClick()">
保存 保存
</u-button> </u-button>
</view> </view>
</view> </view>
</u-popup> </u-popup>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
systemId: '', systemId: '',
isSaveOrigine: true, isSaveOrigine: true,
isPopShow: false, isPopShow: false,
icon_close_new: '', icon_close_new: '',
result: { result: {
hasOrigin: true, hasOrigin: true,
lowerLeft: { lowerLeft: {
body: [] body: []
} }
}, },
currenItem: { currenItem: {
'watemarkText': '', 'watemarkText': '',
'watemarkValue': '' 'watemarkValue': ''
}, },
editingItem: {}, editingItem: {},
showTipLeft: false, showTipLeft: false,
showTipRight: false, showTipRight: false,
loading: true loading: true
} }
}, },
computed: { computed: {
itemList() { itemList() {
console.log(this.result) console.log(this.result)
if (this.result['lowerLeft']) { if (this.result['lowerLeft']) {
var arr = this.result['lowerLeft']['body'] var arr = this.result['lowerLeft']['body']
return arr.filter((item) => { return arr.filter((item) => {
return item.watemarkType === '备注' return item.watemarkType === '备注'
}) })
} else { } else {
return [] return []
} }
}, },
showTitleSwitch() { showTitleSwitch() {
return this.result['lowerLeft'].hasOwnProperty('title') return this.result['lowerLeft'].hasOwnProperty('title')
}, },
customStyleCancel() { customStyleCancel() {
return { return {
'background-color': '#D1D4D4', 'background-color': '#D1D4D4',
'width': '280rpx', 'width': '280rpx',
'height': '96rpx' 'height': '96rpx'
} }
}, },
customStyleSave() { customStyleSave() {
return { return {
'background-color': '##2272FF', 'background-color': '##2272FF',
'width': '280rpx', 'width': '280rpx',
'height': '96rpx', 'height': '96rpx',
'margin-left': '50rpx' 'margin-left': '50rpx'
} }
} }
}, },
created(e) { created(e) {
getApp().trackPage('水印设置页') getApp().trackPage('水印设置页')
const globalData = getApp().globalData const globalData = getApp().globalData
this.icon_close_new = globalData.icon_close_new this.icon_close_new = globalData.icon_close_new
this.systemId = globalData.photo.currentItem.partnerCompanyId this.systemId = globalData.photo.currentItem.partnerCompanyId
this.getItemList() this.getItemList()
}, },
methods: { methods: {
getItemList: function() { getItemList: function() {
this.loading = true this.loading = true
this.$u.api.getWatermark({partnerCompanyId:this.systemId}).then(res => { this.$u.api.getWatermark({partnerCompanyId:this.systemId}).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.result = res.data this.result = res.data
} else { } else {
uni.showToast({title: res.data.message}) uni.showToast({title: res.data.message})
} }
this.loading = false this.loading = false
}) })
}, },
saveUserWatermark: function() { saveUserWatermark: function() {
this.loading = true this.loading = true
this.$u.api.saveWatermark(this.result).then(res=>{ this.$u.api.saveWatermark(this.result).then(res=>{
if(res.code === 200){ if(res.code === 200){
uni.showToast({title:'保存成功'}) uni.showToast({title:'保存成功'})
getApp().globalData.photo.waterSetting = this.result getApp().globalData.photo.waterSetting = this.result
this.$emit("changeWatermark", this.result); this.$emit("changeWatermark", this.result);
}else{ }else{
uni.showToast({title: res.message}) uni.showToast({title: res.message})
} }
this.loading = false this.loading = false
}) })
}, },
//保存原图 开关 //保存原图 开关
handleOrigineChange: function(e) { handleOrigineChange: function(e) {
this.result['hasOrigin'] = !this.result['hasOrigin'] this.result['hasOrigin'] = !this.result['hasOrigin']
this.saveUserWatermark() this.saveUserWatermark()
}, },
handleClickTitleSwitch: function(e) { handleClickTitleSwitch: function(e) {
var string = this.result['lowerLeft']['title'] ? '水印标题不可关闭' : '请先编辑该自定义项' var string = this.result['lowerLeft']['title'] ? '水印标题不可关闭' : '请先编辑该自定义项'
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: string title: string
}) })
}, },
//自定义 开关 //自定义 开关
itemChange: function(item, ikey) { itemChange: function(item, ikey) {
if (item['watemarkValue']) { if (item['watemarkValue']) {
// 修改 // 修改
item['enable'] = !item['enable'] item['enable'] = !item['enable']
this.saveUserWatermark() this.saveUserWatermark()
} else { } else {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '请先编辑该自定义项' title: '请先编辑该自定义项'
}) })
} }
}, },
//自定义 点击 //自定义 点击
itemClick: function(item, ikey) { itemClick: function(item, ikey) {
if (ikey === -1) { if (ikey === -1) {
this.currenItem = { this.currenItem = {
'watemarkText': '水印标题', 'watemarkText': '水印标题',
'watemarkValue': this.result['lowerLeft']['title'], 'watemarkValue': this.result['lowerLeft']['title'],
'type': '备注' 'type': '备注'
} }
} else { } else {
this.editingItem = item this.editingItem = item
this.currenItem = { this.currenItem = {
...item ...item
} }
} }
this.isPopShow = true this.isPopShow = true
}, },
//左侧输入框 //左侧输入框
leftInput: function(e) { leftInput: function(e) {
if (this.currenItem['watemarkText']) { if (this.currenItem['watemarkText']) {
this.showTipLeft = false this.showTipLeft = false
} }
}, },
//右侧输入框 //右侧输入框
rightInput: function(e) { rightInput: function(e) {
if (this.currenItem['watemarkValue']) { if (this.currenItem['watemarkValue']) {
this.showTipRight = false this.showTipRight = false
} }
}, },
//自定义弹窗 关闭 //自定义弹窗 关闭
popCancelClick: function() { popCancelClick: function() {
this.isPopShow = false this.isPopShow = false
this.currenItem = { this.currenItem = {
'watemarkText': '', 'watemarkText': '',
'watemarkValue': '' 'watemarkValue': ''
} }
}, },
handlePopClose() { handlePopClose() {
this.showTipLeft = false, this.showTipLeft = false,
this.showTipRight = false this.showTipRight = false
}, },
backTake() { backTake() {
this.$emit('changeType', 1) this.$emit('changeType', 1)
}, },
//自定义弹窗 保存 //自定义弹窗 保存
popSaveClick: function() { popSaveClick: function() {
if (this.currenItem['watemarkText'] && this.currenItem['watemarkValue']) { if (this.currenItem['watemarkText'] && this.currenItem['watemarkValue']) {
this.isPopShow = false this.isPopShow = false
if (this.currenItem.type === '备注') { if (this.currenItem.type === '备注') {
this.result['lowerLeft']['title'] = this.currenItem['watemarkValue'] this.result['lowerLeft']['title'] = this.currenItem['watemarkValue']
} else { } else {
this.editingItem['watemarkText'] = this.currenItem['watemarkText'] this.editingItem['watemarkText'] = this.currenItem['watemarkText']
this.editingItem['watemarkValue'] = this.currenItem['watemarkValue'] this.editingItem['watemarkValue'] = this.currenItem['watemarkValue']
this.editingItem['enable'] = true this.editingItem['enable'] = true
} }
this.saveUserWatermark() this.saveUserWatermark()
} else { } else {
// 提示 // 提示
if (!this.currenItem['watemarkText']) { if (!this.currenItem['watemarkText']) {
this.showTipLeft = true this.showTipLeft = true
} }
if (!this.currenItem['watemarkValue']) { if (!this.currenItem['watemarkValue']) {
this.showTipRight = true this.showTipRight = true
} }
} }
} }
} }
} }
</script> </script>
<style> <style>
.backView { .backView {
background-color: #FAFAFA; background-color: #FAFAFA;
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
/* /*
.firstItemView{ .firstItemView{
background-color: #FFFFFF; background-color: #FFFFFF;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding-top: 80rpx; padding-top: 80rpx;
padding-bottom: 80rpx; padding-bottom: 80rpx;
border-bottom: 2rpx solid #F4F5F7; border-bottom: 2rpx solid #F4F5F7;
} */ } */
.itemView { .itemView {
background-color: #FFFFFF; background-color: #FFFFFF;
width: 100%; width: 100%;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding-top: 54rpx; padding-top: 54rpx;
padding-bottom: 54rpx; padding-bottom: 54rpx;
} }
.itemView.firstItem { .itemView.firstItem {
border-bottom: 2rpx solid #F4F5F7; border-bottom: 2rpx solid #F4F5F7;
} }
.itemTitleView { .itemTitleView {
background-color: #FFFFFF; background-color: #FFFFFF;
width: 80%; width: 80%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
padding-left: 30rpx; padding-left: 30rpx;
} }
.itemTitle { .itemTitle {
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
color: #333333; color: #333333;
} }
.itemNotice { .itemNotice {
font-size: 26rpx; font-size: 26rpx;
color: #666666; color: #666666;
margin-top: 4rpx; margin-top: 4rpx;
} }
.itemSwitch { .itemSwitch {
margin-right: 30rpx; margin-right: 30rpx;
transform: scale(0.78, 0.75); transform: scale(0.78, 0.75);
} }
.shadowBackView { .shadowBackView {
background-color: rgba(0, 0, 0, 0.5); background-color: rgba(0, 0, 0, 0.5);
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
width: 100%; width: 100%;
height: 100%; height: 100%;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
} }
.popCenterView { .popCenterView {
background-color: #FFFFFF; background-color: #FFFFFF;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
} }
.popTitle { .popTitle {
font-size: 36rpx; font-size: 36rpx;
font-weight: bold; font-weight: bold;
margin-top: 50rpx; margin-top: 50rpx;
padding-left: 30rpx; padding-left: 30rpx;
} }
.inputBackView { .inputBackView {
margin-top: 52rpx; margin-top: 52rpx;
width: 100%; width: 100%;
height: 90rpx; height: 90rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
} }
.leftInputView { .leftInputView {
width: 220rpx; width: 220rpx;
height: 72rpx; height: 72rpx;
border: 2rpx solid #666666; border: 2rpx solid #666666;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.leftInput { .leftInput {
width: 180rpx; width: 180rpx;
height: 32rpx; height: 32rpx;
} }
.ph-pop-left-view { .ph-pop-left-view {
margin-left: 30rpx; margin-left: 30rpx;
} }
.ph-pop-tip-view { .ph-pop-tip-view {
color: #F56C6C; color: #F56C6C;
} }
.ph-pop-mid-view { .ph-pop-mid-view {
margin-top: 20rpx; margin-top: 20rpx;
} }
.rightInputView { .rightInputView {
width: 360rpx; width: 360rpx;
height: 72rpx; height: 72rpx;
border: 2rpx solid #666666; border: 2rpx solid #666666;
margin-right: 30rpx; margin-right: 30rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.rightInput { .rightInput {
width: 320rpx; width: 320rpx;
height: 32rpx; height: 32rpx;
} }
.popNoticeText { .popNoticeText {
font-size: 26rpx; font-size: 26rpx;
color: #666666; color: #666666;
padding-left: 30rpx; padding-left: 30rpx;
} }
.popBtnView { .popBtnView {
margin-top: 110rpx; margin-top: 110rpx;
width: 100%; width: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
/* .popCancelBtn { /* .popCancelBtn {
background-color: #D1D4D4; background-color: #D1D4D4;
width: 280rpx; width: 280rpx;
height: 96rpx; height: 96rpx;
border-radius: 48rpx; border-radius: 48rpx;
margin-left: 40rpx; margin-left: 40rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} */ } */
/* .popSaveBtn { /* .popSaveBtn {
background-color: #2272FF; background-color: #2272FF;
width: 280rpx; width: 280rpx;
height: 96rpx; height: 96rpx;
border-radius: 48rpx; border-radius: 48rpx;
margin-right: 40rpx; margin-right: 40rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} */ } */
/* .popBtnText { /* .popBtnText {
font-size: 32rpx; font-size: 32rpx;
color: #FFFFFF; color: #FFFFFF;
font-weight: 600; font-weight: 600;
} */ } */
</style> </style>
<template> <template>
<view class="camera"> <view class="camera">
<view class="camera-container" v-if="showType === 1"> <view class="camera-container" v-if="showType === 1">
<cover-view class="header-box" :style="{'height':navHeight/2 + 'px'}"> <cover-view class="header-box" :style="{'height':navHeight/2 + 'px'}">
<cover-view class="inner"> <cover-view class="inner">
<cover-image @click="setCameraInfo('devicePosition')" class="icon" mode="aspectFit" <cover-image @click="setCameraInfo('devicePosition')" class="icon" mode="aspectFit"
src="/static/photo/icon-switch.png"></cover-image> src="/static/photo/icon-switch.png"></cover-image>
<cover-image @click="setCameraInfo('flash')" class="icon" mode="aspectFit" <cover-image @click="setCameraInfo('flash')" class="icon" mode="aspectFit"
:src="'/static/photo/icon-light-' + cameraInfo.flash +'.png'"></cover-image> :src="'/static/photo/icon-light-' + cameraInfo.flash +'.png'"></cover-image>
<cover-image v-if="currentItem.partnerCompanyId" @click="changeType(3)" class="icon" mode="aspectFit" <cover-image v-if="currentItem.partnerCompanyId" @click="changeType(3)" class="icon" mode="aspectFit"
src="/static/photo/icon-setting.png"></cover-image> src="/static/photo/icon-setting.png"></cover-image>
</cover-view> </cover-view>
</cover-view> </cover-view>
<camera class="camera-box" v-if="cameraChange&&!standardShow" :device-position="cameraInfo.devicePosition" <camera class="camera-box" v-if="cameraChange&&!standardShow" :device-position="cameraInfo.devicePosition"
:flash="cameraInfo.flash" :style="{'height':cameraHeight/2 + 'px','top':parseInt(navHeight/2) + 'px'}" :flash="cameraInfo.flash" :style="{'height':cameraHeight/2 + 'px','top':parseInt(navHeight/2) + 'px'}"
@error="cameraError"> @error="cameraError">
<cover-view class="mark-box"> <cover-view class="mark-box">
<cover-view class="txt big" v-if="titleTxt">{{titleTxt}}</cover-view> <cover-view class="txt big" v-if="titleTxt">{{titleTxt}}</cover-view>
<cover-view class="txt" v-for="(txt,index) in settingTxtArr" :key="index">{{txt || '获取中'}}</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.latitude || '正在获取中...'}}</cover-view>
<cover-view class="txt u-m-t-10">地址:{{waterInfo.address || '正在获取中...'}}</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-view>
<cover-image class="mark-water" mode="aspectFit" :src="waterInfo.markImage"></cover-image> <cover-image class="mark-water" mode="aspectFit" :src="waterInfo.markImage"></cover-image>
</camera> </camera>
<cover-view class="bottom-box" v-if="!standardShow"> <cover-view class="bottom-box" v-if="!standardShow">
<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="$u.debounce(takePhoto, 500)"> </cover-image> <cover-image class='icon-take icon' src='/static/photo/icon-take.png' @click="$u.debounce(takePhoto, 500)"> </cover-image>
<cover-image class='icon' src='/static/photo/icon-standard.png' @click="standardShow = true" v-if="standardStatus"> </cover-image> <cover-image class='icon' src='/static/photo/icon-standard.png' @click="standardShow = true" v-if="standardStatus"> </cover-image>
<view class='icon' v-else></view> <view class='icon' v-else></view>
</cover-view> </cover-view>
<canvas canvas-id="canvas" id="photoCanvas" class="canvas" <canvas canvas-id="canvas" id="photoCanvas" class="canvas"
:style="{'width':750 + 'rpx','height': cameraHeight + 'rpx'}"></canvas> :style="{'width':750 + 'rpx','height': cameraHeight + 'rpx'}"></canvas>
<view v-show="standardShow" class="page-mask" :z-index="10000"> <view v-show="standardShow" class="page-mask" :z-index="10000">
<photo-standard :currentItem="currentItem" /> <photo-standard :currentItem="currentItem" />
<view class="btn-close"> <view class="btn-close">
<image @click="closeShadow" class="icon icon-close" mode="aspectFit" src="/static/photo/icon-close.png"></image> <image @click="closeShadow" class="icon icon-close" mode="aspectFit" src="/static/photo/icon-close.png"></image>
</view> </view>
</view> </view>
</view> </view>
<photo-preview v-if="showType === 2" @changeType="changeType" @finish="finish" /> <photo-preview v-if="showType === 2" @changeType="changeType" @finish="finish" />
<photo-setting v-if="showType === 3" @changeType="changeType" @changeWatermark="changeWatermark"/> <photo-setting v-if="showType === 3" @changeType="changeType" @changeWatermark="changeWatermark"/>
</view> </view>
</template> </template>
<script> <script>
let r = require("@/libs/bmap-wx.min.js"); let r = require("@/libs/bmap-wx.min.js");
let h = new r.BMapWX({ let h = new r.BMapWX({
// ak: "rpVq5d3yxaRCoKzVwmFMo0o4iC524CAG", // ak: "rpVq5d3yxaRCoKzVwmFMo0o4iC524CAG",
ak: "iXsGdyEcm1iQONoUPyEp0hrBTLCuOaW2" ak: "iXsGdyEcm1iQONoUPyEp0hrBTLCuOaW2"
}); });
import standard from '@/components/photo/standard.vue' import standard from '@/components/photo/standard.vue'
import preview from '@/components/photo/preview.vue' import preview from '@/components/photo/preview.vue'
import setting from '@/components/photo/setting.vue' import setting from '@/components/photo/setting.vue'
export default { export default {
props: { props: {
currentItem: { // 对应的规范item currentItem: { // 对应的规范item
default () { default () {
return { return {
_id: '', // 规格ID _id: '', // 规格ID
system_id: '', // 系统ID system_id: '', // 系统ID
brand_id: '', // 品牌ID brand_id: '', // 品牌ID
classify_id: '', // 分类ID classify_id: '', // 分类ID
images: [], // 拍照要求示意图 images: [], // 拍照要求示意图
main_point: [] // 要点 main_point: [] // 要点
} }
} }
} }
}, },
components: { components: {
'photo-standard': standard, 'photo-standard': standard,
'photo-preview': preview, 'photo-preview': preview,
'photo-setting': setting, 'photo-setting': setting,
}, },
data() { data() {
return { return {
showType: 1, showType: 1,
standardShow: false, standardShow: false,
cameraInfo: { cameraInfo: {
devicePosition: 'back', devicePosition: 'back',
flash: 'auto' flash: 'auto'
}, },
waterInfo: { waterInfo: {
longitude: '', // 经度 longitude: '', // 经度
latitude: '', // 维度 latitude: '', // 维度
address: '', //地址 address: '', //地址
date: '', //日期 date: '', //日期
markImage: 'https://qn-static.banshouhui.com/live_mark.png' markImage: 'https://qn-static.banshouhui.com/live_mark.png'
}, },
tempImgs: { tempImgs: {
'markImage': '', // 拍照水印 'markImage': '', // 拍照水印
'origin': '', // 无水印照片 'origin': '', // 无水印照片
'mixWater': '', // 有水印照片 'mixWater': '', // 有水印照片
}, },
authSetting: { authSetting: {
camera: false, // 相机授权 camera: false, // 相机授权
location: false, // 位置授权 location: false, // 位置授权
}, },
navHeight: 130, navHeight: 130,
cameraWidth: 750, cameraWidth: 750,
cameraHeight: 1000, // (4 / 3 * 750) 图片比例4:3 cameraHeight: 1000, // (4 / 3 * 750) 图片比例4:3
ratio: 0, ratio: 0,
cameraChange: false, cameraChange: false,
waterSetting: null, waterSetting: null,
shadowInitShow: false, // 第一次进入页面需显示弹窗 shadowInitShow: false, // 第一次进入页面需显示弹窗
standardStatus: false // 是否显示拍照要求 standardStatus: false // 是否显示拍照要求
} }
}, },
created(e) { created(e) {
const photo = getApp().globalData.photo const photo = getApp().globalData.photo
getApp().trackPage('拍照页') getApp().trackPage('拍照页')
photo.allImages = [] photo.allImages = []
photo.currentItemLength = 0 photo.currentItemLength = 0
// this.ctx = uni.createCameraContext(); // this.ctx = uni.createCameraContext();
this.updateTime() this.updateTime()
this.getLocation() this.getLocation()
this.getMarkPath() this.getMarkPath()
this.initData() this.initData()
photo.currentItem = this.currentItem photo.currentItem = this.currentItem
if (this.currentItem.images.length > 0) { if (this.currentItem.images.length > 0) {
this.shadowInitShow = true this.shadowInitShow = true
this.standardShow = true this.standardShow = true
this.standardStatus = true this.standardStatus = true
} }
}, },
computed: { computed: {
titleTxt() { titleTxt() {
const waterSetting = this.waterSetting const waterSetting = this.waterSetting
let txt = '' let txt = ''
if (!waterSetting || !waterSetting.lowerLeft) { if (!waterSetting || !waterSetting.lowerLeft) {
return '' return ''
} }
txt = waterSetting.lowerLeft && waterSetting.lowerLeft.title || '' txt = waterSetting.lowerLeft && waterSetting.lowerLeft.title || ''
return txt return txt
}, },
settingTxtArr() { settingTxtArr() {
let arr = [] let arr = []
// 包含经纬度 // 包含经纬度
const waterInfo = this.waterInfo const waterInfo = this.waterInfo
arr = ['经度:' + waterInfo.longitude, '纬度:' + waterInfo.latitude, '地址:' + waterInfo.address, '时间:' + arr = ['经度:' + waterInfo.longitude, '纬度:' + waterInfo.latitude, '地址:' + waterInfo.address, '时间:' +
waterInfo.date waterInfo.date
] ]
let settingTxtArr = [] let settingTxtArr = []
const typeArr = ['经度', '纬度', '地址', '时间'] const typeArr = ['经度', '纬度', '地址', '时间']
const waterSetting = this.waterSetting const waterSetting = this.waterSetting
if (!waterSetting || !waterSetting.lowerLeft || !waterSetting.lowerLeft.body) { if (!waterSetting || !waterSetting.lowerLeft || !waterSetting.lowerLeft.body) {
return arr return arr
} }
const settingArr = waterSetting.lowerLeft.body const settingArr = waterSetting.lowerLeft.body
settingArr.map(item => { settingArr.map(item => {
const idx = typeArr.indexOf(item.watemarkType) const idx = typeArr.indexOf(item.watemarkType)
if (item.enable && (idx > -1 || (item.watemarkValue && item.watemarkText))) { if (item.enable && (idx > -1 || (item.watemarkValue && item.watemarkText))) {
if (idx > -1) { if (idx > -1) {
settingTxtArr.push(arr[idx]) settingTxtArr.push(arr[idx])
} else { } else {
settingTxtArr.push(item.watemarkText + ':' + item.watemarkValue) settingTxtArr.push(item.watemarkText + ':' + item.watemarkValue)
} }
} }
}) })
return settingTxtArr return settingTxtArr
} }
}, },
watch: {}, watch: {},
mounted() { mounted() {
// 默认开启弹窗 // 默认开启弹窗
const photo = getApp().globalData.photo const photo = getApp().globalData.photo
this.waterSetting = photo.waterSetting this.waterSetting = photo.waterSetting
this.standardShow = this.shadowInitShow this.standardShow = this.shadowInitShow
this.cameraChange = true this.cameraChange = true
// this.initData() // this.initData()
}, },
destroyed(){ destroyed(){
this.cameraChange = false this.cameraChange = false
}, },
methods: { methods: {
closeShadow() { closeShadow() {
this.shadowInitShow = false this.shadowInitShow = false
this.standardShow = false this.standardShow = false
}, },
goBack() { goBack() {
uni.showTabBar() uni.showTabBar()
this.$emit('close') this.$emit('close')
}, },
finish() { finish() {
uni.showTabBar() uni.showTabBar()
const photo = getApp().globalData.photo const photo = getApp().globalData.photo
this.$emit('close', photo.allImages) this.$emit('close', photo.allImages)
}, },
changeType(type) { changeType(type) {
this.showType = type this.showType = type
}, },
changeWatermark(watermark){ changeWatermark(watermark){
this.waterSetting = watermark this.waterSetting = watermark
}, },
updateTime() { updateTime() {
this.waterInfo.date = this.getTime() this.waterInfo.date = this.getTime()
// let timer = setTimeout(() => { // let timer = setTimeout(() => {
// clearTimeout(timer); // clearTimeout(timer);
// this.updateTime() // this.updateTime()
// }, 1000) // }, 1000)
}, },
setCameraInfo(type) { setCameraInfo(type) {
// 设置相机前置后置、闪关灯等 // 设置相机前置后置、闪关灯等
const cameraInfo = this.cameraInfo const cameraInfo = this.cameraInfo
let val = cameraInfo[type] let val = cameraInfo[type]
switch (type) { switch (type) {
case 'devicePosition': case 'devicePosition':
val = val === 'back' ? 'front' : 'back' val = val === 'back' ? 'front' : 'back'
break; break;
case 'flash': case 'flash':
val = val === 'auto' ? 'on' : (val === 'on' ? 'off' : 'auto') val = val === 'auto' ? 'on' : (val === 'on' ? 'off' : 'auto')
break; break;
defalut: defalut:
break; break;
} }
this.cameraInfo[type] = val this.cameraInfo[type] = val
}, },
initData() { initData() {
const globalData = getApp().globalData const globalData = getApp().globalData
this.navHeight = globalData.navHeight this.navHeight = globalData.navHeight
this.cameraHeight = parseInt(globalData.safeHeight*2 - globalData.navHeight - 200) this.cameraHeight = parseInt(globalData.safeHeight*2 - globalData.navHeight - 200)
this.ratio = globalData.screenHeight / globalData.rpxScreenHeight this.ratio = globalData.screenHeight / globalData.rpxScreenHeight
this.waterSetting = globalData.photo.waterSetting this.waterSetting = globalData.photo.waterSetting
}, },
baiduLocation() { baiduLocation() {
// 百度sdk解析经纬度 // 百度sdk解析经纬度
let waterInfo = this.waterInfo let waterInfo = this.waterInfo
const t = function() { const t = function() {
let t = { let t = {
success: function(res) { success: function(res) {
let e = res.wxMarkerData[0]; let e = res.wxMarkerData[0];
let i = e.address; let i = e.address;
waterInfo.address = i waterInfo.address = i
}, },
fail: function(err) { fail: function(err) {
//console.log(err, 'err') //console.log(err, 'err')
} }
}; };
if (waterInfo.latitude && waterInfo.longitude) { if (waterInfo.latitude && waterInfo.longitude) {
let e = waterInfo.latitude + "," + waterInfo.longitude; let e = waterInfo.latitude + "," + waterInfo.longitude;
t.location = e; t.location = e;
} }
h.regeocoding(t); h.regeocoding(t);
}; };
t() t()
}, },
cameraError(e) { cameraError(e) {
const { const {
errMsg errMsg
} = e.detail } = e.detail
// console.log(e.detail, 'e.detail') // console.log(e.detail, 'e.detail')
if (errMsg !== 'insertCamera:fail auth deny') { if (errMsg !== 'insertCamera:fail auth deny') {
return return
} }
this.showSettingModal('camera') this.showSettingModal('camera')
}, },
//获取位置 //获取位置
getLocation() { getLocation() {
let that = this let that = this
const waterInfo = this.waterInfo const waterInfo = this.waterInfo
uni.getLocation({ uni.getLocation({
type: 'gcj02', type: 'gcj02',
success: function(res) { success: function(res) {
waterInfo.longitude = parseFloat(res.longitude).toFixed(4) waterInfo.longitude = parseFloat(res.longitude).toFixed(4)
waterInfo.latitude = parseFloat(res.latitude).toFixed(3) waterInfo.latitude = parseFloat(res.latitude).toFixed(3)
that.baiduLocation() that.baiduLocation()
}, },
fail(err) { fail(err) {
that.showSettingModal('location') that.showSettingModal('location')
// that.showLocationAuthModal('') // that.showLocationAuthModal('')
} }
}); });
}, },
showSettingModal(type) { showSettingModal(type) {
type = type || 'camera' type = type || 'camera'
const self = this const self = this
let authSetting = { let authSetting = {
'camera': { 'camera': {
content: '将无法进行拍照', content: '将无法进行拍照',
method: '' method: ''
}, },
'location': { 'location': {
content: '将无法定位当前位置', content: '将无法定位当前位置',
method: '' method: ''
}, },
'writePhotosAlbum': { 'writePhotosAlbum': {
content: '将无法保存图片到本地', content: '将无法保存图片到本地',
method: '' method: ''
} }
} }
let content = authSetting[type].content let content = authSetting[type].content
uni.showModal({ uni.showModal({
content: '拒绝授权' + content + ',是否去设置打开?', content: '拒绝授权' + content + ',是否去设置打开?',
confirmText: "确认", confirmText: "确认",
cancelText: '取消', cancelText: '取消',
success(res) { success(res) {
if (res.confirm) { if (res.confirm) {
self.openSetting() self.openSetting()
} }
}, },
fail() {} fail() {}
}) })
}, },
openSetting() { openSetting() {
// 打开设置 // 打开设置
let self = this let self = this
this.cameraChange = false this.cameraChange = false
wx.openSetting({ wx.openSetting({
success(res) { success(res) {
const authSetting = res.authSetting const authSetting = res.authSetting
self.cameraChange = true self.cameraChange = true
if (authSetting['scope.userLocation']) { if (authSetting['scope.userLocation']) {
// 位置授权成功 // 位置授权成功
self.authSetting.location = true self.authSetting.location = true
self.getLocation() self.getLocation()
} }
if (res.authSetting['scope.camera']) { if (res.authSetting['scope.camera']) {
self.authSetting.camera = true self.authSetting.camera = true
} }
if (res.authSetting['scope.writePhotosAlbum']) { if (res.authSetting['scope.writePhotosAlbum']) {
self.authSetting.writePhotosAlbum = true self.authSetting.writePhotosAlbum = true
} }
} }
}) })
}, },
//获取 水印 本地缓存路径 //获取 水印 本地缓存路径
getMarkPath: function() { getMarkPath: function() {
uni.downloadFile({ uni.downloadFile({
url: this.waterInfo.markImage, //仅为示例,并非真实的资源 url: this.waterInfo.markImage, //仅为示例,并非真实的资源
success: (res) => { success: (res) => {
if (res.statusCode === 200) { if (res.statusCode === 200) {
this.tempImgs.markImage = res.tempFilePath this.tempImgs.markImage = res.tempFilePath
} }
}, },
fail() { fail() {
console.log('水印图片 下载失败') console.log('水印图片 下载失败')
} }
}) })
}, },
/* ---------------------- 拍照流程 ---------------------- */ /* ---------------------- 拍照流程 ---------------------- */
// 第一步:拍照 // 第一步:拍照
takePhoto() { takePhoto() {
wx.createCameraContext().takePhoto({ wx.createCameraContext().takePhoto({
quality: "high" quality: "high"
}).then(res => { }).then(res => {
this.tempImgs.origin = res.tempImagePath this.tempImgs.origin = res.tempImagePath
this.drawCanvas(res.tempImagePath) this.drawCanvas(res.tempImagePath)
}) })
}, },
// 第二步:绘制画布 // 第二步:绘制画布
drawCanvas: function(tempPath) { drawCanvas: function(tempPath) {
uni.showLoading({ uni.showLoading({
title: '数据处理中...', title: '数据处理中...',
icon: 'loading' icon: 'loading'
}) })
const waterSetting = this.waterSetting const waterSetting = this.waterSetting
const globalTempPath = getApp().globalData.photo.tempPath const globalTempPath = getApp().globalData.photo.tempPath
const ratio = this.ratio const ratio = this.ratio
console.log(this.ratio,'this.ratio') console.log(this.ratio,'this.ratio')
// const ratio = 0.5 // const ratio = 0.5
let canvasWidth = this.cameraWidth * ratio let canvasWidth = this.cameraWidth * ratio
let canvasHeight = this.cameraHeight * ratio let canvasHeight = this.cameraHeight * ratio
const waterInfo = this.waterInfo const waterInfo = this.waterInfo
this.showImage = true this.showImage = true
const settingTxtArr = this.settingTxtArr const settingTxtArr = this.settingTxtArr
//将原图画到canvas上面 //将原图画到canvas上面
let canvas = uni.createCanvasContext("canvas", this) let canvas = uni.createCanvasContext("canvas", this)
canvas.rect(0, 0, canvasWidth, canvasHeight) canvas.rect(0, 0, canvasWidth, canvasHeight)
canvas.drawImage(tempPath, 0, 0, canvasWidth, canvasHeight) canvas.drawImage(tempPath, 0, 0, canvasWidth, canvasHeight)
// this.canvas.draw() // this.canvas.draw()
let txtHeight = 18 let txtHeight = 18
let h = 1 let h = 1
//加入 水印文字 //加入 水印文字
for (let i = settingTxtArr.length - 1; i >= 0; i--) { for (let i = settingTxtArr.length - 1; i >= 0; i--) {
txtHeight = 20 txtHeight = 20
canvas.setFontSize(15) canvas.setFontSize(15)
canvas.setFillStyle('#f2f2f2') canvas.setFillStyle('#f2f2f2')
let txt = settingTxtArr[i] let txt = settingTxtArr[i]
if(txt.indexOf('时间')>=0){ if(txt.indexOf('时间')>=0){
canvas.fillText(txt, 10, canvasHeight - txtHeight * h++); canvas.fillText(txt, 10, canvasHeight - txtHeight * h++);
}else{ }else{
if(txt.length>22){ if(txt.length>22){
canvas.fillText(txt.substr(22,22), 10, canvasHeight - txtHeight * h++); canvas.fillText(txt.substr(22,22), 10, canvasHeight - txtHeight * h++);
canvas.fillText(txt.substr(0,22), 10, canvasHeight - txtHeight * h++); canvas.fillText(txt.substr(0,22), 10, canvasHeight - txtHeight * h++);
}else{ }else{
canvas.fillText(txt, 10, canvasHeight - txtHeight * h++); canvas.fillText(txt, 10, canvasHeight - txtHeight * h++);
} }
} }
// canvas.fillText(txt, 10, canvasHeight - txtHeight * h++); // canvas.fillText(txt, 10, canvasHeight - txtHeight * h++);
} }
const title = this.titleTxt const title = this.titleTxt
if (title) { if (title) {
canvas.save() canvas.save()
let titleHeight = title.length > 14 ? 60 : 30 let titleHeight = title.length > 14 ? 60 : 30
let rectWidth = title.length > 14 ? 215 : title.length*10 let rectWidth = title.length > 14 ? 215 : title.length*10
canvas.setFillStyle('rgba(34, 114, 255, 0.6)') canvas.setFillStyle('rgba(34, 114, 255, 0.6)')
canvas.fillRect(10, canvasHeight - txtHeight * h - titleHeight, 215, titleHeight) canvas.fillRect(10, canvasHeight - txtHeight * h - titleHeight, 215, titleHeight)
canvas.restore() canvas.restore()
canvas.setFontSize(20) canvas.setFontSize(20)
canvas.setFillStyle('#f2f2f2') canvas.setFillStyle('#f2f2f2')
// canvas.setTextAlign('center') // canvas.setTextAlign('center')
if (title.length > 14) { if (title.length > 14) {
canvas.fillText(title.substr(14, 14), 10, canvasHeight - txtHeight * h++ + 20); canvas.fillText(title.substr(14, 14), 10, canvasHeight - txtHeight * h++ + 20);
} }
canvas.fillText(title.substr(0, 14), 10, canvasHeight - txtHeight * h++ - titleHeight / 2 + 10); canvas.fillText(title.substr(0, 14), 10, canvasHeight - txtHeight * h++ - titleHeight / 2 + 10);
} }
if (this.waterSetting && this.waterSetting.mid_text) { 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.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, canvas.draw(false,
setTimeout(() => { setTimeout(() => {
uni.canvasToTempFilePath({ uni.canvasToTempFilePath({
width: canvasWidth, width: canvasWidth,
height: canvasHeight, height: canvasHeight,
canvasId: 'canvas', canvasId: 'canvas',
success: (res) => { success: (res) => {
this.tempImgs.mixWater = res.tempFilePath this.tempImgs.mixWater = res.tempFilePath
globalTempPath.origin = this.tempImgs.origin globalTempPath.origin = this.tempImgs.origin
globalTempPath.mixWater = res.tempFilePath globalTempPath.mixWater = res.tempFilePath
let timer = setTimeout(()=>{ let timer = setTimeout(()=>{
//this.goPage('/pages/photo/preview') //this.goPage('/pages/photo/preview')
this.changeType(2) this.changeType(2)
},0) },0)
// this.saveToLocal(res.tempFilePath) // this.saveToLocal(res.tempFilePath)
}, },
fail: (res) => { fail: (res) => {
console.log(res); console.log(res);
}, },
complete: () => { complete: () => {
uni.hideLoading(); uni.hideLoading();
} }
}, this); }, this);
}, 50)) }, 50))
}, },
// 第三步:保存到本地 // 第三步:保存到本地
saveToLocal(tempImagePath) { saveToLocal(tempImagePath) {
//has_origin //是否保存原图 //has_origin //是否保存原图
let that = this let that = this
uni.saveImageToPhotosAlbum({ uni.saveImageToPhotosAlbum({
filePath: tempImagePath, filePath: tempImagePath,
success() { success() {
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: '已将照片保存到本地相册' title: '已将照片保存到本地相册'
}) })
}, },
fail() {} fail() {}
}) })
}, },
showPreviewFn(img) { showPreviewFn(img) {
uni.previewImage({ uni.previewImage({
current: 0, current: 0,
urls: [img] urls: [img]
}); });
}, },
//获取当前时间 //获取当前时间
getTime: function() { getTime: function() {
let d = new Date(); let d = new Date();
let year = d.getFullYear(); let year = d.getFullYear();
let month = d.getMonth() + 1; let month = d.getMonth() + 1;
let date = d.getDate(); let date = d.getDate();
let days = new Array("日", "一", "二", "三", "四", "五", "六"); let days = new Array("日", "一", "二", "三", "四", "五", "六");
let day = d.getDay(); let day = d.getDay();
let hour = (d.getHours() < 10) ? ("0" + d.getHours()) : d.getHours(); let hour = (d.getHours() < 10) ? ("0" + d.getHours()) : d.getHours();
let min = (d.getMinutes() < 10) ? ("0" + d.getMinutes()) : d.getMinutes(); let min = (d.getMinutes() < 10) ? ("0" + d.getMinutes()) : d.getMinutes();
let sec = (d.getSeconds() < 10) ? ("0" + d.getSeconds()) : d.getSeconds(); let sec = (d.getSeconds() < 10) ? ("0" + d.getSeconds()) : d.getSeconds();
let now = year + "年" + month + "月" + date + "日 " + hour + ":" + min + ":" + sec; let now = year + "年" + month + "月" + date + "日 " + hour + ":" + min + ":" + sec;
return now return now
}, },
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.camera { .camera {
position:fixed; position:fixed;
padding:0; padding:0;
margin:0; margin:0;
top:0; top:0;
left:0; left:0;
width: 100%; width: 100%;
height: 100%; height: 100%;
z-index: 999999; z-index: 999999;
} }
.camera-container { .camera-container {
// padding-top:var(--status-bar-height); // padding-top:var(--status-bar-height);
min-height: 100vh; min-height: 100vh;
background-color: black; background-color: black;
} }
.header-box { .header-box {
// padding:10rpx 20rpx; // padding:10rpx 20rpx;
position: relative; position: relative;
.inner { .inner {
display: flex; display: flex;
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
} }
.icon { .icon {
margin: 20rpx; margin: 20rpx;
display: block; display: block;
width: 44rpx; width: 44rpx;
height: 44rpx; height: 44rpx;
} }
} }
.camera-box { .camera-box {
position: absolute; position: absolute;
left:0; left:0;
width: 100%; width: 100%;
// height: 100vh; // height: 100vh;
z-index: 1; z-index: 1;
} }
.mark-water { .mark-water {
position: absolute; position: absolute;
left: 50%; left: 50%;
top: 50%; top: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
width: 360rpx; width: 360rpx;
height: 90rpx; height: 90rpx;
z-index: 6; z-index: 6;
} }
.mark-box { .mark-box {
position: absolute; position: absolute;
left: 0; left: 0;
bottom: 0; bottom: 0;
padding: 20rpx; padding: 20rpx;
.txt { .txt {
max-width: 500rpx; max-width: 500rpx;
max-height: 80rpx; max-height: 80rpx;
overflow: hidden; overflow: hidden;
margin-top: 5rpx; margin-top: 5rpx;
line-height: 40rpx; line-height: 40rpx;
white-space: normal; white-space: normal;
font-size: 28rpx; font-size: 28rpx;
color: #fff; color: #fff;
&.big { &.big {
padding: 10rpx; padding: 10rpx;
margin-bottom: 10rpx; margin-bottom: 10rpx;
width: 430rpx; width: 430rpx;
line-height: 40rpx; line-height: 40rpx;
font-size: 32rpx; font-size: 32rpx;
background-color: rgba(34, 114, 255, 0.6); background-color: rgba(34, 114, 255, 0.6);
} }
} }
} }
.bottom-box { .bottom-box {
position: absolute; position: absolute;
left: 0; left: 0;
right: 0; right: 0;
bottom:0; bottom:0;
// bottom: constant(safe-area-inset-bottom); // bottom: constant(safe-area-inset-bottom);
// bottom: env(safe-area-inset-bottom); // bottom: env(safe-area-inset-bottom);
z-index: 5; z-index: 5;
box-sizing: border-box; box-sizing: border-box;
height: 200rpx; height: 200rpx;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
padding: 20rpx 78rpx; padding: 20rpx 78rpx;
align-items: center; align-items: center;
background-color: black; background-color: black;
.txt { .txt {
white-space: nowrap; white-space: nowrap;
line-height: 60rpx; line-height: 60rpx;
color: #fff; color: #fff;
} }
.icon { .icon {
display: block; display: block;
width: 92rpx; width: 92rpx;
height: 92rpx; height: 92rpx;
&.icon-take { &.icon-take {
width: 144rpx; width: 144rpx;
height: 144rpx; height: 144rpx;
} }
} }
} }
.canvas { .canvas {
position: fixed; position: fixed;
left: -750rpx; left: -750rpx;
top: 0; top: 0;
} }
// 拍照规范 // 拍照规范
.page-mask { .page-mask {
position: fixed; position: fixed;
bottom: 0; bottom: 0;
bottom: constant(safe-area-inset-bottom); bottom: constant(safe-area-inset-bottom);
bottom: env(safe-area-inset-bottom); bottom: env(safe-area-inset-bottom);
z-index: 1000; z-index: 1000;
width: 750rpx; width: 750rpx;
height: 100vh; height: 100vh;
// padding: 0 30rpx; // padding: 0 30rpx;
box-sizing: border-box; box-sizing: border-box;
background-color: rgba(0, 0, 0, 0.8); background-color: rgba(0, 0, 0, 0.8);
.icon { .icon {
width: 92rpx; width: 92rpx;
height: 92rpx; height: 92rpx;
} }
.btn-close { .btn-close {
position: absolute; position: absolute;
bottom: 0; bottom: 0;
bottom: constant(safe-area-inset-bottom); bottom: constant(safe-area-inset-bottom);
bottom: env(safe-area-inset-bottom); bottom: env(safe-area-inset-bottom);
left: 0; left: 0;
right: 0; right: 0;
height: 200rpx; height: 200rpx;
z-index: 100; z-index: 100;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
} }
</style> </style>
...@@ -328,14 +328,14 @@ ...@@ -328,14 +328,14 @@
console.log('click cell') console.log('click cell')
this.viewOderItem(item.orderId) this.viewOderItem(item.orderId)
}, },
filish(item){ filish(item){
// 去完工 // 去完工
uni.navigateTo({ uni.navigateTo({
url: 'pages/order/complete?orderId='+item.orderId url: 'pages/order/complete?orderId='+item.orderId
+ "&categoryId=" + item.categoryId + "&categoryId=" + item.categoryId
+ "&orderServiceType=" + item.orderServiceType + "&orderServiceType=" + item.orderServiceType
+ "&inGuaranteePeriod=" + item.inGuaranteePeriod + "&inGuaranteePeriod=" + item.inGuaranteePeriod
+ "&auditResultsId=" + Object.keys(item.auditResults)[0] + "&auditResultsId=" + (item.auditResults?Object.keys(item.auditResults)[0]:'')
}) })
}, },
handleAction(item) { handleAction(item) {
......
<template>
<view class="cert-page">
<u-navbar
back-icon-color="#000000"
:background="background"
title-color="#000"
:border-bottom="false"
title="我的证件"
title-bold="true"
></u-navbar>
<view class="content-cody">
<view class="title">{{ info.type }}</view>
<view class="content" v-for="item in info.url"><image :src="item" mode=""></image></view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
info: {
type: "",
url: null
}
}
},
onLoad() {
var that = this;
const eventChannel = this.getOpenerEventChannel()
eventChannel.on('acceptDataFromCert', function(data) {
try{
let urlArr = data.url.split(',');
that.info.type = data.type;
that.info.url = urlArr;
console.log(urlArr);
}catch(e){}
console.log(that.info);
})
},
}
</script>
<style>
.cert-page {
font-size: 28rpx;
margin: 30rpx;
}
.content-cody {
padding-left: 30rpx;
padding-right: 30rpx;
background-color: #F4F5F7;
border-radius: 12rpx;
}
.title {
font-size: 32rpx;
font-weight: bold;
}
.content {
padding-top: 30rpx;
}
</style>
<template>
<view class="cert-page">
<u-navbar
class="navbarHeigth"
back-icon-color="#000000"
:background="background"
title-color="#000"
:border-bottom="false"
title="我的证件"
title-bold="true"
></u-navbar>
<view class="content-cody">
<u-cell-group :border="false">
<u-cell-item v-for="item in list" :title="item.name" :value="item.isUploadName" :arrow="true"
:value-style="{'color': item.color}" @click="toDetail(item.keyName)" :title-style="{'padding-left':'20rpx'}">
<u-icon slot="icon" size="32" name="checkmark-circle" :color="item.iconColor"></u-icon>
</u-cell-item>
</u-cell-group>
</view>
</view>
</template>
<script>
export default {
data() {
return {
list: {
id_card: {
name: "身份证",
isUpload: false,
isUploadName: "",
keyName: "id_card",
color: "#999999"
},
electrician_certificate: {
name: "电工证",
isUpload: false,
isUploadName: "",
keyName: "electrician_certificate",
color: "#999999"
},
driver_license: {
name: "驾驶证",
isUpload: false,
isUploadName: "",
keyName: "driver_license",
color: "#999999"
},
driving_license: {
name: "行驶证",
isUpload: false,
isUploadName: "",
keyName: "driving_license",
color: "#999999"
},
vehicle: {
name: "车辆照",
isUpload: false,
isUploadName: "",
keyName: "vehicle",
color: "#999999"
},
high_sky_license: {
name: "高空证",
isUpload: false,
isUploadName: "",
keyName: "high_sky_license",
color: "#999999"
},
refrigeration_license: {
name: "制冷证",
isUpload: false,
isUploadName: "",
keyName: "refrigeration_license",
color: "#999999"
},
business_license: {
name: "营业执照",
isUpload: false,
isUploadName: "",
keyName: "business_license",
color: "#999999"
},
}
}
},
onLoad() {
let that = this;
this.$u.api
.getCertList()
.then((res) => {
if(res.code != 200){
return
}
for(let key in this.list){
let getData = res.data[key];
this.list[key].isUpload = getData.status;
this.list[key].isUploadName = getData.status == 1 ? '已上传' : '未上传';
this.list[key].color = getData.status == 1 ? "#999999" : "#2272FF";
this.list[key].iconColor = getData.status == 1 ? "#2272FF" : "#999999";
this.list[key].data = getData;
}
console.log(this.list);
console.log(res);
}).catch((err) => {
console.log(err);
});
},
methods: {
isUpload(typeBool) {
return typeBool ? '已上传' : '未上传'
},
toDetail(key) {
let data = this.list[key].data;
if(data.status != 1){
return;
}
wx.navigateTo({
url: '/pages/mine/cert/detail',
success: function(res) {
res.eventChannel.emit('acceptDataFromCert', data)
}
});
}
}
}
</script>
<style>
.cert-page {
font-size: 28rpx;
margin: 30rpx;
height: 100vh;
display: flex;
flex-direction: column;
}
.content-cody {
padding: 30rpx;
background-color: #ffffff;
border-radius: 12rpx;
height: 82vh;
}
.rightBlue {
color: #007AFF;
}
</style>
<template>
<view class="cus-wrap">
<w-navbar title="联系客服"></w-navbar>
<view class="content">
<u-image class="qrcode" :src="cusQrcode" width="400" mode="widthFix" @longtap="download">
<u-loading slot="loading"></u-loading>
<view slot="error" style="font-size: 24rpx;">加载失败</view>
</u-image>
<text class="desc">长按二维码保存图片添加官方客服微信</text>
</view>
</view>
</template>
<script>
export default {
data() {
return {
};
},
computed: {
cusQrcode() {
return process.uniEnv.qn_base_url + 'erweima-bg.png'
},
},
methods: {
download() {
let that = this;
uni.downloadFile({ //获得二维码的临时地址
url: that.erweimaImage,
success:(res)=>{
if(res.statusCode == 200){
uni.saveImageToPhotosAlbum({
filePath:res.tempFilePath,//传入临时地址
success() {
that.$u.toast('保存成功!');
},
fail() {
that.$u.toast('保存失败!');
}
})
}
}
})
}
}
}
</script>
<style lang="scss">
.cus-wrap {
background-color: #F4F5F7;
padding: 30rpx;
.content {
width: 690rpx;
height: 800rpx;
background: #FFFFFF;
border-radius: 12rpx;
display: flex;
flex-direction: column;
align-items: center;
.qrcode {
margin-top: 160rpx;
}
.desc {
margin-top: 40rpx;
font-size: 24rpx;
font-weight: 400;
color: #666666;
line-height: 24rpx;
}
}
}
</style>
<template>
<view class="wallet-view">
<u-navbar back-icon-color="#333333" background="#F4F5F7" title="我的钱包" titleColor="#333333" :border-bottom="false"></u-navbar>
<image class="header-image" mode="widthFix" :src="qianbaobeijing"></image>
<view class="survey-view">
<view class="survey-top-view">
<view class="survey-top-left">
<view>账户总资产(元)</view>
<view>{{info.totalPayAmount}}</view>
</view>
<view class="survey-top-right">
<u-button>提现</u-button>
</view>
</view>
<view class="survey-bottom-view">
<view v-for="(value, key) in items" :key="key">
<view>{{value}}</view>
<view>{{info[key]}}</view>
</view>
</view>
</view>
<view class="content-view">
<view v-for="(item, index) in lists" :class="['content-list', {'first': index==0}]" :key="index">
<view class="content-list-left">
<image class="content-list-image" :src="item.icon"></image>
<view class="content-list-text">
<view class="content-list-text-title">{{item.title}}</view>
<view>{{item.content}}</view>
</view>
</view>
<view class="content-list-right">
<text class="content-list-right-text">点击查看</text>
<u-icon name="arrow-right"></u-icon>
</view>
</view>
</view>
<view class="list-view">
</view>
</view>
</template>
<script>
export default {
data() {
return {
info: {
canApplyAmount: 0, // 可提现金额
saveApplyCount: 0, // 已申请提现的支付单数
canApplyCount: 0, // 可申请提现的支付单数
saveAndApplyAmount: 0, // 已申请提现金额
totalPayAmount: 0, // 总共收入
/* 还没对字段名 */
dairuzhang: 0, // 预计待入账
}
}
},
computed: {
lists() {
return [{
title: '结算账单',
content: '展示您已提现的账单信息',
icon: this.imageUrl + 'jiesuan.png'
},{
title: '收入流水',
content: '当前展示最近5条,点击查看全部',
icon: this.imageUrl + 'liushui.png'
}]
},
items() {
return {canApplyAmount:'可提现(元)', dairuzhang:'预计待入账(元)'}
},
imageUrl() {
return process.uniEnv.qn_base_url
},
qianbaobeijing() {
return this.imageUrl + 'qianbaobeijing.png'
},
},
methods: {
}
}
</script>
<style lang="scss" scoped>
.wallet-view {
position: relative;
height: 100vh;
overflow: auto;
background-color: #F4F5F7;
.header-image {
position: absolute;
width: 100%;
margin-left: 4rpx;
margin-top: 10rpx;
}
.survey-view {
position: relative;
height: 400rpx;
margin: 30rpx 30rpx 10rpx 30rpx;
color: #FFFFFF;
padding: 30rpx;
.survey-top-view {
display: flex;
justify-content: space-between;
align-items: flex-end;
.survey-top-left {
}
.survey-top-right {
}
}
.survey-bottom-view {
display: flex;
justify-content: space-between;
}
}
.content-view {
position: relative;
padding: 0 30rpx;
.content-list {
height: 140rpx;
border-radius: 12rpx;
display: flex;
justify-content: space-between;
padding: 30rpx;
background-color: #FFFFFF;
&.first {
margin-bottom: 20rpx;
}
.content-list-left {
display: flex;
.content-list-image {
width: 56rpx;
height: 56rpx;
margin-top: 2rpx;
}
.content-list-text {
font-size: 24rpx;
color: #666666;
margin-left: 20rpx;
.content-list-text-title {
font-size: 32rpx;
color: #333333;
}
}
}
.content-list-right {
color: #2272FF;
font-size: 26rpx;
.content-list-right-text {
margin-right: 4rpx;
}
}
}
}
.list-view {
position: relative;
}
}
</style>
...@@ -10,78 +10,78 @@ ...@@ -10,78 +10,78 @@
:class="[current == index ? 'u-tab-item-active' : '']" @tap.stop="swichMenu(index)"> :class="[current == index ? 'u-tab-item-active' : '']" @tap.stop="swichMenu(index)">
<text class="u-line-1">{{item.name}}</text> <text class="u-line-1">{{item.name}}</text>
</view> </view>
</scroll-view> </scroll-view>
<view class="right-boxs"> <view class="right-boxs">
<scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll"> <scroll-view :scroll-top="scrollRightTop" scroll-y scroll-with-animation class="right-box" @scroll="rightScroll">
</scroll-view> </scroll-view>
<view class="form-list"> <view class="form-list">
<u-form :model="form" ref="uForm"> <u-form :model="form" ref="uForm">
<template v-for="(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])"> <template v-for="(groupItem, groupIndex) in (list.length>0?list[tabIndex].items:[])">
<view class="class-item" :key="groupIndex" v-show="current == groupIndex"> <view class="class-item" :key="groupIndex" v-show="current == groupIndex">
<view class="title" v-if="groupItem.name !== '基本信息'">{{groupItem.name}}</view> <view class="title" v-if="groupItem.name !== '基本信息'">{{groupItem.name}}</view>
<view class="class-bd"> <view class="class-bd">
<u-form-item v-for="(item,itemIndex) in groupItem.items" :key="itemIndex" label-position="top" <u-form-item v-for="(item,itemIndex) in groupItem.items" :key="itemIndex" label-position="top"
:prop="item.fieldsName" :border-bottom="false" v-show="item.fieldsId != 200 || show200"> :prop="item.fieldsName" :border-bottom="false" v-show="item.fieldsId != 200 || show200">
<view :class="[{'label-bold': groupItem.name === '基本信息'}, 'label']" v-if="typeToComponentType(item.fieldsType)!=='location'"> <view :class="[{'label-bold': groupItem.name === '基本信息'}, 'label']" v-if="typeToComponentType(item.fieldsType)!=='location'">
<image class="item-image" :src="mixingImage" v-if="item.required"></image> <image class="item-image" :src="mixingImage" v-if="item.required"></image>
{{item.fieldsTitle}} {{item.fieldsTitle}}
</view> </view>
<template v-if="item.fieldsType"> <template v-if="item.fieldsType">
<xh-input v-if="typeToComponentType(item.fieldsType)==='input'" :groupIndex="groupIndex" <xh-input v-if="typeToComponentType(item.fieldsType)==='input'" :groupIndex="groupIndex"
:itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' @value-change="fieldValueChange"> :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' @value-change="fieldValueChange">
</xh-input> </xh-input>
<xh-multi-input v-else-if="typeToComponentType(item.fieldsType)==='multiinput'" <xh-multi-input v-else-if="typeToComponentType(item.fieldsType)==='multiinput'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-multi-input> </xh-multi-input>
<xh-radio v-else-if="typeToComponentType(item.fieldsType)==='radio'" <xh-radio v-else-if="typeToComponentType(item.fieldsType)==='radio'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-radio> </xh-radio>
<xh-checkbox v-else-if="typeToComponentType(item.fieldsType)==='checkbox'" <xh-checkbox v-else-if="typeToComponentType(item.fieldsType)==='checkbox'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-checkbox> </xh-checkbox>
<xh-select v-else-if="typeToComponentType(item.fieldsType)==='select'" <xh-select v-else-if="typeToComponentType(item.fieldsType)==='select'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-select> </xh-select>
<xh-files v-else-if="typeToComponentType(item.fieldsType)==='file'" <xh-files v-else-if="typeToComponentType(item.fieldsType)==='file'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || []' :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :partnerCompanyId="partnerCompanyId" :value='form[item.fieldsName] || []'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-files> </xh-files>
<xh-location v-else-if="typeToComponentType(item.fieldsType)==='location'" <xh-location v-else-if="typeToComponentType(item.fieldsType)==='location'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-location> </xh-location>
<xh-scan v-else-if="typeToComponentType(item.fieldsType)==='scan'" <xh-scan v-else-if="typeToComponentType(item.fieldsType)==='scan'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-scan> </xh-scan>
<xh-picker v-else-if="typeToComponentType(item.fieldsType)==='picker'" <xh-picker v-else-if="typeToComponentType(item.fieldsType)==='picker'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-picker> </xh-picker>
<xh-service-measure v-else-if="typeToComponentType(item.fieldsType)==='servicemeasure'" <xh-service-measure v-else-if="typeToComponentType(item.fieldsType)==='servicemeasure'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :orderId="orderId" :categoryId="categoryId" :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :orderId="orderId" :categoryId="categoryId"
:orderServiceType="orderServiceType" :specificationId="form['specificationId'] || 0" :value="form[item.fieldsName]" :orderServiceType="orderServiceType" :specificationId="form['specificationId'] || 0" :value="form[item.fieldsName]"
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-service-measure> </xh-service-measure>
<xh-time v-else-if="typeToComponentType(item.fieldsType)==='time'" <xh-time v-else-if="typeToComponentType(item.fieldsType)==='time'"
:groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""' :groupIndex="groupIndex" :itemIndex="itemIndex" :item="item" :value='form[item.fieldsName] || ""'
@value-change="fieldValueChange"> @value-change="fieldValueChange">
</xh-time> </xh-time>
</template> </template>
</u-form-item> </u-form-item>
</view> </view>
</view> </view>
</template> </template>
</u-form> </u-form>
</view> </view>
</view> </view>
</view> </view>
<view :class="['btn-wrap', 'flex-xc', {'btn-bottom': tabIndex > 0}]"> <view :class="['btn-wrap', 'flex-xc', {'btn-bottom': tabIndex > 0}]">
<u-button class="btn-submit" @click="saveComplete" <u-button class="btn-submit" @click="saveComplete"
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
下一步 下一步
</u-button> </u-button>
</view> </view>
</view> </view>
<u-toast ref="uToast" /> <u-toast ref="uToast" />
</view> </view>
</template> </template>
...@@ -121,7 +121,8 @@ ...@@ -121,7 +121,8 @@
orderId:0, orderId:0,
categoryId:0, categoryId:0,
orderServiceType:'', orderServiceType:'',
inGuaranteePeriod:'', inGuaranteePeriod:'',
partnerCompanyId:'',
auditResultsId: '', auditResultsId: '',
list: [], list: [],
tabIndex: 0, tabIndex: 0,
...@@ -169,7 +170,7 @@ ...@@ -169,7 +170,7 @@
completeCheckResult: [], completeCheckResult: [],
waitHandlerPanelIndex: 0, waitHandlerPanelIndex: 0,
waitHandlerGroupIndex: 0, waitHandlerGroupIndex: 0,
waitHandlerEleIndex: 0, waitHandlerEleIndex: 0,
pass: false, pass: false,
} }
}, },
...@@ -195,7 +196,8 @@ ...@@ -195,7 +196,8 @@
this.orderId = option.orderId this.orderId = option.orderId
this.categoryId = option.categoryId this.categoryId = option.categoryId
this.orderServiceType = decodeURIComponent(option.orderServiceType) this.orderServiceType = decodeURIComponent(option.orderServiceType)
this.inGuaranteePeriod = option.inGuaranteePeriod this.inGuaranteePeriod = option.inGuaranteePeriod
this.partnerCompanyId = option.partnerCompanyId
this.auditResultsId = option.auditResultsId this.auditResultsId = option.auditResultsId
} else { } else {
this.orderId = 11880091 this.orderId = 11880091
...@@ -251,51 +253,54 @@ ...@@ -251,51 +253,54 @@
self.$u.api.getCompleteConfigAndData(self.orderId).then((res) => { self.$u.api.getCompleteConfigAndData(self.orderId).then((res) => {
if (res.code == 200) { if (res.code == 200) {
self.list = res.data.config self.list = res.data.config
self.form = res.data.value || {} self.form = res.data.value || {}
// 异常单处理 // 异常单处理
if (self.auditResultsId) self.checkCompleteError() if (self.auditResultsId) self.checkCompleteError()
} else { } else {
console.log(res.message, "获取订单完工项目失败!"); console.log(res.message, "获取订单完工项目失败!");
} }
}); });
} }
},
checkCompleteError() { // 异常单定位错误项
let self = this
self.list.forEach((panel, panelIndex)=>{
panel.items.forEach((group, groupIndex) =>{
group.items.forEach((ele, eleIndex)=>{
if (ele.fieldsName === self.auditResultsId) {
self.waitHandlerPanelIndex = panelIndex
self.waitHandlerGroupIndex = groupIndex
self.waitHandlerEleIndex = eleIndex
}
})
})
})
this.locationCompleteItem(self.waitHandlerPanelIndex, self.waitHandlerGroupIndex, self.waitHandlerEleIndex)
}, },
saveComplete(){// 保存完工信息 checkCompleteError() { // 异常单定位错误项
let self = this let self = this
let param = {} self.list.forEach((panel, panelIndex)=>{
panel.items.forEach((group, groupIndex) =>{
self.list.forEach((panel)=>{ group.items.forEach((ele, eleIndex)=>{
if (ele.fieldsName === self.auditResultsId) {
self.waitHandlerPanelIndex = panelIndex
self.waitHandlerGroupIndex = groupIndex
self.waitHandlerEleIndex = eleIndex
}
})
})
})
this.locationCompleteItem(self.waitHandlerPanelIndex, self.waitHandlerGroupIndex, self.waitHandlerEleIndex)
},
handleSaveData(){
let param = {}
this.list.forEach((panel)=>{
param[panel.panelFieldsName] = [] param[panel.panelFieldsName] = []
panel.items.forEach((group) =>{ panel.items.forEach((group) =>{
group.items.forEach((ele)=>{ group.items.forEach((ele)=>{
if(self.form[ele.fieldsName]){ if(this.form[ele.fieldsName]){
param[panel.panelFieldsName].push({ param[panel.panelFieldsName].push({
"fieldsName": ele.fieldsName, "fieldsName": ele.fieldsName,
"fieldsType": ele.fieldsType, "fieldsType": ele.fieldsType,
"fieldsValue": self.form[ele.fieldsName], "fieldsValue": this.form[ele.fieldsName],
"required": ele.required, "required": ele.required,
}) })
} }
}) })
}) })
}) })
return param
self.$u.api.saveCompleteData(param,self.orderId).then((res)=>{ },
saveComplete(){// 保存完工信息
let self = this
let param = self.handleSaveData()
self.$u.api.saveCompleteData(param,self.orderId).then((res)=>{
if (res.code == 200) { if (res.code == 200) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: '保存成功', title: '保存成功',
...@@ -303,7 +308,7 @@ ...@@ -303,7 +308,7 @@
}) })
} else { } else {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.data, title: res.message,
type: 'error', type: 'error',
}) })
} }
...@@ -325,7 +330,7 @@ ...@@ -325,7 +330,7 @@
panelResult.submitted++ panelResult.submitted++
}else if(value&&Array.isArray(value)&&value.length > 0){ }else if(value&&Array.isArray(value)&&value.length > 0){
panelResult.submitted++ panelResult.submitted++
}else if(first){// 记录第一个 为空 并且需要必填的项 用于定位 }else if(first){// 记录第一个 为空 并且需要必填的项 用于定位
first = false first = false
self.waitHandlerPanelIndex = panelIndex self.waitHandlerPanelIndex = panelIndex
self.waitHandlerGroupIndex = groupIndex self.waitHandlerGroupIndex = groupIndex
...@@ -365,23 +370,33 @@ ...@@ -365,23 +370,33 @@
}, },
orderFinish(){ orderFinish(){
let self = this let self = this
let pass = this.checkCompleteItem() let pass = this.checkCompleteItem()
if(!pass){ if(!pass){
self.completeCheckStatus = true self.completeCheckStatus = true
}else{ }else{// 先保存完工项
console.log("完工"); let param = self.handleSaveData()
this.pass = pass self.$u.api.saveCompleteData(param,self.orderId).then((res)=>{
if(self.inGuaranteePeriod === 'Y'){ if (res.code == 200) {//完工项信息保存成功再次完工工单
self.$u.api.inOrderFinish(self.orderId).then((res)=>{ console.log("完工");
console.log(res) this.pass = pass
self.completeCheckStatus = true if(self.inGuaranteePeriod === 'Y'){
}) self.$u.api.inOrderFinish(self.orderId).then((res)=>{
}else{ console.log(res)
self.$u.api.outOrderFinish({customerPayType:'CASH'}, self.orderId).then((res)=>{ self.completeCheckStatus = true
console.log(res) })
self.completeCheckStatus = true }else{
}) self.$u.api.outOrderFinish({customerPayType:'CASH'}, self.orderId).then((res)=>{
} console.log(res)
self.completeCheckStatus = true
})
}
} else {
this.$refs.uToast.show({
title: res.message,
type: 'error',
})
}
})
} }
}, },
tabsChange(index){ tabsChange(index){
...@@ -401,7 +416,7 @@ ...@@ -401,7 +416,7 @@
if (groupItem.items) { if (groupItem.items) {
innerItem = groupItem.items[data.itemIndex] innerItem = groupItem.items[data.itemIndex]
} }
if(innerItem.fieldsType ==='multiInput'){ if(innerItem.fieldsType ==='multiInput'){
// 多个输入框的值触发 // 多个输入框的值触发
let key = Object.keys(data.value)[0] let key = Object.keys(data.value)[0]
...@@ -424,8 +439,8 @@ ...@@ -424,8 +439,8 @@
nextStep() { nextStep() {
if (this.tabIndex < this.list.length - 1) { if (this.tabIndex < this.list.length - 1) {
this.tabIndex++ this.tabIndex++
this.arr = [] this.arr = []
this.scrollRightTop = 0 this.scrollRightTop = 0
this.leftMenuStatus(0) this.leftMenuStatus(0)
this.$nextTick(function() { this.$nextTick(function() {
this.getMenuItemTop() this.getMenuItemTop()
...@@ -467,6 +482,7 @@ ...@@ -467,6 +482,7 @@
formType = 'location' formType = 'location'
break break
case 'scan': case 'scan':
case 'machine_code':
formType = 'scan' formType = 'scan'
break break
case 'picker': case 'picker':
...@@ -493,7 +509,7 @@ ...@@ -493,7 +509,7 @@
this.scrollRightTop = this.oldScrollTop; this.scrollRightTop = this.oldScrollTop;
this.$nextTick(function() { this.$nextTick(function() {
this.scrollRightTop = this.arr[index]; this.scrollRightTop = this.arr[index];
this.current = index; this.current = index;
this.leftMenuStatus(index); this.leftMenuStatus(index);
}) })
}, },
...@@ -618,12 +634,12 @@ ...@@ -618,12 +634,12 @@
.label { .label {
color: #333; color: #333;
font-size: 28rpx; font-size: 28rpx;
line-height: 40rpx; line-height: 40rpx;
padding-bottom: 20rpx; padding-bottom: 20rpx;
} }
.label-bold { .label-bold {
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
} }
.required { .required {
padding-right: 10rpx; padding-right: 10rpx;
...@@ -670,7 +686,7 @@ ...@@ -670,7 +686,7 @@
display: flex; display: flex;
overflow: hidden; overflow: hidden;
border-radius: 12rpx 12rpx 0 0; border-radius: 12rpx 12rpx 0 0;
} }
.u-search-inner { .u-search-inner {
...@@ -690,7 +706,7 @@ ...@@ -690,7 +706,7 @@
.u-tab-view { .u-tab-view {
width: 200rpx; width: 200rpx;
height: 100%; height: 100%;
border: 4rpx solid #F4F5F7; border: 4rpx solid #F4F5F7;
overflow: auto; overflow: auto;
} }
...@@ -728,8 +744,8 @@ ...@@ -728,8 +744,8 @@
.right-box, .right-boxs { .right-box, .right-boxs {
// background-color: rgb(250, 250, 250); // background-color: rgb(250, 250, 250);
background-color: #FFFFFF; background-color: #FFFFFF;
overflow: auto; overflow: auto;
width: 100%; width: 100%;
} }
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<view v-if="readMore" @click="readMore = false" class="read-more-toggle"> <view v-if="readMore" @click="readMore = false" class="read-more-toggle">
<u-icon name="arrow-down"></u-icon> <u-icon name="arrow-down"></u-icon>
<text class="read-more-text">查看更多</text> <text class="read-more-text">查看更多</text>
</view> </view>
<view v-else class="order-item-more"> <view v-else class="order-item-more">
<view class="line-view"></view> <view class="line-view"></view>
<view class="order-cell between-cell"> <view class="order-cell between-cell">
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<text class="cell-title">充电桩信息:</text> <text class="cell-title">充电桩信息:</text>
<text>{{ order.serviceContent }}</text> <text>{{ order.serviceContent }}</text>
</view> </view>
<!-- <view class="order-cell between-cell"> <!-- <view class="order-cell between-cell">
<!-- <view class="order-cell between-cell"> <!-- <view class="order-cell between-cell">
<text>备注:</text> <text>备注:</text>
...@@ -102,7 +102,7 @@ ...@@ -102,7 +102,7 @@
<view v-if="readMoreRecord" @click="readMoreRecord = false" class="read-more-toggle"> <view v-if="readMoreRecord" @click="readMoreRecord = false" class="read-more-toggle">
<u-icon name="arrow-down"></u-icon> <u-icon name="arrow-down"></u-icon>
<text class="read-more-text">查看更多</text> <text class="read-more-text">查看更多</text>
</view> </view>
<view v-else class="read-more-toggle"> <view v-else class="read-more-toggle">
<u-icon name="arrow-up"></u-icon> <u-icon name="arrow-up"></u-icon>
<text class="read-more-text" @click="readMoreRecord = true">点击收起</text> <text class="read-more-text" @click="readMoreRecord = true">点击收起</text>
...@@ -129,14 +129,14 @@ ...@@ -129,14 +129,14 @@
<text>{{ centerButtonText }}</text> <text>{{ centerButtonText }}</text>
<view v-if="order.currentOverTime && showTimeOut" class="time-view"> <view v-if="order.currentOverTime && showTimeOut" class="time-view">
<text style="padding-right: 8rpx;">{{order.currentOverTime > new Date().getTime()?'剩':'超'}}</text> <text style="padding-right: 8rpx;">{{order.currentOverTime > new Date().getTime()?'剩':'超'}}</text>
<u-count-down <u-count-down
:timestamp="timestampDiff(order.currentOverTime)" :timestamp="timestampDiff(order.currentOverTime)"
font-size="20" font-size="20"
color="#FFFFFF" color="#FFFFFF"
bg-color="transparent" bg-color="transparent"
separator-color="#FFFFFF" separator-color="#FFFFFF"
separator-size="20" separator-size="20"
:ref="'uCountDown'" :ref="'uCountDown'"
show-days show-days
height="20" height="20"
:show-days="threeDays()" :show-days="threeDays()"
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
<view class="right"> <view class="right">
<view v-if="errorSignIn || scenePhoto" @click="$u.debounce(handleClickRight, 500)" :class="['button', {'active': scenePhoto}]"> <view v-if="errorSignIn || scenePhoto" @click="$u.debounce(handleClickRight, 500)" :class="['button', {'active': scenePhoto}]">
<text>{{errorSignIn ? '异常' : '拍照'}}</text> <text>{{errorSignIn ? '异常' : '拍照'}}</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -240,14 +240,14 @@ ...@@ -240,14 +240,14 @@
console.log("option", option) console.log("option", option)
if (option && option.id) { if (option && option.id) {
this.orderId = option.id this.orderId = option.id
} }
this.loadOrderDetail() this.loadOrderDetail()
this.loadOrderRecord() this.loadOrderRecord()
this.getLocation() this.getLocation()
this.getSignDistance() this.getSignDistance()
}, },
computed: { computed: {
phoneIcon() { phoneIcon() {
//self-support/icon/dianhua-0@2x.png //self-support/icon/dianhua-0@2x.png
if(this.isAllowDianhuaAndDaohang){ if(this.isAllowDianhuaAndDaohang){
...@@ -302,7 +302,7 @@ ...@@ -302,7 +302,7 @@
success: function () { success: function () {
console.log('success'); console.log('success');
} }
}); });
}, },
complete: function(res) { complete: function(res) {
...@@ -320,7 +320,7 @@ ...@@ -320,7 +320,7 @@
} }
}); });
} }
} }
}) })
} else { } else {
...@@ -345,7 +345,7 @@ ...@@ -345,7 +345,7 @@
this.contactTime() this.contactTime()
} }
}, },
contactTime() { contactTime() {
let self = this let self = this
var data={} var data={}
if(this.submitType === "workerAppointment"){ if(this.submitType === "workerAppointment"){
...@@ -414,7 +414,7 @@ ...@@ -414,7 +414,7 @@
self.$u.api.getSignDistance(data).then((res) => { self.$u.api.getSignDistance(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
self.signDistance = res.data self.signDistance = res.data
} }
}); });
}, },
loadOrderRecord() { loadOrderRecord() {
...@@ -599,7 +599,7 @@ ...@@ -599,7 +599,7 @@
} }
this.$u.api[this.submitType](data, this.order.orderId).then(res => { this.$u.api[this.submitType](data, this.order.orderId).then(res => {
let self = this let self = this
if ((res.data.code!==undefined && res.data.code === 200) if ((res.data.code!==undefined && res.data.code === 200)
|| (res.code!==undefined && res.code === 200) ) { || (res.code!==undefined && res.code === 200) ) {
this.$refs.uToast.show({ this.$refs.uToast.show({
title: this.centerButtonText + '操作成功', title: this.centerButtonText + '操作成功',
...@@ -647,10 +647,11 @@ ...@@ -647,10 +647,11 @@
filish(){ filish(){
// 去完工 // 去完工
uni.navigateTo({ uni.navigateTo({
url: 'pages/order/complete?orderId='+this.order.orderId url: 'pages/order/complete?orderId='+this.order.orderId
+ "&categoryId=" + this.order.categoryId + "&categoryId=" + this.order.categoryId
+ "&orderServiceType=" + this.order.orderServiceType + "&orderServiceType=" + this.order.orderServiceType
+ "&inGuaranteePeriod=" + this.order.inGuaranteePeriod + "&inGuaranteePeriod=" + this.order.inGuaranteePeriod
+ "&partnerCompanyId=" + this.order.partnerCompanyId
}) })
}, },
rejectOrder() { // 拒单 rejectOrder() { // 拒单
...@@ -682,23 +683,23 @@ ...@@ -682,23 +683,23 @@
self.dataValue = dataValue self.dataValue = dataValue
}, },
fail(err) { fail(err) {
} }
}); });
}, },
getDistance(Latitud, Longitud){ getDistance(Latitud, Longitud){
return this.distance(Latitud,Longitud,this.dataValue[1],this.dataValue[0]) return this.distance(Latitud,Longitud,this.dataValue[1],this.dataValue[0])
}, },
/** /**
* echo distance(116.3896,39.91917,116.3940,39.91726); * echo distance(116.3896,39.91917,116.3940,39.91726);
* 计算两点之间直线距离 * 计算两点之间直线距离
* @param float $lon1 经度 * @param float $lon1 经度
* @param float $lat1 维度 * @param float $lat1 维度
* @param float $lon2 经度 * @param float $lon2 经度
* @param float $lat2 维度 * @param float $lat2 维度
* @return float 浮点数 * @return float 浮点数
*/ */
distance(lat1, lng1, lat2, lng2) { distance(lat1, lng1, lat2, lng2) {
console.log(lat1, lng1, lat2, lng2) console.log(lat1, lng1, lat2, lng2)
var radLat1 = this.Rad(lat1); var radLat1 = this.Rad(lat1);
var radLat2 = this.Rad(lat2); var radLat2 = this.Rad(lat2);
...@@ -708,7 +709,7 @@ ...@@ -708,7 +709,7 @@
Math.cos(radLat1)*Math.cos(radLat2)*Math.pow(Math.sin(b/2),2))); Math.cos(radLat1)*Math.cos(radLat2)*Math.pow(Math.sin(b/2),2)));
s = s *6378.137 ;// EARTH_RADIUS; s = s *6378.137 ;// EARTH_RADIUS;
s = Math.round(s * 10000)/10 ; //输出为米 s = Math.round(s * 10000)/10 ; //输出为米
console.log("计算结果",s,'M'); console.log("计算结果",s,'M');
return Number(s?s.toFixed(2):0); return Number(s?s.toFixed(2):0);
}, },
Rad(d){ Rad(d){
...@@ -736,7 +737,7 @@ ...@@ -736,7 +737,7 @@
}) })
}, },
threeDays() { threeDays() {
return this.timestampDiff(this.order.currentOverTime) > 3600 * 24 * 3 return this.timestampDiff(this.order.currentOverTime) > 3600 * 24 * 3
} }
} }
}; };
...@@ -814,7 +815,7 @@ ...@@ -814,7 +815,7 @@
color: #FFFFFF; color: #FFFFFF;
line-height: 40rpx; line-height: 40rpx;
background-image: linear-gradient(to right, #FF930D, #FFC174); background-image: linear-gradient(to right, #FF930D, #FFC174);
&.active { &.active {
background-image: linear-gradient(to right, #2272FF, #47ABFF); background-image: linear-gradient(to right, #2272FF, #47ABFF);
} }
...@@ -861,7 +862,7 @@ ...@@ -861,7 +862,7 @@
} }
} }
} }
.read-more-toggle { .read-more-toggle {
text-align: center; text-align: center;
color: #2272FF; color: #2272FF;
...@@ -869,11 +870,11 @@ ...@@ -869,11 +870,11 @@
margin-top: 30rpx; margin-top: 30rpx;
padding-bottom: 30rpx; padding-bottom: 30rpx;
} }
.read-more-text { .read-more-text {
padding-left: 8rpx; padding-left: 8rpx;
} }
.order-item-more { .order-item-more {
font-size: 26rpx; font-size: 26rpx;
color: #333333; color: #333333;
...@@ -883,9 +884,9 @@ ...@@ -883,9 +884,9 @@
height: 2rpx; height: 2rpx;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
} }
.order-item { .order-item {
padding-bottom: 6rpx; padding-bottom: 6rpx;
...@@ -902,15 +903,15 @@ ...@@ -902,15 +903,15 @@
color: #333333; color: #333333;
line-height: 36rpx; line-height: 36rpx;
} }
} }
.no-record-view { .no-record-view {
font-size: 26rpx; font-size: 26rpx;
color: #333333; color: #333333;
margin-top: 30rpx; margin-top: 30rpx;
} }
.record-line-view { .record-line-view {
padding-left: 30rpx; padding-left: 30rpx;
position: relative; position: relative;
...@@ -923,7 +924,7 @@ ...@@ -923,7 +924,7 @@
.line-view-right { .line-view-right {
// text-align: right; // text-align: right;
} }
.record-line-view ::before { .record-line-view ::before {
content: " "; content: " ";
position: absolute; position: absolute;
...@@ -1013,7 +1014,7 @@ ...@@ -1013,7 +1014,7 @@
color: #FFFFFF; color: #FFFFFF;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
.time-view { .time-view {
display: flex; display: flex;
font-size: 20rpx; font-size: 20rpx;
...@@ -1069,7 +1070,7 @@ ...@@ -1069,7 +1070,7 @@
color: #333333; color: #333333;
line-height: 48rpx; line-height: 48rpx;
margin-bottom: 10rpx; margin-bottom: 10rpx;
} }
.between-cell { .between-cell {
......
<template> <template>
<view class="backView"> <view class="backView">
<u-navbar :title-size="32" title-color="#000" :border-bottom="false" :title="title"></u-navbar> <u-navbar :title-size="32" title-color="#000" :border-bottom="false" :title="title"></u-navbar>
<u-loading style="position: fixed;top: 50%;" :show="loading" size="36" mode="flower"></u-loading> <u-loading style="position: fixed;top: 50%;" :show="loading" size="36" mode="flower"></u-loading>
<view class="topView"> <view class="topView">
<view :class="['topItemView', {'active':activeTop===ikey}]" @click="handleTopItemChange(ikey,item)" <view :class="['topItemView', {'active':activeTop===ikey}]" @click="handleTopItemChange(ikey,item)"
v-for="(item,ikey) in dataList" :key="ikey"> v-for="(item,ikey) in dataList" :key="ikey">
<text :class="['ph-lst-top-index', {'active':activeTop===ikey}]">{{ ikey + 1 }}</text> <text :class="['ph-lst-top-index', {'active':activeTop===ikey}]">{{ ikey + 1 }}</text>
<text class="topItemTitle">{{item.type}}</text> <text class="topItemTitle">{{item.type}}</text>
</view> </view>
</view> </view>
<view class="rightView"> <view class="rightView">
<view class="right-view-title">拍照项有:</view> <view class="right-view-title">拍照项有:</view>
<scroll-view scroll-y="true" class="scroll-y"> <scroll-view scroll-y="true" class="scroll-y">
<template v-for="(item,ikey) in rightList"> <template v-for="(item,ikey) in rightList">
<view class="rightItemView" @click="take(item,ikey)" :key="ikey"> <view class="rightItemView" @click="take(item,ikey)" :key="ikey">
<view :class="['rightContentView', {'active':item.orderImages[0]}]"> <view :class="['rightContentView', {'active':item.orderImages[0]}]">
<text class="ph-lst-item-index">{{ ikey + 1 }}</text> <text class="ph-lst-item-index">{{ ikey + 1 }}</text>
<text class="">{{item.name}}</text> <text class="">{{item.name}}</text>
<image class="ph-list-item-arrow" src="/static/photo/arrow.png"></image> <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> --> <!-- <text class="rightContent u-m-t-14 u-m-l-30 u-p-b-30">{{item.describe}}</text> -->
</view> </view>
<view class="rightImageView" v-if="item.orderImages && item.orderImages.length > 0"> <view class="rightImageView" v-if="item.orderImages && item.orderImages.length > 0">
<image class="rightImage" v-for="(image, index) in item.orderImages.slice(0 , 10)" :src="image" <image class="rightImage" v-for="(image, index) in item.orderImages.slice(0 , 10)" :src="image"
:key="index" @click.stop="handleClickImage(item, index)" mode="aspectFill"></image> :key="index" @click.stop="handleClickImage(item, index)" mode="aspectFill"></image>
</view> </view>
</view> </view>
</template> </template>
</scroll-view> </scroll-view>
<take-photo type="test" v-if="takeStatus" :currentItem="currentItemDate" @close="closeTake"></take-photo> <take-photo type="test" v-if="takeStatus" :currentItem="currentItemDate" @close="closeTake"></take-photo>
<!-- <u-button v-if="activeTop + 1 === dataList.length" class="ph-list-button" type="error" shape="circle" <!-- <u-button v-if="activeTop + 1 === dataList.length" class="ph-list-button" type="error" shape="circle"
:disabled="buttonDisabled" :custom-style="buttonStyle" @click="isPopShow = true">一键清空展示图片</u-button> --> :disabled="buttonDisabled" :custom-style="buttonStyle" @click="isPopShow = true">一键清空展示图片</u-button> -->
</view> </view>
<!-- <u-popup border-radius="10" v-model="isPopShow" safe-area-inset-bottom mode="center" width="690rpx" <!-- <u-popup border-radius="10" v-model="isPopShow" safe-area-inset-bottom mode="center" width="690rpx"
height="600rpx"> height="600rpx">
<view class="ph-list-pop-title"> <view class="ph-list-pop-title">
<text>是否一键清空系统展示的图片?</text> <text>是否一键清空系统展示的图片?</text>
</view> </view>
<view class="ph-list-pop-text"> <view class="ph-list-pop-text">
<text>点击"确定"则删除系统展示的所有图片</text> <text>点击"确定"则删除系统展示的所有图片</text>
</view> </view>
<view class="ph-list-pop-btn-view"> <view class="ph-list-pop-btn-view">
<u-button :custom-style="customStyleCancel" hover-class="none" shape="circle" type="primary" <u-button :custom-style="customStyleCancel" hover-class="none" shape="circle" type="primary"
@click="isPopShow = false"> @click="isPopShow = false">
取消 取消
</u-button> </u-button>
<u-button :custom-style="customStyleSave" shape="circle" type="primary" @click="handleClickSure()"> <u-button :custom-style="customStyleSave" shape="circle" type="primary" @click="handleClickSure()">
确定 确定
</u-button> </u-button>
</view> </view>
</u-popup> --> </u-popup> -->
</view> </view>
</template> </template>
<script> <script>
import takePhoto from '@/components/take/index.vue' import takePhoto from '@/components/take/index.vue'
export default { export default {
components: { components: {
'take-photo': takePhoto 'take-photo': takePhoto
}, },
data() { data() {
return { return {
takeStatus: false, takeStatus: false,
currentItemDate:{}, currentItemDate:{},
topList: [], topList: [],
activeTop: 0, activeTop: 0,
leftList: [], leftList: [],
rightList: [], rightList: [],
classifyId: '', classifyId: '',
systemId: '', systemId: '',
brand: '', brand: '',
brandId: '', brandId: '',
orderId:'', orderId:'',
dataList: [], dataList: [],
loading: true, loading: true,
isPopShow: false, isPopShow: false,
userWatermark:{}, userWatermark:{},
title: '规范展示' title: '规范展示'
} }
}, },
onLoad(e) { onLoad(e) {
getApp().trackPage('照片规范列表页') getApp().trackPage('照片规范列表页')
if (e && e.brandId) { if (e && e.brandId) {
this.brandId = e.brandId this.brandId = e.brandId
} }
if (e && e.brand) { if (e && e.brand) {
this.brand = decodeURIComponent(e.brand) this.brand = decodeURIComponent(e.brand)
this.title = this.brand this.title = this.brand
} }
if (e && e.orderId) { if (e && e.orderId) {
this.orderId = e.orderId this.orderId = e.orderId
} }
if (e && e.systemId) { if (e && e.systemId) {
this.systemId = e.systemId this.systemId = e.systemId
} }
if (e && e.classifyId) { if (e && e.classifyId) {
this.classifyId = e.classifyId this.classifyId = e.classifyId
} }
// this.getListData() // this.getListData()
this.getListDataNew() this.getListDataNew()
this.getWatermark() this.getWatermark()
}, },
computed: { computed: {
buttonStyle() { buttonStyle() {
return { return {
'color': '#FFFFFF', 'color': '#FFFFFF',
'width': '600rpx', 'width': '600rpx',
'height': '104rpx', 'height': '104rpx',
'font-size': '36rpx' 'font-size': '36rpx'
} }
}, },
buttonDisabled() { buttonDisabled() {
for (var item of this.dataList) { for (var item of this.dataList) {
for (var i of item.list) { for (var i of item.list) {
if ((i.imageList || []).length > 0) { if ((i.imageList || []).length > 0) {
return false return false
} }
} }
} }
return true return true
}, },
customStyleCancel() { customStyleCancel() {
return { return {
'background-color': '#D1D4D4', 'background-color': '#D1D4D4',
'width': '280rpx', 'width': '280rpx',
'height': '96rpx' 'height': '96rpx'
} }
}, },
customStyleSave() { customStyleSave() {
return { return {
'background-color': '##2272FF', 'background-color': '##2272FF',
'width': '280rpx', 'width': '280rpx',
'height': '96rpx', 'height': '96rpx',
'margin-left': '50rpx' 'margin-left': '50rpx'
} }
} }
}, },
methods: { methods: {
getListData: function() { getListData: function() {
this.loading = true this.loading = true
let that = this let that = this
this.$u.cloudApi.getGroupStandardV2({ this.$u.cloudApi.getGroupStandardV2({
'token': this.vuex_token, 'token': this.vuex_token,
'classify_id': this.classifyId, 'classify_id': this.classifyId,
'system_id': this.systemId, 'system_id': this.systemId,
'brand_id': this.brandId 'brand_id': this.brandId
}).then(res => { }).then(res => {
this.loading = false this.loading = false
if (res && res.result) { if (res && res.result) {
if (res.result.error_code) { if (res.result.error_code) {
uni.showToast({ uni.showToast({
title: res.result.error_msg title: res.result.error_msg
}) })
} else { } else {
that.handleData(res.result) that.handleData(res.result)
} }
} }
}) })
}, },
getListDataNew() { getListDataNew() {
this.loading = true this.loading = true
let self = this let self = this
var data = { var data = {
partnerCompanyId:this.systemId , partnerCompanyId:this.systemId ,
orderId:this.orderId, orderId:this.orderId,
categoryId:this.classifyId, categoryId:this.classifyId,
brandId:this.brandId brandId:this.brandId
}; };
self.$u.api.orderStandard(data).then((res) => { self.$u.api.orderStandard(data).then((res) => {
this.loading = false this.loading = false
if (res.code == 200) { if (res.code == 200) {
if(res.data && res.data.length > 0){ if(res.data && res.data.length > 0){
let dataList = [] let dataList = []
var flag = false; var flag = false;
res.data.forEach(item=>{ res.data.forEach(item=>{
if(dataList.length===0 ){ if(dataList.length===0 ){
var dataItem = {type:'',list:[]} var dataItem = {type:'',list:[]}
dataItem.type = item.type dataItem.type = item.type
dataItem.list.push(item) dataItem.list.push(item)
dataList.push(dataItem) dataList.push(dataItem)
}else{ }else{
dataList.forEach(dataListItem=>{ dataList.forEach(dataListItem=>{
if(dataListItem.type===item.type){ if(dataListItem.type===item.type){
dataListItem.list.push(item) dataListItem.list.push(item)
flag = true flag = true
return false; return false;
}else{ }else{
flag = false flag = false
} }
}) })
if(!flag){ if(!flag){
var dataItem = {type:'',list:[]} var dataItem = {type:'',list:[]}
dataItem.type = item.type dataItem.type = item.type
dataItem.list.push(item) dataItem.list.push(item)
dataList.push(dataItem) dataList.push(dataItem)
} }
} }
}) })
console.log("===", dataList) console.log("===", dataList)
this.handleData(dataList) this.handleData(dataList)
} }
} else { } else {
console.log(res.code.message) console.log(res.code.message)
} }
}); });
}, },
handleData: function(result) { handleData: function(result) {
this.activeTop = 0 this.activeTop = 0
this.dataList = result this.dataList = result
if (result.length > 0) { if (result.length > 0) {
var item = result[0] var item = result[0]
this.rightList = item.list this.rightList = item.list
} }
}, },
//顶部点击 //顶部点击
handleTopItemChange: function(ikey, item) { handleTopItemChange: function(ikey, item) {
this.activeTop = ikey this.activeTop = ikey
this.rightList = item.list this.rightList = item.list
const photo = getApp().globalData.photo const photo = getApp().globalData.photo
photo.topIndex = ikey photo.topIndex = ikey
photo.waterSetting = item.userWatermark photo.waterSetting = item.userWatermark
uni.pageScrollTo({ uni.pageScrollTo({
scrollTop: 0, scrollTop: 0,
duration: 0 duration: 0
}); });
}, },
// 点击图片 // 点击图片
handleClickImage(item, index) { handleClickImage(item, index) {
uni.previewImage({ uni.previewImage({
urls: item.orderImages, urls: item.orderImages,
current: index current: index
}) })
}, },
//右侧点击 //右侧点击
rightItemClick: function(item, ikey) { rightItemClick: function(item, ikey) {
const photo = getApp().globalData.photo const photo = getApp().globalData.photo
photo.currentItem = item photo.currentItem = item
photo.itemIndex = ikey photo.itemIndex = ikey
const len = item.imageList.length const len = item.imageList.length
photo.currentItemLength = len > 9 ? 10 : len photo.currentItemLength = len > 9 ? 10 : len
uni.navigateTo({ uni.navigateTo({
url: '/pages/photo/take' url: '/pages/photo/take'
}) })
}, },
// 清除图片 // 清除图片
handleClickSure: function() { handleClickSure: function() {
this.$u.cloudApi.cleanImage({ this.$u.cloudApi.cleanImage({
'token': this.vuex_token, 'token': this.vuex_token,
}).then(res => { }).then(res => {
this.isPopShow = false this.isPopShow = false
if (res && res.result) { if (res && res.result) {
this.getListData() this.getListData()
} }
}) })
}, },
take(item,ikey) { take(item,ikey) {
this.currentItemDate = item this.currentItemDate = item
const photo = getApp().globalData.photo const photo = getApp().globalData.photo
photo.currentItem = item photo.currentItem = item
photo.itemIndex = ikey photo.itemIndex = ikey
const len = item.orderImages?item.orderImages.length:0 const len = item.orderImages?item.orderImages.length:0
photo.currentItemLength = len > 9 ? 10 : len photo.currentItemLength = len > 9 ? 10 : len
uni.hideTabBar() uni.hideTabBar()
this.takeStatus = true this.takeStatus = true
}, },
closeTake(img) { closeTake(img) {
if(img !==undefined ){ if(img !==undefined ){
if (!this.currentItemDate.orderImages) this.currentItemDate.orderImages = [] if (!this.currentItemDate.orderImages) this.currentItemDate.orderImages = []
// step1 添加图片 // step1 添加图片
img.forEach(v => { img.forEach(v => {
this.currentItemDate.orderImages.push(v.key) this.currentItemDate.orderImages.push(v.key)
}) })
// step2 保存图片 // step2 保存图片
var data={ var data={
type : this.currentItemDate.type, type : this.currentItemDate.type,
images : Array.from(this.currentItemDate.orderImages), images : Array.from(this.currentItemDate.orderImages),
fieldsName:this.currentItemDate.fieldName fieldsName:this.currentItemDate.fieldName
} }
this.$u.api.saveImage(data,this.orderId).then((res) => { this.$u.api.saveImage(data,this.orderId).then((res) => {
if (res.code == 200) { if (res.code == 200) {
console.log("===", res.data) console.log("===", res.data)
} else { } else {
console.log("保存图片异常",res.data.message) console.log("保存图片异常",res.data.message)
} }
}); });
} }
this.takeStatus = false this.takeStatus = false
}, },
getWatermark(){ getWatermark(){
var data={partnerCompanyId:this.systemId} var data={partnerCompanyId:this.systemId}
this.$u.api.getWatermark(data).then((res) => { this.$u.api.getWatermark(data).then((res) => {
if (res.code == 200) { if (res.code == 200) {
console.log("===", res.data) console.log("===", res.data)
this.userWatermark = res.data this.userWatermark = res.data
} else { getApp().globalData.photo.waterSetting = this.userWatermark
console.log("获取水印备注异常",res.data.message) } else {
} console.log("获取水印备注异常",res.data.message)
}); }
} });
} }
} }
</script> }
</script>
<style>
.backView { <style>
background-color: #F4F5F7; .backView {
position: absolute; background-color: #F4F5F7;
top: 0; position: absolute;
left: 0; top: 0;
width: 100%; left: 0;
display: flex; width: 100%;
flex-direction: column; display: flex;
align-items: center; flex-direction: column;
height: 100%; align-items: center;
} height: 100%;
}
.centerBackView {
display: flex; .centerBackView {
flex-direction: row; display: flex;
margin-top: 80rpx; flex-direction: row;
width: 100%; margin-top: 80rpx;
} width: 100%;
}
.ph-lst-top-index {
font-size: 26rpx; .ph-lst-top-index {
font-weight: bold; font-size: 26rpx;
color: #FFFFFF; font-weight: bold;
border-radius: 8rpx; color: #FFFFFF;
background-color: #999999; border-radius: 8rpx;
width: 36rpx; background-color: #999999;
height: 36rpx; width: 36rpx;
line-height: 36rpx; height: 36rpx;
text-align: center; line-height: 36rpx;
} text-align: center;
}
.ph-lst-top-index.active {
background-color: #2272FF; .ph-lst-top-index.active {
} background-color: #2272FF;
}
.rightView {
background-color: #F4F5F7; .rightView {
width: 100%; background-color: #F4F5F7;
display: flex; width: 100%;
flex-direction: column; display: flex;
padding-bottom: 50rpx; flex-direction: column;
} padding-bottom: 50rpx;
}
.right-view-title {
font-size: 36rpx; .right-view-title {
font-weight: bold; font-size: 36rpx;
height: 104rpx; font-weight: bold;
line-height: 104rpx; height: 104rpx;
margin-left: 30rpx; line-height: 104rpx;
} margin-left: 30rpx;
}
.rightItemView {
/* width: 100%; */ .rightItemView {
/* display: flex; */ /* width: 100%; */
/* flex-direction: row; */ /* display: flex; */
/* justify-content: space-between; */ /* flex-direction: row; */
/* border-bottom: 20rpx solid #F3F3F3; */ /* justify-content: space-between; */
margin: 0rpx 30rpx 20rpx 30rpx; /* border-bottom: 20rpx solid #F3F3F3; */
padding: 36rpx 30rpx 30rpx 30rpx; margin: 0rpx 30rpx 20rpx 30rpx;
border-radius: 12rpx; padding: 36rpx 30rpx 30rpx 30rpx;
background-color: #FFFFFF; border-radius: 12rpx;
/* min-height: 108rpx; */ background-color: #FFFFFF;
} /* min-height: 108rpx; */
}
.ph-lst-item-index {
font-size: 24rpx; .ph-lst-item-index {
font-weight: bold; font-size: 24rpx;
border-radius: 4rpx; font-weight: bold;
width: 34rpx; border-radius: 4rpx;
height: 34rpx; width: 34rpx;
line-height: 32rpx; height: 34rpx;
text-align: center; line-height: 32rpx;
border-width: 1px; text-align: center;
border-style: solid; border-width: 1px;
margin-right: 10rpx; border-style: solid;
margin-top: 4rpx; margin-right: 10rpx;
} margin-top: 4rpx;
}
.rightContentView {
display: flex; .rightContentView {
align-items: flex-start; display: flex;
width: 100%; align-items: flex-start;
font-size: 30rpx; width: 100%;
color: #2272FF; font-size: 30rpx;
/* flex-direction: column; */ color: #2272FF;
/* border-left: 2rpx solid #F3F3F3; */ /* flex-direction: column; */
} /* border-left: 2rpx solid #F3F3F3; */
}
.rightContentView.active {
color: #666666; .rightContentView.active {
border-color: #666666; color: #666666;
} border-color: #666666;
}
.ph-list-item-arrow {
position: absolute; .ph-list-item-arrow {
width: 40rpx; position: absolute;
height: 40rpx; width: 40rpx;
right: 38rpx; height: 40rpx;
} right: 38rpx;
}
.rightContent {
font-size: 30rpx; .rightContent {
color: #333333; font-size: 30rpx;
line-height: 40rpx; color: #333333;
} line-height: 40rpx;
}
.rightImageView {
/* width: 300rpx; */ .rightImageView {
/* height: 320rpx; */ /* width: 300rpx; */
display: flex; /* height: 320rpx; */
align-items: center; display: flex;
justify-content: flex-start; align-items: center;
flex-wrap: wrap; justify-content: flex-start;
margin-top: 26rpx; flex-wrap: wrap;
} margin-top: 26rpx;
}
.rightImage {
background-color: #F3F3F3; .rightImage {
width: 116rpx; background-color: #F3F3F3;
height: 116rpx; width: 116rpx;
margin: 0rpx 12rpx 12rpx 0rpx; height: 116rpx;
margin: 0rpx 12rpx 12rpx 0rpx;
}
}
.rightImage:nth-child(5n) {
margin-right: 0; .rightImage:nth-child(5n) {
} margin-right: 0;
}
.topView {
background-color: #FAFAFA; .topView {
width: 100%; background-color: #FAFAFA;
height: 100rpx; width: 100%;
display: flex; height: 100rpx;
flex-direction: row; display: flex;
z-index: 1; flex-direction: row;
} z-index: 1;
}
.topItemView {
/* width: 210rpx; */ .topItemView {
height: 100rpx; /* width: 210rpx; */
display: flex; height: 100rpx;
align-items: center; display: flex;
justify-content: center; align-items: center;
-webkit-flex: 1; justify-content: center;
flex: 1; -webkit-flex: 1;
background-color: #FFFFFF; flex: 1;
color: #999999; background-color: #FFFFFF;
} color: #999999;
}
.topItemView.active {
color: #2272FF; .topItemView.active {
} color: #2272FF;
}
.topItemTitle {
font-size: 36rpx; .topItemTitle {
font-weight: bold; font-size: 36rpx;
padding-left: 30rpx; font-weight: bold;
} padding-left: 30rpx;
}
.greenBackColor {
background-color: #4CD964; .greenBackColor {
} background-color: #4CD964;
}
.ph-list-pop-text {
color: #666666; .ph-list-pop-text {
text-align: center; color: #666666;
margin-top: 20rpx; text-align: center;
font-size: 30rpx; margin-top: 20rpx;
} font-size: 30rpx;
}
.ph-list-pop-title {
font-size: 40rpx; .ph-list-pop-title {
padding-top: 150rpx; font-size: 40rpx;
text-align: center; padding-top: 150rpx;
color: #333333; text-align: center;
} color: #333333;
}
.ph-list-pop-btn-view {
display: flex; .ph-list-pop-btn-view {
justify-content: center; display: flex;
margin-top: 150rpx; justify-content: center;
} margin-top: 150rpx;
}
.scroll-y {
height: 73vh; .scroll-y {
} height: 73vh;
</style> }
</style>
...@@ -8,20 +8,20 @@ ...@@ -8,20 +8,20 @@
<text class="itemTitle">保存原图</text> <text class="itemTitle">保存原图</text>
<text class="itemNotice">拍照后另保存一张无水印的图片</text> <text class="itemNotice">拍照后另保存一张无水印的图片</text>
</view> </view>
<switch class="itemSwitch" :checked="result['has_origin']" @change="handleOrigineChange" color="#007AFF" /> <switch class="itemSwitch" :checked="result['hasOrigin']" @change="handleOrigineChange" color="#007AFF" />
</view> </view>
<view class="itemView" v-if="showTitleSwitch"> <view class="itemView" v-if="showTitleSwitch">
<view class="itemTitleView" @click="itemClick({},-1)"> <view class="itemTitleView" @click="itemClick({},-1)">
<text class="itemTitle">水印标题</text> <text class="itemTitle">水印标题</text>
<text class="itemNotice">{{result['lower_right']['title_text'] || '点击可编辑更改'}}</text> <text class="itemNotice">{{result['lowerLeft']['title'] || '点击可编辑更改'}}</text>
</view> </view>
<switch class="itemSwitch" disabled :checked="result['lower_right']['title_text'] != ''" <switch class="itemSwitch" disabled :checked="result['lowerLeft']['title'] != ''"
@click="handleClickTitleSwitch" color="#007AFF" /> @click="handleClickTitleSwitch" color="#007AFF" />
</view> </view>
<view class="itemView" v-for="(item,ikey) in itemList" :key="ikey"> <view class="itemView" v-for="(item,ikey) in itemList" :key="ikey">
<view class="itemTitleView" @click="itemClick(item,ikey)"> <view class="itemTitleView" @click="itemClick(item,ikey)">
<text class="itemTitle">{{item['watemark_text'] || '自定义' + (ikey + 1)}}</text> <text class="itemTitle">{{item['watemarkText'] || '自定义' + (ikey + 1)}}</text>
<text class="itemNotice">{{item['watemark_value'] || '点击可编辑更改'}}</text> <text class="itemNotice">{{item['watemarkValue'] || '点击可编辑更改'}}</text>
</view> </view>
<switch class="itemSwitch" :checked="item['enable']" @change="itemChange(item, ikey)" color="#007AFF" /> <switch class="itemSwitch" :checked="item['enable']" @change="itemChange(item, ikey)" color="#007AFF" />
</view> </view>
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<view class="inputBackView"> <view class="inputBackView">
<view class="ph-pop-left-view"> <view class="ph-pop-left-view">
<view class="leftInputView"> <view class="leftInputView">
<input class="leftInput" type="text" v-model="currenItem['watemark_text']" <input class="leftInput" type="text" v-model="currenItem['watemarkText']"
@input="leftInput()" :disabled="currenItem.type === 'title_text'" placeholder="请输入" @input="leftInput()" :disabled="currenItem.type === 'title_text'" placeholder="请输入"
maxlength="10" /> maxlength="10" />
</view> </view>
...@@ -41,7 +41,7 @@ ...@@ -41,7 +41,7 @@
<view class="ph-pop-mid-view">:</view> <view class="ph-pop-mid-view">:</view>
<view> <view>
<view class="rightInputView"> <view class="rightInputView">
<input class="rightInput" type="text" v-model="currenItem['watemark_value']" <input class="rightInput" type="text" v-model="currenItem['watemarkValue']"
@input="rightInput()" placeholder="请输入内容" maxlength="30" /> @input="rightInput()" placeholder="请输入内容" maxlength="30" />
</view> </view>
<view class="ph-pop-tip-view" v-if="showTipRight">*必填项</view> <view class="ph-pop-tip-view" v-if="showTipRight">*必填项</view>
...@@ -71,14 +71,14 @@ ...@@ -71,14 +71,14 @@
isPopShow: false, isPopShow: false,
icon_close_new: '', icon_close_new: '',
result: { result: {
has_origin: true, hasOrigin: true,
lower_right: { lowerLeft: {
body: [] body: []
} }
}, },
currenItem: { currenItem: {
'watemark_text': '', 'watemarkText': '',
'watemark_value': '' 'watemarkValue': ''
}, },
editingItem: {}, editingItem: {},
showTipLeft: false, showTipLeft: false,
...@@ -88,8 +88,8 @@ ...@@ -88,8 +88,8 @@
}, },
computed: { computed: {
itemList() { itemList() {
if (this.result['lower_right']) { if (this.result['lowerLeft']) {
var arr = this.result['lower_right']['body'] var arr = this.result['lowerLeft']['body']
return arr.filter((item) => { return arr.filter((item) => {
return item.watemark_type === '备注' return item.watemark_type === '备注'
}) })
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
}, },
showTitleSwitch() { showTitleSwitch() {
return this.result['lower_right'].hasOwnProperty('title_text') return this.result['lowerLeft'].hasOwnProperty('title')
}, },
customStyleCancel() { customStyleCancel() {
return { return {
...@@ -164,12 +164,12 @@ ...@@ -164,12 +164,12 @@
//保存原图 开关 //保存原图 开关
handleOrigineChange: function(e) { handleOrigineChange: function(e) {
this.result['has_origin'] = !this.result['has_origin'] this.result['hasOrigin'] = !this.result['hasOrigin']
this.saveUserWatermark() this.saveUserWatermark()
}, },
handleClickTitleSwitch: function(e) { handleClickTitleSwitch: function(e) {
var string = this.result['lower_right']['title_text'] ? '水印标题不可关闭' : '请先编辑该自定义项' var string = this.result['lowerLeft']['title'] ? '水印标题不可关闭' : '请先编辑该自定义项'
uni.showToast({ uni.showToast({
icon: 'none', icon: 'none',
title: string title: string
...@@ -178,7 +178,7 @@ ...@@ -178,7 +178,7 @@
//自定义 开关 //自定义 开关
itemChange: function(item, ikey) { itemChange: function(item, ikey) {
if (item['watemark_value']) { if (item['watemarkValue']) {
// 修改 // 修改
item['enable'] = !item['enable'] item['enable'] = !item['enable']
this.saveUserWatermark() this.saveUserWatermark()
...@@ -194,8 +194,8 @@ ...@@ -194,8 +194,8 @@
itemClick: function(item, ikey) { itemClick: function(item, ikey) {
if (ikey === -1) { if (ikey === -1) {
this.currenItem = { this.currenItem = {
'watemark_text': '水印标题', 'watemarkText': '水印标题',
'watemark_value': this.result['lower_right']['title_text'], 'watemarkValue': this.result['lowerLeft']['title'],
'type': 'title_text' 'type': 'title_text'
} }
} else { } else {
...@@ -210,7 +210,7 @@ ...@@ -210,7 +210,7 @@
//左侧输入框 //左侧输入框
leftInput: function(e) { leftInput: function(e) {
if (this.currenItem['watemark_text']) { if (this.currenItem['watemarkText']) {
this.showTipLeft = false this.showTipLeft = false
} }
...@@ -218,7 +218,7 @@ ...@@ -218,7 +218,7 @@
//右侧输入框 //右侧输入框
rightInput: function(e) { rightInput: function(e) {
if (this.currenItem['watemark_value']) { if (this.currenItem['watemarkValue']) {
this.showTipRight = false this.showTipRight = false
} }
}, },
...@@ -227,8 +227,8 @@ ...@@ -227,8 +227,8 @@
popCancelClick: function() { popCancelClick: function() {
this.isPopShow = false this.isPopShow = false
this.currenItem = { this.currenItem = {
'watemark_text': '', 'watemarkText': '',
'watemark_value': '' 'watemarkValue': ''
} }
}, },
...@@ -239,22 +239,22 @@ ...@@ -239,22 +239,22 @@
//自定义弹窗 保存 //自定义弹窗 保存
popSaveClick: function() { popSaveClick: function() {
if (this.currenItem['watemark_text'] && this.currenItem['watemark_value']) { if (this.currenItem['watemarkText'] && this.currenItem['watemarkValue']) {
this.isPopShow = false this.isPopShow = false
if (this.currenItem.type === 'title_text') { if (this.currenItem.type === 'title_text') {
this.result['lower_right']['title_text'] = this.currenItem['watemark_value'] this.result['lowerLeft']['title'] = this.currenItem['watemarkValue']
} else { } else {
this.editingItem['watemark_text'] = this.currenItem['watemark_text'] this.editingItem['watemarkText'] = this.currenItem['watemarkText']
this.editingItem['watemark_value'] = this.currenItem['watemark_value'] this.editingItem['watemarkValue'] = this.currenItem['watemarkValue']
this.editingItem['enable'] = true this.editingItem['enable'] = true
} }
this.saveUserWatermark() this.saveUserWatermark()
} else { } else {
// 提示 // 提示
if (!this.currenItem['watemark_text']) { if (!this.currenItem['watemarkText']) {
this.showTipLeft = true this.showTipLeft = true
} }
if (!this.currenItem['watemark_value']) { if (!this.currenItem['watemarkValue']) {
this.showTipRight = true this.showTipRight = true
} }
} }
......
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