1.6提交

This commit is contained in:
zoujiandong
2026-01-06 08:36:02 +08:00
parent 8025b2abab
commit 56c645a75c
42 changed files with 3902 additions and 2595 deletions
+24 -6
View File
@@ -1,6 +1,6 @@
<template>
<view class="coupon-page">
<uni-nav-bar
<!-- <uni-nav-bar
left-icon="left"
title="积分券"
@clickLeft="goBack"
@@ -9,7 +9,8 @@
height="180rpx"
:border="false"
backgroundColor="#ffffff"
/>
/> -->
<navBar :title="'积分券'" ></navBar>
<!-- 顶部 tabs -->
<view class="tabs">
@@ -43,7 +44,10 @@
</view>
</view>
</view>
<view v-else class="empty">暂无数据</view>
<empty v-else></empty>
<!-- <view v-else class="empty">暂无数据</view> -->
</scroll-view>
</view>
</template>
@@ -52,7 +56,8 @@
import { ref, computed, onMounted } from 'vue'
import navTo from '@/utils/navTo.js'
import api from '@/api/api.js'
import navBar from '@/components/navBar/navBar.vue'
import empty from '@/components/empty/empty.vue'
const tabs = [
{ label: '未兑换', value: '1' },
{ label: '已兑换', value: '2' },
@@ -124,11 +129,24 @@ const formatDate = (seconds) => {
<style scoped>
.coupon-page{background:#f5f5f5;min-height:100vh}
.tabs{display:flex;align-items:center;justify-content:space-around;height:88rpx;background:#fff;border-bottom:1px solid #f0f0f0}
.tabs{
position: fixed;
top: calc(var(--status-bar-height) + 44px);
left: 0;
right: 0;
z-index: 100;
display:flex;align-items:center;justify-content:space-around;height:88rpx;background:#fff;border-bottom:1px solid #f0f0f0}
.tab-item{flex:1;display:flex;align-items:center;justify-content:center}
.tab-text{font-size:28rpx;color:#999}
.tab-item.active .tab-text{color:#8B2316;font-weight:600}
.list{height:calc(100vh - 88rpx - 180rpx);}
.list{
position: fixed;
top: calc(var(--status-bar-height) + 44px + 88rpx);
left: 0;
right: 0;
z-index: 100;
height:calc(100vh - var(--status-bar-height) - 44px - 88rpx);
}
.card-wrap{padding:24rpx}
.coupon-card{display:flex;flex-direction: column; background:linear-gradient(90deg,#ff7381, #ff6a7a);border-radius:16rpx;color:#fff;position:relative;margin-bottom:24rpx}
.coupon-card.gray{background:#e5e5e5;color:#666}
+5 -4
View File
@@ -1,6 +1,7 @@
<template>
<view class="address-page">
<uni-nav-bar left-icon="left" title="收货地址" fixed color="#8B2316" height="180rpx" :border="false" backgroundColor="#ffffff" @clickLeft="goBack" />
<navBar :title="'收货地址'" />
<!-- <uni-nav-bar left-icon="left" title="收货地址" fixed color="#8B2316" height="180rpx" :border="false" backgroundColor="#ffffff" @clickLeft="goBack" /> -->
<scroll-view scroll-y class="content">
<view class="form-item">
@@ -35,8 +36,8 @@
</view>
</scroll-view>
<view class="footer-bar">
<view class="confirm-btn" @click="submit">确定</view>
<view class="footer-bar" @click="submit">
<view class="confirm-btn" >确定</view>
</view>
<!-- 省市区选择器 -->
@@ -205,7 +206,7 @@ const submit = () => {
<style scoped>
.address-page { min-height: 100vh; background: #fff; }
.content { position: absolute; top: 180rpx; bottom: 120rpx; left: 0; right: 0; background: #fff; }
.content { position: absolute; top: calc(var(--status-bar-height) + 44px); bottom: 120rpx; left: 0; right: 0; background: #fff; }
.form-item { display: flex; align-items: center; padding: 24rpx; }
.label { width: 160rpx; color: #333; font-size: 30rpx; }
.input { flex: 1; color: #333; font-size: 30rpx; }
+3 -2
View File
@@ -1,6 +1,7 @@
<template>
<view class="addr-list-page">
<uni-nav-bar left-icon="left" title="地址管理" fixed color="#8B2316" height="180rpx" :border="false" backgroundColor="#ffffff" @clickLeft="goBack" />
<navBar :title="'地址管理'" />
<!-- <uni-nav-bar left-icon="left" title="地址管理" fixed color="#8B2316" height="180rpx" :border="false" backgroundColor="#ffffff" @clickLeft="goBack" /> -->
<scroll-view scroll-y class="list-wrap">
<view v-if="!list.length" class="empty">暂无收货地址</view>
@@ -74,7 +75,7 @@ const select = (item) => {
<style scoped>
.addr-list-page { min-height: 100vh; background: #fff; }
.list-wrap { position: absolute; top: 180rpx; bottom: 120rpx; left: 0; right: 0; }
.list-wrap { position: absolute; top: calc(var(--status-bar-height) + 44px); bottom: 120rpx; left: 0; right: 0; }
.empty { text-align: center; color: #999; padding: 80rpx 24rpx; }
.addr-item { display: flex; align-items: center; justify-content: space-between; padding: 24rpx; border-bottom: 1rpx solid #f0f0f0; }
.addr-main { flex: 1; }
+4 -3
View File
@@ -1,6 +1,7 @@
<template>
<view class="exchange-page">
<uni-nav-bar left-icon="left" title="在线兑换" fixed color="#8B2316" height="180rpx" :border="false" backgroundColor="#ffffff" @clickLeft="goBack" />
<navBar :title="'在线兑换'" />
<!-- <uni-nav-bar left-icon="left" title="在线兑换" fixed color="#8B2316" height="180rpx" :border="false" backgroundColor="#ffffff" @clickLeft="goBack" /> -->
<scroll-view scroll-y class="content">
<!-- 收货地址 -->
@@ -168,7 +169,7 @@ const getTotalPoints = () => {
<style scoped>
.exchange-page { min-height: 100vh; background: #fff; }
.content { position: absolute; top: 180rpx; bottom: 120rpx; left: 0; right: 0; background: #fff; }
.content { position: absolute; top: calc(var(--status-bar-height) + 44px); bottom: 120rpx; left: 0; right: 0; background: #fff; }
.addr-card { background: #fff; padding: 24rpx; border-bottom: 1rpx solid #f0f0f0; }
.addr-header { display: flex; align-items: center; justify-content: space-between; margin-bottom: 12rpx; }
.addr-title { color: #333; font-size: 30rpx; }
@@ -178,7 +179,7 @@ const getTotalPoints = () => {
.addr-row.small { color: #666; font-size: 26rpx; }
.addr-empty { color: #bbb; font-size: 28rpx; }
.goods-title { padding: 24rpx; font-size: 32rpx; color: #333; line-height: 1.6; }
.price { padding: 0 24rpx 24rpx; color: #e74c3c; font-size: 30rpx; font-weight: 700; }
.price { padding: 0 24rpx 24rpx; color: #e74c3c; font-size: 30rpx; }
.divider { height: 16rpx; background: #f5f5f5; }
.section { padding: 24rpx; }
.section-label { color: #333; font-size: 30rpx; margin-bottom: 20rpx; }
+8 -5
View File
@@ -1,7 +1,7 @@
<template>
<view class="page">
<uni-nav-bar left-icon="left" title="我的兑换" fixed color="#8B2316" height="180rpx" :border="false" backgroundColor="#ffffff" @clickLeft="goBack" />
<!-- <uni-nav-bar left-icon="left" title="我的兑换" fixed color="#8B2316" height="180rpx" :border="false" backgroundColor="#ffffff" @clickLeft="goBack" /> -->
<navBar :title="'我的兑换'" />
<scroll-view
scroll-y
class="content"
@@ -10,8 +10,9 @@
@refresherrefresh="onRefresh"
@scrolltolower="onReachBottom"
:lower-threshold="80"
>
<view v-if="!orderList.length" class="empty">暂无兑换记录</view>
>
<empty v-if="!orderList.length" />
<!-- <view v-if="!orderList.length" class="empty">暂无兑换记录</view> -->
<view v-for="item in orderList" :key="item.uuid" class="card">
<view class="row">
<text class="label">兑换物品:</text>
@@ -35,6 +36,8 @@
<script setup>
import goods_api from '@/api/goods_api'
import { ref, onMounted } from 'vue'
import navBar from '@/components/navBar/navBar.vue'
import empty from '@/components/empty/empty.vue'
const orderList = ref([])
const page = ref(1)
const pageSize = ref(10)
@@ -99,7 +102,7 @@ const goBack = () => uni.navigateBack()
<style scoped>
.page { min-height: 100vh; background: #fff; }
.content { position: absolute; top: 180rpx; bottom: 0; left: 0; right: 0; background: #fff; }
.content { position: absolute; top: calc(var(--status-bar-height) + 44px); bottom: 0; left: 0; right: 0; background: #fff; }
.card { background: #fff; padding: 24rpx; border-bottom: 16rpx solid #f5f5f5; }
.row { display: flex; align-items: center; padding: 10rpx 0; }
.label { color: #333; font-size: 30rpx; width: 180rpx; }
File diff suppressed because it is too large Load Diff
+6 -5
View File
@@ -1,7 +1,7 @@
<template>
<view class="product-detail-container">
<!-- 顶部导航栏 -->
<uni-nav-bar
<!-- <uni-nav-bar
left-icon="left"
:title="navTitle"
@clickLeft="goBack"
@@ -10,13 +10,13 @@
height="180rpx"
:border="false"
backgroundColor="#ffffff"
/>
/> -->
<navBar :title="navTitle" />
<!-- 内容区 -->
<scroll-view scroll-y class="detail-scroll">
<!-- 商品主图轮播 -->
<view class="swiper-box">
<swiper class="detail-swiper" :indicator-dots="true" :autoplay="false" :interval="3000" :duration="400">
<swiper class="detail-swiper" :indicator-dots="true" :autoplay="false" :interval="3000" :duration="400" indicator-color="#ccc" indicator-active-color="#8B2316">
<swiper-item v-for="(img, idx) in images" :key="idx">
<image class="swiper-image" :src="img" mode="aspectFit"></image>
</swiper-item>
@@ -62,6 +62,7 @@ import { ref, computed } from 'vue'
import { onLoad } from '@dcloudio/uni-app'
import goods_api from '@/api/goods_api'
import docUrl from '@/utils/docUrl'
import navBar from '@/components/navBar/navBar.vue'
const product = ref({ id: '', title: '', price: 0, times: 0, content: '' })
const images = ref([])
@@ -116,7 +117,7 @@ const goExchange = () => {
.detail-scroll {
position: absolute;
top: 180rpx;
top: calc(var(--status-bar-height) + 44px);
left: 0;
right: 0;
bottom: 100rpx;