ext.liuqiwen3 3 days ago
parent
commit
a58906719f

+ 2 - 2
pages/goods/goods_details/index.vue

@@ -124,7 +124,7 @@
               <!-- 材质和克重行 -->
               <!-- 材质和克重行 -->
               <view class="material-row">
               <view class="material-row">
                 <view class="material-item" style="width: 60rpx;">
                 <view class="material-item" style="width: 60rpx;">
-                  <image style="width: 40rpx;" src="@/static/images/order.png" mode="widthFix"></image>
+                  <image style="width: 40rpx;height: 40rpx;" src="@/static/images/order.png" mode="widthFix"></image>
                 </view>
                 </view>
                 <view class="material-item">
                 <view class="material-item">
                   <text class="material-value">{{ metalTypeFormatter(productInfo.metalType) }}</text>
                   <text class="material-value">{{ metalTypeFormatter(productInfo.metalType) }}</text>
@@ -159,7 +159,7 @@
               <!-- 规格选择区域 -->
               <!-- 规格选择区域 -->
               <view class="spec-section">
               <view class="spec-section">
                 <view style="width: 60rpx;text-align: center;">
                 <view style="width: 60rpx;text-align: center;">
-                  <image style="width: 40rpx;" src="@/static/images/2-001.png" mode="widthFix"></image>
+                  <image style="width: 40rpx;height: 40rpx;" src="@/static/images/2-001.png" mode="widthFix"></image>
                 </view>
                 </view>
                   <view class="spec-info">
                   <view class="spec-info">
                   <view class="spec-label">请选择规格</view>
                   <view class="spec-label">请选择规格</view>

+ 2 - 2
pages/goods_cate/goods_cate.vue

@@ -76,8 +76,8 @@ const getAllCategory = async () => {
       newArr[index] = value
       newArr[index] = value
       if (value.child) newArr[index].child = value.child.filter(item => item.status === true)
       if (value.child) newArr[index].child = value.child.filter(item => item.status === true)
     })
     })
-    productList.value = newArr.filter(item => item.code !== 'bb_mall')
-
+    let listArr = newArr.filter(item => item.code !== 'bb_mall')
+    productList.value = listArr.sort((a, b) => a.sort - b.sort);
     if(query.value.id){
     if(query.value.id){
       const index = productList.value.findIndex(item => item.id === query.value.id);
       const index = productList.value.findIndex(item => item.id === query.value.id);
       tap(index,query.value.id)
       tap(index,query.value.id)

+ 2 - 1
pages/merchantCenters/components/merchant_cate.vue

@@ -76,7 +76,8 @@ const getAllCategory = async () => {
       newArr[index] = value
       newArr[index] = value
       if (value.child) newArr[index].child = value.child.filter(item => item.status === true)
       if (value.child) newArr[index].child = value.child.filter(item => item.status === true)
     })
     })
-    productList.value = newArr.filter(item => item.code !== 'bb_mall')
+    let listArr = newArr.filter(item => item.code !== 'bb_mall')
+    productList.value = listArr.sort((a, b) => a.sort - b.sort);
 
 
     // 使用 nextTick 确保 DOM 已更新
     // 使用 nextTick 确保 DOM 已更新
     nextTick(() => {
     nextTick(() => {

+ 9 - 2
pages/order_list/index.vue

@@ -11,7 +11,7 @@
               >
               >
               <text
               <text
                 >总消费:¥{{
                 >总消费:¥{{
-                  Number(orderDataState.sumPrice).toFixed(2) || 0
+                  formattedSumPrice
                 }}</text
                 }}</text
               >
               >
             </view>
             </view>
@@ -113,7 +113,7 @@
 </template>
 </template>
 
 
 <script setup>
 <script setup>
-import { ref, onMounted } from "vue";
+import { ref, onMounted,computed } from "vue";
 import { onShow,onLoad, onReachBottom } from "@dcloudio/uni-app";
 import { onShow,onLoad, onReachBottom } from "@dcloudio/uni-app";
 import OrderListCard from "@/components/OrderListCard";
 import OrderListCard from "@/components/OrderListCard";
 import { useAppStore } from "@/stores/app";
 import { useAppStore } from "@/stores/app";
@@ -305,6 +305,13 @@ function delOrder(order_id, index) {
       Toast({ title: err });
       Toast({ title: err });
     });
     });
 }
 }
+const formattedSumPrice = computed(() => {
+  const price = orderDataState.value.sumPrice;
+  if (price === null || price === undefined || price === '' || isNaN(price)) {
+    return '0.00';
+  }
+  return Number(price).toFixed(2);
+});
 </script>
 </script>
 
 
 <style scoped lang="scss">
 <style scoped lang="scss">

+ 5 - 4
pages/users/user_goods_collection/index.vue

@@ -48,7 +48,7 @@
       <view class='pictrue'>
       <view class='pictrue'>
         <image :src="HTTP_REQUEST_URL_IMG+'noCollection.png'"></image>
         <image :src="HTTP_REQUEST_URL_IMG+'noCollection.png'"></image>
       </view>
       </view>
-      <recommend :hostProduct="hostProduct"></recommend>
+<!--      <recommend :hostProduct="hostProduct"></recommend>-->
     </view>
     </view>
 
 
     <home></home>
     <home></home>
@@ -176,7 +176,7 @@ const setAllSelectValue = (status) => {
 // 授权回调
 // 授权回调
 const onLoadFun = () => {
 const onLoadFun = () => {
   get_user_collect_product();
   get_user_collect_product();
-  get_host_product();
+  // get_host_product();
 };
 };
 
 
 // 授权关闭
 // 授权关闭
@@ -208,7 +208,7 @@ const get_user_collect_product = async () => {
     collectProductList.value = Util.SplitArray(collectProductListData, collectProductList.value);
     collectProductList.value = Util.SplitArray(collectProductListData, collectProductList.value);
 
 
     if (collectProductList.value.length === 0) {
     if (collectProductList.value.length === 0) {
-      get_host_product();
+      // get_host_product();
     }
     }
 
 
     loadend.value = isLoadend;
     loadend.value = isLoadend;
@@ -290,7 +290,7 @@ onShow(() => {
 // 页面上拉触底
 // 页面上拉触底
 onReachBottom(() => {
 onReachBottom(() => {
   get_user_collect_product();
   get_user_collect_product();
-  get_host_product();
+  // get_host_product();
 });
 });
 </script>
 </script>
 
 
@@ -414,6 +414,7 @@ onReachBottom(() => {
 .noCommodity {
 .noCommodity {
   background-color: #fff;
   background-color: #fff;
   padding-top: 1rpx;
   padding-top: 1rpx;
+  padding-bottom: 30rpx;
   border-top: 0;
   border-top: 0;
 }
 }