Merge branch 'uniapp-vue3' of https://gitee.com/beijing_hongye_huicheng/lilishop-uniapp into uniapp-vue3

App.vue

@@ -33,34 +33,8 @@ import {
 
 
 		/**
-		 * 监听返回
+		 * 监听返回（页面级 onBackPress 在 App.vue 不生效，保留空实现避免误导）
 		 */
-		onBackPress(e) {
-			console.log("onBackPress-APP", e);
-			if (e.from == "backbutton") {
-				let routes = getCurrentPages();
-				let curRoute = routes[routes.length - 1].options;
-				routes.forEach((item) => {
-					if (
-						item.route == "pages/tabbar/cart/cartList" ||
-						item.route.indexOf("pages/product/goods") != -1
-					) {
-						uni.redirectTo({
-							url: item.route,
-						});
-					}
-				});
-
-				if (curRoute.addId) {
-					uni.reLaunch({
-						url: "/pages/tabbar/cart/cartList",
-					});
-				} else {
-					uni.navigateBack();
-				}
-				return true; //阻止默认返回行为
-			}
-		},
 		onLaunch: function(val) {
 			if(val.query.inviter){
 				storage.setInviter(val.query.inviter)

README.md

@@ -58,7 +58,7 @@ LILISHOP 是基于 Spring Boot / Spring Cloud / Vue / Uniapp 开发的 Java 开
 ### 1. 项目简介
 
 **Lilishop** 是一款功能完善的B2B2C多商户商城系统，采用前后端分离架构，全端代码开源。
-后端基于 **SpringBoot3** 构建，具备高内聚、低耦合的特性，支持分布式部署。
+后端基于 **SpringBoot4** 构建，具备高内聚、低耦合的特性，支持分布式部署。
 前端覆盖PC、H5、小程序和APP，基于 **Vue** 和 **uni-app** 开发。
 
 -   **官方网站**: <https://pickmall.cn>

components/m-airbtn/index.vue

@@ -15,12 +15,13 @@
 
 <script>
 import config from "@/config/config";
+import logoImg from "@/icon.png";
 export default {
   data() {
     return {
       config, // 设置工具类
       weChat: false,  // 是否微信浏览器，该项为true时不显示 当前整个页面
-      logo: require("@/icon.png"), //显示的圆形logo
+      logo: logoImg, //显示的圆形logo
     };
   },
   mounted() {

components/m-canvas/index.vue

@@ -20,13 +20,14 @@
 <script>
 // 引入绘制插件
 import DrawPoster from "@/js_sdk/u-draw-poster";
+import logoImg from "@/pages/passport/static/logo-title.png";
 
 export default {
   data: () => ({
     imgUrl: "", //绘制出来的图片路径
     show: false, //是否展示模态框
     dp: {}, //绘制的dp对象，用于存储绘制等一些方法。
-    logo: require("@/pages/passport/static/logo-title.png"), //本地logo地址
+    logo: logoImg, //本地logo地址
   }),
 
   props: {

components/m-goods-list/list.vue

@@ -213,7 +213,8 @@
 			display: flex;
 			flex-wrap: wrap;
 			margin: 10rpx 20rpx 284rpx;
-			width: 100%;
+			width: calc(100% - 40rpx);
+			box-sizing: border-box;
 
 			&.goods-list--embedded {
 				margin-bottom: 20rpx;

components/m-placard/index.vue

@@ -18,14 +18,16 @@
 import DrawPoster from "@/js_sdk/u-draw-poster";
 // 生成二维码
 import uQRCode from '@/components/Sansnn-uQRCode/uqrcode.js';
+import logoImg from "@/pages/passport/static/logo-title.png";
+import myFaceImg from "@/pages/passport/static/missing-face.png";
 
 export default {
   data: () => ({
     imgUrl: "", //绘制出来的图片路径
     show: false, //是否展示模态框
     dp: {}, //绘制的dp对象，用于存储绘制等一些方法。
-    logo: require("@/pages/passport/static/logo-title.png"), 	// 本地logo地址
+    logo: logoImg, 	// 本地logo地址
-	myFace: require("@/pages/passport/static/missing-face.png"),	// 本地默认头像
+	myFace: myFaceImg,	// 本地默认头像
 	sharingLink: '',	// 二维码链接
   }),
   props: {

components/verify-code/verify-code.vue

@@ -2,10 +2,11 @@
 	<view class="xt__verify-code">
 		<!-- 输入框 -->
 		<input
+			ref="codeInput"
 			id="xt__input"
 			:value="code"
 			class="xt__input"
-			:focus="isFocus"
+			:focus="focused"
 			:password="isPassword"
 			:type="inputType"
 			:maxlength="size"
@@ -23,7 +24,7 @@
 		></view>
 
 		<!-- 输入框 - 组 -->
-		<view id="xt__input-ground" class="xt__input-ground">
+		<view id="xt__input-ground" class="xt__input-ground" @click="focusInput">
 			<template v-for="(item, index) in size" :key="index">
 				<view
 					:style="{ borderColor: code.length === index && cursorVisible ? boxActiveColor : boxNormalColor }"
@@ -51,7 +52,12 @@
  */
 export default {
 	name: 'xt-verify-code',
+	emits: ['update:modelValue', 'input', 'confirm'],
 	props: {
+		modelValue: {
+			type: String,
+			default: () => ''
+		},
 		value: {
 			type: String,
 			default: () => ''
@@ -89,12 +95,9 @@ export default {
 			default: () => '#000000'
 		}
 	},
-	model: {
-		prop: 'value',
-		event: 'input'
-	},
 	data() {
 		return {
+			focused: false,
 			cursorVisible: false,
 			cursorHeight: 35,
 			code: '', // 输入的验证码
@@ -102,12 +105,31 @@ export default {
 		};
 	},
 	created() {
+		this.code = this.modelValue || this.value || '';
+		this.focused = this.isFocus;
 		this.cursorVisible = this.isFocus;
 	},
 	mounted() {
 		this.init();
+		if (this.isFocus) {
+			this.$nextTick(() => {
+				this.focusInput();
+			});
+		}
 	},
 	methods: {
+		focusInput() {
+			this.focused = false;
+			this.$nextTick(() => {
+				this.focused = true;
+				// #ifdef H5
+				const inputEl = this.$refs.codeInput;
+				if (inputEl && typeof inputEl.focus === 'function') {
+					inputEl.focus();
+				}
+				// #endif
+			});
+		},
 		/**
 		 * @description 初始化
 		 */
@@ -159,7 +181,9 @@ export default {
 		// 输入框输入变化的回调
 		input(e) {
 			const value = e.detail.value;
+			this.code = value;
 			this.cursorVisible = value.length !== this.size;
+			this.$emit('update:modelValue', value);
 			this.$emit('input', value);
 			this.inputSuccess(value);
 		},
@@ -187,8 +211,11 @@ export default {
 		}
 	},
 	watch: {
+		modelValue(val) {
+			this.code = val || '';
+		},
 		value(val) {
-			this.code = val;
+			this.code = val || '';
 		}
 	}
 };
@@ -200,11 +227,13 @@ export default {
 	box-sizing: border-box;
 
 	.xt__input {
-		height: 100%;
-		width: 200%;
 		position: absolute;
-		left: -100%;
+		top: 0;
-		z-index: 1;
+		left: 0;
+		height: 100%;
+		width: 100%;
+		opacity: 0;
+		z-index: 2;
 	}
 	.xt__cursor {
 		position: absolute;
@@ -212,6 +241,8 @@ export default {
 		transform: translateY(-50%);
 		display: inline-block;
 		width: 2px;
+		z-index: 1;
+		pointer-events: none;
 		animation-name: cursor;
 		animation-duration: 0.8s;
 		animation-iteration-count: infinite;
@@ -223,11 +254,14 @@ export default {
 		align-items: center;
 		width: 100%;
 		box-sizing: border-box;
+		position: relative;
+		z-index: 1;
 		.xt__box {
 			position: relative;
 			display: inline-block;
 			width: 76rpx;
 			height: 112rpx;
+			pointer-events: none;
 			&-bottom {
 				border-bottom-width: 2px;
 				border-bottom-style: solid;

config/config.js

@@ -15,7 +15,7 @@ export default {
   imWebSrc: "https://im.pickmall.cn", //IM地址
   baseWsUrl: "wss://im-api.pickmall.cn/lili/webSocket", // IM WS 地址
   enableGetClipboard: false, //是否启用粘贴板获取 scanAuthNavigation 中的链接，如果匹配则会跳转到对应页面
-  enableMiniBarStartUpApp: true, //是否在h5中右侧浮空按钮点击启动app
+  enableMiniBarStartUpApp: false, //是否在h5中右侧浮空按钮点击启动app
   /**
    * 如需更换主题请修改此处以及uni.scss中的全局颜色
    */

index.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
+    />
+    <title></title>
+    <!--preload-links-->
+    <!--app-context-->
+  </head>
+  <body>
+    <div id="app"><!--app-html--></div>
+    <script type="module" src="/main.js"></script>
+  </body>
+</html>

pages/mine/set/editionIntro.vue

@@ -14,17 +14,17 @@
       </view>
     </view>
 
-    <u-cell-group class="cell-group">
+    <u-cell-group class="cell-group" :border="false">
       <!-- #ifdef APP-PLUS -->
-      <u-cell v-if="IosWhether" isLink title="去评分" @click="checkStar"></u-cell>
+      <u-cell v-if="IosWhether" is-link title="去评分" @click="checkStar"></u-cell>
-      <u-cell isLink title="功能介绍" @click="navigateTo('/pages/mine/set/versionFunctionList')"></u-cell>
+      <u-cell is-link title="功能介绍" @click="navigateTo('/pages/mine/set/versionFunctionList')"></u-cell>
-      <u-cell isLink title="检查更新" @click="checkUpdate"></u-cell>
+      <u-cell is-link title="检查更新" @click="checkUpdate"></u-cell>
       <!-- #endif -->
 
-      <u-cell isLink title="证照信息" @click="navigateTo('/pages/mine/help/tips?type=LICENSE_INFORMATION')"></u-cell>
+      <u-cell is-link title="证照信息" @click="navigateTo('/pages/mine/help/tips?type=LICENSE_INFORMATION')"></u-cell>
-      <u-cell isLink title="服务协议" @click="navigateTo('/pages/mine/help/tips?type=USER_AGREEMENT')"></u-cell>
+      <u-cell is-link title="服务协议" @click="navigateTo('/pages/mine/help/tips?type=USER_AGREEMENT')"></u-cell>
-      <u-cell isLink title="隐私协议" @click="navigateTo('/pages/mine/help/tips?type=PRIVACY_POLICY')"></u-cell>
+      <u-cell is-link title="隐私协议" @click="navigateTo('/pages/mine/help/tips?type=PRIVACY_POLICY')"></u-cell>
-      <u-cell isLink title="关于我们" @click="navigateTo('/pages/mine/help/tips?type=ABOUT')"></u-cell>
+      <u-cell is-link title="关于我们" @click="navigateTo('/pages/mine/help/tips?type=ABOUT')"></u-cell>
     </u-cell-group>
 
     <view class="intro">
@@ -131,21 +131,25 @@ export default {
 
 <style lang="scss" scoped>
 page {
-  background: #fff !important;
+  background: #f8f8f8 !important;
 }
 
 .edition-intro {
+  width: 100%;
   min-height: 100vh;
-  background: #fff;
+  box-sizing: border-box;
+  background: #f8f8f8;
   display: flex;
   flex-direction: column;
+  padding-bottom: calc(40rpx + env(safe-area-inset-bottom));
 }
 
 .header-block {
   display: flex;
   flex-direction: column;
   align-items: center;
-  padding: 80rpx 0 48rpx;
+  padding: 60rpx 0 40rpx;
+  background: #fff;
 }
 
 .logo {
@@ -169,10 +173,20 @@ page {
 
 .cell-group {
   width: 100%;
+  margin-top: 20rpx;
+  background: #fff;
+}
+
+:deep(.u-cell-group) {
+  width: 100%;
 }
 
 :deep(.u-cell) {
-  padding: 0 30rpx;
+  width: 100%;
+}
+
+:deep(.u-cell__body) {
+  padding: 28rpx 30rpx;
 }
 
 :deep(.u-cell__title-text) {
@@ -184,23 +198,35 @@ page {
   color: #ccc !important;
 }
 
+:deep(.u-line) {
+  width: 100% !important;
+  margin: 0 !important;
+}
+
 .intro {
   margin-top: auto;
   width: 100%;
-  padding: 48rpx 40rpx 60rpx;
+  padding: 48rpx 40rpx calc(80rpx + env(safe-area-inset-bottom));
   text-align: center;
   font-size: 24rpx;
-  line-height: 1.6;
+  line-height: 1.8;
   color: #666;
   letter-spacing: 1rpx;
   box-sizing: border-box;
 }
 
 .intro-line {
-  margin-top: 16rpx;
+  margin-top: 12rpx;
 }
 
 .intro-link {
   color: #003a8c;
 }
 </style>
+<style lang="scss">
+/* #ifdef H5 */
+page {
+  min-height: 100vh;
+}
+/* #endif */
+</style>

pages/mine/set/feedBack.vue

@@ -1,36 +1,55 @@
 <template>
-  <div class="feedBack">
+  <view class="feedBack">
-    <div class="feedBack-box">
+    <view class="feedBack-box">
-      <h4>猜你想问</h4>
+      <view class="box-title">猜你想问</view>
-      <div class="feedBack-item" :class="{'active':feedBack.type == item.value }" @click="handleClick(index)" v-for="(item,index) in list" :key="index">
+      <view
-        {{item.text}}
+        class="feedBack-item"
-      </div>
+        :class="{ active: feedBack.type == item.value }"
-    </div>
+        @click="handleClick(index)"
+        v-for="(item, index) in list"
+        :key="index"
+      >
+        {{ item.text }}
+      </view>
+    </view>
 
-    <div class="feedBack-box">
+    <view class="feedBack-box">
-      <h4>问题反馈 <span style="margin-left:10rpx;" v-if="feedBack.type">@{{ list.find(item=>{return item.value == feedBack.type }).text  }}</span></h4>
+      <view class="box-title">问题反馈
-      <u-input class="field-input" height="500" border="none" v-model="feedBack.context" type="textarea" placeholder="请输入反馈信息">
+        <text class="box-tag" v-if="feedBack.type">@{{ list.find(item => item.value == feedBack.type).text }}</text>
-      </u-input>
+      </view>
-    </div>
+      <u-textarea
+        class="field-textarea"
+        v-model="feedBack.context"
+        placeholder="请输入反馈信息"
+        border="none"
+        height="240"
+        maxlength="500"
+      ></u-textarea>
+    </view>
 
     <!-- 上传凭证 -->
-    <div class="feedBack-box">
+    <view class="feedBack-box">
-      <view class="opt-view">
+      <view class="box-title">上传凭证（最多2张）</view>
-        <view class="img-title">上传凭证（最多2张）</view>
+      <view class="images-view">
-        <view class="images-view">
+        <u-upload :file-list="uploadFileList" :auto-upload="false" width="150" @afterRead="onUploadAfterRead" :max-count="2"></u-upload>
-          <u-upload :file-list="uploadFileList" :auto-upload="false" width="150" @afterRead="onUploadAfterRead" :max-count="2"></u-upload>
-        </view>
       </view>
-    </div>
+    </view>
 
-    <div class="feedBack-box">
+    <view class="feedBack-box">
-      <h4>手机号</h4>
+      <view class="box-title">手机号</view>
-      <u-input border="none" v-model="feedBack.mobile" placeholder="请输入您的手机号">
+      <u-input
-      </u-input>
+        class="field-input"
-    </div>
+        v-model="feedBack.mobile"
+        type="number"
+        maxlength="11"
+        border="none"
+        placeholder="请输入您的手机号"
+        :custom-style="inputStyle"
+      ></u-input>
+    </view>
 
-    <div class="submit" @click="submit()">提交</div>
+    <view class="submit" @click="submit()">提交</view>
-  </div>
+  </view>
 
 </template>
 
@@ -45,7 +64,15 @@ export default {
       storage,
       config,
       feedBack: {
-        type: "FUNCTION", //默认反馈问题为 '功能相关'
+        type: "FUNCTION",
+        context: "",
+        mobile: "",
+      },
+      inputStyle: {
+        background: "#fafafa",
+        borderRadius: "12rpx",
+        padding: "0 24rpx",
+        height: "80rpx",
       },
       uploadFileList: [],
       list: [
@@ -116,49 +143,86 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+page {
+  background: #f8f8f8;
+}
+
 .submit {
   text-align: center;
   background: $light-color;
-  height: 70rpx;
+  height: 88rpx;
-  line-height: 70rpx;
+  line-height: 88rpx;
   color: #fff;
   width: 92%;
-  margin-bottom: 100rpx;
+  margin: 40rpx auto 60rpx;
-  margin: 0 auto;
   border-radius: 100px;
+  font-size: 30rpx;
 }
-.active{
+
+.active {
   color: $light-color !important;
   font-weight: bold;
 }
+
 .feedBack {
-  padding-bottom: 100rpx;
+  width: 100%;
+  box-sizing: border-box;
+  padding: 20rpx 24rpx 40rpx;
+  min-height: 100vh;
+  background: #f8f8f8;
 }
+
 .feedBack-box {
   background: #fff;
   border-radius: 20rpx;
   padding: 32rpx;
-  margin-bottom: 40rpx;
+  margin-bottom: 20rpx;
 }
-::v-deep .u-input__textarea {
+
-  padding: 12px;
+.box-title {
+  font-size: 30rpx;
+  font-weight: 600;
+  color: #333;
+  line-height: 1.4;
 }
-.feedBack-box:nth-of-type(1) {
+
-  border-top-left-radius: 0;
+.box-tag {
-  border-top-right-radius: 0;
+  margin-left: 10rpx;
+  font-size: 26rpx;
+  font-weight: normal;
+  color: $light-color;
 }
+
 .feedBack-item {
   margin: 20rpx 0;
-  font-size: 24rpx;
+  font-size: 28rpx;
   color: #666;
 }
-h4 {
+
-  font-size: 30rpx;
+.field-textarea {
+  margin-top: 20rpx;
+
+  :deep(.u-textarea) {
+    background: #fafafa !important;
+    border-radius: 12rpx;
+    padding: 20rpx;
+    box-sizing: border-box;
+  }
+
+  :deep(.u-textarea__field) {
+    width: 100%;
+    font-size: 28rpx;
+    line-height: 1.6;
+    color: #333;
+  }
 }
+
 .field-input {
-  margin: 20rpx 0;
+  margin-top: 20rpx;
-  padding: 20rpx 0;
+  width: 100%;
-  background: #fafafa;
+}
-  border-radius: 0.6em;
+
+.images-view {
+  margin-top: 20rpx;
 }
 </style>

pages/mine/set/setUp.vue

@@ -14,21 +14,21 @@
       <u-icon color="#ccc" name="arrow-right" size="16"></u-icon>
     </view>
 
-    <u-cell-group class="cell-group">
+    <u-cell-group class="cell-group" :border="false">
       <!-- #ifdef APP-PLUS -->
-      <u-cell :isLink="false" title="清除缓存" :value="fileSizeString" @click="clearCache"></u-cell>
+      <u-cell is-link title="清除缓存" :value="fileSizeString" @click="clearCache"></u-cell>
       <!-- #endif -->
       <!-- #ifndef MP-WEIXIN -->
       <u-cell
-        :isLink="false"
+        is-link
         title="安全中心"
         @click="navigateTo('/pages/mine/set/securityCenter/securityCenter')"
       ></u-cell>
       <!-- #endif -->
-      <u-cell :isLink="false" title="用户注销" v-if="userInfo.id" @click="logoff"></u-cell>
+      <u-cell is-link title="用户注销" v-if="userInfo.id" @click="logoff"></u-cell>
-      <u-cell :isLink="false" title="意见反馈" @click="navigateTo('/pages/mine/set/feedBack')"></u-cell>
+      <u-cell is-link title="意见反馈" @click="navigateTo('/pages/mine/set/feedBack')"></u-cell>
       <u-cell
-        :isLink="false"
+        is-link
         :title="`关于${config.name}`"
         @click="navigateTo('/pages/mine/set/editionIntro')"
       ></u-cell>
@@ -148,12 +148,14 @@ export default {
 
 <style lang="scss" scoped>
 page {
-  background: #fff !important;
+  background: #f8f8f8 !important;
 }
 
 .set-up {
+  width: 100%;
   min-height: 100vh;
-  background: #fff;
+  box-sizing: border-box;
+  background: #f8f8f8;
 }
 
 .person {
@@ -161,6 +163,7 @@ page {
   align-items: center;
   padding: 36rpx 30rpx;
   background: #fff;
+  border-bottom: 1rpx solid #ededed;
 }
 
 .user-name {
@@ -176,10 +179,20 @@ page {
 
 .cell-group {
   width: 100%;
+  margin-top: 20rpx;
+  background: #fff;
+}
+
+:deep(.u-cell-group) {
+  width: 100%;
 }
 
 :deep(.u-cell) {
-  padding: 0 30rpx;
+  width: 100%;
+}
+
+:deep(.u-cell__body) {
+  padding: 28rpx 30rpx;
 }
 
 :deep(.u-cell__title-text) {
@@ -191,6 +204,15 @@ page {
   color: #ccc !important;
 }
 
+:deep(.u-cell__right-icon-wrap) {
+  color: #ccc !important;
+}
+
+:deep(.u-line) {
+  width: 100% !important;
+  margin: 0 !important;
+}
+
 .submit {
   height: 90rpx;
   line-height: 90rpx;

pages/navigation/search/search.scss

@@ -136,8 +136,9 @@ page {
 .scoll-page,
 .goods-scroll {
   flex: 1;
-  height: 0;
+  min-height: 0;
-  overflow: auto;
+  height: 100%;
+  box-sizing: border-box;
 }
 
 .search-navbar-wrap {
@@ -170,6 +171,30 @@ page {
   flex-direction: column;
 }
 
+/* #ifdef H5 */
+.content--goods {
+  height: auto;
+  min-height: 100vh;
+  overflow: visible;
+}
+
+.goods-content--h5 {
+  flex: none;
+  min-height: auto;
+  overflow: visible;
+}
+
+.goods-list-wrap {
+  padding-bottom: 40rpx;
+}
+
+.sort-navbar {
+  position: sticky;
+  top: 0;
+  z-index: 9;
+}
+/* #endif */
+
 .index-nav-arrow:last-child {
   margin-top: -22rpx;
 }

pages/navigation/search/searchPage.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="content">
+	<view class="content" :class="{ 'content--goods': isShowSeachGoods }">
 		<u-navbar
 			:bg-color="navObj.background"
 			:auto-back="false"
@@ -75,8 +75,8 @@
 			</div>
 		</view>
 		<!-- 搜索 -->
-		<view class="goods-content" v-if="isShowSeachGoods">
+		<view class="goods-content" :class="{ 'goods-content--h5': isShowSeachGoods }" v-if="isShowSeachGoods">
-			<view class="navbar">
+			<view class="navbar sort-navbar">
 				<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
 				<view class="nav-item" :class="{ current: filterIndex === 3 }" @click="tabClick(3, 'buyCount')">
 					<text>销量</text>
@@ -106,23 +106,36 @@
 				</view>
 				<view class="nav-item" @click="sortGoods">筛选</view>
 			</view>
+			<!-- #ifdef H5 -->
+			<view v-if="!empty && isSWitch" class="goods-list-wrap">
+				<goodsList :res="goodsList" type="oneColumns" :keyword="keyword" :tab-bar-gap="false" />
+				<uni-load-more :status="loadingType" @clickLoadMore="loadmore"></uni-load-more>
+			</view>
+			<view v-if="!empty && !isSWitch && goodsList.length" class="goods-list-wrap">
+				<goodsList :res="goodsList" :keyword="keyword" :tab-bar-gap="false" />
+				<uni-load-more :status="loadingType" @clickLoadMore="loadmore"></uni-load-more>
+			</view>
+			<!-- #endif -->
+			<!-- #ifndef H5 -->
 			<!-- 一行一个商品展示 -->
 			<scroll-view
 				v-if="!empty && isSWitch"
 				class="goods-scroll"
+				:style="goodsScrollStyle"
 				enableBackToTop="true"
 				lower-threshold="250"
 				@scrolltolower="loadmore()"
 				scroll-with-animation
 				scroll-y
 			>
-				<goodsList :res="goodsList" type="oneColumns" :keyword="keyword" />
+				<goodsList :res="goodsList" type="oneColumns" :keyword="keyword" :tab-bar-gap="false" />
 				<uni-load-more :status="loadingType" @loadmore="loadmore()"></uni-load-more>
 			</scroll-view>
 			<!-- 一行两个商品展示 -->
 			<scroll-view
 				v-if="!empty && !isSWitch && goodsList.length"
 				class="goods-scroll"
+				:style="goodsScrollStyle"
 				scroll-anchoring
 				enableBackToTop="true"
 				@scrolltolower="loadmore()"
@@ -130,9 +143,10 @@
 				scroll-y
 				lower-threshold="250"
 			>
-				<goodsList :res="goodsList" :keyword="keyword" />
+				<goodsList :res="goodsList" :keyword="keyword" :tab-bar-gap="false" />
 				<uni-load-more :status="loadingType"></uni-load-more>
 			</scroll-view>
+			<!-- #endif -->
 
 			<view class="empty" v-if="empty">
 				<image class="empty-img" src="/static/nodata.png" mode="aspectFit"></image>
@@ -296,6 +310,7 @@ export default {
 			routerVal: '',
 			capsuleInsetRight: 0,
 			searchNavbarWidth: 0,
+			goodsScrollHeight: 0,
 		};
 	},
 
@@ -310,6 +325,14 @@ export default {
 				width: '100%',
 			};
 		},
+		goodsScrollStyle() {
+			if (this.goodsScrollHeight > 0) {
+				return {
+					height: `${this.goodsScrollHeight}px`,
+				};
+			}
+			return {};
+		},
 	},
 
 	onPageScroll(e) {
@@ -352,6 +375,20 @@ export default {
 	},
 	onReady() {
 		this.setSearchNavbarWidth();
+		this.calcGoodsScrollHeight();
+	},
+	onShow() {
+		this.calcGoodsScrollHeight();
+	},
+	mounted() {
+		// #ifdef H5
+		window.addEventListener('resize', this.calcGoodsScrollHeight);
+		// #endif
+	},
+	beforeUnmount() {
+		// #ifdef H5
+		window.removeEventListener('resize', this.calcGoodsScrollHeight);
+		// #endif
 	},
 	components: {
 		mSearch,
@@ -374,15 +411,49 @@ export default {
 			if (val) {
 				this.selectedWay = { brand: [], categoryId: [], prop: [] };
 			}
+		},
+		isShowSeachGoods(val) {
+			if (val) {
+				this.$nextTick(() => {
+					this.calcGoodsScrollHeight();
+				});
+			}
+		},
+		isSWitch() {
+			this.$nextTick(() => {
+				this.calcGoodsScrollHeight();
+			});
 		}
 	},
 
 	onReachBottom() {
-		this.params.pageNumber++;
+		// #ifdef H5
-		this.loadData();
+		if (!this.isShowSeachGoods || this.loadingType !== 'more') {
+			return;
+		}
+		this.loadmore();
+		// #endif
 	},
 
 	methods: {
+		calcGoodsScrollHeight() {
+			this.$nextTick(() => {
+				const query = uni.createSelectorQuery().in(this);
+				query.select('.goods-content').boundingClientRect();
+				query.select('.goods-content .navbar').boundingClientRect();
+				query.exec((res) => {
+					const contentRect = res[0];
+					const navbarRect = res[1];
+					if (!contentRect) {
+						return;
+					}
+					const sortBarHeight = navbarRect ? navbarRect.height : uni.upx2px(80);
+					const { windowHeight } = uni.getWindowInfo();
+					const height = Math.max(contentRect.height, windowHeight - contentRect.top) - sortBarHeight;
+					this.goodsScrollHeight = Math.max(height, 0);
+				});
+			});
+		},
 		setSearchNavbarWidth() {
 			// #ifdef MP-WEIXIN
 			try {
@@ -529,6 +600,9 @@ export default {
 			});
 		},
 		loadmore() {
+			if (this.loadingType !== 'more') {
+				return;
+			}
 			this.params.pageNumber++;
 			this.loadData();
 		},
@@ -663,6 +737,9 @@ export default {
 			this.empty = this.goodsList.length === 0;
 			
 			this.initSortGoods();
+			this.$nextTick(() => {
+				this.calcGoodsScrollHeight();
+			});
 			 if (this.$store.state.isShowToast){ uni.hideLoading() };
 		},
 
@@ -778,3 +855,12 @@ export default {
 <style lang="scss" scoped>
 @import './search.scss';
 </style>
+<style lang="scss">
+/* #ifdef H5 */
+page {
+  height: auto;
+  min-height: 100vh;
+  overflow-y: auto;
+}
+/* #endif */
+</style>

pages/order/fillorder.vue

@@ -342,9 +342,8 @@
     <div class="notSupportFreight" v-if="notSupportFreight.length != 0">
       <u-notice-bar
         style="width: 100%"
-        :volume-icon="false"
+        icon=""
-        mode="horizontal"
+        :text="notSupportFreightNoticeText"
-        :list="notSupportFreightGoodsList"
       >
       </u-notice-bar>
     </div>
@@ -443,7 +442,7 @@ export default {
       masterWay: "", //团长信息
       pintuanFlage: true, //是开团还是拼团
       notSupportFreight: [], //不支持运费
-      notSupportFreightGoodsList: ["以下商品超出配送范围："],
+      notSupportFreightNoticeText: "",
       storeAddress: "",
 
       originOrderData:"", // 原始订单数据
@@ -466,29 +465,20 @@ export default {
    * 监听返回
    */
   onBackPress(e) {
-    console.log("onBackPress", e);
     if (e.from == "backbutton") {
-      let routes = getCurrentPages();
+      const curRoute = getCurrentPages().slice(-1)[0]?.options || {};
-      let curRoute = routes[routes.length - 1].options;
-      routes.forEach((item) => {
-        if (
-          item.route == "pages/tabbar/cart/cartList" ||
-          item.route.indexOf("pages/product/goods") != -1
-        ) {
-          uni.navigateTo({
-            url: item.route,
-          });
-        }
-      });
-      console.log("curRoute.addId",curRoute.addId)
       if (curRoute.addId) {
         uni.reLaunch({
           url: "/pages/tabbar/cart/cartList",
         });
+      } else if (this.routerVal?.way === "CART") {
+        uni.switchTab({
+          url: "/pages/tabbar/cart/cartList",
+        });
       } else {
         uni.navigateBack();
       }
-      return true; //阻止默认返回行为
+      return true;
     }
   },
 
@@ -500,18 +490,19 @@ export default {
     uni.showLoading({
       mask: true,
     });
-    await this.getOrderList();
+    try {
-    await this.getDistribution();
+      await this.getOrderList();
-    if (this.$store.state.isShowToast) {
+      await this.getDistribution();
+      if (this.routerVal.way == "PINTUAN") {
+        this.isAssemble = true;
+        this.routerVal.parentOrder = JSON.parse(
+          decodeURIComponent(this.routerVal.parentOrder)
+        );
+        this.pintuanWay();
+      }
+    } finally {
       uni.hideLoading();
     }
-    if (this.routerVal.way == "PINTUAN") {
-      this.isAssemble = true;
-      this.routerVal.parentOrder = JSON.parse(
-        decodeURIComponent(this.routerVal.parentOrder)
-      );
-      this.pintuanWay();
-    }
   },
   mounted() {},
 
@@ -780,33 +771,31 @@ export default {
     },
 
     // 获取结算参数
-    async getOrderList() {
+    getOrderList() {
       this.notSupportFreight = [];
-      // 获取结算参数
+      this.notSupportFreightNoticeText = "";
-      API_Trade.getCheckoutParams(this.routerVal.way).then((res) => {
+      return API_Trade.getCheckoutParams(this.routerVal.way).then((res) => {
         // 获取结算参数 进行首次判断
-        this.originOrderData = this.orderMessage ? JSON.parse(JSON.stringify(this.orderMessage)) : ""
+        this.originOrderData = this.orderMessage
-        
+          ? JSON.parse(JSON.stringify(this.orderMessage))
+          : null;
+
         if (
           !res.data.result.checkedSkuList ||
           res.data.result.checkedSkuList.length === 0
         ) {
-
+          if (!this.originOrderData?.checkedSkuList?.length) {
-          if(!this.originOrderData.checkedSkuList.length){
             uni.switchTab({
               url: "/pages/tabbar/cart/cartList",
             });
           }
-         
         }
         if (res.data.result.skuList.length <= 0) {
-
+          if (!this.originOrderData?.skuList?.length) {
-          if(!this.originOrderData.skuList.length){
             uni.navigateTo({
               url: "/pages/order/myOrder?status=0",
             });
           }
-         
         }
 
         let repeatData;
@@ -849,9 +838,9 @@ export default {
           res.data.result.notSupportFreight.length != 0
         ) {
           this.notSupportFreight = res.data.result.notSupportFreight;
-
+          this.notSupportFreightNoticeText = "以下商品超出配送范围：";
           res.data.result.notSupportFreight.forEach((item) => {
-            this.notSupportFreightGoodsList[0] += item.goodsSku.goodsName;
+            this.notSupportFreightNoticeText += item.goodsSku.goodsName;
           });
         }
       });

pages/order/orderDetail.vue

@@ -3,8 +3,8 @@
     <!-- 订单状态 -->
     <div class="info-view order-view">
       <div class="order-status" v-if="orderStatusMap[order.orderStatus]">
-        {{ orderStatusMap[order.orderStatus].title }}
+        <view class="order-status-title">{{ orderStatusMap[order.orderStatus].title }}</view>
-        <div>{{ orderStatusMap[order.orderStatus].value }}</div>
+        <view class="order-status-desc">{{ orderStatusMap[order.orderStatus].value }}</view>
       </div>
 
     </div>
@@ -573,11 +573,14 @@ export default {
   color: #fff;
   width: 100%;
   text-align: center;
-  font-size: 30rpx;
-  font-weight: 500;
   margin-top: 36rpx;
 
-  >div {
+  .order-status-title {
+    font-size: 44rpx;
+    font-weight: 600;
+  }
+
+  .order-status-desc {
     font-size: 22rpx;
     font-weight: normal;
     margin-top: 8rpx;

pages/passport/login.vue

@@ -1,6 +1,6 @@
 <template>
 	<div class="wrapper">
-		<div v-if="!wechatLogin">
+		<div v-if="!wechatLogin" class="login-body">
 			<u-navbar :auto-back="showBack" :border="false"></u-navbar>
 			<div>
 				<div class="title">{{ loginTitleWay[current].title }}</div>
@@ -12,16 +12,34 @@
 			<!-- 手机号 -->
 			<div v-show="!enableUserPwdBox">
 				<div v-show="current == 0">
-					<u-input :custom-style="inputStyle" :placeholder-style="placeholderStyle" placeholder="请输入手机号 (11位)"
+					<u-input
-						class="mobile" focus v-model="mobile" type="number" maxlength="11" />
+						border="none"
+						:custom-style="inputStyle"
+						:placeholder-style="placeholderStyle"
+						font-size="40rpx"
+						color="#333"
+						placeholder="请输入手机号 (11位)"
+						class="mobile"
+						focus
+						v-model="mobile"
+						type="number"
+						maxlength="11"
+					/>
 					<div :class="!enableFetchCode ? 'disable' : 'fetch'" @click="fetchCode" class="btn">
 						获取验证码
 					</div>
 				</div>
 				<!-- 输入验证码 -->
-				<div v-show="current == 1" class="box-code">
+				<div v-if="current == 1" class="box-code">
-					<verifyCode type="bottom" @confirm="submit" boxActiveColor="#D8D8D8" v-model="code" isFocus
+					<verifyCode
-						boxNormalColor="#D8D8D8" cursorColor="#D8D8D8" />
+						type="bottom"
+						@confirm="submit"
+						boxActiveColor="#D8D8D8"
+						v-model="code"
+						:is-focus="true"
+						boxNormalColor="#D8D8D8"
+						cursorColor="#D8D8D8"
+					/>
 
 					<div class="fetch-btn">
 						<u-code change-text="验证码已发送（x）" end-text="重新获取验证码" unique-key="page-login"
@@ -35,18 +53,44 @@
 
 			<!-- 帐号密码登录 -->
 			<div v-show="enableUserPwdBox">
-				<u-input :custom-style="inputStyle" :placeholder-style="placeholderStyle" placeholder="请输入用户名"
+				<u-input
-					class="mobile" focus v-model="userData.username" />
+					border="none"
-				<u-input :custom-style="inputStyle" :placeholder-style="placeholderStyle" placeholder="请输入密码"
+					:custom-style="inputStyle"
-					class="mobile" focus v-model="userData.password" type="password" />
+					:placeholder-style="placeholderStyle"
+					font-size="40rpx"
+					color="#333"
+					placeholder="请输入用户名"
+					class="mobile"
+					focus
+					v-model="userData.username"
+				/>
+				<u-input
+					border="none"
+					:custom-style="inputStyle"
+					:placeholder-style="placeholderStyle"
+					font-size="40rpx"
+					color="#333"
+					placeholder="请输入密码"
+					class="mobile"
+					focus
+					v-model="userData.password"
+					type="password"
+				/>
 
 				<div :class="!enableUserBtnColor ? 'disable' : 'fetch'" @click="passwordLogin" class="btn">
 					帐号密码登录
 				</div>
 			</div>
 
-			<div class="flex" v-show="current != 1">
+			<div class="privacy-row" v-show="current != 1">
-				<u-checkbox usedAlone :icon-size="24" shape="circle" v-model:checked="enablePrivacy" active-color="#FF5E00"></u-checkbox>
+				<u-checkbox
+					class="privacy-check"
+					usedAlone
+					shape="circle"
+					v-model:checked="enablePrivacy"
+					:active-color="lightColor"
+					:icon-size="18"
+				></u-checkbox>
 				<div class="tips">
 					未注册的手机号验证后将自动创建用户账号，登录即代表您已同意<span @click="navigateToPrivacy('PRIVACY_POLICY')">《隐私协议》</span>
 					<span @click="navigateToPrivacy('USER_AGREEMENT')">
@@ -151,9 +195,7 @@
 					height: "104rpx",
 					"border-bottom": "1rpx solid #D8D8D8",
 					"letter-spacing": "1rpx",
-					"font-size": "40rpx",
+					padding: "0",
-					"line-height": "40rpx",
-					color: "#333",
 				},
 				placeholderStyle: "font-size: 32rpx;line-height: 32rpx;color: #999999;",
 				loginList: [
@@ -311,35 +353,40 @@
 
 			async flage(val) {
 				if (val) {
-					if (this.$refs.uCode.canGetCode) {
+					if (this.enableUserPwdBox) {
-						if (this.enableUserPwdBox) {
+						this.submitUserLogin();
-							this.submitUserLogin();
+						return;
-							return;
+					}
-							// 执行登录
+
-						} else {
+					// 首次发送时 uCode 尚未挂载；重新获取时才检查倒计时
-							// 向后端请求验证码
+					const canSendCode = this.current === 0 || this.$refs.uCode?.canGetCode;
-							uni.showLoading({});
+					if (!canSendCode) {
-							let res = await sendMobile(this.mobile);
+						this.$u.toast("请倒计时结束后再发送");
-							 if (this.$store.state.isShowToast){ uni.hideLoading() };
+						return;
-							// 这里此提示会被this.start()方法中的提示覆盖
+					}
-							if (res.data.success) {
+
-								this.current = 1;
+					uni.showLoading({});
-								this.$refs.uCode.start();
+					let res = await sendMobile(this.mobile);
-							} else {
+					if (this.$store.state.isShowToast) {
-								uni.showToast({
+						uni.hideLoading();
-									title: res.data.message,
+					}
-									duration: 2000,
+					if (res.data.success) {
-									icon: "none",
+						this.code = '';
-								});
+						this.current = 1;
-								this.flage = false;
+						this.$nextTick(() => {
-								this.$refs.verification.getCode();
+							this.$refs.uCode?.start();
-							}
+						});
-						}
 					} else {
-						!this.enableUserPwdBox ? this.$u.toast("请倒计时结束后再发送") : "";
+						uni.showToast({
+							title: res.data.message,
+							duration: 2000,
+							icon: "none",
+						});
+						this.flage = false;
+						this.$refs.verification?.getCode();
 					}
 				} else {
-					this.$refs.verification.hide();
+					this.$refs.verification?.hide();
 				}
 			},
 		},
@@ -751,8 +798,18 @@
 	}
 </style>
 <style lang="scss" scoped>
+	.login-body {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
+
 	.wrapper {
 		padding: 0 80rpx;
+		min-height: 100vh;
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
 	}
 
 	.title {
@@ -813,16 +870,32 @@
 	}
 
 	.tips {
-		font-size: 12px;
+		flex: 1;
-		line-height: 20px;
+		font-size: 24rpx;
-		margin-top: 32rpx;
+		line-height: 36rpx;
-		width: 546rpx;
+		margin-top: 0;
+		color: #666;
 
 		>span {
 			color: $light-color;
 		}
 	}
 
+	.privacy-row {
+		display: flex;
+		align-items: flex-start;
+		margin-top: 32rpx;
+	}
+
+	.privacy-check {
+		flex-shrink: 0;
+		margin-top: 4rpx;
+
+		:deep(.u-checkbox) {
+			margin: 0;
+		}
+	}
+
 	.fetch-btn {
 		width: 370rpx;
 		height: 80rpx;
@@ -839,8 +912,8 @@
 	.login-list {
 		display: flex;
 		width: 590rpx;
-		position: absolute;
+		margin-top: auto;
-		top: 1200rpx;
+		margin-bottom: 80rpx;
 		align-items: center;
 		justify-content: center;
 	}
@@ -858,7 +931,8 @@
 
 	.user-password-tips {
 		text-align: center;
-		color: $main-color;
+		color: $light-color;
-		margin: 20px 0;
+		margin: 40rpx 0;
+		font-size: 28rpx;
 	}
 </style>

pages/product/product/evaluation/-evaluation.vue

@@ -26,7 +26,7 @@
               text-indent="0"
               :show-height="120"
             >
-              <rich-text @load="parseLoaded(commIndex)" :nodes="commItem.content" class="con"></rich-text>
+              <rich-text :nodes="commItem.content" class="con"></rich-text>
             </u-read-more>
             <scroll-view scroll-x class="scroll-x" v-if="commentImages(commItem).length">
               <view class="img-list">
@@ -70,7 +70,8 @@ export default {
   data() {
     return {
       lightColor: this.$lightColor,
-      commDetail: [],
+      commDetail: {},
+      readMoreInited: {},
       grade: "",
       params: {
         pageNumber: 1,
@@ -106,18 +107,27 @@ export default {
       return typeof images === "string" ? images.split(",").filter(Boolean) : images;
     },
 
-    parseLoaded(index) {
+    initReadMore(index) {
+      if (this.readMoreInited[index]) return;
+      this.readMoreInited[index] = true;
       this.$nextTick(() => {
         const refs = this.$refs.uReadMore;
         const target = Array.isArray(refs) ? refs[index] : refs;
-        target && target.init && target.init();
+        target?.init?.();
       });
     },
 
     getGoodsCommentsMethods() {
       if (!this.goodsDetail.goodsId) return;
       API_Members.getGoodsComments(this.goodsDetail.goodsId, this.params).then((res) => {
-        this.commDetail = res.data.result;
+        this.readMoreInited = {};
+        this.commDetail = res.data.result || {};
+        this.$nextTick(() => {
+          const records = this.commDetail.records || [];
+          records.slice(0, 2).forEach((_, index) => {
+            setTimeout(() => this.initReadMore(index), 50 * (index + 1));
+          });
+        });
       });
     },
 

pages/promotion/lives.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="box">
+  <view class="box">
     <u-navbar
       class="navbar"
       :border="false"
@@ -30,46 +30,65 @@
       :list="tabs"
     ></u-tabs>
 
-    <div class="wrapper">
+    <view class="wrapper">
-      <!-- 直播中 全部 直播回放 -->
+      <view
-      <div class="live-item" :class="{'invalid':item.status == 'END'}" v-for="(item,index) in liveList" :key="index" @click="handleLivePlayer(item)">
+        class="live-item"
-        <div class="live-cover-img">
+        :class="{ invalid: item.status == 'END' }"
-          <div class="tips">
+        v-for="(item, index) in liveList"
-            <div class="live-box">
+        :key="item.id || item.roomId || index"
-              <image class="live-gif" src="./static/live.gif"></image>
+        @click="handleLivePlayer(item)"
-            </div>
+      >
-            <span>{{item.status == 'END' ? '已结束' : item.status =='NEW' ? '未开始' : '直播中'}}</span>
+        <view class="live-cover-img">
-          </div>
+          <view class="tips">
-          <div class="bg"></div>
+            <view class="live-box" v-if="item.status === 'START'">
-          <u-image width="326" height="354" :src="item.shareImg" />
+              <image class="live-gif" src="/pages/promotion/static/live.gif" mode="aspectFit"></image>
-        </div>
+            </view>
-        <div class="live-goods">
+            <text>{{ item.status == 'END' ? '已结束' : item.status == 'NEW' ? '未开始' : '直播中' }}</text>
-          <div class="live-goods-name">
+          </view>
-            {{item.name}}
+          <view class="bg"></view>
-          </div>
+          <u-image
-          <div class="live-store">
+            class="cover-image"
-            <span class="wes">lilishop</span>
+            width="326rpx"
-          </div>
+            height="354rpx"
-          <div class="live-goods-list">
+            mode="aspectFill"
-            <div class="live-goods-item">
+            :src="item.shareImg"
-              <u-image border-radius="20" :src="item.roomGoodsList ? item.roomGoodsList[0] : ''" height="140"></u-image>
+          />
-            </div>
+        </view>
-            <div class="live-goods-item">
+        <view class="live-goods">
-              <u-image border-radius="20" :src="item.roomGoodsList ? item.roomGoodsList[1] : ''" height="140"></u-image>
+          <view class="live-goods-name">{{ item.name }}</view>
-            </div>
+          <view class="live-store">
-          </div>
+            <text class="wes">{{ config.name }}</text>
-        </div>
+          </view>
-      </div>
+          <view class="live-goods-list" v-if="item.roomGoodsList && item.roomGoodsList.length">
-      <u-loadmore v-if="liveList.length > 10" bg-color="#f8f8f8" :status="status" />
+            <view
-    </div>
+              class="live-goods-item"
-  </div>
+              v-for="(goodsImg, goodsIndex) in item.roomGoodsList.slice(0, 2)"
+              :key="goodsIndex"
+            >
+              <u-image
+                border-radius="20"
+                :src="goodsImg"
+                width="100%"
+                height="140rpx"
+                mode="aspectFill"
+              ></u-image>
+            </view>
+          </view>
+        </view>
+      </view>
+      <u-loadmore v-if="liveList.length > 0" bg-color="#f8f8f8" :status="status" />
+      <view class="empty-live" v-if="!liveList.length && status === 'noMore'">暂无直播间</view>
+    </view>
+  </view>
 </template>
 
 <script>
 import { getLiveList } from "@/api/promotions.js";
+import config from "@/config/config";
 export default {
   data() {
     return {
+      config,
       status: "loadmore",
       activeColor: this.$lightColor,
       current: 0, // 当前tabs索引
@@ -142,6 +161,7 @@ export default {
      * 点击标签栏切换
      */
     changeTabs() {
+      this.params[this.current].pageNumber = 1;
       this.init();
     },
 
@@ -185,9 +205,9 @@ export default {
       let recommendLives = await getLiveList(this.recommendParams);
       if (recommendLives.data.success) {
         // 推荐直播间
-        if (recommendLives.data.result.records.length ) {
+        if (recommendLives.data.result.records.length) {
           this.status = "loadmore";
-          this.recommendLives = recommendLives.data.result.records;
+          this.recommendLiveList = recommendLives.data.result.records;
         } else {
           this.status = "noMore";
         }
@@ -198,9 +218,9 @@ export default {
          * 2.如果没有直播间设置一个默认图片
          */
 
-        if (!this.recommendLives.length) {
+        if (!this.recommendLiveList.length) {
-          if (this.liveList[0].shareImg) {
+          if (this.liveList[0] && this.liveList[0].shareImg) {
-            this["swiperImg"] = [
+            this.swiperImg = [
               {
                 image: this.liveList[0].shareImg,
                 roomId: this.liveList[0].roomId,
@@ -208,10 +228,8 @@ export default {
             ];
           }
         } else {
-          this.recommendLives.forEach((item) => {
+          this.recommendLiveList.forEach((item) => {
-            this["swiperImg"] = [
+            this.swiperImg = [{ image: item.shareImg, roomId: item.roomId }];
-              { image: item.shareImg, roomId: item.roomId },
-            ];
           });
         }
       }
@@ -239,8 +257,12 @@ export default {
 
       
         this.liveList.forEach((item) => {
-          if (item.roomGoodsList) {
+          if (item.roomGoodsList && typeof item.roomGoodsList === "string") {
-            item.roomGoodsList = JSON.parse(item.roomGoodsList);
+            try {
+              item.roomGoodsList = JSON.parse(item.roomGoodsList);
+            } catch (e) {
+              item.roomGoodsList = [];
+            }
           }
         });
       }
@@ -261,61 +283,97 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+page {
+  background: #f8f8f8;
+}
+
+.box {
+  width: 100%;
+  min-height: 100vh;
+  background: #f8f8f8;
+  box-sizing: border-box;
+}
+
 .slot-wrap {
   display: flex;
   align-items: center;
-  /* 如果您想让slot内容占满整个导航栏的宽度 */
   flex: 1;
-  /* 如果您想让slot内容与导航栏左右有空隙 */
+  padding-right: 24rpx;
-  /* padding: 0 30rpx; */
 }
+
 .invalid {
   filter: grayscale(1);
 }
+
 .wrapper {
-  padding: 0 24rpx;
+  padding: 0 24rpx 40rpx;
+  box-sizing: border-box;
 }
+
 .live-item {
   display: flex;
+  flex-direction: row;
+  align-items: stretch;
   overflow: hidden;
   border-radius: 20rpx;
-  flex-wrap: wrap;
   background: #fff;
-
   margin: 20rpx 0;
 }
+
 .live-cover-img {
   position: relative;
+  flex-shrink: 0;
+  width: 326rpx;
+  height: 354rpx;
+  overflow: hidden;
+  border-radius: 20rpx 0 0 20rpx;
 }
+
+.cover-image {
+  display: block;
+  width: 100%;
+  height: 100%;
+}
+
 .swiper {
-  margin: 20rpx 0;
+  margin: 20rpx 24rpx;
 }
 
 .live-goods {
-  position: relative;
   flex: 1;
+  min-width: 0;
+  display: flex;
+  flex-direction: column;
   padding: 16rpx 24rpx 24rpx;
+  box-sizing: border-box;
 }
+
 .live-goods-name {
-  height: 84rpx;
+  min-height: 84rpx;
   font-weight: bold;
   font-size: 30rpx;
+  line-height: 1.4;
   display: -webkit-box;
   -webkit-box-orient: vertical;
   -webkit-line-clamp: 2;
   overflow: hidden;
+  color: #333;
 }
+
 .live-store {
   display: flex;
   align-items: center;
-  margin: 20rpx 0;
+  margin: 12rpx 0 20rpx;
   overflow: hidden;
-  width: calc(100% - 50rpx);
+  font-size: 24rpx;
+  color: #999;
 }
+
 .live-gif {
   width: 20rpx;
   height: 20rpx;
 }
+
 .live-box {
   display: flex;
   align-items: center;
@@ -324,66 +382,53 @@ export default {
   width: 40rpx;
   margin-right: 10rpx;
   height: 40rpx;
+  flex-shrink: 0;
   background: linear-gradient(90deg, #ff6b35, #ff9f28, #ffcc03);
 }
+
 .live-goods-list {
   display: flex;
   align-items: center;
-  justify-content: space-between;
+  gap: 20rpx;
-  > .live-goods-item {
+  margin-top: auto;
-    flex: 1;
-  }
-  > .live-goods-item:nth-of-type(1) {
-    padding-right: 38rpx;
-  }
 }
 
-.live-icon,
+.live-goods-item {
-.zan {
+  flex: 1;
-  position: absolute;
+  min-width: 0;
-  width: 80rpx;
+  overflow: hidden;
-  height: 80rpx;
+  border-radius: 20rpx;
-  z-index: 9;
 }
+
 .tips {
   display: flex;
   position: absolute;
   z-index: 9;
-
   align-items: center;
   top: 20rpx;
-  right: 0;
+  left: 20rpx;
-  padding: 4rpx 12rpx 4rpx 0;
+  padding: 4rpx 12rpx 4rpx 4rpx;
   font-size: 24rpx;
   border-radius: 100px;
   color: #fff;
   background: rgba(0, 0, 0, 0.46);
 }
-.live-icon {
-  right: 0;
-  top: 104rpx;
-}
 
-.zan {
-  bottom: 0;
-  right: 0;
-  width: 100rpx;
-  height: 100rpx;
-}
 .bg {
   position: absolute;
-  bottom: 4rpx;
+  left: 0;
-  width: 100%;
+  right: 0;
+  bottom: 0;
   height: 100rpx;
   z-index: 8;
-  background-image: -webkit-gradient(
+  pointer-events: none;
-    linear,
-    left bottom,
-    left top,
-    from(rgba(0, 0, 0, 0.25)),
-    color-stop(82%, transparent)
-  );
   background-image: linear-gradient(0deg, rgba(0, 0, 0, 0.25), transparent 82%);
-  border-bottom-left-radius: 20rpx;
+}
+
+.empty-live {
+  padding: 80rpx 0;
+  text-align: center;
+  font-size: 28rpx;
+  color: #999;
 }
 </style>

pages/promotion/point/detail.vue

@@ -107,6 +107,10 @@ export default {
         this.pointDetail = res.data.result;
       }
     },
+
+    closePopupBuy(val) {
+      this.maskFlag = val;
+    },
   },
 };
 </script>

pages/promotion/point/pointList.vue

@@ -2,6 +2,22 @@
   <view class="index">
     <user-point />
     <view class="index-head">
+      <!-- #ifdef H5 -->
+      <view class="list-scroll-content list-scroll-content-h5">
+        <view class="index-head-navs">
+          <view
+            class="index-head-nav"
+            v-for="(ele, index) in categoryIndexData"
+            :key="index"
+            :class="{ 'index-head-nav-active': tabIndex == index }"
+            @click="setCat(index)"
+          >
+            {{ ele.name }}
+          </view>
+        </view>
+      </view>
+      <!-- #endif -->
+      <!-- #ifndef H5 -->
       <scroll-view scroll-x class="list-scroll-content" :scroll-left="currentLeft" scroll-with-animation>
         <view class="index-head-navs">
           <view class="index-head-nav" v-for="(ele, index) in categoryIndexData" :key="index"
@@ -10,11 +26,48 @@
           </view>
         </view>
       </scroll-view>
+      <!-- #endif -->
     </view>
+
+    <!-- #ifdef H5 -->
+    <view class="tab-content-h5">
+      <view class="index-items">
+        <view
+          class="index-item"
+          v-for="(item, key) in categoryIndexData[tabIndex].goods"
+          :key="item.id || key"
+          @click="toGoods(item)"
+        >
+          <view class="index-item-img">
+            <image
+              class="index-item-image"
+              :src="item.thumbnail"
+              mode="aspectFit"
+              lazy-load
+            ></image>
+          </view>
+          <view class="index-item-info">
+            <view class="index-item-title">{{ item.goodsName || item.promotionName || '' }}</view>
+            <view class="index-item-price">
+              <view class="point">
+                <text class="point-num">{{ item.points != null ? item.points : 0 }}</text>
+                <text class="point-unit">积分</text>
+              </view>
+              <text class="tipsMkt">¥{{ unitPrice(item.originalPrice) }}</text>
+            </view>
+          </view>
+        </view>
+      </view>
+      <uni-load-more
+        :status="categoryIndexData[tabIndex].loadStatus"
+        @clickLoadMore="loadMore"
+      ></uni-load-more>
+    </view>
+    <!-- #endif -->
+
+    <!-- #ifndef H5 -->
     <swiper :current="tabIndex" class="swiper-box" @change="ontabchange" duration="300">
-
       <swiper-item v-for="(nav, index) in categoryIndexData" :key="index" class="swiper-item">
-
         <scroll-view class="scroll-v" enableBackToTop="true" scroll-with-animation scroll-y @scrolltolower="loadMore">
           <view class="index-items">
             <view class="index-item" v-for="(item, key) in nav.goods" :key="item.id || key" @click="toGoods(item)">
@@ -42,6 +95,7 @@
         </scroll-view>
       </swiper-item>
     </swiper>
+    <!-- #endif -->
   </view>
 </template>
 
@@ -80,11 +134,14 @@ export default {
   },
   onLoad() {},
   async onPullDownRefresh() {
+    // #ifndef H5
     this.categoryIndexData[this.tabIndex].goods = [];
     this.categoryIndexData[this.tabIndex].params.pageNumber = 1;
     this.categoryIndexData[this.tabIndex].loadStatus = "more";
     this.loadGoods();
+    // #endif
   },
+  // #ifndef H5
   onPageScroll(e) {
     if (e.scrollTop < -40 && this.flag) {
       this.flag = false;
@@ -95,6 +152,7 @@ export default {
       this.loadGoods();
     }
   },
+  // #endif
   watch: {
     tabIndex(val) {
       if (
@@ -175,7 +233,9 @@ export default {
         }, 3000);
       }
 
+      // #ifndef H5
       uni.stopPullDownRefresh();
+      // #endif
     },
     setCat(type) {
       this.tabIndex = type;
@@ -189,12 +249,21 @@ export default {
       }
     },
     loadMore() {
-      if (this.categoryIndexData[this.tabIndex].loadStatus == "more") {
+      if (this.categoryIndexData[this.tabIndex].loadStatus !== "more") {
-        this.categoryIndexData[this.tabIndex].params.pageNumber++;
+        return;
-        this.loadGoods();
       }
+      this.categoryIndexData[this.tabIndex].params.pageNumber++;
+      this.loadGoods();
     },
   },
+  // #ifdef H5
+  onReachBottom() {
+    if (this.categoryIndexData[this.tabIndex].loadStatus !== 'more') {
+      return;
+    }
+    this.loadMore();
+  },
+  // #endif
 };
 </script>
 <style lang="scss" scoped>
@@ -212,15 +281,21 @@ page {
 
 .index {
   height: 100vh;
-  // #ifdef H5
-  height: calc(100vh - 44px);
-  // #endif
   width: 100%;
+  display: flex;
+  flex-direction: column;
   overflow: hidden;
+
+  // #ifdef H5
+  height: auto;
+  min-height: 100vh;
+  overflow: visible;
+  // #endif
 }
 
 .index-head {
   background: #fff;
+  flex-shrink: 0;
 }
 
 .list-scroll-content {
@@ -259,14 +334,25 @@ page {
   }
 }
 
-.swiper-box {
+// #ifdef H5
-  // #ifdef H5
+.list-scroll-content-h5 {
-  height: calc(100vh - (100rpx + 300rpx + 44px));
+  overflow-x: auto;
-  // #endif
+  -webkit-overflow-scrolling: touch;
 
-  // #ifndef H5
+  .index-head-navs {
-  height: calc(100vh - 400rpx);
+    display: inline-flex;
-  // #endif
+    min-width: 100%;
+  }
+}
+
+.tab-content-h5 {
+  padding-bottom: 40rpx;
+}
+// #endif
+
+.swiper-box {
+  flex: 1;
+  min-height: 0;
 
   .scroll-v {
     height: 100%;
@@ -355,3 +441,12 @@ page {
   }
 }
 </style>
+<style lang="scss">
+/* #ifdef H5 */
+page {
+  height: auto;
+  min-height: 100vh;
+  overflow-y: auto;
+}
+/* #endif */
+</style>

pages/promotion/point/user.vue

@@ -35,6 +35,7 @@ export default {
 .user-point {
   padding: 0 20rpx;
   height: 300rpx;
+  flex-shrink: 0;
   background: url("/static/point-bg.png") no-repeat;
   background-size: 100%;
   display: flex;

pages/tabbar/cart/cartList.vue

@@ -119,24 +119,24 @@
         <u-checkbox class="checkout-all" usedAlone shape="circle" :active-color="lightColor" v-model:checked="checkout"
           :label-size="12" label="全选" @change="checkOut">
         </u-checkbox>
-        <span class="price checkout-total">
+        <view class="checkout-total">
-          <div class="prices">
+          <view class="checkout-total-main">
-            <div class="fullPrice">
+            <text class="checkout-total-label">总计:</text>
-              <span class="number" v-if="cartDetail && cartDetail.priceDetailDTO">
+            <text class="checkout-total-price" v-if="cartDetail && cartDetail.priceDetailDTO">
-                总计:
+              <text class="checkout-total-currency">¥</text>
-                <span>¥{{ goodsFormatPrice(cartDetail.priceDetailDTO.flowPrice)[0] }}</span>.<span>{{ goodsFormatPrice(cartDetail.priceDetailDTO.flowPrice)[1] }}</span>
+              <text class="checkout-total-int">{{ goodsFormatPrice(cartDetail.priceDetailDTO.flowPrice)[0] }}</text>
-              </span>
+              <text class="checkout-total-dec">.{{ goodsFormatPrice(cartDetail.priceDetailDTO.flowPrice)[1] }}</text>
-              <span class="number" v-else>总计:0.00</span>
+            </text>
-            </div>
+            <text class="checkout-total-price" v-else>¥0.00</text>
-            <div
+          </view>
-              v-if="cartDetail.cartList && cartDetail.cartList.length!=0 && cartDetail.priceDetailDTO && cartDetail.priceDetailDTO.discountPrice!=0 "
+          <view
-              class="discountPrice">
+            v-if="cartDetail.cartList && cartDetail.cartList.length != 0 && cartDetail.priceDetailDTO && cartDetail.priceDetailDTO.discountPrice != 0"
-              <span>优惠减:￥{{(cartDetail.priceDetailDTO.goodsPrice -unitPrice(cartDetail.priceDetailDTO.flowPrice))}}
+            class="checkout-total-discount"
-              </span>
+          >
-              <span class="discount-details" @click="discountDetails">优惠明细</span>
+            <text>优惠减:￥{{ cartDetail.priceDetailDTO.goodsPrice - unitPrice(cartDetail.priceDetailDTO.flowPrice) }}</text>
-            </div>
+            <text class="discount-details" @click="discountDetails">优惠明细</text>
-          </div>
+          </view>
-        </span>
+        </view>
       </view>
       <!-- 优惠详情 -->
       <u-popup z-index="3" close mode="bottom" height="50%" closeable v-model:show="discountDetailsFlag" border-radius="20">
@@ -851,7 +851,50 @@ page {
   }
 
   .checkout-total {
-    margin-left: 8rpx;
+    flex: 1;
+    min-width: 0;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+  }
+
+  .checkout-total-main {
+    display: flex;
+    align-items: baseline;
+    line-height: 1.2;
+  }
+
+  .checkout-total-label {
+    font-size: 28rpx;
+    color: #333;
+    flex-shrink: 0;
+  }
+
+  .checkout-total-price {
+    margin-left: 4rpx;
+    font-size: 30rpx;
+    font-weight: bold;
+    color: $main-color;
+    line-height: 1.2;
+  }
+
+  .checkout-total-int {
+    font-size: 38rpx;
+    font-weight: bold;
+  }
+
+  .checkout-total-dec {
+    font-size: 24rpx;
+    font-weight: bold;
+  }
+
+  .checkout-total-discount {
+    display: flex;
+    align-items: center;
+    margin-top: 4rpx;
+    font-size: 24rpx;
+    color: #c9c7c7;
+    line-height: 1.2;
   }
 }
 
@@ -889,17 +932,6 @@ page {
   }
 }
 
-.prices {
-  display: flex;
-  flex-direction: column;
-
-  > .discountPrice {
-    align-items: center;
-    display: flex;
-    font-size: 24rpx;
-    color: rgb(201, 199, 199);
-  }
-}
 .discount-details {
   margin-left: 10px;
   color: #666;