项目日志: 12.19 消息列表删除信息

components/my-nav/my-nav.vue

@@ -7,8 +7,9 @@
 			</view>
 			<!-- 胶囊位置信息 -->
 			<view class="nav-main flex align-center justify-center" :style="{height: navBarHeight+'px'}">
-				<view class="nav-main-back" @click="back" v-if="backIcon">
-					<uni-icons type="back" size="26" color="#fff"></uni-icons>
+				<view class="nav-main-back" @click="search" v-if="backIcon">
+					<!-- <uni-icons type="search" size="26" color="#000"></uni-icons> -->
+					<image style="width: 32rpx;height: 32rpx;" src="/static/icon/search02.png" mode=""></image>
 				</view>
 				<text class="nav-main-title">{{title}}</text>
 			</view>
@@ -73,9 +74,9 @@
 				}
 			},
 			//返回
-			back() {
-				uni.navigateBack({
-					delta: 1
+			search() {
+				uni.navigateTo({
+					url:'/pages/index/active-list/index'
 				})
 			},
 		}

manifest.json

@@ -1,6 +1,6 @@
 {
     "name" : "hotel_uni",
-    "appid" : "__UNI__9140D70",
+    "appid" : "__UNI__807A871",
     "description" : "",
     "versionName" : "1.0.0",
     "versionCode" : "100",

pages/index/active-detail/index.vue

@@ -15,8 +15,9 @@
 			<view class="vote-detail">
 				<!-- 改版 -->
 				<view class="vote-detail-top-main1">
+					<view style="display: inline-block; width: 230rpx;" v-if="activeDeatil.activity_status == 1">距活动开始</view>
+					<view style="display: inline-block; width: 230rpx;" v-else>距活动结束</view>
 					<view>
-						距活动结束
 						<text v-if="countdownh>0">{{countdownd}}</text>
 						<text>{{countdownh}}</text>
 						<text>{{countdownm}}</text>
@@ -334,15 +335,28 @@
 						this.title = res.data.title
 						this.activeDeatil = res.data
 						
-						// this.endTime = res.data.end_time
-						this.endTime = (()=>{
-							const endT = res.data?.end_time ? res.data.end_time : "";
-							return endT.replace(/-/g, "/");
-						})()
+						if(res.data.activity_status == 1){
+							this.start_time = (()=>{
+								const endT = res.data?.start_time ? res.data.start_time : "";
+								return endT.replace(/-/g, "/");
+							})()
+							
+							this.timer = setInterval(() => {
+								this.showtime(this.start_time)
+							}, 100);
+						}else{
+							this.endTime = (()=>{
+								const endT = res.data?.end_time ? res.data.end_time : "";
+								return endT.replace(/-/g, "/");
+							})()
+							
+							this.timer = setInterval(() => {
+								this.showtime(this.endTime)
+							}, 100);
+						}
+						
+						
 						
-						this.timer = setInterval(() => {
-							this.showtime(this.endTime)
-						}, 100);
 					}
 				})
 			},

pages/index/index.vue

@@ -1,13 +1,12 @@
 <template>
 	<view class="home">
-		<MyNav title="洲际酒店集团中国西区" bgColor="" :backIcon="false"></MyNav>
+		<MyNav title="洲际酒店集团中国西区" bgColor="" :backIcon="true"></MyNav>
 		<!-- swiper -->
 		<view class="home-swiper">
 			<uni-swiper-dot :info="infoList" :current="current1" :mode="mode" :dots-styles="dotsStyles">
 				<swiper class="swiper-box" @change="change1" circular>
 					<swiper-item v-for="(item ,index) in infoList" :key="index">
-						<view class="swiper-item" v-if="item.resource_type == 1"
-							@click="$utils.jump({
+						<view class="swiper-item" v-if="item.resource_type == 1" @click="$utils.jump({
 								jump_type: item.jump_type,
 								jump_config: item.jump_config
 							})">
@@ -25,8 +24,7 @@
 
 		<!-- 金刚图 -->
 		<view class="home-nav">
-			<view class="home-nav-item" v-for="(item,index) in navList" :key="index"
-				@click="$utils.jump({
+			<view class="home-nav-item" v-for="(item,index) in navList" :key="index" @click="$utils.jump({
 					jump_type: item.jump_type,
 					jump_config: item.jump_config
 				})">
@@ -52,7 +50,7 @@
 
 		<!-- 活动图片 -->
 		<view class="home-special-img">
-			<template v-for="(item,index) in specialList" >
+			<template v-for="(item,index) in specialList">
 				<view class="ListItem" v-if="item.show_status" :key="index" @click="$utils.jump({
 					jump_type: 3,
 					jump_config: '/pages/index/active-detail/index',
@@ -63,19 +61,19 @@
 					<view class="kudosicon" @click.stop="kudosActive(item.id,index)">
 						<image style="width:24rpx;height: 24rpx;" src="/static/icon/Kudos.png" v-if="item.is_like==0">
 						</image>
-						<image style="width:24rpx;height: 24rpx;" src="/static/icon/Kudos(1).png" v-if="item.is_like==1">
+						<image style="width:24rpx;height: 24rpx;" src="/static/icon/Kudos(1).png"
+							v-if="item.is_like==1">
 						</image>
 					</view>
 					<text style="color: #333;font-weight: bold;font-size: 28rpx;">{{item.title}}</text>
-				</view> 
-			</template>	
+				</view>
+			</template>
 		</view>
 
 		<!-- 广告图 -->
 		<view class="home-banner" v-if="!isShowAdver">
 			<view class="home-banner-img" v-if="in_page==1 && type == 1 ">
-				<image style="width: 100%; height: 576rpx; border-radius: 12rpx;" :src="advData.img" mode="" 
-				@click="$utils.jump({
+				<image style="width: 100%; height: 576rpx; border-radius: 12rpx;" :src="advData.img" mode="" @click="$utils.jump({
 					jump_type: advData.jump_type,
 					jump_config: advData.jump_config
 				})"></image>
@@ -105,16 +103,14 @@
 		</movable-area>
 
 		<!-- 广告的附图 -->
-		<view class="home-attach" 
-			@click="$utils.jump({
+		<view class="home-attach" @click="$utils.jump({
 				jump_type: advInsetImg.jump_type,
 				jump_config: advInsetImg.jump_config
-			})"
-		>
+			})">
 			<image style="width: 690rpx;height: 156rpx;border-radius: 79rpx;" :src="advInsetImg.img" mode=""></image>
 		</view>
 		<!-- 酒店推荐 -->
-		<view class="home-hotel home-special-area" v-if="false">
+		<view class="home-hotel home-special-area">
 			<view class="home-special-area-left">
 				<text>西区优品</text>
 				<view class="text-shadow"></view>
@@ -124,12 +120,11 @@
 		</view>
 
 		<!-- 酒店推荐图片 -->
-		<view class="home-hotel-img" v-if="false">
-			<view class="home-hotel-img-content" v-if="isDevelopment">
-				<template v-for="(item,index) in goodsList" >
+		<view class="home-hotel-img">
+			<view class="home-hotel-img-content">
+				<template v-for="(item,index) in goodsList">
 					<view v-if="item.status==1" class="home-hotel-img-content-item" :key="index"
-						:style="{marginTop:item.marginTop || 0 }" 
-						@click="goToProduct(item.id)">
+						:style="{marginTop:item.marginTop || 0 }" @click="goToProduct(item.id)">
 						<image class="home-hotel-img-content-item-img"
 							:class="item.short?'home-hotel-img-content-item-img': 'home-hotel-img-content-item-img-long' "
 							:src="item.cover_img" mode=""></image>
@@ -137,12 +132,10 @@
 							<text class="text-top">{{item.name}}</text>
 						</view>
 					</view>
-				</template>	
+				</template>
 			</view>
-			<view v-if="isDevelopment" class="home-hotel-img-more" @click="$utils.jump({
-				jump_type: 4,
-				jump_config: '/pages/goods/goods'
-			})">
+
+			<view class="home-hotel-img-more" @click='geMore'>
 				<text>查看更多商品</text>
 			</view>
 		</view>
@@ -160,12 +153,10 @@
 			<uni-swiper-dot :info="info" mode="default" :current="current2" :dots-styles="dotsStylesBand">
 				<swiper class="swiper-box" circular @change="change2">
 					<swiper-item v-for="(items ,index) in info" :key="index">
-						<view v-for="(item ,j) in items" :key="j" class="swiper-item"
-							@click="$utils.jump({
+						<view v-for="(item ,j) in items" :key="j" class="swiper-item" @click="$utils.jump({
 								jump_type: item.jump_type,
 								jump_config: item.jump_config
-							})"
-						>
+							})">
 							<image style="width:144rpx;height:142rpx;" :src="item.img" mode="aspectFill"></image>
 						</view>
 					</swiper-item>
@@ -218,11 +209,11 @@
 				jup_type: '',
 				jump_config: '',
 				//广告弹框图
-				popupData:{},
+				popupData: {},
 				//弹窗的类型 1只弹一次首次  2就是每次都弹啊
-				times_type:'',
+				times_type: '',
 				//弹窗的显示0不显示 1显示
-				popupImgStatus:'',
+				popupImgStatus: '',
 				//视频封面图
 				isOpenVideo: false,
 				videoCoverImg: '',
@@ -236,26 +227,25 @@
 				advData: {},
 				//广告附图展示图片
 				advertisInsetImg: '',
-				advInsetImg:{},
+				advInsetImg: {},
 				//广告图展示图片:
 				advertisImg: '',
 				//广告图展示视频
-				goodsList: [
-					{
-						cover_img:'https://t9.9026.com/imgs/11.png',
-						name:'2023新春福兔系列礼盒 倾心甄选 待你拥有'
+				goodsList: [{
+						cover_img: 'https://t9.9026.com/imgs/11.png',
+						name: '2023新春福兔系列礼盒 倾心甄选 待你拥有'
 					},
 					{
-						cover_img:'https://t9.9026.com/imgs/22.png',
-						name:'2023新春福兔系列礼盒 倾心甄选 待你拥有'
+						cover_img: 'https://t9.9026.com/imgs/22.png',
+						name: '2023新春福兔系列礼盒 倾心甄选 待你拥有'
 					},
 					{
-						cover_img:'https://t9.9026.com/imgs/33.png',
-						name:'2023新春福兔系列礼盒 倾心甄选 待你拥有'
+						cover_img: 'https://t9.9026.com/imgs/33.png',
+						name: '2023新春福兔系列礼盒 倾心甄选 待你拥有'
 					},
 					{
-						cover_img:'https://t9.9026.com/imgs/44.png',
-						name:'2023新春福兔系列礼盒 倾心甄选 待你拥有'
+						cover_img: 'https://t9.9026.com/imgs/44.png',
+						name: '2023新春福兔系列礼盒 倾心甄选 待你拥有'
 					},
 				],
 				status: 'noMore',
@@ -292,10 +282,10 @@
 				navList: [],
 				//活动专区
 				specialList: [],
-				isDevelopment:false,
+				isDevelopment: false,
 			}
 		},
-		onTabItemTap(e){
+		onTabItemTap(e) {
 			console.log(e)
 		},
 		// 下拉刷新
@@ -319,17 +309,13 @@
 			this.getGoodsList()
 			this.getAllSet()
 			// this.isDevelopment = process.env.NODE_ENV === 'development';
-			this.isDevelopment = true;
-			//用户访问
-			this.getUserVisits()
-			
-			// uni.navigateTo({
-			// 	url: "/pages/goods/goods-lucky/index"
-			// })
+			// this.isDevelopment = true;
+
 
 		},
 		methods: {
 			// **************** Data ***************//
+
 			//获取配置数据
 			getAllSet() {
 				this.$api.document.allSet().then(res => {
@@ -337,7 +323,7 @@
 					this.infoList = this.$store.getters.allset.banners
 					this.navList = this.$store.getters.allset.nav_icon
 					this.info = this.$store.getters.allset.partner
-			
+
 					//广告图
 					this.advertis = this.$store.getters.allset.advertises.filter(item => {
 						return item.in_page == 1
@@ -362,8 +348,8 @@
 					//广告弹框图
 					this.popupData = this.$store.getters.allset.popup_ads[0]
 					//弹窗是否展示
-					this.popupImgStatus =  this.popupData?.status
-					this.times_type =  this.popupData?.times_type
+					this.popupImgStatus = this.popupData?.status
+					this.times_type = this.popupData?.times_type
 					//广告弹框跳转h5和小程序和内部
 					this.jump_type = this.popupData?.jump_type,
 						this.jump_config = this.popupData?.jump_config
@@ -389,19 +375,19 @@
 					type: 1,
 					page: 0,
 				}).then(res => {
-					this.goodsList = res.data.data.slice(0,4)
+					this.goodsList = res.data.data.slice(0, 4)
 					this.shortLong()
-					console.log(this.goodsList,'------>产品图');
+					console.log(this.goodsList, '------>产品图');
 				})
 			},
 			//产品详情
-			produceDetail(id){
-				
+			produceDetail(id) {
+
 				uni.navigateTo({
-					url:`/pages/goods/goods-detail/index?id=${id}&type=1`
+					url: `/pages/goods/goods-detail/index?id=${id}&type=1`
 				})
 			},
-			
+
 			// **************** Dev ***************//
 			shortLong() {
 				this.goodsList.forEach((item, index, arr) => {
@@ -426,10 +412,10 @@
 			},
 			//打开弹框
 			open() {
-				console.log(this.popupImgStatus,this.times_type);
+				console.log(this.popupImgStatus, this.times_type);
 				// 从本地缓存中同步获取指定 key 对应的内容，用于判断是否是第一次打开应用
-				if(this.popupImgStatus == 1){
-					if(this.times_type == 1){
+				if (this.popupImgStatus == 1) {
+					if (this.times_type == 1) {
 						//首次进入弹窗
 						const value = uni.getStorageSync('launchFlag');
 						if (value) {
@@ -442,11 +428,11 @@
 							});
 							this.$refs.popup.open('center')
 						}
-					}else{
-						this.$refs.popup.open('center')//每次都弹
-					}	
-				}else{
-					this.$refs.popup.close()//不显示广告弹框
+					} else {
+						this.$refs.popup.open('center') //每次都弹
+					}
+				} else {
+					this.$refs.popup.close() //不显示广告弹框
 				}
 			},
 			//关闭弹框
@@ -524,19 +510,19 @@
 						}
 					}
 				})
-			},	
-			
-			
+			},
+
+
 			//获取当前页面路径
 			getPageUrl() {
 				const pages = getCurrentPages();
-				console.log(pages,'--------->pages')
-				if(pages.length==1){
+				console.log(pages, '--------->pages')
+				if (pages.length == 1) {
 					const currentPage = pages[0];
 					let pageUrl = `/${currentPage.route}`;
 					return pageUrl
 					console.log('当前页面url：', pageUrl);
-				}else{
+				} else {
 					const currentPage = pages[pages.length - 1];
 					let pageUrl = `/${currentPage.route}`;
 					return pageUrl
@@ -568,7 +554,7 @@
 						}).then(res => {
 							console.log(res.data);
 						})
-			
+
 						// 打开成功
 					},
 					fail(e) {
@@ -576,18 +562,18 @@
 					}
 				})
 			},
-			
+
 			//用户访问
-			getUserVisits(){
+			getUserVisits() {
 				this.$api.my.userVisits({
-					page:'/pages/index/index'
-				}).then(res=>{
+					page: '/pages/index/index'
+				}).then(res => {
 					console.log(res.data);
 				})
 			},
-			
-			
-			
+
+
+
 			//跳转方法
 			// jumpHAppID(id, urls) {
 			// 	if (id == 1) {
@@ -631,10 +617,31 @@
 			// 		})
 			// 	}
 			// },
-			goToProduct(id){
-				uni.navigateTo({
-					url:`/pages/goods/goods-detail/index?id=${id}&type=1`
-				})
+
+			//查看更多商品
+			geMore() {
+				if (this.admin == undefined) {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				} else {
+					uni.navigateTo({
+						url: '/pages/goods/goods'
+					})
+				}
+			},
+
+			//跳转产品详情
+			goToProduct(id) {
+				if (this.admin == undefined) {
+					uni.navigateTo({
+						url: '/pages/login/login'
+					})
+				} else {
+					uni.navigateTo({
+						url: `/pages/goods/goods-detail/index?id=${id}&type=1`
+					})
+				}
 			},
 			//产品列表
 			goProduceList() {

pages/index/vote-detail/index.vue

@@ -129,7 +129,7 @@
 					<text v-if="isVoteNum && is_prize==0 ">今日投票数还有 {{userCanVoteNum}} 次
 						点击再次投票可再次为本项目投票也可为其他项目投票</text>
 					<text v-if="is_prize==1">恭喜你中奖了！
-						获得了{{prizeProduct}}的奖品{{prizeProduct.indexOf('积分')==-1?'':'，请尽快领取'}}</text>
+						获得了{{prizeProduct}}{{prizeProduct.indexOf('积分')==-1?'':'，请尽快领取'}}</text>
 				</view>
 				<view class="btn">
 					<view v-if="is_prize==0" class="cancel"

pages/login/login.vue

@@ -60,6 +60,26 @@
 			this.isLoginOff = this.$store.getters.userInfo
 		},
 		methods: {
+			
+			getPageUrl() {
+				const pages = getCurrentPages();
+				console.log(pages,'--------->pages')
+				if(pages.length==1){
+					const currentPage = pages[0];
+					let pageUrl = `${currentPage.$page.fullPath}`;
+					console.log('当前页面url1：', pageUrl);
+					return pageUrl
+					
+				}else{
+					const currentPage = pages[pages.length - 2];
+					let pageUrl = `${currentPage.$page.fullPath}`;
+					console.log('当前页面url2：', pageUrl);
+					return pageUrl
+					
+				}
+			},
+			
+			
 			//关闭遮罩层
 			closeMask() {
 				this.modal.show = false
@@ -82,9 +102,18 @@
 					this.$hideLoading()
 					this.$store.dispatch('user/info', res.data)
 					this.modal.show = false
-					uni.switchTab({
-						url: '/pages/my/my'
-					})
+					
+					//获取登录页前地址
+					let pages = this.getPageUrl()
+					if(pages){
+						uni.redirectTo({
+							url:pages
+						})
+					}else{
+						uni.switchTab({
+							url: '/pages/my/my'
+						})
+					}
 				})
 			},
 			handleGetWechatUserInfo() {

pages/msg/msg.vue

@@ -14,26 +14,25 @@
 				</template>
 			</u-input>
 		</view>
-
-		<!-- 消息列表 -->
-		<view class="msgListBox">
-			<view class="childBox" v-for="(item,index) in messageList" :key="index"  @click="jumpPage(item.type,item.relation_id)" >
-				<view class="childBox-top" >{{item.title}}</view>
-				<view  class="childBox-content" >
-					<text>{{item.content}}</text>
-					<image style="width: 12rpx;height: 20rpx;" src="/static/icon/right.png" ></image>
-				</view>
-				<view class="childBox-bom">{{item.created_at}}</view>
+		
+		<view class="msg-null" v-if="messageList.length == 0">
+			<image src="https://t9.9026.com/imgs/dataNull.png" style="width: 394rpx;height: 396rpx;" mode=""></image>
+			<view class="msg-null-text">
+				<text>暂无数据</text>
 			</view>
-			<uni-swipe-action v-if="false">
-				<uni-swipe-action-item :right-options="options" v-for="(item,index) in messageList" :key="index">
+		</view>
+		
+		<!-- 消息列表 -->
+		<view class="msgListBox"  v-if="messageList.length > 0">
+			<uni-swipe-action>
+				<uni-swipe-action-item :right-options="options" v-for="(item,index) in messageList" :key="index" > 
 					<template v-slot:right>
-						<view style="display: flex;align-items: center;justify-content: center;">
-							<image src="/static/icon//data.png" style="width: 60rpx; height: 54rpx;"></image>
-							<text class="slot-button-text">删除</text>
+						<view style="display: flex;align-items: center;justify-content: center;" @click="deleteImg(item.id)">
+							<image src="/static/icon/delete.png" style="width: 36rpx; height: 40rpx; margin-right: 20rpx; "></image>
+							<text class="slot-button-text" style="color: red;">删除</text>
 						</view>
 					</template>
-					<view class="childBox">
+					<view class="childBox" @click="jumpPage(item.type,item.relation_id)">
 						<view class="childBox-top">{{item.title}}</view>
 						<view class="childBox-content">
 							<text>{{item.content}}</text>
@@ -46,7 +45,7 @@
 		</view>
 
 		<!-- 触底 -->
-		<view class="home-bottom">
+		<view class="home-bottom"  v-if="messageList.length > 0">
 			<uni-load-more :status="status" color="#CCCCCC" :content-text="contentText" />
 		</view>
 
@@ -95,6 +94,25 @@
 		},
 		methods: {
 			
+			//删除消息
+			deleteImg(id){
+				this.$api.my.delMessage({
+					message_id:id
+				}).then(res=>{
+					if(res.code == 0 ){
+						console.log(res.data);
+						this.getMessageList()
+					}else{
+						uni.showToast({
+							icon:'none',
+							title:res.msg
+						})
+					}
+					
+				})
+			},
+			
+			
 			//跳转消息详情页面
 			jumpPage(type,id){
 				if(type>2){
@@ -165,6 +183,19 @@
 		background-color: #f9f9f9;
 		padding-top: 120rpx;
 	}
+	
+	.msg-null{
+		margin-top: 162rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		.msg-null-text{
+			margin-top: 40rpx;
+			font-size: 28rpx;
+			color: #333;
+		}
+	}
 
 	// 搜索
 	.search {
@@ -199,7 +230,7 @@
 		padding: 48rpx 30rpx;
 		padding-top: 0;
 		margin-top: 24rpx;
-		background: $bgColor;
+		background: #f9f9f9;
 		box-shadow: 0rpx 4rpx 24rpx -10rpx rgba(101, 95, 90, 0.3);
 		border-radius: 12rpx;
 		.childBox {

pages/my/my.vue

@@ -149,7 +149,6 @@
 
 		onShow() {
 			this.admin = this.$store.getters.userInfo
-			console.log(this.admin);
 		},
 
 		methods: {
@@ -402,7 +401,7 @@
 				left: 200rpx;
 
 				.unlogin {
-					width: 220rpx;
+					width: 360rpx;
 					font-size: 44rpx;
 					font-family: PingFang-SC-Heavy, PingFang-SC;
 					font-weight: 500;

pages/my/myorders/orders.vue

@@ -218,29 +218,40 @@
 					title: "保存中..."
 				})
 				const that = this;
+				console.log(this.check_qrcode, '---->check_qrcode');
 				uni.downloadFile({
 					url: that.check_qrcode,
 					success: res => {
 						if (res.statusCode === 200) {
-							uni.hideLoading()
-							uni.saveImageToPhotosAlbum({
-								filePath: res.tempFilePath,
-								success: function() {
-									uni.showToast({
-										title: '已保存到相册',
-										icon: 'success',
-										duration: 2000
-									})
-									this.$refs.popup.close()
+							uni.getFileSystemManager().readFile({
+								filePath: res.tempFilePath, //选择图片返回的相对路径
+								encoding: 'base64', //编码格式
+								success: res => { //成功的回调
+									console.log(res);
+									// that.imgBase64 = 'data:image/jpeg;base64,' + res.data //不加上这串字符，在页面无法显示的哦
+									that.imgBase64 = res.data //不加上这串字符，在页面无法显示的哦
+									uni.hideLoading()
+									uni.saveImageToPhotosAlbum({
+										filePath: that.imgBase64,
+										success: function() {
+											uni.showToast({
+												title: '已保存到相册',
+												icon: 'success',
+												duration: 2000
+											})
+											that.$refs.popup.close()
+										},
+										fail: function() {
+											uni.showToast({
+												title: '保存失败，请稍后重试',
+												icon: 'none',
+												duration: 2000
+											})
+										}
+									});
+
 								},
-								fail: function() {
-									uni.showToast({
-										title: '保存失败，请稍后重试',
-										icon: 'none',
-										duration: 2000
-									})
-								}
-							});
+							})
 						} else {
 							uni.hideLoading()
 							uni.showToast({

setting.js

@@ -3,8 +3,8 @@
  */
 const IS_DEV = process.env.NODE_ENV === 'development'
 
-// const URL = 'https://t9.9026.com'
-const URL = 'https://ihg.9026.com'
+const URL = 'https://t9.9026.com'
+// const URL = 'https://ihg.9026.com'
 
 	
 module.exports = {