Merge remote-tracking branch 'yudao/develop' into dev

pages/activity/point/list.vue

@@ -60,7 +60,7 @@
 
   // 加载更多
   function loadMore() {
-    if (loadStatus !== 'noMore') {
+    if (loadStatus.value !== 'noMore') {
       activityPageParams.pageNo += 1;
       getActivityList();
     }

pages/commission/goods.vue

@@ -63,7 +63,7 @@
   import { showShareModal } from '@/sheep/hooks/useModal';
   import SpuApi from '@/sheep/api/product/spu';
   import BrokerageApi from '@/sheep/api/trade/brokerage';
-  import { fen2yuan } from '../../sheep/hooks/useGoods';
+  import { fen2yuan } from '@/sheep/hooks/useGoods';
 
   const state = reactive({
     pagination: {
@@ -104,19 +104,29 @@
       pageSize: state.pagination.pageSize,
       pageNo: state.pagination.pageNo,
     });
+
     if (code !== 0) {
+      state.loadStatus = 'error'; // 处理错误状态
       return;
     }
+
+    // 使用 Promise.all 来等待所有佣金请求完成
+    await Promise.all(
+      data.list.map(async (item) => {
+        try {
+          const res = await BrokerageApi.getProductBrokeragePrice(item.id);
+          item.brokerageMinPrice = res.data.brokerageMinPrice;
+          item.brokerageMaxPrice = res.data.brokerageMaxPrice;
+        } catch (error) {
+          console.error(`获取商品【${item.name}】的佣金时出错：`, error);
+        }
+      }),
+    );
+
+    // 在所有请求完成后合并列表和更新状态
     state.pagination.list = _.concat(state.pagination.list, data.list);
     state.pagination.total = data.total;
     state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
-    // 补充分佣金额
-    data.list.forEach((item) => {
-      BrokerageApi.getProductBrokeragePrice(item.id).then((res) => {
-        item.brokerageMinPrice = res.data.brokerageMinPrice;
-        item.brokerageMaxPrice = res.data.brokerageMaxPrice;
-      });
-    });
   }
 
   onLoad(() => {

pages/commission/order.vue

@@ -128,7 +128,7 @@
     state.loadStatus = 'loading';
     let { code, data } = await BrokerageApi.getBrokerageRecordPage({
       pageSize: state.pagination.pageSize,
-      pageNo: state.pagination.pageSize,
+      pageNo: state.pagination.pageNo,
       bizType: 1, // 获得推广佣金
       status: state.currentTab > 0 ? state.currentTab : undefined,
     });

pages/goods/index.vue

@@ -85,7 +85,7 @@
                 <view class="price-text ss-m-r-16">
                   {{ fen2yuan(state.selectedSku.price || state.goodsInfo.price) }}
                 </view>
-                <view class="origin-price-text" v-if="state.goodsInfo.marketPrice > 0">
+                <view class="origin-price-text" v-if="state.goodsInfo.marketPrice > state.goodsInfo.price">
                   {{ fen2yuan(state.selectedSku.marketPrice || state.goodsInfo.marketPrice) }}
                 </view>
               </view>
@@ -361,7 +361,7 @@
     // 选择有 promotionPrice 且最小的
     state.settlementSku = state.goodsInfo.skus
       .filter((sku) => sku.stock > 0 && sku.promotionPrice > 0)
-      .reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr));
+      .reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr), []);
 
     // 设置满减送活动
     if (data.rewardActivity) {

pages/goods/point.vue

@@ -7,7 +7,10 @@
     <detailSkeleton v-if="state.skeletonLoading" />
     <!-- 下架/售罄提醒 -->
     <s-empty
-      v-else-if="state.goodsInfo === null || state.goodsInfo.activity_type !== PromotionActivityTypeEnum.POINT.type"
+      v-else-if="
+        state.goodsInfo === null ||
+        state.goodsInfo.activity_type !== PromotionActivityTypeEnum.POINT.type
+      "
       text="活动不存在或已结束"
       icon="/static/soldout-empty.png"
       showAction
@@ -37,7 +40,9 @@
               ></image>
               <text class="point-text ss-m-r-16">
                 {{ getShowPrice.point }}
-                {{ !getShowPrice.price || getShowPrice.price === 0 ? '' : `+￥${getShowPrice.price}` }}
+                {{
+                  !getShowPrice.price || getShowPrice.price === 0 ? '' : `+￥${getShowPrice.price}`
+                }}
               </text>
             </view>
             <view class="sales-text">
@@ -87,21 +92,19 @@
           <button
             class="ss-reset-button btn-box ss-flex-col"
             @tap="state.showSelectSku = true"
-            :class="
+            :class="state.goodsInfo.stock != 0 ? 'check-btn-box' : 'disabled-btn-box'"
-             state.goodsInfo.stock != 0
-                ? 'check-btn-box'
-                : 'disabled-btn-box'
-            "
             :disabled="state.goodsInfo.stock === 0"
           >
             <view class="price-box ss-flex">
               <image
                 :src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
-                style="width: 36rpx;height: 36rpx;margin: 0 4rpx;"
+                style="width: 36rpx; height: 36rpx; margin: 0 4rpx"
               ></image>
               <text class="point-text ss-m-r-16">
                 {{ getShowPrice.point }}
-                {{ !getShowPrice.price || getShowPrice.price === 0 ? '' : `+￥${getShowPrice.price}` }}
+                {{
+                  !getShowPrice.price || getShowPrice.price === 0 ? '' : `+￥${getShowPrice.price}`
+                }}
               </text>
             </view>
             <view v-if="state.goodsInfo.stock === 0">已售罄</view>
@@ -135,8 +138,7 @@
   const seckillBg = sheep.$url.css('/static/img/shop/goods/seckill-tip-bg.png');
   const grouponBg = sheep.$url.css('/static/img/shop/goods/groupon-tip-bg.png');
 
-  onPageScroll(() => {
+  onPageScroll(() => {});
-  });
   const state = reactive({
     skeletonLoading: true,
     goodsInfo: {},
@@ -178,6 +180,7 @@
         title: activity.value.name,
         image: sheep.$url.cdn(state.goodsInfo.picUrl),
         params: {
+          // TODO @puhui：page 相关，要不搞个枚举，然后都弄过去；
           page: '6',
           query: activity.value.id,
         },

pages/index/components/first-two.vue

@@ -8,7 +8,7 @@
             <image class="goods-img" :src="item.picUrl" mode="aspectFit" />
           </view>
           <view class="goods-content">
-            <view class="goods-title ss-line-1 ss-m-b-28">{{ item.title }}</view>
+            <view class="goods-title ss-line-1 ss-m-b-28">{{ item.name }}</view>
             <view class="goods-price">￥{{ fen2yuan(item.price) }}</view>
           </view>
         </view>

pages/order/aftersale/list.vue

@@ -37,14 +37,14 @@
           <text class="_icon-forward"></text>
         </view>
         <view class="tool-btn-box ss-flex ss-col-center ss-row-right ss-p-r-20">
-          <!-- TODO 功能缺失：填写退货信息 -->
           <view>
             <button
               class="ss-reset-button tool-btn"
               @tap.stop="onApply(order.id)"
               v-if="order?.buttons.includes('cancel')"
-              >取消申请</button
             >
+              取消申请
+            </button>
           </view>
         </view>
       </view>

sheep/components/s-uploader/choose-and-upload-file.js

@@ -204,17 +204,22 @@ async function uploadFiles(choosePromise, { onChooseFile, onUploadProgress }) {
 
   // 如果是前端直连上传
   if (UPLOAD_TYPE.CLIENT === import.meta.env.SHOPRO_UPLOAD_TYPE) {
-    for (const file of files) {
+    // 为上传创建一组 Promise
+    const uploadPromises = files.map(async (file) => {
+      try {
         // 1.1 获取文件预签名地址
         const { data: presignedInfo } = await FileApi.getFilePresignedUrl(file.name);
         // 1.2 获取二进制文件对象
         const fileBuffer = await convertToArrayBuffer(file);
-      // 1.3 上传文件
+
-      await uni.request({
+        // 返回上传的 Promise
+        return new Promise((resolve, reject) => {
+          uni.request({
             url: presignedInfo.uploadUrl, // 预签名的上传 URL
             method: 'PUT', // 使用 PUT 方法
             header: {
-          'Content-Type': file.fileType + '/' + file.name.substring(file.name.lastIndexOf('.') + 1), // 设置内容类型
+              'Content-Type':
+                file.fileType + '/' + file.name.substring(file.name.lastIndexOf('.') + 1), // 设置内容类型
             },
             data: fileBuffer, // 文件的路径，适用于小程序
             success: (res) => {
@@ -223,13 +228,22 @@ async function uploadFiles(choosePromise, { onChooseFile, onUploadProgress }) {
               // 1.5. 重新赋值
               file.url = presignedInfo.url;
               console.log('上传成功:', res);
+              resolve(file);
             },
             fail: (err) => {
               console.error('上传失败:', err);
+              reject(err);
             },
           });
+        });
+      } catch (error) {
+        console.error('上传失败：', error);
+        throw error;
       }
-    return files;
+    });
+
+    // 等待所有上传完成
+    return await Promise.all(uploadPromises); // 返回已上传的文件列表
   } else {
     // 后端上传
     for (let file of files) {

sheep/components/s-uploader/s-uploader.vue

@@ -44,13 +44,7 @@
 
 <script>
   import { chooseAndUploadFile, uploadCloudFiles } from './choose-and-upload-file.js';
-  import {
+  import { get_extname, get_files_and_is_max, get_file_data } from './utils.js';
-    get_file_ext,
-    get_extname,
-    get_files_and_is_max,
-    get_file_info,
-    get_file_data,
-  } from './utils.js';
   import uploadImage from './upload-image.vue';
   import uploadFile from './upload-file.vue';
   import sheep from '@/sheep';
@@ -352,11 +346,10 @@
       /**
        * 选择文件并上传
        */
-      chooseFiles() {
+      async chooseFiles() {
         const _extname = get_extname(this.fileExtname);
         // 获取后缀
-        uniCloud
+        await chooseAndUploadFile({
-          .chooseAndUploadFile({
           type: this.fileMediatype,
           compressed: false,
           sizeType: this.sizeType,
@@ -587,7 +580,7 @@
             path: v.path,
             size: v.size,
             fileID: v.fileID,
-            url: v.path,
+            url: v.url,
           });
         });
         return newFilesData;

sheep/components/s-uploader/utils.js

@@ -17,12 +17,11 @@ export const get_file_ext = (name) => {
  */
 export const get_extname = (fileExtname) => {
   if (!Array.isArray(fileExtname)) {
-    let extname = fileExtname.replace(/(\[|\])/g, '');
+    let extname = fileExtname.replace(/([\[\]])/g, '');
     return extname.split(',');
   } else {
     return fileExtname;
   }
-  return [];
 };
 
 /**
@@ -91,7 +90,7 @@ export const get_file_data = async (files, type = 'image') => {
     extname: extname || '',
     cloudPath: files.cloudPath,
     fileType: files.fileType,
-    url: files.path || files.path,
+    url: files.url || files.path,
     size: files.size, //单位是字节
     image: {},
     path: files.path,

sheep/hooks/useGoods.js

@@ -416,7 +416,7 @@ export function appendSettlementProduct(spus, settlementInfos) {
     // 选择价格最小的 SKU 设置到 SPU 上
     const settlementSku = settlementInfo.skus
       .filter((sku) => sku.promotionPrice > 0)
-      .reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr));
+      .reduce((prev, curr) => (prev.promotionPrice < curr.promotionPrice ? prev : curr), []);
     if (settlementSku) {
       spu.promotionType = settlementSku.promotionType;
       spu.promotionPrice = settlementSku.promotionPrice;