Merge remote-tracking branch 'refs/remotes/origin/h5' into h5

README.md

@@ -44,3 +44,7 @@ PC的老版本地址: https://puton.meidaojia.com/
 
 本地开发: http://172.16.18.38:3000/pages/fittingRoom/index
 
+
+【腾讯文档】PUTON美搭小程序-验收文档
+https://docs.qq.com/sheet/DS0pybm5Yc1ViakNj
+改成所有人可编辑了

pages/fittingRoom/index.vue

@@ -4,6 +4,7 @@
       <!--    https://ext.dcloud.net.cn/plugin?id=22930-->
       <hbxw-stack-carousel
         :key="fittingRoomStore.testResults"
+        :autoplay="false"
         :height="680"
         :interval="15000"
         :list="fittingRoomStore.testResults"
@@ -22,6 +23,17 @@
             />
           </view>
         </template>
+        <template #indicator="{ currentIndex, total, handleClick }">
+          <view class="custom-indicators">
+            <view
+              v-for="i in total"
+              :key="i"
+              :class="{ active: currentIndex === i - 1 }"
+              class="custom-indicator"
+              @click="handleClick(i - 1)"
+            ></view>
+          </view>
+        </template>
       </hbxw-stack-carousel>
       <s-select-mote />
       <Clothespic />
@@ -92,7 +104,7 @@
   // const template = computed(() => sheep.$store('app').template?.home);
 
   onLoad((options) => {
-    uni.setStorageSync('token', options?.token ?? 'e84526c0f7a3457da54e663fb4396beb');
+    uni.setStorageSync('token', options?.token ?? '92d2805a85ca422e90dd7d50eef49a85');
     console.log('🚀 ~ URL上的token  ~ options?.token: ', options?.token);
   });
 
@@ -178,4 +190,21 @@
     width: 550rpx;
     padding: 0 100rpx;
   }
+  .custom-indicators {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    .custom-indicator {
+      width: 10rpx;
+      height: 1px;
+      opacity: 0.5;
+      background: #fff;
+      margin: 0 5rpx;
+    }
+    .active {
+      width: 30rpx;
+      height: 1px;
+      background: #171717;
+    }
+  }
 </style>

sheep/store/fittingRoom.js

@@ -61,6 +61,7 @@ const fittingRoom = defineStore({
         pageSize: '30',
       });
       const result = httpResponse.data?.list ?? [];
+      result.reverse();
       // 将模特放到最后一张
       result.push({
         id: 100000,
@@ -69,7 +70,7 @@ const fittingRoom = defineStore({
           'https://tupian05.oss-cn-beijing.aliyuncs.com/digital_cloth/1758853865858.png',
         clothingImageUrl:
           'https://tupian05.oss-cn-beijing.aliyuncs.com/digital_cloth/1758795488865.jpg',
-        tryOnResultUrl: this.currentModel.thumbnailFileUrl,
+        tryOnResultUrl: this.currentModel.fileUrl,
         // "userId": 284,
         // "createTime": 1758857790000
       });

uni_modules/uni-grid/components/uni-grid-item/uni-grid-item.vue

@@ -117,8 +117,8 @@ export default {
 	/* #endif */
 	/* #ifndef APP-NVUE */
 	z-index: 0;
-	border-bottom: 1px #d2d2d2 solid;
-	border-right: 1px #d2d2d2 solid;
+	border-bottom: 0.5px #d2d2d2 solid;
+	border-right: 0.5px #d2d2d2 solid;
 	/* #endif */
 }
 .uni-grid-item--border-top {