Merge branch 'master' into zhangtao

src/api/api.type.d.ts

@@ -1308,6 +1308,10 @@ namespace Api {
     [property: string]: any
   }
   interface OrderRefundDetails {
+    /**
+     * 用户实际退款金额
+     */
+    userRefundMoney?: number
     /**
      * 申请时间
      */
@@ -1414,6 +1418,18 @@ namespace Api {
      */
     shipTime?: string
     updateTime?: string
+    /**
+     * 退款时过期的积分
+     */
+    refundExpiredScore?: number
+    /**
+     * 退款总积分
+     */
+    refundScore?: number
+    /**
+     * 退款金额
+     */
+    refundMoney?: number
     [property: string]: any
   }
   interface OrderRefundSkuVo {

src/components.d.ts

@@ -12,6 +12,7 @@ declare module 'vue' {
     GlobalMessage: typeof import('./components/GlobalMessage.vue')['default']
     GlobalToast: typeof import('./components/GlobalToast.vue')['default']
     PrivacyPopup: typeof import('./components/PrivacyPopup.vue')['default']
+    StatusTip: typeof import('./components/StatusTip.vue')['default']
     WdBadge: typeof import('wot-design-uni/components/wd-badge/wd-badge.vue')['default']
     WdButton: typeof import('wot-design-uni/components/wd-button/wd-button.vue')['default']
     WdCard: typeof import('wot-design-uni/components/wd-card/wd-card.vue')['default']

src/components/StatusTip.vue

@@ -0,0 +1,24 @@
+<script setup lang="ts">
+import { statusTipProps } from 'wot-design-uni/components/wd-status-tip/types'
+import { StaticUrl } from '@/config'
+
+const props = defineProps({ ...statusTipProps, image: { type: String, default: '' }, imageSize: { type: String, default: '248rpx' } })
+const imgs = computed(() => {
+  if (props.image)
+    return `${StaticUrl}/${props.image}`
+  return `${StaticUrl}/status-tip.png`
+})
+</script>
+
+<template>
+  <wd-status-tip v-bind="props">
+    <template #image>
+      <image
+        :style="{ width: imageSize, height: imageSize }"
+        :src="imgs"
+      />
+    </template>
+  </wd-status-tip>
+</template>
+
+<style lang="scss" scoped></style>

src/config/index.ts

@@ -7,8 +7,8 @@ const mapEnvVersion = {
   // develop: 'http://192.168.0.157:8080',
   // develop: 'http://192.168.1.253:8080',
   // develop: 'http://192.168.1.89:8080', // 田
-  // develop: 'http://47.109.84.152:8081',
-  develop: 'https://smqjh.api.zswlgz.com',
+  develop: 'http://47.109.84.152:8081',
+  // develop: 'https://smqjh.api.zswlgz.com',
   /**
    * 体验版
    */

src/pages.json

@@ -306,6 +306,22 @@
           }
         }
       ]
+    },
+    {
+      "root": "subPack-charge",
+      "pages": [
+        {
+          "path": "index/index",
+          "type": "page",
+          "name": "charge-index",
+          "islogin": false,
+          "style": {
+            "navigationStyle": "custom",
+            "navigationBarTitleText": "",
+            "backgroundColorBottom": "#fff"
+          }
+        }
+      ]
     }
   ]
 }

src/pages/index/index.vue

@@ -55,7 +55,7 @@ onReachBottom(() => {
 const navList = computed(() => {
   const list = [
     { icon: `${StaticUrl}/xsb.png`, title: '星闪豹', name: 'xsb-homeTabbar', show: true },
-    { icon: `${StaticUrl}/smqjh-index-cd.png`, title: '充电', name: '', show: !isOnlineAudit.value },
+    { icon: `${StaticUrl}/smqjh-index-cd.png`, title: '充电', name: '', show: !isOnlineAudit.value }, // !isOnlineAudit.value
     { icon: `${StaticUrl}/smqjh-sp.png`, title: '电影演出', name: '', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-vip.png`, title: '视频权益', name: '', show: !isOnlineAudit.value },
     { icon: `${StaticUrl}/smqjh-diancan.png`, title: '大牌点餐', name: '', show: !isOnlineAudit.value },
@@ -159,7 +159,7 @@ function handleGo() {
                 <view class="relative h120rpx w120rpx">
                   <image :src="item.icon" class="h120rpx w120rpx" />
                   <view
-                    v-if="item.title != '星闪豹'"
+                    v-if="item.name == ''"
                     class="linebg absolute left-0 top-0 h-full w-full flex items-center justify-center rounded-32rpx text-24rpx text-white font-semibold"
                   >
                     敬请期待

src/subPack-charge/components/charge-tab.vue

@@ -0,0 +1,34 @@
+<script lang="ts" setup>
+import { StaticUrl } from '@/config'
+</script>
+
+<template>
+  <view class="charge-footer">
+    <view class="ios flex items-center justify-center pb-20rpx -mt-26rpx">
+      <view class="img-box">
+        <image class="h-120rpx w-120rpx" :src="`${StaticUrl}/charge-qrCode.png`" />
+      </view>
+    </view>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+.charge-footer {
+  position: fixed;
+  width: 100%;
+  bottom: 0rpx;
+  border-radius: 32rpx 32rpx 0rpx 0rpx;
+  background: #FFFFFF;
+  box-shadow: 0rpx -6rpx 12rpx 2rpx rgba(0, 0, 0, 0.05);
+  .img-box{
+    border-radius: 50%;
+    width: 140rpx;
+    height: 140rpx;
+    background: #FFFFFF;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+      box-shadow: 0rpx -6rpx 12rpx 2rpx rgba(0, 0, 0, 0.05);
+  }
+}
+</style>

src/subPack-charge/components/search.vue

@@ -0,0 +1,52 @@
+<script lang="ts" setup>
+import { ref } from 'vue'
+import { StaticUrl } from '@/config'
+// 如果需要从外部传入动态文本，可以使用 props
+defineProps<{
+  initialMapModeText?: string
+}>()
+// 如果需要从外部传入点击事件处理方法，也可以定义 emit
+defineEmits<{
+  (e: 'mapModeClick'): void
+}>()
+// 定义动态文本
+const mapModeText = ref('地图模式')
+// 定义点击事件处理方法
+function onMapModeClick() {
+  // 在这里添加点击逻辑
+  console.log('地图模式被点击')
+  // 示例：切换显示文本
+  // mapModeText.value = mapModeText.value === '地图模式' ? '列表模式' : '地图模式'
+}
+</script>
+
+<template>
+  <view class="flex items-center justify-between">
+    <view class="search-box flex items-center">
+      <view class="mr-16rpx flex items-center">
+        <image :src="`${StaticUrl}/location-black.png`" class="h33.8rpx min-w28.97rpx w28.97rpx" />
+        <text class="ml-1">
+          贵阳
+        </text>
+      </view>
+      <view class="h-36rpx border-2rpx border-#AAAAAA border-solid" />
+      <view class="ml-16rpx text-#AAAAAA">
+        请输入目的地/电站名
+      </view>
+    </view>
+    <view class="search-box flex items-center gap-20rpx" @click="onMapModeClick">
+      <image :src="`${StaticUrl}/charge-map.png`" class="h-40rpx w-40rpx" mode="" />
+      <text>
+        {{ mapModeText }}
+      </text>
+    </view>
+  </view>
+</template>
+
+<style scoped lang="scss">
+.search-box{
+background: rgba(255, 255, 255, 0.7);
+border-radius: 16rpx;
+padding: 10rpx 20rpx;
+}
+</style>

src/subPack-charge/index/index.vue

@@ -0,0 +1,219 @@
+<script setup lang="ts">
+import chargeSearch from '../components/search.vue'
+import chargeFooter from '../components/charge-tab.vue'
+import router from '@/router'
+import { StaticUrl } from '@/config'
+
+const { statusBarHeight, MenuButtonHeight, opcity, userInfo } = storeToRefs(useSysStore())
+const swiperList = ['https://www.keaitupian.cn/cjpic/frombd/2/253/1659552792/3869332496.jpg']
+definePage({
+  name: 'charge-index',
+  islogin: false,
+  style: {
+    navigationStyle: 'custom',
+    navigationBarTitleText: '',
+    backgroundColorBottom: '#fff',
+  },
+})
+const filterOptions = [
+  { key: 'nearest', label: '离我最近', widthClass: 'w-152rpx' },
+  { key: 'most-available', label: '空闲最多', widthClass: '' },
+  { key: 'lowest-price', label: '电费最低', widthClass: '' },
+]
+const activeFilter = ref('nearest')
+
+// 处理筛选项点击的方法
+function handleFilterClick(filterKey: string) {
+  activeFilter.value = filterKey
+  console.log(`选择了: ${filterKey}`)
+  // 根据不同筛选类型执行相应操作
+  switch (filterKey) {
+    case 'nearest':
+      // 执行距离排序逻辑
+      break
+    case 'most-available':
+      // 执行空闲数量排序逻辑
+      break
+    case 'lowest-price':
+      // 执行价格排序逻辑
+      break
+  }
+}
+</script>
+
+<template>
+  <view class="min-h-screen from-[#E2FF91] to-[rgba(158,214,5,0)] bg-gradient-to-b">
+    <wd-navbar
+      title="" :custom-style="`background-color: rgba(226, 255, 145, ${opcity})`" :bordered="false"
+      :z-index="99" safe-area-inset-top left-arrow fixed @click-left="router.back()"
+    >
+      <template #left>
+        <view class="flex items-center">
+          <wd-icon name="arrow-left" size="22px" color="#000" />
+          <view class="relative z-10 h62rpx w-full w180rpx opacity-100">
+            <image class="absolute left-0 top-0 h62rpx w180rpx" :src="`${StaticUrl}/charge-logo.png`" />
+          </view>
+        </view>
+      </template>
+    </wd-navbar>
+    <view :style="{ paddingTop: `${(Number(statusBarHeight) || 44) + MenuButtonHeight + 12}px` }" class="px24rpx">
+      <charge-search />
+      <view class="userInfo-card">
+        <view class="flex items-center gap-20rpx">
+          <image
+            class="h-100rpx w-100rpx"
+            :src="`${userInfo && userInfo?.avatarUrl ? userInfo.avatarUrl : `${StaticUrl}/charge-default-avatar.png`}`"
+          />
+          <view class="flex items-center gap-16rpx">
+            <view class="text-32rpx text-#2B303A font-bold">
+              {{ userInfo?.nickName || '游客' }}
+            </view>
+            <view class="text-24rpx text-#9ED605">
+              授权登录
+            </view>
+          </view>
+        </view>
+        <view class="mt-20rpx flex items-center justify-between gap-18rpx">
+          <view class="bg-#F3FFD1 p-24rpx">
+            <view class="flex items-center justify-between gap-48rpx text-28rpx text-#2B303A font-bold">
+              <view>我的积分</view>
+              <view>可用充电余额</view>
+            </view>
+            <view class="mt-24rpx flex items-center gap-30rpx text-40rpx text-#9ED605 font-bold">
+              <view class="flex items-center gap-20rpx">
+                <text>896</text>
+                <image class="h-48rpx w-48rpx" :src="`${StaticUrl}/charge-acc.png`" />
+              </view>
+              <view>
+                <text class="text-28rpx">
+                  ￥
+                </text>
+                89.6
+              </view>
+            </view>
+          </view>
+          <view class="flex items-center gap-20rpx bg-#F3FFD1 p-24rpx">
+            <view>
+              <view class="text-28rpx font-bold">
+                充电订单
+              </view>
+              <view class="mt-24rpx text-40rpx text-#9ED605 font-bold">
+                956
+              </view>
+            </view>
+            <image class="h-80rpx w-80rpx" :src="`${StaticUrl}/charge-order.png`" />
+          </view>
+        </view>
+      </view>
+      <view class="mt-24rpx">
+        <wd-swiper :list="swiperList" :height="100" :indicator="false" value-key="advertImg" />
+      </view>
+      <view class="mt-24rpx flex items-center gap-20rpx">
+        <view
+          v-for="option in filterOptions"
+          :key="option.key"
+          class="select-item h-60rpx w-152rpx text-28rpx line-height-[60rpx]" :class="[
+            option.widthClass,
+            { 'select-item-active': activeFilter === option.key },
+          ]"
+          @click="handleFilterClick(option.key)"
+        >
+          {{ option.label }}
+        </view>
+      </view>
+      <view>
+        <view class="relative mt-24rpx rounded-16rpx bg-#FFFFFF p-24rpx">
+          <image
+            class="absolute right-0 top-0 h-52rpx w-186rpx"
+            :src="`${StaticUrl}/charge-firm-tag.png`"
+          />
+          <view class="text-32rpx text-#2B303A font-bold">
+            贵阳花果园购物中心充电站
+          </view>
+          <view class="mt-20rpx text-24rpx text-#aaa">
+            充电减免2小时停车费，超出部分按每小时3元计算
+          </view>
+          <view class="mt-24rpx flex items-center rounded-16rpx bg-[linear-gradient(90deg,rgba(170,255,235,0.3)_0%,rgba(175,247,252,0.2)_43.57%,rgba(139,232,252,0)_100%)] p-20rpx">
+            <view class="flex items-center gap-16rpx">
+              <view class="h-40rpx w-40rpx rounded-8rpx bg-[linear-gradient(180deg,#4FEF86_0%,#00AA3A_100%)] text-center text-28rpx text-#FFF font-bold line-height-[40rpx]">
+                快
+              </view>
+              <view class="flex items-center">
+                <text class="text-32rpx font-bold">
+                  12
+                </text>
+                <text class="text-24rpx text-#AAAAAA">
+                  /12
+                </text>
+              </view>
+            </view>
+            <view class="ml-40rpx flex items-center gap-16rpx">
+              <view class="h-40rpx w-40rpx rounded-8rpx bg-[linear-gradient(180deg,#8EB1FF_0%,#3071FF_100%)] text-center text-28rpx text-#FFF font-bold line-height-[40rpx]">
+                慢
+              </view>
+              <view class="flex items-center">
+                <text class="text-32rpx font-bold">
+                  12
+                </text>
+                <text class="text-24rpx text-#AAAAAA">
+                  /12
+                </text>
+              </view>
+            </view>
+            <view class="ml-150rpx h-44rpx w-148rpx flex items-center border-2rpx border-#3EB6F8 rounded-34rpx border-solid line-height-[44rpx]">
+              <view class="w-44rpx rounded-[34rpx_0rpx_0rpx_34rpx] bg-#3EB6F8 text-center">
+                <wd-icon name="location" size="16px" color="#FFF" />
+              </view>
+              <view class="text-24rpx text-#3EB6F8">
+                1.55km
+              </view>
+            </view>
+          </view>
+          <view class="mt-28rpx flex items-center justify-between">
+            <view class="relative flex">
+              <view class="absolute left-30rpx z-10 flex items-center -top-26rpx">
+                <text class="text-40rpx text-#FF6464 font-bold">
+                  1.0026
+                </text>
+                <text class="w-100rpx text-24rpx">
+                  元/度
+                </text>
+              </view>
+              <image
+                class="absolute h-60rpx w-365rpx -top-30rpx"
+                :src="`${StaticUrl}/to-charge-tag.png`"
+              />
+            </view>
+            <view class="text-24rpx text-#2B303A">
+              峰：10：00-13：00
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+    <chargeFooter />
+  </view>
+</template>
+
+<style scoped lang="scss">
+.userInfo-card {
+  background: #FFFFFF;
+  box-shadow: inset 0rpx 20rpx 40rpx 2rpx rgba(158, 214, 5, 0.2);
+  border-radius: 16rpx;
+  padding: 24rpx;
+  margin-top: 24rpx;
+}
+.select-item{
+background: #FFFFFF;
+border-radius: 16rpx;
+color: #2B303A;
+text-align: center;
+}
+.select-item-active{
+background: #9ED605;
+box-shadow: inset 0rpx 20rpx 40rpx 2rpx rgba(100,255,218,0.26);
+border-radius: 0rpx 16rpx 0rpx 16rpx;
+font-weight: bold;
+color: #FFFFFF;
+}
+</style>

src/subPack-common/addressList/index.vue

@@ -73,7 +73,7 @@ async function handleEditAddress(item: Api.addressList) {
         </view>
         <view class="ios h120rpx" />
       </wd-radio-group>
-      <wd-status-tip v-if="!addresses.length" image="content" tip="暂无内容" />
+      <StatusTip v-if="!addresses.length" tip="暂无内容" />
     </view>
 
     <view class="ios fixed bottom-0 left-0 box-border w-full rounded-t-32rpx bg-white px24rpx">

src/subPack-common/afterSalesDetail/index.vue

@@ -27,6 +27,12 @@ async function handleCancel() {
   await handleCommonRefundOrderCancel(refundNumber.value)
   getDetail(refundNumber.value)
 }
+function copyToClipboard(text: string) {
+  uni.setClipboardData({
+    data: text,
+    showToast: true,
+  })
+}
 </script>
 
 <template>
@@ -125,6 +131,12 @@ async function handleCancel() {
       <view class="mt20rpx text-24rpx text-#AAAAAA">
         申请通过后，将退回至原账户
       </view>
+      <view v-if="refundOrderInfo.returnMoneySts == refundStatus.ReturnCompleted" class="mt20rpx flex items-center text-24rpx text-#AAAAAA">
+        <view>退还金额：{{ refundOrderInfo.userRefundMoney }}</view>
+        <view class="ml20rpx">
+          退还积分：{{ refundOrderInfo.refundScore }}（已过期{{ refundOrderInfo.refundExpiredScore }}）
+        </view>
+      </view>
     </view>
     <view class="mt20rpx rounded-16rpx bg-white p24rpx">
       <view class="grid grid-cols-5 py24rpx text-28rpx text-#222">
@@ -268,7 +280,7 @@ async function handleCancel() {
             <text class="text-#222">
               {{ refundOrderInfo.orderNumber }}
             </text>
-            <view class="ml10rpx">
+            <view class="ml10rpx" @click="copyToClipboard(refundOrderInfo.orderNumber as string)">
               <wd-icon name="file-copy" size="22px" />
             </view>
           </view>
@@ -281,7 +293,7 @@ async function handleCancel() {
             <text class="text-#222">
               {{ refundNumber }}
             </text>
-            <view class="ml10rpx">
+            <view class="ml10rpx" @click="copyToClipboard(refundNumber)">
               <wd-icon name="file-copy" size="22px" />
             </view>
           </view>

src/subPack-common/afterSalesList/index.vue

@@ -85,7 +85,7 @@ async function handleCancel(item: Api.AppRefundOrderListVo) {
         </wd-button>
       </view>
     </view>
-    <wd-status-tip v-if="!refundList.length" image="content" tip="暂无内容" />
+    <StatusTip v-if="!refundList.length" tip="暂无内容" />
   </view>
 </template>
 

src/subPack-common/integral/index.vue

@@ -77,7 +77,7 @@ function handleScrollBottom() {
         </view>
         <view v-if="index < pointList.length - 1" class="mt24rpx h-2rpx w-full bg-#F0F0F0" />
       </view>
-      <wd-status-tip v-if="!pointList.length" image="content" tip="暂无内容" />
+      <StatusTip v-if="!pointList.length" tip="暂无内容" />
     </scroll-view>
   </view>
 </template>

src/subPack-smqjh/order/index.vue

@@ -216,7 +216,7 @@ async function handleAfterSale(item: Api.xsbOrderList) {
               </wd-button>
             </view>
           </template>
-          <template v-if="item.refundStatus != 2 && [subPackOrder?.OrderStatus.OrderCompleted, subPackOrder?.OrderStatus.OrderWaitDelivery, subPackOrder?.OrderStatus.OrderAccepted].includes(item.hbOrderStatus) ">
+          <template v-if="item.refundStatus != 2 || [subPackOrder?.OrderStatus.OrderCompleted, subPackOrder?.OrderStatus.OrderWaitDelivery, subPackOrder?.OrderStatus.OrderAccepted].includes(item.hbOrderStatus) ">
             <view class="mr20rpx">
               <wd-button size="small" plain type="info" @click.stop="handleAfterSale(item)">
                 申请售后
@@ -225,7 +225,7 @@ async function handleAfterSale(item: Api.xsbOrderList) {
           </template>
         </view>
       </view>
-      <wd-status-tip v-if="!orderList.length" image="content" tip="暂无内容" />
+      <StatusTip v-if="!orderList.length" tip="暂无内容" />
     </view>
     <view class="h-20rpx" />
   </view>

src/subPack-xsb/commonTab/components/classfiy.vue

@@ -550,7 +550,7 @@ function handlePay() {
                 </view>
               </view>.
             </view>
-            <wd-status-tip v-else image="content" tip="暂无内容" />
+            <StatusTip v-else tip="暂无内容" />
             <view v-if="goodsLoading == 'finished' || isTopLoading" class="h-40vh" />
           </scroll-view>
           <view v-if="goodsLoading == 'loading' || isTopLoading" class="absolute left-0 top-0 z-10 h-full w-full flex items-center justify-center bg-white">
@@ -647,7 +647,7 @@ function handlePay() {
             </view>
           </view>
         </view>
-        <wd-status-tip v-if="!cartList.length" image="content" tip="暂无内容" />
+        <StatusTip v-if="!cartList.length" tip="暂无内容" />
 
         <view class="h320rpx" />
       </view>

src/subPack-xsb/confirmOrder/index.vue

@@ -205,7 +205,7 @@ async function handlePay() {
           </view>
         </view>
         <view class="w180rpx">
-          <wd-button size="large" :loading="isPay" :disabled="isPay" @click="handlePay">
+          <wd-button size="large" :loading="isPay" loading-color="#9ED605" @click="handlePay">
             立即支付
           </wd-button>
         </view>

src/subPack-xsb/goods/index.vue

@@ -157,7 +157,7 @@ async function handleAddCart() {
           </view>
         </template>
       </wd-swiper>
-      <view class="header view-0 relative z-3 rounded-t-32rpx px24rpx pt24rpx -mt30rpx">
+      <view class="view-0 header relative z-3 rounded-t-32rpx px24rpx pt24rpx -mt30rpx">
         <view class="flex items-center justify-between">
           <view class="flex items-end text-#FF4D3A font-semibold">
             <view class="text-24rpx">
@@ -357,7 +357,7 @@ async function handleAddCart() {
 
           <view class="flex items-center">
             <view class="w220rpx">
-              <wd-button plain hairline block @click="selectGoods = true">
+              <wd-button hairline plain block @click="selectGoods = true">
                 加入购物车
               </wd-button>
             </view>
@@ -373,12 +373,12 @@ async function handleAddCart() {
         <template #footer>
           <view class="box-border w-full flex items-center justify-between py20rpx">
             <view class="w-48%">
-              <wd-button plain hairline block :loading="isLoging" :disabled="isLoging" @click="handleAddCart">
+              <wd-button plain hairline block :loading="isLoging" loading-color="#9ED605" @click="handleAddCart">
                 加入购物车
               </wd-button>
             </view>
             <view class="w-48%">
-              <wd-button block :loading="isLoging" :disabled="isLoging" @click="handleConfimOrder">
+              <wd-button block :loading="isLoging" loading-color="#9ED605" @click="handleConfimOrder">
                 立即购买
               </wd-button>
             </view>

src/subPack-xsb/order/index.vue

@@ -199,7 +199,7 @@ async function handleAfterSale(item: Api.xsbOrderList) {
               </wd-button>
             </view>
           </template>
-          <template v-if="item.refundStatus != 2 && [OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(item.hbOrderStatus) ">
+          <template v-if="item.refundStatus != 2 || [OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(item.hbOrderStatus) ">
             <view class="mr20rpx">
               <wd-button size="small" plain type="info" @click.stop="handleAfterSale(item)">
                 申请售后
@@ -209,7 +209,7 @@ async function handleAfterSale(item: Api.xsbOrderList) {
         </view>
       </view>
     </view>
-    <wd-status-tip v-if="!orderList.length" image="content" tip="暂无内容" />
+    <StatusTip v-if="!orderList.length" tip="暂无内容" />
     <view class="h-20rpx" />
   </view>
 </template>

src/subPack-xsb/orderDetaile/index.vue

@@ -15,14 +15,6 @@ definePage({
     navigationBarTitleText: '订单详情',
     navigationStyle: 'custom',
   },
-
-  plugins: {
-    logisticsPlugin: {
-      version: '2.1.12',
-      provider: 'wx9ad912bf20548d92',
-    },
-  },
-
 })
 const collapse = ref(true)
 const orderInfo = ref<Api.xsbOrderList>()
@@ -398,7 +390,7 @@ async function handleReceive() {
             </Zcontact>
           </view>
           <view
-            v-if="[OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(orderInfo.hbOrderStatus)"
+            v-if="orderInfo.refundStatus == 2 || [OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(orderInfo.hbOrderStatus)"
             class="flex flex-col items-center" @click="handleAfterSale"
           >
             <image :src="`${StaticUrl}/orderDetaile-shou.png`" class="h40rpx w40rpx" />

src/subPack-xsb/search/index.vue

@@ -177,7 +177,7 @@ function handleSearchText(text: string) {
         </view>
       </view>
       <wd-loadmore v-if="data.length" :state="state" :loading-props="{ color: '#9ED605', size: 20 }" />
-      <wd-status-tip v-if="!data.length" image="search" tip="当前搜索无结果" />
+      <StatusTip v-if="!data.length" tip="当前搜索无结果" />
     </view>
     <view class="h30rpx" />
   </view>

src/uni-pages.d.ts

@@ -28,7 +28,8 @@ type _LocationUrl =
   "/subPack-common/revalue/index" |
   "/subPack-common/revalueSuccess/index" |
   "/subPack-common/user-center/index" |
-  "/subPack-smqjh/order/index";
+  "/subPack-smqjh/order/index" |
+  "/subPack-charge/index/index";
 
 interface NavigateToOptions {
   url: _LocationUrl;

vite.config.ts

@@ -27,6 +27,7 @@ export default async () => {
           'src/subPack-xsb',
           'src/subPack-common',
           'src/subPack-smqjh',
+          'src/subPack-charge',
         ],
         /**
          * 排除的页面，相对于 dir 和 subPackages