Skip to content

U
uni-pdtravel
Commit b7128e7e authored by qipeng's avatar qipeng
Browse files
Options

插件修改

parent 977d0eef
Show whitespace changes
Inline Side-by-side
Showing with 142 additions and 66 deletions
pages/album/myPhotoAlbum/myPhotoAlbum.vue
View file @ b7128e7e
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<i>{{cityName}}</i> <i>{{cityName}}</i>
<image src="../static/album/myPhoto01.png"></image> <image src="../static/album/myPhoto01.png"></image>
</view> </view>
<u-picker mode="selector" v-model="orderShow" :default-selector="[orderType]" :range="option" range-key="areaName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker> <u-picker mode="selector" :show="orderShow" :default-selector="[orderType]" :columns="option" keyName="areaName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker>
<template v-for="(item,index) in merchantList"> <template v-for="(item,index) in merchantList">
<view :key="index" v-if="index<2" class="left-project" :class="[projectCheck==0?'left-projectDe':'']" @click="projectClick(index,item.id)"> <view :key="index" v-if="index<2" class="left-project" :class="[projectCheck==0?'left-projectDe':'']" @click="projectClick(index,item.id)">
{{item.name}} {{item.name}}
...@@ -26,14 +26,21 @@ ...@@ -26,14 +26,21 @@
</view> </view>
<!--全选按钮--> <!--全选按钮-->
<view class="album-checkAll"> <view class="album-checkAll">
<u-checkbox v-model="checkProjectAll" @change="checkProjectAllFun()">全选</u-checkbox> <!-- <u-checkbox v-model="checkProjectAll" @change="checkProjectAllFun()">全选</u-checkbox> -->
<view class="checkAll-all" @click="checkProjectAllFun()">
<checkbox value="val" :checked="checkProjectAll" style="transform:scale(0.7)" :class="checkProjectAll==true?'checkAll-allAct':''" />全选
</view>
<view class="checkAll-tips">未下载影像保留15天</view> <view class="checkAll-tips">未下载影像保留15天</view>
</view> </view>
<!--主体循环--> <!--主体循环-->
<view class="album-subject"> <view class="album-subject">
<view class="subject-List" v-for="(item,index) in previewData" :key="index" > <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> <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> <!-- <u-checkbox v-model="item.checkType" v-if="checkTypeFun==true" shape="circle" class="list-uCheck" @click.stop.native="()=>{}" @change="stopPhoto(index)"></u-checkbox> -->
<checkbox-group @click.stop.native="()=>{}" @change="stopPhoto(index)">
<checkbox value="val" :checked="item.checkType" style="transform:scale(0.7)" class="list-uCheck" :class="item.checkType==true?'list-uCheckAct':''" />
</checkbox-group>
<view class="list-mask" @click.stop.native="()=>{}" @click="projectCheckPhoto(index)" >预览</view> <view class="list-mask" @click.stop.native="()=>{}" @click="projectCheckPhoto(index)" >预览</view>
</view> </view>
<view class="subject-noMore" v-if="previewDataType==true">暂无更多数据</view> <view class="subject-noMore" v-if="previewDataType==true">暂无更多数据</view>
...@@ -66,23 +73,12 @@ ...@@ -66,23 +73,12 @@
<!--预览--> <!--预览-->
<view class="album-maskPreview" v-if="maskPreviewType==true" @click="maskPreviewType=false"> <view class="album-maskPreview" v-if="maskPreviewType==true" @click="maskPreviewType=false">
<view class="maskPreview-Num">{{previewNum+1}}/{{previewData.length}}</view> <view class="maskPreview-Num">{{previewNum+1}}/{{previewData.length}}</view>
<!-- <view class="maskPreview-img" @touchstart="start" @touchend="end" @touchmove="move"> <u-swiper1 class="maskPreview-swiper" height="794" :list="previewData" :effect3d="true" :autoplay="false" :mode="none" :current ="previewNum" @change="projectNumFun" ></u-swiper1>
<template v-if="previewData.length==1">
<image class="img-center" :src="previewData[previewNum].faceSourceUrl"></image>
</template>
<template v-else>
<image class="img-left" :style="{left:touchLeft0 +'rpx'}" v-if="previewNum==0" :src="previewData[previewData.length-1].faceSourceUrl||previewData[previewData.length-1].faceAiUrl"></image>
<image class="img-left" :style="{left:touchLeft0 +'rpx'}" v-else :src="previewData[previewNum-1].faceSourceUrl||previewData[previewNum-1].faceAiUrl"></image>
<image class="img-center" :style="{right:touchRight +'rpx',left:touchLeft +'rpx'}" :src="previewData[previewNum].faceSourceUrl||previewData[previewNum].faceAiUrl"></image>
<image class="img-right" :style="{right:touchRight2 +'rpx'}" v-if="previewNum==previewData.length-1" :src="previewData[0].faceSourceUrl||previewData[0].faceAiUrl"></image>
<image class="img-right" :style="{right:touchRight2 +'rpx'}" v-else :src="previewData[previewNum+1].faceSourceUrl||previewData[previewNum+1].faceAiUrl"></image>
</template>
</view> -->
<u-swiper class="maskPreview-swiper" height="794" :list="previewData" :effect3d="true" :autoplay="false" :mode="none" :current ="previewNum" @change="projectNumFun" ></u-swiper>
<view class="maskPreview-check" v-if="checkTypeFun==true"> <view class="maskPreview-check" v-if="checkTypeFun==true">
<u-checkbox v-model="previewData[previewNum].checkType" @click.stop.native="()=>{}" @change="stopPhoto(previewNum)" shape="circle" class="maskPreview-Check"></u-checkbox> <!-- <u-checkbox v-model="previewData[previewNum].checkType" shape="circle" class="maskPreview-Check"></u-checkbox> -->
<checkbox-group @click.stop.native="()=>{}" @change="stopPhoto(previewNum)">
<checkbox value="val" :checked="previewData[previewNum].checkType" style="transform:scale(0.7)" class="maskPreview-CheckBox" :class="previewData[previewNum].checkType==true?'maskPreview-CheckBoxAct':''" />
</checkbox-group>
</view> </view>
</view> </view>
...@@ -222,7 +218,9 @@ export default { ...@@ -222,7 +218,9 @@ export default {
inChina:0 inChina:0
}).then((res)=>{ }).then((res)=>{
if(res.code=='00'){ if(res.code=='00'){
this.option = res.data var opTionList = []
opTionList.push(res.data)
this.option = opTionList
}else{ }else{
uni.showToast({ uni.showToast({
title: res.message, title: res.message,
...@@ -291,9 +289,10 @@ export default { ...@@ -291,9 +289,10 @@ export default {
}) })
}, },
industrysTypeConfirm(e) { //单列----分类 点击确定 城市 industrysTypeConfirm(e) { //单列----分类 点击确定 城市
this.cityName = this.option[e].areaName this.cityName = e.value[0].areaName
this.areaId = this.option[e].areaId this.areaId = e.value[0].areaId
this.inquireMerchant() this.inquireMerchant()
this.cancel()
}, },
cancel() { //单列 点击取消 cancel() { //单列 点击取消
this.orderShow = false this.orderShow = false
...@@ -308,6 +307,7 @@ export default { ...@@ -308,6 +307,7 @@ export default {
this.maskPreviewType = true this.maskPreviewType = true
}, },
projectNumFun(e){//当前滑动到第几张 projectNumFun(e){//当前滑动到第几张
console.log(e)
this.previewNum = e this.previewNum = e
}, },
stopPhoto(index){//刷新显示 stopPhoto(index){//刷新显示
...@@ -510,6 +510,7 @@ export default { ...@@ -510,6 +510,7 @@ export default {
display: flex; display: flex;
flex: 1; flex: 1;
box-shadow: inset -16px 0px 8px 0px rgba(255, 255, 255, 0.2); box-shadow: inset -16px 0px 8px 0px rgba(255, 255, 255, 0.2);
position: relative;
overflow-x: auto; overflow-x: auto;
.left-name { .left-name {
...@@ -535,7 +536,11 @@ export default { ...@@ -535,7 +536,11 @@ export default {
margin-left: 8rpx; margin-left: 8rpx;
} }
} }
/deep/ .u-popup{
position: absolute;
left: 0;
top: 0;
}
.left-project { .left-project {
font-size: 32rpx; font-size: 32rpx;
color: #333333; color: #333333;
...@@ -596,21 +601,25 @@ export default { ...@@ -596,21 +601,25 @@ export default {
display: flex; display: flex;
width: 100%; width: 100%;
height: 98rpx; height: 98rpx;
padding: 32rpx 24rpx 0 24rpx; padding: 32rpx 24rpx 20rpx 24rpx;
overflow: hidden; overflow: hidden;
position: fixed; position: fixed;
top: 76rpx; top: 76rpx;
left: 0; left: 0;
z-index: 20; z-index: 20;
/deep/ .u-checkbox { .checkAll-all{
line-height: 34rpx !important; font-size: 24rpx;
line-height: 46rpx;
}
.checkAll-allAct{
/deep/ .wx-checkbox-input,
/deep/ .uni-checkbox-input{
background-color: #3688FF !important;
border-color: #3688FF !important;
color: #ffffff !important;
} }
/deep/ .u-checkbox__label {
font-size: 24rpx !important;
} }
.checkAll-tips { .checkAll-tips {
font-size: 24rpx; font-size: 24rpx;
color: #999999; color: #999999;
...@@ -669,7 +678,18 @@ export default { ...@@ -669,7 +678,18 @@ export default {
position: absolute; position: absolute;
right: 0; right: 0;
top: 24rpx; top: 24rpx;
/deep/ .wx-checkbox-input,
/deep/ .uni-checkbox-input{
border-radius: 100rpx;
}
}
.list-uCheckAct{
/deep/ .wx-checkbox-input,
/deep/ .uni-checkbox-input{
background-color: #3688FF !important;
border-color: #3688FF !important;
color: #ffffff !important;
}
} }
/deep/ .u-checkbox__icon-wrap{ /deep/ .u-checkbox__icon-wrap{
color: #fff !important; color: #fff !important;
...@@ -965,6 +985,12 @@ export default { ...@@ -965,6 +985,12 @@ export default {
top: 152rpx; top: 152rpx;
left: 0; left: 0;
} }
/deep/ .u-swiper{
width: 100%;
position: fixed;
top: 152rpx;
left: 0;
}
/deep/ swiper{ /deep/ swiper{
background-color: rgba(0, 0, 0, 0) !important; background-color: rgba(0, 0, 0, 0) !important;
} }
...@@ -976,13 +1002,27 @@ export default { ...@@ -976,13 +1002,27 @@ export default {
top: 998rpx; top: 998rpx;
left: 0; left: 0;
right: 0; right: 0;
.maskPreview-CheckBox{
/deep/ .u-checkbox__icon-wrap { /deep/ .wx-checkbox-input,
width: 50rpx !important; /deep/ .uni-checkbox-input{
height: 50rpx !important; border-radius: 100rpx;
color: #fff !important; }
border: solid 2px #fff;
} }
.maskPreview-CheckBoxAct{
/deep/ .wx-checkbox-input,
/deep/ .uni-checkbox-input{
background-color: #3688FF !important;
border-color: #3688FF !important;
color: #ffffff !important;
}
}
// /deep/ .u-checkbox__icon-wrap {
// width: 50rpx !important;
// height: 50rpx !important;
// color: #fff !important;
// border: solid 2px #fff;
// }
} }
/deep/ .u-swiper-image::after { /deep/ .u-swiper-image::after {
content: ""; content: "";
......
pages/album/purchasedPhotoAlbum/purchasedPhotoAlbum.vue
View file @ b7128e7e
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
<i>{{cityName}}</i> <i>{{cityName}}</i>
<image src="../static/album/myPhoto01.png"></image> <image src="../static/album/myPhoto01.png"></image>
</view> </view>
<u-picker mode="selector" v-model="orderShow" :default-selector="[orderType]" :range="option" range-key="areaName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker> <u-picker mode="selector" :show="orderShow" :default-selector="[orderType]" :columns="option" keyName="areaName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker>
<view class="left-picker" @click="merchantShow=true"> <view class="left-picker" @click="merchantShow=true">
<i>{{merchantName}}</i> <i>{{merchantName}}</i>
<image src="../static/album/myPhoto01.png"></image> <image src="../static/album/myPhoto01.png"></image>
</view> </view>
<u-picker mode="selector" v-model="merchantShow" :default-selector="[orderType]" :range="option" range-key="name" @confirm="industrysTypeConfirm2($event)" @cancel="cancel2"></u-picker> <u-picker mode="selector" :show="merchantShow" :default-selector="[orderType]" :columns="merchantList" keyName="merchantName" @confirm="industrysTypeConfirm2($event)" @cancel="cancel2"></u-picker>
</view> </view>
</view> </view>
...@@ -26,7 +26,10 @@ ...@@ -26,7 +26,10 @@
<view class="album-subject"> <view class="album-subject">
<view class="subject-List" v-for="(item2,index2) in item.photoOrderImgResVoList" :key="index2"> <view class="subject-List" v-for="(item2,index2) in item.photoOrderImgResVoList" :key="index2">
<image class="list-image" :src="item2.imgUrl" @click="stopPhoto(index,index2)"></image> <image class="list-image" :src="item2.imgUrl" @click="stopPhoto(index,index2)"></image>
<u-checkbox v-model="item2.checkType" v-if="checkTypeFun==true" @click.stop.native="()=>{}" @change="stopPhoto(index,index2)" shape="circle" class="list-uCheck"></u-checkbox> <!-- <u-checkbox v-model="item2.checkType" v-if="checkTypeFun==true" @click.stop.native="()=>{}" @change="stopPhoto(index,index2)" shape="circle" class="list-uCheck"></u-checkbox> -->
<checkbox-group @click.stop.native="()=>{}" @change="stopPhoto(index,index2)">
<checkbox value="val" :checked="item2.checkType" style="transform:scale(0.7)" class="list-uCheck" :class="item2.checkType==true?'list-uCheckAct':''" />
</checkbox-group>
</view> </view>
</view> </view>
</view> </view>
...@@ -35,8 +38,9 @@ ...@@ -35,8 +38,9 @@
<view class="album-bottom"> <view class="album-bottom">
<view class="bottom-left" v-if="maskDetail==false"> <view class="bottom-left" v-if="maskDetail==false">
<!--全选按钮--> <!--全选按钮-->
<view class="album-checkAll"> <view class="album-checkAll" @click="checkProjectAllFun()">
<u-checkbox v-model="checkProjectAll" @change="checkProjectAllFun()">全选</u-checkbox> <!-- <u-checkbox v-model="checkProjectAll" @change="checkProjectAllFun()">全选</u-checkbox> -->
<checkbox value="val" :checked="checkProjectAll" style="transform:scale(0.7)" :class="checkProjectAll==true?'checkAll-allAct':''" />
<view class="checkAll-tips">未下载影像保留15天</view> <view class="checkAll-tips">未下载影像保留15天</view>
</view> </view>
</view> </view>
...@@ -47,16 +51,16 @@ ...@@ -47,16 +51,16 @@
</template> </template>
<script> <script>
import uPicker from '@/uview-ui/components/u-picker/u-picker.vue' // 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 uCheckboxGroup from '@/uview-ui/components/u-checkbox-group/u-checkbox-group.vue'
import uCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox' // import uCheckbox from '@/uview-ui/components/u-checkbox/u-checkbox'
import uToast from '@/uview-ui/components/u-toast/u-toast.vue' // import uToast from '@/uview-ui/components/u-toast/u-toast.vue'
export default { export default {
components: { components: {
uPicker, // uPicker,
uCheckboxGroup, // uCheckboxGroup,
uCheckbox, // uCheckbox,
uToast // uToast
}, },
data() { data() {
return { return {
...@@ -122,7 +126,9 @@ export default { ...@@ -122,7 +126,9 @@ export default {
inChina:0 inChina:0
}).then((res)=>{ }).then((res)=>{
if(res.code=='00'){ if(res.code=='00'){
this.option = res.data var opTionList = []
opTionList.push(res.data)
this.option = opTionList
}else{ }else{
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
...@@ -137,7 +143,9 @@ export default { ...@@ -137,7 +143,9 @@ export default {
} }
this.$request('scenic/albumConfig/getSurveyConfig',data).then((res)=>{ this.$request('scenic/albumConfig/getSurveyConfig',data).then((res)=>{
if(res.code=='00'){ if(res.code=='00'){
this.merchantList = res.data var merchantListList = []
merchantListList.push(res.data)
this.merchantList = merchantListList
}else{ }else{
this.$refs.uToast.show({ this.$refs.uToast.show({
title: res.message, title: res.message,
...@@ -168,14 +176,16 @@ export default { ...@@ -168,14 +176,16 @@ export default {
}) })
}, },
industrysTypeConfirm(e) { //单列----分类 点击确定 城市 industrysTypeConfirm(e) { //单列----分类 点击确定 城市
this.cityName = this.option[e].areaName this.cityName = e.value[0].areaName
this.areaId = this.option[e].areaId this.areaId = e.value[0].areaId
this.inquireMerchant() this.inquireMerchant()
this.cancel()
}, },
industrysTypeConfirm2(e) { //单列----分类 点击确定 项目 industrysTypeConfirm2(e) { //单列----分类 点击确定 项目
this.merchantId = this.merchantList[e].merchantId this.merchantId = e.value[0].merchantId
this.merchantName = this.merchantList[e].merchantName this.merchantName = e.value[0].merchantName
this.getPhotos() this.getPhotos()
this.cancel2()
}, },
cancel() { //单列 点击取消 cancel() { //单列 点击取消
this.orderShow = false this.orderShow = false
...@@ -352,6 +362,11 @@ export default { ...@@ -352,6 +362,11 @@ export default {
margin-left: 8rpx; margin-left: 8rpx;
} }
} }
/deep/ .u-popup{
position: absolute;
left: 0;
top: 0;
}
} }
} }
...@@ -417,6 +432,18 @@ export default { ...@@ -417,6 +432,18 @@ export default {
position: absolute; position: absolute;
right: 0; right: 0;
top: 24rpx; top: 24rpx;
/deep/ .wx-checkbox-input,
/deep/ .uni-checkbox-input{
border-radius: 100rpx;
}
}
.list-uCheckAct{
/deep/ .wx-checkbox-input,
/deep/ .uni-checkbox-input{
background-color: #3688FF !important;
border-color: #3688FF !important;
color: #ffffff !important;
}
} }
} }
} }
...@@ -450,6 +477,14 @@ export default { ...@@ -450,6 +477,14 @@ export default {
/deep/ .u-checkbox__label { /deep/ .u-checkbox__label {
font-size: 24rpx !important; font-size: 24rpx !important;
} }
.checkAll-allAct{
/deep/ .wx-checkbox-input,
/deep/ .uni-checkbox-input{
background-color: #3688FF !important;
border-color: #3688FF !important;
color: #ffffff !important;
}
}
.checkAll-tips { .checkAll-tips {
font-size: 24rpx; font-size: 24rpx;
......
pages/my/order/orderList/orderList.vue
View file @ b7128e7e
...@@ -38,16 +38,16 @@ ...@@ -38,16 +38,16 @@
<view class="product-searchBt"> <view class="product-searchBt">
<view class="searchBt-left" @click="orderShow=true"> <view class="searchBt-left" @click="orderShow=true">
<text>{{orderName}}</text> <text>{{orderName}}</text>
<u-icon v-if="orderShow==false" name="arrow-down" color="#333333" size="28"></u-icon> <u-icon v-if="orderShow==false" name="arrow-down" color="#333333" size="20"></u-icon>
<u-icon v-else name="arrow-up" color="#333333" size="28"></u-icon> <u-icon v-else name="arrow-up" color="#333333" size="20"></u-icon>
<u-picker mode="selector" v-model="orderShow" :default-selector="[orderType]" :range="option" range-key="cateName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker> <u-picker mode="selector" :show="orderShow" :default-selector="[orderType]" :columns="option" keyName="cateName" @confirm="industrysTypeConfirm($event)" @cancel="cancel"></u-picker>
</view> </view>
<text @click="showQueryPhone()">手机查询</text> <text @click="showQueryPhone()">手机查询</text>
</view> </view>
</view> </view>
<!--手机查询遮罩--> <!--手机查询遮罩-->
<u-popup mode="bottom" v-model="phoneQuery"> <u-popup mode="bottom" :show="phoneQuery">
<view class="content"> <view class="content">
<view class="content-title"> <view class="content-title">
订单查询 订单查询
...@@ -415,7 +415,7 @@ export default { ...@@ -415,7 +415,7 @@ export default {
orderType:0,//筛选 //1景区，2酒店，3餐饮，4特产，5运营车，10组合订单 orderType:0,//筛选 //1景区，2酒店，3餐饮，4特产，5运营车，10组合订单
orderName:'全部',//筛选 //1景区，2酒店，3餐饮，4特产，5运营车，10组合订单 orderName:'全部',//筛选 //1景区，2酒店，3餐饮，4特产，5运营车，10组合订单
orderShow:false, orderShow:false,
option: [ option: [[
{ cateName: '全部', id: 0 }, { cateName: '全部', id: 0 },
{ cateName: '景区', id: 1 }, { cateName: '景区', id: 1 },
{ cateName: '酒店', id: 2 }, { cateName: '酒店', id: 2 },
...@@ -423,7 +423,7 @@ export default { ...@@ -423,7 +423,7 @@ export default {
{ cateName: '特产', id: 4 }, { cateName: '特产', id: 4 },
// { cateName: '运营车', id: 5 }, // { cateName: '运营车', id: 5 },
// { cateName: '组合订单', id: 10 }, // { cateName: '组合订单', id: 10 },
], ]],
isTrue:true,//截留 防止重复加载 isTrue:true,//截留 防止重复加载
pageIndex:1,//当前页 pageIndex:1,//当前页
pageTotal:0,//总条数 pageTotal:0,//总条数
...@@ -459,8 +459,9 @@ export default { ...@@ -459,8 +459,9 @@ export default {
this.getData(1) this.getData(1)
}, },
industrysTypeConfirm(e) {//单列----分类 点击确定 industrysTypeConfirm(e) {//单列----分类 点击确定
this.orderType = this.option[e].id console.log('confirm', e)
this.orderName = this.option[e].cateName this.orderType = e.value[0].id
this.orderName = e.value[0].cateName
this.pageIndex = 1 this.pageIndex = 1
this.pageTotal = 0 this.pageTotal = 0
this.isTrue = true this.isTrue = true
...@@ -805,7 +806,7 @@ page{ ...@@ -805,7 +806,7 @@ page{
position: relative; position: relative;
font-size: 32rpx; font-size: 32rpx;
font-weight: bold; font-weight: bold;
u-icon{ /deep/ .u-icon{
color: #c8c9cc; color: #c8c9cc;
position: absolute; position: absolute;
right: 16rpx; right: 16rpx;
...@@ -837,7 +838,7 @@ page{ ...@@ -837,7 +838,7 @@ page{
} }
.confrim-btn{ .confrim-btn{
margin: 64rpx 24rpx 40rpx 24rpx; margin: 64rpx 24rpx 40rpx 24rpx;
/deep/ .u-size-default{ /deep/ .u-reset-button{
height: 80rpx; height: 80rpx;
line-height: 80rpx; line-height: 80rpx;
border-radius: 15rpx; border-radius: 15rpx;
......
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