Skip to content

U
uni-pdtravel
Commit 33b5b1f2 authored by 潘永坪's avatar 潘永坪
Browse files
Options

Merge remote-tracking branch 'remotes/origin/album' into develop

parents 78d0702e b382ed0c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1162 additions and 578 deletions
pages.json
View file @ 33b5b1f2
......@@ -372,7 +372,16 @@
}
}
]
,{
"path" : "purchasedPhotoAlbum/purchasedPhotoAlbum",
"style" :
{
"navigationBarTitleText": "我的影集",
"enablePullDownRefresh": false
}
}
]
}
],
"globalStyle" : {
......
pages/album/albumIndex.vue
View file @ 33b5b1f2
<template>
<view class="big-box" :style="{'padding-top': statusBarHeight + 'px'}">
<view class="big-box" :style="{'padding-top': statusBarHeight + 'px'}" v-show="show">
<view class="nav-bar" :style="{'top': statusBarHeight + 'px', 'height': navHeight + 'px','line-height': navHeight + 'px'}">
摄影/旅拍
</view>
......@@ -92,6 +92,7 @@ export default {
statusBarHeight: 0,
capsule: 0,
navHeight: 0,
show: false,//是否显示首页
list: [
{
title: '精彩瞬间',
......@@ -129,14 +130,15 @@ export default {
image: './static/album/customPic.png',
color: '#D48D46'
}
]
],
options: {}//路由参数
}
},
methods: {
jumpToScanFaceClick() {//---跳转扫脸页面
const openid = uni.getStorageSync('openid')
this.$request('wechatUser/pdFace/checkScanFace',{openid}).then(res => {//创建任务
this.$request('wechatUser/pdFace/checkScanFace',{openid}).then(res => {
if (res.code === '00') {
if(res.data.isScanFace === 0) {//未扫脸
uni.navigateTo({
......@@ -156,7 +158,6 @@ export default {
})
},
jumptoVlog() {//---跳转到vlog页面
console.log('fdsa')
uni.redirectTo({
url: '/pages/vlog/vlogIndex/vlogIndex'
})
......@@ -166,16 +167,89 @@ export default {
this.jumpToScanFaceClick()
}
},
judgeWhether(url, data) {//---判断是否成功的封装函数
return new Promise((resolve, reject) => {
this.$request(url, data).then(res => {
if (res.code === '00') {
resolve(res.data)
}else{
reject(false)
}
})
})
},
async handleWhetherToVotePage() {//---判断是否跳转投票页面
// 1.获取调查列表
const surveyQueryData = {
pageCode: 'albumIndex',//默认前端写死
channelId: this.options.channelId//游客扫码携带的channelId或者是胖丁登录时的公司id
}
const surveyList = await this.judgeWhether('scenic/market/findPageMarket', surveyQueryData)
// 2.判断商店是否在做投票活动
let surveyIds
let surveyResult = []
if(surveyList.length) {
surveyIds = surveyList.map(item => item.surveyId)
surveyResult = await this.judgeWhether('scenic/albumConfig/getSurveyConfig', { surveyIds })
}
// 3.判断用户是否已经投过票
let voteObj = {}// 用户投票信息
if(surveyResult.length) {
// 默认保存第一个商店id到缓存
uni.setStorageSync('merchantId', surveyResult[0].merchantId)
const votedQueryData = {
merchantId: surveyResult[0].merchantId,
openid: uni.getStorageSync('openid')
}
voteObj = await this.judgeWhether('wechatUser/pdAlbum/checkVisitorSurvey', votedQueryData)
}
// 4.判断是否跳转投票页面
if(voteObj.alreadySurvey === 0) {// 未投过票
uni.navigateTo({
url: `./chooseFavorite?surveyConfig=${JSON.stringify(surveyResult)}`
})
}else if(voteObj.alreadySurvey === 1) {// 已投票
this.show = true
}
},
recordDeviceInfo() {//---记录设备信息
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight // 状态栏高度
this.capsule = uni.getMenuButtonBoundingClientRect() // 胶囊大小、位置数据
this.navHeight = (this.capsule.top - this.statusBarHeight) * 2 + this.capsule.height // 导航栏高度
}
}
},
onLoad(option) {
if(option.tip === 'true') this.showtip = true
onLoad(options) {
this.recordDeviceInfo()
}
this.options = options
if(this.options.tip === 'true') {
this.show = true
this.showtip = true
}else {
this.handleWhetherToVotePage()
}
if(uni.getStorageSync('location')) return
uni.getLocation({//获取定位
type: 'wgs84',
success: res => {
uni.setStorageSync('location', JSON.stringify(res))
},
fail() {
uni.showToast({
title: '获取经纬度失败',
icon: 'none'
})
}
})
}
}
</script>
......
pages/album/chooseFavorite.vue
View file @ 33b5b1f2
<template>
<view class="big-box" :style="{'padding-top': statusBarHeight + 'px'}">
<view class="nav-bar" :style="{'height': navHeight + 'px'}">
<picker mode="selector" @change="companyChage" :value="index" :range="companyArr" range-key="name">
<view class="company">{{companyArr[index] ? companyArr[index].name : '请选择公司'}}</view>
<picker mode="selector" @change="companyChage" :value="index" :range="companyArr" range-key="merchantName">
<view class="company">{{companyArr[index] ? companyArr[index].merchantName : '请选择公司'}}</view>
</picker>
<u-icon name="arrow-down"></u-icon>
</view>
......@@ -13,8 +13,8 @@
<image class="start" src="./static/album/star.png"></image>
</view>
<view class="img-box">
<view class="item" @click="imageChange(item)" v-for="(item, index) in imgArr" :key="item.id">
<image class="img" :src="item.url" mode="aspectFill"></image>
<view class="item" @click="imageChange(item)" v-for="(item, index) in imgArr" :key="item.templateId">
<image class="img" :src="item.templateUrl" mode="aspectFill"></image>
<u-checkbox class="checkbox" v-model="item.value" shape="circle"></u-checkbox>
</view>
</view>
......@@ -39,20 +39,27 @@ export default {
index: 0,// 选中的公司索引-默认选中第一个
companyArr: [],// 公司枚举
imgArr: [],//图片
value: true,
location: {},//位置信息
option: {},//路由传参
}
},
methods: {
saveClick() {//---提交
const selectedPic = this.imgArr.filter(item => item.value)
const templateIds = this.imgArr.map(item => {
if(item.value) return item.templateId
}) || []
if(!templateIds.length) return uni.showToast({
title: '您还没有选择模板哟！',
icon: 'none'
})
const data = {
id: selectedPic[0].id,// 图片id
merchantId: selectedPic[0].merchantId
merchantId: this.companyArr[this.index].merchantId,//商店id
openid: uni.getStorageSync('openid'), //openid
templateIds//模板Id
}
uni.setStorageSync('merchantId', data.merchantId)
this.$request('scenic/V2merchant/submitChoose', data).then(res => {//创建任务
this.$request('wechatUser/pdAlbum/saveVisitorSurvey', data).then(res => {
if (res.code === '00') {
uni.showToast({
title: '提交成功',
......@@ -71,99 +78,30 @@ export default {
},
companyChage(e) {//---公司变化
this.index = Number(e.detail.value)
const merchantId = this.companyArr[this.index].id
this.getPic(merchantId)
this.imgArr = this.companyArr[this.index].templateDetailList
},
imageChange(item) {//---图片选择
this.imgArr.forEach(item => item.value = false)
item.value = true
this.$set(item, 'value', !item.value)
this.$forceUpdate()
// item.value = !item.value
},
recordDeviceInfo() {//---记录设备信息
this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight // 状态栏高度
this.capsule = uni.getMenuButtonBoundingClientRect() // 胶囊大小、位置数据
this.navHeight = (this.capsule.top - this.statusBarHeight) * 2 + this.capsule.height // 导航栏高度
},
getCompany(nearbyId) {//---获取景区列表
this.$request('scenic/newMerchant/findAllMerchant').then(res => {//创建任务
if (res.code === '00') {
if(!res.data.length) return
const id = this.option.merchantId || nearbyId
let index = res.data.findIndex(item => item.id === id)
this.index = index === -1 ? 0 : index
this.companyArr = res.data
this.getPic(this.companyArr[this.index].id)
}else{
uni.showToast({
title: res.message,
icon: 'none'
})
}
})
},
getPic(merchantId) {//---获取景区图片
this.$request('scenic/V2merchant/getImgList',{ merchantId }).then(res => {//创建任务
if (res.code === '00') {
res.data.forEach(item => item.value = false)
this.imgArr = res.data
}else{
uni.showToast({
title: res.message,
icon: 'none'
})
}
})
},
getNearByCompany() {//---获取最近的景区
const data = {
merchantType: 1,
userlatitude: this.location.latitude,//纬度
userlongitude: this.location.longitude//经度
}
this.$request('scenic/newMerchant/findAllMerchant', data).then(res => {//创建任务
if (res.code === '00') {
if(!res.data.length) {
this.getCompany()
return uni.showToast({
title: '获取最近景点失败',
icon: 'none'
})
}
this.getCompany(res.data[0].id)
}else{
uni.showToast({
title: res.message,
icon: 'none'
})
}
})
}
},
onLoad(option) {
this.option = option
this.recordDeviceInfo()
uni.getLocation({//获取定位
type: 'wgs84',
success: res => {
this.location = res
uni.setStorageSync('location', JSON.stringify(res))
if(this.option.merchantId) {//扫码进入则直接加载景区列表，默认显示传入的景区
this.getCompany()
}else {//否则获取并显示距离最近的景点
this.getNearByCompany()
}
},
fail() {
this.getCompany()
uni.showToast({
title: '获取经纬度失败',
icon: 'none'
})
}
this.option = option
this.companyArr = JSON.parse(option.surveyConfig)
const imgArr = []
this.companyArr.forEach(item => {
imgArr.push(...item.templateDetailList)
})
imgArr.forEach(item => this.$set(item, 'value', false))
this.imgArr = this.companyArr[0].templateDetailList
}
}
</script>
......
pages/album/myPhotoAlbum/myPhotoAlbum.vue
View file @ 33b5b1f2
This diff is collapsed.
pages/album/purchasedPhotoAlbum/purchasedPhotoAlbum.vue 0 → 100644
View file @ 33b5b1f2
<template>
<view class="albumBox">
<!--头部-->
<view class="album-address">
<view class="address-left">
<view class="left-picker" @click="orderShow=true">
<i>{{cityName}}</i>
<image src="../static/album/myPhoto01.png"></image>
</view>
<u-picker mode="selector" v-model="orderShow" :default-selector="[orderType]" :range="option" range-key="areaName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker>
</view>
</view>
<!--主体循环-->
<view class="album-subject">
<view class="subject-List" v-for="(item,index) in previewData" :key="index" @click="projectCheckPhoto(index)" >
<image class="list-image" :src="item.faceSourceUrl" ></image>
<u-checkbox v-model="item.checkType" v-if="checkTypeFun==true" @click.stop.native="()=>{}" @change="stopPhoto(index)" shape="circle" class="list-uCheck"></u-checkbox>
<view class="list-mask">预览</view>
</view>
</view>
<!--脚部-->
<view class="album-bottom">
<view class="bottom-left" v-if="maskDetail==false">
<!--全选按钮-->
<view class="album-checkAll">
<u-checkbox v-model="checkProjectAll" @change="checkProjectAllFun()">全选</u-checkbox>
<view class="checkAll-tips">未下载影像保留15天</view>
</view>
</view>
<view class="bootom-btn" @click="upLoad()">去下载</view>
</view>
<u-toast ref="uToast" />
</view>
</template>
<script>
import uPicker from '@/uview-ui/components/u-picker/u-picker.vue'
import uCheckboxGroup from '@/uview-ui/components/u-checkbox-group/u-checkbox-group.vue'
import uCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox'
import uToast from '@/uview-ui/components/u-toast/u-toast.vue'
export default {
components: {
uPicker,
uCheckboxGroup,
uCheckbox,
uToast
},
data() {
return {
faceIds: [], //查询照片ID
openid:'',
orderShow: false, //头部城市选择
option: [],//城市
cityName: '全部',
areaId:'',//城市ID
merchantId:'',//商户ID
location: {},//位置信息
projectCheck: 0, //当前选择的产品
merchantList:[],//商户列表
merchantName:'全部',//商户名称
projectMoreType: false, //是否显示更多产品
checkProjectAll: false, //所有产品全选
maskDetail: false,
maskPreviewType:false,//遮罩预览
previewData: [ //图片预览
// {
// type: false,
// src: '../static/album/customPic.png'
// },
],
previewNum: 0, //当前是第几张图片
checkTypeFun:true,//刷新选项
//左右滑动监听开始
startData: {
clientX: '',
clientY: '',
},
transition: '',
touch: {},
touchLeft: 0,
touchRight: 0,
touchType: 0, //向左0++ 向右1--
//左右滑动 监听结束
originalPrice:0,//原价单价
originalPrices:0,//原价
sellingPrice:0,//售价单价
sellingPrices:0,//售价
favorablePrice:0,//优惠
priceNum:0,//选购了多少照片
}
},
onLoad(option) {
this.openid = uni.getStorageSync('openid') //获取openid
//this.merchantId = 'z0015605022691a5945bbe463141668c'//uni.getStorageSync('merchantId')
this.obtainProvince()//获取省市区
this.inquireMerchant()//查询所有商户
this.getPhotos()//照片列表
},
methods: {
obtainProvince(){//获取省列表
this.$request('scenic/search/loadAreaByCity',{
areaLevel:1,
inChina:0
}).then((res)=>{
if(res.code=='00'){
this.option = res.data
}else{
this.$refs.uToast.show({
title: res.message,
type: 'error',
})
}
})
},
inquireMerchant(){//查询所有商户
var data = {
id:this.merchantId,//商户ID
province:this.areaId,//省市ID
areaCode:this.areaId,//省市ID
merchantType:1,//
}
this.$request('scenic/newMerchant/findAllMerchant',data).then((res)=>{
if(res.code=='00'){
this.merchantList = res.data
}else{
this.$refs.uToast.show({
title: res.message,
type: 'error',
})
}
})
},
getPhotos(){//照片
var data = {
openid:this.openid,
merchantId:this.merchantId,//商户ID
}
this.$request('wechatUser/pdFace/getAlbumList',data).then((res)=>{
if(res.code=='00'){
this.previewData = res.data
this.previewData.forEach((item,index)=>{
item['checkType'] = false
this.originalPrice = item.originalPrice//原价.
this.sellingPrice = item.sellingPrice//售价
})
}else{
this.$refs.uToast.show({
title: res.message,
type: 'error',
})
}
})
},
industrysTypeConfirm(e) { //单列----分类 点击确定 城市
this.cityName = this.option[e].areaName
this.areaId = this.option[e].areaId
this.inquireMerchant()
},
cancel() { //单列 点击取消
this.orderShow = false
},
projectCheckPhoto(index){//点击预览
this.previewNum = index
this.maskPreviewType = true
},
stopPhoto(index){//刷新显示
if(this.checkProjectAll==true){
this.checkProjectAll=false
}
if(this.previewData[index].checkType==false){
this.previewData[index].checkType = true
}else{
this.previewData[index].checkType = false
}
this.checkTypeFun = false
this.checkTypeFun = true
},
checkProjectAllFun(){//是否全选
if(this.checkProjectAll==true){
this.checkProjectAll = false
this.previewData.forEach((item,index)=>{
item.checkType = false
})
}else{
this.checkProjectAll = true
this.previewData.forEach((item,index)=>{
item.checkType = true
})
}
},
upLoad(){//下单
},
}
}
</script>
<style scoped lang="scss">
page {
background-color: #F7F7F7;
}
.albumBox {
// 76=16 - 44 - 16 98 =34 - 32 - 32
display: flex;
flex-direction: column;
height: 100%;
background-color: #F7F7F7;
padding-bottom: 98rpx;
padding-top: 174rpx;
overflow: auto;
}
.album-address {
display: flex;
justify-content: space-between;
width: 100%;
height: 76rpx;
padding: 0 24rpx 0 24rpx;
background-color: #FFFFFF;
box-shadow: 0 0 16px 0 rgba(0, 0, 0, 0.1);
overflow: hidden;
position: fixed;
top: 0;
left: 0;
z-index: 20;
.address-left {
display: flex;
flex: 1;
box-shadow: inset -16px 0px 8px 0px rgba(255, 255, 255, 0.2);
overflow-x: auto;
.left-picker {
display: flex;
font-size: 32rpx;
color: #333333;
line-height: 76rpx;
margin-right: 24rpx;
image {
width: 26rpx;
height: 26rpx;
margin-top: 25rpx;
margin-left: 8rpx;
}
}
}
}
.album-address::-webkit-scrollbar {
display: none;
}
.album-subject {
display: flex;
flex-wrap: wrap;
justify-content: space-between;
flex: 1;
padding: 0 24rpx 0 24rpx;
overflow: auto;
.subject-List {
width: 344rpx;
height: 460rpx;
margin-bottom: 24rpx;
border-radius: 16rpx;
overflow: hidden;
position: relative;
.list-image {
display: block;
width: 344rpx;
height: 460rpx;
}
.list-mask {
width: 344rpx;
height: 64rpx;
background-color: rgba(0, 0, 0, 0.2);
font-size: 28rpx;
color: #fff;
line-height: 64rpx;
text-align: center;
position: absolute;
left: 0;
bottom: 0;
}
.list-uCheck {
position: absolute;
right: 0;
top: 24rpx;
}
}
}
.album-bottom {
display: flex;
justify-content: space-between;
width: 100%;
height: 98rpx;
padding: 0 0 0 24rpx;
box-shadow: 0rpx -2rpx 8rpx 2rpx rgba(0, 0, 0, 0.08);
position: fixed;
bottom: 0;
left: 0;
z-index: 25;
.bottom-left {
flex: 1;
display: flex;
line-height: 98rpx;
.album-checkAll {
width: 100%;
height: 98rpx;
padding: 32rpx 24rpx 0 24rpx;
overflow: hidden;
/deep/ .u-checkbox {
line-height: 34rpx !important;
}
/deep/ .u-checkbox__label {
font-size: 24rpx !important;
}
.checkAll-tips {
font-size: 24rpx;
color: #999999;
line-height: 46rpx;
margin-left: 24rpx;
}
}
}
.bootom-btn {
width: 240rpx;
height: 98rpx;
background-color: #3688FF;
font-size: 32rpx;
color: #fff;
font-weight: bold;
text-align: center;
line-height: 98rpx;
}
}
</style>
\ No newline at end of file
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