Commit b4a70553 authored by 潘永坪's avatar 潘永坪

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

parents f4724964 fec3503b
<template>
<view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
methods: {
}
}
</script>
<style>
</style>
<template>
<view class="purchaseBox">
<view class="purchase-list">
<image class="list-photo" src="../static/album/pillow.png"></image>
<view class="list-name">定制明信片</view>
<view class="list-text">双面可选</view>
<view class="list-other">
<view class="other-oldMoney">¥19.9</view>
<view class="other-newUnit"></view>
<view class="other-newMoney">0</view>
<view class="other-lable">首单</view>
</view>
</view>
</view>
</template>
<script>
export default {
data() {
return {
}
},
onLoad(option) {
},
methods: {
}
}
</script>
<style scoped lang="scss">
page {
background-color: #F7F7F7;
}
.purchaseBox{
display: flex;
justify-content: space-between;
padding: 24rpx;
}
.purchase-list{
width: 344rpx;
height: 522rpx;
border-radius: 16rpx;
background-color: #fff;
box-shadow: 0rpx 4rpx 8rpx 2rpx rgba(0,0,0,0.08);
overflow: hidden;
.list-photo{
display: block;
width: 344rpx;
height: 344rpx;
}
.list-name{
padding: 0 0 0 24rpx;
margin: 16rpx 0 4rpx 0;
font-size: 32rpx;
color: #333333;
line-height: 44rpx;
}
.list-text{
padding: 0 0 0 24rpx;
margin: 0rpx 0 16rpx 0;
font-size: 24rpx;
color: #999999;
line-height: 34rpx;
}
.list-other{
display: flex;
flex-wrap: wrap;
padding: 0 24rpx 0 24rpx;
height: 48rpx;
overflow: hidden;
.other-oldMoney{
text-decoration: line-through;
font-size: 20rpx;
color: #999999;
line-height: 60rpx;
margin-right: 8rpx;
}
.other-newUnit{
font-size: 20rpx;
color: #EE520E;
line-height: 60rpx;
margin-right: 8rpx;
}
.other-newMoney{
font-size: 40rpx;
color: #EE520E;
line-height: 48rpx;
margin-right: 24rpx;
}
.other-lable{
width: 48rpx;
height: 32rpx;
font-size: 20rpx;
line-height: 32rpx;
color: #EE520E;
background: #FFF4EF;
border-radius: 4rpx 4rpx 4rpx 4rpx;
margin-top: 8rpx;
text-align: center;
margin-right: 24rpx;
}
}
}
</style>
......@@ -29,10 +29,10 @@
</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||item.faceAiUrl" ></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 class="subject-List" v-for="(item,index) in previewData" :key="index" >
<image class="list-image" :src="item.faceSourceUrl||item.faceAiUrl" @click="stopPhoto(index)"></image>
<u-checkbox v-model="item.checkType" v-if="checkTypeFun==true" shape="circle" class="list-uCheck" @click.stop.native="()=>{}" @change="stopPhoto(index)"></u-checkbox>
<view class="list-mask" @click.stop.native="()=>{}" @click="projectCheckPhoto(index)" >预览</view>
</view>
</view>
<!--脚部-->
......@@ -306,7 +306,7 @@ export default {
upLoad(){//下单
var data = {
orderMoney:this.sellingPrices,//订单总价
userId:this.openid,
userId:this.openid,
orderProductVo:{},//下单信息
}
var orderProductVo = {
......
......@@ -8,15 +8,20 @@
<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 class="left-picker" @click="merchantShow=true">
<i>{{merchantName}}</i>
<image src="../static/album/myPhoto01.png"></image>
</view>
<u-picker mode="selector" v-model="merchantShow" :default-selector="[orderType]" :range="option" range-key="name" @confirm="industrysTypeConfirm2($event)" @cancel="cancel2"></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>
<view class="subject-List" v-for="(item,index) in previewData" :key="index" >
<image class="list-image" :src="item.faceSourceUrl" @click="stopPhoto(index)"></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>
<!--脚部-->
......@@ -59,6 +64,7 @@ export default {
projectCheck: 0, //当前选择的产品
merchantList:[],//商户列表
merchantName:'全部',//商户名称
merchantShow:false,//
projectMoreType: false, //是否显示更多产品
checkProjectAll: false, //所有产品全选
maskDetail: false,
......@@ -88,10 +94,12 @@ export default {
sellingPrices:0,//售价
favorablePrice:0,//优惠
priceNum:0,//选购了多少照片
options:{},//参数
}
},
onLoad(option) {
this.openid = uni.getStorageSync('openid') //获取openid
this.openid = 'oroHZ5B455jLw_BqDmVpr7W13NLY' //获取openid uni.getStorageSync('openid')
this.options = option
//this.merchantId = 'z0015605022691a5945bbe463141668c'//uni.getStorageSync('merchantId')
this.obtainProvince()//获取省市区
this.inquireMerchant()//查询所有商户
......@@ -115,12 +123,9 @@ export default {
},
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)=>{
this.$request('scenic/albumConfig/getSurveyConfig',data).then((res)=>{
if(res.code=='00'){
this.merchantList = res.data
}else{
......@@ -157,12 +162,16 @@ export default {
this.areaId = this.option[e].areaId
this.inquireMerchant()
},
industrysTypeConfirm2(e) { //单列----分类 点击确定 项目
this.merchantId = this.merchantList[e].merchantId
this.merchantName = this.merchantList[e].merchantName
this.getPhotos()
},
cancel() { //单列 点击取消
this.orderShow = false
},
projectCheckPhoto(index){//点击预览
this.previewNum = index
this.maskPreviewType = true
cancel2() { //单列 点击取消
this.merchantShow = false
},
stopPhoto(index){//刷新显示
if(this.checkProjectAll==true){
......@@ -264,7 +273,7 @@ export default {
.subject-List {
width: 344rpx;
height: 460rpx;
height: 344rpx;
margin-bottom: 24rpx;
border-radius: 16rpx;
overflow: hidden;
......@@ -273,7 +282,7 @@ export default {
.list-image {
display: block;
width: 344rpx;
height: 460rpx;
height: 344rpx;
}
.list-mask {
......@@ -316,7 +325,7 @@ export default {
.album-checkAll {
width: 100%;
height: 98rpx;
padding: 32rpx 24rpx 0 24rpx;
padding: 0rpx 24rpx 0 0rpx;
overflow: hidden;
/deep/ .u-checkbox {
line-height: 34rpx !important;
......
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