Commit e11175e2 authored by 李俊赕's avatar 李俊赕

合并代码

parent 251c3de0
...@@ -101,7 +101,17 @@ ...@@ -101,7 +101,17 @@
settleRecommend:'', settleRecommend:'',
navHeight:0, //导航栏高度 navHeight:0, //导航栏高度
rpxScreenHeight:0,// 照相视框高度 rpxScreenHeight:0,// 照相视框高度
//拍照相关数据
photo:{
product:{
brandId:'', // 品牌id
brandName:'', // 品牌名称
classifyId:'', // 分类id
systemId:'', // 系统id
},
productList:[],
currentItem:null, // 选择的某一项
},
// 用户信息 // 用户信息
tempUserInfo: '', // 临时用户选项 tempUserInfo: '', // 临时用户选项
userInfo: '', // 用户信息 userInfo: '', // 用户信息
......
...@@ -124,7 +124,16 @@ ...@@ -124,7 +124,16 @@
"navigationBarTitleText": "工单详情" "navigationBarTitleText": "工单详情"
} }
}, },
{
"path": "pages/photo/setting",
"style": {
"navigationStyle":"custom",
"navigationBarTitleText": "水印设置",
"navigationBarBackgroundColor": "#333333",
"navigationBarTextStyle": "#FFFFFF",
"disableScroll": true
}
},
{ {
"path": "pages/photo/take", "path": "pages/photo/take",
"style": { "style": {
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<cover-view class="inner"> <cover-view class="inner">
<cover-image @click="setCameraInfo('devicePosition')" class="icon" mode="aspectFit" src="/static/photo/icon-switch.png"></cover-image> <cover-image @click="setCameraInfo('devicePosition')" class="icon" mode="aspectFit" src="/static/photo/icon-switch.png"></cover-image>
<cover-image @click="setCameraInfo('flash')" class="icon" mode="aspectFit" src="/static/photo/icon-light.png"></cover-image> <cover-image @click="setCameraInfo('flash')" class="icon" mode="aspectFit" src="/static/photo/icon-light.png"></cover-image>
<cover-image @click="goPage('/pages/photo/markSetting')" class="icon" mode="aspectFit" src="/static/photo/icon-setting.png"></cover-image> <cover-image @click="goPage('/pages/photo/setting')" class="icon" mode="aspectFit" 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" :flash="cameraInfo.flash" :style="{'height':cameraHeight + 'rpx'}" <camera class="camera-box" v-if="cameraChange&&!standardShow" :device-position="cameraInfo.devicePosition" :flash="cameraInfo.flash" :style="{'height':cameraHeight + 'rpx'}"
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
methods: { methods: {
goBack(){ goBack(){
uni.redirectTo({ uni.redirectTo({
url:'/pages/photo/brand' url:'/pages/photo/list'
}) })
}, },
goPage(url){ goPage(url){
......
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