Skip to content

B
buildingAgricultureSharing-miniapp
Commit 5eb5aa36 authored by 周俊涛（东信）'s avatar 周俊涛（东信）
Browse files
Options

Merge branch 'master' of…

Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/buildingAgricultureSharing-miniapp
parents 17766240 34914a27
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 399 additions and 15 deletions
src/pages.json
View file @ 5eb5aa36
......@@ -60,6 +60,37 @@
"navigationBarBackgroundColor": "#ffffff",
"navigationStyle":""
}
},
{
"path": "pages/cart/ConfirmOrder",
"style": {
"navigationBarTitleText": "确认订单",
"navigationBarBackgroundColor": "#ffffff",
"navigationStyle":""
}
},
{
"path": "pages/RuralTravel/RuralTravel",
"style": {
"navigationBarTitleText": "乡村旅居"
}
},
{
"path": "pages/reviewDetails/reviewDetails",
"style": {
"navigationBarTitleText": "点评详情",
"navigationBarBackgroundColor": "#ffffff",
"navigationStyle":""
}
},
{
"path": "pages/reviewDetails/scenicSpotDetails",
"style": {
"navigationBarTitleText": "景点详情",
"navigationBarBackgroundColor": "#ffffff",
"navigationStyle":""
}
}
],
"globalStyle": {
......
src/pages/RuralTravel/RuralTravel.vue 0 → 100644
View file @ 5eb5aa36
This diff is collapsed.
src/pages/confirm-order.vue → src/pages/cart/ConfirmOrder.vue
View file @ 5eb5aa36
......@@ -25,7 +25,7 @@
<view class="trade-name">杨家黄焖鸡</view>
<view class="commordity-content">
<view class="commordity-details">
<img class="commodity-picture" src="/src/static/assets/shangpin.png" alt="" />
<img class="commodity-picture" src="/src/static/assets/img1.png" alt="" />
<view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
<view class="price-information">
<text class="price-symbol">￥</text>
......@@ -35,7 +35,7 @@
<view class="label">约1000克</view>
</view>
<view class="commordity-details">
<img class="commodity-picture" src="/src/static/assets/shangpin.png" alt="" />
<img class="commodity-picture" src="/src/static/assets/img1.png" alt="" />
<view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
<view class="price-information">
<text class="price-symbol">￥</text>
......@@ -392,12 +392,13 @@ page {
font-size: 32rpx;
}
.submit-order-view {
width: 710rpx;
width: 750rpx;
height: 131rpx;
padding-left: 18rpx;
padding-top: 21rpx;
margin-top: 15%;
background: #ffffff;
margin-left: -20rpx;
}
.total-view {
width: 142rpx;
......
src/pages/cart/cart.vue
View file @ 5eb5aa36
......@@ -50,7 +50,7 @@
<span>￥{{ totalPrice }}</span>
</div>
</div>
<div class="submit">去结算({{ totalPrice }})</div>
<div class="submit" @tap="toSettle">去结算({{ totalPrice }})</div>
</div>
</div>
</template>
......@@ -140,6 +140,12 @@ const changeCheckedAll = () => {
changeShopChecked(v);
});
};
function toSettle() {
// TODO: 跳转到结算页面
xma.navigateTo({
url: '/pages/cart/ConfirmOrder',
});
}
</script>
<style lang="scss" scoped>
......
src/pages/index/building.vue
View file @ 5eb5aa36
......@@ -91,6 +91,10 @@
</view>
</view>
</view>
<!-- 购物车悬浮按钮 -->
<view class="cart-floating">
<img class="cart" @tap="toCart" src="/static/presale/cart.png" />
</view>
</view>
</template>
......@@ -142,6 +146,12 @@ function toDetail() {
url: '/pages/detail/detail',
});
}
function toCart() {
// TODO: 跳转到购物车
xma.navigateTo({
url: '/pages/cart/cart',
});
}
</script>
<style lang="scss" scoped>
......@@ -319,4 +329,21 @@ page {
margin-top: -15px;
display: block;
}
.cart-floating {
position: fixed;
right: 20rpx;
bottom: 100rpx;
width: 80rpx;
height: 80rpx;
z-index: 99;
background-color: #ffffff;
border-radius: 50%;
}
.cart {
position: relative;
top: 20rpx;
left: 16rpx;
width: 48rpx;
height: 46rpx;
}
</style>
src/pages/index/index.vue
View file @ 5eb5aa36
......@@ -17,7 +17,7 @@
<img src="/static/assets/adoption.png" style="width: 96rpx; height: 96rpx" />
<view class="sort-text">认养农业</view>
</view>
<view class="borderClass">
<view class="borderClass" @tap="toRuralTravel">
<img src="/static/assets/rural.png" style="width: 96rpx; height: 96rpx" />
<view class="sort-text">乡村旅居</view>
</view>
......@@ -108,7 +108,7 @@
</view>
</view>
</view>
<view class="product-page" @tap="toDetail" v-for="(item, index) in list" :key="index">
<view class="product-page" v-for="(item, index) in list" :key="index">
<view>
<view class="page-title">{{ item.text }}</view>
<img :src="item.img" class="main-img" />
......@@ -157,9 +157,15 @@ function toBuilding() {
url: '/pages/index/building',
});
}
function toRuralTravel() {
// TODO: 跳转到乡村旅居
xma.navigateTo({
url: '/pages/RuralTravel/RuralTravel',
});
}
// 跳转详情页
function toDetail() {
// TODO: 跳转到筑农严选
// TODO: 跳转到详情页
xma.navigateTo({
url: '/pages/detail/detail',
});
......
src/pages/index/presale.vue
View file @ 5eb5aa36
......@@ -135,7 +135,7 @@
</view>
<!-- 购物车悬浮按钮 -->
<view class="cart-floating">
<img @tap="toCart" src="/static/presale/cart.png" style="width: 48rpx; height: 46rpx" />
<img class="cart" @tap="toCart" src="/static/presale/cart.png" />
</view>
</template>
......@@ -145,7 +145,7 @@ import { ref } from 'vue';
const current = ref(0);
const light = ref(0);
const sortList = ref([
{ img: '/static/presale/img1.png', price: '25', text: '应季好物' },
{ img: '/static/presale/bacImg.png', price: '25', text: '应季好物' },
{ img: '/static/presale/img2.png', price: '25', text: '猪肉蛋禽' },
{ img: '/static/presale/img3.png', price: '25', text: '米面粮油' },
{ img: '/static/presale/img4.png', price: '25', text: '预选蔬菜' },
......@@ -481,5 +481,14 @@ page {
width: 80rpx;
height: 80rpx;
z-index: 99;
background-color: #ffffff;
border-radius: 50%;
}
.cart {
position: relative;
top: 20rpx;
left: 16rpx;
width: 48rpx;
height: 46rpx;
}
</style>
src/pages/reviewDetails/reviewDetails.vue 0 → 100644
View file @ 5eb5aa36
<template>
<!-- 点评详情页面 -->
<view class="review-details-pages">
<view class="swiper-list">
<wd-swiper
:list="swiperList"
direction="horizontal"
indicatorPosition="right"
autoplay
height="456rpx"
v-model:current="current"
@click="handleClick"
@change="onChange"
>
<template #indicator="{ current, total }">
<view class="custom-indicator" style="position: absolute; bottom: 24rpx; right: 24rpx">
{{ current + 1 }}/{{ total }}
</view>
</template>
</wd-swiper>
</view>
<view class="revuew-content">
<view class="user-info">
<view class="info-content">
<image src="@/static/reviewDetails/avatar.png" mode="aspectFill"></image>
<view class="text-box">
<text class="user-name">不爱吃鱼的小猫咪</text>
<text class="fb-time">2024-08-03</text>
</view>
</view>
<view>
<text class="score">4.9</text>
<text class="score-unit">/5分</text>
</view>
</view>
<text style="margin-top: 12rpx; font-size: 14 * 2rpx; color: #3d3d3d">
跟团游行程紧凑有序，充分利用了时间，让游客能够在有限的时间内充分游览黄果树的主要景点，如黄果树大瀑布、陡坡塘瀑布、天星桥景区等,不留遗憾。导游专业且热情，对景区有深入的了解，能够生动有趣地讲解景点的历史、文化和特色,同时耐心解答问题。
跟团游行程紧凑有序，充分利用了时间，让游客能够在有限的时间内充分游览黄果树的主要景点，如黄果树大瀑布、陡坡塘瀑布、天星桥景区等,不留遗憾。导游专业且热情，对景区有深入的了解，能够生动有趣地讲解景点的历史、文化和特色,同时耐心解答问题。
</text>
</view>
<view class="scenic-spot">
<image src="@/static/reviewDetails/fj.png" mode="aspectFill"></image>
<view class="scenic-area-details">
<text class="scenic-name">红枫湖+青岩古镇+云漫湖</text>
<text class="scenic-type">自然风景</text>
<view class="tag-list">
<text class="tag">无购物</text>
<text class="tag">无购物</text>
</view>
</view>
<wd-icon class="icon" color="#ABAAAA" name="arrow-right" size="22px"></wd-icon>
</view>
<view class="dz-btn">
<wd-icon color="#767676" name="thumb-up" size="22px"></wd-icon>
<text>12</text>
</view>
</view>
</template>
<script setup>
const current = ref(0);
onMounted(() => {
xma.getSystemInfo({
success: function (res) {
console.log(res, '11111111');
},
});
});
const swiperList = ref([
'https://registry.npmmirror.com/wot-design-uni-assets/*/files/redpanda.jpg',
'https://registry.npmmirror.com/wot-design-uni-assets/*/files/capybara.jpg',
'https://registry.npmmirror.com/wot-design-uni-assets/*/files/panda.jpg',
]);
function handleClick(e) {}
function onChange(e) {
console.log(e);
}
</script>
<style lang="scss" scoped>
page {
background: #ffffff;
}
.review-details-pages {
display: flex;
flex-direction: column;
align-items: center;
width: 750rpx;
.swiper-list {
width: 375 * 2rpx;
height: 228 * 2rpx;
:deep(.wd-swiper__track) {
border-radius: 0;
}
.custom-indicator {
padding: 0 12rpx;
height: 48rpx;
line-height: 48rpx;
border-radius: 45%;
background: rgba(0, 0, 0, 0.6);
color: #ffffff;
font-size: 24rpx;
}
}
.revuew-content {
display: flex;
flex-direction: column;
width: 100%;
align-items: center;
padding: 40rpx 20rpx;
box-sizing: border-box;
.user-info {
width: 100%;
display: flex;
align-items: center;
justify-content: space-between;
.info-content {
display: flex;
align-items: center;
image {
width: 36 * 2rpx;
height: 36 * 2rpx;
border-radius: 50%;
}
.text-box {
display: flex;
flex-direction: column;
margin-left: 20rpx;
.user-name {
font-size: 14 * 2rpx;
color: #3d3d3d;
}
.fb-time {
font-size: 11 * 2rpx;
/* 小文本 */
color: #abaaaa;
margin-top: 10rpx;
}
}
.score {
font-size: 14 * 2rpx;
/* 4.9 */
color: #0974f5;
}
.score-unit {
font-size: 12 * 2rpx;
color: #abaaaa;
}
}
}
}
.scenic-spot {
width: 355 * 2rpx;
box-sizing: border-box;
padding: 20rpx 36rpx 20rpx 10rpx;
background: #f3f3f3;
border-radius: 8 * 2rpx;
display: flex;
align-items: center;
image {
width: 102 * 2rpx;
height: 72 * 2rpx;
border-radius: 4 * 2rpx;
}
.scenic-area-details {
display: flex;
flex-direction: column;
margin-left: 20rpx;
.cenic-name {
font-size: 14 * 2rpx;
color: #3d3d3d;
}
.scenic-type {
font-size: 12 * 2rpx;
/* 菜头标题文本 */
color: #3d3d3d;
}
.tag-list {
display: flex;
flex-wrap: wrap;
.tag {
box-sizing: border-box;
padding: 10rpx 16rpx;
border-radius: 30rpx;
border: 2rpx solid #d8d8d8;
color: #3d3d3d;
font-size: 16rpx;
margin-top: 10rpx;
margin-left: 20rpx;
}
}
}
.icon {
margin-left: auto;
}
}
.dz-btn {
display: flex;
align-items: center;
box-sizing: border-box;
padding: 28rpx 100rpx;
border: 2rpx solid #abaaaa;
margin-top: 46rpx;
border-radius: 68rpx;
text {
color: #767676;
font-size: 28rpx;
margin-left: 10rpx;
}
}
}
</style>
src/pages/reviewDetails/scenicSpotDetails.vue 0 → 100644
View file @ 5eb5aa36
<template>
<!-- 点评详情页面 -->
<view class="review-details-pages">
<view class="list">
<view class="item" v-for="i in 10" :key="i">
<image mode="aspectFill" src="@/static/reviewDetails/fj.png"></image>
<view class="info-box">
<text>红枫湖景区</text>
<text>自然风景</text>
<text class="t-2">4.5分</text>
<text class="t-2">门票费用已包含</text>
</view>
</view>
</view>
</view>
</template>
<script setup>
onMounted(() => {});
</script>
<style lang="scss" scoped>
page {
background: #f3f3f3;
}
.review-details-pages {
display: flex;
flex-direction: column;
align-items: center;
width: 750rpx;
.list {
width: 355 * 2rpx;
.item {
margin-top: 10rpx;
box-sizing: border-box;
padding: 20rpx;
display: flex;
background: #fff;
border-radius: 16rpx;
align-items: center;
image {
width: 102 * 2rpx;
height: 72 * 2rpx;
border-radius: 8rpx;
}
.info-box {
display: flex;
flex-direction: column;
margin-left: 40rpx;
text {
font-size: 12 * 2rpx;
margin-top: 8rpx;
/* 菜头标题文本 */
color: #3d3d3d;
}
.t-2 {
font-size: 12 * 2rpx;
color: rgba(9, 116, 245, 1);
}
}
}
}
}
</style>
src/pages/shop/index.vue
View file @ 5eb5aa36
......@@ -41,13 +41,17 @@
</div>
</div>
</div>
<div class="shopping-cart">
<div>
<img src="/src/static/shop/shoppingCart.png" alt="" />
购物车
</div>
<img src="/src/static/shop/doubleArrow.png" alt="" />
<!-- 购物车悬浮按钮 -->
<div class="cart-floating">
<img class="cart" @tap="toCart" src="/static/presale/cart.png" />
</div>
<!-- <div class="shopping-cart">-->
<!-- <div>-->
<!-- <img src="/src/static/shop/shoppingCart.png" alt="" />-->
<!-- 购物车-->
<!-- </div>-->
<!-- <img src="/src/static/shop/doubleArrow.png" alt="" />-->
<!-- </div>-->
</div>
</template>
......@@ -80,6 +84,12 @@ const navList = ref([
const acitveNav = ref(1);
const activeFilter = ref(false);
function toCart() {
// TODO: 跳转到购物车
xma.navigateTo({
url: '/pages/cart/cart',
});
}
</script>
<style lang="scss" scoped>
......@@ -236,4 +246,22 @@ uni-page-body {
}
}
}
.cart-floating {
position: fixed;
bottom: 10%;
width: 80rpx;
height: 80rpx;
z-index: 99;
background-color: #ffffff;
border-radius: 50%;
margin-left: 10px;
}
.cart {
position: relative;
top: 20rpx;
left: 16rpx;
width: 48rpx;
height: 46rpx;
}
</style>
yarn.lock
View file @ 5eb5aa36
This source diff could not be displayed because it is too large. You can view the blob instead.
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