From dd4163cecaeb728357e8201b89dc9de1770900cd Mon Sep 17 00:00:00 2001
From: jevononlie <728254585@qq.com>
Date: Wed, 29 May 2024 12:56:09 +0800
Subject: [PATCH] fix code

---
 src/pages.json                               |  13 -
 src/pages/my/my.vue                          |   7 -
 src/pages/newsList/components/newsItem.vue   | 161 ------
 src/pages/newsList/components/noticeItem.vue | 161 ------
 src/pages/newsList/newsList.vue              | 141 -----
 src/pages/orderAuto/components/CartMain.vue  | 509 -------------------
 src/pages/orderAuto/orderAuto.vue            | 121 -----
 src/payment/success/success.vue              |  10 +-
 src/static/images/news_icon.png              | Bin 2813 -> 0 bytes
 src/static/images/order_auto_my.png          | Bin 2640 -> 0 bytes
 10 files changed, 7 insertions(+), 1116 deletions(-)
 delete mode 100644 src/pages/newsList/components/newsItem.vue
 delete mode 100644 src/pages/newsList/components/noticeItem.vue
 delete mode 100644 src/pages/newsList/newsList.vue
 delete mode 100644 src/pages/orderAuto/components/CartMain.vue
 delete mode 100644 src/pages/orderAuto/orderAuto.vue
 delete mode 100644 src/static/images/news_icon.png
 delete mode 100644 src/static/images/order_auto_my.png

diff --git a/src/pages.json b/src/pages.json
index b8d57ea..4cef4d7 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -51,19 +51,6 @@
         "navigationBarTitleText": "完成订单详情"
       }
     },
-    {
-      "path": "pages/newsList/newsList",
-      "style": {
-        "navigationBarTitleText": "消息列表",
-         "navigationStyle": "custom"
-      }
-    },
-    {
-      "path": "pages/orderAuto/orderAuto",
-      "style": {
-        "navigationBarTitleText": "自动接单"
-      }
-    },
     {
       "path": "pages/my/my",
       "style": {
diff --git a/src/pages/my/my.vue b/src/pages/my/my.vue
index 6ee6926..31ec6da 100644
--- a/src/pages/my/my.vue
+++ b/src/pages/my/my.vue
@@ -96,9 +96,6 @@ const handleWallet = () => {
             </view>
           </view>
         </view>
-        <!-- <navigator class="settings" url="/pagesMember/settings/settings" hover-class="none">
-          设置
-        </navigator> -->
       </view>
       <!-- 我的订单 -->
       <view class="orders">
@@ -119,10 +116,6 @@ const handleWallet = () => {
         <uni-icons type="cart" color="#3775F6" size="20"></uni-icons>
         <view class="label"> 已完成订单 </view>
       </button>
-      <!-- <button hover-class="none" class="item arrow" @click="handleOrderAuto">
-        <image class="img" src="/static/images/order_auto_my.png" mode="scaleToFill" />
-        <view class="text"> 自动接单 </view>
-      </button> -->
       <navigator v-if="orgFund != null" class="settings item arrow" @click="handleWallet" hover-class="none">
         <uni-icons type="wallet" color="#3775F6" size="20"></uni-icons>
         <view class="label"> 商户充值记录 </view>
diff --git a/src/pages/newsList/components/newsItem.vue b/src/pages/newsList/components/newsItem.vue
deleted file mode 100644
index f087717..0000000
--- a/src/pages/newsList/components/newsItem.vue
+++ /dev/null
@@ -1,161 +0,0 @@
-<script setup lang="ts">
-import { onMounted, ref } from 'vue'
-import type { OrderListParams } from '@/types/order'
-// 是否分页结束
-const isFinish = ref(false)
-// 是否触发下拉刷新
-const isTriggered = ref(false)
-// 定义 porps
-const props = defineProps<{
-  orderState: number
-}>()
-
-// 是否加载中标记，用于防止滚动触底触发多次请求
-const isLoading = ref(false)
-// 请求参数
-const queryParams: Required<OrderListParams> = {
-  page: 1,
-  pageSize: 5,
-  orderState: props.orderState,
-}
-
-const dataList = ref([
-  {
-    id: 1,
-    name: 'dd',
-  },
-  {
-    id: 2,
-    name: 'dd',
-  },
-  {
-    id: 3,
-    name: 'dd',
-  },
-  {
-    id: 4,
-    name: 'dd',
-  },
-  {
-    id: 5,
-    name: 'dd',
-  },
-])
-
-const getMemberOrderData = async () => {
-  // 如果数据出于加载中，退出函数
-  if (isLoading.value) return
-  // 退出分页判断
-  if (isFinish.value === true) {
-    return uni.showToast({ icon: 'none', title: '没有更多数据~' })
-  }
-  // 发送请求前，标记为加载中
-  isLoading.value = true
-  // 发送请求
-  const res = await getListOrderAPI(queryParams)
-  // debugger
-  // 发送请求后，重置标记
-  isLoading.value = false
-  // 数组追加
-  orderList.value.push(...res.result.items)
-  // 分页条件
-  if (queryParams.page < res.result.pages) {
-    // 页码累加
-    queryParams.page++
-  } else {
-    // 分页已结束
-    isFinish.value = true
-  }
-}
-
-onMounted(() => {
-  // getMemberOrderData()
-  // const arr: object[] = [
-  //   {
-  //     id: 1,
-  //     name: '233'
-  //   }
-  // ]
-  // orderList.value.push(...arr)
-})
-
-// 自定义下拉刷新被触发
-const onRefresherrefresh = async () => {
-  // 开始动画
-  isTriggered.value = true
-  // 重置数据
-  queryParams.page = 1
-  orderList.value = []
-  isFinish.value = false
-  // 加载数据
-  await getMemberOrderData()
-  // 关闭动画
-  isTriggered.value = false
-}
-</script>
-<template>
-  <scroll-view
-    enable-back-to-top
-    scroll-y
-    class="orders"
-    refresher-enabled
-    :refresher-triggered="isTriggered"
-    @refresherrefresh="onRefresherrefresh"
-    @scrolltolower="getMemberOrderData"
-  >
-    <view class="dataList">
-      <view class="item" v-for="item in dataList" :key="item.id">
-        <image src="/static/images/news_icon.png" mode="aspectFit" class="img"></image>
-        <view class="right">
-          <view class="hd">
-            <view class="title">13277590688</view>
-            <view class="time">4分钟前</view>
-          </view>
-          <view class="info">什么时间到？</view>
-        </view>
-      </view>
-    </view>
-  </scroll-view>
-</template>
-
-<style lang="scss">
-.dataList {
-  padding: 20rpx 20rpx;
-  .item {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    margin: 20rpx 0;
-    padding: 20rpx 10rpx;
-    border-radius: 16rpx;
-    box-shadow: 0px 0px 8px 0px rgba(164, 182, 203, 0.33);
-    .img {
-      width: 72rpx;
-      height: 72rpx;
-      margin-right: 20rpx;
-    }
-    .right {
-      flex: 1;
-      margin-right: 10rpx;
-      .hd {
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        .title {
-          color: #3d3d3d;
-          font-size: 32rpx;
-        }
-        .time {
-          color: #afb0b6;
-          font-size: 28rpx;
-        }
-      }
-      .info {
-        color: #868891;
-        margin: 20rpx 0;
-        font-size: 30rpx;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/pages/newsList/components/noticeItem.vue b/src/pages/newsList/components/noticeItem.vue
deleted file mode 100644
index ea65180..0000000
--- a/src/pages/newsList/components/noticeItem.vue
+++ /dev/null
@@ -1,161 +0,0 @@
-<script setup lang="ts">
-import { onMounted, ref } from 'vue'
-import type { OrderListParams } from '@/types/order'
-// 是否分页结束
-const isFinish = ref(false)
-// 是否触发下拉刷新
-const isTriggered = ref(false)
-// 定义 porps
-const props = defineProps<{
-  orderState: number
-}>()
-
-// 是否加载中标记，用于防止滚动触底触发多次请求
-const isLoading = ref(false)
-// 请求参数
-const queryParams: Required<OrderListParams> = {
-  page: 1,
-  pageSize: 5,
-  orderState: props.orderState,
-}
-
-const dataList = ref([
-  {
-    id: 1,
-    name: 'dd',
-  },
-  {
-    id: 2,
-    name: 'dd',
-  },
-  {
-    id: 3,
-    name: 'dd',
-  },
-  {
-    id: 4,
-    name: 'dd',
-  },
-  {
-    id: 5,
-    name: 'dd',
-  },
-])
-
-const getMemberOrderData = async () => {
-  // 如果数据出于加载中，退出函数
-  if (isLoading.value) return
-  // 退出分页判断
-  if (isFinish.value === true) {
-    return uni.showToast({ icon: 'none', title: '没有更多数据~' })
-  }
-  // 发送请求前，标记为加载中
-  isLoading.value = true
-  // 发送请求
-  // const res = await getListOrderAPI(queryParams)
-  // debugger
-  // 发送请求后，重置标记
-  isLoading.value = false
-  // 数组追加
-  orderList.value.push(...res.result.items)
-  // 分页条件
-  if (queryParams.page < res.result.pages) {
-    // 页码累加
-    queryParams.page++
-  } else {
-    // 分页已结束
-    isFinish.value = true
-  }
-}
-
-onMounted(() => {
-  // getMemberOrderData()
-  // const arr: object[] = [
-  //   {
-  //     id: 1,
-  //     name: '233'
-  //   }
-  // ]
-  // orderList.value.push(...arr)
-})
-
-// 自定义下拉刷新被触发
-const onRefresherrefresh = async () => {
-  // 开始动画
-  isTriggered.value = true
-  // 重置数据
-  queryParams.page = 1
-  orderList.value = []
-  isFinish.value = false
-  // 加载数据
-  await getMemberOrderData()
-  // 关闭动画
-  isTriggered.value = false
-}
-</script>
-<template>
-  <scroll-view
-    enable-back-to-top
-    scroll-y
-    class="orders"
-    refresher-enabled
-    :refresher-triggered="isTriggered"
-    @refresherrefresh="onRefresherrefresh"
-    @scrolltolower="getMemberOrderData"
-  >
-    <view class="dataList">
-      <view class="item" v-for="item in dataList" :key="item.id">
-        <image src="/static/images/news_icon.png" mode="aspectFit" class="img"></image>
-        <view class="right">
-          <view class="hd">
-            <view class="title">平台运营中心</view>
-            <view class="time">4分钟前</view>
-          </view>
-          <view class="info">派送给您编号【HS21545455244】...</view>
-        </view>
-      </view>
-    </view>
-  </scroll-view>
-</template>
-
-<style lang="scss">
-.dataList {
-  padding: 20rpx 20rpx;
-  .item {
-    display: flex;
-    justify-content: flex-start;
-    align-items: center;
-    margin: 20rpx 0;
-    padding: 20rpx 10rpx;
-    border-radius: 16rpx;
-    box-shadow: 0px 0px 8px 0px rgba(164, 182, 203, 0.33);
-    .img {
-      width: 72rpx;
-      height: 72rpx;
-      margin-right: 20rpx;
-    }
-    .right {
-      flex: 1;
-      margin-right: 10rpx;
-      .hd {
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-        .title {
-          color: #3d3d3d;
-          font-size: 32rpx;
-        }
-        .time {
-          color: #afb0b6;
-          font-size: 28rpx;
-        }
-      }
-      .info {
-        color: #868891;
-        margin: 20rpx 0;
-        font-size: 30rpx;
-      }
-    }
-  }
-}
-</style>
diff --git a/src/pages/newsList/newsList.vue b/src/pages/newsList/newsList.vue
deleted file mode 100644
index 820744e..0000000
--- a/src/pages/newsList/newsList.vue
+++ /dev/null
@@ -1,141 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue'
-import newsItem from './components/newsItem.vue'
-import noticeItem from './components/noticeItem.vue'
-// 获取屏幕边界到安全区域距离
-const { safeAreaInsets } = uni.getSystemInfoSync()
-
-// tabs 数据
-const orderTabs = ref([
-  { orderState: 0, title: '通知', isRender: false },
-  { orderState: 1, title: '私信', isRender: false },
-])
-// 高亮下标
-const activeIndex = ref(orderTabs.value.findIndex((v) => v.orderState === Number(0)))
-
-// 默认渲染容器
-orderTabs.value[activeIndex.value].isRender = true
-</script>
-
-<template>
-  <!-- <CartMain /> -->
-  <view class="viewport">
-    <!-- 自定义导航栏: 默认透明不可见, scroll-view 滚动到 50 时展示 -->
-    <view class="navbar" :style="{ paddingTop: safeAreaInsets?.top + 'px' }">
-      <view class="wrap">
-        <navigator open-type="navigateBack" class="back icon-left"></navigator>
-        <view class="title"></view>
-      </view>
-    </view>
-    <view class="tabs">
-      <text
-        class="item"
-        :class="{ active: activeIndex == index }"
-        v-for="(item, index) in orderTabs"
-        :key="item.title"
-        @tap="
-          () => {
-            activeIndex = index
-            item.isRender = true
-          }
-        "
-      >
-        {{ item.title }}
-      </text>
-      <!-- 游标 -->
-      <view class="cursor" :style="{ left: activeIndex ? '65%' : '14%' }"></view>
-    </view>
-    <!-- 滑动容器 -->
-    <swiper class="swiper" :current="activeIndex" @change="activeIndex = $event.detail.current">
-      <!-- 滑动项 -->
-      <swiper-item v-for="item in orderTabs" :key="item.title">
-        <newsItem v-if="activeIndex" />
-        <noticeItem v-else />
-      </swiper-item>
-    </swiper>
-  </view>
-</template>
-
-<style lang="scss">
-page {
-  height: 100%;
-}
-.viewport {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  // background-color: #3775F6;
-  .navbar {
-    width: 750rpx;
-    color: #000;
-    position: fixed;
-    top: 0;
-    left: 0;
-    z-index: 9;
-    /* background-color: #f8f8f8; */
-    background-color: #3775f6;
-    .wrap {
-      position: relative;
-      background-color: #3775f6;
-      .title {
-        height: 44px;
-        display: flex;
-        justify-content: center;
-        align-items: center;
-        font-size: 32rpx;
-        /* color: #000; */
-        color: #fff;
-      }
-      .back {
-        position: absolute;
-        left: 0;
-        height: 44px;
-        width: 44px;
-        font-size: 44rpx;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        /* color: #000; */
-        color: #fff;
-      }
-    }
-  }
-  .tabs {
-    display: flex;
-    justify-content: space-around;
-    line-height: 60rpx;
-    background-color: #3775f6;
-    position: relative;
-    z-index: 9;
-    margin-top: 128rpx;
-    width: 100%;
-
-    .item {
-      flex: 1;
-      text-align: center;
-      padding: 20rpx;
-      font-size: 28rpx;
-      color: #fff;
-      // &.active {
-      //   border-bottom: 2rpx solid #5386e4;
-      // }
-    }
-
-    .cursor {
-      position: absolute;
-      left: 13%;
-      bottom: 0;
-      width: 20%;
-      height: 6rpx;
-      padding: 0 50rpx;
-      background-color: #fff;
-      /* 过渡效果 */
-      transition: all 0.4s;
-    }
-  }
-  // swiper
-  .swiper {
-    background-color: #f7f7f8;
-  }
-}
-</style>
diff --git a/src/pages/orderAuto/components/CartMain.vue b/src/pages/orderAuto/components/CartMain.vue
deleted file mode 100644
index 71acea8..0000000
--- a/src/pages/orderAuto/components/CartMain.vue
+++ /dev/null
@@ -1,509 +0,0 @@
-<script setup lang="ts">
-import type { InputNumberBoxEvent } from '@/components/vk-data-input-number-box/vk-data-input-number-box'
-import { useGuessList } from '@/composables'
-import {
-  deleteMemberCartAPI,
-  getMemberCartAPI,
-  putMemberCartBySkuIdAPI,
-  putMemberCartSelectedAPI,
-} from '@/services/cart'
-import { useMemberStore } from '@/stores'
-import type { CartItem } from '@/types/cart'
-import { onShow } from '@dcloudio/uni-app'
-import { computed, ref } from 'vue'
-
-// 是否适配底部安全区域
-defineProps<{
-  safeAreaInsetBottom?: boolean
-}>()
-
-// 获取屏幕边界到安全区域距离
-const { safeAreaInsets } = uni.getSystemInfoSync()
-
-// 获取会员Store
-const memberStore = useMemberStore()
-
-// 获取购物车数据
-const cartList = ref<CartItem[]>([])
-// 优化购物车空列表状态，默认展示列表
-const showCartList = ref(true)
-const getMemberCartData = async () => {
-  const res = await getMemberCartAPI()
-  cartList.value = res.result
-  showCartList.value = res.result.length > 0
-}
-
-// 初始化调用: 页面显示触发
-onShow(() => {
-  if (memberStore.profile) {
-    getMemberCartData()
-  }
-})
-
-// 点击删除按钮
-const onDeleteCart = (skuId: string) => {
-  // 弹窗二次确认
-  uni.showModal({
-    content: '是否删除',
-    confirmColor: '#3775F6',
-    success: async (res) => {
-      if (res.confirm) {
-        // 后端删除单品
-        await deleteMemberCartAPI({ ids: [skuId] })
-        // 重新获取列表
-        getMemberCartData()
-      }
-    },
-  })
-}
-
-// 修改商品数量
-const onChangeCount = (ev: InputNumberBoxEvent) => {
-  putMemberCartBySkuIdAPI(ev.index, { count: ev.value })
-}
-
-// 修改选中状态-单品修改
-const onChangeSelected = (item: CartItem) => {
-  // 前端数据更新-是否选中取反
-  item.selected = !item.selected
-  // 后端数据更新
-  putMemberCartBySkuIdAPI(item.skuId, { selected: item.selected })
-}
-
-// 计算全选状态
-const isSelectedAll = computed(() => {
-  return cartList.value.length && cartList.value.every((v) => v.selected)
-})
-
-// 修改选中状态-全选修改
-const onChangeSelectedAll = () => {
-  // 全选状态取反
-  const _isSelectedAll = !isSelectedAll.value
-  // 前端数据更新
-  cartList.value.forEach((item) => {
-    item.selected = _isSelectedAll
-  })
-  // 后端数据更新
-  putMemberCartSelectedAPI({ selected: _isSelectedAll })
-}
-
-// 计算选中单品列表
-const selectedCartList = computed(() => {
-  return cartList.value.filter((v) => v.selected)
-})
-
-// 计算选中总件数
-const selectedCartListCount = computed(() => {
-  return selectedCartList.value.reduce((sum, item) => sum + item.count, 0)
-})
-
-// 计算选中总金额
-const selectedCartListMoney = computed(() => {
-  return selectedCartList.value
-    .reduce((sum, item) => sum + item.count * item.nowPrice, 0)
-    .toFixed(2)
-})
-
-// 结算按钮
-const gotoPayment = () => {
-  if (selectedCartListCount.value === 0) {
-    return uni.showToast({
-      icon: 'none',
-      title: '请选择商品',
-    })
-  }
-  // 跳转到结算页
-  uni.navigateTo({ url: '/pagesOrder/create/create' })
-}
-
-// 猜你喜欢
-const { guessRef, onScrolltolower } = useGuessList()
-</script>
-
-<template>
-  <scroll-view enable-back-to-top scroll-y class="scroll-view" @scrolltolower="onScrolltolower">
-    <!-- 已登录: 显示购物车 -->
-    <template v-if="memberStore.profile">
-      <!-- 购物车列表 -->
-      <view class="cart-list" v-if="showCartList">
-        <!-- 优惠提示 -->
-        <view class="tips">
-          <text class="label">满减</text>
-          <text class="desc">满1件, 即可享受9折优惠</text>
-        </view>
-        <!-- 滑动操作分区 -->
-        <uni-swipe-action>
-          <!-- 滑动操作项 -->
-          <uni-swipe-action-item v-for="item in cartList" :key="item.skuId" class="cart-swipe">
-            <!-- 商品信息 -->
-            <view class="goods">
-              <!-- 选中状态 -->
-              <text
-                @tap="onChangeSelected(item)"
-                class="checkbox"
-                :class="{ checked: item.selected }"
-              ></text>
-              <navigator
-                :url="`/pages/goods/goods?id=${item.id}`"
-                hover-class="none"
-                class="navigator"
-              >
-                <image mode="aspectFill" class="picture" :src="item.picture"></image>
-                <view class="meta">
-                  <view class="name ellipsis">{{ item.name }}</view>
-                  <view class="attrsText ellipsis">{{ item.attrsText }}</view>
-                  <view class="price">{{ item.nowPrice }}</view>
-                </view>
-              </navigator>
-              <!-- 商品数量 -->
-              <view class="count">
-                <vk-data-input-number-box
-                  v-model="item.count"
-                  :min="1"
-                  :max="item.stock"
-                  :index="item.skuId"
-                  @change="onChangeCount"
-                />
-              </view>
-            </view>
-            <!-- 右侧删除按钮 -->
-            <template #right>
-              <view class="cart-swipe-right">
-                <button @tap="onDeleteCart(item.skuId)" class="button delete-button">删除</button>
-              </view>
-            </template>
-          </uni-swipe-action-item>
-        </uni-swipe-action>
-      </view>
-      <!-- 购物车空状态 -->
-      <view class="cart-blank" v-else>
-        <image src="/static/images/blank_cart.png" class="image" />
-        <text class="text">购物车还是空的，快来挑选好货吧</text>
-        <navigator url="/pages/index/index" hover-class="none">
-          <button class="button">去首页看看</button>
-        </navigator>
-      </view>
-      <!-- 吸底工具栏 -->
-      <view
-        v-if="showCartList"
-        class="toolbar"
-        :style="{ paddingBottom: safeAreaInsetBottom ? safeAreaInsets?.bottom + 'px' : 0 }"
-      >
-        <text @tap="onChangeSelectedAll" class="all" :class="{ checked: isSelectedAll }">全选</text>
-        <text class="text">合计:</text>
-        <text class="amount">{{ selectedCartListMoney }}</text>
-        <view class="button-grounp">
-          <view
-            @tap="gotoPayment"
-            class="button payment-button"
-            :class="{ disabled: selectedCartListCount === 0 }"
-          >
-            去结算({{ selectedCartListCount }})
-          </view>
-        </view>
-      </view>
-    </template>
-    <!-- 未登录: 提示登录 -->
-    <view class="login-blank" v-else>
-      <text class="text">登录后可查看购物车中的商品</text>
-      <navigator url="/pages/login/login" hover-class="none">
-        <button class="button">去登录</button>
-      </navigator>
-    </view>
-    <!-- 猜你喜欢 -->
-    <XtxGuess ref="guessRef" />
-    <!-- 底部占位空盒子 -->
-    <view class="toolbar-height"></view>
-  </scroll-view>
-</template>
-
-<style lang="scss">
-// 根元素
-:host {
-  height: 100vh;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-  background-color: #f7f7f8;
-}
-
-// 滚动容器
-.scroll-view {
-  flex: 1;
-  background-color: #f7f7f8;
-}
-
-// 购物车列表
-.cart-list {
-  padding: 0 20rpx;
-
-  // 优惠提示
-  .tips {
-    display: flex;
-    align-items: center;
-    line-height: 1;
-    margin: 30rpx 10rpx;
-    font-size: 26rpx;
-    color: #666;
-
-    .label {
-      color: #fff;
-      padding: 7rpx 15rpx 5rpx;
-      border-radius: 4rpx;
-      font-size: 24rpx;
-      background-color: #3775F6;
-      margin-right: 10rpx;
-    }
-  }
-
-  // 购物车商品
-  .goods {
-    display: flex;
-    padding: 20rpx 20rpx 20rpx 80rpx;
-    border-radius: 10rpx;
-    background-color: #fff;
-    position: relative;
-
-    .navigator {
-      display: flex;
-    }
-
-    .checkbox {
-      position: absolute;
-      top: 0;
-      left: 0;
-
-      display: flex;
-      align-items: center;
-      justify-content: center;
-      width: 80rpx;
-      height: 100%;
-
-      &::before {
-        content: '\e6cd';
-        font-family: 'erabbit' !important;
-        font-size: 40rpx;
-        color: #444;
-      }
-
-      &.checked::before {
-        content: '\e6cc';
-        color: #3775F6;
-      }
-    }
-
-    .picture {
-      width: 170rpx;
-      height: 170rpx;
-    }
-
-    .meta {
-      flex: 1;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      margin-left: 20rpx;
-    }
-
-    .name {
-      height: 72rpx;
-      font-size: 26rpx;
-      color: #444;
-    }
-
-    .attrsText {
-      line-height: 1.8;
-      padding: 0 15rpx;
-      font-size: 24rpx;
-      align-self: flex-start;
-      border-radius: 4rpx;
-      color: #888;
-      background-color: #f7f7f8;
-    }
-
-    .price {
-      line-height: 1;
-      font-size: 26rpx;
-      color: #444;
-      margin-bottom: 2rpx;
-      color: #cf4444;
-
-      &::before {
-        content: '￥';
-        font-size: 80%;
-      }
-    }
-
-    // 商品数量
-    .count {
-      position: absolute;
-      bottom: 20rpx;
-      right: 5rpx;
-
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      width: 220rpx;
-      height: 48rpx;
-
-      .text {
-        height: 100%;
-        padding: 0 20rpx;
-        font-size: 32rpx;
-        color: #444;
-      }
-
-      .input {
-        height: 100%;
-        text-align: center;
-        border-radius: 4rpx;
-        font-size: 24rpx;
-        color: #444;
-        background-color: #f6f6f6;
-      }
-    }
-  }
-
-  .cart-swipe {
-    display: block;
-    margin: 20rpx 0;
-  }
-
-  .cart-swipe-right {
-    display: flex;
-    height: 100%;
-
-    .button {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      width: 50px;
-      padding: 6px;
-      line-height: 1.5;
-      color: #fff;
-      font-size: 26rpx;
-      border-radius: 0;
-    }
-
-    .delete-button {
-      background-color: #cf4444;
-    }
-  }
-}
-
-// 空状态
-.cart-blank,
-.login-blank {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  flex-direction: column;
-  height: 60vh;
-  .image {
-    width: 400rpx;
-    height: 281rpx;
-  }
-  .text {
-    color: #444;
-    font-size: 26rpx;
-    margin: 20rpx 0;
-  }
-  .button {
-    width: 240rpx !important;
-    height: 60rpx;
-    line-height: 60rpx;
-    margin-top: 20rpx;
-    font-size: 26rpx;
-    border-radius: 60rpx;
-    color: #fff;
-    background-color: #3775F6;
-  }
-}
-
-// 吸底工具栏
-.toolbar {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: calc(var(--window-bottom));
-  z-index: 1;
-
-  height: 100rpx;
-  padding: 0 20rpx;
-  display: flex;
-  align-items: center;
-  border-top: 1rpx solid #ededed;
-  border-bottom: 1rpx solid #ededed;
-  background-color: #fff;
-  box-sizing: content-box;
-
-  .all {
-    margin-left: 25rpx;
-    font-size: 14px;
-    color: #444;
-    display: flex;
-    align-items: center;
-  }
-
-  .all::before {
-    font-family: 'erabbit' !important;
-    content: '\e6cd';
-    font-size: 40rpx;
-    margin-right: 8rpx;
-  }
-
-  .checked::before {
-    content: '\e6cc';
-    color: #3775F6;
-  }
-
-  .text {
-    margin-right: 8rpx;
-    margin-left: 32rpx;
-    color: #444;
-    font-size: 14px;
-  }
-
-  .amount {
-    font-size: 20px;
-    color: #cf4444;
-
-    .decimal {
-      font-size: 12px;
-    }
-
-    &::before {
-      content: '￥';
-      font-size: 12px;
-    }
-  }
-
-  .button-grounp {
-    margin-left: auto;
-    display: flex;
-    justify-content: space-between;
-    text-align: center;
-    line-height: 72rpx;
-    font-size: 13px;
-    color: #fff;
-
-    .button {
-      width: 240rpx;
-      margin: 0 10rpx;
-      border-radius: 72rpx;
-    }
-
-    .payment-button {
-      background-color: #3775F6;
-
-      &.disabled {
-        opacity: 0.6;
-      }
-    }
-  }
-}
-// 底部占位空盒子
-.toolbar-height {
-  height: 100rpx;
-}
-</style>
diff --git a/src/pages/orderAuto/orderAuto.vue b/src/pages/orderAuto/orderAuto.vue
deleted file mode 100644
index 832cbb8..0000000
--- a/src/pages/orderAuto/orderAuto.vue
+++ /dev/null
@@ -1,121 +0,0 @@
-<script setup lang="ts">
-import { ref } from 'vue'
-
-const handleSubmit = async () => {}
-</script>
-<template>
-  <view class="viewport">
-    <view class="section-auto">
-      <view class="left">
-        <view class="title">自动接单</view>
-        <view class="desc">开启后将根据配置情况自动接单</view>
-      </view>
-      <view class="switch">
-        <switch checked color="#3775F6" style="transform: scale(0.7)" />
-      </view>
-    </view>
-    <view class="section-time">
-      <view class="start-time item">
-        <view class="left">
-          <view class="title">开始接单时间</view>
-          <view class="val">2024-01-16 13:25:22</view>
-        </view>
-        <view class="edit">修改</view>
-      </view>
-      <view class="end-time item">
-        <view class="left">
-          <view class="title">结束接单时间</view>
-          <view class="val">2024-01-16 13:25:22</view>
-        </view>
-        <view class="edit">修改</view>
-      </view>
-      <view class="auto-num item">
-        <view class="left">
-          <view class="title">自动接单范围</view>
-          <view class="val">4km</view>
-        </view>
-        <view class="edit">修改</view>
-      </view>
-    </view>
-    <view class="action" @click="handleSubmit"> 保存修改 </view>
-  </view>
-</template>
-<style lang="scss">
-page {
-  height: 100%;
-  background-color: #fafafd;
-}
-.viewport {
-  padding: 10rpx;
-
-  .section-auto {
-    display: flex;
-    justify-content: space-between;
-    padding: 30rpx 0rpx;
-    margin: 20rpx 0;
-    border-radius: 16rpx;
-    background: #ffffff;
-    box-shadow: 0px 0px 8px 0px rgba(164, 182, 203, 0.33);
-
-    .left {
-      margin-left: 30rpx;
-      .title {
-        color: #3d3d3d;
-        font-size: 34rpx;
-        margin-bottom: 20rpx;
-      }
-      .desc {
-        color: #999a9f;
-        font-size: 32rpx;
-      }
-    }
-  }
-  .section-time {
-    padding: 30rpx 30rpx;
-    margin: 20rpx 0;
-    background: #ffffff;
-    border-radius: 16rpx;
-    box-shadow: 0px 0px 8px 0px rgba(164, 182, 203, 0.33);
-    .item {
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      margin: 20rpx 0;
-      padding-bottom: 10rpx;
-      border-bottom: 2rpx solid #f2f2f2;
-      .left {
-        .title {
-          font-size: 34rpx;
-          color: #3d3d3d;
-          margin-bottom: 20rpx;
-        }
-        .val {
-          color: #999a9f;
-          font-size: 32rpx;
-        }
-      }
-      .edit {
-        color: #3775f6;
-        font-size: 40rpx;
-        text-decoration: underline;
-      }
-      &:last-child {
-        border: none;
-      }
-    }
-  }
-  .action {
-    width: 344rpx;
-    margin: 100rpx auto 0;
-    border-radius: 100rpx;
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    align-items: center;
-    padding: 30rpx 30rpx;
-    color: #fff;
-    font-size: 36rpx;
-    background: linear-gradient(152deg, #51b6ff 16%, #3775f6 86%);
-  }
-}
-</style>
diff --git a/src/payment/success/success.vue b/src/payment/success/success.vue
index d58163c..7231fc0 100644
--- a/src/payment/success/success.vue
+++ b/src/payment/success/success.vue
@@ -1,8 +1,8 @@
 <!--
  * @Author: 王文杰
  * @Date: 2024-01-25 10:55:51
- * @LastEditors: 王文杰
- * @LastEditTime: 2024-03-16 10:09:50
+ * @LastEditors: jevononlie 728254585@qq.com
+ * @LastEditTime: 2024-05-29 12:52:50
  * @FilePath: /app-nx-recycle/src/payment/success/success.vue
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 -->
@@ -19,7 +19,6 @@ const gotoHome = () => {
       <view class="status">
         <image class="img" src="/static/images/success_result.png" mode="scaleToFill" />
         <view class="text">结算成功</view>
-        <!-- <view class="desc">当前剩余3个订单未处理，请尽快处理</view> -->
       </view>
       <view class="action" @click="gotoHome"> 回到首页 </view>
     </view>
@@ -30,11 +29,13 @@ const gotoHome = () => {
 page {
   height: 100%;
 }
+
 .viewport {
   height: 100%;
   display: flex;
   position: relative;
   flex-direction: column;
+
   // background-color: #3775F6;
   .cont {
     height: 100vh;
@@ -55,16 +56,19 @@ page {
         width: 120rpx;
         height: 120rpx;
       }
+
       .text {
         color: #3d3d3d;
         margin: 20rpx 0;
         font-size: 44rpx;
       }
+
       .desc {
         color: #999a9f;
         font-size: 30rpx;
       }
     }
+
     .action {
       background: linear-gradient(149deg, #51b6ff 19%, #3775f6 82%);
       width: 400rpx;
diff --git a/src/static/images/news_icon.png b/src/static/images/news_icon.png
deleted file mode 100644
index 9f9286c3f04622982ba82b265a6d400e2e6f7e12..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2813
zcmV<Z3Ig?sP)<h;3K|Lk000e1NJLTq0058x0058(1^@s6=SJeV00001b5ch_0Itp)
z=>Px#1am@3R0s$N2z&@+hyVZzr%6OXRCt{2oljC5$r8rDEWsNZJTW~dc=8FXS$NRS
z?GxBO0dN9~2;^Wlup<l;Pn=-H2?kDJu@jz!<r7%%1n!6jG)7YATS&rfK%hVMr@NKE
zjU%wBs>SEbud=eM06`E0K@bE%5GI0j4p!cdis;5Wtmp-SkCv{NYmFL(I_D75g;oLm
zzI9P2qP67DnE6OS)td)iL+4yVI?yVh)pwU)z$lKGszHoh5mLUeD4?4e+hEkZj&~&K
zE&C|zGxh~mix#6V<#!i5L4|$mYY?<yKLXu@_@wNjH3AXizf=7l(HawfSgl4M%3J>n
zbgoG-%Yx3qm^lQ^64W?gDg>+5%aDi<r3{dM^hO|smZqV6X8I#qjJ~W^FKgwkD9|*n
zpc$<KilI$FLwo>lzo$15Qrgg6i4M5OA9Rj+4=n(7DFdVftpWmo)#@ed9&-dC5g$US
zdUMZfTbfh2g$V(D0#MRD?!!ox+Z84RR0Hr<_qbysyEn^d7trtTE?yJU-@3=0kPw7A
z#dIQ3$t>Ch6ja!c7Nf7a$DJNYZzj<$Ai$LmdKd<WU{$;BULCe-ze;-3gptEkB0e!O
z?ko_<C*qx-7JvFGH6?u*i9pY*=OqR8$;8+?VQ{DjV!CI*h=73UPv+erUTGT43CQhs
zeioz@FagE{RNjt?+~Y5%#<zn+rN=NPARwK)u_=*blMxsdP`P@(&QO1uoWnlU0QguA
zbNd(-5RgSPJvJeLBVsz9=M-mLK;^BAI^X(MEN={pl&XuPW^KMwoOuD|!c0#BHNbrG
zt^2J$4;63Y0s`*;Vs$>~i^=PH^}PBeD*~FoD0GJqpjM3D(Mo6KI8S1-A|L=Lzq{CB
zrax@Wmtt<j)ai7Nv!3Rx2?)sbj%+IW<{Kvps=m}+YGpApSrt%uJ1TO_A4Ej=lF71w
zRRID0hO?`GT~?UsE&8AB2zSYhn5+wEhzMy+2<<dq*5yn<N&0=%>Mg*5>$Rku1`{7%
zUtc%UV!l%$pdsb$sE9aTm#Fk8scAV$m4K3zx1u0MyiP=~AYys|Y7lpKn+HEPoXqZG
z(n$y^>_-dHI*49LihBq*y-TSVP!bW-I8cKM*s#^NWVeu5J+A?3*yb7n)B^Z3F&$4@
zNc+BvQ!hkJ_Yog@os}Ka9?9NO##R(CJ$Q4+P*BIj^m!6NmA9e*Dh?R5CPm5wgm%pF
zn}7D7=)QI*F@+_jxccQLLNRe;`FgoAj-YPDB$4R`LcG!3e^NIywnb(>3nR2S=2Iqa
z6bgmLV|o62SwO^ON<?<g!Zdd$GB_kqi<ue<-P5aXw>7H3CSn4pKu>j>Yr6un(PTe}
zQbhDAMtpi-{x5GwMeg$Jx!cVV+Gp>VpXwdbB90o%LI7<5r!nHz?bJ7Kr2*Zk%z7Ot
zCEtqm4LWg)!KX^8R&&p52Nm`&7B5~a6xIMPA&(Vs=99C7mDjq4vo4_2ek(?3Bj(Ql
zHCS<5Db?!rdI2#7c{)xZ;Iz5F9OxQP>qX;ZQ7AOfvvm*W1TcyqDgt;#OyC|vk!myZ
zDHyw?*pFirvo0nEe$hFelcS7Ge=A040{|F4vM40YDa`(BJpizvcAU(s14eOB%gUa3
zp!GEY0FDII-1FMZeB@&8xkstG*5PyxHqpdcjzXD*9<AO_iZcN<_q;X{@4A|Q9$|_P
zb&u)1A4t9xvjc;}kNYdX>K@lw1R6q$Ub<exT)?VkVp!(_l2m4e@Va}YJ$(Tw5D)+~
z->>WdRCm3Oyh6mrE>};5fB?YjENw#ngLML-y>z{7Bz*xX5>TT?Ar<J&O{G`R0&%=+
zvM<{CF6=ggmXE*T{=_~9P~&XhGrCDhO#~X!-1FLA$9vho4ON&0Vi@0?q%Hy_kxQv&
z!F==qQW$}fG~ci6P=TIGG@2Y6(FaI*1WNKlQ#^4|s@J1o=A(}XE9*Aq%8Y>SBdD-{
zwRGk8dOg2TDEI&n$Fa}McUmnJE1%TepHBkE6tdzHfqr2|k&w!^j?n9PPi@`Wk!b<x
zX3!H|B%-1MO3dUFP#SdcWnx!I#Jl~%tR3vPv^wT_^}JLl6nyS-i4^-BqeMhL1J5Ev
zzJdZ67&hIeu=#d0hKq*xkxKz3MFK+cb`;?r0|YQr|4+y3)dlx>)Aof^nNMNm?I_?b
zmjDhx^lxM&)#%60w*5Alj6gw!{mX^R8WF7xqe%|_FU&-Y-lmIrQ(XrdMYI_0%;(!1
zBOugFUg7c(nG_JsZJN55@Z0q_XZ=)}6c9_>$9EXJF0cH}q=2YER=29@g&JoEcDL=f
z$)td!4YrT1^R5Ti;CcbGkdm7|91$O$?LVowUPUG&(2zOqU<|#Ez2l09$h3f(dtRFq
zy_`D{F^smUPC}+r*pT^phs;gIc@&wBKttv!5~aa7C&`6?fI%<ywf9@TyBFibv^_wV
zixhU7TTd$F147%o_I^u?_ZgC#2$bY(|4D^F8|dHAnhRXCYK%iJ1q1-ieXmXhvYXNf
zZGcapUAXb#$3It&^^U2B+zJTj`=Yab?<E+UFcXbJFrN_OjTrH7XYZGvdY$EUof9xP
zH8r36$fXCmkD$VSw0N-ts5Q*i2;TysL5fbAdv^`(7_Smd24mCpdDlbCjev$s^I9|k
zr$AiC7!SOxZe3PD_>YdYns}N(H*+VTB!g)28o&$u_=!$Pz~^yAlVr6TebDt}0x`Wz
z+qV5Sb1fhftX40-Ld&;e>8d!7LIk9d=hgF)g8HOsxDYg(@#h|In%=!-vZ+3;C{}^S
z|C0XTHvB1x4?q6-#Q4@f*V}m8aQ}s$G|;lO^%nu@gz(Ds5&(o$pf|Rv){??B@w|Fo
zB9QZo7C7dOv;F0^t@$JZX+p6IT(7~!k%tIK6DjaNEf+n~A|OqWq8F~_W^n(8TL*}M
zG*I4-+}@ZLV?*~VJmVq)(m=1*3*61_w$(!fqyb_I98K-S_aqSkX~2>HaprrHh=69K
zRQc+=@IS=##+C0$A_AI`#l=N!FCdRkdcMw()A$(~UNt=F?{SYmVXC%|bhUZNQO1l6
z&YUJXcPej10cfg|_K*tLnBw=0At}rSDh{UkwY2!2BqAUOFsq4oZA84A7T=RZJdkDj
zUx!3rFp>XBm+wg;5y&!E3+E+FW}e$=^F2vKK(<jTnB<=m_ne(`je`itGL!h9zVG?D
zVQ@J!BOb^illh<Y`ko{bfh=;ha5bL)A+){DlJj$}aS#F7WX$>x#k7&et6c6w1Z0u1
z{10O@jrE>UhzGL7nEvPZY=1cuscVQtAWJ;ze+X@_<E6IVGYS!qCF1@KAS20=?@1y8
zvIG%=k$;&n-;+c<kOdy`KbiAANhAVU-~s=WN#B!11Z081EogU$5nH<i!4x7OE6}q$
zKVodUdgoLp;(-h^@IPN~{W#OUCy7KL!wme-cQRV<8HEVQFt_VJF=yZRB$2N&4D&<%
zhq3w3LH2!567fI=`O*JS{cJx!scVR&FoWFqpMHPOrsL%pK?G!wLH#ErMKAN@dy<HN
zj6%=A*iCa&ypU3Y3j3?o=r7mnFpWeYLtHIg`FZs{f*=TjAP9mW%)tKvR5#+XcL7Zn
P00000NkvXXu0mjf@V+un

diff --git a/src/static/images/order_auto_my.png b/src/static/images/order_auto_my.png
deleted file mode 100644
index 35e8954902f68a3073f60c1207bdc23d789d0a05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2640
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