空状态需要处理，需要添加分享页面

2025-12-26 17:42:07 +08:00
parent bb02cb22c0
commit dfc5888fa9
64 changed files with 11036 additions and 109 deletions
--- a/pages/discover/discover.vue
+++ b/pages/discover/discover.vue
@@ -14,6 +14,11 @@
  const onGo = item => {
    if (item === 'mall') {
      navigateTo('/pages/mall/list')
+      return
+    }
+    if (item === 'team') {
+      navigateTo('/pages/shop-together/index')
+      return
    }
  }
 </script>
--- a/pages/mall/confirm-order.vue
+++ b/pages/mall/confirm-order.vue
@@ -1,10 +1,10 @@
 <script setup>
  import { onLoad, onShow } from '@dcloudio/uni-app'
-  import { getProductDetail } from '@/api/mall'
+  import { getProductDetail, addOrder } from '@/api/mall'
  import { reactive, ref } from 'vue'
  import { formatRMB } from '@/utils'
  import { getUserAddress } from '@/api'
-  import { navigateTo } from '@/utils/router'
+  import { navigateTo, redirectTo } from '@/utils/router'

  const viewData = ref({})

@@ -63,7 +63,6 @@
    formData.spec = id
    priceData.value = price
    formData.total = price
-    console.log('111111111111111111111')
  }

  /** 数量切换 */
@@ -81,13 +80,18 @@
  }

  // 提交订单
-  const onConfirm = () => {
+  const onConfirm = async () => {
    const data = {
      addressId: topRessData.id,
      productId: viewData.value.id,
-      quantity: formData.num
+      quantity: formData.num,
+      skuId: formData.spec
    }
-    console.log(data, '提交订单')
+    const res = await addOrder(data)
+    redirectTo('/pages/shop-together/detail', {
+      id: res.data.groupId,
+      type: 'add'
+    })
  }

  onShow(() => {
@@ -121,7 +125,7 @@
    </view>

    <!-- 商品展示 -->
-    <view class="product-box">
+    <view class="public-product_item">
      <image
        :src="viewData.mainImage"
        mode="scaleToFill"
@@ -133,8 +137,8 @@
        </text>
        <view class="line-box">
          <view class="rmb-box">
-            <text>¥{{ viewData.maxPrice }}</text>
-            <text>¥{{ viewData.minPrice }}</text>
+            <text>¥{{ viewData.originalPrice || '' }}</text>
+            <text>¥{{ priceData }}</text>
          </view>
          <!-- 添加数量 -->
          <view class="add-num">
@@ -210,5 +214,6 @@
  page {
    background: #f9f9f9;
  }
+  @import '@/styles/mall.scss';
  @import './styles/confirm-order.scss';
 </style>
--- a/pages/mall/styles/confirm-order.scss
+++ b/pages/mall/styles/confirm-order.scss
@@ -48,76 +48,6 @@
  }

  // 商品展示
-  .product-box {
-    margin: 16rpx 0;
-    padding: 32rpx;
-    border-radius: 32rpx;
-    background: #ffffff;
-    display: flex;
-    align-items: center;
-
-    .left-img {
-      width: 192rpx;
-      height: 192rpx;
-      border-radius: 8rpx;
-      flex-shrink: 0;
-      margin-right: 32rpx;
-    }
-    .right-content {
-      width: 100%;
-      height: 192rpx;
-      display: flex;
-      flex-direction: column;
-      justify-content: space-between;
-      font-family: PingFang SC, PingFang SC;
-      font-style: normal;
-      text-transform: none;
-      .product-name {
-        font-weight: bold;
-        font-size: 32rpx;
-        color: #333333;
-
-        display: -webkit-box;
-        -webkit-box-orient: vertical;
-        box-orient: vertical;
-        -webkit-line-clamp: 2;
-        line-clamp: 2; 
-        overflow: hidden;
-        text-overflow: ellipsis;
-        word-break: break-word;
-        overflow-wrap: break-word;
-      }
-
-      .line-box {
-        display: flex;
-        justify-content: space-between;
-        align-items: flex-end;
-        .rmb-box {
-          display: flex;
-          flex-direction: column;
-          text {
-            font-weight: 500;
-            font-size: 32rpx;
-            color: #eb3c39;
-            // 第一个
-            &:first-child {
-              font-size: 24rpx;
-              color: #999999;
-              text-decoration-line: line-through;
-            }
-          }
-        }
-
-        .add-num {
-          display: flex;
-          align-items: center;
-          .uni-number-box {
-            width: 120rpx;
-          }
-        }
-      }
-    }
-  }

  // 规格
  .spec-box {
--- a/pages/shop-together/detail.vue
+++ b/pages/shop-together/detail.vue
@@ -0,0 +1,118 @@
+<script setup>
+  import { onLoad } from '@dcloudio/uni-app'
+  import { GROUP_STATUS } from '@/constants/mall-data'
+  import { getGroupDetail } from '@/api/mall'
+  import { navigateBack, redirectTo } from '@/utils/router'
+  import { ref } from 'vue'
+
+  const viewData = ref({})
+  const topUser = ref({})
+  const participants = ref([])
+  const loading = ref(true)
+
+  const getData = async id => {
+    const res = await getGroupDetail(id)
+    viewData.value = res.data
+    participants.value = res.data.participants.filter(
+      v => v.roleType == 2
+    )
+    topUser.value = res.data.participants.find(v => v.roleType == 1)
+    loading.value = false
+  }
+
+  const onShare = () => {
+    console.log('分享')
+  }
+
+  onLoad(e => {
+    getData(e.id)
+  })
+</script>
+
+<template>
+  <view>
+    <cb-loading v-if="loading"></cb-loading>
+    <view v-else class="shop-together">
+      <!-- 顶部用户信息 -->
+      <view class="top-user">
+        <view class="state-box">发起人</view>
+        <view class="left-box">
+          <image
+            src="https://wx1.sinaimg.cn/mw690/92eeb099gy1i29hl0ne80j21jk2bcash.jpg"
+            mode="scaleToFill"
+            class="avatar"
+          ></image>
+          <view class="name-box">
+            <text>{{ topUser.userName }}</text>
+            <text>ID:{{ topUser.userId }}</text>
+          </view>
+        </view>
+        <view class="right-box">
+          <text>
+            {{
+              viewData.status === 1
+                ? viewData.commissionAmount
+                : (viewData.commissionRate / 100) * viewData.groupPrice
+            }}
+          </text>
+          <text>积分</text>
+        </view>
+      </view>
+
+      <!-- 商品展示 -->
+      <view class="public-product_item">
+        <image
+          :src="viewData.productImage"
+          mode="scaleToFill"
+          class="left-img"
+        ></image>
+        <view class="right-content">
+          <text class="product-name">{{ viewData.productName }}</text>
+          <view class="line-box">
+            <view class="rmb-box">
+              <text></text>
+              <text>¥{{ viewData.groupPrice }}</text>
+            </view>
+            <view
+              :class="`_${GROUP_STATUS[viewData.status].class}`"
+              class="state-box"
+            >
+              {{ GROUP_STATUS[viewData.status].name }}
+            </view>
+          </view>
+        </view>
+      </view>
+
+      <!-- 人员列表 -->
+      <view :class="{ 'bottom-user-list': viewData.status == 0 }">
+        <view
+          v-for="item in participants"
+          :key="item.id"
+          class="bottom-list"
+        >
+          <view class="left-name">
+            <image
+              src="https://wx1.sinaimg.cn/mw690/92eeb099gy1i29hl0ne80j21jk2bcash.jpg"
+              mode="scaleToFill"
+              class="avatar"
+            ></image>
+            <text>{{ item.userName }}</text>
+          </view>
+          <text class="date">加入时间：{{ item.paidTime }}</text>
+        </view>
+      </view>
+      <!-- 底部按钮 -->
+      <bottom-view v-if="viewData.status == 0">
+        <cb-button @click="onShare">分享</cb-button>
+      </bottom-view>
+    </view>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+  page {
+    background: #f9f9f9;
+  }
+  @import '@/styles/mall.scss';
+  @import './styles/detail.scss';
+</style>
--- a/pages/shop-together/index.vue
+++ b/pages/shop-together/index.vue
@@ -0,0 +1,64 @@
+<script setup>
+  import { onLoad } from '@dcloudio/uni-app'
+  import { getMyGroupList } from '@/api/mall'
+  import { ref } from 'vue'
+  import { GROUP_STATUS } from '@/constants/mall-data'
+  import { navigateTo } from '@/utils/router'
+
+  const list = ref([])
+  const getData = async () => {
+    const res = await getMyGroupList()
+    list.value = res.data
+    console.log(res.data)
+  }
+
+  const onGo = id => {
+    navigateTo('/pages/shop-together/detail', { id })
+  }
+
+  onLoad(() => {
+    getData()
+  })
+</script>
+
+<template>
+  <view class="shop-together">
+    <view
+      v-for="item in list"
+      :key="item.id"
+      class="public-product_item"
+      @click="onGo(item.id)"
+    >
+      <image
+        :src="item.productImage"
+        mode="scaleToFill"
+        class="left-img"
+      ></image>
+      <view class="right-content">
+        <text class="product-name">{{ item.productName }}</text>
+        <view class="line-box">
+          <view class="rmb-box">
+            <text></text>
+            <text>¥{{ item.totalAmount }}</text>
+          </view>
+          <view
+            :class="`_${GROUP_STATUS[item.status].class}`"
+            class="state-box"
+          >
+            {{ GROUP_STATUS[item.status].name }}
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<style lang="scss" scoped>
+  page {
+    background: #f9f9f9;
+  }
+  @import '@/styles/mall.scss';
+  .shop-together {
+    padding: 16rpx 24rpx;
+  }
+</style>
--- a/pages/shop-together/styles/detail.scss
+++ b/pages/shop-together/styles/detail.scss
@@ -0,0 +1,113 @@
+.shop-together {
+  padding: 32rpx 26rpx;
+
+  .top-user {
+    position: relative;
+    background: #ffffff;
+    border-radius: 16rpx;
+    padding: 70rpx 32rpx 34rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-family: PingFang SC, PingFang SC;
+    font-style: normal;
+    text-transform: none;
+
+    .state-box {
+      position: absolute;
+      top: 0;
+      left: 0;
+      background: linear-gradient(180deg, #00d993 0%, #00d9c5 100%);
+      padding: 4rpx 16rpx;
+      border-radius: 16rpx 0rpx 16rpx 0rpx;
+      font-weight: bold;
+      font-size: 24rpx;
+      color: #ffffff;
+    }
+    .left-box {
+      display: flex;
+      align-items: center;
+      .avatar {
+        width: 100rpx;
+        height: 100rpx;
+        border-radius: 100rpx;
+        margin-right: 32rpx;
+      }
+      .name-box {
+        height: 100rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+        text {
+          font-weight: bold;
+          font-size: 32rpx;
+          color: #333333;
+          &:last-child {
+            font-weight: 500;
+            font-size: 24rpx;
+            color: #999999;
+          }
+        }
+      }
+    }
+
+    .right-box {
+      height: 100rpx;
+      display: flex;
+      flex-direction: column;
+      justify-content: space-between;
+      align-items: center;
+      text {
+        font-weight: bold;
+        font-size: 40rpx;
+        color: #00d9c5;
+        &:last-child {
+          font-weight: 500;
+          font-size: 28rpx;
+          color: #999999;
+        }
+      }
+    }
+  }
+
+  .bottom-user-list {
+    margin-bottom: 130rpx;
+  }
+
+  .bottom-list + .bottom-list {
+    margin-top: 16rpx;
+  }
+
+  .bottom-list {
+    background: #ffffff;
+    border-radius: 16rpx;
+    padding: 16rpx 32rpx;
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    font-family: PingFang SC, PingFang SC;
+    text-align: left;
+    font-style: normal;
+    text-transform: none;
+    font-weight: 500;
+
+    .left-name {
+      display: flex;
+      align-items: center;
+      .avatar {
+        width: 90rpx;
+        height: 90rpx;
+        border-radius: 90rpx;
+        margin-right: 20rpx;
+        text {
+          font-size: 28rpx;
+          color: #333333;
+        }
+      }
+    }
+    .date {
+      font-size: 24rpx;
+      color: #999999;
+    }
+  }
+}