add

api/courseLook.js

@@ -77,5 +77,5 @@ export function getRealLink(data) {
  }
  //看课获取用户信息
   export function getUserInfoLook(data) {
-  	 return request('/course_uniapp/app/user/getUserInfo',data,'GET','application/json;charset=UTF-8','https://h5api.his.cdwjyyh.com');
+  	 return request('/course_uniapp/app/user/getUserInfoByUserId',data,'GET','application/json;charset=UTF-8','https://h5api.his.cdwjyyh.com');
   }

api/living.js

@@ -173,4 +173,14 @@ export function internetTraffic(data) {
 // 直播流量(缓冲百分比)
 export function liveInternetTraffic(data) {
 	return request('/app/live/liveTrafficLog/getLiveInternetTraffic', data, 'POST', 'application/json;charset=UTF-8');
-}
+}
+
+// 芳华币
+export function getUserIntegralInfo(data) {
+	return request('/app/live/liveData/getUserIntegralInfo', data, 'GET', 'application/json;charset=UTF-8');
+}
+
+// 我的中奖明细
+export function myLottery(data) {
+	return request('/app/live/liveLottery/myLottery', data, 'GET', 'application/json;charset=UTF-8');
+}

common/request.js

@@ -3,6 +3,7 @@ export default class Request {
 	http(router, data = {}, method, contentType, url) {
 		let that = this;
 		let path = 'https://api.fhhx.runtzh.com';
+		// let path = 'http://x5d7cc68.natappfree.cc';//刘明欣
 
 
 		// let path =  'http://192.168.10.122:7014';

pages.json

@@ -825,6 +825,13 @@
 						"enablePullDownRefresh": false
 					}
 
+				},{
+					"path": "live/integral",
+					"style": {
+						"navigationBarTitleText": "芳华币",
+						"enablePullDownRefresh": false
+					}
+
 				},
 
 				{

pages_company/storeProductPackageDetails.vue

@@ -41,33 +41,6 @@
 				{{package.descs}}
 			</view>
 		</view>
-		<!-- <view class="drug-box">
-			<view class="title">组合套餐</view>
-			<view class="inner">
-				<view class="drug-list"  >
-					<view v-for="(subItem,index) in products" :key="index" class="drug-item">
-						<view class="img-box">
-							<image :src="subItem.image" mode="aspectFill"></image>
-						</view>
-						<view class="drug-info"  >
-							<view>
-								<view class="name-box ellipsis2">
-									{{subItem.productName}}
-								</view>
-								<view class="spec">{{subItem.sku}}</view>
-							</view>
-							<view class="num-box">
-								<view class="price">
-									<text class="unit">¥</text>
-									<text class="num">{{subItem.price.toFixed(2)}}</text>
-								</view>
-								<view class="amount">x{{subItem.count}}</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view> -->
 		<!-- 图文详情 -->
 		<view class="det-box">
 			<view class="title">图文详情</view>

pages_course/livingList.vue

@@ -121,7 +121,7 @@
 			.list-item {
 				border-radius: 16rpx;
 				width: 340rpx;
-				height: 600rpx;
+				height: 450rpx;
 				background-color: #0d0d0d;
 				margin-bottom: 24rpx;
 				overflow: hidden;

pages_shopping/live/confirmCreateOrder.vue

@@ -58,14 +58,6 @@
 						<text class="text" v-if="address==null">--</text>
 					</view>
 				</view>
-				<!-- <view class="points">
-					<view class="left">
-						<text class="text">服务费</text>
-					</view>
-					<view class="right">
-						<text class="text">{{price.serviceFee.toFixed(2)}}</text>
-					</view>
-				</view> -->
 				<view class="points">
 					<view class="left">
 						<text class="text">合计</text>
@@ -134,9 +126,7 @@
 	import {
 		createliveOrder, // 创建订单
 		userAddr, // 获取用户收货地址
-		cartOrder, //购物车订单
 		computed
-		// checked //获取购物车选中商品
 	} from "@/api/order.js"
 	import {
 		curCoupon
@@ -150,17 +140,13 @@
 			return {
 				orderData: {},
 				cityId: null,
-				// priceSum: null,
-				cartsSelect: [],
 				address: null,
 				addressId: null,
 				totalNum: null,
 				orderKey: null,
-				// price: null,
 				goodsId: null,
 				liveId: null,
 				orderList: [],
-				userInfo: null,
 				temps: [],
 				couponUserId: null,
 				couponText: "请选择",
@@ -168,7 +154,6 @@
 				couponVisible: false,
 				carts: [],
 				checked: false,
-				// type: null,
 				cartIds: null,
 				confirmParam: [],
 
@@ -207,21 +192,6 @@
 			uni.$off('updateAddress');
 		},
 		methods: {
-
-			// getCurCoupon() {
-			// 	curCoupon().then(res => {
-			// 			if (res.code == 200) {
-
-			// 			} else {
-			// 				uni.showToast({
-			// 					title: res.msg,
-			// 					icon: 'none'
-			// 				});
-			// 			}
-			// 		},
-			// 		rej => {}
-			// 	);
-			// },
 			handleAddressUpdate(item) {
 				console.log('接收到地址数据:', item);
 				// 在这里处理地址数据
@@ -312,18 +282,7 @@
 					}
 				});
 			},
-			getWeixinOrderTemps: function() {
-				getWeixinOrderTemps().then(
-					res => {
-						if (res.code == 200) {
-							this.temps = res.temp
-						} else {
-
-						}
-					},
-					rej => {}
-				);
-			},
+			
 			couponSelect(item) {
 				this.couponText = "-¥" + (item.couponPrice || 0).toFixed(2);
 				this.couponUserId = item.id;
@@ -342,10 +301,6 @@
 					this.couponsList = res.data
 				})
 			},
-			integralChange(e) {
-				this.form.useIntegral = e ? 1 : 0
-				this.computed()
-			},
 			openAddress() {
 				uni.navigateTo({
 					url: '/pages_user/user/address'
@@ -382,25 +337,24 @@
 					});
 				}
 			},
-
 		}
 	}
 </script>
 
 <style lang="scss">
 	.inner-box {
-		padding: 20upx 20upx 140upx;
+		padding: 20rpx 20rpx 140rpx;
 
 		.address-box {
 			margin-bottom: 20rpx;
 			box-sizing: border-box;
-			min-height: 171upx;
+			min-height: 171rpx;
 			background: #FFFFFF;
-			border-radius: 16upx;
+			border-radius: 16rpx;
 			background-repeat: no-repeat;
-			background-size: 100% 30upx;
+			background-size: 100% 30rpx;
 			background-position: left bottom;
-			padding: 38upx 30upx 36upx;
+			padding: 38rpx 30rpx 36rpx;
 			display: flex;
 			align-items: center;
 			justify-content: space-between;
@@ -413,32 +367,32 @@
 					align-items: center;
 
 					.text {
-						font-size: 32upx;
+						font-size: 32rpx;
 						font-family: PingFang SC;
 						font-weight: bold;
 						color: #111111;
 						line-height: 1;
 
 						&.name {
-							margin-right: 30upx;
+							margin-right: 30rpx;
 						}
 					}
 				}
 
 				.address {
-					font-size: 28upx;
+					font-size: 28rpx;
 					font-family: PingFang SC;
 					font-weight: 500;
 					color: #666666;
-					line-height: 42upx;
+					line-height: 42rpx;
 					text-align: left;
-					margin-top: 23upx;
+					margin-top: 23rpx;
 				}
 			}
 
 			.arrow-box {
-				width: 12upx;
-				height: 23upx;
+				width: 12rpx;
+				height: 23rpx;
 				display: flex;
 				align-items: cenetr;
 				justify-content: cenetr;
@@ -449,97 +403,9 @@
 				}
 			}
 		}
-
-		.shopbox {
-			background: #FFFFFF;
-			border-radius: 16rpx;
-			margin-bottom: 20rpx;
-
-			.points {
-				padding: 0 !important;
-			}
-
-			.remarks {
-				padding: 0 !important;
-			}
-		}
-
-		.shopbox-name {
-			padding: 30rpx 30rpx 0 30rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 400;
-			font-size: 30rpx;
-			color: #111;
-			overflow: hidden;
-			white-space: nowrap;
-			text-overflow: ellipsis;
-		}
-
-		.goods-list {
-			padding: 0 30upx;
-			background-color: #FFFFFF;
-			border-radius: 16upx;
-
-			.item {
-				padding: 30upx 0;
-				border-bottom: 1px solid #EDEEEF;
-				display: flex;
-				align-items: center;
-
-				.img-box {
-					width: 160upx;
-					height: 160upx;
-					margin-right: 30upx;
-
-					image {
-						width: 100%;
-						height: 100%;
-					}
-				}
-
-
-			}
-
-			.sub-total {
-				height: 88upx;
-				display: flex;
-				align-items: center;
-				justify-content: flex-end;
-
-				.label {
-					font-size: 24upx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-				}
-
-				.price {
-					display: flex;
-					align-items: flex-end;
-
-					.unit {
-						font-size: 24upx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #FF6633;
-						line-height: 1.2;
-						margin-right: 4upx;
-					}
-
-					.num {
-						font-size: 32upx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #FF6633;
-						line-height: 1;
-					}
-				}
-			}
-		}
-
 		.price-info {
 			background: #FFFFFF;
-			border-radius: 16upx;
+			border-radius: 16rpx;
 
 			&-title {
 				padding: 30rpx 30rpx 20rpx 30rpx;
@@ -559,10 +425,10 @@
 		}
 
 		.points {
-			height: 88upx;
-			padding: 0 30upx;
+			height: 88rpx;
+			padding: 0 30rpx;
 			background: #FFFFFF;
-			border-radius: 16upx;
+			border-radius: 16rpx;
 
 			display: flex;
 			align-items: center;
@@ -573,13 +439,13 @@
 				align-items: center;
 
 				image {
-					width: 28upx;
-					height: 28upx;
-					margin-right: 20upx;
+					width: 28rpx;
+					height: 28rpx;
+					margin-right: 20rpx;
 				}
 
 				.text {
-					font-size: 28upx;
+					font-size: 28rpx;
 					font-family: PingFang SC;
 					font-weight: 500;
 					color: #666666;
@@ -591,7 +457,7 @@
 				align-items: center;
 
 				.text {
-					font-size: 28upx;
+					font-size: 28rpx;
 					font-family: PingFang SC;
 					font-weight: 500;
 					color: #111111;
@@ -599,46 +465,21 @@
 				}
 
 				image {
-					margin-left: 15upx;
-					width: 14upx;
-					height: 24upx;
+					margin-left: 15rpx;
+					width: 14rpx;
+					height: 24rpx;
 				}
 			}
 		}
-
-		.remarks {
-			// height: 88upx;
-			padding: 0 30upx;
-			background: #FFFFFF;
-			border-radius: 16upx;
-			margin-top: 20upx;
-			display: flex;
-			align-items: center;
-
-			input {
-				width: 100%;
-				font-size: 28upx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #000000;
-			}
-
-			.input {
-				font-size: 28upx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-			}
-		}
 	}
 
 
 	.btn-foot {
 		box-sizing: border-box;
 		width: 100%;
-		height: 121upx;
+		height: 121rpx;
 		background: #FFFFFF;
-		padding: 16upx 30upx 16upx 60upx;
+		padding: 16rpx 30rpx 16rpx 60rpx;
 		display: flex;
 		align-items: center;
 		justify-content: flex-end;
@@ -654,10 +495,10 @@
 			.total {
 				display: flex;
 				align-items: flex-end;
-				margin-right: 36upx;
+				margin-right: 36rpx;
 
 				.label {
-					font-size: 26upx;
+					font-size: 26rpx;
 					font-family: PingFang SC;
 					font-weight: 500;
 					color: #999999;
@@ -669,16 +510,16 @@
 					align-items: flex-end;
 
 					.unit {
-						font-size: 32upx;
+						font-size: 32rpx;
 						font-family: PingFang SC;
 						font-weight: bold;
 						color: #FF6633;
 						line-height: 1.2;
-						margin-right: 10upx;
+						margin-right: 10rpx;
 					}
 
 					.num {
-						font-size: 50upx;
+						font-size: 50rpx;
 						font-family: PingFang SC;
 						font-weight: bold;
 						color: #FF6633;
@@ -688,16 +529,16 @@
 			}
 
 			.btn {
-				width: 200upx;
-				height: 88upx;
-				line-height: 88upx;
+				width: 200rpx;
+				height: 88rpx;
+				line-height: 88rpx;
 				text-align: center;
-				font-size: 30upx;
+				font-size: 30rpx;
 				font-family: PingFang SC;
 				font-weight: bold;
 				color: #FFFFFF;
 				background: #2BC7B9;
-				border-radius: 44upx;
+				border-radius: 44rpx;
 			}
 		}
 	}
@@ -784,8 +625,4 @@
 		line-height: 0.44 * 100rpx;
 		background-color: red;
 	}
-
-	.coupon-list .item .text .data .bnt.gray {
-		background-color: #ccc;
-	}
 </style>

pages_shopping/live/goods.vue

@@ -2,19 +2,17 @@
 	<view class="">
 		<view class="content" v-cloak>
 			<view class="shop-banner">
-				<view class="shop-banner" @click="showImg()">
-					<swiper class="swiper" :indicator-dots="false" :circular="true" :autoplay="true" :interval="3000"
-						:duration="1000" indicator-color="rgba(255, 255, 255, 0.6)" indicator-active-color="#ffffff"
-						@change="swiperChange">
-						<swiper-item class="swiper-item" v-for="(item,index) in  banner" :key="index">
-							<image :src="item" mode="aspectFill"></image>
-						</swiper-item>
-					</swiper>
-					<!-- 底部遮罩 -->
-					<view class="banner-mask"></view>
-					<!-- 数量 -->
-					<view class="num-box">{{ activeBanner }}/{{ banner.length }}</view>
-				</view>
+				<swiper class="swiper" :indicator-dots="false" :circular="true" :autoplay="true" :interval="3000"
+					:duration="1000" indicator-color="rgba(255, 255, 255, 0.6)" indicator-active-color="#ffffff"
+					@change="swiperChange">
+					<swiper-item class="swiper-item" v-for="(item,index) in  banner" :key="index">
+						<image :src="item" mode="aspectFill"></image>
+					</swiper-item>
+				</swiper>
+				<!-- 底部遮罩 -->
+				<view class="banner-mask"></view>
+				<!-- 数量 -->
+				<view class="num-box">{{ activeBanner }}/{{ banner.length }}</view>
 			</view>
 			<!-- 详细信息 -->
 			<view class="det-info">
@@ -116,42 +114,16 @@
 				serviceList: ['品质保障', '药师服务', '隐私保护'],
 				productId: null,
 				goosDetail: {}, //商品详情
-				loadding: true,
 				buyText: "立即购买",
 				goodsNum: 0, //商品选择数量
-				attrs: [],
-				values: [],
-				stores: [],
-				storeNames: [],
-				storeIdx: 0,
-				storeName: "",
-				product: {
-					price: 0,
-					otPrice: 0,
-				},
-				showModal: false,
 				// 当前轮播的图片
 				activeBanner: 1,
-				// 购物车数量
-				cartCount: 0,
 				// 规格弹窗
 				specVisible: false,
-				// // 规格数量
-				// specNum: 1,
-				config: null,
-				showServiceFee: false,
-				selectVal: "",
-				// 链接带的storeId
-				urlStoreId: undefined,
-				// 所选店铺
-				storeSelectInfo: {},
-				// 保存选的规格
-				choseSpecSubIndex: 0,
-				choseSpecIndex: 0,
 			};
 		},
 		onLoad(options) {
-			console.log("商品详情options", options)
+			// console.log("商品详情options", options)
 			if (options.productId) {
 				this.productId = options.productId;
 			}
@@ -170,8 +142,6 @@
 		},
 		mounted() {
 			this.getliveGoods()
-			var userInfo = uni.getStorageSync("userInfo")
-
 		},
 		methods: {
 			// swiper变化事件
@@ -190,22 +160,19 @@
 				if (type == "buy") {
 					this.getKey()
 				} else {
-					this.getCartCount()
 					uni.showToast({
 						icon: 'success',
 						title: "添加成功",
 					});
 				}
-
 			},
-			
+
 			// 获得key
 			getKey() {
 				liveOrderKey().then(res => {
 						if (res.code == 200) {
-							console.log("下订单的key>>>>", res)
+							// console.log("下订单的key>>>>", res)
 							this.orderKey = res.orderKey
-							console.log("key>>>>", this.orderKey)
 							uni.navigateTo({
 								url: '/pages_shopping/live/confirmCreateOrder?&orderKey=' + this.orderKey +
 									'&liveId=' + this.liveId + '&goodsId=' + this.goodsId +
@@ -237,20 +204,6 @@
 				this.type = type;
 				this.specVisible = true
 			},
-
-
-			// 跳转页面
-			navgetTo(url) {
-				uni.navigateTo({
-					url: url
-				})
-			},
-			// openEditMoney() {
-			// 	this.editShow = true;
-			// },
-			// cancelEditMoney(){
-			// 	this.editShow = false;
-			// },
 			//商品详情
 			getliveGoods() {
 				if (!this.productId) return;
@@ -263,8 +216,6 @@
 							// console.log("小黄车 商品详情>>>>", res)
 							this.goosDetail = res.data
 							this.banner = res.data.sliderImage.split(',');
-							// console.log("轮播图",this.banner)
-
 						} else {
 							uni.showToast({
 								title: res.msg,
@@ -280,12 +231,14 @@
 </script>
 
 <style lang="scss">
-	  [v-cloak] {
-	    display: none;
-	  }
+	[v-cloak] {
+		display: none;
+	}
+
 	.content {
 		font-family: PingFang SC;
 	}
+
 	.shop-banner {
 		height: 756rpx;
 		background-color: #FFFFFF;
@@ -328,37 +281,6 @@
 			bottom: 34rpx;
 			z-index: 10;
 		}
-
-		.cf-box {
-			position: absolute;
-			z-index: 10;
-			left: 0;
-			right: 0;
-			top: calc(50% - 200rpx);
-			bottom: calc(50% - 200rpx);
-			background-color: rgba(0, 0, 0, 0.3);
-			backdrop-filter: blur(2rpx);
-			/* 背景模糊度 */
-			display: flex;
-			flex-direction: column;
-			flex: 1;
-			justify-content: center;
-			align-items: center;
-			color: #EDEEEF;
-
-			.title {
-				font-size: 40rpx;
-				font-weight: bold;
-			}
-
-			.subTitle {
-				font-size: 28rpx;
-				font-weight: bold;
-				margin-top: 10rpx;
-			}
-		}
-
-
 	}
 
 	.guige {
@@ -370,13 +292,6 @@
 		color: #222426;
 		margin: 24rpx;
 
-		.guige-gg {
-			.gg-text {
-				color: #898E91;
-				margin-right: 40rpx;
-			}
-		}
-
 		.safe-box {
 			display: flex;
 			align-items: center;
@@ -466,15 +381,6 @@
 					line-height: 1.3;
 				}
 			}
-
-			
-			.spec {
-				font-size: 24rpx;
-				font-family: PingFang SC;
-				font-weight: 500;
-				color: #999999;
-				line-height: 36rpx;
-			}
 		}
 
 		.name-box {
@@ -499,39 +405,6 @@
 				margin-top: 7rpx;
 			}
 		}
-
-		.intro {
-			font-size: 26rpx;
-			font-weight: 500;
-			color: #999999;
-			line-height: 36rpx;
-			padding: 18rpx 0 23rpx;
-		}
-		.safe-box {
-			display: flex;
-			align-items: center;
-			padding-top: 24rpx;
-
-			image {
-				width: 20rpx;
-				height: 24rpx;
-				margin-right: 20rpx;
-			}
-
-			.text {
-				font-size: 22rpx;
-				font-weight: 500;
-				color: #999999;
-				line-height: 1;
-			}
-
-			.line {
-				width: 1px;
-				height: 23rpx;
-				background: #EDEEEF;
-				margin: 0 20rpx;
-			}
-		}
 	}
 
 	.det-box {
@@ -573,30 +446,6 @@
 		.menu-box {
 			display: flex;
 			align-items: center;
-
-			.item {
-				display: flex;
-				align-items: center;
-				flex-direction: column;
-				margin-right: 48rpx;
-
-				&:last-child {
-					margin-right: 0;
-				}
-
-				image {
-					width: 40rpx;
-					height: 40rpx;
-					margin-bottom: 10rpx;
-				}
-
-				.label {
-					font-size: 20rpx;
-					font-weight: 500;
-					color: #626468;
-					text-align: center;
-				}
-			}
 		}
 
 		.btn-box {
@@ -618,10 +467,6 @@
 					margin-left: 0;
 				}
 
-				&.cart {
-					background: #FF5030;
-				}
-
 				&.buy {
 					background: #2bc7b9;
 				}
@@ -739,29 +584,4 @@
 			margin-top: 30rpx;
 		}
 	}
-	.loadding {
-		background-color: #fff;
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		z-index: 9999;
-
-		image {
-			border-radius: 50%;
-			animation: load linear 1s infinite;
-			width: 120rpx;
-			height: 120rpx;
-		}
-
-		.text {
-			font-size: 28rpx;
-			margin-top: 20rpx;
-		}
-	}
 </style>

pages_shopping/live/integral.vue

@@ -0,0 +1,550 @@
+<template>
+	<view>
+		<view class="top-cont">
+			<!-- 背景图片 -->
+			<image class="bg"
+				src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/ed4a8ff0406747a68e40988b210d1c78.png"
+				mode=""></image>
+			<view class="top-inner">
+				<!-- 这里是状态栏 -->
+				<view class="fixed-top-box" :style="{ background: bg }">
+					<view class="status_bar" :style="{height: statusBarHeight}"></view>
+					<view class="back-box" @click="back">
+						<text class="title">我的芳华币</text>
+						<text></text>
+					</view>
+				</view>
+				<!-- 顶部固定后站位元素 -->
+				<view style="padding-bottom: 88upx;">
+					<view :style="{height: statusBarHeight}"></view>
+				</view>
+				<!-- 可用芳华币 -->
+				<view class="available-points">
+					<text class="label">可用芳华币</text>
+					<text class="num">{{integral}}</text>
+				</view>
+
+				<view class="content">
+					<!-- 芳华币列表 -->
+					<view class="points-cont">
+						<!-- tab切换 -->
+						<!-- <view class="pub-tab-box">
+							<view class="tab-inner">
+								<view 
+									v-for="(item,index) in tags" 
+									:key="index"
+									:class="tabIndex == item.value?'item active':'item'"
+									@click="tabChange(item)">
+									<view class="text">
+										{{ item.lable }}
+										<image v-show="tabIndex == item.value" class="tab-bg" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/1828ea6b3b124b5f84e3556267a8d9ef.png" mode=""></image>
+									</view>
+								</view>
+							</view>
+						</view> -->
+
+						<!-- 列表 -->
+						<view class="point-list">
+							<view v-for="(item,index) in list" :key="index" class="item">
+								<view class="left">
+									<text class="title">
+										{{item.logTypeName}}
+									</text>
+									<view class="time">{{item.createTime}}</view>
+								</view>
+								<view class="right">
+									<text v-if="item.integral<0" class="less">{{item.integral}}</text>
+									<text v-else class="add">+{{item.integral}}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		getUserIntegralInfo
+	} from '@/api/living.js' // 芳华币
+
+
+	// import {getDictByKey} from '@/api/common.js'
+	// import {getUserSign,getUserIntegralLogsList,doSign} from '@/api/integral';
+	export default {
+		comments() {
+			Loading
+		},
+		data() {
+			return {
+				typeOptions: [],
+				top: 0,
+				integral: 0,
+				sign: [],
+				// 状态栏的高度
+				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
+				// tab切换
+				// {lable:'获得',value:1},{lable:'消耗',value:2}
+				// tags: [{lable:'最近十条',value:0},],
+				// 选中的tab
+				tabIndex: 0,
+				current: 0,
+				page: {
+					type: 0,
+					page: 1,
+					pageSize: 10
+				},
+				list: [],
+				loaded: false,
+				loading: false
+			};
+		},
+		onLoad(option) {
+			this.getUserIntegralInfo()
+		},
+		computed: {
+			// 计算属性的 getter
+			bg: function() {
+				return 'rgba(255,142,60, ' + this.top / 30 + ')';
+			},
+		},
+		methods: {
+			// 芳华币
+			getUserIntegralInfo() {
+				uni.showLoading({
+					title: "正在加载中..."
+				})
+				getUserIntegralInfo().then(res => {
+					uni.hideLoading()
+					if (res.code == 200) {
+						console.log("芳华币>>", res)
+						 // 处理列表数据，将"积分"替换为"芳华币"
+						      this.list = res.data.logs.map(item => {
+						        return {
+						          ...item,
+						          logTypeName: item.logTypeName ? item.logTypeName.replace(/积分/g, '芳华币') : item.logTypeName
+						        }
+						      })
+						this.integral = res.data.integral
+					}
+				}).catch(error => {
+					console.error("获取芳华币数据失败:", error);
+
+				});
+			},
+
+
+
+			getDictByKey(key) {
+				var data = {
+					key: key
+				}
+				getDictByKey(data).then(
+					res => {
+						if (res.code == 200) {
+							this.typeOptions = res.data;
+						}
+					},
+					err => {}
+				);
+
+			},
+			// doSign(){
+			// 	var data={};
+			// 	uni.showLoading({
+			// 		title:"正在加载中..."
+			// 	})
+			// 	doSign(data).then(
+			// 		res => {
+			// 			uni.hideLoading()
+			// 			if(res.code==200){
+			// 				uni.showToast({
+			// 					icon:'success',
+			// 					title: res.msg,
+			// 				});
+			// 				this.list=[];
+			// 				this.page.page=1;
+			// 				this.list=[];
+			// 				this.loaded=false;
+			// 				this.loading=false;
+			// 				this.getUserIntegralLogsList();
+			// 				this.getUserSign();
+			// 			}else{
+			// 				uni.showToast({
+			// 					icon:'none',
+			// 					title: res.msg,
+			// 				});
+			// 			}
+			// 		},
+			// 		rej => {}
+			// 	);
+			// },
+			// getUserSign(){
+			// 	getUserSign().then(
+			// 		res => {
+			// 			if(res.code==200){
+			// 				this.data=res.member;
+			// 				this.integral=res.integral;
+			// 				this.sign=JSON.parse(res.sign);
+
+			// 			}else{
+			// 				uni.showToast({
+			// 					icon:'none',
+			// 					title: "请求失败",
+			// 				});
+			// 			}
+			// 		},
+			// 		rej => {}
+			// 	);
+			// },
+
+			// getUserIntegralLogsList() {
+			//   let that = this;
+			//   if (that.loaded == true || that.loading == true) return;
+			//   that.loading = true;
+			//   uni.showLoading({
+			//   	title:"加载中..."
+			//   })
+			//   getUserIntegralLogsList(that.page).then(
+			//     res => {
+			//       that.loading = false;
+			//       that.loaded = res.data.list.length < that.page.pageSize;
+			//       that.page.page = that.page.page + 1;
+			//       that.list.push.apply(that.list, res.data.list);
+			// 	  uni.hideLoading()
+			//     },
+			//     err => {
+			// 		uni.hideLoading()
+			// 		uni.showToast({
+			// 				title: err.msg ,
+			// 				icon: 'none',
+			// 				duration: 2000
+			// 			});
+			//     }
+			//   );
+			// },
+			// 返回上一页
+			back() {
+				uni.navigateBack()
+			},
+			// tab选择
+			// tabChange(item) {
+			// 	console.log(item)
+			// 	this.tabIndex = item.value
+			// 	this.page.type=this.tabIndex;
+			// 	this.page.page=1;
+			// 	this.list=[];
+			// 	this.loaded=false;
+			// 	this.loading=false;
+			// 	this.getUserIntegralLogsList();
+			// }
+		}
+	}
+</script>
+
+<style lang="scss">
+	.fixed-top-box {
+		width: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 1000;
+		transition: all 0.5s;
+
+	}
+
+	.top-cont {
+		width: 100%;
+		height: 654upx;
+		position: relative;
+
+		.bg {
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 1;
+		}
+
+		.top-inner {
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
+			left: 0;
+			z-index: 2;
+
+			.back-box {
+				height: 88upx;
+				padding-left: 22upx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				padding: 0 20upx;
+
+				image {
+					width: 40upx;
+					height: 40upx;
+				}
+
+				.title {
+					font-size: 36upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #FFFFFF;
+				}
+			}
+
+			.available-points {
+				margin-top: 140upx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+
+				.label {
+					font-size: 30upx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #FFFFFF;
+					line-height: 1;
+				}
+
+				.num {
+					font-size: 80upx;
+					font-family: Gilroy;
+					font-weight: 500;
+					color: #FFFFFF;
+					line-height: 1;
+					margin-top: 28upx;
+				}
+			}
+
+			.singn-content {
+				padding: 0 20upx;
+				margin-top: 50upx;
+			}
+
+			.sign-in-box {
+				height: 380upx;
+				background: #FFFFFF;
+				border-radius: 16upx;
+
+				.inner {
+					padding: 40upx 30upx;
+
+					.title-box {
+						font-size: 26upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #666666;
+						line-height: 1;
+
+						.num {
+							font-size: 32upx;
+							font-family: PingFang SC;
+							font-weight: Bold;
+							color: #FF7511;
+							margin: 0 10upx;
+							line-height: 1;
+						}
+					}
+
+					.sign-list {
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						margin-top: 40upx;
+
+						.item {
+							display: flex;
+							justify-content: center;
+
+							.right {
+								display: flex;
+								flex-direction: column;
+								align-items: center;
+								justify-content: center;
+
+								image {
+									width: 44upx;
+									height: 44upx;
+									margin-bottom: 20upx;
+								}
+
+								.text {
+									font-size: 24upx;
+									font-family: PingFang SC;
+									font-weight: 500;
+									color: #FF7511;
+									line-height: 1;
+									white-space: nowrap;
+								}
+							}
+
+							.line {
+								width: 34upx;
+								height: 4upx;
+								background: #F6CDA7;
+								border-radius: 2upx;
+								margin-top: 22upx;
+							}
+
+							&:first-child {
+								.line {
+									display: none;
+								}
+							}
+
+							&.active {
+								.line {
+									background: #FF8E3C;
+								}
+							}
+						}
+					}
+				}
+
+				.sign-btn-box {
+					padding: 0 14upx;
+
+					.btn {
+						width: 100%;
+						height: 88upx;
+						box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.05);
+						background-color: #FF7511;
+						border-radius: 44rpx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+
+						image {
+							width: 32upx;
+							height: 32upx;
+						}
+
+						.text {
+							font-size: 30upx;
+							font-family: PingFang SC;
+							font-weight: bold;
+							color: #FFFFFF;
+							line-height: 1;
+						}
+					}
+				}
+			}
+
+		}
+	}
+
+	.content {
+		margin-top: 20upx;
+		padding: 0 20upx 40upx;
+
+		.points-cont {
+
+			background-color: #FFFFFF;
+			border-radius: 16upx;
+
+			.pub-tab-box {
+				padding: 0 80upx;
+
+				.tab-inner {
+					height: 88upx;
+					line-height: 88upx;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+				}
+
+				.item {
+					font-size: 28upx;
+					white-space: nowrap;
+					line-height: 1;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+
+					&.active {
+						font-weight: bold;
+						color: #333333;
+					}
+
+					.text {
+						position: relative;
+						z-index: 1;
+					}
+
+					.tab-bg {
+						width: 72upx;
+						height: 28upx;
+						position: absolute;
+						top: 17upx;
+						left: 50%;
+						transform: translateX(-36upx);
+						z-index: -1;
+					}
+				}
+			}
+
+			.point-list {
+				padding: 0 30upx;
+
+				.item {
+					padding: 30upx 0;
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					border-bottom: 1px solid #F0F0F0;
+
+					&:last-child {
+						border-bottom: none;
+					}
+
+					.left {
+						.title {
+							font-size: 28upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #111111;
+							line-height: 1;
+						}
+
+						.time {
+							font-size: 24upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #999999;
+							line-height: 1;
+							margin-top: 22upx;
+						}
+					}
+
+					.right {
+						.add {
+							font-size: 28upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #111111;
+						}
+
+						.less {
+							font-size: 28upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #F56C6C;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

pages_shopping/live/order.vue

@@ -8,7 +8,6 @@
 				<!-- <u-tabs class="tabs" itemStyle="width:14%;height:100rpx;" :list="tabList" @click="tabsClick"
 				lineColor="#FF5C03"></u-tabs> -->
 
-
 				<view class="top-fixed">
 					<view class="pub-tab-box">
 						<scroll-view class="scroll-tabs" scroll-x="true" show-scrollbar="false">
@@ -64,7 +63,7 @@
 							<view class="button-group">
 								<view v-if="item.status == 1" @click.stop="cancel(item)" class="button cancel ">取消订单
 								</view>
-								<view v-if="item.isAfterSales==1" @click.stop="refund(item)" class="button cancel">申请售后
+								<view v-if="item.isAfterSales==1&&item.status!=-3&&item.status!=1&&item.status!=-2" @click.stop="refund(item)" class="button cancel">申请售后
 								</view>
 								<view v-if="item.status ==3 ||item.status ==4 ||item.deliverySn" class="button cancel"
 									@click.stop="showDelivery(item)">查看物流</view>
@@ -148,11 +147,6 @@
 		methods: {
 			goDetail(item) {
 				console.log("跳转", item)
-				// uni.navigateTo({
-				// 	url: './storeOrderDetail?orderId=' + item.orderId
-				// })
-
-
 				if (item.status == -1) {
 					uni.navigateTo({
 						url: './refundOrderDetail?id=' + item.afterSaleId

pages_shopping/live/paymentOrder.vue

@@ -229,95 +229,6 @@
 				console.log('当前选中:', this.payType);
 			},
 
-
-			// async doWechatPay() {
-			// 	try {
-			// 		uni.showLoading({
-			// 			title: '发起支付中...',
-			// 			mask: true
-			// 		});
-			// 		let data = {
-			// 			orderId: this.order.orderId
-			// 		}
-			// 		await weChatPayment(data);
-			// 		uni.redirectTo({
-			// 			url: '/pages_shopping/live/success'
-			// 		});
-
-			// 	} catch (err) {
-			// 		console.error('支付流程异常:', err);
-			// 	} finally {
-			// 		uni.hideLoading();
-			// 	}
-			// },
-
-			// 支付宝支付
-			// doAlipay() {
-			// 	var data = {
-			// 		orderId: this.order.orderId
-			// 	};
-			// 	console.log("orderId>>", this.order.orderId)
-			// 	let that = this;
-			// 	// #ifdef H5||APP-PLUS
-			// 	// #ifdef APP-PLUS
-			// 	const tzCashier = uni.requireNativePlugin("TZBank-Cashier");
-			// 	// #endif
-			// 	uni.showLoading();
-			// 	zfbPayment(data).then(res => {
-			// 			console.log("支付开始", res)
-			// 			uni.hideLoading();
-			// 			if (res.code == 200) {
-			// 				console.log("支付在这里", res)
-			// 				if (res.type == "tz") {
-			// 					//console.log("qxj orderFlowNo:"+res.data.body.orderFlowNo+" businessCstNo:"+res.data.body.orderNo+" platMerCstNo:"+res.data.body.platMerCstNo);
-			// 					const match = res.data.body.url.match(/[\?&]businessCstNo=([^&]+)/);
-			// 					const businessCstNo = match ? match[1] : null;
-			// 					console.log("qxj tzCashier:" + tzCashier + " businessCstNo:" + businessCstNo);
-			// 					tzCashier.pay({
-			// 						env: 0,
-			// 						wxMiniProgramType: 0,
-			// 						// wxAppId: 'wx703c4bd07bbd1695',
-			// 						wxAppId: 'wx9ea36eecd281bcd3',
-			// 						wxUniversalLink: "https://yjf.runtzh.com/",
-			// 						orderFlowNo: res.data.body.orderFlowNo,
-			// 						businessCstNo: businessCstNo,
-			// 						platMerCstNo: res.data.body.platMerCstNo
-			// 					}, (res) => {
-			// 						// uni.showToast({
-			// 						// 	title:'收银台回调:'+JSON.stringify(res),
-			// 						// 	icon:'none'
-			// 						// })
-			// 						uni.$emit('closePrivilege', {});
-			// 						that.showPayTips = true;
-			// 					});
-			// 				} else if (res.type == 'hf') {
-			// 					if (uni.getWindowInfo().platform == 'android') {
-			// 						var alipayScheme = 'alipays://platformapi/startApp?&saId=10000007&qrcode=' + res
-			// 							.data.qr_code;
-			// 					} else {
-			// 						var alipayScheme = 'alipay://platformapi/startApp?&saId=10000007&qrcode=' + res
-			// 							.data.qr_code;
-			// 					}
-			// 					// 在uni-app中使用plus.runtime.openURL打开URL
-			// 					plus.runtime.openURL(alipayScheme, function(error) {
-
-			// 					});
-			// 					uni.$emit('closePrivilege', {});
-			// 					that.showPayTips = true;
-			// 				}
-			// 			} else {
-			// 				uni.showToast({
-			// 					title: res.msg,
-			// 					icon: 'none'
-			// 				})
-			// 			}
-			// 		},
-			// 		rej => {}
-			// 	);
-			// 	// #endif
-			// },
-
-
 			getUserInfo() {
 				getUserInfo().then(
 					res => {

pages_shopping/live/refundOrderDetail.vue

@@ -171,7 +171,8 @@
 								</view>
 								<view class="det-item">
 									<text class="label">申请时间</text>
-									<text class="text">{{sales.createTime}}</text>
+									<!-- {{sales.createTime}} -->
+									<text class="text">{{formattedCreateTime}} </text>
 								</view>
 
 							</view>
@@ -197,7 +198,7 @@
 				sales: {},
 				items: [],
 				order: null,
-				id:null,
+				id: null,
 				// 状态栏的高度
 				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
 
@@ -211,7 +212,38 @@
 		onShow() {
 			this.getStoreAfterSalesById()
 		},
-		methods: {
+		computed: {
+			formattedCreateTime() {
+				if (!this.sales.createTime) return '';
+
+				// 如果是时间戳格式
+				if (typeof this.sales.createTime === 'number') {
+					const date = new Date(this.sales.createTime);
+					return this.formatDate(date);
+				}
+
+				// 如果是字符串格式，尝试解析
+				const date = new Date(this.sales.createTime);
+				if (!isNaN(date.getTime())) {
+					return this.formatDate(date);
+				}
+
+				// 如果无法解析，返回原值
+				return this.sales.createTime;
+			},
+		},
+		methods: { // 日期格式化方法
+			formatDate(date) {
+				const year = date.getFullYear();
+				const month = String(date.getMonth() + 1).padStart(2, '0');
+				const day = String(date.getDate()).padStart(2, '0');
+				const hours = String(date.getHours()).padStart(2, '0');
+				const minutes = String(date.getMinutes()).padStart(2, '0');
+				const seconds = String(date.getSeconds()).padStart(2, '0');
+
+				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+			},
+
 			addDeliverySn() {
 				uni.navigateTo({
 					url: './refundOrderDelivery?id=' + this.id

pages_shopping/live/storeOrderDetail.vue

@@ -176,7 +176,7 @@
 						</view>
 						<view class="item">
 							<text class="label">下单时间</text>
-							<text class="text">{{order.createTime}}</text>
+							<text class="text">{{formattedCreateTime}}</text>
 						</view>
 						<view class="item">
 							<text class="label">支付方式</text>
@@ -282,13 +282,43 @@
 			};
 		},
 		onLoad(option) {
-			this.orderId = option.id
+			this.orderId = option.orderId
 			if (!option.orderCode) {}
 		},
 		onShow() {
 			this.getMyStoreOrderById()
 		},
-		methods: {
+		computed: {
+			formattedCreateTime() {
+				if (!this.order || !this.order.createTime) return '';
+
+				// 如果是时间戳格式
+				if (typeof this.order.createTime === 'number') {
+					const date = new Date(this.order.createTime);
+					return this.formatDate(date);
+				}
+
+				// 如果是字符串格式，尝试解析
+				const date = new Date(this.order.createTime);
+				if (!isNaN(date.getTime())) {
+					return this.formatDate(date);
+				}
+
+				// 如果无法解析，返回原值
+				return this.order.createTime;
+			},
+		},
+		methods: { // 日期格式化方法
+			formatDate(date) {
+				const year = date.getFullYear();
+				const month = String(date.getMonth() + 1).padStart(2, '0');
+				const day = String(date.getDate()).padStart(2, '0');
+				const hours = String(date.getHours()).padStart(2, '0');
+				const minutes = String(date.getMinutes()).padStart(2, '0');
+				const seconds = String(date.getSeconds()).padStart(2, '0');
+
+				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+			},
 			openDetails(item) {
 				console.log(item)
 				uni.navigateTo({
@@ -390,11 +420,7 @@
 					// url: './paymentOrder?orderId=' + this.order.orderId
 				})
 			},
-			// payRemain() {
-			// 	 uni.navigateTo({
-			// 	 	url: '/pages_user/user/paymentOrderRemain?orderId='+this.order.id
-			// 	 })
-			// },
+
 			// 返回上一页
 			back() {
 				let pages = getCurrentPages();

pages_shopping/live/success.vue

@@ -14,13 +14,13 @@
 				<view class="item">
 					<text class="label">订单编号</text>
 					<view class="sn-box">
-						<view class="text">{{orderCode}}</view>
-						<view class="copy-btn" @click="copyOrderSn(orderCode)">复制</view>
+						<view class="text">{{order.orderCode}}</view>
+						<view class="copy-btn" @click="copyOrderSn(order.orderCode)">复制</view>
 					</view>
 				</view>
 				<view class="item">
 					<text class="label">下单时间</text>
-					<text class="text">{{order.createTime}}</text>
+					<text class="text">{{formattedCreateTime}}</text>
 				</view>
 
 			</view>
@@ -31,83 +31,78 @@
 </template>
 
 <script>
-export default {
-  data() {
-    return {
-      order: null,
-      orderCode: "",
-      ids: []
-    }
-  },
-  onLoad(option) {
-    console.log("options是", option)
-    this.order = JSON.parse(decodeURIComponent(option.order))
-    console.log("this.order是", this.order)
-    
-    // orderCodes和ids字段表示店铺订单
-    this.orderCode = this.order.orderCode || '';
-    this.orderId = this.order.orderId ? this.order.orderId : '';
-    
-    // 转换时间格式
-    this.formatCreateTime();
-  },
-  methods: {
-    // 格式化创建时间
-    formatCreateTime() {
-      if (this.order && this.order.createTime) {
-        // 如果已经是时间戳格式
-        if (/^\d+$/.test(this.order.createTime)) {
-          const timestamp = parseInt(this.order.createTime);
-          this.order.createTime = this.formatDate(timestamp);
-        } 
-        // 如果是其他日期字符串格式
-        else {
-          const timestamp = new Date(this.order.createTime).getTime();
-          this.order.createTime = this.formatDate(timestamp);
-        }
-      }
-    },
-    
-    // 格式化日期
-    formatDate(timestamp) {
-      const date = new Date(timestamp);
-      const year = date.getFullYear();
-      const month = (date.getMonth() + 1).toString().padStart(2, '0');
-      const day = date.getDate().toString().padStart(2, '0');
-      const hours = date.getHours().toString().padStart(2, '0');
-      const minutes = date.getMinutes().toString().padStart(2, '0');
-      const seconds = date.getSeconds().toString().padStart(2, '0');
-      
-      return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-    },
-    
-    copyOrderSn(text) {
-      // 复制方法
-      uni.setClipboardData({
-        data: text,
-        success: () => {
-          uni.showToast({
-            title: '内容已成功复制到剪切板',
-            icon: 'none'
-          })
-        }
-      });
-    },
-    
-    goOrderDetails(id) {
-      console.log("id是", id)
-      if (id) {
-        uni.redirectTo({
-          url: "./storeOrderDetail?id=" + id
-        })
-      } else {
-        uni.navigateTo({
-          url: './order'
-        })
-      }
-    }
-  }
-}
+	export default {
+		data() {
+			return {
+				order: null,
+			}
+		},
+		onLoad(option) {
+			console.log("options是", option)
+			// this.order=JSON.parse(decodeURIComponent(option.order))
+			this.order = JSON.parse(decodeURIComponent(option.order))
+			console.log("this.order是", this.order)
+		},
+		computed: {
+			formattedCreateTime() {
+				if (!this.order || !this.order.createTime) return '';
+				
+				// 如果是时间戳格式
+				if (typeof this.order.createTime === 'number') {
+					const date = new Date(this.order.createTime);
+					return this.formatDate(date);
+				}
+				
+				// 如果是字符串格式，尝试解析
+				const date = new Date(this.order.createTime);
+				if (!isNaN(date.getTime())) {
+					return this.formatDate(date);
+				}
+				
+				// 如果无法解析，返回原值
+				return this.order.createTime;
+			},
+		},
+		methods: {
+			// 日期格式化方法
+			formatDate(date) {
+				const year = date.getFullYear();
+				const month = String(date.getMonth() + 1).padStart(2, '0');
+				const day = String(date.getDate()).padStart(2, '0');
+				const hours = String(date.getHours()).padStart(2, '0');
+				const minutes = String(date.getMinutes()).padStart(2, '0');
+				const seconds = String(date.getSeconds()).padStart(2, '0');
+				
+				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+			},
+			
+			copyOrderSn(text) {
+				// 复制方法
+				uni.setClipboardData({
+					data: text,
+					success: () => {
+						uni.showToast({
+							title: '内容已成功复制到剪切板',
+							icon: 'none'
+						})
+					}
+				});
+			},
+			goOrderDetails(id) {
+				console.log("id是", id)
+				if (id) {
+					uni.redirectTo({
+						url: "./storeOrderDetail?orderId=" + this.order.orderId
+					})
+
+				} else {
+					uni.navigateTo({
+						url: './order'
+					})
+				}
+			}
+		}
+	}
 </script>
 
 <style lang="scss">