Explorar el Código

refactor(ui): 调整订单列表间距及首页图片样式

- 修改多个订单列表组件外边距从上边距改为下边距
- 首页替换banner图片,新增圆角样式
- 商品售罄状态下添加半透明遮罩及不可售提示
- 注释并更新开发环境接口地址配置
- 修复manifest.json多余括号格式问题
zhangtao hace 6 días
padre
commit
ecd1d39811

+ 2 - 2
src/config/index.ts

@@ -7,11 +7,11 @@ const mapEnvVersion = {
   // develop: 'http://192.168.0.157:8080',
   // develop: 'http://192.168.0.157:8080',
   // develop: 'http://192.168.1.253:8080',
   // develop: 'http://192.168.1.253:8080',
   // develop: 'http://192.168.0.19:8080', // 邓
   // develop: 'http://192.168.0.19:8080', // 邓
-  develop: 'http://192.168.0.217:8080', // 黄
+  // develop: 'http://192.168.0.217:8080', // 黄
   // develop: 'http://192.168.0.11:8080', // 王
   // develop: 'http://192.168.0.11:8080', // 王
   // develop: 'http://192.168.1.89:8080', // 田
   // develop: 'http://192.168.1.89:8080', // 田
   // develop: 'http://74949mkfh190.vicp.fun', // 付
   // develop: 'http://74949mkfh190.vicp.fun', // 付
-  // develop: 'http://47.109.84.152:8081',
+  develop: 'http://47.109.84.152:8081',
   // develop: 'https://5ed0f7cc.r9.vip.cpolar.cn',
   // develop: 'https://5ed0f7cc.r9.vip.cpolar.cn',
   // develop: 'https://smqjh.api.zswlgz.com',
   // develop: 'https://smqjh.api.zswlgz.com',
   /**
   /**

+ 11 - 1
src/pages/index/index.vue

@@ -222,7 +222,7 @@ function handleChangeSwiper(e: UniHelper.SwiperOnChangeEvent) {
       </view>
       </view>
 
 
       <view class="mt-20rpx w-full flex items-center justify-between">
       <view class="mt-20rpx w-full flex items-center justify-between">
-        <image :src="`${StaticUrl}/smqjh-fl.png`" class="h-346rpx w-344rpx flex-shrink-0" />
+        <image :src="`${StaticUrl}/smqjh-jy-banner.jpg`" class="h-346rpx w-344rpx flex-shrink-0 rounded-12rpx" />
         <view class="flex flex-1 flex-col items-end justify-center" @click="handleGo">
         <view class="flex flex-1 flex-col items-end justify-center" @click="handleGo">
           <image :src="`${StaticUrl}/smqjh-home-banner1.jpg`" class="h-180rpx w-344rpx rounded-12rpx" />
           <image :src="`${StaticUrl}/smqjh-home-banner1.jpg`" class="h-180rpx w-344rpx rounded-12rpx" />
           <image :src="`${StaticUrl}/smqjh-home-banner2.jpg`" class="mt-14rpx h-152rpx w-344rpx rounded-12rpx" />
           <image :src="`${StaticUrl}/smqjh-home-banner2.jpg`" class="mt-14rpx h-152rpx w-344rpx rounded-12rpx" />
@@ -288,6 +288,16 @@ function handleChangeSwiper(e: UniHelper.SwiperOnChangeEvent) {
                       商品已售罄
                       商品已售罄
                     </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 justify-center bg-[rgba(255,255,255,0.6)]"
+                  >
+                    <view
+                      class="h-156rpx w-156rpx flex items-center justify-center rounded-full bg-[rgba(0,0,0,.6)] text-28rpx text-white"
+                    >
+                      商品不可售
+                    </view>
+                  </view>
                 </view>
                 </view>
               </grid-view>
               </grid-view>
             </scroll-view>
             </scroll-view>

+ 1 - 1
src/subPack-smqjh/components/charge-orderList/charge-orderList.vue

@@ -30,7 +30,7 @@ function handleItemClick(item: Api.xsbOrderList) {
 </script>
 </script>
 
 
 <template>
 <template>
-  <view class="mt-20rpx mt20rpx rounded-16rpx bg-#FFF p-24rpx" @click="handleItemClick(order)">
+  <view class="mb-20rpx rounded-16rpx bg-#FFF p-24rpx" @click="handleItemClick(order)">
     <view class="flex items-center justify-between">
     <view class="flex items-center justify-between">
       <view>
       <view>
         <view class="text-28rpx font-bold">
         <view class="text-28rpx font-bold">

+ 1 - 1
src/subPack-smqjh/components/film-orderList/film-orderList.vue

@@ -127,7 +127,7 @@ function handleOrder(orderNo: string) {
   background: #FFFFFF;
   background: #FFFFFF;
   border-radius: 16rpx 16rpx 16rpx 16rpx;
   border-radius: 16rpx 16rpx 16rpx 16rpx;
   padding: 24rpx;
   padding: 24rpx;
-  margin-top: 20rpx;
+  margin-bottom: 20rpx;
 }
 }
 
 
   .order-item {
   .order-item {

+ 5 - 2
src/subPack-smqjh/components/xsb-orderList/xsb-orderList.vue

@@ -45,11 +45,14 @@ async function handleAfterSale(item: Api.xsbOrderList) {
     return
     return
   }
   }
   await useSysStore().getRefunOrder(item.orderNumber as string)
   await useSysStore().getRefunOrder(item.orderNumber as string)
+}
+async function handleTime(_order: Api.xsbOrderList) {
+
 }
 }
 </script>
 </script>
 
 
 <template>
 <template>
-  <view class="mt-20rpx rounded-16rpx bg-white p-24rpx">
+  <view class="mb-20rpx rounded-16rpx bg-white p-24rpx">
     <view class="flex items-center justify-between">
     <view class="flex items-center justify-between">
       <view class="flex items-center">
       <view class="flex items-center">
         <image :src="`${StaticUrl}/order-icon.png`" class="h-36rpx w-36rpx" />
         <image :src="`${StaticUrl}/order-icon.png`" class="h-36rpx w-36rpx" />
@@ -140,7 +143,7 @@ async function handleAfterSale(item: Api.xsbOrderList) {
           </wd-button>
           </wd-button>
         </view>
         </view>
       </template>
       </template>
-      <template v-if="order.refundStatus != 2 && [OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(order.hbOrderStatus) ">
+      <template v-if="order.refundStatus != 2 && [OrderStatus.OrderCompleted, OrderStatus.OrderWaitDelivery, OrderStatus.OrderAccepted].includes(order.hbOrderStatus) && handleTime(order)">
         <view class="mr-20rpx">
         <view class="mr-20rpx">
           <wd-button size="small" plain type="info" @click.stop="() => handleAfterSale(order)">
           <wd-button size="small" plain type="info" @click.stop="() => handleAfterSale(order)">
             申请售后
             申请售后