合并
This commit is contained in:
parent
81f41f8067
commit
b5da9d5dde
@ -1,13 +1,23 @@
|
||||
<template>
|
||||
<view class="page-total">
|
||||
<view :class="isOverall ? 'tab-list_ip' : 'tab-list' ">
|
||||
<view class="list" v-for="(item,index) in TabBarList" @click="onTabBar(item,index)" :key="index" >
|
||||
<image :src="item.acImg" mode="widthFix" v-show="tabBarShow === index"></image>
|
||||
<image :src="item.img" mode="widthFix" v-show="tabBarShow != index" ></image>
|
||||
|
||||
<!-- background: (index == 2) ? 'red' : '' -->
|
||||
<text :class="(tabBarShow === index) ? 'action' :''">{{item.name}}</text>
|
||||
<view class="list" v-for="(item,index) in TabBarList" @click="onTabBar(item,index)" :key="index">
|
||||
<view v-if="item.index!=2">
|
||||
<image :src="item.acImg" mode="widthFix" v-show="tabBarShow === index"></image>
|
||||
<image :src="item.img" mode="widthFix" v-show="tabBarShow != index"></image>
|
||||
<!-- background: (index == 2) ? 'red' : '' -->
|
||||
<view :class="(tabBarShow === index) ? 'action' :'no'">{{item.name}}</view>
|
||||
</view>
|
||||
<view v-if="item.index==2" style="position: absolute;bottom: 0rpx;text-align: center;">
|
||||
<image :src="item.acImg" mode="widthFix" v-show="tabBarShow === index"
|
||||
style="border-radius: 50%;width: 90rpx;height: 90rpx"></image>
|
||||
<image :src="item.img" mode="widthFix" v-show="tabBarShow != index"
|
||||
style="border-radius: 50%;width: 90rpx;height: 90rpx;"></image>
|
||||
<!-- background: (index == 2) ? 'red' : '' -->
|
||||
<view :class="(tabBarShow === index) ? 'action' :'no'" style="height: 64rpx;line-height: 64rpx;">{{item.name}}</view>
|
||||
</view>
|
||||
</view>
|
||||
<view style="height: 100rpx;position: fixed;bottom: 0;width: 100%;background-color: #ffffff;"></view>
|
||||
<!-- <span class="badge" v-if="number != 0">
|
||||
<u-badge type="warning " max="99" :value="number"></u-badge>
|
||||
</span> -->
|
||||
@ -25,7 +35,7 @@
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
TabBarList:[],
|
||||
TabBarList: [],
|
||||
TabBarList1: [{
|
||||
index: 0,
|
||||
name: '首页',
|
||||
@ -41,8 +51,8 @@
|
||||
{
|
||||
index: 2,
|
||||
name: '发布',
|
||||
img: '/static/center.png',
|
||||
acImg: '/static/center1.png',
|
||||
img: '/static/home_add.png',
|
||||
acImg: '/static/home_add.png',
|
||||
},
|
||||
{
|
||||
index: 3,
|
||||
@ -81,7 +91,7 @@
|
||||
codeheight: 0,
|
||||
isOverall: 0,
|
||||
phoneModel: '',
|
||||
initFb:''
|
||||
initFb: ''
|
||||
|
||||
};
|
||||
},
|
||||
@ -107,7 +117,7 @@
|
||||
// console.log(res.screenHeight) //屏幕高度
|
||||
that.codeheight = Math.round(res.screenHeight);
|
||||
that.phoneModel = res.model;
|
||||
|
||||
|
||||
if (/iPad|iPhone|iPod/.test(res.model)) {
|
||||
that.isOverall = 1;
|
||||
}
|
||||
@ -138,7 +148,7 @@
|
||||
} else {
|
||||
this.TabBarList = this.TabBarList2;
|
||||
}
|
||||
}
|
||||
}
|
||||
}).catch(error => {
|
||||
console.log(error);
|
||||
});
|
||||
@ -150,7 +160,7 @@
|
||||
onTabBar(item, index) {
|
||||
this.$emit('tabBarShow', index);
|
||||
console.log('index', index);
|
||||
if(this.initFb == 1){
|
||||
if (this.initFb == 1) {
|
||||
|
||||
switch (index) {
|
||||
case 0:
|
||||
@ -184,7 +194,7 @@
|
||||
})
|
||||
}
|
||||
|
||||
}else{
|
||||
} else {
|
||||
|
||||
switch (index) {
|
||||
case 0:
|
||||
@ -208,7 +218,7 @@
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
},
|
||||
|
||||
}
|
||||
@ -225,7 +235,6 @@
|
||||
bottom: 0;
|
||||
width: 100%;
|
||||
z-index: 10;
|
||||
// height: 166rpx;
|
||||
}
|
||||
|
||||
.tab-list {
|
||||
@ -233,11 +242,12 @@
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
width: 100%;
|
||||
height: 128rpx;
|
||||
padding-bottom: 27rpx;
|
||||
background-color: #FFFFFF;
|
||||
box-sizing:border-box;
|
||||
box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
|
||||
height: 100rpx;
|
||||
padding-bottom: 0;
|
||||
background: url('/static/bottom_tab.png') no-repeat;
|
||||
background-size: 100%;
|
||||
box-sizing: border-box;
|
||||
|
||||
.list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@ -246,7 +256,7 @@
|
||||
width: 200rpx;
|
||||
height: 130rpx;
|
||||
position: relative;
|
||||
|
||||
z-index: 1000;
|
||||
image {
|
||||
width: 44rpx;
|
||||
height: 44rpx;
|
||||
@ -254,19 +264,23 @@
|
||||
margin-top: 12rpx;
|
||||
}
|
||||
|
||||
text {
|
||||
color: #C1C1C1;
|
||||
font-size: 20rpx;
|
||||
margin-top: 14rpx;
|
||||
}
|
||||
|
||||
.action {
|
||||
color: $base;
|
||||
font-weight: 400;
|
||||
font-size: 20rpx;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
.no {
|
||||
color: #C1C1C1;
|
||||
font-size: 20rpx;
|
||||
}
|
||||
|
||||
.action {
|
||||
color: $base;
|
||||
font-weight: 400;
|
||||
font-size: 20rpx;
|
||||
}
|
||||
|
||||
.tab-list_ip {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
@ -274,9 +288,12 @@
|
||||
width: 100%;
|
||||
height: 160rpx;
|
||||
padding-bottom: 50rpx;
|
||||
background-color: #FFFFFF;
|
||||
box-sizing:border-box;
|
||||
box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
|
||||
background: url('/static/bottom_tab.png') no-repeat;
|
||||
background-size: 100%;
|
||||
box-sizing: border-box;
|
||||
z-index: 100;
|
||||
|
||||
// box-shadow: 0rpx -1rpx 0rpx 0rpx #EEEEEE;
|
||||
.list {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
@ -285,7 +302,7 @@
|
||||
width: 200rpx;
|
||||
height: 130rpx;
|
||||
position: relative;
|
||||
|
||||
z-index: 1000;
|
||||
image {
|
||||
width: 44rpx;
|
||||
height: 44rpx;
|
||||
|
@ -7,7 +7,7 @@
|
||||
<view class="box flex justify-start flex-column align-items" :class="overlay ? 'no-scroll' : ''">
|
||||
<view class="swiper">
|
||||
<u-swiper :list="detail.images" indicator indicatorInactiveColor="#D8D8D8" indicatorActiveColor="#323232" indicatorMode="dot"
|
||||
:indicator-style="{ bottom: '60rpx', zIndex: 999 }" :height="height_sw" circular></u-swiper>
|
||||
:indicator-style="{ bottom: '60rpx', zIndex: 999 }" :height="height_sw" circular @click="swiperImg"></u-swiper>
|
||||
</view>
|
||||
|
||||
<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
|
||||
@ -430,6 +430,12 @@
|
||||
},
|
||||
|
||||
methods: {
|
||||
swiperImg(index){
|
||||
uni.previewImage({
|
||||
current:index,
|
||||
urls: this.detail.images,
|
||||
});
|
||||
},
|
||||
openImg(img) {
|
||||
uni.previewImage({
|
||||
urls: [img],
|
||||
|
@ -8,7 +8,7 @@
|
||||
<view class="swiper">
|
||||
<u-swiper :list="detail.images" indicator indicatorInactiveColor="#D8D8D8"
|
||||
indicatorActiveColor="#323232" indicatorMode="dot" :indicator-style="{ bottom: '60rpx', zIndex: 999 }"
|
||||
height="580rpx" circular></u-swiper>
|
||||
height="580rpx" circular @click="swiperImg"></u-swiper>
|
||||
</view>
|
||||
|
||||
<view class="con-center w-100 flex justify-center flex-column align-items flex-start">
|
||||
@ -172,7 +172,7 @@
|
||||
<image src="@/static/detail/fenxiangsys.png" style="width: 100%;height: 100%;" mode="widthFix">
|
||||
</image>
|
||||
</view>
|
||||
<view class="footer-right" @click="cancelsOpen">
|
||||
<view v-if="detail.status != -3" class="footer-right" @click="cancelsOpen">
|
||||
取消活动
|
||||
</view>
|
||||
</view>
|
||||
@ -382,6 +382,12 @@ export default {
|
||||
},
|
||||
|
||||
methods: {
|
||||
swiperImg(index){
|
||||
uni.previewImage({
|
||||
current:index,
|
||||
urls: this.detail.images,
|
||||
});
|
||||
},
|
||||
async afterRead(item) {
|
||||
const result = await this.uploadFilePromise(item.file.url, 'user');
|
||||
console.log(result);
|
||||
|
@ -12,8 +12,8 @@
|
||||
<span class="first-name">{{detail.title}}</span>
|
||||
</view>
|
||||
<view class="first-image flex align-items white-space" style="margin-top: 25rpx;">
|
||||
<image :src="detailAny.user.avatar" mode="" style="width: 36rpx;height: 36rpx;"></image>
|
||||
<span style="color:#9C9C9C;">{{ detailAny.user.nickname }}</span>
|
||||
<image :src="detailAny.user.avatar" mode="" style="width: 36rpx;height: 36rpx;border-radius: 50%;"></image>
|
||||
<span style="color:#9C9C9C;padding-left: 10rpx;">{{ detailAny.user.nickname }}</span>
|
||||
<span
|
||||
style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
|
||||
|
||||
@ -25,7 +25,7 @@
|
||||
</view>
|
||||
|
||||
<span class="line"></span>
|
||||
<span class="first-image flex align-items" style="margin-top: 20rpx;">
|
||||
<span class="first-image flex align-items" style="padding: 20rpx 0rpx;">
|
||||
<image src="../../static/center/Alarm.png" mode="" class="icon-size"></image>
|
||||
<span>{{formattedTime.formattedTime}}</span>
|
||||
</span>
|
||||
@ -35,7 +35,7 @@
|
||||
@click.stop="toMap(detail.latitude, detail.longitude, detail.address_detail)">
|
||||
<view>
|
||||
<image src="/static/center/address.png" mode="" class="icon-size"></image>
|
||||
<span class="white-space">{{detail.address_detail}}</span>
|
||||
<span class="white-space">{{detail.address}}{{detail.address_detail}}</span>
|
||||
</view>
|
||||
<image src="/static/detail/daohang.png" class="icon-size" style="width: 50rpx; height: 50rpx;">
|
||||
</image>
|
||||
@ -50,11 +50,11 @@
|
||||
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 8rpx;">
|
||||
<span>订单编号</span>
|
||||
<span>{{detailAny.order_no}}</span>
|
||||
<span style="color: #000000;">{{detailAny.order_no}}</span>
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
|
||||
<span>报名人昵称</span>
|
||||
<span>{{ detailAny.user.nickname }}</span>
|
||||
<span style="color: #000000;">{{ detailAny.user.nickname }}</span>
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
|
||||
<span>核销/报名人数</span>
|
||||
@ -368,7 +368,7 @@
|
||||
width: 690rpx;
|
||||
background: #FFFFFF;
|
||||
padding: 30rpx;
|
||||
border-radius: 18rpx;
|
||||
border-radius: 44rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
.head_img {
|
||||
|
@ -220,23 +220,30 @@
|
||||
list: [],
|
||||
show: false,
|
||||
qrcode: '',
|
||||
count: 0
|
||||
count: 0,
|
||||
option:{},
|
||||
isInitialized:false,
|
||||
};
|
||||
},
|
||||
onLoad(option) {
|
||||
this.list = []
|
||||
this.page = 1
|
||||
|
||||
console.log(1);
|
||||
if (option?.status) {
|
||||
this.selected = option.status
|
||||
this.getList(option.status);
|
||||
} else {
|
||||
this.getList('-3,0,2,3,4,5,6,7,9');
|
||||
}
|
||||
this.isInitialized = true; // 标记已初始化
|
||||
},
|
||||
onShow() {
|
||||
this.page = 1;
|
||||
this.list = [];
|
||||
this.getList(this.selected);
|
||||
console.log(2);
|
||||
if (!this.isInitialized) return; // 拦截未初始化时的逻辑
|
||||
setTimeout(()=>{
|
||||
this.list = []
|
||||
this.page = 1
|
||||
this.getList(this.selected);
|
||||
},500)
|
||||
},
|
||||
onPullDownRefresh() {
|
||||
uni.showLoading({
|
||||
|
@ -12,8 +12,8 @@
|
||||
<span class="first-name">{{detail.title}}</span>
|
||||
</view>
|
||||
<view class="first-image flex align-items white-space" style="margin-top: 25rpx;">
|
||||
<image :src="detailAny.user.avatar" mode="" style="width: 36rpx;height: 36rpx;"></image>
|
||||
<span style="color:#9C9C9C;">{{ detailAny.user.nickname }}</span>
|
||||
<image :src="detailAny.user.avatar" mode="" style="width: 36rpx;height: 36rpx;border-radius: 50%;"></image>
|
||||
<span style="color:#9C9C9C;margin-left: 10rpx;">{{ detailAny.user.nickname }}</span>
|
||||
<span
|
||||
style="color:#0CA013;margin-left: 20rpx;">{{ detailAny.join_info.people_number }}人玩过</span>
|
||||
<span style="color:#0CA013;margin-left: 20rpx;"
|
||||
@ -26,7 +26,7 @@
|
||||
</view>
|
||||
|
||||
<span class="line"></span>
|
||||
<span class="first-image flex align-items" style="margin-top: 20rpx;">
|
||||
<span class="first-image flex align-items" style="padding: 20rpx 0rpx;">
|
||||
<image src="../../static/center/Alarm.png" mode="" class="icon-size"></image>
|
||||
<span>{{formattedTime.formattedTime}}</span>
|
||||
</span>
|
||||
@ -36,7 +36,7 @@
|
||||
@click.stop="toMap(detail.latitude, detail.longitude, detail.address_detail)">
|
||||
<view>
|
||||
<image src="/static/center/address.png" mode="" class="icon-size"></image>
|
||||
<span>{{detail.address_detail}}</span>
|
||||
<span>{{detail.address}}{{detail.address_detail}}</span>
|
||||
</view>
|
||||
<view>
|
||||
<image src="/static/detail/daohang.png" class="icon-size" style="width: 50rpx; height: 50rpx;">
|
||||
@ -72,7 +72,7 @@
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 30rpx;">
|
||||
<span>付款时间</span>
|
||||
<span>{{ formattime(detailAny.createtime)}}</span>
|
||||
<span>{{ formattime(detailAny.paytime)}}</span>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
@ -843,7 +843,7 @@
|
||||
width: 690rpx;
|
||||
background: #FFFFFF;
|
||||
padding: 30rpx;
|
||||
border-radius: 18rpx;
|
||||
border-radius: 44rpx;
|
||||
box-sizing: border-box;
|
||||
|
||||
.head_img {
|
||||
|
@ -13,7 +13,7 @@
|
||||
</view>
|
||||
<view class="first-image flex align-items" style="margin-top: 25rpx;">
|
||||
<image :src="detailAny.user.avatar" mode=""
|
||||
style="width: 36rpx;height: 36rpx;border-radius: 80rpx ;"></image>
|
||||
style="width: 36rpx;height: 36rpx;border-radius:50%;"></image>
|
||||
<text style="color:#9C9C9C;">{{ detailAny.user.nickname }}</text>
|
||||
<text style="color:#9C9C9C;margin-left: 20rpx;">{{ detailAny.join_info.people_number
|
||||
}}人玩过</text>
|
||||
@ -35,7 +35,7 @@
|
||||
@click.stop="toMap(detail.latitude, detail.longitude, detail.address_detail)">
|
||||
<view class="flex">
|
||||
<image src="/static/center/address.png" mode="" class="icon-size"></image>
|
||||
<text>{{ detail.address_detail }}</text>
|
||||
<text>{{ detail.address }}{{ detail.address_detail }}</text>
|
||||
</view>
|
||||
<image src="/static/detail/daohang.png" class="icon-size" style="width: 48rpx; height: 48rpx;">
|
||||
</image>
|
||||
@ -90,7 +90,7 @@
|
||||
</view>
|
||||
<view class="flex w-100 space-between hui align-items" style="margin-top: 40rpx;">
|
||||
<text>付款时间</text>
|
||||
<text style="color: #323232;">{{ formattime(detailAny.createtime) }}</text>
|
||||
<text style="color: #323232;">{{ formattime(detailAny.paytime) }}</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
@ -1276,14 +1276,14 @@ export default {
|
||||
}
|
||||
|
||||
// 校验金额
|
||||
if (this.form.price == '') {
|
||||
uni.showToast({
|
||||
title: '请输入金额!',
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
return;
|
||||
}
|
||||
// if (this.form.price == '') {
|
||||
// uni.showToast({
|
||||
// title: '请输入金额!',
|
||||
// icon: 'none',
|
||||
// duration: 2000
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// 校验退款政策
|
||||
if (this.form.refund_id == '') {
|
||||
uni.showToast({
|
||||
@ -1394,18 +1394,16 @@ export default {
|
||||
}
|
||||
|
||||
} else {
|
||||
if (res.data.errcode == '1001100') {
|
||||
this.cardShow = true;
|
||||
}
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
this.$u.toast(res.msg);
|
||||
// uni.showToast({
|
||||
// title: res.msg,
|
||||
// icon: 'none',
|
||||
// duration: 2000
|
||||
// });
|
||||
}
|
||||
}).catch(error => {
|
||||
uni.showToast({
|
||||
title: '请求失败,请稍后再试',
|
||||
title: error.msg,
|
||||
icon: 'none',
|
||||
duration: 2000
|
||||
});
|
||||
@ -1436,7 +1434,7 @@ export default {
|
||||
overflow: visible;
|
||||
/* 允许内容溢出 */
|
||||
margin-top: 200rpx;
|
||||
margin-bottom: 360rpx;
|
||||
margin-bottom: 420rpx;
|
||||
}
|
||||
|
||||
.title_logo {
|
||||
@ -1639,7 +1637,7 @@ export default {
|
||||
background: #FFFFFF;
|
||||
// box-shadow: 0rpx -6rpx 12rpx 0rpx rgba(111, 190, 255, 0.1);
|
||||
border-radius: 0rpx 0rpx 0rpx 0rpx;
|
||||
bottom: 128rpx;
|
||||
bottom: 162rpx;
|
||||
position: fixed;
|
||||
z-index: 10;
|
||||
|
||||
|
@ -1050,6 +1050,7 @@ export default {
|
||||
.bbb {
|
||||
background: #ffffff;
|
||||
border-radius: 36rpx;
|
||||
margin-bottom: 30rpx;
|
||||
}
|
||||
|
||||
.right {
|
||||
@ -1413,7 +1414,7 @@ export default {
|
||||
}
|
||||
|
||||
::v-deep .u-search__content__input {
|
||||
background-color: rgba($color: #FFFFFF, $alpha: 0.6) !important;
|
||||
background-color: rgba($color: #FFFFFF, $alpha: 0) !important;
|
||||
}
|
||||
|
||||
::v-deep .u-icon__img {
|
||||
|
@ -665,15 +665,15 @@
|
||||
// _this.miniLogin();
|
||||
// return false;
|
||||
// }
|
||||
_this.miniLogin();
|
||||
|
||||
var openidInfo = uni.getStorageSync('openidInfo');
|
||||
//console.log(333)
|
||||
//if (!openidInfo) {
|
||||
_this.miniLogin();
|
||||
uni.showLoading({
|
||||
title: '获取信息中...'
|
||||
});
|
||||
setTimeout(() => {
|
||||
var openidInfo = uni.getStorageSync('openidInfo');
|
||||
//console.log(333)
|
||||
uni.hideLoading();
|
||||
_this.decodeMobile({
|
||||
encryptedData: e.detail.encryptedData,
|
||||
@ -681,12 +681,7 @@
|
||||
sessionKey: openidInfo.session_key,
|
||||
}, openidInfo);
|
||||
}, 2000)
|
||||
// uni.showToast({
|
||||
// title: '未获取到信息,请重新点击授权',
|
||||
// icon: 'none',
|
||||
// duration: 2000
|
||||
// })
|
||||
// this.$api.toast('未获取到信息,请重新点击授权');
|
||||
|
||||
return false;
|
||||
//}
|
||||
|
||||
|
BIN
static/bottom_tab.png
Normal file
BIN
static/bottom_tab.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.6 KiB |
BIN
static/home_add.png
Normal file
BIN
static/home_add.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.6 KiB |
Loading…
x
Reference in New Issue
Block a user