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

Merge branch 'dev-photo-v2' of https://git.banshouhui.com/heyinchen/take_order into dev-photo-v2

parents 0859fccb 881ccae4
...@@ -50,13 +50,7 @@ ...@@ -50,13 +50,7 @@
}, { }, {
name: '之约' name: '之约'
}], }],
swiperList:[{ swiperList:[],
title:'记录的距离大家零点九零杰拉德杰拉德建立的连接就111111111111',
},{
title:'记录的距离大家零点九零杰拉德杰拉德建立的连接就222222',
},{
title:'记录的距离大家零点九零杰拉德杰拉德建立的连接就333333',
},],
// 因为内部的滑动机制限制,请将tabs组件和swiper组件的current用不同变量赋值 // 因为内部的滑动机制限制,请将tabs组件和swiper组件的current用不同变量赋值
current: 0, // tabs组件的current值,表示当前活动的tab选项 current: 0, // tabs组件的current值,表示当前活动的tab选项
swiperCurrent: 0, // swiper组件的current值,表示当前那个swiper-item是活动的 swiperCurrent: 0, // swiper组件的current值,表示当前那个swiper-item是活动的
......
...@@ -123,7 +123,7 @@ export default { ...@@ -123,7 +123,7 @@ export default {
signupLogin(e) { signupLogin(e) {
var that = this var that = this
if (!e || !detail || e.detail.errMsg.indexOf('user deny') > -1) { if (!e || !e.detail || e.detail.errMsg.indexOf('user deny') > -1) {
wx.showModal({ wx.showModal({
title: '提示', title: '提示',
showCancel: false, showCancel: false,
......
...@@ -121,6 +121,12 @@ ...@@ -121,6 +121,12 @@
handleClick() { handleClick() {
// 点击下一步设置全局拍照品牌品类 // 点击下一步设置全局拍照品牌品类
const globalData = getApp().globalData const globalData = getApp().globalData
if (!globalData.token) {
uni.navigateTo({
url:'/pages/login/wxlogin'
})
return
}
let keys = ['brandId', 'brandName', 'classifyId', 'systemId'] let keys = ['brandId', 'brandName', 'classifyId', 'systemId']
keys.map(key => { keys.map(key => {
globalData.photo.product[key] = this[key] || this.param[key] globalData.photo.product[key] = this[key] || this.param[key]
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
<view class="rightItemView" @click="rightItemClick(item,ikey)" :key="ikey"> <view class="rightItemView" @click="rightItemClick(item,ikey)" :key="ikey">
<view :class="['rightContentView', {'active':item.images.length > 0}]"> <view :class="['rightContentView', {'active':item.images.length > 0}]">
<text class="ph-lst-item-index">{{ ikey + 1 }}</text> <text class="ph-lst-item-index">{{ ikey + 1 }}</text>
<text class="">{{item.name}} ({{item.image_count}}张)</text> <text class="">{{item.name}}</text>
<image class="ph-list-item-arrow" src="/static/photo/arrow.png"></image> <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>
......
<template> <template>
<view class="backView"> <view class="backView">
<u-loading style="position: absolute;top: 50%;" :show="loading" size="36" mode="flower"></u-loading> <u-loading style="position: absolute;top: 50%;" :show="loading" size="36" mode="flower"></u-loading>
<view class="itemView firstItem"> <view class="itemView firstItem">
<view class="itemTitleView"> <view class="itemTitleView">
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
<text class="itemTitle">{{item['watemark_text'] || '自定义' + (ikey + 1)}}</text> <text class="itemTitle">{{item['watemark_text'] || '自定义' + (ikey + 1)}}</text>
<text class="itemNotice">{{item['watemark_value'] || '点击可编辑更改'}}</text> <text class="itemNotice">{{item['watemark_value'] || '点击可编辑更改'}}</text>
</view> </view>
<switch class="itemSwitch" :checked="item['enable']" @change="itemChange(item, ikey)" <switch class="itemSwitch" :checked="item['enable']" @change="itemChange(item, ikey)" color="#007AFF" />
color="#007AFF" />
</view> </view>
<view class="shadowBackView" v-if="isPopShow"> <u-popup border-radius="10" v-model="isPopShow" safe-area-inset-bottom :mask-close-able="false" mode="center"
width="690rp" height="600rpx">
<view class="popCenterView"> <view class="popCenterView">
<text class="popTitle">设置自定义项</text> <text class="popTitle">设置自定义项</text>
<view class="inputBackView"> <view class="inputBackView">
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
</view> </view>
</view> </view>
</view> </view>
</view> </u-popup>
</view> </view>
</template> </template>
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
}, },
editingItem: {}, editingItem: {},
showTipLeft: false, showTipLeft: false,
showTipRight: false, showTipRight: false,
loading: true loading: true
} }
}, },
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
}).then(res => { }).then(res => {
if (res && res.result) { if (res && res.result) {
this.result = res.result this.result = res.result
} }
this.loading = false this.loading = false
}) })
...@@ -129,10 +129,10 @@ ...@@ -129,10 +129,10 @@
'token': getApp().globalData.token, 'token': getApp().globalData.token,
'watermark': this.result 'watermark': this.result
}).then(res => { }).then(res => {
if (res.result == true) { if (res.result == true) {
const photo = getApp().globalData.photo const photo = getApp().globalData.photo
photo.waterSetting = this.result photo.waterSetting = this.result
} }
this.loading = false this.loading = false
}) })
...@@ -201,11 +201,11 @@ ...@@ -201,11 +201,11 @@
//自定义弹窗 关闭 //自定义弹窗 关闭
popCancelClick: function() { popCancelClick: function() {
this.currenItem = { this.isPopShow = false
'watemark_text': '', this.currenItem = {
'watemark_value': '' 'watemark_text': '',
'watemark_value': ''
} }
this.isPopShow = false
}, },
//自定义弹窗 保存 //自定义弹窗 保存
...@@ -318,10 +318,6 @@ ...@@ -318,10 +318,6 @@
.popCenterView { .popCenterView {
background-color: #FFFFFF; background-color: #FFFFFF;
width: 690rpx;
height: 600rpx;
margin-top: 300rpx;
border-radius: 12rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
......
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