add

common/request.js

@@ -39,8 +39,8 @@ export default class Request {
   
   http(router, data = {}, method, contentType, showLoading = true) {
     let that = this;
-    // let path = 'https://live.test.ylrztop.com/live-api'; // 余红奇
-	let path = 'http://192.168.10.166:7114'; // 余红奇
+    let path = 'https://live.test.ylrztop.com/live-api'; // 余红奇
+	// let path = 'http://192.168.10.166:7114'; // 余红奇
     
     // 检查是否应该显示loading
     const shouldShowLoading = showLoading && 

core/config/defaultConfig.js

@@ -14,8 +14,8 @@ const productionUrl = 'https://wanbei.monvkeji.cn/'
 // 测试环境
 const testUrl = 'https://wanbei.monvkeji.cn/'
 // 开发环境
-// const developUrl = 'https://live.test.ylrztop.com/live-api/'//余红奇
-const developUrl = 'http://192.168.10.166:7114/'//余红奇
+const developUrl = 'https://live.test.ylrztop.com/live-api/'//余红奇
+// const developUrl = 'http://192.168.10.166:7114/'//余红奇
 // const developUrl = 'http://v56c9b8e.natappfree.cc/'//余红奇
 // const developUrl = 'http://nd383294.natappfree.cc/'//余红奇
 // const developUrl = 'http://192.168.10.170:7114/'//陈果

manifest.json

@@ -7,6 +7,10 @@
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
+		 "softinput": {
+		      "adjustResize": false,  // 禁止窗口大小调整
+		      "adjustPan": false      // 禁止窗口平移（关键：避免页面上移）
+		    },
         "compatible" : {
             "ignoreVersion" : true
         },

pages.json

@@ -208,16 +208,7 @@
 						}
 					}
 				},
-				{
-					"path": "confirmPackageOrder",
-					"style": {
-						"navigationBarTitleText": "确认支付",
-						"navigationBarTextStyle": "black",
-						"app-plus": {
-							"bounce": "none"
-						}
-					}
-				}, {
+				 {
 					"path": "storeOrder",
 					"style": {
 						"navigationBarTitleText": "订单",
@@ -297,23 +288,25 @@
 						"titleNView": false
 					}
 				}
-			}, {
-				"path": "integral",
-				"style": {
-					"navigationBarTitleText": "我的芳华币",
-					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#ffffff",
-					"navigationBarTextStyle": "black"
-				}
-			}, {
-				"path": "integralGoodsList",
-				"style": {
-					"navigationBarTitleText": "芳华币商城",
-					"enablePullDownRefresh": false,
-					"navigationBarBackgroundColor": "#ffffff",
-					"navigationBarTextStyle": "black"
-				}
-			}, {
+			}, 
+			// {
+			// 	"path": "integral",
+			// 	"style": {
+			// 		"navigationBarTitleText": "我的芳华币",
+			// 		"enablePullDownRefresh": false,
+			// 		"navigationBarBackgroundColor": "#ffffff",
+			// 		"navigationBarTextStyle": "black"
+			// 	}
+			// }, {
+			// 	"path": "integralGoodsList",
+			// 	"style": {
+			// 		"navigationBarTitleText": "芳华币商城",
+			// 		"enablePullDownRefresh": false,
+			// 		"navigationBarBackgroundColor": "#ffffff",
+			// 		"navigationBarTextStyle": "black"
+			// 	}
+			// },
+			{
 				"path": "addAddress",
 				"style": {
 					"navigationBarTitleText": "新建收货地址",

pages/home/living.vue

@@ -9,7 +9,7 @@
 						<image @click="goBack" class="w60 h64 mr26" src="/static/images/live/return.png">
 						</image>
 						<view class="align-center"
-							style="padding: 6rpx 4rpx;height: 64rpx;background: rgba(0,0,0,0.5);border-radius: 32rpx;">
+							style="padding: 6rpx 8rpx;height: 64rpx;background: rgba(0,0,0,0.5);border-radius: 32rpx;">
 							<u-avatar :src="liveItem.liveImgUrl||$img.logo" size="32"></u-avatar>
 							<view class="colorf ml10 mr6">
 								<view>{{liveItem.liveName?truncateString(liveItem.liveName,8):"未命名"}}</view>
@@ -78,17 +78,21 @@
 						{{orderUser.count || 0}}
 						人正在去购买</text>
 				</view>
-
-				<view class="videolist" style="margin: auto 0">
-					<view class="video" style="height:100vh">
+				<!-- style="margin: auto 0" -->
+				<view class="videolist">
+					<view class="video" :class="liveItem.showType == 1 ? 'video_row' : ''">
 						<!-- 视频组件 -->
-						<live-player v-if=" liveItem.livingUrl && liveItem.liveType === 1"
-							:id="'myLivePlayer_' + liveId" :class="liveItem.showType == 1 ? 'video_row' : 'videotop'"
-							:src="liveItem.livingUrl" autoplay mode="live" object-fit="contain" :waiting="false"
-							:muted="false" :orientation="liveItem.showType == 1 ? 'horizontal' : 'vertical'"
+						<!-- <live-player v-if=" liveItem.livingUrl && liveItem.liveType === 1"
+							:id="'myLivePlayer_' + liveId" :src="liveItem.livingUrl" autoplay mode="live"
+							object-fit="contain" :waiting="false" :muted="false"
+							:orientation="liveItem.showType == 1 ? 'horizontal' : 'vertical'"
 							@statechange="onLiveStateChange($event, liveItem)" @error="onLiveError($event, liveItem)"
-							class="live-player"></live-player>
-
+							class=" item"></live-player> -->
+						<live-player v-if="liveItem.livingUrl && liveItem.liveType === 1" :id="'myLivePlayer_' + liveId"
+							:src="liveItem.livingUrl" autoplay mode="live" object-fit="contain" :muted="false"
+							orientation="vertical" :enable-play-gesture="true"
+							@statechange="onLiveStateChange($event, liveItem)" @error="onLiveError($event, liveItem)"
+							class="item"></live-player>
 
 						<!-- 	<video v-if="currentSwiperIndex === index && liveItem.livingUrl"
               :id="'myVideo_' + liveItem.liveId"
@@ -103,27 +107,39 @@
 							:custom-cache="false" :enable-progress-gesture="false" vslide-gesture-in-fullscreen='true'
 							:show-center-play-btn="false" :http-cache="false" loop @error="videoError">
 						</video> -->
-
-						<video v-if="liveItem.videoUrl" :id="`myVideo_${liveId}`"
-							:class="liveItem.showType == 1 ? 'video_row' : 'videotop'" :src="liveItem.videoUrl"
-							:autoplay="true" :controls="false" object-fit="contain" :custom-cache="false"
-							:enable-progress-gesture="false" vslide-gesture-in-fullscreen="true"
+						<!-- 录播 -->
+						<video v-if="liveItem.videoUrl&&liveItem.liveType==2" :id="`myVideo_${liveId}`" class="item"
+							:src="liveItem.videoUrl" :autoplay="true" :controls="false" object-fit="contain"
+							:custom-cache="false" :enable-progress-gesture="false" vslide-gesture-in-fullscreen="true"
 							:show-center-play-btn="false" :http-cache="false" loop @error="videoError"
 							@timeupdate="onVideoTimeUpdate" @loadeddata="onVideoLoaded"
 							@loadedmetadata="onVideoMetaLoaded" @pause="onVideoPause" @play="onVideoPlay">
 						</video>
-						<view v-if="liveItem.videoUrl" class="time">{{liveItem.totalTime}}</view>
+
+						<!-- 直播回放 -->
+						<!-- :enable-progress-gesture="true" -->
+						<video v-if="liveItem.videoUrl&&liveItem.liveType==3" :id="`myVideo_${liveId}`" class="item"
+							:src="liveItem.videoUrl" :autoplay="true" :controls="true" object-fit="contain"
+							:custom-cache="false" :enable-progress-gesture="liveItem.isSpeedAllowed"
+							vslide-gesture-in-fullscreen="true" :show-center-play-btn="true" :http-cache="false" loop
+							@error="videoError" @timeupdate="onVideoTimeUpdate" @loadeddata="onVideoLoaded"
+							@loadedmetadata="onVideoMetaLoaded" @pause="onVideoPause" @play="onVideoPlay"
+							@seek="onVideoSeek">
+						</video>
+						<!-- v-if="liveItem.liveType" -->
+						<view v-if="liveItem.videoUrl&&liveItem.liveType==2" class="time">{{liveItem.totalTime}}</view>
+						<view v-if="liveItem.videoUrl&&liveItem.liveType==3" class="lable">直播回放</view>
 					</view>
 				</view>
 
 				<!-- 底部聊天区域 -->
-				<view class="pb40 mt90 " style="position: fixed;bottom: 120rpx;width: 100%;">
-					<view class="w100 h500 mt20">
-						<scroll-view enable-flex scroll-y="true" class="talk p20 scrolly flex-1 column"
+				<view class="pb40  " style="position: fixed;bottom: 120rpx;width: 100%;">
+					<view class="w100  mt20" style="height: 35vh;">
+						<scroll-view enable-flex scroll-y="true" class=" p20 scrolly flex-1 column"
 							style="width: calc(100% - 40rpx);height: calc(100% - 40rpx);"
 							:scroll-into-view="scrollIntoView">
-							<view>
-								<view class="list justify-start" v-for="(item,talkIndex) in talklist" :key="talkIndex"
+							<!-- <view>
+								<view class="list justify-start" v-for="(item,talkIndex) in inAndOut" :key="talkIndex"
 									v-show="item.cmd=='announcement'">
 									<view class="talk-list ml16 justify-start">
 										<view class="fs30">
@@ -132,7 +148,7 @@
 										</view>
 									</view>
 								</view>
-							</view>
+							</view> -->
 
 							<view class="list justify-start" v-for="(item,talkIndex) in talklist" :key="talkIndex"
 								:id="`list_${talkIndex}`" v-show="item.cmd!='red'&&item.cmd!='out'&&item.cmd!='entry'">
@@ -144,13 +160,12 @@
 								</view>
 							</view>
 							<view v-if="showWelcomeMessage" class="welcome-message">
-								<view class="list justify-start" v-for="(item,talkIndex) in talklist" :key="talkIndex"
-									v-show="item.cmd=='entry'||item.cmd=='out'">
+								<view class="list justify-start" v-show="inAndOut.cmd=='entry'||inAndOut.cmd=='out'">
 									<view class="talk-list ml16 justify-start">
 										<view class="fs30">
-											<text style="color: #ff89d6;">{{item.nickName}} </text>
+											<text style="color: #ff89d6;">{{inAndOut.nickName}} </text>
 											<text class='colorf'>
-												{{item.msg}}直播间{{liveItem.messageContent}}</text>
+												{{inAndOut.msg}}直播间{{liveItem.messageContent}}</text>
 										</view>
 									</view>
 								</view>
@@ -176,7 +191,27 @@
 					</view>
 				</view>
 			</view>
-			<u-popup :show="isShowGoods" @close="!isShowGoods" round='20rpx' mode="center" zIndex='10099'
+
+			<view class="goods" v-if="isShowGoods">
+				<view class="top">
+					<view class="left">
+						<image class="w30 h30 mr8" src="/static/images/signal.png"></image>讲解中
+					</view>
+					<image class="w44 h44 mr10" src="/static/images/close.png" @click="isShowGoods=false">
+					</image>
+				</view>
+				<image class="photo" :src="goodsCard?.imgUrl"></image>
+				<view class="item">
+					<view class="price"><text class="red">￥{{goodsCard?.price}} </text><text
+							class="del">￥{{goodsCard?.otPrice}}</text></view>
+					<view class="title oneline-hide">{{goodsCard?.productName}}</view>
+					<view class="button" @click="goShop(goodsCard?.productId,goodsCard?.goodsId)">
+						立即抢购
+					</view>
+				</view>
+			</view>
+
+			<!-- <u-popup :show="isShowGoods" @close="!isShowGoods" round='20rpx' mode="center" zIndex='10099'
 				bgColor='#ffffff'>
 				<view class="goods">
 					<view class="top">
@@ -196,7 +231,7 @@
 						</view>
 					</view>
 				</view>
-			</u-popup>
+			</u-popup> -->
 			<u-popup :show="isShowLotteryPop" @close="!isShowLotteryPop" round='40rpx'>
 				<view class="prize-box" style="border-radius: 40rpx;height: fit-content;">
 					<image class="nav-img " src="/static/images/red_head.png" mode="widthFix"></image>
@@ -235,24 +270,12 @@
 								<ThreeItemSwiper :products="lotteryProducts"></ThreeItemSwiper>
 							</view>
 
-
 							<!-- <view class="item-group">
-								<view class="item" v-for="(item,index) in lotteryProducts" :key="index">
-									<image class="w280 h280" :src="item.imgUrl"></image>
-									<view v-show="true" class="title">{{item.prizeLevel}}等奖</view>
-									<view v-show="true" class="txt">{{item.productName}}</view>
-								</view>
 								<view class="item center">
 									<image class="w280 h280" src="/static/images/img.png"></image>
 									<view v-show="true" class="title">二等奖</view>
 									<view v-show="true" class="txt">新用户免费领礼品弹窗</view>
 								</view>
-
-								<view class="item">
-									<image class="w280 h280" src="/static/images/img.png"></image>
-									<view v-show="false" class="title">二等奖</view>
-									<view v-show="false" class="txt">新用户免费领礼品弹窗</view>
-								</view>
 							</view> -->
 							<view class="point-group" v-for="(item,index) in lotteryProducts" :key="index">
 								<!-- <view class="item" v-if="item.length"
@@ -296,14 +319,17 @@
 					</view>
 				</view>
 			</u-popup>
+			<!-- :show="isShowPrize" -->
 
-			<u-popup :show="isShowPrize" @close="!isShowPrize" round='20rpx' mode="center" bgColor='#fff' zIndex='10076'>
+			<u-popup :show="isShowPrize" @close="!isShowPrize" round='20rpx' mode="center" bgColor='#fff'
+				zIndex='10076'>
 				<view class="prize-card">
-					<view class="title">位幸运观众</view>
+					<view class="title">{{prizeInfo.length}}位幸运观众</view>
 					<view class="prize-content" v-for="(item,index) in prizeInfo" :key="index">
-						<view class="name">{{item.userName}}</view>
-						<view class="txt ">{{item.prizeLevel}}等奖</view>
+						<view>{{item.userName}}</view>
+						<view class="txt">{{item.prizeLevel}}等奖</view>
 					</view>
+					<view class="tip">请联系管理员领取</view>
 					<view class="button" @click="isShowPrize=flase">确认</view>
 				</view>
 			</u-popup>
@@ -329,7 +355,7 @@
 			</u-popup>
 
 			<!-- 商品弹窗 -->
-			<u-popup :show="shopping" @close="closeShop" @open="openShop" round='20rpx' bgColor='f3f5f9' zIndex='10070'>
+			<u-popup :show="shopping" @close="closeShop" round='20rpx' bgColor='f3f5f9' zIndex='10075'>
 				<view class="shoppop">
 					<view class="shoppop-top">
 						<!-- <u-avatar :src="store.logoUrl" size="36" class="ml16"></u-avatar> -->
@@ -413,8 +439,8 @@
 	import {
 		getlive,
 	} from '@/api/home'
-	// var wsUrl = "wss://live.test.ylrztop.com/ws/live-api/app/webSocket"; //余红奇
-	var wsUrl = "ws://192.168.10.166:7114/app/webSocket"; //余红奇
+	var wsUrl = "wss://live.test.ylrztop.com/ws/live-api/app/webSocket"; //余红奇
+	// var wsUrl = "ws://192.168.10.166:7114/app/webSocket"; //余红奇
 	var pingpangTimes = null;
 	var initTimes = null;
 	var isSocketOpen = false;
@@ -429,7 +455,7 @@
 				videoCurrentTime: 0, // 当前视频播放时间
 				isVideoPlaying: false, // 视频是否正在播放
 				videoProgressKey: '', // 存储进度的key
-
+				inAndOut: {},
 
 				isShowPrize: false,
 				prizeInfo: [],
@@ -575,12 +601,12 @@
 		},
 		computed: {
 			filteredViewers() {
-				// 若 liveViewers 是 null/undefined/非数组，返回空数组
-				if (!Array.isArray(this.liveViewers)) {
+				// 先判断是否为数组，再判断长度，避免 null/undefined 报错
+				if (!Array.isArray(this.liveViewers) || this.liveViewers.length === 0) {
 					return [];
 				}
 				return this.liveViewers.slice(0, 3);
-			},
+			}
 			// payLimitTime() {
 			// 	return this.order?.updateTime ?
 			// 		dayjs(this.order.updateTime).add(2, 'day').format('YYYY-MM-DD HH:mm:ss') :
@@ -603,6 +629,7 @@
 		},
 		mounted() {
 			this.getCurrentActivities();
+			this.getliveOrder()
 		},
 		onUnload() {
 			// 页面卸载时保存视频进度
@@ -671,8 +698,8 @@
 			}
 		},
 		methods: {
+			// 录播时间点
 			onVideoMetaLoaded(e) {
-				console.log('视频元数据加载完成');
 				// 设置存储key
 				this.videoProgressKey = `videoProgress_${this.liveId}`;
 
@@ -680,7 +707,6 @@
 				uni.getStorage({
 					key: this.videoProgressKey,
 					success: (res) => {
-						console.log('获取到保存的播放进度:', res.data);
 						this.videoCurrentTime = res.data;
 
 						// 设置视频播放位置
@@ -728,7 +754,7 @@
 
 				if (videoContext) {
 					videoContext.seek(time);
-					console.log(`设置视频播放位置: ${time}秒`);
+					// console.log(`设置视频播放位置: ${time}秒`);
 				}
 			},
 
@@ -751,17 +777,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
 			onChange(e) {
 				this.timeData = e
 			},
@@ -806,7 +821,7 @@
 
 				// 抽奖查询
 				liveLottery(data).then(res => {
-						this.isShowLottery = false
+						// this.isShowLottery = false
 						this.isShowLotteryPop = true
 						if (res.code == 200) {
 							this.lotteryList = res.data
@@ -851,20 +866,23 @@
 			inputBlur() {
 				this.isFocus = false
 			},
+
 			//正在购买
-			async getliveOrder() {
 
-				try {
-					const res = await liveOrderUser(this.liveId);
-					if (res.code === 200) {
-						this.orderUser = res; // 同步全局变量
-					}
-				} catch (error) {
-					console.error('获取正在购买用户失败:', error);
+			getliveOrder(item) {
+				if (!this.liveId) {
+					return;
 				}
-			},
-			openShop() {
-				this.shopping = true
+				liveOrderUser(this.liveId).then(res => {
+						console.log("正在购买", res)
+						if (res.code == 200) {
+							this.orderUser = res; // 同步全局变量
+						} else {
+							console.error('获取正在购买用户失败:', error);
+						}
+					},
+					rej => {}
+				);
 			},
 			onLiveStateChange(e, liveItem) {
 				// console.log('直播状态变化:', e.detail.code, e.detail);
@@ -904,7 +922,6 @@
 
 							// 抽奖
 							this.lotteryTime = this.lotteryInfo?.duration * 60 * 1000
-							console.log("毫秒", this.lotteryTime)
 
 							if (this.goodsCard && this.goodsCard.status == 1) {
 
@@ -1123,6 +1140,14 @@
 								videoContext.play();
 							});
 						}
+					} else if (liveItem.liveType === 3 && liveItem.videoUrl) {
+						const videoId = `myVideo_${this.liveId}`;
+						const videoContext = uni.createVideoContext(videoId, this);
+						if (videoContext) {
+							videoContext.pause(() => {
+								videoContext.play();
+							});
+						}
 					}
 				} catch (error) {
 					console.error("播放视频失败:", error);
@@ -1171,28 +1196,21 @@
 
 			// 获取直播间用户
 			async getliveUser(isLoadMore = false) {
-				// 强制使用当前 liveId，避免使用旧值
-
 				this.viewLoading = true;
 				try {
-					const res = await watchUserList(this.liveId, this.viewPageSize, this.viewPageNum,
-						false);
+					const res = await watchUserList(this.liveId, this.viewPageSize, this.viewPageNum, false);
 					if (res.code === 200) {
-						// 若请求期间已切换直播间，忽略旧数据
-
-						this.liveUserTotal = res.total;
-						if (res.rows.length === 0) {
-							this.viewNoMoreData = true;
-							return;
-						}
-
-						this.liveViewers = isLoadMore ? [...this.liveViewers, ...res.rows] : res
-							.rows; // 首次加载/切换直播间时重置数据
+						this.liveUserTotal = res.total || 0;
+						// 强制将 rows 转为数组（防止接口返回 null/undefined）
+						const newRows = Array.isArray(res.rows) ? res.rows : [];
+						// 加载更多时合并数组，首次加载直接赋值（确保始终是数组）
+						this.liveViewers = isLoadMore ? [...this.liveViewers, ...newRows] : newRows;
 						this.viewPageNum++;
-						// console.log("在线观众", this.liveViewers)
 					}
 				} catch (error) {
 					console.error('获取观众列表失败:', error);
+					// 异常时重置为数组，避免后续报错
+					this.liveViewers = [];
 				} finally {
 					this.viewLoading = false;
 				}
@@ -1523,7 +1541,7 @@
 			initSocket() {
 
 
-				if (this.liveId == null) return;
+				if (!this.liveId||this.userinfo?.userId ) return;
 
 				// 设置正在连接的直播间ID
 				// this.connectingLiveId = liveId;
@@ -1610,18 +1628,18 @@
 								this.isShowLottery = false
 							}, time * 60000)
 							this.lotteryTime = time * 60 * 1000
-							// console.log("毫秒",this.lotteryTime)
 							// this.convertMinutesToHoursMinutes(time)
 						} else {
 							this.isShowLottery = false
 						}
 					} else if (socketMessage.cmd == 'entry' || socketMessage.cmd ==
 						'out') {
-						const oldList = this.talklist || [];
+
+						// const oldList = this.talklist || [];
 						// 创建新数组并添加元素
-						const newList = [...oldList, messageData];
+
 						// 1. 将消息追加到当前直播间的talklist中（响应式更新）
-						this.talklist = newList;
+						this.inAndOut = socketMessage;
 						this.showWelcomeMessage = false;
 						this.showWelcomeMessage = true;
 						this.getliveUser(false);
@@ -1636,7 +1654,8 @@
 						}
 					} else if (socketMessage.cmd == 'LotteryDetail') {
 						this.prizeInfo = JSON.parse(socketMessage.data);
-						this.isShowPrize = socketMessage.status === 1;
+						this.isShowPrize = true;
+						this.isShowLottery = false
 					} else if (socketMessage.cmd == 'blockUser') {
 						uni.removeStorage({
 							key: 'AppToken',
@@ -1709,11 +1728,6 @@
 </script>
 
 <style scoped lang="scss">
-	.live-player {
-		width: 100%;
-		height: 100%;
-	}
-
 	.swiper-wrapper {
 		position: relative;
 		width: 100%;
@@ -1891,7 +1905,7 @@
 
 		.activity-box {
 			position: fixed;
-			top: 220rpx;
+			top: 188rpx;
 			left: 30rpx;
 			z-index: 5;
 			display: flex;
@@ -1900,8 +1914,8 @@
 			.item-box {
 				border-radius: 16rpx;
 				background-color: rgba(77, 77, 77, 0.5);
-				width: 80rpx;
-				height: 90rpx;
+				width: 90rpx;
+				height: 100rpx;
 				margin-right: 20rpx;
 				position: relative;
 
@@ -1910,7 +1924,7 @@
 					width: 100%;
 					bottom: 0;
 					color: #fafcff;
-					font-size: 20rpx;
+					font-size: 26rpx;
 					background-color: rgba(15, 15, 15, 0.8);
 					border-radius: 16rpx;
 					text-align: center;
@@ -2030,30 +2044,47 @@
 
 	.videolist {
 		position: relative;
+		height: 100vh;
+		width: 100%;
+
 
 		.video {
 			height: 100vh;
-			/* 占屏幕高度的80% */
 			width: 100%;
 			background-color: rgba(57, 57, 57, 0.4);
 
+			.item {
+				width: 100%;
+				height: 100%;
+			}
+
 			.time {
+
 				color: #ffffff;
 				font-size: 20rpx;
 				margin-left: 10rpx;
 			}
 
-			.videotop {
-				width: 100%;
-				height: 100%;
+			.lable {
+				position: absolute;
+				top: 50rpx;
+				right: 16rpx;
+				background-color: rgba(57, 57, 57, 0.6);
+				padding: 4rpx 10rpx;
+				color: #fff;
+				border-radius: 15rpx;
 			}
 
-			.video_row {
-				width: 100%;
-				max-height: 500rpx;
-				overflow: hidden;
-				margin-top: 360rpx;
-			}
+
+		}
+
+		.video_row {
+			position: absolute;
+			top: 18%;
+			max-height: 500rpx;
+			z-index: 99;
+
+
 		}
 
 	}
@@ -2073,31 +2104,34 @@
 		}
 
 		.prize-content {
+			width: 100%;
 			display: flex;
-			flex-direction: column;
-
-			.name {
-				font-size: 32rpx;
-				font-weight: 600;
-			}
+			justify-content: space-between;
+			align-items: center;
+			font-size: 30rpx;
+			margin-bottom: 10rpx;
 
 			.txt {
-				font-size: 28rpx;
-				color: #C32008;
+				font-weight: 600;
 			}
 
+		}
 
+		.tip {
+			font-size: 30rpx;
+			color: #222222;
+			margin: 30rpx 0;
 		}
 
 		.button {
-			width: 392rpx;
-			height: 96rpx;
-			line-height: 96rpx;
-			background: linear-gradient(180deg, #FFF4D5 0%, #FFE5B1 100%);
-			border-radius: 48rpx 48rpx 48rpx 48rpx;
-			font-weight: 600;
-			font-size: 36rpx;
-			color: #C32008;
+			width: 200rpx;
+			height: 70rpx;
+			line-height: 70rpx;
+			background: linear-gradient(180deg, #ff7c30 0%, #FF3A1E 100%);
+			border-radius: 28rpx;
+			font-weight: 500;
+			font-size: 32rpx;
+			color: #ffffff;
 			text-align: center;
 		}
 
@@ -2220,14 +2254,14 @@
 
 	.goods {
 		position: fixed;
-		top: 50%;
-		left: 50%;
-		transform: translate(-50%, -50%);
+		bottom: 140rpx;
+		right: 100rpx;
+		// transform: translate(-50%, -50%);
 		z-index: 5;
 		background-color: #fff;
 		border-radius: 20rpx;
 		overflow: hidden;
-		width: 400rpx;
+		width: 280rpx;
 		padding: 4rpx;
 
 		.top {
@@ -2244,7 +2278,7 @@
 			.left {
 				background-color: rgba(0, 0, 0, 0.8);
 				padding: 12rpx;
-				font-size: 26rpx;
+				font-size: 22rpx;
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
@@ -2254,7 +2288,7 @@
 
 		.photo {
 			width: 100%;
-			height: 400rpx;
+			height: 180rpx;
 			border-radius: 16rpx 16rpx 0 0;
 			overflow: hidden;
 		}
@@ -2263,7 +2297,7 @@
 			padding: 4rpx;
 
 			.price {
-				font-size: 34rpx;
+				font-size: 30rpx;
 
 				.red {
 					color: #FF5701;
@@ -2281,7 +2315,7 @@
 
 			.title {
 				font-weight: 500;
-				font-size: 34rpx;
+				font-size: 30rpx;
 				margin: 10rpx 0 12rpx;
 			}
 
@@ -2292,7 +2326,7 @@
 				padding: 16rpx 0;
 				border-radius: 10rpx;
 				font-weight: 500;
-				font-size: 34rpx;
+				font-size: 30rpx;
 			}
 
 		}

pages_shop/confirmCreateOrder.vue

@@ -443,9 +443,8 @@
 						url: `/pages_shop/paymentOrder?orderList=${orderListStr}`
 					});
 				} catch (error) {
-					console.error('订单创建失败:', error);
 					uni.showToast({
-						title: '提交失败',
+						title: res.msg,
 						icon: 'none'
 					});
 				}

pages_shop/confirmPackageOrder.vue

@@ -1,720 +0,0 @@
-<template>
-	<view>
-		<view class="inner-box">
-			<!-- 收货人 -->
-			<view class="address-box" v-if="address==null" @click="openAddress()">
-				<view class="left">
-					<view class="name-box">
-						<text class="text name">添加收货地址</text>
-					</view>
-				</view>
-				<view class="arrow-box">
-					<image src="/static/images/arrow_gray.png" mode=""></image>
-				</view>
-			</view>
-			<view class="address-box" v-if="address!=null" @click="openAddress()">
-				<view class="left">
-					<view class="name-box">
-						<text class="text name">{{address.realName}}</text>
-						<text class="text" v-if="address.phone!=null">{{utils.parsePhone(address.phone)}}</text>
-					</view>
-					<view class="address">
-						{{address.province}}{{address.city}}{{address.district}}{{address.detail}}
-					</view>
-				</view>
-				<view class="arrow-box">
-					<image src="/static/images/arrow_gray.png" mode=""></image>
-				</view>
-			</view>
-			<!-- 药品列表 -->
-			<view class="goods-list">
-				<view  class="item">
-					<view class="img-box">
-						<image :src="package.imgUrl" mode="aspectFill"></image>
-					</view>
-					<view class="info-box">
-						<view>
-							<view class="name-box ellipsis2">
-								{{package.title}}
-							</view>
-							<view class="spec ellipsis2">{{package.descs}}</view>
-						</view>
-						
-						<view class="price-num">
-							<view class="price">
-								<text class="unit">¥</text>
-								<text class="num" v-if="package.payMoney!=null">{{package.payMoney.toFixed(2)}}</text>
-							</view>
-						</view>
-					</view>
-				</view>
-				<!-- 小计 -->
-				<view class="sub-total">
-					<text class="label">合计：</text>
-					<view class="price">
-						<text class="unit">¥</text>
-						<text class="num" v-if="package.payMoney!=null">{{package.payMoney.toFixed(2)}}</text>
-					</view>
-				</view>
-			</view>
-			 
-			<view class="points" @click="openCoupon()">
-				<view class="left">
-					<text class="text">优惠券</text>
-				</view>
-				<view class="right">
-					<text class="text">{{couponText}}</text>
-					<image src="/static/images/arrow4.png" mode=""></image>
-				</view>
-			</view>
-			<!-- 备注 -->
-			<view class="remarks">
-				<input type="text" v-model="form.mark" placeholder="备注留言（选填）" placeholder-class="input" />
-			</view>
-		</view>
-		<!-- 底部按钮 -->
-		<view class="btn-foot">
-			<view class="right">
-				<view class="total">
-					<text class="label">应付金额：</text>
-					<view class="price">
-						<text class="unit">¥</text>
-						<text class="num" v-if="totalMoney!=null">{{totalMoney.toFixed(2)}}</text>
-					</view>
-				</view>
-				<view class="btn" @click="submitOrder">提交订单</view>
-			</view>
-		</view>
-		<popupBottom ref="popup" :visible.sync="couponVisible" title=" " bgColor="#f5f5f5"  radius="30"    maxHeight="60%">
-		     <view class="coupon" style="height:650rpx;">
-				 <div class="coupon-list" v-if="couponsList.length > 0">
-				   <div class="item acea-row row-center-wrapper"  v-for="(item, index) in couponsList" :key="index">
-				     <div class="money" >
-				       <image v-if="item.status==0" class="img" src="/static/images/coupon1.png" mode="widthFix"></image>
-				 	  <image v-if="item.status!=0" class="img" src="/static/images/coupon2.png" mode="widthFix"></image>
-				 	  <div style="z-index: 999;">
-				         ￥<span class="num">{{ item.couponPrice }}</span>
-				       </div>
-				       <div class="pic-num"  >满{{ item.useMinPrice }}元可用</div>
-				     </div>
-				     <div class="text">
-				       <div class="condition line1">
-				         {{ item.couponTitle }}
-				       </div>
-				       <div class="data acea-row row-between-wrapper">
-							<div >{{ item.limitTime }}到期</div>
-							<div class="bnt bg-color-red" @click="couponSelect(item)"  >选择</div>
-				       </div>
-				     </div>
-				   </div>
-				 </div>
-				 <view v-if="couponsList.length == 0" class="no-data-box" >
-				 	<image src="/static/images/no_data.png" mode="aspectFit"></image>
-				 	<view class="empty-title">暂无数据</view>
-				 </view>
-			 </view>
-			 
-		</popupBottom>
-	</view>
-</template>
-
-<script>
-	// import {getWeixinTemps} from '@/api/common'
-	// import {confirmPackageOrder,computedPackageOrder,createPackageOrder} from '@/api/storeOrder'
-	// import { getMyEnableCouponList } from '@/api/coupon'
-	 
-	import EvanSwitch from '@/components/evan-switch/evan-switch.vue'
-	import popupBottom from '@/components/px-popup-bottom/px-popup-bottom.vue'
-	export default {
-		components: {
-			EvanSwitch,
-			popupBottom
-		},
-		data() {
-			return {
-				liveId:null,
-				temps:[],
-				totalMoney:0,
-				couponUserId:null,
-				couponText:"请选择",
-				couponsList:[],
-				couponVisible:false,
-				companyUserId:null,
-				packageId:null,
-				address:null,
-				package:{},
-				// checked: false,
-				// type:null,
-				// cartIds:null,
-				form:{
-					// useIntegral:0,
-					orderKey:null,
-					addressId:null,
-					mark:null,
-				}
-				
-			}
-		},
-		onLoad(option) {
-			// this.liveId=otion.liveId
-			
-			
-			// this.packageId=option.packageId;
-			// this.companyUserId=option.companyUserId;
-			// this.confirmPackageOrder();
-			// uni.$on('updateAddress', (e) => {
-			// 	this.address=e;
-			// 	this.form.addressId=e.id;
-			// })
-			// this.getWeixinTemps();
-		},
-		onShow() {
-			
-		},
-		methods: {
-			getWeixinTemps:function(){
-				getWeixinTemps().then(
-					res => {
-						if(res.code==200){
-							this.temps=res.temp
-						}else{
-							 
-						}
-					},
-					rej => {}
-				);
-			},
-			couponSelect(item){
-				this.couponText="-¥"+item.couponPrice.toFixed(2);
-				this.couponUserId=item.id;
-				this.couponVisible=false;
-				this.computedPackageOrder();
-			},
-			openCoupon(){
-				let that = this;
-				var data={packageCateId:this.package.cateId,couponType:1,useMinPrice:this.totalMoney};
-				getMyEnableCouponList(data).then(res => {
-				  this.couponVisible=true;
-				  that.couponsList = res.data
-				})
-			},
-			confirmPackageOrder(){
-				let data = {packageId:this.packageId,couponUserId:this.couponUserId};
-				confirmPackageOrder(data).then(
-					res => {
-						if(res.code==200){
-							 this.form.orderKey=res.orderKey;
-							 this.address=res.address;
-							 this.package=res.package;
-							 if(res.address!=null){
-								 this.form.addressId=res.address.id;
-							 }
-							 this.totalMoney=res.totalMoney;
-							 
-						}else{
-							
-							uni.showToast({
-								icon:'none',
-								title: res.msg,
-							});
-						}
-					},
-					rej => {}
-				);
-			},
-			computedPackageOrder(){
-				let data = {packageId:this.packageId,couponUserId:this.couponUserId};
-				computedPackageOrder(data).then(
-					res => {
-						if(res.code==200){
-							 this.totalMoney=res.totalMoney;
-							 
-						}else{
-							
-							uni.showToast({
-								icon:'none',
-								title: res.msg,
-							});
-						}
-					},
-					rej => {}
-				);
-			},
-		 
-			// 提交订单
-			submitOrder() {
-				var that=this;
-				if(this.form.orderKey==null){
-					uni.showToast({
-						icon:'none',
-						title: '订单KEY不存在',
-					});
-					return;
-				}
-				if(this.form.addressId==null){
-					uni.showToast({
-						icon:'none',
-						title: '收货地址不能为空',
-					});
-					return;
-				}
-				
-				uni.requestSubscribeMessage({
-					tmplIds: this.temps,
-					success(res) {
-						 that.createPackageOrder();
-					},
-					fail(res) {
-						that.createPackageOrder();
-					}
-				})
-				
-				
-			},
-			createPackageOrder(){
-				var that=this;
-				uni.showLoading({
-					title: '正在处理中...'
-				});
-				let data = {couponUserId:this.couponUserId,mark:this.form.mark,orderKey:this.form.orderKey,addressId:this.form.addressId,packageId:this.packageId,companyUserId:this.companyUserId};
-				createPackageOrder(data).then(
-					res => {
-						uni.hideLoading()
-						if(res.code==200){
-							if(res.order.isPrescribe==1){
-								setTimeout(function(){
-									uni.redirectTo({
-										url:"prescribe?orderId="+res.order.id
-									})
-								},200);
-							}
-							else{
-								setTimeout(function(){
-									uni.redirectTo({
-										url: './paymentOrder?orderId='+res.order.id
-									})
-								},200);
-							}
-							return;
-						}
-						else{
-							if(res.code==501){
-								uni.showToast({
-									icon:'none',
-									title: res.msg,
-								});
-								setTimeout(function(){
-									uni.navigateBack({
-										delta:1
-									})
-								},200);
-								return;
-							}
-							else{
-								uni.showToast({
-									icon:'none',
-									title: res.msg,
-								});
-							}
-						}
-					},
-					rej => {}
-				);
-			},
-			openAddress(){
-				uni.navigateTo({
-					url: '/pages_user/user/address'
-				})
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	.inner-box{
-		padding: 20upx 20upx 140upx;
-		.address-box{
-			box-sizing: border-box;
-			min-height: 171upx;
-			background: #FFFFFF;
-			border-radius: 16upx;
-			background-image: url(../../static/images/address_bg.png);
-			background-repeat: no-repeat;
-			background-size: 100% 30upx;
-			background-position: left bottom;
-			padding: 38upx 30upx 36upx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			.left{
-				width: 92%;
-				.name-box{
-					display: flex;
-					align-items: center;
-					.text{
-						font-size: 32upx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #111111;
-						line-height: 1;
-						&.name{
-							margin-right: 30upx;
-						}
-					}
-				}
-				.address{
-					font-size: 28upx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #666666;
-					line-height: 42upx;
-					text-align:left;
-					margin-top: 23upx;
-				}
-			}
-			.arrow-box{
-				width: 12upx;
-				height: 23upx;
-				display: flex;
-				align-items: cenetr;
-				justify-content: cenetr;
-				image{
-					width: 100%;
-					height: 100%;
-				}
-			}
-		}
-		.goods-list{
-			margin-top: 20upx;
-			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%;
-					}
-				}
-				.info-box{
-					width: calc(100% - 190upx);
-					height: 160upx;
-					display: flex;
-					flex-direction: column;
-					justify-content: space-between;
-					.name-box{
-						font-size: 28upx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #111111;
-						line-height: 40upx;
-						.tag{
-							display: inline-block;
-							padding: 0 6upx;
-							height: 30upx;
-							background: linear-gradient(90deg, #66b2ef 0%, #0bb3f2 100%);
-							border-radius: 4upx;
-							margin-right: 10upx;
-							font-size: 22upx;
-							font-family: PingFang SC;
-							font-weight: bold;
-							color: #FFFFFF;
-							line-height: 30upx;
-							float: left;
-							margin-top: 7upx;
-						}
-					}
-					.spec{
-						margin-top: 10upx;
-						font-size: 24upx;
-						font-family: PingFang SC;
-						font-weight: 500;
-						color: #999999;
-						line-height: 1;
-					}
-					.price-num{
-						display: flex;
-						align-items: center;
-						justify-content: space-between;
-						.price{
-							display: flex;
-							align-items: flex-end;
-							.unit{
-								font-size: 24upx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #111111;
-								line-height: 1.2;
-								margin-right: 4upx;
-							}
-							.num{
-								font-size: 32upx;
-								font-family: PingFang SC;
-								font-weight: 500;
-								color: #111111;
-								line-height: 1;
-							}
-						}
-						.num{
-							font-size: 24upx;
-							font-family: PingFang SC;
-							font-weight: 500;
-							color: #999999;
-							line-height: 1;
-						}
-					}
-				}
-			}
-			.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;
-					}
-				}
-			}
-		}
-		.points{
-			height: 88upx;
-			padding: 0 30upx;
-			background: #FFFFFF;
-			border-radius: 16upx;
-			margin-top: 20upx;
-			display: flex;
-			align-items: center;
-			justify-content: space-between;
-			.left{
-				display: flex;
-				align-items: center;
-				image{
-					width: 28upx;
-					height: 28upx;
-					margin-right: 20upx;
-				}
-				.text{
-					font-size: 28upx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #666666;
-				}
-			}
-			.right{
-				display: flex;
-				align-items: center;
-				.text{
-					font-size: 28upx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #111111;
-					 
-				}
-				image{
-					margin-left: 15upx;
-					width: 14upx;
-					height: 24upx;
-				}
-			}
-		}
-		.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;
-		background: #FFFFFF;
-		padding: 16upx 30upx 16upx 60upx;
-		display: flex;
-		align-items: center;
-		justify-content: flex-end;
-		position: fixed;
-		left: 0;
-		bottom: 0;
-		z-index: 99;
-		.right{
-			display: flex;
-			align-items: center;
-			.total{
-				display: flex;
-				align-items: flex-end;
-				margin-right: 36upx;
-				.label{
-					font-size: 26upx;
-					font-family: PingFang SC;
-					font-weight: 500;
-					color: #999999;
-					line-height: 1.5;
-				}
-				.price{
-					display: flex;
-					align-items: flex-end;
-					.unit{
-						font-size: 32upx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #FF6633;
-						line-height: 1.2;
-						margin-right: 10upx;
-					}
-					.num{
-						font-size: 50upx;
-						font-family: PingFang SC;
-						font-weight: bold;
-						color: #FF6633;
-						line-height: 1;
-					}
-				}
-			}
-			.btn{
-				width: 200upx;
-				height: 88upx;
-				line-height: 88upx;
-				text-align: center;
-				font-size: 30upx;
-				font-family: PingFang SC;
-				font-weight: bold;
-				color: #FFFFFF;
-				background: #0bb3f2;
-				border-radius: 44upx;
-			}
-		}
-	}
-	 
-</style>
-<style lang="less" scoped>
-	.coupon {
-	  height: 100%;
-	}
-	/*优惠券列表公共*/
-	.coupon-list {
-	}
-	.coupon-list .item {
-	  display: flex;
-	  flex-direction: column;
-	  justify-content: center;
-	  align-items: center;
-	  width: 100%;
-	  height: 1.7 * 100rpx;
-	  margin-bottom: 0.16 * 100rpx;
-	}
-	
-	.coupon-list .item .money {
-	  background-size: 100% 100%;
-	  width: 2.4 * 100rpx;
-	  height: 100%;
-	  color: #fff;
-	  font-size: 0.36 * 100rpx;
-	  font-weight: bold;
-	  text-align: center;
-	  display: flex;
-	  flex-direction: column;
-	  align-items: center;
-	  justify-content: center;
-	  position: relative;
-	  
-	}
-	.coupon-list .item .money .img{
-	  position: absolute;
-	  width: 2.4 * 100rpx;
-	  height: 100%;
-	  color: #fff;
-	  
-	}
-	
-	.coupon-list .item .money .num {
-	  font-size: 0.6 * 100rpx;
-	}
-	.coupon-list .item .money .pic-num {
-	  font-size: 20rpx;
-	  z-index: 99;
-	}
-
-	
-	.coupon-list .item .text {
-	  width: 4.5 * 100rpx;
-	  padding: 0 0.17 * 100rpx 0 0.24 * 100rpx;
-	  background-color: #fff;
-	  box-sizing: border-box;
-	}
-	
-	.coupon-list .item .text .condition {
-	  font-size: 0.3 * 100rpx;
-	  color: #282828;
-	  height: 0.93 * 100rpx;
-	  line-height: 0.93 * 100rpx;
-	  border-bottom: 1px solid #f0f0f0;
-	}
-	
-	.coupon-list .item .text .data {
-	  font-size: 0.2 * 100rpx;
-	  color: #999;
-	  height: 0.76 * 100rpx;
-	}
-	
-	.coupon-list .item .text .data .bnt {
-	  width: 1.36 * 100rpx;
-	  height: 0.44 * 100rpx;
-	  border-radius: 0.22 * 100rpx;
-	  font-size: 0.22 * 100rpx;
-	  color: #fff;
-	  text-align: center;
-	  line-height: 0.44 * 100rpx;
-	  background-color: red;
-	}
-	
-	.coupon-list .item .text .data .bnt.gray {
-	  background-color: #ccc;
-	}
-</style>

pages_user/address.vue

@@ -27,7 +27,6 @@
 
 		</view>
 		<view class="btn-box">
-
 			<view class="sub-btn" @click="addAdress">新建收货地址</view>
 		</view>
 	</view>
@@ -82,6 +81,7 @@
 			},
 			// 编辑地址
 			editAddress(item) {
+				
 				uni.navigateTo({
 					url: './addAddress?type=edit&addressId=' + item.addressId
 				})
@@ -181,6 +181,7 @@
 			// },
 			// 新建收货地址
 			addAdress() {
+				
 				uni.navigateTo({
 					url: './addAddress?type=add'
 				})

pages_user/integral.vue

@@ -1,529 +0,0 @@
-<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">
-						<!-- <image src="../static/images/back_white.png" mode=""></image> -->
-						<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="singn-content">
-					<view class="sign-in-box">
-						<view class="inner">
-							<view class="title-box">已连续签到<text class="num">{{signNum}}</text>天</view>
-							<!-- 签到天数 -->
-							<view class="sign-list">
-								<view v-for="(item,index) in sign" :key="index"  :class="signNum >= index+ 1?'item active':'item'">
-									<view class="line"></view>
-									<view class="right">
-										<!-- 已签到图标 -->
-										<image v-if="signNum >= index+ 1" src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/f3bdd5d388854e9a8f365904840c3b32.png" mode=""></image>
-										<!-- 未签到图标 -->
-										<image v-else src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/c593e551e4b246b981aaa58deb1fe725.png" mode=""></image>
-										<text class="text">{{ item.day }}</text>
-									</view>
-								</view>
-							</view>
-						</view>
-						<!-- 签到按钮 -->
-						<view class="sign-btn-box"  >
-							<view class="btn" v-if="isDaySign==false" @click="doSign()">
-								<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/295aa046433d4feb95b467c83f8b4096.png" mode=""></image>
-								<text class="text">签到</text>
-							</view>
-							<view class="btn" v-else>
-								<image src="https://fs-1319721001.cos.ap-chongqing.myqcloud.com/fs/20240229/295aa046433d4feb95b467c83f8b4096.png" mode=""></image>
-								<text class="text">签到</text>
-							</view>
-						</view>
-					</view>
-				</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"  >
-										{{$getDictLabelName(typeOptions,item.logType)}}
-									</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>
-						<Loading :loaded="loaded" :loading="loading"></Loading>
-					</view>
-				</view>
-				
-			</view>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	// import {getDictByKey} from '@/api/common.js'
-	// import {getUserSign,getUserIntegralLogsList,doSign} from '@/api/integral';
-	import Loading from "@/components/Loading";
-	export default {
-		components: {
-		  Loading,
-		},
-		data() {
-			return {
-				typeOptions:[],
-				isDaySign:false,
-				top:0,
-				signNum:0,
-				integral:0,
-				sign:[],
-				// 状态栏的高度
-				statusBarHeight: uni.getStorageSync('menuInfo').statusBarHeight,
-				// tab切换
-				tags: [{lable:'全部',value:0},{lable:'获得',value:1},{lable:'消耗',value:2}],
-				// 选中的tab
-				tabIndex: 0,
-				current: 0,
-				page: {
-				  type:0,
-				  page: 1,
-				  pageSize: 10
-				},
-				list: [],
-				loaded: false,
-				loading: false
-			};
-		},
-		onLoad(option) {
-			
-			this.getDictByKey("sys_integral_log_type");
-			this.getUserSign()
-			this.getUserIntegralLogsList()
-		},
-		onReachBottom() {
-		  !this.loading && this.getUserIntegralLogsList();
-		},
-		onPageScroll(e) {
-			if(e.scrollTop > 30) {
-				this.topFixed = true
-			} else {
-				this.topFixed = false
-			}
-		},
-		onPageScroll(e) {
-			this.top=e.scrollTop;
-		},
-		computed: {
-			// 计算属性的 getter
-			bg: function() {
-				return 'rgba(255,142,60, ' + this.top / 30 + ')';
-			},
-		},
-		methods: {
-			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.signNum=res.signNum;
-							this.isDaySign=res.isDaySign;
-							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_user/integralGoodsList.vue

@@ -1,348 +0,0 @@
-<template>
-	<view class="content">
-		<view class="cont-box">
-			<u-sticky>
-				<view class="top-box">
-					<view class="my-integral">
-						<view class="left">
-							<view class="label">我的芳华币</view>
-							<view style="margin-top: 30rpx;display: flex;align-items: baseline;">
-								<view class="integral">{{integral}}</view>
-								<view class="integralbtn" @click="goIntegral">获取芳华币</view>
-							</view>
-						</view>
-						<view class="btn-box">
-							<view class="btn" @click="navTo('/pages/user/integral/integralLogsList')">获得记录</view>
-							<view class="btn" @click="navTo('/pages/user/integral/integralOrderList')">兑换记录</view>
-						</view>
-					</view>
-					<view class="tabs" v-if="tabs.length>0">
-						<u-tabs :current="tabIndex" :scrollable="true" :list="tabs" lineColor="#FF5C03"
-							@change="tabChange">
-						</u-tabs>
-					</view>
-				</view>
-			</u-sticky>
-			<mescroll-body bottom="0" ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback"
-				:down="downOption" :up="upOption">
-				<view class="integral-box">
-					<view class="item" @click="navTo('/pages/user/integral/integralGoodsDetails?goodsId='+item.goodsId)"
-						v-for="(item,index) in dataList">
-						<view class="top">
-							<image :src="item.imgUrl"></image>
-						</view>
-						<view class="bottom">
-							<view class="title ellipsis2">
-								{{item.goodsName}}
-							</view>
-							<view class="price-box">
-								<view class="price">{{item.integral}}芳华币</view>
-								<view class="count">价值:{{item.otPrice.toFixed(2)}}元</view>
-							</view>
-						</view>
-					</view>
-				</view>
-			</mescroll-body>
-		</view>
-
-	</view>
-</template>
-
-<script>
-	// import {getDictByKey} from '@/api/common.js'
-	// import MescrollMixin from "@/uni_modules/mescroll-uni/components/mescroll-uni/mescroll-mixins.js";
-	// import {getIntegralGoodsList} from '@/api/integral.js'
-	// import {getUserInfo} from '@/api/user'
-	export default {
-		mixins: [MescrollMixin],
-		data() {
-			return {
-				integral: 0,
-				type: "0",
-				typeOptions: [],
-				tabIndex: 0,
-				tabs: [],
-				mescroll: null,
-				downOption: {
-					use: true,
-					auto: false,
-					textInOffset: '下拉刷新', // 可选：下拉提示文字
-					textOutOffset: '释放更新', // 可选：释放提示文字
-					textLoading: '加载中...' // 可选：加载中提示文字
-				},
-				upOption: {
-					onScroll: false,
-					use: true, // 是否启用上拉加载; 默认true
-					page: {
-						pae: 0, // 当前页码,默认0,回调之前会加1,即callback(page)会从1开始
-						size: 10 // 每页数据的数量,默认10
-					},
-					noMoreSize: 10, // 配置列表的总数量要大于等于5条才显示'-- END --'的提示
-					textNoMore: "已经到底了",
-					empty: {
-						icon: 'https://cos.his.cdwjyyh.com/fs/20240423/cf4a86b913a04341bb44e34bb4d37aa2.png',
-						tip: '暂无数据'
-					}
-				},
-				dataList: []
-			}
-		},
-		onLoad() {
-			this.getDictByKey("sys_integral_goods_type");
-			this.getUserInfo();
-		},
-		methods: {
-			getUserInfo() {
-				getUserInfo().then(
-					res => {
-						if (res.code == 200) {
-							if (res.user != null) {
-								this.integral = res.user.integral;
-							}
-						} else {
-							uni.showToast({
-								icon: 'none',
-								title: "请求失败",
-							});
-						}
-					},
-					rej => {}
-				);
-			},
-			navTo(url) {
-				uni.navigateTo({
-					url: url
-				})
-			},
-			goIntegral() {
-				let pages = getCurrentPages();
-				let url = pages[pages.length - 2];
-				if (pages.length > 1 && url && url.route == 'pages/user/integral/points') {
-					uni.navigateBack()
-				} else {
-					uni.navigateTo({
-						url: '/pages/user/integral/points'
-					})
-				}
-			},
-			getDictByKey(key) {
-				var data = {
-					key: key
-				}
-				var that = this;
-				getDictByKey(data).then(
-					res => {
-						if (res.code == 200) {
-							this.typeOptions = res.data;
-							this.typeOptions.forEach(function(item, index) {
-								var data = {
-									name: item.dictLabel
-								};
-								that.tabs.push(data);
-							})
-							if (this.tabs.length > 0) {
-								this.tabIndex = 0
-							}
-
-						}
-					},
-					err => {}
-				);
-
-			},
-			tabChange(item) {
-				console.log(item.index)
-				this.type = this.typeOptions[item.index].dictValue;
-				this.mescroll.resetUpScroll()
-			},
-			mescrollInit(mescroll) {
-				this.mescroll = mescroll;
-			},
-			/*下拉刷新的回调 */
-			downCallback(mescroll) {
-				mescroll.resetUpScroll()
-			},
-			upCallback(page) {
-				//联网加载数据
-				var that = this;
-				var data = {
-					pageNum: page.num,
-					pageSize: page.size
-				};
-				if (this.type != null) {
-					data.goodsType = this.type
-				}
-				getIntegralGoodsList(data).then(res => {
-					if (res.code == 200) {
-						//设置列表数据
-						if (page.num == 1) {
-							that.dataList = res.data.list;
-
-						} else {
-							that.dataList = that.dataList.concat(res.data.list);
-
-						}
-						that.mescroll.endBySize(res.data.list.length, res.data.total);
-
-					} else {
-						uni.showToast({
-							icon: 'none',
-							title: "请求失败",
-						});
-						that.dataList = null;
-						that.mescroll.endErr();
-					}
-				});
-			}
-
-		}
-	}
-</script>
-
-
-<style scoped lang="scss">
-	page {
-		height: 100%;
-		background-color: #f5f5f5;
-	}
-
-	.content {
-		height: 100%;
-
-		.cont-box {
-			.top-box {
-				padding: 30rpx 30rpx 0 30rpx;
-				width: 100%;
-				background-color: #f5f5f5;
-
-				.my-integral {
-					height: 200rpx;
-					box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.05);
-					background: linear-gradient(#FF5C03, #E2C99E);
-					border-radius: 30rpx;
-					display: flex;
-					align-items: flex-start;
-					justify-content: space-between;
-					padding: 30rpx;
-
-					.integralbtn {
-						font-size: 24rpx;
-						font-family: PingFang SC;
-						color: #fff;
-						margin-left: 16rpx;
-						text-decoration: underline;
-					}
-
-					.btn {
-						margin-bottom: 30rpx;
-						background-color: #fff;
-						border-radius: 30rpx;
-						display: flex;
-						align-items: center;
-						justify-content: center;
-						padding: 10rpx 15rpx;
-						font-size: 20upx;
-						font-family: PingFang SC;
-						color: #FF5C03;
-					}
-
-					.left {
-						.label {
-							font-size: 28upx;
-							font-family: PingFang SC;
-							color: #fff;
-						}
-
-						.integral {
-							font-weight: bold;
-							font-size: 40upx;
-							font-family: PingFang SC;
-							color: #fff;
-						}
-					}
-
-					.btn-box {
-						display: flex;
-						flex-direction: column;
-						align-items: flex-start;
-						justify-content: flex-start;
-					}
-				}
-
-				.tabs {
-					height: 88rpx;
-				}
-			}
-
-			.integral-box {
-				padding: 0 30rpx 30rpx 30rpx;
-				display: flex;
-				align-items: flex-start;
-				justify-content: flex-start;
-				flex-wrap: wrap;
-
-				.item {
-					box-shadow: 0px 0px 5px 2px rgba(0, 0, 0, 0.05);
-					background-color: #fff;
-					width: calc(50% - 20rpx);
-					border-radius: 15rpx;
-					margin: 10rpx;
-					display: flex;
-					flex-direction: column;
-					align-items: flex-start;
-					justify-content: flex-start;
-
-					&:last-child {}
-
-					.top {
-						width: 100%;
-						height: 300rpx;
-
-						image {
-							border-radius: 15rpx 15rpx 0rpx 0rpx;
-							width: 100%;
-							height: 300rpx;
-						}
-
-					}
-
-					.bottom {
-						width: 100%;
-						padding: 15rpx;
-
-						.title {
-							font-weight: bold;
-							font-size: 28upx;
-							font-family: PingFang SC;
-							color: #111111;
-						}
-
-						.price-box {
-							margin-top: 10rpx;
-							display: flex;
-							align-items: center;
-							justify-content: space-between;
-							width: 100%;
-
-							.price {
-								padding: 5rpx 10rpx;
-								background-color: #FF5C03;
-								border-radius: 30rpx;
-								font-size: 20upx;
-								font-family: PingFang SC;
-								color: #ffffff;
-							}
-
-							.count {
-								font-size: 24upx;
-								font-family: PingFang SC;
-								color: #333333;
-							}
-
-						}
-					}
-				}
-			}
-		}
-	}
-</style>

unpackage/dist/dev/.sourcemap/mp-weixin/core/config/defaultConfig.js.map

@@ -1 +1 @@
-{"version":3,"file":"defaultConfig.js","sources":["core/config/defaultConfig.js"],"sourcesContent":["// //正式环境\r\n// const productionUrl = 'https://wanbei.monvkeji.cn/'\r\n// // 测试环境\r\n// const testUrl = 'https://wanbei.monvkeji.cn/'\r\n// // 开发环境\r\n// const developUrl = 'http://192.168.10.166:7114/'\r\n// export default {\r\n// \t// 系统名称\r\n// \tname: \"签约\",\r\n// \tapiUrl: process.env.NODE_ENV !== 'production' ? testUrl : testUrl,\r\n// }\r\n//正式环境\r\nconst productionUrl = 'https://wanbei.monvkeji.cn/'\r\n// 测试环境\r\nconst testUrl = 'https://wanbei.monvkeji.cn/'\r\n// 开发环境\r\n// const developUrl = 'https://live.test.ylrztop.com/live-api/'//余红奇\r\nconst developUrl = 'http://192.168.10.166:7114/'//余红奇\r\n// const developUrl = 'http://v56c9b8e.natappfree.cc/'//余红奇\r\n// const developUrl = 'http://nd383294.natappfree.cc/'//余红奇\r\n// const developUrl = 'http://192.168.10.170:7114/'//陈果\r\nexport default {\r\n\t// 系统名称\r\n\tname: \"签约\",\r\n\tapiUrl: process.env.NODE_ENV !== 'production' ? developUrl : testUrl,\r\n}"],"names":["developUrl","defaultConfig"],"mappings":"aAiBA,MAAMA,EAAa,8BAIJC,EAAA,CAEd,KAAM,KACN,OAAgDD,CACjD"}
+{"version":3,"file":"defaultConfig.js","sources":["core/config/defaultConfig.js"],"sourcesContent":["// //正式环境\r\n// const productionUrl = 'https://wanbei.monvkeji.cn/'\r\n// // 测试环境\r\n// const testUrl = 'https://wanbei.monvkeji.cn/'\r\n// // 开发环境\r\n// const developUrl = 'http://192.168.10.166:7114/'\r\n// export default {\r\n// \t// 系统名称\r\n// \tname: \"签约\",\r\n// \tapiUrl: process.env.NODE_ENV !== 'production' ? testUrl : testUrl,\r\n// }\r\n//正式环境\r\nconst productionUrl = 'https://wanbei.monvkeji.cn/'\r\n// 测试环境\r\nconst testUrl = 'https://wanbei.monvkeji.cn/'\r\n// 开发环境\r\nconst developUrl = 'https://live.test.ylrztop.com/live-api/'//余红奇\r\n// const developUrl = 'http://192.168.10.166:7114/'//余红奇\r\n// const developUrl = 'http://v56c9b8e.natappfree.cc/'//余红奇\r\n// const developUrl = 'http://nd383294.natappfree.cc/'//余红奇\r\n// const developUrl = 'http://192.168.10.170:7114/'//陈果\r\nexport default {\r\n\t// 系统名称\r\n\tname: \"签约\",\r\n\tapiUrl: process.env.NODE_ENV !== 'production' ? developUrl : testUrl,\r\n}"],"names":["developUrl","defaultConfig"],"mappings":"aAgBA,MAAMA,EAAa,0CAKJC,EAAA,CAEd,KAAM,KACN,OAAgDD,CACjD"}

unpackage/dist/dev/mp-weixin/app.json

@@ -20,7 +20,6 @@
         "order",
         "confirmCreateOrder",
         "paymentOrder",
-        "confirmPackageOrder",
         "storeOrder",
         "refundOrder",
         "refundOrderProduct",
@@ -35,8 +34,6 @@
       "root": "pages_user",
       "pages": [
         "address",
-        "integral",
-        "integralGoodsList",
         "addAddress"
       ]
     }

unpackage/dist/dev/mp-weixin/common/request.js

@@ -1,2 +1,2 @@
-"use strict";var m=Object.defineProperty;var k=(a,e,t)=>e in a?m(a,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):a[e]=t;var u=(a,e,t)=>(k(a,typeof e!="symbol"?e+"":e,t),t);const d=require("./vendor.js"),n=class n{static addExcludePath(e){this.excludePaths.push(e)}static addExcludePage(e){this.excludePages.push(e)}static isCurrentPageExcluded(){const e=getCurrentPages();if(e.length===0)return!1;const t=e[e.length-1],s=t.route||t.__route__;return this.excludePages.some(o=>s.includes(o)||o.includes(s))}static isPathExcluded(e){return this.excludePaths.some(t=>t instanceof RegExp?t.test(e):e.includes(t)||t.includes(e))}http(e,t={},s,o,x=!0){let f="http://192.168.10.166:7114";const r=x&&!n.isPathExcluded(e)&&!n.isCurrentPageExcluded();return r&&n.loadingCount===0&&d.index.showLoading({title:"加载中",mask:!0}),r&&n.loadingCount++,new Promise((l,C)=>{let P=d.index.getStorageSync("AppToken");var g="application/x-www-form-urlencoded";o!=null&&(g=o),d.index.request({header:{"Content-Type":g,AppToken:P},url:`${f}${e}`,data:t,method:s,success:i=>{if(i.code==401){let h=getCurrentPages(),p=h[h.length-1];if(p!=null&&p.route=="/pages/home/index"){l(i.data);return}d.index.reLaunch({url:"/pages/home/index"});return}i.token&&d.index.setStorageSync("AppToken",i.token),l(i.data)},fail:i=>{C(i)},complete:i=>{r&&(n.loadingCount--,n.loadingCount<=0&&(d.index.hideLoading(),n.loadingCount=0))}})})}};u(n,"loadingCount",0),u(n,"excludePaths",[]),u(n,"excludePages",[]);let c=n;exports.Request=c;
+"use strict";var P=Object.defineProperty;var k=(a,e,t)=>e in a?P(a,e,{enumerable:!0,configurable:!0,writable:!0,value:t}):a[e]=t;var u=(a,e,t)=>(k(a,typeof e!="symbol"?e+"":e,t),t);const d=require("./vendor.js"),n=class n{static addExcludePath(e){this.excludePaths.push(e)}static addExcludePage(e){this.excludePages.push(e)}static isCurrentPageExcluded(){const e=getCurrentPages();if(e.length===0)return!1;const t=e[e.length-1],s=t.route||t.__route__;return this.excludePages.some(o=>s.includes(o)||o.includes(s))}static isPathExcluded(e){return this.excludePaths.some(t=>t instanceof RegExp?t.test(e):e.includes(t)||t.includes(e))}http(e,t={},s,o,x=!0){let f="https://live.test.ylrztop.com/live-api";const r=x&&!n.isPathExcluded(e)&&!n.isCurrentPageExcluded();return r&&n.loadingCount===0&&d.index.showLoading({title:"加载中",mask:!0}),r&&n.loadingCount++,new Promise((l,m)=>{let C=d.index.getStorageSync("AppToken");var g="application/x-www-form-urlencoded";o!=null&&(g=o),d.index.request({header:{"Content-Type":g,AppToken:C},url:`${f}${e}`,data:t,method:s,success:i=>{if(i.code==401){let h=getCurrentPages(),p=h[h.length-1];if(p!=null&&p.route=="/pages/home/index"){l(i.data);return}d.index.reLaunch({url:"/pages/home/index"});return}i.token&&d.index.setStorageSync("AppToken",i.token),l(i.data)},fail:i=>{m(i)},complete:i=>{r&&(n.loadingCount--,n.loadingCount<=0&&(d.index.hideLoading(),n.loadingCount=0))}})})}};u(n,"loadingCount",0),u(n,"excludePaths",[]),u(n,"excludePages",[]);let c=n;exports.Request=c;
 //# sourceMappingURL=../../.sourcemap/mp-weixin/common/request.js.map

unpackage/dist/dev/mp-weixin/core/config/defaultConfig.js

@@ -1,2 +1,2 @@
-"use strict";const t="http://192.168.10.166:7114/",e={name:"签约",apiUrl:t};exports.defaultConfig=e;
+"use strict";const t="https://live.test.ylrztop.com/live-api/",e={name:"签约",apiUrl:t};exports.defaultConfig=e;
 //# sourceMappingURL=../../../.sourcemap/mp-weixin/core/config/defaultConfig.js.map

unpackage/dist/dev/mp-weixin/pages/home/living.json

@@ -7,8 +7,8 @@
     "three-item-swiper": "../../components/ThreeItemSwiper",
     "u-avatar": "../../uni_modules/uview-plus/components/u-avatar/u-avatar",
     "u-input": "../../uni_modules/uview-plus/components/u-input/u-input",
-    "u-popup": "../../uni_modules/uview-plus/components/u-popup/u-popup",
     "u-icon": "../../uni_modules/uview-plus/components/u-icon/u-icon",
-    "u-count-down": "../../uni_modules/uview-plus/components/u-count-down/u-count-down"
+    "u-count-down": "../../uni_modules/uview-plus/components/u-count-down/u-count-down",
+    "u-popup": "../../uni_modules/uview-plus/components/u-popup/u-popup"
   }
 }

unpackage/dist/dev/mp-weixin/pages_shop/confirmPackageOrder.json

@@ -1,7 +0,0 @@
-{
-  "navigationBarTitleText": "确认支付",
-  "navigationBarTextStyle": "black",
-  "usingComponents": {
-    "popup-bottom": "../components/px-popup-bottom/px-popup-bottom"
-  }
-}

unpackage/dist/dev/mp-weixin/pages_shop/storeOrderDelivery.js

@@ -1,2 +1,2 @@
-"use strict";const e=require("../common/vendor.js"),n=require("../common/assets.js"),d={data(){return{statusBarHeight:e.index.getStorageSync("menuInfo").statusBarHeight,orderId:null,deliveryId:null,express:{},expressList:[]}},onLoad(r){this.orderId=r.orderId,this.getExpress()},methods:{getExpress(){var r={orderId:this.orderId};getExpress(r).then(t=>{t.code==200?(this.express=t.express,this.expressList=t.data,this.deliveryId=t.deliveryId):e.index.showToast({icon:"none",title:"请求失败"})})},back(){e.index.navigateBack()},copyOrderSn(r){e.index.setClipboardData({data:r,success:()=>{e.index.showToast({title:"内容已成功复制到剪切板",icon:"none"})}})},callPhone(r){e.index.makePhoneCall({phoneNumber:r})}}};function a(r,t,p,x,s,o){return e.e({a:n._imports_0$12,b:s.statusBarHeight,c:n._imports_1$8,d:e.o((...i)=>o.back&&o.back(...i)),e:e.t(s.deliveryId),f:e.o(i=>o.copyOrderSn(s.deliveryId)),g:e.t(s.express.name),h:s.expressList!=null},s.expressList!=null?e.e({i:s.expressList.Traces!=null},s.expressList.Traces!=null?{j:e.f(s.expressList.Traces,(i,c,u)=>({a:e.t(i.AcceptStation),b:e.t(i.AcceptTime),c})),k:n._imports_2$5,l:n._imports_3$2}:{}):{})}const l=e._export_sfc(d,[["render",a]]);wx.createPage(l);
+"use strict";const e=require("../common/vendor.js"),n=require("../common/assets.js"),d={data(){return{statusBarHeight:e.index.getStorageSync("menuInfo").statusBarHeight,orderId:null,deliveryId:null,express:{},expressList:[]}},onLoad(r){this.orderId=r.orderId,this.getExpress()},methods:{getExpress(){var r={orderId:this.orderId};getExpress(r).then(t=>{t.code==200?(this.express=t.express,this.expressList=t.data,this.deliveryId=t.deliveryId):e.index.showToast({icon:"none",title:"请求失败"})})},back(){e.index.navigateBack()},copyOrderSn(r){e.index.setClipboardData({data:r,success:()=>{e.index.showToast({title:"内容已成功复制到剪切板",icon:"none"})}})},callPhone(r){e.index.makePhoneCall({phoneNumber:r})}}};function a(r,t,p,x,s,o){return e.e({a:n._imports_0$12,b:s.statusBarHeight,c:n._imports_1$8,d:e.o((...i)=>o.back&&o.back(...i)),e:e.t(s.deliveryId),f:e.o(i=>o.copyOrderSn(s.deliveryId)),g:e.t(s.express.name),h:s.expressList!=null},s.expressList!=null?e.e({i:s.expressList.Traces!=null},s.expressList.Traces!=null?{j:e.f(s.expressList.Traces,(i,c,u)=>({a:e.t(i.AcceptStation),b:e.t(i.AcceptTime),c})),k:n._imports_2$5,l:n._imports_3$1}:{}):{})}const l=e._export_sfc(d,[["render",a]]);wx.createPage(l);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pages_shop/storeOrderDelivery.js.map

unpackage/dist/dev/mp-weixin/pages_user/address.js

@@ -1,2 +1,2 @@
-"use strict";const e=require("../common/vendor.js"),u=require("../api/order.js"),o=require("../common/assets.js"),h={data(){return{address:[]}},onLoad(){this.getUserAddr(),e.index.$on("refreshAddress",()=>{this.getUserAddr()})},methods:{getUserAddr(){this.userInfo=JSON.parse(e.index.getStorageSync("userInfo")),u.userAddr(this.userInfo.userId).then(s=>{s.code==200?(e.index.__f__("log","at pages_user/address.vue:62","用户收货地址>>>>",s.data),this.address=s.data):e.index.showToast({title:s.msg,icon:"none"})},s=>{})},selectAddress(s){e.index.$emit("updateAddress",s),e.index.navigateBack({delta:1})},editAddress(s){e.index.navigateTo({url:"./addAddress?type=edit&addressId="+s.addressId})},delAddress(s){e.index.showModal({title:"提示",content:"确认删除此地址吗?",showCancel:!0,cancelText:"取消",confirmText:"确定",success:i=>{if(i.confirm){var c={addressId:s.addressId};u.delAddress(c).then(a=>{a.code==200?(e.index.showToast({icon:"success",title:"操作成功"}),this.getUserAddr()):e.index.showToast({icon:"none",title:"请求失败"})},a=>{})}}})},addAdress(){e.index.navigateTo({url:"./addAddress?type=add"})}}};function g(s,i,c,a,n,r){return e.e({a:e.f(n.address,(d,t,_)=>e.e({a:d.isDefault==1},d.isDefault==1?{}:{},{b:e.t(d.province),c:e.t(d.city),d:e.t(d.district),e:e.t(d.detail),f:e.t(d.realName),g:e.t(s.$parsePhone(d.phone)),h:e.o(l=>r.selectAddress(d),t),i:e.o(l=>r.delAddress(d),t),j:e.o(l=>r.editAddress(d),t),k:t})),b:o._imports_0$13,c:o._imports_1$9,d:n.address.length==0},n.address.length==0?{e:o._imports_2$1,f:e.o(d=>s.getAddressList())}:{},{g:e.o((...d)=>r.addAdress&&r.addAdress(...d))})}const A=e._export_sfc(h,[["render",g]]);wx.createPage(A);
+"use strict";const e=require("../common/vendor.js"),u=require("../api/order.js"),o=require("../common/assets.js"),h={data(){return{address:[]}},onLoad(){this.getUserAddr(),e.index.$on("refreshAddress",()=>{this.getUserAddr()})},methods:{getUserAddr(){this.userInfo=JSON.parse(e.index.getStorageSync("userInfo")),u.userAddr(this.userInfo.userId).then(s=>{s.code==200?(e.index.__f__("log","at pages_user/address.vue:61","用户收货地址>>>>",s.data),this.address=s.data):e.index.showToast({title:s.msg,icon:"none"})},s=>{})},selectAddress(s){e.index.$emit("updateAddress",s),e.index.navigateBack({delta:1})},editAddress(s){e.index.navigateTo({url:"./addAddress?type=edit&addressId="+s.addressId})},delAddress(s){e.index.showModal({title:"提示",content:"确认删除此地址吗?",showCancel:!0,cancelText:"取消",confirmText:"确定",success:i=>{if(i.confirm){var c={addressId:s.addressId};u.delAddress(c).then(a=>{a.code==200?(e.index.showToast({icon:"success",title:"操作成功"}),this.getUserAddr()):e.index.showToast({icon:"none",title:"请求失败"})},a=>{})}}})},addAdress(){e.index.navigateTo({url:"./addAddress?type=add"})}}};function g(s,i,c,a,n,r){return e.e({a:e.f(n.address,(d,t,_)=>e.e({a:d.isDefault==1},d.isDefault==1?{}:{},{b:e.t(d.province),c:e.t(d.city),d:e.t(d.district),e:e.t(d.detail),f:e.t(d.realName),g:e.t(s.$parsePhone(d.phone)),h:e.o(l=>r.selectAddress(d),t),i:e.o(l=>r.delAddress(d),t),j:e.o(l=>r.editAddress(d),t),k:t})),b:o._imports_0$13,c:o._imports_1$9,d:n.address.length==0},n.address.length==0?{e:o._imports_2$1,f:e.o(d=>s.getAddressList())}:{},{g:e.o((...d)=>r.addAdress&&r.addAdress(...d))})}const A=e._export_sfc(h,[["render",g]]);wx.createPage(A);
 //# sourceMappingURL=../../.sourcemap/mp-weixin/pages_user/address.js.map

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -10,7 +10,7 @@
       "list": [
         {
           "name": "pages_shop/confirmCreateOrder",
-          "pathName": "pages_shop/storeOrderRefundList",
+          "pathName": "pages_user/integralGoodsList",
           "query": "",
           "scene": null,
           "launchMode": "default"