Skip to content

G
groupPurchase-miniapp
Commit af140c96 authored by 陈宗胤（贵阳日报）'s avatar 陈宗胤（贵阳日报）
Browse files
Options

json改

parents c5ace5da 1d304314
Hide whitespace changes
Inline Side-by-side
Showing with 419 additions and 142 deletions
src/pages.json
View file @ af140c96
......@@ -10,21 +10,21 @@
"path": "pages/index/loading",
"style": {
"navigationBarTitleText": "加载",
"navigationStyle":"custom"
"navigationStyle": "custom"
}
},
{
"path": "pages/assistingAgriculture/searchPage/searchPage",
"style": {
"navigationBarTitleText": "搜索",
"navigationStyle":"custom"
"navigationStyle": "custom"
}
},
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "小程序平台",
"navigationStyle":"custom",
"navigationStyle": "custom",
"enablePullDownRefresh": true
}
},
......@@ -162,7 +162,7 @@
"style": {
"navigationBarTitleText": "商店首页",
"navigationBarBackgroundColor": "#ffffff",
"navigationStyle":""
"navigationStyle": "custom"
}
},
{
......@@ -194,7 +194,7 @@
"style": {
"navigationBarTitleText": "购物车",
"navigationBarBackgroundColor": "#ffffff",
"navigationStyle":""
"navigationStyle": "custom"
}
},
{
......@@ -202,23 +202,22 @@
"style": {
"navigationBarTitleText": "确认订单",
"navigationBarBackgroundColor": "#ffffff",
"navigationStyle":""
"navigationStyle": "custom"
}
},
{
"path": "pages/assistingAgriculture/RuralTravel/RuralTravel",
"style": {
"navigationBarTitleText": "乡村旅居",
"enablePullDownRefresh": true,
"enablePullDownRefresh": true
}
},
{
"path": "pages/assistingAgriculture/reviewDetails/reviewDetails",
"style": {
"navigationBarTitleText": "点评详情",
"navigationBarBackgroundColor": "#ffffff",
"navigationStyle":""
"navigationStyle": "custom"
}
},
{
......@@ -226,7 +225,7 @@
"style": {
"navigationBarTitleText": "景点详情",
"navigationBarBackgroundColor": "#ffffff",
"navigationStyle":"",
"navigationStyle": "custom",
"onReachBottomDistance": 50
}
},
......@@ -265,4 +264,4 @@
"globalStyle": {
"navigationStyle": "custom"
}
}
}
\ No newline at end of file
src/pages/assistingAgriculture/RouteDetails/RouteDetails.vue
View file @ af140c96
<template>
<div class="route-details">
<Search></Search>
<scroll-view class="container" scroll-y>
<img class="back-img" src="/static/assistingAgriculture/assets/left.png" @tap="back" />
<!-- <img class="back-img" src="/static/assistingAgriculture/assets/left.png" @tap="back" /> -->
<!-- 轮播 -->
<div class="banner">
<!-- -->
......@@ -541,6 +542,13 @@ uni-page-body {
background-color: #eaf9f1;
}
.route-details {
.searchComponent {
z-index: 55;
width: 100%;
position: fixed;
top: 0;
left: 0;
}
height: 100%;
display: flex;
flex-direction: column;
......
src/pages/assistingAgriculture/RuralTravel/RuralTravel.vue
View file @ af140c96
......@@ -3,12 +3,27 @@
<view class="container">
<view class="top">
<Search
background="rgba(255, 255, 255, 0.8)"
backIcon="black"
iconSrc="/static/assistingAgriculture/assets/left.png"
placeholderText="请输入要搜索的关键词"
@search="toSearch"
></Search>
style="position: fixed; top: 0; width: 100%"
:backgroundBox="backgroundBox"
:backIcon="backIcon"
>
<view class="searchBox" :style="{ border }">
<image
class="magnifyingGlass"
src="../../../static/index/magnifyingGlass.png"
mode="aspectFit|aspectFill|widthFix"
/>
<input
type="text"
class="text"
@confirm="toSearch"
placeholder="请输入要搜索的关键词"
@input="updateModelValue"
@keyup.enter="toSearch"
@focus="toSearch"
/>
</view>
</Search>
</view>
<view class="bac-img">
<img
......@@ -149,13 +164,15 @@
{{ tag.labelName }}
</wd-tag>
</view>
<view class="detail-score">
<text class="score">{{ item.score }}分</text>
<text class="num">月销{{ item.monthSoldNum }}</text>
</view>
<view class="venue">
<text class="place">{{ item.tripArea }}出发</text>
<text class="price">￥{{ item.price }}</text>
<view class="all-info">
<view class="detail-score">
<text class="score">{{ item.score }}分</text>
<text class="num">月销{{ item.monthSoldNum }}</text>
</view>
<view class="venue">
<text class="place">{{ item.tripArea }}出发</text>
<text class="price">￥{{ item.price }}</text>
</view>
</view>
</view>
</view>
......@@ -167,14 +184,14 @@
</template>
<script setup lang="ts">
import Search from '../../../components/assistingAgriculture/index/Search.vue';
import Search from '../../../components/index/Search.vue';
import Sort from '../../../components/assistingAgriculture/index/Sort.vue';
import DepartureDate from '../../../components/assistingAgriculture/index/DepartureDate.vue';
import ScenicSpots from '../../../components/assistingAgriculture/index/ScenicSpots.vue';
import Screen from '../../../components/assistingAgriculture/index/Screen.vue';
import { getPopularList, getProdList, getTour } from '@/api/assistingAgriculture/village';
import { getPresaleList } from '@/api/assistingAgriculture/building';
import { onMounted } from 'vue';
import { onMounted, ref } from 'vue';
import fab from '../../../components/fab/fab.vue';
onMounted(async () => {
getProd();
......@@ -198,6 +215,9 @@ const sortRef = ref(null);
const departureDateRef = ref(null);
const scenicSpotsRef = ref(null);
const screenRef = ref(null);
const backgroundBox = ref('');
const border = ref('');
const locationFiltering = (index) => {
switch (index) {
case 0:
......@@ -374,6 +394,16 @@ function toSpecialOfferZoneList() {
url: '/pages/assistingAgriculture/RuralTravel/specialOfferZoneList',
});
}
// 监听页面滚动
onPageScroll((e) => {
if (e.scrollTop > 20) {
backgroundBox.value = '#fff';
border.value = '1rpx solid gray';
} else {
backgroundBox.value = '';
border.value = '';
}
});
</script>
<style lang="scss" scoped>
......@@ -585,6 +615,7 @@ page {
font-weight: bold;
line-height: 28rpx;
color: #fa5151;
margin-left: 160rpx;
}
.venue {
display: flex;
......@@ -601,14 +632,32 @@ page {
margin-top: 10rpx;
width: 400rpx;
}
::v-deep .search {
margin-top: 60rpx;
.detail-score {
margin-top: 30rpx;
}
::v-deep .icon {
width: 56rpx;
.searchBox {
opacity: 1;
width: 440rpx;
height: 56rpx;
background: #ffffff;
border-radius: 28rpx 28rpx 28rpx 28rpx;
display: flex;
align-items: center;
padding-left: 20rpx;
margin-left: 80rpx;
text-align: start;
.magnifyingGlass {
width: 26rpx;
height: 26rpx;
}
.text {
margin-left: 10rpx;
font-size: 24rpx;
color: #ffffff;
}
}
.detail-score {
margin-top: 30rpx;
.all-info {
position: absolute;
margin-top: 140rpx;
}
</style>
src/pages/assistingAgriculture/RuralTravel/specialOfferZoneList.vue
View file @ af140c96
<template>
<view class="special-offer-zone-list-page">
<view class="search">
<wd-icon color="#fff" name="thin-arrow-left" class="icon" @tap="back"></wd-icon>
</view>
<search
style="position: fixed; top: 0; z-index: 99; width: 100%"
:type="2"
title="特价专区"
showTitles="true"
:backgroundBox="backIconColor"
>
<view
v-if="backIconColor === 'white'"
:style="{ color: textColor }"
style="width: 100%; text-align: center; font-size: 36rpx"
>
特价专区
</view>
</search>
<view class="swiper">
<wd-swiper
customClass="swiper-custom"
......@@ -124,6 +136,8 @@ const imgUrl = import.meta.env.VITE_APP_IMG_URL;
const rotate2 = ref(false);
const rotate3 = ref(false);
const rotate4 = ref(false);
const textColor = ref('#ffffff');
const backIconColor = ref('white');
const current = ref(0);
const isLoadReachBottom = ref(null);
const params = ref({
......@@ -132,6 +146,15 @@ const params = ref({
isEnd: false,
});
const shopSwiperList = ref([]);
onPageScroll((e) => {
if (e.scrollTop > 20) {
backIconColor.value = 'white';
textColor.value = 'black';
} else {
backIconColor.value = '';
textColor.value = 'white';
}
});
const locationFiltering = (index) => {
const rotates = [rotate, rotate2, rotate3, rotate4];
rotates.forEach((rotate, i) => {
......
src/pages/assistingAgriculture/cart/ConfirmOrder.vue
View file @ af140c96
<template>
<search style="z-index: 99; width: 100%" :type="2" backgroundBox="#fff">
<view style="width: 100%; text-align: center; font-size: 36rpx; font-weight: bold">
确认订单
</view>
</search>
<view class="confirm-order">
<wd-popup
v-model="showpopup"
......
src/pages/assistingAgriculture/cart/cart.vue
View file @ af140c96
<template>
<Search title="购物车" showTitle backgroundBox="#fff"></Search>
<div class="cart-wrap">
<div class="shop" v-for="(shop, i) in cartList" :key="i">
<div class="flex-align-center shop-info">
......
src/pages/assistingAgriculture/detail/comment.vue
View file @ af140c96
<template>
<view class="container">
<!-- 顶部搜索框-->
<view class="header">
<Search backgroundBox="white">
<view class="searchBoxs">
<view class="search1">
<wd-icon name="search" size="24rpx" color="#ABAAAA"></wd-icon>
<input
type="text"
:value="catalog.evaluation"
class="text"
placeholder="点评关键词/特色"
placeholder-style="font-size:22rpx;"
@confirm="handleSearch"
@input="handleInput"
confirm-type="搜索"
/>
</view>
<wd-icon
name="error-fill"
size="30rpx"
color="#999"
v-if="catalog.evaluation"
@tap="handleClear"
></wd-icon>
</view>
</Search>
<!-- <view class="header">
<wd-icon
class="icon"
name="arrow-left"
......@@ -31,7 +55,7 @@
@tap="handleClear"
></wd-icon>
</view>
</view>
</view> -->
<view class="content">
<view class="tabs">
......@@ -146,7 +170,7 @@ const rateList = ref({
},
5: {
url: '../../../static/assistingAgriculture/detail/fiveStars.png',
text: '还行',
text: '超赞',
},
});
......@@ -299,33 +323,34 @@ page {
align-items: center;
padding: 0 40rpx;
gap: 32rpx;
}
.searchBox {
width: 492rpx;
height: 56rpx;
background: #f3f3f3;
border-radius: 28rpx 28rpx 28rpx 28rpx;
.searchBoxs {
width: 480rpx;
height: 56rpx;
background: #f3f3f3;
border-radius: 28rpx 28rpx 28rpx 28rpx;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0rpx 20rpx;
gap: 10rpx;
margin-left: 40rpx;
.search1 {
gap: 10rpx;
display: flex;
align-items: center;
justify-content: space-between;
padding: 0rpx 20rpx;
gap: 10rpx;
.search {
gap: 10rpx;
display: flex;
align-items: center;
.text {
margin-left: 10rpx;
font-size: 22rpx;
}
.text {
margin-left: 10rpx;
font-size: 22rpx;
}
}
}
.content {
padding: 98rpx 20rpx 30rpx;
padding: 10rpx 20rpx 30rpx;
display: flex;
flex-direction: column;
gap: 10rpx;
......
src/pages/assistingAgriculture/index/building.vue
View file @ af140c96
<template>
<Search :backgroundBox="backgroundBox" background="rgba(255, 255, 255, 0.8)">
<view class="searchBox">
<image
class="magnifyingGlass"
src="../../../static/index/magnifyingGlass.png"
mode="aspectFit|aspectFill|widthFix"
/>
<input
type="text"
class="text"
@confirm="toSearch"
placeholder="请输入要搜索的内容"
@input="updateModelValue"
@keyup.enter="toSearch"
@focus="toSearch"
/>
</view>
</Search>
<view class="container">
<!-- 顶部搜索框-->
<view class="top">
<Search
background="rgba(255, 255, 255, 0.8)"
backIcon="black"
iconSrc="/static/assistingAgriculture/assets/blackLeft.png"
placeholderText="请输入要搜索的内容"
@search="toSearch"
></Search>
</view>
<!-- <view class="top">-->
<!-- <Search-->
<!-- background="rgba(255, 255, 255, 0.8)"-->
<!-- backIcon="black"-->
<!-- iconSrc="/static/assistingAgriculture/assets/blackLeft.png"-->
<!-- placeholderText="请输入要搜索的内容"-->
<!-- @search="toSearch"-->
<!-- ></Search>-->
<!-- </view>-->
<!-- 轮播图-->
<view class="nav">
<wd-swiper
......@@ -130,7 +148,7 @@
</template>
<script setup>
import Search from '../../../components/assistingAgriculture/index/Search.vue';
import Search from '../../../components/index/Search.vue';
import fab from '../../../components/fab/fab.vue';
import {
getGoodSaleProdList,
......@@ -139,6 +157,7 @@ import {
import { getshoppingCartList } from '@/api/packageDetail';
import { onMounted, ref } from 'vue';
import { useRoute } from 'vue-router';
const backgroundBox = ref('#ffffff');
const current = ref(0);
const rightList = ref([]);
......@@ -442,10 +461,6 @@ page {
::v-deep .wd-badge__content.is-fixed {
margin-top: 20rpx;
}
::v-deep.icon {
width: 56rpx;
height: 56rpx;
}
.container1 {
display: flex;
}
......@@ -473,4 +488,24 @@ img.rice {
position: relative;
top: -20rpx;
}
.searchBox {
opacity: 1;
width: 440rpx;
height: 56rpx;
background: #f4f4f4;
border-radius: 28rpx 28rpx 28rpx 28rpx;
display: flex;
align-items: center;
padding-left: 20rpx;
margin-left: 80rpx;
text-align: start;
.magnifyingGlass {
width: 26rpx;
height: 26rpx;
}
.text {
margin-left: 10rpx;
font-size: 24rpx;
}
}
</style>
src/pages/assistingAgriculture/index/index.vue
View file @ af140c96
......@@ -2,12 +2,27 @@
<view>
<view class="container">
<Search
background="rgba(255, 255, 255, 0.8)"
backIcon="black"
iconSrc="/static/assistingAgriculture/assets/return.png"
placeholderText="请输入要搜索的内容"
@search="toSearch"
></Search>
style="position: fixed; top: 0; width: 100%"
:backgroundBox="backgroundBox"
:backIcon="backIcon"
>
<view class="searchBox" :style="{ border }">
<image
class="magnifyingGlass"
src="../../../static/index/magnifyingGlass.png"
mode="aspectFit|aspectFill|widthFix"
/>
<input
type="text"
class="text"
@confirm="toSearch"
placeholder="请输入要搜索的内容"
@input="updateModelValue"
@keyup.enter="toSearch"
@focus="toSearch"
/>
</view>
</Search>
<view>
<wd-swiper
:list="swiperList"
......@@ -64,7 +79,7 @@
</template>
<script setup lang="ts">
import Search from '../../../components/assistingAgriculture/index/Search.vue';
import Search from '../../../components/index/Search.vue';
import fab from '../../../components/fab/fab.vue';
import {
getPresaleCategory,
......@@ -77,6 +92,9 @@ const list = ref([]);
const sortList = ref([]);
const swiperList = ref([]);
const current = ref(0);
const backgroundBox = ref('');
const border = ref('');
// const backIcon = ref('white');
// 轮播图数据
let lunboData;
onMounted(async () => {
......@@ -143,6 +161,16 @@ const toBuilding = (item) => {
});
}
};
// 监听页面滚动
onPageScroll((e) => {
if (e.scrollTop > 20) {
backgroundBox.value = '#fff';
border.value = '1rpx solid gray';
} else {
backgroundBox.value = '';
border.value = '';
}
});
// 跳转详情页
function toDetail(item) {
// TODO: 跳转到详情页
......@@ -156,14 +184,6 @@ function toDetail(item) {
page {
background-color: #f3f3f3;
}
.container {
position: relative;
left: 0rpx;
top: 0rpx;
width: 750rpx;
height: 440rpx;
opacity: 1;
}
.img1 {
display: flex;
}
......@@ -273,9 +293,25 @@ page {
margin-top: -23rpx;
color: #fa5151;
}
::v-deep .icon {
width: 40rpx;
height: 40rpx;
margin-left: 40rpx;
.searchBox {
opacity: 1;
width: 440rpx;
height: 56rpx;
background: #ffffff;
border-radius: 28rpx 28rpx 28rpx 28rpx;
display: flex;
align-items: center;
padding-left: 20rpx;
margin-left: 80rpx;
text-align: start;
.magnifyingGlass {
width: 26rpx;
height: 26rpx;
}
.text {
margin-left: 10rpx;
font-size: 24rpx;
color: #ffffff;
}
}
</style>
src/pages/assistingAgriculture/index/presale.vue
View file @ af140c96
......@@ -2,12 +2,27 @@
<view class="container">
<view class="top">
<Search
background="rgba(255, 255, 255, 0.8)"
backIcon="black"
iconSrc="/static/assistingAgriculture/assets/left.png"
placeholderText="输入商品名称"
@search="toSearch"
></Search>
style="position: fixed; top: 0; width: 100%"
:backgroundBox="backgroundBox"
:backIcon="backIcon"
>
<view class="searchBox" :style="{ border }">
<image
class="magnifyingGlass"
src="../../../static/index/magnifyingGlass.png"
mode="aspectFit|aspectFill|widthFix"
/>
<input
type="text"
class="text"
@confirm="toSearch"
placeholder="输入商品名称"
@input="updateModelValue"
@keyup.enter="toSearch"
@focus="toSearch"
/>
</view>
</Search>
</view>
<view class="nav">
<wd-swiper
......@@ -125,7 +140,7 @@
</template>
<script setup>
import Search from '../../../components/assistingAgriculture/index/Search.vue';
import Search from '../../../components/index/Search.vue';
import { useRoute } from 'vue-router';
import { ref, onMounted } from 'vue';
import {
......@@ -154,6 +169,8 @@ const params = {
};
const subscript = ref(0);
const tabsList = ref([]);
const backgroundBox = ref('');
const border = ref('');
onMounted(async () => {
getPresale();
presaleSortList();
......@@ -255,6 +272,16 @@ function toDetail(item) {
url: `/pages/assistingAgriculture/detail/detail?prodId=${item.prodId}`,
});
}
// 监听页面滚动
onPageScroll((e) => {
if (e.scrollTop > 20) {
backgroundBox.value = '#fff';
border.value = '1rpx solid gray';
} else {
backgroundBox.value = '';
border.value = '';
}
});
</script>
<style lang="scss" scoped>
......@@ -485,13 +512,30 @@ page {
::v-deep .wd-badge__content.is-fixed {
margin-top: 20rpx;
}
::v-deep.icon {
width: 56rpx;
height: 56rpx;
}
img.add {
.add {
position: relative;
left: 200rpx;
top: 30rpx;
}
.searchBox {
opacity: 1;
width: 440rpx;
height: 56rpx;
background: #ffffff;
border-radius: 28rpx 28rpx 28rpx 28rpx;
display: flex;
align-items: center;
padding-left: 20rpx;
margin-left: 80rpx;
text-align: start;
.magnifyingGlass {
width: 26rpx;
height: 26rpx;
}
.text {
margin-left: 10rpx;
font-size: 24rpx;
color: #ffffff;
}
}
</style>
src/pages/assistingAgriculture/order/detail.vue
View file @ af140c96
......@@ -8,8 +8,8 @@
v-if="logisticsDetail"
></web-view>
<!-- <view style="height: 600rpx; background-color: aquamarine"></view> -->
<view class="content1" v-if="orderDetail">
<view class="info">
<view class="content" v-if="orderDetail">
<view class="info" :style="{ 'padding-top': logisticsDetail ? '30rpx' : '60rpx' }">
<view class="top" v-if="logisticsDetail">
<view class="left">
<image
......@@ -636,7 +636,7 @@ page {
width: 375 * 2rpx;
margin: 0 auto;
.content1 {
.content {
position: relative;
top: -20rpx;
border-radius: 20rpx 20rpx 0 0;
......@@ -711,7 +711,7 @@ page {
background: #f12a2a;
border-radius: 50%;
position: absolute;
top: 6rpx;
top: -14rpx;
z-index: 1;
}
......@@ -721,7 +721,7 @@ page {
background: #ffd5d5;
border-radius: 50%;
position: absolute;
top: 6rpx;
top: -14rpx;
z-index: 1;
}
......@@ -729,8 +729,8 @@ page {
height: 100%;
width: 2rpx;
background-color: #ffd5d5;
position: absolute;
top: 6rpx;
// position: absolute;
// top: 6rpx;
}
}
......
src/pages/assistingAgriculture/reviewDetails/reviewDetails.vue
View file @ af140c96
<template>
<!-- 点评详情页面 -->
<search style="z-index: 99; width: 100%" :type="2" backgroundBox="#fff">
<view style="width: 100%; text-align: center; font-size: 36rpx; font-weight: bold">
点评详情
</view>
</search>
<view class="review-details-pages">
<view class="swiper-list">
<wd-swiper
......
src/pages/assistingAgriculture/reviewDetails/scenicSpotDetails.vue
View file @ af140c96
<template>
<!-- 点评详情页面 -->
<!-- 点评详情页面 -->
<search style="z-index: 99; width: 100%" :type="2" backgroundBox="#fff">
<view style="width: 100%; text-align: center; font-size: 36rpx; font-weight: bold">
点评详情
</view>
</search>
<view class="review-details-pages">
<view class="list">
<view class="item" v-for="(item, index) in list" :key="index">
......
src/pages/assistingAgriculture/shop/index.vue
View file @ af140c96
<template>
<search style="z-index: 99; width: 100%" :type="2" backgroundBox="#fff">
<view style="width: 100%; text-align: center; font-size: 36rpx; font-weight: bold">
确认订单
</view>
</search>
<view class="page">
<view class="banner">
<wd-swiper :list="shopImgList" height="236rpx" autoplay></wd-swiper>
......@@ -249,20 +254,20 @@ uni-page-body {
.page {
height: 100%;
background-color: #f6f6f6;
padding: 20rpx;
box-sizing: border-box;
display: flex;
flex-direction: column;
}
.banner {
width: 710rpx;
height: 236rpx;
padding: 20rpx;
margin-bottom: 20rpx;
:deep(.wd-swiper__track) {
border-radius: 0;
}
}
.commodity-wrap {
padding: 20rpx;
height: 40rpx;
flex-grow: 1;
background-color: #fff;
......
src/pages/order/afterSales.vue
View file @ af140c96
<template>
<view class="container">
<Header title="售后详情"></Header>
<Search :showTitle="true" title="售后详情" backgroundBox="white"></Search>
<view class="content">
<view class="box box1" v-if="afterSaleDetail">
......@@ -54,7 +54,6 @@
</template>
<script setup>
import Header from '@/pages/order/components/Header/index.vue';
import { afterSale } from '@/api/order';
const fileDomain = import.meta.env.VITE_APP_IMG_URL;
const orderNumber = ref('');
......@@ -83,7 +82,7 @@ page {
margin: 0 auto;
.content {
padding-top: 88rpx;
//padding-top: 88rpx;
.box1 {
display: flex;
flex-direction: column;
......
src/pages/order/order.vue
View file @ af140c96
......@@ -2,8 +2,8 @@
<view class="container">
<!-- 顶部搜索框-->
<Search backgroundBox="#f3f3f3">
<view class="searchBox">
<view class="search">
<view class="searchBoxs">
<view class="search1">
<wd-icon name="search" size="30rpx" color="#999"></wd-icon>
<input
type="text"
......@@ -556,12 +556,12 @@ const anotherOrder = (item) => {
});
break;
case 7:
xma.redirectTo({
xma.navigateTo({
url: `/pages/assistingAgriculture/detail/detail?prodId=${item.orderItems[0].prodId}`,
});
break;
case 10:
xma.redirectTo({
xma.navigateTo({
url: `/pages/assistingAgriculture/RouteDetails/RouteDetails?prodId=${item.orderItems[0].prodId}&shopId=${item.shopId}`,
});
break;
......@@ -708,7 +708,7 @@ page {
padding: 0 30rpx;
gap: 14rpx;
}
.searchBox {
.searchBoxs {
width: 492rpx;
height: 66rpx;
background: #f3f3f3;
......@@ -721,7 +721,7 @@ page {
background-color: #fff;
.search {
.search1 {
gap: 10rpx;
display: flex;
align-items: center;
......
src/pages/order/refund.vue
View file @ af140c96
<template>
<view class="container">
<!-- <Header title="售后/退款"></Header> -->
<Search title="售后/退款" backgroundBox="white" :type="2"></Search>
<Search title="售后/退款" backgroundBox="white" :showTitle="true"></Search>
<view class="content" v-if="orderDetail">
<view class="content-box">
<view class="content-item">
......
src/pages/shop/confirmOrder.vue
View file @ af140c96
<template>
<!-- 确认订单页面 -->
<search
title="确认订单"
:showTitle="true"
style="z-index: 99; width: 100%"
:type="2"
backgroundBox="#fff"
></search>
<view class="confirm-order-pages">
<wd-popup
v-model="showpopup"
......@@ -82,13 +89,6 @@
<wd-status-tip v-if="orderInfo.shopCoupon.length === 0" image="content" tip="暂无优惠券" />
</view>
</wd-popup>
<search
style="position: fixed; top: 0; z-index: 99; width: 100%"
:type="2"
backgroundBox="#fff"
>
<view style="width: 100%; text-align: center; font-size: 36rpx">确认订单</view>
</search>
<!-- 商品卡 -->
<view class="order-detail-card">
<view class="title">{{ orderInfo.shopName }}</view>
......
src/pages/shop/paymentSuccessful.vue
View file @ af140c96
<template>
<!-- 支付成功页面 -->
<search style="z-index: 99; width: 100%" :type="2" backgroundBox="#fff">
<view style="width: 100%; text-align: center; font-size: 36rpx; font-weight: bold">
确认订单
</view>
</search>
<view class="container">
<search
style="position: fixed; top: 0; z-index: 99; width: 100%"
:type="2"
backgroundBox="#fff"
>
<view style="width: 100%; text-align: center; font-size: 36rpx">确认订单</view>
</search>
<view class="content">
<!-- 使用状态 -->
<view class="status">
......
src/pages/storeEntry/detail.vue
View file @ af140c96
......@@ -2,7 +2,6 @@
<view class="container">
<Search :showTitle="true" title="商家入驻" backgroundBox="white"></Search>
<view class="content">
<view class="formmain">
<wd-form ref="form" :model="formData" :rules="rules">
......@@ -392,7 +391,17 @@ onLoad((options) => {
}
getShopCategoryFun();
});
onUnload(() => {
try {
const value = xma.getStorageSync('storage_choosedShopInfo');
if (value && JSON.parse(value).length > 0) {
console.log('hhh');
xma.removeStorageSync('storage_choosedShopInfo');
}
} catch (e) {
// error
}
});
// 获取店铺入驻分类（弹窗tree）
const getShopCategoryFun = async () => {
const res = await sgyrShopCategory();
......@@ -680,7 +689,7 @@ const submitData = () => {
});
}
try {
xma.setStorageSync('storage_choosedShopInfo', {});
xma.removeStorageSync('storage_choosedShopInfo');
xma.showToast({
title: '修改成功',
icon: 'success',
......@@ -838,7 +847,7 @@ page {
padding-bottom: 40rpx;
.content {
// padding-top: 88rpx;
// padding-top: 88rpx;
padding-bottom: 44rpx;
}
......
src/pages/storeEntry/index.vue
View file @ af140c96
......@@ -123,7 +123,7 @@ const deleteShop = (shopId) => {
min-height: calc(100vh - 160rpx);
.content {
// padding-top: 88rpx;
// padding-top: 88rpx;
.listcon {
margin-top: 10px;
......
src/pages/ticket/ticket.vue
View file @ af140c96
......@@ -121,10 +121,21 @@
<script setup>
import { myCouponListApi, userCouponStatisticsApi } from '@/api/ticket';
import { signIn } from '@/utils/signIn';
import Header from '@/pages/order/components/Header/index.vue';
import testJson from '@/static/json/test.json';
import { getTokenUser } from '@/api/index';
import { getToken } from '@/utils/auth';
const fileDomain = import.meta.env.VITE_APP_IMG_URL;
onLoad(async () => {
if (!getToken()) await signIn();
// if (!getToken()) await signIn2();
getStatistics();
getCouponList();
});
// 优惠券状态 0:失效 2:已使用,3-未使用
const iconUrl = ref({
0: '@/static/ticket/past-icon.png',
......@@ -173,7 +184,6 @@ const getStatistics = async () => {
discountAmount.value = res.data;
}
};
getStatistics();
/**
* 获取用户优惠券列表
......@@ -213,7 +223,21 @@ const getCouponList = async () => {
// state.value = 'finished';
xma.hideLoading();
};
getCouponList();
// 登录
const signIn2 = () => {
xma.showLoading({
title: '加载中',
mask: true,
});
return getTokenUser(testJson).then((res) => {
const token = res.data.access_token;
const userInfo = res.data.user_info;
xma.setStorageSync('Authorization', token);
xma.setStorageSync('userInfo', userInfo);
console.log('登录...');
});
};
// 下拉刷新
onPullDownRefresh(() => {
......
yarn.lock
View file @ af140c96
......@@ -6198,6 +6198,11 @@ xinhua-sdk@*:
resolved "https://registry.npmmirror.com/xinhua-sdk/-/xinhua-sdk-1.6.1.tgz"
integrity sha512-Pjhwgn6lme5MxA6EcXQLD7ZEZMUZWJ714yLJCOkwEW96Yr0oS2JItnJA4NNYUP2hQBqQLc9SAUrOn9QOpFcQdw==
xinhua-sdk@^1.8.0:
version "1.8.0"
resolved "https://registry.npmmirror.com/xinhua-sdk/-/xinhua-sdk-1.8.0.tgz#a67fd21ed76f4489935cb5b4b0c9b8fde544da6b"
integrity sha512-5aXpi+zql1d+ojaERMtcgGZHsVEJAyKRctQJ8RlixPRa0jttBTTIaZaMXUzJtLxlnB82n4uhX/oJ8TNb65TbPA==
xml-name-validator@^4.0.0:
version "4.0.0"
resolved "https://registry.npmmirror.com/xml-name-validator/-/xml-name-validator-4.0.0.tgz"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment