2 Commits 7a9c7a2633 ... 9203d94f25

Tác giả SHA1 Thông báo Ngày
  zhangtao 9203d94f25 refactor(pages): 移除订单详情页面的物流插件配置 5 ngày trước cách đây
  zhangtao 95ad370cd2 feat(pages): 添加页面配置基础结构 1 tuần trước cách đây

+ 4 - 1
pages.config.ts

@@ -1,7 +1,9 @@
 import { defineUniPages } from '@uni-helper/vite-plugin-uni-pages'
 
 export default defineUniPages({
-  pages: [],
+  pages: [
+
+  ],
   globalStyle: {
     // 导航栏配置
     navigationBarBackgroundColor: '@navBgColor',
@@ -22,6 +24,7 @@ export default defineUniPages({
     animationType: 'pop-in',
     animationDuration: 300,
   },
+
   tabBar: {
     custom: true,
     // #ifdef MP-ALIPAY

+ 6 - 2
src/subPack-common/afterSalesDetail/index.vue

@@ -214,12 +214,16 @@ async function handleCancel() {
               <view class="text-24rpx text-#AAAAAA">
                 单价:¥{{ item.skuPrice }}
               </view>
+              <view class="text-24rpx text-#AAAAAA">
+                数量:{{ item.productCount }}
+              </view>
             </view>
           </view>
           <view class="mt24rpx h2rpx w-full bg-#F0F0F0" />
         </view>
       </CollapsePanel>
-
+    </view>
+    <view class="mt20rpx rounded-16rpx bg-white p24rpx">
       <view class="mt24rpx flex items-center justify-between">
         <view class="text-28rpx">
           商品金额
@@ -233,7 +237,7 @@ async function handleCancel() {
           配送费({{ refundOrderInfo.omsOrderVo.dvyType == 1 ? '快递' : '即时配送' }})
         </view>
         <view class="text-#FF4A39 font-semibold">
-          ¥{{ refundOrderInfo.omsOrderVo.freightAmount }}
+          ¥{{ refundOrderInfo.freightAmount }}
         </view>
       </view>
       <view class="mt24rpx flex items-center justify-between">

+ 1 - 1
src/subPack-common/afterSalesList/index.vue

@@ -65,7 +65,7 @@ async function handleCancel(item: Api.AppRefundOrderListVo) {
               ¥{{ item.refundProdMoney }}
             </view>
             <view class="text-center text-28rpx text-#AAAAAA">
-              共{{ item.refundProdList?.length }}件
+              共{{ item.refundProdNumber }}件
             </view>
           </view>
         </view>

+ 9 - 1
src/subPack-xsb/commonTab/components/classfiy.vue

@@ -182,6 +182,7 @@ async function handleSubCart(event: WechatMiniprogram.TouchEvent, item: Api.xsbC
         await useSmqjhCartStore().addCart(item.skuList[0].skuId, -1, Number(item.shopId), 'XSB')
         await getCartCategorList()
         setProductNum()
+        totalProduct.value = undefined
       },
     })
   }
@@ -540,7 +541,14 @@ function handlePay() {
                     </view>
                   </view>
                 </view>
-              </view>
+                <view v-if="!item.skuList.some((it) => it.saleStatus)" class="absolute left-0 top-0 z-1 h-full w-full flex items-center bg-[rgba(255,255,255,.6)]">
+                  <view class="h172rpx w172rpx flex items-center justify-center">
+                    <view class="h36rpx w112rpx flex items-center justify-center rounded-16rpx bg-[rgba(0,0,0,.6)] text-28rpx text-white">
+                      不可售
+                    </view>
+                  </view>
+                </view>
+              </view>.
             </view>
             <wd-status-tip v-else image="content" tip="暂无内容" />
             <view v-if="goodsLoading == 'finished' || isTopLoading" class="h-40vh" />

+ 5 - 0
src/subPack-xsb/components/goodsItem/index.vue

@@ -47,6 +47,11 @@ defineProps<{ itemGoods: Api.xsbCategoryProductList }>()
         商品已售罄
       </view>
     </view>
+    <view v-if="!itemGoods.skuList.some((it) => it.saleStatus)" class="mask absolute left-0 top-0 z-1 h-full w-full flex items-center justify-center">
+      <view class="h156rpx w156rpx flex items-center justify-center rounded-full bg-[rgba(0,0,0,.6)] text-28rpx text-white">
+        商品不可售
+      </view>
+    </view>
   </view>
 </template>
 

+ 1 - 2
src/subPack-xsb/confirmOrder/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { clearCart, getOrderPayMent, getWxCommonPayment, handleCommonPayMent, payError, paySuccess } from '../utils/confirm-order'
+import { clearCart, getOrderPayMent, getWxCommonPayment, handleCommonPayMent, paySuccess } from '../utils/confirm-order'
 import router from '@/router'
 
 definePage({
@@ -80,7 +80,6 @@ async function handlePay() {
     }
   }
   catch {
-    await payError()
     isPay.value = false
   }
 }

+ 8 - 0
src/subPack-xsb/orderDetaile/index.vue

@@ -15,6 +15,14 @@ definePage({
     navigationBarTitleText: '订单详情',
     navigationStyle: 'custom',
   },
+
+  plugins: {
+    logisticsPlugin: {
+      version: '2.1.12',
+      provider: 'wx9ad912bf20548d92',
+    },
+  },
+
 })
 const collapse = ref(true)
 const orderInfo = ref<Api.xsbOrderList>()

+ 5 - 0
src/subPack-xsb/search/index.vue

@@ -170,6 +170,11 @@ function handleSearchText(text: string) {
             商品已售罄
           </view>
         </view>
+        <view v-if="!item.skuList.some((it) => it.saleStatus)" class="absolute left-0 top-0 z10 h-full w-full flex items-center justify-center bg-[rgba(255,255,255,0.6)]">
+          <view class="flex items-center justify-center rounded-16rpx bg-[rgba(0,0,0,.6)] p8rpx text-28rpx text-white">
+            商品不可售
+          </view>
+        </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="当前搜索无结果" />