diff --git a/App.vue b/App.vue
index ac86430..c7659f8 100644
--- a/App.vue
+++ b/App.vue
@@ -1,202 +1,206 @@
-<script setup lang="ts">
-import config from '@/config/config'
-import { getClipboardData } from '@/js_sdk/h5-copy/h5-copy.js'
-import APPUpdate from '@/plugins/APPUpdate'
-import storage from '@/utils/storage'
-import { getThemeSetting } from '@/api/common.js'
-import {
-  applyTabBarStyle,
-  cacheTheme,
-  loadCachedTheme,
-  normalizeTheme,
-} from '@/utils/theme'
-import { onLaunch, onShow } from '@dcloudio/uni-app'
-import { useStore } from '@/store'
-import { handleAppLaunchScene } from '@/utils/distributionBind.js'
-
-const store = useStore()
-
-// #ifdef MP-WEIXIN
-wx.onAppRoute(() => {})
-// #endif
-
-onLaunch((val) => {
-  initTheme()
-  handleAppLaunchScene(val)
-  if (val?.query?.inviter) {
-    storage.setInviter(val.query.inviter)
-  }
-
-  // #ifdef APP-PLUS
-  plus.globalEvent.addEventListener('newintent', () => {
-    checkArguments()
-  })
-  // #endif
-
-  // #ifdef MP-WEIXIN
-  applyUpdateWeChat()
-  // #endif
-})
-
-onShow(() => {
-  // #ifndef H5
-  if (config.enableGetClipboard) {
-    getClipboard()
-  }
-  // #endif
-
-  // #ifdef APP-PLUS
-  if (storage.getShow()) {
-    if (uni.getSystemInfoSync().platform == 'ios') {
-      uni.navigateTo({ url: '/pages/tabbar/screen/fullScreen' })
-    }
-  }
-  // #endif
-})
-
-function initTheme() {
-  const cached = loadCachedTheme()
-  if (cached) {
-    store.commit('SET_THEME', cached)
-    applyTabBarStyle(cached.mainColor)
-  }
-  getThemeSetting()
-    .then((res) => {
-      if (res.data?.success && res.data.result?.settingValue) {
-        try {
-          const raw = JSON.parse(res.data.result.settingValue)
-          const theme = normalizeTheme(raw)
-          store.commit('SET_THEME', theme)
-          cacheTheme(theme)
-          applyTabBarStyle(theme.mainColor)
-        } catch (e) {
-          // 主题配置解析失败时使用缓存
-        }
-      }
-    })
-    .catch(() => {})
-}
-
-function applyUpdateWeChat() {
-  const updateManager = uni.getUpdateManager()
-
-  updateManager.onCheckForUpdate(() => {})
-
-  updateManager.onUpdateReady(() => {
-    uni.showModal({
-      title: '更新提示',
-      content: '发现新版本，是否重启应用？',
-      success(res) {
-        if (res.confirm) {
-          updateManager.applyUpdate()
-        }
-      },
-    })
-  })
-
-  updateManager.onUpdateFailed(() => {})
-}
-
-function launch() {
-  try {
-    const value = uni.getStorageSync('launchFlag')
-    if (!value) {
-      // uni.navigateTo({ url: '/pages/index/agreement' })
-    } else {
-      const w = plus.webview.open(
-        '/hybrid/html/advertise/advertise.html',
-        '本地地址',
-        {
-          top: 0,
-          bottom: 0,
-          zindex: 999,
-        },
-        'fade-in',
-        500,
-      )
-      setTimeout(() => {
-        plus.webview.close(w)
-        APPUpdate()
-      }, 3000)
-    }
-  } catch (e) {
-    uni.setStorage({
-      key: 'launchFlag',
-      data: true,
-      success() {
-        console.log('error时存储launchFlag')
-      },
-    })
-  }
-}
-
-async function getClipboard() {
-  const res = await getClipboardData()
-  if (res.indexOf(config.shareLink) != -1 && res != store.state.shareLink) {
-    store.state.shareLink = res
-    uni.showModal({
-      title: '提示',
-      content: '检测到一个分享链接是否跳转？',
-      confirmText: '跳转',
-      success(callback) {
-        if (callback.confirm) {
-          const path = res.split(config.shareLink)[1]
-          if (path.indexOf('tabbar') != -1) {
-            uni.switchTab({ url: path })
-          } else {
-            uni.navigateTo({ url: path })
-          }
-        }
-      },
-    })
-  }
-}
-
-function checkArguments() {
-  // #ifdef APP-PLUS
-  setTimeout(() => {
-    const args = plus.runtime.arguments
-    if (args) {
-      const argsStr = decodeURIComponent(args)
-      const path = argsStr.split('//')[1]
-      if (path.indexOf('tabbar') != -1) {
-        uni.switchTab({ url: `/${path}` })
-      } else {
-        uni.navigateTo({ url: `/${path}` })
-      }
-    }
-  })
-  // #endif
-}
-</script>
-
-<style lang="scss">
-@import "uview-plus/index.scss";
-@import "@/styles/uview-form-fix.scss";
-
-// -------适配底部安全区  苹果x系列刘海屏
-
-// #ifdef MP-WEIXIN
-.mp-iphonex-bottom {
-	padding-bottom: constant(safe-area-inset-bottom);
-	padding-bottom: env(safe-area-inset-bottom);
-	box-sizing: content-box;
-	height: auto !important;
-	padding-top: 10rpx;
-}
-
-// #endif
-
-body {
-	background-color: $bg-color;
-}
-
-/************************ */
-.w200 {
-	width: 200rpx !important;
-}
-
-.flex1 {
-	flex: 1; //必须父级设置flex
-}
-</style>
+<script setup lang="ts">
+import config from '@/config/config'
+import { getClipboardData } from '@/js_sdk/h5-copy/h5-copy.js'
+import APPUpdate from '@/plugins/APPUpdate'
+import storage from '@/utils/storage'
+import { getThemeSetting } from '@/api/common.js'
+import {
+  applyTabBarStyle,
+  cacheTheme,
+  loadCachedTheme,
+  normalizeTheme,
+} from '@/utils/theme'
+import { onLaunch, onShow } from '@dcloudio/uni-app'
+import { useStore } from '@/store'
+import { handleAppLaunchScene } from '@/utils/distributionBind.js'
+
+const store = useStore()
+
+// #ifdef MP-WEIXIN
+wx.onAppRoute((res) => {
+  applyTabBarStyle(store.state.theme && store.state.theme.mainColor, res && res.path)
+})
+// #endif
+
+onLaunch((val) => {
+  initTheme()
+  handleAppLaunchScene(val)
+  if (val?.query?.inviter) {
+    storage.setInviter(val.query.inviter)
+  }
+
+  // #ifdef APP-PLUS
+  plus.globalEvent.addEventListener('newintent', () => {
+    checkArguments()
+  })
+  // #endif
+
+  // #ifdef MP-WEIXIN
+  applyUpdateWeChat()
+  // #endif
+})
+
+onShow(() => {
+  applyTabBarStyle(store.state.theme && store.state.theme.mainColor)
+
+  // #ifndef H5
+  if (config.enableGetClipboard) {
+    getClipboard()
+  }
+  // #endif
+
+  // #ifdef APP-PLUS
+  if (storage.getShow()) {
+    if (uni.getSystemInfoSync().platform == 'ios') {
+      uni.navigateTo({ url: '/pages/tabbar/screen/fullScreen' })
+    }
+  }
+  // #endif
+})
+
+function initTheme() {
+  const cached = loadCachedTheme()
+  if (cached) {
+    store.commit('SET_THEME', cached)
+    applyTabBarStyle(cached.mainColor)
+  }
+  getThemeSetting()
+    .then((res) => {
+      if (res.data?.success && res.data.result?.settingValue) {
+        try {
+          const raw = JSON.parse(res.data.result.settingValue)
+          const theme = normalizeTheme(raw)
+          store.commit('SET_THEME', theme)
+          cacheTheme(theme)
+          applyTabBarStyle(theme.mainColor)
+        } catch (e) {
+          // 主题配置解析失败时使用缓存
+        }
+      }
+    })
+    .catch(() => {})
+}
+
+function applyUpdateWeChat() {
+  const updateManager = uni.getUpdateManager()
+
+  updateManager.onCheckForUpdate(() => {})
+
+  updateManager.onUpdateReady(() => {
+    uni.showModal({
+      title: '更新提示',
+      content: '发现新版本，是否重启应用？',
+      success(res) {
+        if (res.confirm) {
+          updateManager.applyUpdate()
+        }
+      },
+    })
+  })
+
+  updateManager.onUpdateFailed(() => {})
+}
+
+function launch() {
+  try {
+    const value = uni.getStorageSync('launchFlag')
+    if (!value) {
+      // uni.navigateTo({ url: '/pages/index/agreement' })
+    } else {
+      const w = plus.webview.open(
+        '/hybrid/html/advertise/advertise.html',
+        '本地地址',
+        {
+          top: 0,
+          bottom: 0,
+          zindex: 999,
+        },
+        'fade-in',
+        500,
+      )
+      setTimeout(() => {
+        plus.webview.close(w)
+        APPUpdate()
+      }, 3000)
+    }
+  } catch (e) {
+    uni.setStorage({
+      key: 'launchFlag',
+      data: true,
+      success() {
+        console.log('error时存储launchFlag')
+      },
+    })
+  }
+}
+
+async function getClipboard() {
+  const res = await getClipboardData()
+  if (res.indexOf(config.shareLink) != -1 && res != store.state.shareLink) {
+    store.state.shareLink = res
+    uni.showModal({
+      title: '提示',
+      content: '检测到一个分享链接是否跳转？',
+      confirmText: '跳转',
+      success(callback) {
+        if (callback.confirm) {
+          const path = res.split(config.shareLink)[1]
+          if (path.indexOf('tabbar') != -1) {
+            uni.switchTab({ url: path })
+          } else {
+            uni.navigateTo({ url: path })
+          }
+        }
+      },
+    })
+  }
+}
+
+function checkArguments() {
+  // #ifdef APP-PLUS
+  setTimeout(() => {
+    const args = plus.runtime.arguments
+    if (args) {
+      const argsStr = decodeURIComponent(args)
+      const path = argsStr.split('//')[1]
+      if (path.indexOf('tabbar') != -1) {
+        uni.switchTab({ url: `/${path}` })
+      } else {
+        uni.navigateTo({ url: `/${path}` })
+      }
+    }
+  })
+  // #endif
+}
+</script>
+
+<style lang="scss">
+@import "uview-plus/index.scss";
+@import "@/styles/uview-form-fix.scss";
+
+// -------适配底部安全区  苹果x系列刘海屏
+
+// #ifdef MP-WEIXIN
+.mp-iphonex-bottom {
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+	box-sizing: content-box;
+	height: auto !important;
+	padding-top: 10rpx;
+}
+
+// #endif
+
+body {
+	background-color: $bg-color;
+}
+
+/************************ */
+.w200 {
+	width: 200rpx !important;
+}
+
+.flex1 {
+	flex: 1; //必须父级设置flex
+}
+</style>
diff --git a/components/distribution-goods-share/poster-panel.vue b/components/distribution-goods-share/poster-panel.vue
index 47e93dd..255e03c 100644
--- a/components/distribution-goods-share/poster-panel.vue
+++ b/components/distribution-goods-share/poster-panel.vue
@@ -1,6 +1,6 @@
 <template>
   <view class="poster-panel">
-    <view class="poster-hint">点击海报预览后可保存到相册</view>
+    <view v-if="posterList.length" class="poster-hint">点击海报预览后可保存到相册</view>
 
     <view v-if="loading" class="loading-wrap">
       <text class="loading-text">海报生成中...</text>
@@ -226,8 +226,10 @@ async function generatePosters() {
   }
 
   // #ifndef MP-WEIXIN
-  loadError.value = '请在微信小程序中生成海报'
-  return
+  {
+    loadError.value = '请在微信小程序中生成海报'
+    return
+  }
   // #endif
 
   loading.value = true
@@ -463,23 +465,38 @@ function saveCurrentPoster() {
 }
 
 .loading-wrap {
-  padding: 120rpx 0;
-  text-align: center;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  padding: 80rpx 48rpx;
+  box-sizing: border-box;
 }
 
 .loading-text {
+  display: block;
+  width: 100%;
   color: #999;
   font-size: 28rpx;
+  line-height: 1.6;
+  text-align: center;
+}
+
+.retry-btn {
+  margin-top: 32rpx;
 }
 
 .retry-btn,
 .save-btn {
-  display: inline-block;
-  padding: 12rpx 40rpx;
-  border-radius: 30rpx;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  height: 64rpx;
+  padding: 0 40rpx;
+  border-radius: 32rpx;
   background: linear-gradient(90deg, #ff9f3f, #ff6b35);
   color: #fff;
   font-size: 26rpx;
+  white-space: nowrap;
 }
 
 .poster-swiper {
diff --git a/index.html b/index.html
index 2269a69..e704dd9 100644
--- a/index.html
+++ b/index.html
@@ -7,6 +7,12 @@
       content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0"
     />
     <title></title>
+    <!-- H5 构建会把 process.env 替换成空对象，但运行时仍会读取 process，浏览器中不存在该变量 -->
+    <script>
+      if (typeof process === "undefined") {
+        window.process = { env: {} };
+      }
+    </script>
     <!--preload-links-->
     <!--app-context-->
   </head>
diff --git a/pages/cart/gift-card/myGiftCards.vue b/pages/cart/gift-card/myGiftCards.vue
index 9612fa1..047dadd 100644
--- a/pages/cart/gift-card/myGiftCards.vue
+++ b/pages/cart/gift-card/myGiftCards.vue
@@ -18,7 +18,6 @@
           v-model="bindForm.cardSecret"
           border="none"
           maxlength="128"
-          password
           placeholder="请输入兑换码（卡密）"
           clearable
         />
diff --git a/pages/mine/address/address.scss b/pages/mine/address/address.scss
index a2a920c..944e4dc 100644
--- a/pages/mine/address/address.scss
+++ b/pages/mine/address/address.scss
@@ -20,6 +20,9 @@
       padding: 2rpx 20rpx;
     }
     .list {
+      padding-bottom: calc(140rpx + constant(safe-area-inset-bottom));
+      padding-bottom: calc(140rpx + env(safe-area-inset-bottom));
+
       .item:hover {
         background: #ededed;
       }
@@ -115,21 +118,28 @@
       }
     }
   
+    .btn-bar {
+      position: fixed;
+      left: 0;
+      right: 0;
+      bottom: 0;
+      z-index: 99;
+      padding: 20rpx 30rpx calc(20rpx + constant(safe-area-inset-bottom));
+      padding: 20rpx 30rpx calc(20rpx + env(safe-area-inset-bottom));
+      background: $page-color-base;
+      box-sizing: border-box;
+    }
+
     .btn {
       background: $light-color;
-      position: fixed;
-      width: 690rpx;
-      bottom: calc(60rpx + constant(safe-area-inset-bottom));
-      bottom: calc(60rpx + env(safe-area-inset-bottom));
+      width: 100%;
       height: 80rpx;
-      left: 30rpx;
       font-size: 30rpx;
       color: #fff;
       border-radius: 40rpx;
       display: flex;
       align-items: center;
       justify-content: center;
-      z-index: 99;
       overflow: hidden;
 
       .btn-text {
diff --git a/pages/mine/address/address.vue b/pages/mine/address/address.vue
index 4f59d18..6090a69 100644
--- a/pages/mine/address/address.vue
+++ b/pages/mine/address/address.vue
@@ -1,138 +1,135 @@
-<template>
-  <view class="address">
-
-    <u-empty class="empty" v-if="addressList.length == 0" text="暂无收货地址" mode="address"></u-empty>
-    <view class="list" v-else>
-      <view class="item c-content" v-for="(item, index) in addressList" :key="index">
-        <view class="basic" @click="selectAddressData(item)">
-          <text>{{ item.name }}</text>
-          <text>{{ item.mobile }}</text>
-          <text class="default" v-show="item.isDefault">默认</text>
-          <view>
-            <div class="region">
-              <span v-if="item.consigneeAddressPath[0]">{{item.consigneeAddressPath[0]}}</span>
-              <span v-if="item.consigneeAddressPath[1]">{{item.consigneeAddressPath[1]}}</span>
-              <span v-if="item.consigneeAddressPath[2]">{{item.consigneeAddressPath[2]}}</span>
-              <span v-if="item.consigneeAddressPath[3]">{{item.consigneeAddressPath[3]}}</span>
-              <span>{{ item.detail }}</span>
-            </div>
-          </view>
-        </view>
-        <view class="edit">
-          <view class="relative" @click="setDefault(item)">
-            <view v-if="item.isDefault" class="alifont icon-xuanzhong"></view>
-            <text v-else class="unchecked"></text>
-            <text>{{ item.isDefault ? "默认地址" : "设为默认" }}</text>
-          </view>
-          <view class="relative">
-            <view class="alifont icon-bianji-copy"></view>
-            <text class="mr-40" @click="addAddress(item.id)">编辑</text>
-            <view class="alifont icon-lajitong"></view>
-            <text @click="removeAddress(item.id)">删除</text>
-          </view>
-        </view>
-      </view>
-      <view style="height: 100px"></view>
-    </view>
-    <view class="btn" @click="addAddress('')">
-      <u-icon name="plus-circle" color="#ffffff" size="18"></u-icon>
-      <text class="btn-text">添加新收货人</text>
-    </view>
-    <u-action-sheet :list="removeList" :tips="tips" v-model:show="showAction" @click="deleteAddressMessage"></u-action-sheet>
-  </view>
-</template>
-
-<script setup lang="ts">
-import { ref } from 'vue'
-import { onLoad, onShow, onPullDownRefresh } from '@dcloudio/uni-app'
-import { useStore } from '@/store'
-import * as API_Trade from '@/api/trade'
-import * as API_Address from '@/api/address.js'
-
-const store = useStore()
-
-const addressList = ref<any[]>([])
-const showAction = ref(false)
-const removeList = [{ text: '确定' }]
-const tips = { text: '确定要删除该收货人信息吗？' }
-const removeId = ref('')
-const routerVal = ref<Record<string, string>>({})
-const params = { pageNumber: 1, pageSize: 1000 }
-
-onPullDownRefresh(() => {
-  addressList.value = []
-  getAddressList()
-})
-
-onLoad((val) => {
-  routerVal.value = val || {}
-})
-
-onShow(() => {
-  addressList.value = []
-  getAddressList()
-})
-
-function hideLoadingIfNeeded() {
-  if (store.state.isShowToast) uni.hideLoading()
-}
-
-async function selectAddressData(val: any) {
-  await API_Trade.setAddressId(val.id, routerVal.value.way)
-  uni.navigateBack({ delta: 1 })
-}
-
-function getAddressList() {
-  uni.showLoading()
-  API_Address.getAddressList(params.pageNumber, params.pageSize).then((res) => {
-    res.data.result.records.forEach((item: any) => {
-      item.consigneeAddressPath = item.consigneeAddressPath.split(',')
-    })
-    addressList.value = res.data.result.records
-    hideLoadingIfNeeded()
-  })
-}
-
-function removeAddress(id: string) {
-  removeId.value = id
-  showAction.value = true
-}
-
-function deleteAddressMessage() {
-  API_Address.deleteAddress(removeId.value).then((res) => {
-    if (res.statusCode == 200) {
-      uni.showToast({ icon: 'none', title: '删除成功' })
-      getAddressList()
-    } else {
-      uni.showToast({ icon: 'none', title: res.data.message, duration: 2000 })
-    }
-  })
-}
-
-function addAddress(id: string) {
-  if (id) {
-    uni.navigateTo({
-      url: `/pages/mine/address/add?id=${id}&way=${routerVal.value.way}&type=order`,
-    })
-  } else {
-    uni.navigateTo({
-      url: `/pages/mine/address/add?way=${routerVal.value.way}&type=order`,
-    })
-  }
-}
-
-function setDefault(item: any) {
-  delete item.updateBy
-  delete item.updateTime
-  delete item.deleteFlag
-  if (!item.isDefault) item.isDefault = true
-  API_Address.editAddress(item).then(() => {
-    uni.showToast({ title: '设置默认地址成功', icon: 'none' })
-    getAddressList()
-  })
-}
-</script>
-
-<style lang="scss" scoped>
-@import "./address.scss";
-</style>
+<template>
+  <view class="address">
+
+    <u-empty class="empty" v-if="addressList.length == 0" text="暂无收货地址" mode="address"></u-empty>
+    <view class="list" v-else>
+      <view class="item c-content" v-for="(item, index) in addressList" :key="index">
+        <view class="basic" @click="selectAddressData(item)">
+          <text>{{ item.name }}</text>
+          <text>{{ item.mobile }}</text>
+          <text class="default" v-show="item.isDefault">默认</text>
+          <view>
+            <div class="region">
+              <span v-if="item.consigneeAddressPath[0]">{{item.consigneeAddressPath[0]}}</span>
+              <span v-if="item.consigneeAddressPath[1]">{{item.consigneeAddressPath[1]}}</span>
+              <span v-if="item.consigneeAddressPath[2]">{{item.consigneeAddressPath[2]}}</span>
+              <span v-if="item.consigneeAddressPath[3]">{{item.consigneeAddressPath[3]}}</span>
+              <span>{{ item.detail }}</span>
+            </div>
+          </view>
+        </view>
+        <view class="edit">
+          <view class="relative" @click="setDefault(item)">
+            <view v-if="item.isDefault" class="alifont icon-xuanzhong"></view>
+            <text v-else class="unchecked"></text>
+            <text>{{ item.isDefault ? "默认地址" : "设为默认" }}</text>
+          </view>
+          <view class="relative">
+            <view class="alifont icon-bianji-copy"></view>
+            <text class="mr-40" @click="addAddress(item.id)">编辑</text>
+            <view class="alifont icon-lajitong" @click.stop="removeAddress(item.id)"></view>
+            <text @click.stop="removeAddress(item.id)">删除</text>
+          </view>
+        </view>
+      </view>
+      <view style="height: 100px"></view>
+    </view>
+    <view class="btn" @click="addAddress('')">
+      <u-icon name="plus-circle" color="#ffffff" size="18"></u-icon>
+      <text class="btn-text">添加新收货人</text>
+    </view>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue'
+import { onLoad, onShow, onPullDownRefresh } from '@dcloudio/uni-app'
+import { useStore } from '@/store'
+import * as API_Trade from '@/api/trade'
+import * as API_Address from '@/api/address.js'
+
+const store = useStore()
+
+const addressList = ref<any[]>([])
+const routerVal = ref<Record<string, string>>({})
+const params = { pageNumber: 1, pageSize: 1000 }
+
+onPullDownRefresh(() => {
+  addressList.value = []
+  getAddressList()
+})
+
+onLoad((val) => {
+  routerVal.value = val || {}
+})
+
+onShow(() => {
+  addressList.value = []
+  getAddressList()
+})
+
+function hideLoadingIfNeeded() {
+  if (store.state.isShowToast) uni.hideLoading()
+}
+
+async function selectAddressData(val: any) {
+  await API_Trade.setAddressId(val.id, routerVal.value.way)
+  uni.navigateBack({ delta: 1 })
+}
+
+function getAddressList() {
+  uni.showLoading()
+  API_Address.getAddressList(params.pageNumber, params.pageSize).then((res) => {
+    res.data.result.records.forEach((item: any) => {
+      item.consigneeAddressPath = item.consigneeAddressPath.split(',')
+    })
+    addressList.value = res.data.result.records
+    hideLoadingIfNeeded()
+  })
+}
+
+function removeAddress(id: string) {
+  uni.showModal({
+    title: '提示',
+    content: '确定要删除该收货人信息吗？',
+    success: (res) => {
+      if (!res.confirm) return
+      API_Address.deleteAddress(id).then((result) => {
+        if (result.statusCode == 200) {
+          uni.showToast({ icon: 'none', title: '删除成功' })
+          getAddressList()
+        } else {
+          uni.showToast({ icon: 'none', title: result.data.message, duration: 2000 })
+        }
+      })
+    },
+  })
+}
+
+function addAddress(id: string) {
+  if (id) {
+    uni.navigateTo({
+      url: `/pages/mine/address/add?id=${id}&way=${routerVal.value.way}&type=order`,
+    })
+  } else {
+    uni.navigateTo({
+      url: `/pages/mine/address/add?way=${routerVal.value.way}&type=order`,
+    })
+  }
+}
+
+function setDefault(item: any) {
+  delete item.updateBy
+  delete item.updateTime
+  delete item.deleteFlag
+  if (!item.isDefault) item.isDefault = true
+  API_Address.editAddress(item).then(() => {
+    uni.showToast({ title: '设置默认地址成功', icon: 'none' })
+    getAddressList()
+  })
+}
+</script>
+
+<style lang="scss" scoped>
+@import "./address.scss";
+</style>
diff --git a/pages/mine/address/addressManage.vue b/pages/mine/address/addressManage.vue
index 40a7e3b..9b1739d 100644
--- a/pages/mine/address/addressManage.vue
+++ b/pages/mine/address/addressManage.vue
@@ -26,20 +26,19 @@
           <view class="relative">
             <view class="alifont icon-bianji-copy"></view>
             <text class="mr-40" @click="addAddress(item.id)">编辑</text>
-            <view class="alifont icon-lajitong"></view>
-            <text @click="removeAddress(item.id)">删除</text>
+            <view class="alifont icon-lajitong" @click.stop="removeAddress(item.id)"></view>
+            <text @click.stop="removeAddress(item.id)">删除</text>
           </view>
         </view>
       </view>
-      <view style="height: 100px"></view>
     </view>
 
-    <view class="btn" @click="addAddress('')">
-      <u-icon name="plus-circle" color="#ffffff" size="18"></u-icon>
-      <text class="btn-text">添加新收货人</text>
+    <view class="btn-bar">
+      <view class="btn" @click="addAddress('')">
+        <u-icon name="plus-circle" color="#ffffff" size="18"></u-icon>
+        <text class="btn-text">添加新收货人</text>
+      </view>
     </view>
-
-    <u-action-sheet :list="removeList" :tips="tips" v-model:show="showAction" @click="deleteAddressMessage"></u-action-sheet>
   </view>
 </template>
 
@@ -53,10 +52,6 @@ import * as API_Address from '@/api/address.js'
 const store = useStore()
 
 const addressList = ref<any[]>([])
-const showAction = ref(false)
-const removeList = [{ text: '确定' }]
-const tips = { text: '确定要删除该收货人信息吗？' }
-const removeId = ref('')
 const routerVal = ref<Record<string, string>>({})
 const params = { pageNumber: 1, pageSize: 1000 }
 
@@ -96,18 +91,20 @@ function getAddressList() {
 }
 
 function removeAddress(id: string) {
-  removeId.value = id
-  showAction.value = true
-}
-
-function deleteAddressMessage() {
-  API_Address.deleteAddress(removeId.value).then((res) => {
-    if (res.statusCode == 200) {
-      uni.showToast({ icon: 'none', title: '删除成功' })
-      getAddressList()
-    } else {
-      uni.showToast({ icon: 'none', title: res.data.message, duration: 2000 })
-    }
+  uni.showModal({
+    title: '提示',
+    content: '确定要删除该收货人信息吗？',
+    success: (res) => {
+      if (!res.confirm) return
+      API_Address.deleteAddress(id).then((result) => {
+        if (result.statusCode == 200) {
+          uni.showToast({ icon: 'none', title: '删除成功' })
+          getAddressList()
+        } else {
+          uni.showToast({ icon: 'none', title: result.data.message, duration: 2000 })
+        }
+      })
+    },
   })
 }
 
diff --git a/pages/mine/address/storeAddress.vue b/pages/mine/address/storeAddress.vue
index 1a6c404..d1e3ee0 100644
--- a/pages/mine/address/storeAddress.vue
+++ b/pages/mine/address/storeAddress.vue
@@ -16,7 +16,13 @@
       </view>
       <view style="height: 100px"></view>
     </view>
-    <u-action-sheet :list="removeList" :tips="tips" v-model:show="showAction" @click="deleteAddressMessage"></u-action-sheet>
+    <u-action-sheet
+      :actions="removeList"
+      :description="tips.text"
+      cancel-text="取消"
+      v-model:show="showAction"
+      @select="deleteAddressMessage"
+    ></u-action-sheet>
   </view>
 </template>
 
@@ -31,7 +37,7 @@ const store = useStore()
 
 const storeAddressList = ref<any[]>([])
 const showAction = ref(false)
-const removeList = [{ text: '确定' }]
+const removeList = [{ name: '确定' }]
 const tips = { text: '确定要删除该收货人信息吗？' }
 const removeId = ref('')
 const routerVal = ref<Record<string, string>>({})
diff --git a/pages/mine/myTracks.vue b/pages/mine/myTracks.vue
index 119e2e4..7c0ad54 100644
--- a/pages/mine/myTracks.vue
+++ b/pages/mine/myTracks.vue
@@ -1,330 +1,325 @@
-<template>
-	<view class="myTracks">
-		<u-navbar
-			title="我的足迹"
-			:fixed="true"
-			:placeholder="true"
-			:auto-back="true"
-		>
-			<template #right>
-        <view class="light-color edit" @click="isEdit = !isEdit">{{ !isEdit ? '编辑' : '完成'}}</view>
-      </template>
-		</u-navbar>
-		<view class="tracks-tip">
-			<u-icon name="volume" color="#f9ae3d" size="19"></u-icon>
-			<text class="tracks-tip-text">右划删除浏览记录</text>
-		</view>
-		<u-empty text="暂无历史记录" style="margin-top:200rpx;" mode="history" v-if="isEmpty"></u-empty>
-		<view v-else class="tracks-list">
-			<block v-for="(item, index) in trackList" :key="index">
-				<view
-					class="myTracks-title"
-					v-if="getStoreName(item)"
-					@click="navigateToStore(item)"
-				>{{ getStoreName(item) }}</view>
-				<u-swipe-action class="myTracks-swipe">
-					<u-swipe-action-item
-						:show="item.show"
-						:name="index"
-						@click="deleteTracks"
-						@open="openSwipe"
-						:options="swipeOptions"
-					>
-						<view class="myTracks-item">
-							<u-checkbox-group v-if="isEdit" class="store-line-check">
-								<u-checkbox
-									usedAlone
-									shape="circle"
-									:active-color="lightColor"
-									v-model:checked="item.checked"
-									@change="onTrackCheckChange(item)"
-								></u-checkbox>
-							</u-checkbox-group>
-							<view class="myTracks-item-img" @click.stop="navigateToDetail(item)">
-								<image class="track-thumb" :src="item.thumbnail"></image>
-							</view>
-							<view class="myTracks-item-content" @click.stop="navigateToDetail(item)">
-								<view class="myTracks-item-title">
-									{{ item.goodsName }}
-								</view>
-								<view class="myTracks-item-price">
-									￥{{ unitPrice(item.price) }}
-								</view>
-							</view>
-						</view>
-					</u-swipe-action-item>
-				</u-swipe-action>
-				<view class="myTracks-divider"></view>
-			</block>
-			<view v-if="isEdit" class="submit" @click="deleteSelectedTracks">
-				删除所选
-			</view>
-		</view>
-
-	</view>
-</template>
-
-<script setup lang="ts">
-import { ref, computed } from 'vue'
-import { onShow, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
-import { useStore } from '@/store'
-import { unitPrice } from '@/utils/filters.js'
-import { myTrackList, deleteHistoryListId } from '@/api/members.js'
-import { getStoreBaseInfo } from '@/api/store.js'
-
-const store = useStore()
-const lightColor = computed(() => store.getters.lightColor)
-
-const isEdit = ref(false)
-const isEmpty = ref(false)
-const params = ref({
-	pageNumber: 1,
-	pageSize: 10,
-	order: 'desc',
-	sort: 'updateTime',
-})
-const swipeOptions = [{ text: '删除', style: { backgroundColor: '#dd524d' } }]
-const trackList = ref<any[]>([])
-const storeNameMap = ref<Record<string, string>>({})
-
-onReachBottom(() => {
-	params.value.pageNumber++
-	fetchTrackList()
-})
-
-onShow(() => {
-	params.value.pageNumber = 1
-	trackList.value = []
-	fetchTrackList()
-})
-
-onPullDownRefresh(() => {
-	params.value.pageNumber = 1
-	trackList.value = []
-	fetchTrackList()
-})
-
-function getStoreName(item: any) {
-	return item.storeName || storeNameMap.value[item.storeId] || ''
-}
-
-async function enrichStoreNames(records: any[]) {
-	const storeIds = [
-		...new Set(
-			records
-				.filter((item) => !item.storeName && item.storeId)
-				.map((item) => item.storeId)
-		),
-	].filter((storeId) => !storeNameMap.value[storeId])
-
-	await Promise.all(
-		storeIds.map(async (storeId) => {
-			try {
-				const res = await getStoreBaseInfo(storeId)
-				const name = res.data?.result?.storeName
-				if (name) {
-					storeNameMap.value[storeId] = name
-				}
-			} catch {
-				// ignore
-			}
-		})
-	)
-}
-
-function onTrackCheckChange(_val: any) {
-	// 勾选状态由 v-model:checked 维护
-}
-
-function deleteSelectedTracks() {
-	const ids = trackList.value.filter((item) => item.checked).map((item) => item.goodsId)
-	if (!ids.length) {
-		uni.showToast({ title: '请选择删除数据', icon: 'none' })
-		return
-	}
-	deleteTracks(0, ids)
-}
-
-function navigateToStore(val: any) {
-	uni.navigateTo({ url: `/pages/product/shopPage?id=${val.storeId}` })
-}
-
-function openSwipe(index: number) {
-	trackList.value[index].show = true
-	trackList.value.forEach((val, idx) => {
-		if (index !== idx) val.show = false
-	})
-}
-
-function navigateToDetail(item: any) {
-	uni.navigateTo({
-		url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
-	})
-}
-
-function fetchTrackList() {
-	uni.showLoading({ title: '加载中' })
-	myTrackList(params.value).then(async (res) => {
-		uni.stopPullDownRefresh()
-		uni.hideLoading()
-		if (res.statusCode === 200) {
-			const records = res.data.result.records || []
-			records.forEach((item: any) => {
-				item.show = false
-				item.checked = false
-			})
-
-			if (!records.length) {
-				if (trackList.value.length === 0) {
-					isEmpty.value = true
-				}
-			} else {
-				isEmpty.value = false
-				await enrichStoreNames(records)
-				trackList.value.push(...records)
-			}
-		}
-	})
-}
-
-function deleteTracks(e: any, ids?: any) {
-	const index = typeof e === 'object' ? (e.name != null ? e.name : e.index) : e
-	const goodsId = ids || trackList.value[index]?.goodsId
-	if (!goodsId) return
-	deleteHistoryListId(goodsId).then((res) => {
-		if (res.data.code === 200) {
-			trackList.value = []
-			params.value.pageNumber = 1
-			fetchTrackList()
-		} else {
-			uni.showToast({
-				title: res.data.message,
-				duration: 2000,
-				icon: 'none',
-			})
-		}
-	})
-}
-</script>
-
-<style lang="scss" scoped>
-	.submit {
-		position: fixed;
-		bottom: calc(20rpx + constant(safe-area-inset-bottom));
-		bottom: calc(20rpx + env(safe-area-inset-bottom));
-		left: 10%;
-		width: 80%;
-		height: 80rpx;
-		color: #fff;
-		border-radius: 100px;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		background: $light-color;
-		z-index: 99;
-	}
-
-	.myTracks {
-		width: 100%;
-		padding-top: 2rpx;
-	}
-
-	.tracks-tip {
-		display: flex;
-		align-items: center;
-		padding: 18rpx 24rpx;
-		background: #fdf6ec;
-	}
-
-	.tracks-tip-text {
-		margin-left: 10rpx;
-		font-size: 28rpx;
-		color: #f9ae3d;
-		line-height: 1.4;
-	}
-
-	.tracks-list {
-		width: 100%;
-	}
-
-	.myTracks-swipe,
-	:deep(.u-swipe-action),
-	:deep(.u-swipe-action-item),
-	:deep(.u-swipe-action-item__content) {
-		width: 100%;
-	}
-
-	:deep(.u-swipe-action-item__content) {
-		overflow: hidden;
-	}
-
-	.myTracks-title {
-		width: 100%;
-		height: 110rpx;
-		padding: 0 20rpx;
-		font-size: 28rpx;
-		color: #666;
-		font-weight: bold;
-		background-color: #fff;
-		display: flex;
-		align-items: center;
-		box-sizing: border-box;
-	}
-
-	.myTracks-item {
-		width: 100%;
-		min-height: 226rpx;
-		padding: 30rpx 20rpx;
-		background-color: #fff;
-		box-sizing: border-box;
-		display: flex;
-		align-items: center;
-	}
-
-	.store-line-check {
-		margin-right: 16rpx;
-		flex-shrink: 0;
-	}
-
-	.myTracks-item-img {
-		margin-right: 20rpx;
-		flex-shrink: 0;
-
-		.track-thumb {
-			width: 130rpx;
-			height: 130rpx;
-			border-radius: 8rpx;
-			display: block;
-		}
-	}
-
-	.myTracks-item-content {
-		flex: 1;
-		min-width: 0;
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-	}
-
-	.myTracks-item-title {
-		font-size: 28rpx;
-		color: #333;
-		line-height: 1.4;
-	}
-
-	.myTracks-item-price {
-		font-size: 28rpx;
-		color: $light-color;
-		padding-top: 10rpx;
-	}
-
-	.myTracks-divider {
-		width: 100%;
-		height: 20rpx;
-		background: #f5f5f5;
-	}
-
-	.edit {
-		padding-right: 32rpx;
-	}
-</style>
+<template>
+	<view class="myTracks">
+		<u-navbar
+			title="我的足迹"
+			:fixed="true"
+			:placeholder="true"
+			:auto-back="true"
+		>
+			<template #right>
+        <view class="light-color edit" @click="isEdit = !isEdit">{{ !isEdit ? '编辑' : '完成'}}</view>
+      </template>
+		</u-navbar>
+		<u-empty text="暂无历史记录" style="margin-top:200rpx;" mode="history" v-if="isEmpty"></u-empty>
+		<view v-else class="tracks-list" :class="{ 'is-editing': isEdit }">
+			<u-swipe-action
+				v-for="(item, index) in trackList"
+				:key="item.id || index"
+				class="myTracks-swipe"
+			>
+				<u-swipe-action-item
+					:show="item.show"
+					:name="index"
+					@click="deleteTracks"
+					@open="openSwipe"
+					:options="swipeOptions"
+				>
+					<view class="myTracks-item">
+						<u-checkbox-group v-if="isEdit" class="store-line-check">
+							<u-checkbox
+								usedAlone
+								shape="circle"
+								:active-color="lightColor"
+								v-model:checked="item.checked"
+								@change="onTrackCheckChange(item)"
+							></u-checkbox>
+						</u-checkbox-group>
+						<view class="myTracks-item-img" @click.stop="navigateToDetail(item)">
+							<image v-if="item.thumbnail" class="track-thumb-img" mode="aspectFill" :src="item.thumbnail"></image>
+						</view>
+						<view class="myTracks-item-content" @click.stop="navigateToDetail(item)">
+							<view class="myTracks-item-title">{{ item.goodsName }}</view>
+							<view
+								v-if="getStoreName(item)"
+								class="myTracks-item-store"
+								@click.stop="navigateToStore(item)"
+							>{{ getStoreName(item) }}</view>
+							<view class="myTracks-item-price">￥{{ unitPrice(item.price) }}</view>
+						</view>
+					</view>
+				</u-swipe-action-item>
+			</u-swipe-action>
+			<view v-if="isEdit" class="submit" @click="deleteSelectedTracks">删除所选</view>
+		</view>
+
+	</view>
+</template>
+
+<script setup lang="ts">
+import { ref, computed } from 'vue'
+import { onShow, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
+import { useStore } from '@/store'
+import { unitPrice } from '@/utils/filters.js'
+import { myTrackList, deleteHistoryListId } from '@/api/members.js'
+import { getStoreBaseInfo } from '@/api/store.js'
+
+const store = useStore()
+const lightColor = computed(() => store.getters.lightColor)
+
+const isEdit = ref(false)
+const isEmpty = ref(false)
+const params = ref({
+	pageNumber: 1,
+	pageSize: 10,
+	order: 'desc',
+	sort: 'updateTime',
+})
+const swipeOptions = [{ text: '删除', style: { backgroundColor: '#dd524d' } }]
+const trackList = ref<any[]>([])
+const storeNameMap = ref<Record<string, string>>({})
+
+onReachBottom(() => {
+	params.value.pageNumber++
+	fetchTrackList()
+})
+
+onShow(() => {
+	params.value.pageNumber = 1
+	trackList.value = []
+	fetchTrackList()
+})
+
+onPullDownRefresh(() => {
+	params.value.pageNumber = 1
+	trackList.value = []
+	fetchTrackList()
+})
+
+function getStoreName(item: any) {
+	return item.storeName || storeNameMap.value[item.storeId] || ''
+}
+
+async function enrichStoreNames(records: any[]) {
+	const storeIds = [
+		...new Set(
+			records
+				.filter((item) => !item.storeName && item.storeId)
+				.map((item) => item.storeId)
+		),
+	].filter((storeId) => !storeNameMap.value[storeId])
+
+	await Promise.all(
+		storeIds.map(async (storeId) => {
+			try {
+				const res = await getStoreBaseInfo(storeId)
+				const name = res.data?.result?.storeName
+				if (name) {
+					storeNameMap.value[storeId] = name
+				}
+			} catch {
+				// ignore
+			}
+		})
+	)
+}
+
+function onTrackCheckChange(_val: any) {
+	// 勾选状态由 v-model:checked 维护
+}
+
+function deleteSelectedTracks() {
+	const ids = trackList.value.filter((item) => item.checked).map((item) => item.goodsId)
+	if (!ids.length) {
+		uni.showToast({ title: '请选择删除数据', icon: 'none' })
+		return
+	}
+	deleteTracks(0, ids)
+}
+
+function navigateToStore(val: any) {
+	uni.navigateTo({ url: `/pages/product/shopPage?id=${val.storeId}` })
+}
+
+function openSwipe(index: number) {
+	trackList.value[index].show = true
+	trackList.value.forEach((val, idx) => {
+		if (index !== idx) val.show = false
+	})
+}
+
+function navigateToDetail(item: any) {
+	uni.navigateTo({
+		url: `/pages/product/goods?id=${item.id}&goodsId=${item.goodsId}`,
+	})
+}
+
+function fetchTrackList() {
+	uni.showLoading({ title: '加载中' })
+	myTrackList(params.value).then(async (res) => {
+		uni.stopPullDownRefresh()
+		uni.hideLoading()
+		if (res.statusCode === 200) {
+			const records = res.data.result.records || []
+			records.forEach((item: any) => {
+				item.show = false
+				item.checked = false
+			})
+
+			if (!records.length) {
+				if (trackList.value.length === 0) {
+					isEmpty.value = true
+				}
+			} else {
+				isEmpty.value = false
+				await enrichStoreNames(records)
+				trackList.value.push(...records)
+			}
+		}
+	})
+}
+
+function deleteTracks(e: any, ids?: any) {
+	const index = typeof e === 'object' ? (e.name != null ? e.name : e.index) : e
+	const goodsId = ids || trackList.value[index]?.goodsId
+	if (!goodsId) return
+	deleteHistoryListId(goodsId).then((res) => {
+		if (res.data.code === 200) {
+			trackList.value = []
+			params.value.pageNumber = 1
+			fetchTrackList()
+		} else {
+			uni.showToast({
+				title: res.data.message,
+				duration: 2000,
+				icon: 'none',
+			})
+		}
+	})
+}
+</script>
+
+<style lang="scss" scoped>
+	.submit {
+		position: fixed;
+		bottom: calc(20rpx + constant(safe-area-inset-bottom));
+		bottom: calc(20rpx + env(safe-area-inset-bottom));
+		left: 10%;
+		width: 80%;
+		height: 80rpx;
+		color: #fff;
+		border-radius: 100px;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		background: $light-color;
+		z-index: 99;
+	}
+
+	.myTracks {
+		width: 100%;
+		min-height: 100vh;
+		background: #f5f5f5;
+		padding-top: 2rpx;
+		box-sizing: border-box;
+	}
+
+	.tracks-list {
+		padding: 20rpx 24rpx 40rpx;
+		box-sizing: border-box;
+
+		&.is-editing {
+			padding-bottom: calc(140rpx + constant(safe-area-inset-bottom));
+			padding-bottom: calc(140rpx + env(safe-area-inset-bottom));
+		}
+	}
+
+	.myTracks-swipe {
+		display: block;
+		margin-bottom: 20rpx;
+		border-radius: 16rpx;
+		overflow: hidden;
+		background: #fff;
+	}
+
+	:deep(.u-swipe-action),
+	:deep(.u-swipe-action-item),
+	:deep(.u-swipe-action-item__content) {
+		width: 100%;
+	}
+
+	:deep(.u-swipe-action-item__content) {
+		overflow: hidden;
+		background: #fff;
+	}
+
+	.myTracks-item {
+		width: 100%;
+		padding: 24rpx;
+		background-color: #fff;
+		box-sizing: border-box;
+		display: flex;
+		align-items: center;
+	}
+
+	.store-line-check {
+		margin-right: 16rpx;
+		flex-shrink: 0;
+	}
+
+	.myTracks-item-img {
+		width: 160rpx;
+		height: 160rpx;
+		margin-right: 20rpx;
+		flex-shrink: 0;
+		border-radius: 12rpx;
+		background: #f3f4f6;
+		overflow: hidden;
+
+		.track-thumb-img {
+			width: 100%;
+			height: 100%;
+			display: block;
+		}
+	}
+
+	.myTracks-item-content {
+		flex: 1;
+		min-width: 0;
+		min-height: 160rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
+
+	.myTracks-item-title {
+		font-size: 28rpx;
+		color: #333;
+		line-height: 1.4;
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 2;
+		overflow: hidden;
+	}
+
+	.myTracks-item-store {
+		margin-top: 8rpx;
+		font-size: 24rpx;
+		color: #999;
+		line-height: 1.4;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+
+	.myTracks-item-price {
+		margin-top: 12rpx;
+		font-size: 32rpx;
+		font-weight: 600;
+		color: $light-color;
+		line-height: 1.2;
+	}
+
+	.edit {
+		padding-right: 32rpx;
+	}
+</style>
diff --git a/pages/mine/set/personMsg.vue b/pages/mine/set/personMsg.vue
index 3042c3d..0dfa321 100644
--- a/pages/mine/set/personMsg.vue
+++ b/pages/mine/set/personMsg.vue
@@ -56,7 +56,6 @@
 
     <view class="bottom">
       <view class="submit" @click="submit">保存</view>
-      <view class="submit light" @click="quiteLoginOut">退出登录</view>
     </view>
 
     <u-datetime-picker
@@ -84,7 +83,6 @@
 import { ref, reactive, computed } from 'vue'
 import { onShow } from '@dcloudio/uni-app'
 import { useStore } from '@/store'
-import { quiteLoginOut } from '@/utils/filters.js'
 import { saveUserInfo } from '@/api/members.js'
 import { upload } from '@/api/common.js'
 import storage from '@/utils/storage.js'
@@ -211,31 +209,40 @@ onShow(() => {
 })
 </script>
 
-<style lang="scss" scoped>
+<style lang="scss">
 page {
-  background: #fff;
+  background: #f5f5f5;
 }
-
+</style>
+<style lang="scss" scoped>
 .person-msg {
   min-height: 100vh;
-  background: #fff;
-  padding-bottom: 180rpx;
+  background: #f5f5f5;
+  padding-bottom: calc(160rpx + env(safe-area-inset-bottom));
+  box-sizing: border-box;
 }
 
 .head {
-  padding: 40rpx 0 20rpx;
-  color: $font-color-light;
-  font-size: $font-sm;
+  margin-bottom: 20rpx;
+  padding: 48rpx 0 32rpx;
+  background: #fff;
+  color: #999;
+  font-size: 24rpx;
   display: flex;
   flex-direction: column;
   justify-content: center;
   align-items: center;
-  line-height: 2em;
 
   image {
     width: 144rpx;
     height: 144rpx;
     border-radius: 50%;
+    background: #f3f4f6;
+  }
+
+  view {
+    margin-top: 16rpx;
+    line-height: 1.4;
   }
 }
 
@@ -244,13 +251,13 @@ page {
 }
 
 :deep(.u-form-item) {
-  padding: 0 30rpx;
-  min-height: 100rpx;
+  padding: 0 32rpx;
 }
 
 :deep(.u-form-item__body) {
-  min-height: 100rpx;
+  min-height: 108rpx;
   align-items: center;
+  padding: 16rpx 0 !important;
 }
 
 :deep(.u-form-item__body__left__content__label) {
@@ -258,8 +265,13 @@ page {
   color: #333;
 }
 
+:deep(.u-form-item__body__right) {
+  min-width: 0;
+}
+
 :deep(.u-form-item__body__right__content__slot) {
   flex: 1;
+  min-width: 0;
   display: flex;
   justify-content: flex-end;
   align-items: center;
@@ -271,7 +283,8 @@ page {
 
 :deep(.u-input__content__field-wrapper__field) {
   font-size: 28rpx !important;
-  color: #666 !important;
+  color: #333 !important;
+  text-align: right;
 }
 
 .sex-row {
@@ -288,16 +301,20 @@ page {
 
 .form-value {
   width: 100%;
+  min-width: 0;
   text-align: right;
   font-size: 28rpx;
-  color: #666;
+  color: #333;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
 }
 
 .bind-mobile {
   width: 100%;
   text-align: right;
   font-size: 28rpx;
-  color: $main-color;
+  color: $light-color;
 }
 
 .bottom {
@@ -307,10 +324,10 @@ page {
   bottom: 0;
   display: flex;
   align-items: center;
-  justify-content: space-between;
-  padding: 24rpx 30rpx calc(24rpx + env(safe-area-inset-bottom));
+  padding: 16rpx 32rpx calc(16rpx + env(safe-area-inset-bottom));
   background: #fff;
   box-sizing: border-box;
+  box-shadow: 0 -2rpx 12rpx rgba(0, 0, 0, 0.04);
 }
 
 .submit {
@@ -318,18 +335,9 @@ page {
   height: 80rpx;
   line-height: 80rpx;
   text-align: center;
-  border-radius: 100px;
+  border-radius: 40rpx;
   font-size: 30rpx;
   background: $light-color;
   color: #fff;
 }
-
-.submit + .submit {
-  margin-left: 24rpx;
-}
-
-.light {
-  background: rgba($color: $light-color, $alpha: 0.2) !important;
-  color: $light-color !important;
-}
 </style>
diff --git a/pages/order/afterSales/afterSalesDetail.vue b/pages/order/afterSales/afterSalesDetail.vue
index 557753e..7050abc 100644
--- a/pages/order/afterSales/afterSalesDetail.vue
+++ b/pages/order/afterSales/afterSalesDetail.vue
@@ -159,7 +159,7 @@
       title="申请原因"
       @confirm="reasonSelectConfirm"
     ></u-picker>
-    <u-toast ref="uToast" />
+    <u-toast ref="toastRef" />
   </view>
 </template>
 
@@ -186,7 +186,7 @@ const sku = ref<any>({})
 const reasonSelectShow = ref(false)
 const reasonList = ref<any[]>([])
 const applyInfo = ref<any>({})
-const uToast = ref<any>(null)
+const toastRef = ref<any>(null)
 const isAppointmentAfterSale = ref(false)
 
 const form = reactive({
@@ -335,8 +335,8 @@ function onUploadAfterRead(event: any) {
 
 function showToast(message: string, type = 'error') {
   const text = message || (type === 'success' ? '操作成功' : '操作失败')
-  if (uToast.value) {
-    uToast.value.show({ message: text, type })
+  if (toastRef.value) {
+    toastRef.value.show({ message: text, type })
     return
   }
   uni.showToast({
diff --git a/pages/order/afterSales/afterSalesDetailExpress.vue b/pages/order/afterSales/afterSalesDetailExpress.vue
index f1f51a6..9f02683 100644
--- a/pages/order/afterSales/afterSalesDetailExpress.vue
+++ b/pages/order/afterSales/afterSalesDetailExpress.vue
@@ -69,7 +69,7 @@
       @confirm="onTimeConfirm"
       @close="timeshow = false"
     />
-    <u-toast ref="uToast"/>
+    <u-toast ref="toastRef"/>
   </view>
 </template>
 
@@ -96,7 +96,7 @@ const form = reactive({
 })
 const serviceDetail = reactive<{ sn: string }>({ sn: '' })
 const sku = ref<any>({})
-const uToast = ref<any>(null)
+const toastRef = ref<any>(null)
 
 onLoad((options) => {
   sku.value = storage.getAfterSaleData()
@@ -136,15 +136,15 @@ function onSubmit() {
   delete submitForm.courierCompany
 
   if (form.logisticsId == '') {
-    uToast.value?.show({ title: '请选择快递公司', type: 'error' })
+    toastRef.value?.show({ title: '请选择快递公司', type: 'error' })
     return
   }
   if (form.logisticsNo == '') {
-    uToast.value?.show({ title: '请填写快递单号', type: 'error' })
+    toastRef.value?.show({ title: '请填写快递单号', type: 'error' })
     return
   }
   if (form.mDeliverTime == '') {
-    uToast.value?.show({ title: '请选择发货时间', type: 'error' })
+    toastRef.value?.show({ title: '请选择发货时间', type: 'error' })
     return
   }
 
@@ -152,7 +152,7 @@ function onSubmit() {
   fillShipInfo(serviceDetail.sn, submitForm).then((res) => {
     hideLoadingIfNeeded()
     if (res.statusCode === 200) {
-      uToast.value?.show({
+      toastRef.value?.show({
         title: '提交成功',
         type: 'success',
         back: true,
diff --git a/pages/order/myOrder.vue b/pages/order/myOrder.vue
index c529e98..9c2d0ef 100644
--- a/pages/order/myOrder.vue
+++ b/pages/order/myOrder.vue
@@ -417,7 +417,11 @@ function openOrder(order: any) {
 }
 
 function changeTab(e: any) {
-	tabCurrentIndex.value = e.target.current
+	// H5 的 swiper change 把下标放在 detail.current。
+	// 读 target.current 会得到 undefined，选中态被清掉，列表就停在「全部」。
+	const current = Number(e?.detail?.current ?? e?.target?.current)
+	if (!Number.isInteger(current) || current < 0 || current >= navList.length) return
+	tabCurrentIndex.value = current
 }
 
 function tabClick(index: number) {
diff --git a/pages/order/orderDetail.vue b/pages/order/orderDetail.vue
index a91003d..2890236 100644
--- a/pages/order/orderDetail.vue
+++ b/pages/order/orderDetail.vue
@@ -34,7 +34,7 @@
           <verification-codes :items="verificationCodeItems" />
         </view>
         <view v-else-if="isECouponOrder" class="card-key-entry">
-          <view v-if="ecouponCardKeyDelivered" class="card-key-entry__btn" @click="goCardKeyDetail">
+          <view v-if="ecouponCardKeyDelivered" class="btn" @click="goCardKeyDetail">
             查看卡密
           </view>
           <view v-else-if="order.orderStatus === 'CANCELLED'" class="card-key-entry__tip">
@@ -1055,17 +1055,14 @@ page,
 
 .card-key-entry {
   width: 100%;
-  text-align: center;
-}
 
-.card-key-entry__btn {
-  display: inline-block;
-  padding: 20rpx 80rpx;
-  border: 2rpx solid $main-color;
-  border-radius: 12rpx;
-  color: $main-color;
-  font-size: 28rpx;
-  font-weight: 600;
+  .btn {
+    width: 100%;
+    height: 80rpx;
+    line-height: 80rpx;
+    border-radius: 40rpx;
+    font-size: 30rpx;
+  }
 }
 
 .card-key-entry__tip {
diff --git a/pages/passport/entry/seller/index.vue b/pages/passport/entry/seller/index.vue
index 3ececcc..7b9e654 100644
--- a/pages/passport/entry/seller/index.vue
+++ b/pages/passport/entry/seller/index.vue
@@ -11,15 +11,21 @@
       <div class="step-list">
         <div
           class="step-item"
-          :class="{ active: current == index }"
-          v-for="(item, index) in entrySteps"
-          :key="index"
+          :class="{ active: current == index, done: current > index }"
+          v-for="(item, index) in flowSteps"
+          :key="item.value"
         >
-          {{ item.title }}
+          <div class="step-mark">{{ index + 1 }}</div>
+          <div class="step-title">{{ item.title }}</div>
         </div>
       </div>
-      <div class="submit" @click="keepOn()">开始填写</div>
-      <div class="notice" @click="getEntryNotice">查看店铺入驻协议</div>
+      <div v-if="statusTip" class="status-tip" :class="statusTip.value">
+        {{ statusTip.title }}
+      </div>
+      <div class="actions">
+        <div v-if="showFillButton" class="submit" @click="keepOn()">开始填写</div>
+        <div class="notice" @click="getEntryNotice">查看店铺入驻协议</div>
+      </div>
     </div>
   </div>
 </template>
@@ -36,8 +42,15 @@ const store = useStore()
 
 const themeStyle = computed(() => getThemeStyle(store.state.theme))
 
-const current = ref(999)
+const current = ref(-1)
 const companyData = ref<any>('')
+const showFillButton = computed(() => companyData.value?.storeDisable !== 'OPEN')
+const flowSteps = computed(() =>
+  entrySteps.value.filter((item) => item.value === 'APPLY' || item.value === 'APPLYING')
+)
+const statusTip = computed(() =>
+  entrySteps.value.find((item) => item.value !== 'APPLY' && item.value !== 'APPLYING')
+)
 
 const entrySteps = ref([
   {
@@ -137,54 +150,103 @@ page {
 }
 
 .entry-content {
-  padding: 32rpx 80rpx calc(40rpx + env(safe-area-inset-bottom));
+  padding: 48rpx 48rpx calc(40rpx + env(safe-area-inset-bottom));
   box-sizing: border-box;
 }
 
 .title {
   line-height: 1.2;
-  font-weight: 500;
-  font-size: 56rpx;
-  color: #333;
+  font-weight: 600;
+  font-size: 48rpx;
+  color: #222;
 }
 
 .step-list {
-  margin: 80rpx 0;
+  margin-top: 64rpx;
 }
 
 .step-item {
-  padding: 30rpx 20rpx;
-  font-size: 40rpx;
-  font-weight: bold;
-  color: #666;
+  display: flex;
+  align-items: center;
+  padding: 18rpx 0;
+  color: #999;
 }
 
-.step-item.active {
+.step-mark {
+  width: 48rpx;
+  height: 48rpx;
+  margin-right: 20rpx;
+  border-radius: 50%;
+  background: #f2f2f2;
+  color: #999;
+  font-size: 26rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  flex-shrink: 0;
+}
+
+.step-title {
+  font-size: 32rpx;
+  font-weight: 500;
+  line-height: 1.4;
+}
+
+.step-item.done .step-mark,
+.step-item.active .step-mark {
+  background: var(--theme-light, #ff6b35);
+  color: #fff;
+}
+
+.step-item.done .step-title {
+  color: #333;
+}
+
+.step-item.active .step-title {
+  color: var(--theme-light, #ff6b35);
+}
+
+.status-tip {
+  margin-top: 24rpx;
+  padding: 24rpx 28rpx;
+  border-radius: 16rpx;
+  font-size: 28rpx;
+  line-height: 1.5;
   color: var(--theme-light, #ff6b35);
   background: var(--theme-light-10, rgba(255, 107, 53, 0.1));
-  border-radius: 20rpx;
+}
+
+.status-tip.REFUSED {
+  color: var(--theme-primary, #ff3c2a);
+  background: #fff1f0;
+}
+
+.status-tip.CLOSED {
+  color: #666;
+  background: #f5f5f5;
+}
+
+.actions {
+  margin-top: 72rpx;
 }
 
 .submit,
 .notice {
-  font-weight: bold;
-  font-size: 28rpx;
-  height: 92rpx;
+  height: 88rpx;
+  line-height: 88rpx;
   text-align: center;
-  letter-spacing: 4rpx;
-  line-height: 92rpx;
-  border-radius: 20rpx;
+  font-size: 30rpx;
+  border-radius: 44rpx;
 }
 
 .submit {
   color: #fff;
-  margin-top: 120rpx;
   background: var(--theme-light, #ff6b35);
+  margin-bottom: 24rpx;
 }
 
 .notice {
-  margin-top: 40rpx;
   color: #333;
-  background: $bg-color;
+  background: #f5f5f5;
 }
 </style>
diff --git a/pages/promotion/bargain/log.vue b/pages/promotion/bargain/log.vue
index e8892a3..cf0b42a 100644
--- a/pages/promotion/bargain/log.vue
+++ b/pages/promotion/bargain/log.vue
@@ -1,25 +1,22 @@
 <template>
   <view class="box">
-    <view v-if="bargainLog.length != 0">
-      <view v-for="(item,index) in bargainLog" class="flex" :key="index">
+    <view v-if="bargainLog.length != 0" class="list">
+      <view v-for="(item,index) in bargainLog" class="card" :key="index">
         <view class="goods-img">
-          <u-image radius="20rpx" width="230rpx" height="230rpx" :src="item.thumbnail"></u-image>
+          <u-image radius="12rpx" width="160rpx" height="160rpx" :src="item.thumbnail"></u-image>
         </view>
         <view class="goods">
-          <view class="wes-2">
-            {{item.goodsName}}
+          <view class="head">
+            <view class="goods-name wes-2">{{ item.goodsName }}</view>
+            <text class="tips" :class="item.status">{{ statusWay[item.status] }}</text>
           </view>
-          <view class="surplus">
-            还剩<text class="surplusPrice">{{unitPrice(item.surplusPrice)}}元</text>
-          </view>
-
-          <view @click="navigateToBargainDetail(item)" v-if="item.status == 'START'" class="buy">
-            继续免费领
-          </view>
-        </view>
-        <view class="tips-box">
-          <view class="tips" :class="[item.status]">
-            {{statusWay[item.status]}}
+          <view class="foot">
+            <view class="surplus">
+              还剩<text class="surplusPrice">{{ unitPrice(item.surplusPrice) }}</text>元
+            </view>
+            <view v-if="item.status == 'START'" class="buy" @click="navigateToBargainDetail(item)">
+              继续免费领
+            </view>
           </view>
         </view>
       </view>
@@ -76,67 +73,90 @@ function navigateToBargainDetail(val: any) {
 </script>
 <style>
 page {
-  background: #fff;
+  background: #f5f5f5;
 }
 </style>
 <style scoped lang="scss">
 .box {
-  padding: 0 32rpx;
+  min-height: 100vh;
+  padding: 20rpx 24rpx 40rpx;
+  background: #f5f5f5;
+  box-sizing: border-box;
+}
+.card {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20rpx;
+  padding: 24rpx;
   background: #fff;
+  border-radius: 16rpx;
 }
 .goods-img {
-  width: 230rpx;
-  height: 230rpx;
-  flex: 0 0 230rpx;
-}
-.buy {
-  background: $light-color;
-  color: #fff;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 10rpx 0;
-  border-radius: 100rpx;
-  width: 200rpx;
-  font-size: 24rpx;
-  margin-top: 20rpx;
-}
-.tips-box {
-  flex: 1;
-  justify-content: center;
-  display: flex;
-
-  align-items: center;
-}
-.tips {
-  color: #999;
-
-  margin-top: 20rpx;
-}
-.surplusPrice {
-  font-size: 40rpx;
-  margin-left: 10rpx;
-  font-weight: bold;
-  color: $light-color;
-}
-.surplus {
-  color: #333;
-  font-size: 26rpx;
-  margin-top: 12rpx;
+  width: 160rpx;
+  height: 160rpx;
+  flex: 0 0 160rpx;
+  border-radius: 12rpx;
+  overflow: hidden;
+  background: #f5f5f5;
 }
 .goods {
-  margin: 0 20rpx;
+  flex: 1;
+  min-width: 0;
+  margin-left: 20rpx;
   display: flex;
-  flex: 2;
   flex-direction: column;
-  justify-content: center;
+  justify-content: space-between;
+  min-height: 160rpx;
 }
-.flex {
-  border-bottom: 1rpx solid #f7f7f7;
+.head {
+  display: flex;
+  align-items: flex-start;
+}
+.goods-name {
+  flex: 1;
+  min-width: 0;
+  font-size: 28rpx;
+  color: #333;
+  line-height: 1.4;
+}
+.tips {
+  flex-shrink: 0;
+  margin-left: 16rpx;
+  font-size: 24rpx;
+  line-height: 1.4;
+  color: #999;
+}
+.foot {
   display: flex;
   align-items: center;
-  padding: 20rpx 0;
-  margin: 10rpx 0;
+  justify-content: space-between;
+  margin-top: 16rpx;
+}
+.surplus {
+  flex: 1;
+  min-width: 0;
+  color: #666;
+  font-size: 24rpx;
+  white-space: nowrap;
+}
+.surplusPrice {
+  margin: 0 6rpx;
+  font-size: 36rpx;
+  font-weight: 600;
+  color: $light-color;
+}
+.buy {
+  flex-shrink: 0;
+  margin-left: 16rpx;
+  height: 56rpx;
+  padding: 0 28rpx;
+  border-radius: 100rpx;
+  background: $light-color;
+  color: #fff;
+  font-size: 24rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
 }
 .SUCCESS {
   color: $light-color;
diff --git a/pages/tabbar/cart/cartList.vue b/pages/tabbar/cart/cartList.vue
index caa1bf0..b667829 100644
--- a/pages/tabbar/cart/cartList.vue
+++ b/pages/tabbar/cart/cartList.vue
@@ -1,969 +1,972 @@
-<template>
-  <div class="wrapper" :style="themeStyle">
-    <u-navbar
-      class="cart-navbar"
-      :style="cartNavbarStyle"
-      :auto-back="false"
-      :fixed="true"
-      :placeholder="true"
-      :border="false"
-      left-icon=""
-      title="购物车"
-      :right-text="isEdit ? '完成' : '编辑'"
-      @rightClick="toggleEdit"
-    ></u-navbar>
-    <!-- 空白页-->
-    <view v-if="!loading && (cartDetail.cartList == '' || cartDetail.cartList == [] || !cartDetail)" class="empty">
-      <image src="/static/emptyCart.png" mode="aspectFit"></image>
-      <view class="empty-tips">
-        空空如也
-        <navigator class="navigator" url="/pages/tabbar/home/index" open-type="switchTab">随便逛逛</navigator>
-      </view>
-    </view>
-    <!-- 店铺商品信息 -->
-    <div class="content">
-      <div class="box box2" :class="{ invalid: isInvalid(item) }" v-for="(item, index) in cartDetail.cartList"
-        :key="index">
-        <view class="tab">
-          <view class="store-line">
-            <view class="store-line-check">
-              <u-checkbox usedAlone shape="circle" :active-color="lightColor" v-model:checked="item.checked"
-                :label-size="14" @change="(checked) => onStoreCheckChange(item, checked)"></u-checkbox>
-            </view>
-            <text class="store-name wes" @click.stop="navigateToStore(item)">{{ item.storeName }}</text>
-          </view>
-          <view class="right-col" v-if="item.canReceiveCoupon" @click="navigateToCoupon(item)">
-            <div class="right-line"></div>
-            <span>领劵</span>
-          </view>
-        </view>
-        <u-swipe-action ref="swiperAction" class="cart-item" v-for="(skuItem, i) in item.skuList" :key="skuItem.goodsSku.id">
-          <u-swipe-action-item :show="skuItem.selected" @open="openAction(skuItem)" :options="options"
-          :name="i"
-          @click="changeActionTab(skuItem)" @longpress="changeActionTab(skuItem)">
-          <!-- 满减活动 -->
-          <div v-if="Object.keys(skuItem.promotionMap).length != 0">
-            <div v-if="getPromotion(skuItem).includes('FULL_DISCOUNT')">
-              <div class="promotion-notice" v-if="item.promotionNotice">
-                <span class="tips">满减</span>
-                <span style="flex:10;">{{item.promotionNotice}}</span>
-              </div>
-            </div>
-          </div>
-          <view class="goods-row" :class="{ invalid: isInvalid(skuItem) }">
-            <view class="goods-config">
-              <view>
-                <u-checkbox v-if="skuItem.invalid == 0 && !skuItem.errorMessage" usedAlone shape="circle"
-                  :active-color="lightColor" class="c-left" v-model:checked="skuItem.checked"
-                  @change="(checked) => onSkuCheckChange(skuItem, checked)"></u-checkbox>
-                <span class="invalid" v-else style="font-size: 24rpx">失效</span>
-              </view>
-              <u-image border-radius="10" :fade="true" @click="navigateToGoods(skuItem)" width="160rpx" height="160rpx"
-                mode="aspectFill" :src="getSkuThumbnail(skuItem.goodsSku.thumbnail)" />
-            </view>
-            <view class="goods-content">
-              <!-- 商品名称 -->
-              <p class="sp-name" @click="navigateToGoods(skuItem)">
-                {{ skuItem.goodsSku.goodsName }}
-              </p>
-              <!-- 规格 -->
-              <p class="sp-type" style="width:300rpx">{{skuItem.goodsSku.simpleSpecs}}</p>
-              <p class="sp-type" v-if="skuItem.goodsSku.salesModel == 'WHOLESALE'">批发商品</p>
-              <view class="sp-number">
-                <view class="sp-price">
-                  <div class="main-color">
-                    ￥<span>{{ goodsFormatPrice(skuItem.goodsSku.price)[0] }}</span>
-                    <span>.{{ goodsFormatPrice(skuItem.goodsSku.price)[1] }}</span>
-                  </div>
-                </view>
-                <view class="sp-numbox">
-                  <uni-number-box class="uNumber" :min="1" :max="999" @change="numChange(skuItem)" v-model="skuItem.num"></uni-number-box>
-                </view>
-              </view>
-              <!-- 如果当有促销并且促销是 限时抢购 -->
-              <div class="promotions-list" v-if="Object.keys(skuItem.promotionMap).length != 0">
-                <div class="promotions-item-seckill" v-if="getPromotion(skuItem).includes('SECKILL')">
-                  距秒杀结束: <u-count-down show-border :hide-zero-day="true" :color="$mainColor" border-color="#ededed"
-                    font-size="24" :timestamp="getCountDownTime(skuItem)">
-                  </u-count-down>
-                </div>
-              </div>
-              <div class="sku-error" v-if="!skuItem.checked && skuItem.errorMessage">
-                {{ skuItem.errorMessage }}
-              </div>
-              
-            </view>
-          </view>
-        </u-swipe-action-item>
-        </u-swipe-action>
-      </div>
-    </div>
-    <u-modal v-model:show="deleteShow" :confirm-style="{'color':lightColor}" @confirm="deleteConfirm" show-cancel-button
-      :content="deleteContent" :async-close="true"></u-modal>
-    <!-- 结账 -->
-    <div class="box box6">
-      <view class="navL">
-        <u-checkbox class="checkout-all" usedAlone shape="circle" :active-color="lightColor" v-model:checked="checkout"
-          :label-size="12" label="全选" @change="checkOut">
-        </u-checkbox>
-        <view class="checkout-total">
-          <view class="checkout-total-main">
-            <text class="checkout-total-label">总计:</text>
-            <text class="checkout-total-price" v-if="cartDetail && cartDetail.priceDetailDTO">
-              <text class="checkout-total-currency">¥</text>
-              <text class="checkout-total-int">{{ goodsFormatPrice(cartDetail.priceDetailDTO.flowPrice)[0] }}</text>
-              <text class="checkout-total-dec">.{{ goodsFormatPrice(cartDetail.priceDetailDTO.flowPrice)[1] }}</text>
-            </text>
-            <text class="checkout-total-price" v-else>¥0.00</text>
-          </view>
-          <view
-            v-if="cartDetail.cartList && cartDetail.cartList.length != 0 && cartDetail.priceDetailDTO && cartDetail.priceDetailDTO.discountPrice != 0"
-            class="checkout-total-discount"
-          >
-            <text>优惠减:￥{{ cartDetail.priceDetailDTO.goodsPrice - unitPrice(cartDetail.priceDetailDTO.flowPrice) }}</text>
-            <text class="discount-details" @click="discountDetails">优惠明细</text>
-          </view>
-        </view>
-      </view>
-      <!-- 优惠详情 -->
-      <u-popup z-index="3" close mode="bottom" height="50%" closeable v-model:show="discountDetailsFlag" border-radius="20">
-        <div class="discount-list">
-          <view class="discount-title">优惠明细</view>
-          <div class="discount-way">
-            <div class="discount-item" v-if="cartDetail.priceDetailDTO">
-              <span>商品总额</span>
-              <span>￥{{unitPrice(cartDetail.priceDetailDTO.goodsPrice)}}</span>
-
-            </div>
-            <div class="discount-item" v-if="cartDetail.priceDetailDTO">
-              <span>优惠券</span>
-              <span>-￥{{unitPrice(cartDetail.priceDetailDTO.couponPrice)}}</span>
-            </div>
-            <div class="discount-item" v-if="cartDetail.priceDetailDTO">
-              <span>其他优惠</span>
-              <span>-￥{{unitPrice(cartDetail.priceDetailDTO.discountPrice)}}</span>
-            </div>
-          </div>
-        </div>
-      </u-popup>
-
-      <view v-if="isEdit" @click="deleteGoods()">
-        <div class="settlement">删除</div>
-      </view>
-
-      <view v-else @click="submitOrder()">
-        <div class="settlement">去结算</div>
-      </view>
-    </div>
-    <u-toast ref="uToast" />
-  </div>
-</template>
-<script setup lang="ts">
-import { ref, reactive, computed, onMounted } from 'vue'
-import { onShow, onPullDownRefresh } from '@dcloudio/uni-app'
-import * as API_Trade from '@/api/trade'
-import { debounce } from '@/utils/tools.js'
-import uniNumberBox from '@/components/uni-number-box'
-import config from '@/config/config'
-import { useStore } from '@/store'
-import { unitPrice, goodsFormatPrice, isLogin, forceLogin } from '@/utils/filters.js'
-
-const store = useStore()
-const uToast = ref()
-const swiperAction = ref()
-
-const lightColor = computed(() => store.getters.lightColor)
-const loading = ref(false)
-const discountDetailsFlag = ref(false)
-// 商品栏右侧滑动按钮
-const options = [
-  {
-    text: "删除",
-    style: {
-      backgroundColor: store.getters.lightColor,
-    },
-  },
-]
-const isInvalid = (val: any): boolean => {
-  if (!val) return false
-  if (val.invalid == 1 || (!val.checked && val.errorMessage)) {
-    return true
-  } else {
-    return false
-  }
-}
-const deleteShow = ref(false)
-const deleteContent = "删除该商品？"
-const cartDetail = ref<any>("")
-const goodsVal = ref<any>("")
-const isEdit = ref(false)
-const checkout = ref(false)
-const WEIXIN_num = ref("")
-const defaultGoodsImage = config.logo
-const capsuleInsetRight = ref(0)
-
-const cartNavbarStyle = computed(() => {
-  if (!capsuleInsetRight.value) {
-    return {}
-  }
-  return {
-    "--cart-capsule-inset": `${capsuleInsetRight.value}px`,
-  }
-})
-
-onMounted(() => {
-  setCapsuleInset()
-  // #ifdef MP-WEIXIN
-  uni.showShareMenu({ withShareTicket: true })
-  // #endif
-})
-
-onPullDownRefresh(() => {
-  getCardData()
-})
-
-onShow(() => {
-  deleteShow.value ? (deleteShow.value = false) : true
-  if (swiperAction.value) {
-    (swiperAction.value as any[]).forEach((item: any) => {
-      item.show = false
-    })
-    getCardData()
-  } else {
-    getCardData()
-  }
-})
-
-function setCapsuleInset() {
-  // #ifdef MP-WEIXIN
-  try {
-    const menuButton = uni.getMenuButtonBoundingClientRect()
-    const { windowWidth } = uni.getWindowInfo()
-    capsuleInsetRight.value = windowWidth - menuButton.left + uni.upx2px(8)
-  } catch (e) {
-    capsuleInsetRight.value = 90
-  }
-  // #endif
-}
-
-function toggleEdit() {
-  isEdit.value = !isEdit.value
-}
-
-function getSkuThumbnail(url: any) {
-  if (url && /^(https?:)?\/\//.test(String(url))) {
-    return url
-  }
-  return defaultGoodsImage
-}
-
-/**
- * 倒数计时
- */
-function getCountDownTime(val: any) {
-  if (val.promotionMap) {
-    let key = Object.keys(val.promotionMap).find((child: string) => {
-      return child.split("-")[0] == 'SECKILL'
-    })
-    return val.promotionMap[key].endTime / 1000 - (new Date().getTime() / 1000)
-  }
-}
-
-/**
- * 优惠明细开关
- */
-function discountDetails() {
-  discountDetailsFlag.value = true
-}
-/**
- * 左滑打开删除
- */
-function openAction(skuItem: any) {
-  cartDetail.value.cartList.forEach((cartItem: any) => {
-    if (cartItem.skuList) {
-      cartItem.skuList.forEach((sku: any) => {
-        sku["selected"] = false
-      })
-    }
-  })
-  skuItem["selected"] = true
-}
-
-/**
- * 滑动删除
- */
-function changeActionTab(val: any) {
-  deleteShow.value = true
-  goodsVal.value = val
-}
-
-/**
- * 点击删除
- */
-function deleteConfirm() {
-  API_Trade.deleteSkuItem(goodsVal.value.goodsSku.id).then((res: any) => {
-    if (res.statusCode == 200) {
-      uni.showToast({
-        title: "此商品删除成功",
-        duration: 2000,
-      })
-      deleteShow.value = false
-      getCardData()
-    }
-  })
-}
-
-/**
- * 删除商品
- */
-function deleteGoods() {
-  if (whetherChecked()) {
-    var delGoodsData: any[] = []
-    cartDetail.value.cartList.forEach((item: any) => {
-      item.skuList.forEach((goodsItem: any) => {
-        if (goodsItem.checked) {
-          delGoodsData.push(goodsItem.goodsSku.id)
-        }
-      })
-    })
-    if (delGoodsData && delGoodsData.length > 0) {
-      API_Trade.deleteSkuItem(delGoodsData).then((res: any) => {
-        if (res.data.success) {
-          uni.showToast({
-            title: "删除成功!",
-            icon: "none",
-          })
-          getCardData()
-        }
-      })
-    } else {
-      uni.showToast({
-        title: "请选择删除商品，如果商品失效，请左滑无效商品删除",
-        icon: "none",
-      })
-    }
-  }
-}
-
-/**
- * 跳转到店铺
- */
-function navigateToStore(val: any) {
-  uni.navigateTo({
-    url: "/pages/product/shopPage?id=" + val.storeId,
-  })
-}
-
-/**
- * 跳转到优惠券
- */
-function navigateToCoupon(val: any) {
-  uni.navigateTo({
-    url: "/pages/cart/coupon/couponCenter?storeId=" + val.storeId,
-  })
-}
-
-/**
- * 跳转到商品
- */
-function navigateToGoods(val: any) {
-  uni.navigateTo({
-    url:
-      "/pages/product/goods?id=" +
-      val.goodsSku.id +
-      "&goodsId=" +
-      val.goodsSku.goodsId,
-  })
-}
-
-/**
- * 点击步进器回调
- */
-const numChange = debounce(function (val: any) {
-  updateSkuNumFun(val.goodsSku.id, val.num)
-}, 1000)
-/**
- * 去结算
- */
-function submitOrder() {
-  if (whetherChecked()) {
-    navigateTo("/pages/order/fillorder?way=CART")
-  }
-}
-
-/**
- * 验证是否选中商品
- */
-function whetherChecked(): boolean {
-  forceLogin()
-
-  let canBuy = false
-  cartDetail.value.cartList.forEach((item: any) => {
-    if (item.checked) {
-      canBuy = true
-    } else {
-      item.skuList.forEach((skuItem: any) => {
-        if (skuItem.checked) {
-          canBuy = true
-        }
-      })
-    }
-  })
-  if (!canBuy) {
-    uni.showToast({
-      title: "您还没有选择商品",
-      duration: 2000,
-      icon: "none",
-    })
-    return false
-  } else {
-    return true
-  }
-}
-
-/**
- * 跳转
- */
-function navigateTo(url: string) {
-  uni.navigateTo({
-    url,
-  })
-}
-
-/**
- * 全选
- */
-function checkOut(checked?: boolean) {
-  const selected = typeof checked === "boolean" ? checked : checkout.value
-  API_Trade.checkAll(selected).then((result: any) => {
-    if (result.data.success) {
-      getCardData()
-    }
-  })
-}
-
-/**
- * 获取店铺选中信息
- */
-function checkStoreFun(skuId: any, num: any) {
-  API_Trade.checkStore(skuId, num).then((result: any) => {
-    if (result.data.success) {
-      getCardData()
-    }
-  })
-}
-
-function onStoreCheckChange(storeItem: any, checked: any) {
-  checkStoreFun(storeItem.storeId, checked)
-}
-
-function onSkuCheckChange(skuItem: any, checked: any) {
-  updateSkuCheckedFun(skuItem.goodsSku.id, checked)
-}
-
-/**
- * 获取购物车选中信息
- */
-function updateSkuCheckedFun(skuId: any, num: any) {
-  API_Trade.updateSkuChecked(skuId, num).then((result: any) => {
-    if (result.data.success) {
-      getCardData()
-    }
-  })
-}
-
-/**
- * 更新商品购物车数量
- */
-function updateSkuNumFun(skuId: any, num: any) {
-  API_Trade.updateSkuNum(skuId, num).then((result: any) => {
-    if (result.statusCode == 200) {
-      getCardData()
-    } else {
-      setTimeout(() => {
-        getCardData()
-      }, 1000)
-    }
-  })
-}
-
-// 数据去重一下
-function getPromotion(item: any) {
-  return Object.keys(item.promotionMap).map((child: string) => {
-    return child.split("-")[0]
-  })
-}
-
-/**
- * 获取购物车数据
- */
-function getCardData() {
-  if (isLogin("auth")) {
-    uni.showLoading({
-      title: "加载中",
-    })
-    API_Trade.getCarts()
-      .then((result: any) => {
-        loading.value = false
-        uni.stopPullDownRefresh()
-        if (result.data.success) {
-          cartDetail.value = result.data.result
-          let checkOuted = true
-          for (let i = 0; i < cartDetail.value.cartList.length; i++) {
-            let item = cartDetail.value.cartList[i]
-            item.checked = item.checked == 1
-            if (!item.checked) {
-              checkOuted = false
-            }
-            item.skuList &&
-              item.skuList.forEach((sku: any) => {
-                sku.checked = sku.checked == 1
-                if (!sku.checked) {
-                  checkOuted = false
-                }
-                if(Object.keys(sku.promotionMap).length != 0)
-                {
-                  Object.keys(sku.promotionMap).forEach((pro: string, proIndex: number) => {
-                    pro = pro.split('-')[0]
-                    if (pro == "PINTUAN" ) {
-                       Object.keys(sku.promotionMap).splice(proIndex, 1);
-                    }
-                  })
-                }
-              })
-          }
-          checkout.value = checkOuted
-          uni.stopPullDownRefresh()
-        }
-      })
-      .catch(() => { loading.value = false })
-     if (store.state.isShowToast){ uni.hideLoading() }
-  } else {
-     if (store.state.isShowToast){ uni.hideLoading() }
-  }
-}
-</script>
-
-<style lang="scss">
-page {
-  background: #f2f2f2;
-}
-</style>
-<style scoped lang="scss">
-// #ifdef MP-WEIXIN
-@import "./mp-carui.scss";
-// #endif
-.u-image {
-  box-shadow: 0 4rpx 12rpx 0 rgba(0, 0, 0, 0.05);
-}
-
-.cart-navbar {
-  ::v-deep .u-navbar__content__right {
-    padding-right: var(--cart-capsule-inset, 13px);
-  }
-
-  ::v-deep .u-navbar__content__right__text {
-    color: $light-color;
-    font-size: 28rpx;
-  }
-}
-.promotion-notice {
-  margin-top: 10px;
-  margin-left: 68rpx;
-  font-size: 24rpx;
-  color: #333;
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  ::v-deep .tips {
-    margin: 0 8rpx 0 0;
-    background: $main-color;
-    border-radius: 100px;
-    display: block;
-    flex: 1;
-    padding: 2rpx 12rpx;
-    color: #fff;
-  }
-}
-.default-color {
-  color: #333;
-}
-.goods-row {
-  padding: 30rpx 0;
-
-  display: flex;
-  align-items: center;
-}
-
-.store-name {
-  flex: 1;
-  min-width: 0;
-  font-weight: bold;
-  font-size: 28rpx;
-  margin-left: 8rpx;
-}
-
-.store-arrow {
-  flex-shrink: 0;
-  margin-left: 10rpx;
-}
-.invalid {
-  filter: grayscale(1);
-}
-
-.cart-item {
-  width: 100%;
-  border-radius: 0.4em;
-  transition: 0.35s;
-  overflow: hidden;
-}
-
-/* 空白页 */
-::v-deep .u-number-input {
-  background: #fff !important;
-  border: 1px solid #ededed;
-  margin: 0 !important;
-}
-
-::v-deep .u-icon-minus,
-::v-deep .u-icon-plus {
-  background: #ffffff !important;
-  border: 1px solid #ededed;
-  color: #333 !important;
-  width: 40rpx;
-}
-
-.empty {
-  position: fixed;
-  left: 0;
-  top: 0;
-  width: 100%;
-  height: 100vh;
-  z-index: 99;
-  padding-bottom: var(--window-bottom);
-  display: flex;
-  justify-content: center;
-  flex-direction: column;
-  align-items: center;
-  background: #fff;
-
-  image {
-    width: 240rpx;
-    height: 160rpx;
-    margin-bottom: 30rpx;
-  }
-
-  .empty-tips {
-    display: flex;
-    font-size: $font-sm + 2rpx;
-    color: $font-color-disabled;
-
-    .navigator {
-      color: $uni-color-primary;
-      margin-left: 16rpx;
-    }
-  }
-}
-
-.settlement {
-  width: 180rpx;
-  height: 70rpx;
-  line-height: 70rpx;
-  background: linear-gradient(91deg, $light-color 1%, $aider-light-color 99%);
-  border-radius: 900rpx;
-  text-align: center;
-  color: #fff;
-  margin-right: 10rpx;
-}
-
-.price {
-  display: flex;
-  align-items: center;
-
-  ::v-deep .number {
-    line-height: 1;
-    font-size: 30rpx;
-    > span {
-      font-weight: bold;
-    }
-  }
-}
-
-.box2 {
-  border-radius: 20rpx;
-  padding: 0 16rpx 0;
-  margin: 0 16rpx 20rpx;
-  .u-checkbox {
-    display: flex;
-    align-items: center;
-    text-align: center;
-  }
-  background: #fff;
-
-}
-
-.wrapper {
-  height: 100%;
-}
-
-::v-deep .u-col {
-  padding: 24rpx 0 !important;
-}
-
-.goods-content {
-  flex: 1;
-  min-width: 0;
-  margin-left: 20rpx;
-  overflow: hidden;
-
-  > p,
-  .sp-name,
-  .sp-type,
-  .sp-number {
-    padding-left: 0;
-  }
-}
-
-.content {
-  padding: 20rpx 0 20rpx 0;
-  margin-bottom: 80rpx;
-}
-
-.line {
-  float: left;
-  width: 1px;
-  height: 100%;
-  border-right: 1px solid $light-color;
-}
-
-.store-line-check {
-  flex-shrink: 0;
-
-  ::v-deep .u-checkbox {
-    margin: 0;
-  }
-}
-
-.store-line {
-  display: flex;
-  align-items: center;
-  flex: 1;
-  min-width: 0;
-  overflow: hidden;
-}
-
-.goods-config {
-  display: flex;
-  align-items: center;
-  flex-shrink: 0;
-
-  ::v-deep .invalid {
-    display: block;
-    width: 80rpx !important;
-  }
-}
-.tab {
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  padding: 24rpx 0 8rpx;
-}
-
-.right-col {
-  flex-shrink: 0;
-  display: flex;
-  align-items: center;
-  text-align: center;
-  color: $light-color;
-  font-size: 26rpx;
-  margin-left: 16rpx;
-
-  > span {
-    margin-left: 20rpx;
-  }
-}
-
-.right-line {
-  width: 2rpx;
-  height: 40rpx;
-  border-left: 1px solid #eeeeee;
-  margin-right: 20rpx;
-}
-
-.box6 {
-  justify-content: space-between;
-  position: fixed;
-  // #ifdef APP-PLUS || MP-WEIXIN
-  bottom: 0;
-  // #endif
-  // #ifdef H5
-  bottom: var(--window-bottom);
-  // #endif
-  left: 0;
-  border-top: 1px solid #ededed;
-  display: flex;
-  height: 100rpx;
-  overflow: hidden;
-  align-items: center;
-  width: 100%;
-  background: rgba(255, 255, 255, 1);
-  color: #333;
-  z-index: 99;
-  > .navL {
-    padding: 0 32rpx;
-    display: flex;
-    align-items: center;
-    flex: 1;
-    min-width: 0;
-    gap: 24rpx;
-
-    .checkout-all {
-      flex-shrink: 0;
-    }
-
-    ::v-deep .u-checkbox {
-      margin: 0;
-    }
-  }
-
-  .checkout-total {
-    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;
-  }
-}
-
-.sp-type {
-  color: $u-light-color;
-  padding: 10rpx 0;
-  font-size: 24rpx;
-  overflow: hidden;
-
-  text-overflow: ellipsis;
-
-  white-space: nowrap;
-}
-
-
-.sp-number {
-  width: 100%;
-  font-weight: bold;
-  display: flex;
-  align-items: center;
-  justify-content: space-between;
-  box-sizing: border-box;
-
-  > .sp-price {
-    flex-shrink: 0;
-
-    ::v-deep span:nth-of-type(1) {
-      font-size: 38rpx;
-    }
-    ::v-deep span:nth-of-type(2) {
-      font-size: 24rpx;
-    }
-  }
-
-  > .sp-numbox {
-    flex-shrink: 0;
-    margin-left: auto;
-  }
-}
-
-.sku-error {
-  margin-top: 8rpx;
-  font-size: 24rpx;
-  color: #999;
-}
-.priceDetail-flowPrice {
-  font-weight: bold;
-  padding-left: 20rpx;
-  > span:nth-of-type(1) {
-    font-size: 38rpx;
-  }
-}
-
-.discount-details {
-  margin-left: 10px;
-  color: #666;
-  padding: 4rpx 10rpx;
-  border-radius: 100px;
-  background: rgba(201, 199, 199, 0.3);
-}
-.discount-item {
-  display: flex;
-  margin: 40rpx 0;
-  justify-content: space-between;
-  > span:nth-of-type(1) {
-    color: #666;
-  }
-  > span:nth-of-type(2) {
-    color: #333;
-    font-weight: bold;
-  }
-}
-.discount-title {
-  font-size: 36rpx;
-  margin-top: 20rpx;
-  text-align: center;
-}
-.discount-way {
-  width: 94%;
-  margin: 0 3%;
-}
-.discount-list {
-  width: 100%;
-}
-.promotions-list {
-  margin-left: 20rpx;
-  > .promotions-item-seckill {
-    background: rgba($color: $main-color, $alpha: 0.1);
-    font-size: 24rpx;
-    color: $main-color;
-    display: inline;
-    padding: 0rpx 10rpx;
-    border-radius: 100px;
-  }
-}
-</style>
+<template>
+  <div class="wrapper" :style="themeStyle">
+    <u-navbar
+      class="cart-navbar"
+      :style="cartNavbarStyle"
+      :auto-back="false"
+      :fixed="true"
+      :placeholder="true"
+      :border="false"
+      left-icon=""
+      title="购物车"
+      :right-text="isEdit ? '完成' : '编辑'"
+      @rightClick="toggleEdit"
+    ></u-navbar>
+    <!-- 空白页-->
+    <view v-if="!loading && (cartDetail.cartList == '' || cartDetail.cartList == [] || !cartDetail)" class="empty">
+      <image src="/static/emptyCart.png" mode="aspectFit"></image>
+      <view class="empty-tips">
+        空空如也
+        <navigator class="navigator" url="/pages/tabbar/home/index" open-type="switchTab">随便逛逛</navigator>
+      </view>
+    </view>
+    <!-- 店铺商品信息 -->
+    <div class="content">
+      <div class="box box2" :class="{ invalid: isInvalid(item) }" v-for="(item, index) in cartDetail.cartList"
+        :key="index">
+        <view class="tab">
+          <view class="store-line">
+            <view class="store-line-check">
+              <u-checkbox usedAlone shape="circle" :active-color="lightColor" v-model:checked="item.checked"
+                :label-size="14" @change="(checked) => onStoreCheckChange(item, checked)"></u-checkbox>
+            </view>
+            <text class="store-name wes" @click.stop="navigateToStore(item)">{{ item.storeName }}</text>
+          </view>
+          <view class="right-col" v-if="item.canReceiveCoupon" @click="navigateToCoupon(item)">
+            <div class="right-line"></div>
+            <span>领劵</span>
+          </view>
+        </view>
+        <u-swipe-action ref="swiperAction" class="cart-item" v-for="(skuItem, i) in item.skuList" :key="skuItem.goodsSku.id">
+          <u-swipe-action-item :show="skuItem.selected" @open="openAction(skuItem)" :options="options"
+          :name="i"
+          @click="changeActionTab(skuItem)" @longpress="changeActionTab(skuItem)">
+          <!-- 满减活动 -->
+          <div v-if="Object.keys(skuItem.promotionMap).length != 0">
+            <div v-if="getPromotion(skuItem).includes('FULL_DISCOUNT')">
+              <div class="promotion-notice" v-if="item.promotionNotice">
+                <span class="tips">满减</span>
+                <span style="flex:10;">{{item.promotionNotice}}</span>
+              </div>
+            </div>
+          </div>
+          <view class="goods-row" :class="{ invalid: isInvalid(skuItem) }">
+            <view class="goods-config">
+              <view>
+                <u-checkbox v-if="skuItem.invalid == 0 && !skuItem.errorMessage" usedAlone shape="circle"
+                  :active-color="lightColor" class="c-left" v-model:checked="skuItem.checked"
+                  @change="(checked) => onSkuCheckChange(skuItem, checked)"></u-checkbox>
+                <span class="invalid" v-else style="font-size: 24rpx">失效</span>
+              </view>
+              <u-image border-radius="10" :fade="true" @click="navigateToGoods(skuItem)" width="160rpx" height="160rpx"
+                mode="aspectFill" :src="getSkuThumbnail(skuItem.goodsSku.thumbnail)" />
+            </view>
+            <view class="goods-content">
+              <!-- 商品名称 -->
+              <p class="sp-name" @click="navigateToGoods(skuItem)">
+                {{ skuItem.goodsSku.goodsName }}
+              </p>
+              <!-- 规格 -->
+              <p class="sp-type" style="width:300rpx">{{skuItem.goodsSku.simpleSpecs}}</p>
+              <p class="sp-type" v-if="skuItem.goodsSku.salesModel == 'WHOLESALE'">批发商品</p>
+              <view class="sp-number">
+                <view class="sp-price">
+                  <div class="main-color">
+                    ￥<span>{{ goodsFormatPrice(skuItem.goodsSku.price)[0] }}</span>
+                    <span>.{{ goodsFormatPrice(skuItem.goodsSku.price)[1] }}</span>
+                  </div>
+                </view>
+                <view class="sp-numbox">
+                  <uni-number-box class="uNumber" :min="1" :max="999" @change="numChange(skuItem)" v-model="skuItem.num"></uni-number-box>
+                </view>
+              </view>
+              <!-- 如果当有促销并且促销是 限时抢购 -->
+              <div class="promotions-list" v-if="Object.keys(skuItem.promotionMap).length != 0">
+                <div class="promotions-item-seckill" v-if="getPromotion(skuItem).includes('SECKILL')">
+                  距秒杀结束: <u-count-down show-border :hide-zero-day="true" :color="$mainColor" border-color="#ededed"
+                    font-size="24" :timestamp="getCountDownTime(skuItem)">
+                  </u-count-down>
+                </div>
+              </div>
+              <div class="sku-error" v-if="!skuItem.checked && skuItem.errorMessage">
+                {{ skuItem.errorMessage }}
+              </div>
+              
+            </view>
+          </view>
+        </u-swipe-action-item>
+        </u-swipe-action>
+      </div>
+    </div>
+    <u-modal v-if="deleteShow" v-model:show="deleteShow" :confirm-style="modalConfirmStyle" @confirm="deleteConfirm" show-cancel-button
+      :content="deleteContent" :async-close="true"></u-modal>
+    <!-- 结账 -->
+    <div class="box box6">
+      <view class="navL">
+        <u-checkbox class="checkout-all" usedAlone shape="circle" :active-color="lightColor" v-model:checked="checkout"
+          :label-size="12" label="全选" @change="checkOut">
+        </u-checkbox>
+        <view class="checkout-total">
+          <view class="checkout-total-main">
+            <text class="checkout-total-label">总计:</text>
+            <text class="checkout-total-price" v-if="cartDetail && cartDetail.priceDetailDTO">
+              <text class="checkout-total-currency">¥</text>
+              <text class="checkout-total-int">{{ goodsFormatPrice(cartDetail.priceDetailDTO.flowPrice)[0] }}</text>
+              <text class="checkout-total-dec">.{{ goodsFormatPrice(cartDetail.priceDetailDTO.flowPrice)[1] }}</text>
+            </text>
+            <text class="checkout-total-price" v-else>¥0.00</text>
+          </view>
+          <view
+            v-if="cartDetail.cartList && cartDetail.cartList.length != 0 && cartDetail.priceDetailDTO && cartDetail.priceDetailDTO.discountPrice != 0"
+            class="checkout-total-discount"
+          >
+            <text>优惠减:￥{{ cartDetail.priceDetailDTO.goodsPrice - unitPrice(cartDetail.priceDetailDTO.flowPrice) }}</text>
+            <text class="discount-details" @click="discountDetails">优惠明细</text>
+          </view>
+        </view>
+      </view>
+      <!-- 优惠详情 -->
+      <u-popup z-index="3" close mode="bottom" height="50%" closeable v-model:show="discountDetailsFlag" border-radius="20">
+        <div class="discount-list">
+          <view class="discount-title">优惠明细</view>
+          <div class="discount-way">
+            <div class="discount-item" v-if="cartDetail.priceDetailDTO">
+              <span>商品总额</span>
+              <span>￥{{unitPrice(cartDetail.priceDetailDTO.goodsPrice)}}</span>
+
+            </div>
+            <div class="discount-item" v-if="cartDetail.priceDetailDTO">
+              <span>优惠券</span>
+              <span>-￥{{unitPrice(cartDetail.priceDetailDTO.couponPrice)}}</span>
+            </div>
+            <div class="discount-item" v-if="cartDetail.priceDetailDTO">
+              <span>其他优惠</span>
+              <span>-￥{{unitPrice(cartDetail.priceDetailDTO.discountPrice)}}</span>
+            </div>
+          </div>
+        </div>
+      </u-popup>
+
+      <view v-if="isEdit" @click="deleteGoods()">
+        <div class="settlement">删除</div>
+      </view>
+
+      <view v-else @click="submitOrder()">
+        <div class="settlement">去结算</div>
+      </view>
+    </div>
+    <u-toast />
+  </div>
+</template>
+<script setup lang="ts">
+import { ref, reactive, computed, onMounted } from 'vue'
+import { onShow, onPullDownRefresh } from '@dcloudio/uni-app'
+import * as API_Trade from '@/api/trade'
+import { debounce } from '@/utils/tools.js'
+import uniNumberBox from '@/components/uni-number-box'
+import config from '@/config/config'
+import { useStore } from '@/store'
+import { unitPrice, goodsFormatPrice, isLogin, forceLogin } from '@/utils/filters.js'
+
+const store = useStore()
+const swiperAction = ref()
+
+const lightColor = computed(() => store.getters.lightColor)
+const loading = ref(false)
+const discountDetailsFlag = ref(false)
+// 商品栏右侧滑动按钮
+const options = [
+  {
+    text: "删除",
+    style: {
+      backgroundColor: store.getters.lightColor,
+    },
+  },
+]
+const isInvalid = (val: any): boolean => {
+  if (!val) return false
+  if (val.invalid == 1 || (!val.checked && val.errorMessage)) {
+    return true
+  } else {
+    return false
+  }
+}
+const deleteShow = ref(false)
+const deleteContent = "删除该商品？"
+const cartDetail = ref<any>("")
+const goodsVal = ref<any>("")
+const isEdit = ref(false)
+const checkout = ref(false)
+const WEIXIN_num = ref("")
+const defaultGoodsImage = config.logo
+const capsuleInsetRight = ref(0)
+
+const cartNavbarStyle = computed(() => {
+  if (!capsuleInsetRight.value) {
+    return {}
+  }
+  return {
+    "--cart-capsule-inset": `${capsuleInsetRight.value}px`,
+  }
+})
+
+const modalConfirmStyle = computed(() => ({
+  color: lightColor.value,
+}))
+
+onMounted(() => {
+  setCapsuleInset()
+  // #ifdef MP-WEIXIN
+  uni.showShareMenu({ withShareTicket: true })
+  // #endif
+})
+
+onPullDownRefresh(() => {
+  getCardData()
+})
+
+onShow(() => {
+  deleteShow.value ? (deleteShow.value = false) : true
+  if (swiperAction.value) {
+    (swiperAction.value as any[]).forEach((item: any) => {
+      item.show = false
+    })
+    getCardData()
+  } else {
+    getCardData()
+  }
+})
+
+function setCapsuleInset() {
+  // #ifdef MP-WEIXIN
+  try {
+    const menuButton = uni.getMenuButtonBoundingClientRect()
+    const { windowWidth } = uni.getWindowInfo()
+    capsuleInsetRight.value = windowWidth - menuButton.left + uni.upx2px(8)
+  } catch (e) {
+    capsuleInsetRight.value = 90
+  }
+  // #endif
+}
+
+function toggleEdit() {
+  isEdit.value = !isEdit.value
+}
+
+function getSkuThumbnail(url: any) {
+  if (url && /^(https?:)?\/\//.test(String(url))) {
+    return url
+  }
+  return defaultGoodsImage
+}
+
+/**
+ * 倒数计时
+ */
+function getCountDownTime(val: any) {
+  if (val.promotionMap) {
+    let key = Object.keys(val.promotionMap).find((child: string) => {
+      return child.split("-")[0] == 'SECKILL'
+    })
+    return val.promotionMap[key].endTime / 1000 - (new Date().getTime() / 1000)
+  }
+}
+
+/**
+ * 优惠明细开关
+ */
+function discountDetails() {
+  discountDetailsFlag.value = true
+}
+/**
+ * 左滑打开删除
+ */
+function openAction(skuItem: any) {
+  cartDetail.value.cartList.forEach((cartItem: any) => {
+    if (cartItem.skuList) {
+      cartItem.skuList.forEach((sku: any) => {
+        sku["selected"] = false
+      })
+    }
+  })
+  skuItem["selected"] = true
+}
+
+/**
+ * 滑动删除
+ */
+function changeActionTab(val: any) {
+  deleteShow.value = true
+  goodsVal.value = val
+}
+
+/**
+ * 点击删除
+ */
+function deleteConfirm() {
+  API_Trade.deleteSkuItem(goodsVal.value.goodsSku.id).then((res: any) => {
+    if (res.statusCode == 200) {
+      uni.showToast({
+        title: "此商品删除成功",
+        duration: 2000,
+      })
+      deleteShow.value = false
+      getCardData()
+    }
+  })
+}
+
+/**
+ * 删除商品
+ */
+function deleteGoods() {
+  if (whetherChecked()) {
+    var delGoodsData: any[] = []
+    cartDetail.value.cartList.forEach((item: any) => {
+      item.skuList.forEach((goodsItem: any) => {
+        if (goodsItem.checked) {
+          delGoodsData.push(goodsItem.goodsSku.id)
+        }
+      })
+    })
+    if (delGoodsData && delGoodsData.length > 0) {
+      API_Trade.deleteSkuItem(delGoodsData).then((res: any) => {
+        if (res.data.success) {
+          uni.showToast({
+            title: "删除成功!",
+            icon: "none",
+          })
+          getCardData()
+        }
+      })
+    } else {
+      uni.showToast({
+        title: "请选择删除商品，如果商品失效，请左滑无效商品删除",
+        icon: "none",
+      })
+    }
+  }
+}
+
+/**
+ * 跳转到店铺
+ */
+function navigateToStore(val: any) {
+  uni.navigateTo({
+    url: "/pages/product/shopPage?id=" + val.storeId,
+  })
+}
+
+/**
+ * 跳转到优惠券
+ */
+function navigateToCoupon(val: any) {
+  uni.navigateTo({
+    url: "/pages/cart/coupon/couponCenter?storeId=" + val.storeId,
+  })
+}
+
+/**
+ * 跳转到商品
+ */
+function navigateToGoods(val: any) {
+  uni.navigateTo({
+    url:
+      "/pages/product/goods?id=" +
+      val.goodsSku.id +
+      "&goodsId=" +
+      val.goodsSku.goodsId,
+  })
+}
+
+/**
+ * 点击步进器回调
+ */
+const numChange = debounce(function (val: any) {
+  updateSkuNumFun(val.goodsSku.id, val.num)
+}, 1000)
+/**
+ * 去结算
+ */
+function submitOrder() {
+  if (whetherChecked()) {
+    navigateTo("/pages/order/fillorder?way=CART")
+  }
+}
+
+/**
+ * 验证是否选中商品
+ */
+function whetherChecked(): boolean {
+  forceLogin()
+
+  let canBuy = false
+  cartDetail.value.cartList.forEach((item: any) => {
+    if (item.checked) {
+      canBuy = true
+    } else {
+      item.skuList.forEach((skuItem: any) => {
+        if (skuItem.checked) {
+          canBuy = true
+        }
+      })
+    }
+  })
+  if (!canBuy) {
+    uni.showToast({
+      title: "您还没有选择商品",
+      duration: 2000,
+      icon: "none",
+    })
+    return false
+  } else {
+    return true
+  }
+}
+
+/**
+ * 跳转
+ */
+function navigateTo(url: string) {
+  uni.navigateTo({
+    url,
+  })
+}
+
+/**
+ * 全选
+ */
+function checkOut(checked?: boolean) {
+  const selected = typeof checked === "boolean" ? checked : checkout.value
+  API_Trade.checkAll(selected).then((result: any) => {
+    if (result.data.success) {
+      getCardData()
+    }
+  })
+}
+
+/**
+ * 获取店铺选中信息
+ */
+function checkStoreFun(skuId: any, num: any) {
+  API_Trade.checkStore(skuId, num).then((result: any) => {
+    if (result.data.success) {
+      getCardData()
+    }
+  })
+}
+
+function onStoreCheckChange(storeItem: any, checked: any) {
+  checkStoreFun(storeItem.storeId, checked)
+}
+
+function onSkuCheckChange(skuItem: any, checked: any) {
+  updateSkuCheckedFun(skuItem.goodsSku.id, checked)
+}
+
+/**
+ * 获取购物车选中信息
+ */
+function updateSkuCheckedFun(skuId: any, num: any) {
+  API_Trade.updateSkuChecked(skuId, num).then((result: any) => {
+    if (result.data.success) {
+      getCardData()
+    }
+  })
+}
+
+/**
+ * 更新商品购物车数量
+ */
+function updateSkuNumFun(skuId: any, num: any) {
+  API_Trade.updateSkuNum(skuId, num).then((result: any) => {
+    if (result.statusCode == 200) {
+      getCardData()
+    } else {
+      setTimeout(() => {
+        getCardData()
+      }, 1000)
+    }
+  })
+}
+
+// 数据去重一下
+function getPromotion(item: any) {
+  return Object.keys(item.promotionMap).map((child: string) => {
+    return child.split("-")[0]
+  })
+}
+
+/**
+ * 获取购物车数据
+ */
+function getCardData() {
+  if (isLogin("auth")) {
+    uni.showLoading({
+      title: "加载中",
+    })
+    API_Trade.getCarts()
+      .then((result: any) => {
+        loading.value = false
+        uni.stopPullDownRefresh()
+        if (result.data.success) {
+          cartDetail.value = result.data.result
+          let checkOuted = true
+          for (let i = 0; i < cartDetail.value.cartList.length; i++) {
+            let item = cartDetail.value.cartList[i]
+            item.checked = item.checked == 1
+            if (!item.checked) {
+              checkOuted = false
+            }
+            item.skuList &&
+              item.skuList.forEach((sku: any) => {
+                sku.checked = sku.checked == 1
+                if (!sku.checked) {
+                  checkOuted = false
+                }
+                if(Object.keys(sku.promotionMap).length != 0)
+                {
+                  Object.keys(sku.promotionMap).forEach((pro: string, proIndex: number) => {
+                    pro = pro.split('-')[0]
+                    if (pro == "PINTUAN" ) {
+                       Object.keys(sku.promotionMap).splice(proIndex, 1);
+                    }
+                  })
+                }
+              })
+          }
+          checkout.value = checkOuted
+          uni.stopPullDownRefresh()
+        }
+      })
+      .catch(() => { loading.value = false })
+     if (store.state.isShowToast){ uni.hideLoading() }
+  } else {
+     if (store.state.isShowToast){ uni.hideLoading() }
+  }
+}
+</script>
+
+<style lang="scss">
+page {
+  background: #f2f2f2;
+}
+</style>
+<style scoped lang="scss">
+// #ifdef MP-WEIXIN
+@import "./mp-carui.scss";
+// #endif
+.u-image {
+  box-shadow: 0 4rpx 12rpx 0 rgba(0, 0, 0, 0.05);
+}
+
+.cart-navbar {
+  ::v-deep .u-navbar__content__right {
+    padding-right: var(--cart-capsule-inset, 13px);
+  }
+
+  ::v-deep .u-navbar__content__right__text {
+    color: $light-color;
+    font-size: 28rpx;
+  }
+}
+.promotion-notice {
+  margin-top: 10px;
+  margin-left: 68rpx;
+  font-size: 24rpx;
+  color: #333;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  ::v-deep .tips {
+    margin: 0 8rpx 0 0;
+    background: $main-color;
+    border-radius: 100px;
+    display: block;
+    flex: 1;
+    padding: 2rpx 12rpx;
+    color: #fff;
+  }
+}
+.default-color {
+  color: #333;
+}
+.goods-row {
+  padding: 30rpx 0;
+
+  display: flex;
+  align-items: center;
+}
+
+.store-name {
+  flex: 1;
+  min-width: 0;
+  font-weight: bold;
+  font-size: 28rpx;
+  margin-left: 8rpx;
+}
+
+.store-arrow {
+  flex-shrink: 0;
+  margin-left: 10rpx;
+}
+.invalid {
+  filter: grayscale(1);
+}
+
+.cart-item {
+  width: 100%;
+  border-radius: 0.4em;
+  transition: 0.35s;
+  overflow: hidden;
+}
+
+/* 空白页 */
+::v-deep .u-number-input {
+  background: #fff !important;
+  border: 1px solid #ededed;
+  margin: 0 !important;
+}
+
+::v-deep .u-icon-minus,
+::v-deep .u-icon-plus {
+  background: #ffffff !important;
+  border: 1px solid #ededed;
+  color: #333 !important;
+  width: 40rpx;
+}
+
+.empty {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100vh;
+  z-index: 99;
+  padding-bottom: var(--window-bottom);
+  display: flex;
+  justify-content: center;
+  flex-direction: column;
+  align-items: center;
+  background: #fff;
+
+  image {
+    width: 240rpx;
+    height: 160rpx;
+    margin-bottom: 30rpx;
+  }
+
+  .empty-tips {
+    display: flex;
+    font-size: $font-sm + 2rpx;
+    color: $font-color-disabled;
+
+    .navigator {
+      color: $uni-color-primary;
+      margin-left: 16rpx;
+    }
+  }
+}
+
+.settlement {
+  width: 180rpx;
+  height: 70rpx;
+  line-height: 70rpx;
+  background: linear-gradient(91deg, $light-color 1%, $aider-light-color 99%);
+  border-radius: 900rpx;
+  text-align: center;
+  color: #fff;
+  margin-right: 10rpx;
+}
+
+.price {
+  display: flex;
+  align-items: center;
+
+  ::v-deep .number {
+    line-height: 1;
+    font-size: 30rpx;
+    > span {
+      font-weight: bold;
+    }
+  }
+}
+
+.box2 {
+  border-radius: 20rpx;
+  padding: 0 16rpx 0;
+  margin: 0 16rpx 20rpx;
+  .u-checkbox {
+    display: flex;
+    align-items: center;
+    text-align: center;
+  }
+  background: #fff;
+
+}
+
+.wrapper {
+  height: 100%;
+}
+
+::v-deep .u-col {
+  padding: 24rpx 0 !important;
+}
+
+.goods-content {
+  flex: 1;
+  min-width: 0;
+  margin-left: 20rpx;
+  overflow: hidden;
+
+  > p,
+  .sp-name,
+  .sp-type,
+  .sp-number {
+    padding-left: 0;
+  }
+}
+
+.content {
+  padding: 20rpx 0 20rpx 0;
+  margin-bottom: 80rpx;
+}
+
+.line {
+  float: left;
+  width: 1px;
+  height: 100%;
+  border-right: 1px solid $light-color;
+}
+
+.store-line-check {
+  flex-shrink: 0;
+
+  ::v-deep .u-checkbox {
+    margin: 0;
+  }
+}
+
+.store-line {
+  display: flex;
+  align-items: center;
+  flex: 1;
+  min-width: 0;
+  overflow: hidden;
+}
+
+.goods-config {
+  display: flex;
+  align-items: center;
+  flex-shrink: 0;
+
+  ::v-deep .invalid {
+    display: block;
+    width: 80rpx !important;
+  }
+}
+.tab {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 24rpx 0 8rpx;
+}
+
+.right-col {
+  flex-shrink: 0;
+  display: flex;
+  align-items: center;
+  text-align: center;
+  color: $light-color;
+  font-size: 26rpx;
+  margin-left: 16rpx;
+
+  > span {
+    margin-left: 20rpx;
+  }
+}
+
+.right-line {
+  width: 2rpx;
+  height: 40rpx;
+  border-left: 1px solid #eeeeee;
+  margin-right: 20rpx;
+}
+
+.box6 {
+  justify-content: space-between;
+  position: fixed;
+  // #ifdef APP-PLUS || MP-WEIXIN
+  bottom: 0;
+  // #endif
+  // #ifdef H5
+  bottom: var(--window-bottom);
+  // #endif
+  left: 0;
+  border-top: 1px solid #ededed;
+  display: flex;
+  height: 100rpx;
+  overflow: hidden;
+  align-items: center;
+  width: 100%;
+  background: rgba(255, 255, 255, 1);
+  color: #333;
+  z-index: 99;
+  > .navL {
+    padding: 0 32rpx;
+    display: flex;
+    align-items: center;
+    flex: 1;
+    min-width: 0;
+    gap: 24rpx;
+
+    .checkout-all {
+      flex-shrink: 0;
+    }
+
+    ::v-deep .u-checkbox {
+      margin: 0;
+    }
+  }
+
+  .checkout-total {
+    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;
+  }
+}
+
+.sp-type {
+  color: $u-light-color;
+  padding: 10rpx 0;
+  font-size: 24rpx;
+  overflow: hidden;
+
+  text-overflow: ellipsis;
+
+  white-space: nowrap;
+}
+
+
+.sp-number {
+  width: 100%;
+  font-weight: bold;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  box-sizing: border-box;
+
+  > .sp-price {
+    flex-shrink: 0;
+
+    ::v-deep span:nth-of-type(1) {
+      font-size: 38rpx;
+    }
+    ::v-deep span:nth-of-type(2) {
+      font-size: 24rpx;
+    }
+  }
+
+  > .sp-numbox {
+    flex-shrink: 0;
+    margin-left: auto;
+  }
+}
+
+.sku-error {
+  margin-top: 8rpx;
+  font-size: 24rpx;
+  color: #999;
+}
+.priceDetail-flowPrice {
+  font-weight: bold;
+  padding-left: 20rpx;
+  > span:nth-of-type(1) {
+    font-size: 38rpx;
+  }
+}
+
+.discount-details {
+  margin-left: 10px;
+  color: #666;
+  padding: 4rpx 10rpx;
+  border-radius: 100px;
+  background: rgba(201, 199, 199, 0.3);
+}
+.discount-item {
+  display: flex;
+  margin: 40rpx 0;
+  justify-content: space-between;
+  > span:nth-of-type(1) {
+    color: #666;
+  }
+  > span:nth-of-type(2) {
+    color: #333;
+    font-weight: bold;
+  }
+}
+.discount-title {
+  font-size: 36rpx;
+  margin-top: 20rpx;
+  text-align: center;
+}
+.discount-way {
+  width: 94%;
+  margin: 0 3%;
+}
+.discount-list {
+  width: 100%;
+}
+.promotions-list {
+  margin-left: 20rpx;
+  > .promotions-item-seckill {
+    background: rgba($color: $main-color, $alpha: 0.1);
+    font-size: 24rpx;
+    color: $main-color;
+    display: inline;
+    padding: 0rpx 10rpx;
+    border-radius: 100px;
+  }
+}
+</style>
diff --git a/patches/uview-plus+3.8.42.patch b/patches/uview-plus+3.8.42.patch
index 2ec07a1..43e173d 100644
--- a/patches/uview-plus+3.8.42.patch
+++ b/patches/uview-plus+3.8.42.patch
@@ -1,5 +1,5 @@
 diff --git a/node_modules/uview-plus/components/u-image/u-image.vue b/node_modules/uview-plus/components/u-image/u-image.vue
-index 24e3b10..b59b657 100644
+index 24e3b10..1360704 100644
 --- a/node_modules/uview-plus/components/u-image/u-image.vue
 +++ b/node_modules/uview-plus/components/u-image/u-image.vue
 @@ -26,7 +26,7 @@
@@ -20,20 +20,7 @@ index 24e3b10..b59b657 100644
  				class="u-image__error"
  				:style="{
  					borderRadius: shape == 'circle' ? '50%' : addUnit(radius),
-@@ -108,7 +108,12 @@
- 				// 图片加载完成时，去掉背景颜色，因为如果是png图片，就会显示灰色的背景
- 				backgroundStyle: {},
- 				// 用于fade模式的控制组件显示与否
-+				// #ifdef MP-WEIXIN
-+				show: true
-+				// #endif
-+				// #ifndef MP-WEIXIN
- 				show: false
-+				// #endif
- 			};
- 		},
- 		watch: {
-@@ -126,6 +131,12 @@
+@@ -126,6 +126,12 @@
  			}
  		},
  		computed: {
@@ -46,6 +33,39 @@ index 24e3b10..b59b657 100644
  			transStyle() {
  				let style = {};
  				// 通过调用addUnit()方法，如果有单位，如百分比，px单位等，直接返回，如果是纯粹的数值，则加上rpx单位
+diff --git a/node_modules/uview-plus/components/u-modal/props.js b/node_modules/uview-plus/components/u-modal/props.js
+index 0f0177b..1aacecf 100644
+--- a/node_modules/uview-plus/components/u-modal/props.js
++++ b/node_modules/uview-plus/components/u-modal/props.js
+@@ -105,7 +105,7 @@ export const props = defineMixin({
+         // 内容样式
+         contentStyle: {
+             type: Object,
+-            default: () => defProps.modal.contentStyle
++            default: () => ({ ...(defProps.modal.contentStyle || {}) })
+         }
+     }
+ })
+diff --git a/node_modules/uview-plus/components/u-modal/u-modal.vue b/node_modules/uview-plus/components/u-modal/u-modal.vue
+index eab8f72..bfd3da0 100644
+--- a/node_modules/uview-plus/components/u-modal/u-modal.vue
++++ b/node_modules/uview-plus/components/u-modal/u-modal.vue
+@@ -142,9 +142,12 @@
+ 		emits: ["confirm", "cancel", "close", "update:show", 'cancelOnAsync'],
+ 		computed: {
+ 			contentStyleCpu() {
+-				let style = this.contentStyle;
+-				style.paddingTop = `${this.title ? 12 : 25}px`
+-				return style;
++				// 不要改 props 上的 contentStyle。那个对象是默认配置里的共享引用，
++				// 渲染时写入会反向触发父组件更新，购物车页会因此无限循环。
++				return {
++					...(this.contentStyle || {}),
++					paddingTop: `${this.title ? 12 : 25}px`
++				}
+ 			}
+ 		},
+ 		methods: {
 diff --git a/node_modules/uview-plus/components/u-navbar/theme-vars.scss b/node_modules/uview-plus/components/u-navbar/theme-vars.scss
 index d057ee6..791a092 100644
 --- a/node_modules/uview-plus/components/u-navbar/theme-vars.scss
diff --git a/utils/theme.js b/utils/theme.js
index d342928..eba6395 100644
--- a/utils/theme.js
+++ b/utils/theme.js
@@ -35,14 +35,35 @@ export function loadCachedTheme() {
   }
 }
 
-export function applyTabBarStyle(mainColor) {
-  if (!mainColor) return;
-  try {
-    uni.setTabBarStyle({
-      selectedColor: mainColor,
-    });
-  } catch (e) {
-    // 非 tabBar 页面可能报错，忽略
+const TAB_BAR_ROUTES = [
+  "pages/tabbar/home/index",
+  "pages/tabbar/category/category",
+  "pages/tabbar/cart/cartList",
+  "pages/tabbar/user/my",
+];
+
+function normalizeRoute(route = "") {
+  return String(route).replace(/^\//, "").split("?")[0];
+}
+
+function currentRoute() {
+  const pages = typeof getCurrentPages === "function" ? getCurrentPages() : [];
+  const page = pages[pages.length - 1];
+  return (page && page.route) || "";
+}
+
+export function isTabBarRoute(route) {
+  return TAB_BAR_ROUTES.includes(normalizeRoute(route || currentRoute()));
+}
+
+export function applyTabBarStyle(mainColor, route) {
+  if (!mainColor || !isTabBarRoute(route)) return;
+  const task = uni.setTabBarStyle({
+    selectedColor: mainColor,
+    fail() {},
+  });
+  if (task && typeof task.catch === "function") {
+    task.catch(() => {});
   }
 }