Skip to content

G
groupPurchase-miniapp
Commit 43499cc9 authored by 周俊涛（东信）'s avatar 周俊涛（东信）
Browse files
Options

Merge branch 'master' of http://gitlab.platform.xinhuaapp.com/pengjiani/groupPurchase-miniapp

parents f94328d1 f31edd22
Expand all Show whitespace changes
Inline Side-by-side
Showing with 878 additions and 213 deletions
package-lock.json
View file @ 43499cc9
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
"qrcode": "^1.5.3", "qrcode": "^1.5.3",
"vue": "^3.3.11", "vue": "^3.3.11",
"vue-i18n": "^9.1.9", "vue-i18n": "^9.1.9",
"wot-design-uni": "^1.2.26" "wot-design-uni": "^1.3.7"
}, },
"devDependencies": { "devDependencies": {
"@dcloudio/types": "^3.3.2", "@dcloudio/types": "^3.3.2",
...@@ -16271,9 +16271,9 @@ ...@@ -16271,9 +16271,9 @@
} }
}, },
"node_modules/wot-design-uni": { "node_modules/wot-design-uni": {
"version": "1.2.26", "version": "1.3.7",
"resolved": "https://registry.npmmirror.com/wot-design-uni/-/wot-design-uni-1.2.26.tgz", "resolved": "https://registry.npmmirror.com/wot-design-uni/-/wot-design-uni-1.3.7.tgz",
"integrity": "sha512-y2YL1lHobRWAJ+22E9G9lNLLIChQ8JY9loOt30PRQJ/izvd5qc+2+BqXCKlFquk2y+2qA75TEfJ/MsaESnYExA==", "integrity": "sha512-6saE25F/TiefYUJrtCpDYgNZTZ2W9llTNufSHZ8EMeX5JXyRTDdsDPYBVv367AxrSQsXCjZacG0RWIk2MIEdQA==",
"engines": { "engines": {
"HBuilderX": "^3.8.7" "HBuilderX": "^3.8.7"
}, },
......
package.json
View file @ 43499cc9
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
"qrcode": "^1.5.3", "qrcode": "^1.5.3",
"vue": "^3.3.11", "vue": "^3.3.11",
"vue-i18n": "^9.1.9", "vue-i18n": "^9.1.9",
"wot-design-uni": "^1.2.26" "wot-design-uni": "^1.3.7"
}, },
"devDependencies": { "devDependencies": {
"@dcloudio/types": "^3.3.2", "@dcloudio/types": "^3.3.2",
......
src/Components/Rating/Rating.vue
View file @ 43499cc9
<template> <template>
<div class="rating"> <view class="rating">
<div v-for="index in maxStars" :key="index" class="star" :style="{ fontSize: fontSize }"> <view v-for="index in maxStars" :key="index" class="star" :style="{ fontSize: size }">
<div <view
class="filled" class="filled"
:style="{ :style="{
width: getStarWidth(index) + '%', width: getStarWidth(index) + '%',
...@@ -9,10 +9,10 @@ ...@@ -9,10 +9,10 @@
}" }"
> >
★ ★
</div> </view>
★ ★
</div> </view>
</div> </view>
</template> </template>
<script> <script>
...@@ -29,9 +29,9 @@ export default { ...@@ -29,9 +29,9 @@ export default {
}, },
color: { color: {
type: String, type: String,
default: '#D44118', default: '#FA5151',
}, },
fontSize: { size: {
type: String, type: String,
default: '30rpx', default: '30rpx',
}, },
......
src/Components/assistingAgriculture/index/Search.vue
View file @ 43499cc9
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<view class="searchBox"> <view class="searchBox">
<image <image
class="magnifyingGlass" class="magnifyingGlass"
src="../../static/assets/magnifyingGlass.png" src="/static/assistingAgriculture/assets/magnifyingGlass.png"
mode="aspectFit|aspectFill|widthFix" mode="aspectFit|aspectFill|widthFix"
/> />
<input <input
......
src/assets/iconfont/iconfont.css
View file @ 43499cc9
@font-face { @font-face {
font-family: "iconfont"; /* Project id 4633414 */ font-family: "iconfont"; /* Project id 4633414 */
src: url('//at.alicdn.com/t/c/font_4633414_jhlymbmljta.woff2?t=1722933863144') format('woff2'), src: url('iconfont.woff2?t=1722996380945') format('woff2'),
url('//at.alicdn.com/t/c/font_4633414_jhlymbmljta.woff?t=1722933863144') format('woff'), url('iconfont.woff?t=1722996380945') format('woff'),
url('//at.alicdn.com/t/c/font_4633414_jhlymbmljta.ttf?t=1722933863144') format('truetype'); url('iconfont.ttf?t=1722996380945') format('truetype');
} }
.iconfont { .iconfont {
font-family: "iconfont" !important; font-family: "iconfont" !important;
font-size: 16px; font-size: 16px;
font-style: normal; font-style: normal;
-webkit-font-smoothing: antialiased; -webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale; -moz-osx-font-smoothing: grayscale;
} }
.icon-gengduo:before { .icon-gengduo:before {
content: "\e633"; content: "\e633";
} }
.icon-lianhe40:before { .icon-lianhe40:before {
content: "\e866"; content: "\e866";
} }
.icon-shuangxiajiantou:before { .icon-shuangxiajiantou:before {
content: "\e660"; content: "\e660";
} }
.icon-dianzan:before { .icon-dianzan:before {
content: "\e602"; content: "\e602";
} }
.icon-dianzan_kuai:before { .icon-dianzan_kuai:before {
content: "\ec8c"; content: "\ec8c";
} }
.icon-xiai:before { .icon-xiai:before {
content: "\e601"; content: "\e601";
} }
.icon-tongzhi:before { .icon-tongzhi:before {
content: "\e60d"; content: "\e60d";
} }
.icon-fenxiang:before { .icon-fenxiang:before {
content: "\e639"; content: "\e639";
} }
.icon-shuangshangjiantou-:before { .icon-shuangshangjiantou-:before {
content: "\e600"; content: "\e600";
} }
.icon-jinggao:before { .icon-jinggao:before {
content: "\e716"; content: "\e716";
} }
.icon-rs-countdown:before { .icon-rs-countdown:before {
content: "\e614"; content: "\e614";
} }
.icon-naozhong:before { .icon-naozhong:before {
content: "\e666"; content: "\e666";
} }
.icon-ic_business_refund24px:before { .icon-ic_business_refund24px:before {
content: "\e619"; content: "\e619";
} }
.icon-shoucang:before { .icon-shoucang:before {
content: "\e606"; content: "\e606";
} }
.icon-pinglun:before { .icon-pinglun:before {
content: "\e618"; content: "\e618";
} }
.icon-aixin:before { .icon-aixin:before {
content: "\e622"; content: "\e622";
} }
src/assets/iconfont/iconfont.js 0 → 100644
View file @ 43499cc9
This diff is collapsed.
src/assets/iconfont/iconfont.json 0 → 100644
View file @ 43499cc9
{
"id": "4633414",
"name": "驻场",
"font_family": "iconfont",
"css_prefix_text": "icon-",
"description": "",
"glyphs": [
{
"icon_id": "10715420",
"name": "更多",
"font_class": "gengduo",
"unicode": "e633",
"unicode_decimal": 58931
},
{
"icon_id": "14542055",
"name": "已领取",
"font_class": "lianhe40",
"unicode": "e866",
"unicode_decimal": 59494
},
{
"icon_id": "5501759",
"name": "双下箭头",
"font_class": "shuangxiajiantou",
"unicode": "e660",
"unicode_decimal": 58976
},
{
"icon_id": "77697",
"name": "点赞",
"font_class": "dianzan",
"unicode": "e602",
"unicode_decimal": 58882
},
{
"icon_id": "6380878",
"name": "点赞_块",
"font_class": "dianzan_kuai",
"unicode": "ec8c",
"unicode_decimal": 60556
},
{
"icon_id": "5028",
"name": "喜爱",
"font_class": "xiai",
"unicode": "e601",
"unicode_decimal": 58881
},
{
"icon_id": "5643534",
"name": "通知",
"font_class": "tongzhi",
"unicode": "e60d",
"unicode_decimal": 58893
},
{
"icon_id": "11391522",
"name": "分享",
"font_class": "fenxiang",
"unicode": "e639",
"unicode_decimal": 58937
},
{
"icon_id": "22652637",
"name": "双上箭头-01",
"font_class": "shuangshangjiantou-",
"unicode": "e600",
"unicode_decimal": 58880
},
{
"icon_id": "4266166",
"name": "警告",
"font_class": "jinggao",
"unicode": "e716",
"unicode_decimal": 59158
},
{
"icon_id": "6304017",
"name": "倒计时",
"font_class": "rs-countdown",
"unicode": "e614",
"unicode_decimal": 58900
},
{
"icon_id": "11737375",
"name": "闹钟",
"font_class": "naozhong",
"unicode": "e666",
"unicode_decimal": 58982
},
{
"icon_id": "15053956",
"name": "退钱",
"font_class": "ic_business_refund24px",
"unicode": "e619",
"unicode_decimal": 58905
},
{
"icon_id": "5849192",
"name": "收藏",
"font_class": "shoucang",
"unicode": "e606",
"unicode_decimal": 58886
},
{
"icon_id": "13053964",
"name": "评论",
"font_class": "pinglun",
"unicode": "e618",
"unicode_decimal": 58904
},
{
"icon_id": "19877102",
"name": "爱心",
"font_class": "aixin",
"unicode": "e622",
"unicode_decimal": 58914
}
]
}
src/pages.json
View file @ 43499cc9
...@@ -218,6 +218,18 @@ ...@@ -218,6 +218,18 @@
"style": { "style": {
"navigationBarTitleText": "线路详情" "navigationBarTitleText": "线路详情"
} }
},
{
"path": "pages/address/addressList",
"style": {
"navigationBarTitleText": "地址管理列表"
}
},
{
"path": "pages/address/addressEdit",
"style": {
"navigationBarTitleText": "编辑收货地址"
}
} }
], ],
"globalStyle": { "globalStyle": {
......
src/pages/address/addressEdit.vue 0 → 100644
View file @ 43499cc9
<template>
<view class="container">
<template v-if="newAddressFlag">
<Header title="新增收货地址"></Header>
</template>
<template v-else>
<Header title="编辑收货地址"></Header>
</template>
<view class="content">
<wd-form ref="form" :model="model" id="form">
<wd-cell-group border>
<wd-input
label="联系人"
label-width="80px"
prop="name"
v-model="model.name"
placeholder="请输入联系人姓名"
:rules="[{ required: false, validator: fieldNotEmpty, message: '姓名不能为空' }]"
/>
<wd-input
label="手机号"
label-width="80px"
prop="phone"
v-model="model.phone"
placeholder="请输入联系人手机号"
:rules="[{ required: false, pattern: /^1[3-9]\d{9}$/, message: '请输入正确的手机号' }]"
/>
<wd-input
label="详细地址"
label-width="80px"
prop="detailAddress"
v-model="model.detailAddress"
placeholder="请输入详细地址"
:rules="[{ required: false, validator: fieldNotEmpty, message: '详细地址不能为空' }]"
/>
<wd-checkbox-group>
<wd-cell title="所在地区" title-width="80px">
<view class="area">
<view class="area_l" @tap="changeLocation">
<view class="area_lt">这是当前定位</view>
<view class="area_lb">这是定位的详细地址点击可跳转地图选择</view>
</view>
<view class="area_r">
<wd-icon name="location" size="22px" @tap="changeLocation"></wd-icon>
</view>
</view>
</wd-cell>
</wd-checkbox-group>
<wd-checkbox-group v-model="model.isDefaultAddress" size="large">
<wd-cell title="设置为默认地址" center clickable @click="setDefaultAddress">
<view>
<wd-checkbox
model-value="1"
ref="checkBoxAdress"
checked-color="#fa5151"
custom-style="margin-right:-18rpx"
></wd-checkbox>
</view>
</wd-cell>
</wd-checkbox-group>
</wd-cell-group>
<view class="footer">
<wd-button type="error" block class="addBtn" @click="handleSubmit">保存</wd-button>
</view>
</wd-form>
</view>
</view>
</template>
<script setup>
import Header from '@/pages/order/components/Header/index.vue';
const fileDomain = import.meta.env.VITE_APP_IMG_URL;
const newAddressFlag = ref(false);
const form = ref();
const checkBoxAdress = ref();
const model = ref({
name: '',
phone: '',
detailAddress: '',
isDefaultAddress: [],
});
onLoad((options) => {
newAddressFlag.value = options.new;
if (newAddressFlag.value) {
model.value = ref({
name: '',
phone: '',
detailAddress: '',
isDefaultAddress: [],
});
} else {
model.value.name = '这是名字';
model.value.phone = '13655844265';
model.value.detailAddress = '贵州省贵阳市南明区';
model.value.isDefaultAddress = ['1'];
}
});
function setDefaultAddress() {
// checkBoxAdress.value && checkBoxAdress.value.toggle();
console.log(model.value.isDefaultAddress);
}
function fieldNotEmpty(val) {
if (String(val).length >= 1) {
return true;
} else {
return false;
}
}
function handleSubmit() {
form.value
.validate()
.then(({ valid, errors }) => {
if (valid) {
xma.showToast({
title: '更新成功',
duration: 2000,
success: function () {
console.log('数据更新后跳转地址列表页');
},
});
}
})
.catch((error) => {
console.log(error, 'error');
});
}
// 重新定位收货地址
function changeLocation() {
console.log('aaa');
}
</script>
<style lang="scss" scoped>
page {
background: #f9f9f9;
}
.container {
width: 375 * 2rpx;
margin: 0 auto;
font-family: Source Han Sans;
font-variation-settings: 'opsz' auto;
font-feature-settings: 'kern' on;
.content {
padding-top: 88rpx;
#form {
width: 710rpx;
margin: 20rpx auto;
}
.wd-input__label.is-required::after {
display: none !important;
}
.addBtn {
width: 630rpx;
height: 72rpx;
border-radius: 18px;
opacity: 1;
background: #fa5151;
position: fixed;
bottom: 80rpx;
left: 50%;
margin-left: -315rpx;
}
.area {
display: flex;
width: 100%;
align-items: center;
.area_l {
flex: 1;
display: flex;
flex-direction: column;
.area_lt {
font-size: 24rpx;
font-weight: 500;
line-height: 24rpx;
color: #3d3d3d;
text-align: left;
margin-bottom: 10rpx;
}
.area_lb {
font-size: 24rpx;
font-weight: normal;
line-height: 24rpx;
color: #abaaaa;
text-align: left;
}
}
.area_r {
width: 40rpx;
}
}
}
}
</style>
src/pages/address/addressList.vue 0 → 100644
View file @ 43499cc9
<template>
<view class="container">
<Header title="地址管理"></Header>
<view class="content">
<view class="empty_list" v-if="isAdressEmpty">
<img src="@/static/address/address.png" />
<wd-button type="error" block class="addBtn" @tap="addNewAddress">新增地址</wd-button>
</view>
<view class="full_list" v-else>
<view class="additem">
<view class="additem_l">
<view class="address">这是地址这是地址这是地址这是地址这是地 址这是地址这是地址</view>
<view class="info">
<view class="name">这是姓名</view>
<view class="phone">123456789258</view>
</view>
<view class="address_status">
<view v-if="mainAddFlag" class="box active">
<wd-icon name="check-circle-filled" size="12px"></wd-icon>
<view class="txt">默认</view>
</view>
<view v-else class="box">
<wd-icon name="circle1" size="12px"></wd-icon>
<view class="txt">默认</view>
</view>
</view>
</view>
<view class="additem_r">
<wd-icon name="edit-outline" size="14px" @tap="editAddress"></wd-icon>
</view>
</view>
<view class="additem">
<view class="additem_l">
<view class="address">这是地址这是地址这是地址这是地址这是地 址这是地址这是地址</view>
<view class="info">
<view class="name">这是姓名</view>
<view class="phone">123456789258</view>
</view>
<view class="address_status">
<view v-if="mainAddFlag" class="box active">
<wd-icon name="check-circle-filled" size="12px"></wd-icon>
<view class="txt">默认</view>
</view>
<view v-else class="box">
<wd-icon name="circle1" size="12px"></wd-icon>
<view class="txt">默认</view>
</view>
</view>
</view>
<view class="additem_r">
<wd-icon name="edit-outline" size="14px" @tap="editAddress"></wd-icon>
</view>
</view>
<wd-button type="error" block class="addBtn" @tap="addNewAddress">新增地址</wd-button>
</view>
</view>
</view>
</template>
<script setup>
import Header from '@/pages/order/components/Header/index.vue';
const fileDomain = import.meta.env.VITE_APP_IMG_URL;
const isAdressEmpty = ref(false);
const mainAddFlag = ref(false);
const addNewAddress = () => {
xma.navigateTo({ url: '/pages/address/addressEdit?new=true' });
};
const editAddress = () => {
xma.navigateTo({ url: '/pages/address/addressEdit' });
};
onLoad(() => {
xma.getLocation({
success: (res) => {
console.log(res);
},
fail: (err) => {
console.log(err);
},
});
});
</script>
<style lang="scss" scoped>
page {
background: #f9f9f9;
}
.container {
width: 375 * 2rpx;
margin: 0 auto;
.content {
padding-top: 88rpx;
.full_list {
margin-top: 20rpx;
.additem {
width: 710rpx;
padding: 20rpx;
box-sizing: border-box;
border-radius: 8px;
background: #ffffff;
margin: 20rpx auto 20rpx;
display: flex;
flex-direction: row;
font-family: Source Han Sans;
font-variation-settings: 'opsz' auto;
font-feature-settings: 'kern' on;
.additem_l {
width: 600rpx;
display: flex;
flex-direction: column;
}
.additem_r {
flex: 1;
padding-top: 30rpx;
box-sizing: border-box;
text-align: right;
}
.address {
font-size: 24rpx;
font-weight: 500;
line-height: 32rpx;
letter-spacing: 0em;
color: #3d3d3d;
margin-bottom: 20rpx;
}
.info {
font-size: 22rpx;
font-weight: normal;
line-height: 22rpx;
color: #abaaaa;
display: flex;
margin-bottom: 30rpx;
.phone {
margin-left: 10rpx;
}
}
.address_status {
.box {
display: flex;
font-size: 18rpx;
align-items: center;
.txt {
margin-left: 5rpx;
color: #abaaaa;
}
}
.box.active {
color: #fa5151;
}
}
}
.addBtn {
width: 630rpx;
height: 72rpx;
border-radius: 18px;
opacity: 1;
background: #fa5151;
position: fixed;
bottom: 80rpx;
left: 50%;
margin-left: -315rpx;
}
}
.empty_list {
margin-top: 20rpx;
img {
width: 566rpx;
height: 566rpx;
margin: 40rpx auto 60rpx;
display: block;
border: 1px dashed rgb(182, 182, 182);
}
.addBtn {
width: 630rpx;
height: 72rpx;
border-radius: 18px;
opacity: 1;
background: #fa5151;
}
}
}
}
</style>
src/pages/assistingAgriculture/RuralTravel/RuralTravel.vue
View file @ 43499cc9
...@@ -5,12 +5,16 @@ ...@@ -5,12 +5,16 @@
<Search <Search
background="rgba(255, 255, 255, 0.8)" background="rgba(255, 255, 255, 0.8)"
backIcon="black" backIcon="black"
iconSrc="/static/assets/left.png" iconSrc="/static/assistingAgriculture/assets/left.png"
placeholderText="请输入要搜索的关键词" placeholderText="请输入要搜索的关键词"
></Search> ></Search>
</view> </view>
<view class="bac-img"> <view class="bac-img">
<img class="bac" src="/static/rural/bacImg.png" style="width: 750rpx; height: 440rpx" /> <img
class="bac"
src="/static/assistingAgriculture/rural/bacImg.png"
style="width: 750rpx; height: 440rpx"
/>
</view> </view>
<!-- 热门--> <!-- 热门-->
<view style="display: flex; flex-direction: row"> <view style="display: flex; flex-direction: row">
...@@ -18,19 +22,27 @@ ...@@ -18,19 +22,27 @@
<text class="left-title">特价专区</text> <text class="left-title">特价专区</text>
<img <img
class="special-icon" class="special-icon"
src="/static/rural/specialOffer.png" src="/static/assistingAgriculture/rural/specialOffer.png"
style="width: 29rpx; height: 25rpx" style="width: 29rpx; height: 25rpx"
/> />
<img class="spe-img" src="/static/rural/img7.png" style="width: 306rpx; height: 204rpx" /> <img
class="spe-img"
src="/static/assistingAgriculture/rural/img7.png"
style="width: 306rpx; height: 204rpx"
/>
</view> </view>
<view class="right-offer"> <view class="right-offer">
<text class="left-title">日游直播</text> <text class="left-title">日游直播</text>
<img <img
class="special-icon" class="special-icon"
src="/static/rural/dayTOur.png" src="/static/assistingAgriculture/rural/dayTOur.png"
style="width: 32rpx; height: 32rpx" style="width: 32rpx; height: 32rpx"
/> />
<img class="spe-img" src="/static/rural/img5.png" style="width: 306rpx; height: 204rpx" /> <img
class="spe-img"
src="/static/assistingAgriculture/rural/img5.png"
style="width: 306rpx; height: 204rpx"
/>
</view> </view>
</view> </view>
<view class="hot-way"> <view class="hot-way">
...@@ -46,10 +58,14 @@ ...@@ -46,10 +58,14 @@
<view class="foodCard" v-for="(item, index) in 5" :key="index"> <view class="foodCard" v-for="(item, index) in 5" :key="index">
<!-- <img--> <!-- <img-->
<!-- class="img-icon"--> <!-- class="img-icon"-->
<!-- src="/static/rural/icon.png"--> <!-- src="/static/assistingAgriculture/rural/icon.png"-->
<!-- style="width: 118rpx; height: 32rpx"--> <!-- style="width: 118rpx; height: 32rpx"-->
<!-- />--> <!-- />-->
<image class="test5" src="/static/rural/img4.png" mode="widthFix" /> <image
class="test5"
src="/static/assistingAgriculture/rural/img4.png"
mode="widthFix"
/>
</view> </view>
</scroll-view> </scroll-view>
<!-- 列表--> <!-- 列表-->
...@@ -141,11 +157,11 @@ ...@@ -141,11 +157,11 @@
</template> </template>
<script setup lang="ts"> <script setup lang="ts">
import Search from '../../components/index/Search.vue'; import Search from '../../../components/assistingAgriculture/index/Search.vue';
import Sort from '../../components/index/Sort.vue'; import Sort from '../../../components/assistingAgriculture/index/Sort.vue';
import DepartureDate from '../../components/index/DepartureDate.vue'; import DepartureDate from '../../../components/assistingAgriculture/index/DepartureDate.vue';
import ScenicSpots from '../../components/index/ScenicSpots.vue'; import ScenicSpots from '../../../components/assistingAgriculture/index/ScenicSpots.vue';
import Screen from '../../components/index/Screen.vue'; import Screen from '../../../components/assistingAgriculture/index/Screen.vue';
const rotate = ref(false); const rotate = ref(false);
const rotate2 = ref(false); const rotate2 = ref(false);
...@@ -153,7 +169,7 @@ const rotate3 = ref(false); ...@@ -153,7 +169,7 @@ const rotate3 = ref(false);
const rotate4 = ref(false); const rotate4 = ref(false);
const cardList = ref([ const cardList = ref([
{ {
img: '/static/rural/img2.png', img: '/static/assistingAgriculture/rural/img2.png',
title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游', title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
give: '赠价值59元特产伴手礼一份', give: '赠价值59元特产伴手礼一份',
tag: ['可定明日', '无购物', '含保险'], tag: ['可定明日', '无购物', '含保险'],
...@@ -163,7 +179,7 @@ const cardList = ref([ ...@@ -163,7 +179,7 @@ const cardList = ref([
price: '299.00', price: '299.00',
}, },
{ {
img: '/static/rural/img2.png', img: '/static/assistingAgriculture/rural/img2.png',
title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游', title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
give: '赠价值59元特产伴手礼一份', give: '赠价值59元特产伴手礼一份',
tag: ['可定明日', '无购物', '含保险'], tag: ['可定明日', '无购物', '含保险'],
...@@ -173,7 +189,7 @@ const cardList = ref([ ...@@ -173,7 +189,7 @@ const cardList = ref([
price: '299.00', price: '299.00',
}, },
{ {
img: '/static/rural/img2.png', img: '/static/assistingAgriculture/rural/img2.png',
title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游', title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
give: '赠价值59元特产伴手礼一份', give: '赠价值59元特产伴手礼一份',
tag: ['可定明日', '无购物', '含保险'], tag: ['可定明日', '无购物', '含保险'],
...@@ -183,7 +199,7 @@ const cardList = ref([ ...@@ -183,7 +199,7 @@ const cardList = ref([
price: '299.00', price: '299.00',
}, },
{ {
img: '/static/rural/img2.png', img: '/static/assistingAgriculture/rural/img2.png',
title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游', title: '红枫湖+青岩古镇+云漫湖+云顶高坡景区一日游',
give: '赠价值59元特产伴手礼一份', give: '赠价值59元特产伴手礼一份',
tag: ['可定明日', '无购物', '含保险'], tag: ['可定明日', '无购物', '含保险'],
...@@ -224,7 +240,7 @@ const locationFiltering = (index) => { ...@@ -224,7 +240,7 @@ const locationFiltering = (index) => {
function toRouteDetails() { function toRouteDetails() {
// TODO: 跳转到线路详情 // TODO: 跳转到线路详情
xma.navigateTo({ xma.navigateTo({
url: '/pages/RouteDetails/RouteDetails', url: '/pages/assistingAgriculture/RouteDetails/RouteDetails',
}); });
} }
</script> </script>
......
src/pages/assistingAgriculture/cart/ConfirmOrder.vue
View file @ 43499cc9
...@@ -6,9 +6,17 @@ ...@@ -6,9 +6,17 @@
<view class="hypotenuse-view"></view> <view class="hypotenuse-view"></view>
</view> </view>
<view class="location"> <view class="location">
<img class="location-pic" src="/src/static/assets/location.png" alt="" /> <img
class="location-pic"
src="/src/static/assistingAgriculture/assets/location.png"
alt=""
/>
<view class="location-text">贵州省贵阳市南明区花果园中环广场3号楼 1718</view> <view class="location-text">贵州省贵阳市南明区花果园中环广场3号楼 1718</view>
<img class="location-icon" src="/src/static/assets/right-arrow.png" alt="" /> <img
class="location-icon"
src="/src/static/assistingAgriculture/assets/right-arrow.png"
alt=""
/>
<view class="customer-information"> <view class="customer-information">
<view class="customer-name">张三</view> <view class="customer-name">张三</view>
<view class="customer-phone">187****5632</view> <view class="customer-phone">187****5632</view>
...@@ -18,14 +26,22 @@ ...@@ -18,14 +26,22 @@
<text class="send-time">立即送出</text> <text class="send-time">立即送出</text>
<view class="estimated-time">大约13:45送达</view> <view class="estimated-time">大约13:45送达</view>
<view class="estimated-icon"></view> <view class="estimated-icon"></view>
<img class="estimated-icon" src="/src/static/assets/right-arrow.png" alt="" /> <img
class="estimated-icon"
src="/src/static/assistingAgriculture/assets/right-arrow.png"
alt=""
/>
</view> </view>
</view> </view>
<view class="commordity-information-view"> <view class="commordity-information-view">
<view class="trade-name">杨家黄焖鸡</view> <view class="trade-name">杨家黄焖鸡</view>
<view class="commordity-content"> <view class="commordity-content">
<view class="commordity-details"> <view class="commordity-details">
<img class="commodity-picture" src="/src/static/assets/img1.png" alt="" /> <img
class="commodity-picture"
src="/src/static/assistingAgriculture/assets/img1.png"
alt=""
/>
<view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view> <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
<view class="price-information"> <view class="price-information">
<text class="price-symbol">￥</text> <text class="price-symbol">￥</text>
...@@ -35,7 +51,11 @@ ...@@ -35,7 +51,11 @@
<view class="label">约1000克</view> <view class="label">约1000克</view>
</view> </view>
<view class="commordity-details"> <view class="commordity-details">
<img class="commodity-picture" src="/src/static/assets/img1.png" alt="" /> <img
class="commodity-picture"
src="/src/static/assistingAgriculture/assets/img1.png"
alt=""
/>
<view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view> <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
<view class="price-information"> <view class="price-information">
<text class="price-symbol">￥</text> <text class="price-symbol">￥</text>
...@@ -50,7 +70,11 @@ ...@@ -50,7 +70,11 @@
<view class="discount-coupon">卷</view> <view class="discount-coupon">卷</view>
<view class="discount-coupon-text">商家优惠券</view> <view class="discount-coupon-text">商家优惠券</view>
<view class="discount-coupon-price">￥0</view> <view class="discount-coupon-price">￥0</view>
<img class="discount-coupon-icon" src="/src/static/assets/right-arrow.png" alt="" /> <img
class="discount-coupon-icon"
src="/src/static/assistingAgriculture/assets/right-arrow.png"
alt=""
/>
</view> </view>
</view> </view>
<view class="freight-view"> <view class="freight-view">
......
src/pages/assistingAgriculture/cart/cart(old).vue
View file @ 43499cc9
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<view class="commodity-information"> <view class="commodity-information">
<view class="commodity-checkbox"></view> <view class="commodity-checkbox"></view>
<img class="commodity-picture" src="/src/static/assets/fruit.png" alt="" /> <img class="commodity-picture" src="/src/static/assistingAgriculture/assets/fruit.png" alt="" />
<view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view> <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
<view class="label">约1000克</view> <view class="label">约1000克</view>
<view class="price-information"> <view class="price-information">
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
<view class="commodity-information"> <view class="commodity-information">
<view class="commodity-checkbox"></view> <view class="commodity-checkbox"></view>
<img class="commodity-picture" src="/src/static/assets/fruit.png" alt="" /> <img class="commodity-picture" src="/src/static/assistingAgriculture/assets/fruit.png" alt="" />
<view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view> <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
<view class="label">约1000克</view> <view class="label">约1000克</view>
<view class="price-information"> <view class="price-information">
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
</view> </view>
<view class="commodity-information"> <view class="commodity-information">
<view class="commodity-checkbox"></view> <view class="commodity-checkbox"></view>
<img class="commodity-picture" src="/src/static/assets/fruit.png" alt="" /> <img class="commodity-picture" src="/src/static/assistingAgriculture/assets/fruit.png" alt="" />
<view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view> <view class="commodity-name">招牌黄焖鸡+米饭（土豆+生菜）</view>
<view class="label">约1000克</view> <view class="label">约1000克</view>
<view class="price-information"> <view class="price-information">
......
src/pages/assistingAgriculture/cart/cart.vue
View file @ 43499cc9
...@@ -143,7 +143,7 @@ const changeCheckedAll = () => { ...@@ -143,7 +143,7 @@ const changeCheckedAll = () => {
function toSettle() { function toSettle() {
// TODO: 跳转到结算页面 // TODO: 跳转到结算页面
xma.navigateTo({ xma.navigateTo({
url: '/pages/cart/ConfirmOrder', url: '/pages/assistingAgriculture/cart/ConfirmOrder',
}); });
} }
</script> </script>
......
src/pages/assistingAgriculture/detail/detail.vue
View file @ 43499cc9
...@@ -6,23 +6,27 @@ ...@@ -6,23 +6,27 @@
<Search <Search
background="rgba(255, 255, 255, 0.8)" background="rgba(255, 255, 255, 0.8)"
backIcon="black" backIcon="black"
iconSrc="/static/assets/blackLeft.png" iconSrc="/static/assistingAgriculture/assets/blackLeft.png"
placeholderText="请输入要搜索的内容" placeholderText="请输入要搜索的内容"
></Search> ></Search>
</view> </view>
</view> </view>
<!-- 图片--> <!-- 图片-->
<view class="nav"> <view class="nav">
<img class="main-img" src="/static/detail/img2.png" style="width: 750rpx; height: 668rpx" /> <img
class="main-img"
src="/static/assistingAgriculture/detail/img2.png"
style="width: 750rpx; height: 668rpx"
/>
<view class="pre-icon"> <view class="pre-icon">
<img <img
class="left-icon" class="left-icon"
src="/static/detail/img4.png" src="/static/assistingAgriculture/detail/img4.png"
style="width: 248rpx; height: 100rpx; position: relative" style="width: 248rpx; height: 100rpx; position: relative"
/> />
<img <img
class="right-icon" class="right-icon"
src="/static/detail/img3.png" src="/static/assistingAgriculture/detail/img3.png"
style="width: 546rpx; height: 62rpx" style="width: 546rpx; height: 62rpx"
/> />
</view> </view>
...@@ -38,7 +42,7 @@ ...@@ -38,7 +42,7 @@
这是商品简介这是商品简介这是商品简介这是商品简介这是商品 简介这是商品简介这是商品简介 这是商品简介这是商品简介这是商品简介这是商品简介这是商品 简介这是商品简介这是商品简介
</view> </view>
<view> <view>
<img class="share-img" src="/static/detail/share.png" /> <img class="share-img" src="/static/assistingAgriculture/detail/share.png" />
<text class="share-text" @click="share">分享</text> <text class="share-text" @click="share">分享</text>
</view> </view>
</view> </view>
...@@ -52,24 +56,33 @@ ...@@ -52,24 +56,33 @@
<!-- 详情图--> <!-- 详情图-->
<view class="detail-info"> <view class="detail-info">
<text class="info-title">详情</text> <text class="info-title">详情</text>
<img class="info-img" src="/static/detail/detail-img.png" /> <img class="info-img" src="/static/assistingAgriculture/detail/detail-img.png" />
<img class="info-img" src="/static/detail/detail-img.png" /> <img class="info-img" src="/static/assistingAgriculture/detail/detail-img.png" />
</view> </view>
<!-- 底部--> <!-- 底部-->
<view class="detail-bottom"> <view class="detail-bottom">
<view class="sort"> <view class="sort">
<view class="bottom" style="display: flex; flex-direction: row"> <view class="bottom" style="display: flex; flex-direction: row">
<view class="borderClass" @tap="toStore"> <view class="borderClass" @tap="toStore">
<img src="/static/detail/img7.png" style="width: 40rpx; height: 40rpx" /> <img
src="/static/assistingAgriculture/detail/img7.png"
style="width: 40rpx; height: 40rpx"
/>
<view class="sort-text">店铺</view> <view class="sort-text">店铺</view>
</view> </view>
<view class="borderClass"> <view class="borderClass">
<img src="/static/detail/img8.png" style="width: 40rpx; height: 40rpx" /> <img
src="/static/assistingAgriculture/detail/img8.png"
style="width: 40rpx; height: 40rpx"
/>
<view class="sort-text">客服</view> <view class="sort-text">客服</view>
</view> </view>
<view class="borderClass" @tap="toCart"> <view class="borderClass" @tap="toCart">
<wd-badge modelValue="4"> <wd-badge modelValue="4">
<img src="/static/detail/car.png" style="width: 40rpx; height: 40rpx" /> <img
src="/static/assistingAgriculture/detail/car.png"
style="width: 40rpx; height: 40rpx"
/>
</wd-badge> </wd-badge>
<view class="sort-text">购物车</view> <view class="sort-text">购物车</view>
</view> </view>
...@@ -91,21 +104,21 @@ ...@@ -91,21 +104,21 @@
</template> </template>
<script setup> <script setup>
import Search from '../../components/index/Search.vue'; import Search from '../../../components/assistingAgriculture/index/Search.vue';
import { ref } from 'vue'; import { ref } from 'vue';
import { onShow } from '@dcloudio/uni-app'; import { onShow } from '@dcloudio/uni-app';
// 图片 // 图片
const swiperList = ref([ const swiperList = ref([
'../../static/detail/img2.png', '../../static/assistingAgriculture/detail/img2.png',
'../../static/detail/img2.png', '../../static/assistingAgriculture/detail/img2.png',
'../../static/detail/img2.png', '../../static/assistingAgriculture/detail/img2.png',
]); ]);
// 底部 // 底部
const storeList = ref([ const storeList = ref([
{ img: '/static/detail/img7.png', text: '店铺' }, { img: '/static/assistingAgriculture/detail/img7.png', text: '店铺' },
{ img: '/static/detail/img8.png', text: '客服' }, { img: '/static/assistingAgriculture/detail/img8.png', text: '客服' },
{ img: '/static/detail/img6.png', text: '购物车' }, { img: '/static/assistingAgriculture/detail/img6.png', text: '购物车' },
]); ]);
// 进入页面回到顶部 // 进入页面回到顶部
onShow(() => { onShow(() => {
...@@ -120,13 +133,13 @@ const share = () => { ...@@ -120,13 +133,13 @@ const share = () => {
function toStore() { function toStore() {
// TODO: 跳转到筑农严选 // TODO: 跳转到筑农严选
xma.navigateTo({ xma.navigateTo({
url: '/pages/shop/index', url: '/pages/assistingAgriculture/shop/index',
}); });
} }
function toCart() { function toCart() {
// TODO: 跳转到购物车 // TODO: 跳转到购物车
xma.navigateTo({ xma.navigateTo({
url: '/pages/cart/cart', url: '/pages/assistingAgriculture/cart/cart',
}); });
} }
</script> </script>
......
src/pages/assistingAgriculture/index/building.vue
View file @ 43499cc9
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<Search <Search
background="rgba(255, 255, 255, 0.8)" background="rgba(255, 255, 255, 0.8)"
backIcon="black" backIcon="black"
iconSrc="/static/assets/blackLeft.png" iconSrc="/static/assistingAgriculture/assets/blackLeft.png"
placeholderText="请输入要搜索的内容" placeholderText="请输入要搜索的内容"
></Search> ></Search>
</view> </view>
...@@ -24,19 +24,19 @@ ...@@ -24,19 +24,19 @@
<view class="nav-img"> <view class="nav-img">
<img <img
class="culture" class="culture"
src="/static/assets/culture.png" src="/static/assistingAgriculture/assets/culture.png"
style="width: 366rpx; height: 362rpx" style="width: 366rpx; height: 362rpx"
/> />
<view class="right-img"> <view class="right-img">
<img <img
class="delicacy" class="delicacy"
src="/static/assets/delicacy.png" src="/static/assistingAgriculture/assets/delicacy.png"
style="height: 176rpx; margin-left: 8rpx" style="height: 176rpx; margin-left: 8rpx"
/> />
<img <img
@tap="toPresale" @tap="toPresale"
class="fresh" class="fresh"
src="/static/assets/fresh.png" src="/static/assistingAgriculture/assets/fresh.png"
style="height: 176rpx; margin-left: 8rpx" style="height: 176rpx; margin-left: 8rpx"
/> />
</view> </view>
...@@ -57,13 +57,13 @@ ...@@ -57,13 +57,13 @@
<img <img
@tap="toDetail" @tap="toDetail"
class="rice" class="rice"
src="/static/assets/rice.png" src="/static/assistingAgriculture/assets/rice.png"
style="width: 670rpx; height: 236rpx" style="width: 670rpx; height: 236rpx"
/> />
<img <img
@tap="toDetail" @tap="toDetail"
class="potato" class="potato"
src="/static/assets/potato.png" src="/static/assistingAgriculture/assets/potato.png"
style="width: 650rpx; height: 236rpx; margin-left: 20rpx; margin-top: -20rpx" style="width: 650rpx; height: 236rpx; margin-left: 20rpx; margin-top: -20rpx"
/> />
</view> </view>
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
<view class="tabs-list"> <view class="tabs-list">
<img <img
class="fruit-img" class="fruit-img"
src="/static/assets/fruit4.png" src="/static/assistingAgriculture/assets/fruit4.png"
style="width: 670rpx; height: 236rpx" style="width: 670rpx; height: 236rpx"
/> />
<view class="sort-list"> <view class="sort-list">
...@@ -93,45 +93,57 @@ ...@@ -93,45 +93,57 @@
<view class="price-page"> <view class="price-page">
<text class="price">￥{{ item.price }}</text> <text class="price">￥{{ item.price }}</text>
</view> </view>
<img class="presale" src="/static/assets/car.png" style="width: 40rpx; height: 40rpx" /> <img
class="presale"
src="/static/assistingAgriculture/assets/car.png"
style="width: 40rpx; height: 40rpx"
/>
</view> </view>
</view> </view>
</view> </view>
<!-- 购物车悬浮按钮 --> <!-- 购物车悬浮按钮 -->
<view class="cart-floating" @tap="toCart"> <view class="cart-floating" @tap="toCart">
<wd-badge modelValue="4"> <wd-badge modelValue="4">
<img class="shop-car" src="/static/presale/cart.png" style="width: 40rpx; height: 40rpx" /> <img
class="shop-car"
src="/static/assistingAgriculture/presale/cart.png"
style="width: 40rpx; height: 40rpx"
/>
</wd-badge> </wd-badge>
</view> </view>
</view> </view>
</template> </template>
<script setup> <script setup>
import Search from '../../components/index/Search.vue'; import Search from '../../../components/assistingAgriculture/index/Search.vue';
const current = ref(0); const current = ref(0);
const light = ref(0); const light = ref(0);
// 轮播图 // 轮播图
const swiperList = ref([ const swiperList = ref([
'../../static/assets/village.png', '../../../static/assistingAgriculture/assets/village.png',
'../../static/assets/village.png', '../../../static/assistingAgriculture/assets/village.png',
'../../static/assets/village.png', '../../../static/assistingAgriculture/assets/village.png',
]); ]);
// 分类列表数据 // 分类列表数据
const tabsData = ref([ const tabsData = ref([
{ img: '/static/assets/mainPicture.png', text: '水果生鲜' }, { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '水果生鲜' },
{ img: '/static/assets/presale.png', text: '米面粮油' }, { img: '/static/assistingAgriculture/assets/presale.png', text: '米面粮油' },
{ img: '/static/assets/mainPicture.png', text: '农家干货' }, { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '农家干货' },
{ img: '/static/assets/mainPicture.png', text: '鲜货预售' }, { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '鲜货预售' },
{ img: '/static/assets/mainPicture.png', text: '水果生鲜' }, { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '水果生鲜' },
{ img: '/static/assets/mainPicture.png', text: '米面粮油' }, { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '米面粮油' },
{ img: '/static/assets/mainPicture.png', text: '农家干货' }, { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '农家干货' },
{ img: '/static/assets/mainPicture.png', text: '鲜货预售' }, { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '鲜货预售' },
]); ]);
const detailList = ref([ const detailList = ref([
{ img: '/static/assets/fruit.png', price: '2555', text: '这是草莓这是草莓' }, { img: '/static/assistingAgriculture/assets/fruit.png', price: '2555', text: '这是草莓这是草莓' },
{ img: '/static/assets/fruit1.png', price: '2555', text: '这是草莓这是草莓' }, {
{ img: '/static/assets/fruit2.png', price: '2555', text: '麻辣鱼豆腐' }, img: '/static/assistingAgriculture/assets/fruit1.png',
{ img: '/static/assets/fruit3.png', price: '2555', text: '麻辣鱼豆腐' }, price: '2555',
text: '这是草莓这是草莓',
},
{ img: '/static/assistingAgriculture/assets/fruit2.png', price: '2555', text: '麻辣鱼豆腐' },
{ img: '/static/assistingAgriculture/assets/fruit3.png', price: '2555', text: '麻辣鱼豆腐' },
]); ]);
const choice = (index) => { const choice = (index) => {
light.value = index; light.value = index;
...@@ -145,19 +157,19 @@ function onChange(e) { ...@@ -145,19 +157,19 @@ function onChange(e) {
function toPresale() { function toPresale() {
// TODO: 跳转到预售 // TODO: 跳转到预售
xma.navigateTo({ xma.navigateTo({
url: '/pages/index/presale', url: '/pages/assistingAgriculture/index/presale',
}); });
} }
function toDetail() { function toDetail() {
// TODO: 跳转到详情页 // TODO: 跳转到详情页
xma.navigateTo({ xma.navigateTo({
url: '/pages/detail/detail', url: '/pages/assistingAgriculture/detail/detail',
}); });
} }
function toCart() { function toCart() {
// TODO: 跳转到购物车 // TODO: 跳转到购物车
xma.navigateTo({ xma.navigateTo({
url: '/pages/cart/cart', url: '/pages/assistingAgriculture/cart/cart',
}); });
} }
</script> </script>
...@@ -257,7 +269,7 @@ page { ...@@ -257,7 +269,7 @@ page {
content: ''; content: '';
width: 40rpx; width: 40rpx;
height: 12rpx; height: 12rpx;
background: url('../../static/assets/selected.png') no-repeat; background: url('../../static/assistingAgriculture/assets/selected.png') no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
position: absolute; position: absolute;
bottom: -16rpx; bottom: -16rpx;
......
src/pages/assistingAgriculture/index/presale.vue
View file @ 43499cc9
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<Search <Search
background="rgba(255, 255, 255, 0.8)" background="rgba(255, 255, 255, 0.8)"
backIcon="black" backIcon="black"
iconSrc="/static/assets/left.png" iconSrc="/static/assistingAgriculture/assets/left.png"
placeholderText="输入商品名称" placeholderText="输入商品名称"
></Search> ></Search>
</view> </view>
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<view> <view>
<img <img
class="buy-img" class="buy-img"
src="/static/presale/img6.png" src="/static/assistingAgriculture/presale/img6.png"
style=" style="
position: sticky; position: sticky;
width: 284rpx; width: 284rpx;
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
<image :src="good.image" mode="widthFix"></image> <image :src="good.image" mode="widthFix"></image>
<image <image
class="presale-img" class="presale-img"
src="/static/presale/presale.png" src="/static/assistingAgriculture/presale/presale.png"
style=" style="
width: 132rpx; width: 132rpx;
height: 64rpx; height: 64rpx;
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
/> />
<image <image
class="preview-img" class="preview-img"
src="/static/presale/preview.png" src="/static/assistingAgriculture/presale/preview.png"
style="width: 264rpx; height: 40rpx; z-index: 9; top: -70rpx" style="width: 264rpx; height: 40rpx; z-index: 9; top: -70rpx"
/> />
<text class="pre-text">预计9月15日发货</text> <text class="pre-text">预计9月15日发货</text>
...@@ -115,12 +115,12 @@ ...@@ -115,12 +115,12 @@
<image :src="good.image" mode="widthFix"></image> <image :src="good.image" mode="widthFix"></image>
<image <image
class="presale-img" class="presale-img"
src="/static/presale/presale.png" src="/static/assistingAgriculture/presale/presale.png"
style="width: 132rpx; height: 64rpx; z-index: 10; top: -70rpx" style="width: 132rpx; height: 64rpx; z-index: 10; top: -70rpx"
/> />
<image <image
class="preview-img" class="preview-img"
src="/static/presale/preview.png" src="/static/assistingAgriculture/presale/preview.png"
style="width: 264rpx; height: 40rpx; z-index: 9; top: -66rpx" style="width: 264rpx; height: 40rpx; z-index: 9; top: -66rpx"
/> />
<text class="pre-text">预计9月15日发货</text> <text class="pre-text">预计9月15日发货</text>
...@@ -141,51 +141,55 @@ ...@@ -141,51 +141,55 @@
<!-- 购物车悬浮按钮 --> <!-- 购物车悬浮按钮 -->
<view class="cart-floating" @tap="toCart"> <view class="cart-floating" @tap="toCart">
<wd-badge modelValue="4"> <wd-badge modelValue="4">
<img class="shop-car" src="/static/presale/cart.png" style="width: 40rpx; height: 40rpx" /> <img
class="shop-car"
src="/static/assistingAgriculture/presale/cart.png"
style="width: 40rpx; height: 40rpx"
/>
</wd-badge> </wd-badge>
</view> </view>
</template> </template>
<script setup> <script setup>
import Search from '../../components/index/Search.vue'; import Search from '../../../components/assistingAgriculture/index/Search.vue';
import { ref } from 'vue'; import { ref } from 'vue';
const current = ref(0); const current = ref(0);
const light = ref(0); const light = ref(0);
const sortList = ref([ const sortList = ref([
{ img: '/static/presale/bacImg.png', price: '25', text: '应季好物' }, { img: '/static/assistingAgriculture/presale/bacImg.png', price: '25', text: '应季好物' },
{ img: '/static/presale/img2.png', price: '25', text: '猪肉蛋禽' }, { img: '/static/assistingAgriculture/presale/img2.png', price: '25', text: '猪肉蛋禽' },
{ img: '/static/presale/img3.png', price: '25', text: '米面粮油' }, { img: '/static/assistingAgriculture/presale/img3.png', price: '25', text: '米面粮油' },
{ img: '/static/presale/img4.png', price: '25', text: '预选蔬菜' }, { img: '/static/assistingAgriculture/presale/img4.png', price: '25', text: '预选蔬菜' },
{ img: '/static/presale/img5.png', price: '25', text: '心选水果' }, { img: '/static/assistingAgriculture/presale/img5.png', price: '25', text: '心选水果' },
]); ]);
const swiperList = ref([ const swiperList = ref([
'../../static/presale/img.png', '../../../static/assistingAgriculture/presale/img.png',
'../../static/presale/img.png', '../../../static/assistingAgriculture/presale/img.png',
'../../static/presale/img.png', '../../../static/assistingAgriculture/presale/img.png',
]); ]);
const tabsData = ref([ const tabsData = ref([
{ img: '/static/assets/mainPicture.png', text: '全部' }, { img: '/static/assistingAgriculture/assets/mainPicture.png', text: '全部' },
{ img: '/static/assets/presale.png', text: '分类1' }, { img: '/static/assistingAgriculture/assets/presale.png', text: '分类1' },
{ img: '/static/assets/presale.png', text: '分类2' }, { img: '/static/assistingAgriculture/assets/presale.png', text: '分类2' },
{ img: '/static/assets/presale.png', text: '分类3' }, { img: '/static/assistingAgriculture/assets/presale.png', text: '分类3' },
{ img: '/static/assets/presale.png', text: '分类4' }, { img: '/static/assistingAgriculture/assets/presale.png', text: '分类4' },
{ img: '/static/assets/presale.png', text: '分类5' }, { img: '/static/assistingAgriculture/assets/presale.png', text: '分类5' },
{ img: '/static/assets/presale.png', text: '分类6' }, { img: '/static/assistingAgriculture/assets/presale.png', text: '分类6' },
{ img: '/static/assets/presale.png', text: '分类7' }, { img: '/static/assistingAgriculture/assets/presale.png', text: '分类7' },
{ img: '/static/assets/presale.png', text: '分类8' }, { img: '/static/assistingAgriculture/assets/presale.png', text: '分类8' },
]); ]);
const buyList = ref([ const buyList = ref([
{ img: '/static/presale/buy.png', price: '29.9', text: '应季好物' }, { img: '/static/assistingAgriculture/presale/buy.png', price: '29.9', text: '应季好物' },
{ img: '/static/presale/buy.png', price: '29.9', text: '猪肉蛋禽' }, { img: '/static/assistingAgriculture/presale/buy.png', price: '29.9', text: '猪肉蛋禽' },
{ img: '/static/presale/buy.png', price: '29.9', text: '米面粮油' }, { img: '/static/assistingAgriculture/presale/buy.png', price: '29.9', text: '米面粮油' },
]); ]);
const shopList = ref([ const shopList = ref([
{ img: '/static/presale/img7.png', price: '29.9', text: '应季好物' }, { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
{ img: '/static/presale/img7.png', price: '29.9', text: '应季好物' }, { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
{ img: '/static/presale/img7.png', price: '29.9', text: '应季好物' }, { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
{ img: '/static/presale/img7.png', price: '29.9', text: '应季好物' }, { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
{ img: '/static/presale/img7.png', price: '29.9', text: '应季好物' }, { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
{ img: '/static/presale/img7.png', price: '29.9', text: '应季好物' }, { img: '/static/assistingAgriculture/presale/img7.png', price: '29.9', text: '应季好物' },
]); ]);
// 声明需要的数据 // 声明需要的数据
const data = reactive({ const data = reactive({
...@@ -201,35 +205,35 @@ const goodList = ref([ ...@@ -201,35 +205,35 @@ const goodList = ref([
{ {
id: 1, id: 1,
name: '这是一个商品', name: '这是一个商品',
image: '/static/presale/buy.png', image: '/static/assistingAgriculture/presale/buy.png',
introduction: '商品简介商品简介', introduction: '商品简介商品简介',
price: 69.9, price: 69.9,
}, },
{ {
id: 2, id: 2,
name: '商品二', name: '商品二',
image: '/static/presale/img7.png', image: '/static/assistingAgriculture/presale/img7.png',
introduction: '商品简介商品简介', introduction: '商品简介商品简介',
price: 69.9, price: 69.9,
}, },
{ {
id: 3, id: 3,
name: '商品三', name: '商品三',
image: '/static/assets/fruit.png', image: '/static/assistingAgriculture/assets/fruit.png',
introduction: '商品简介商品简介', introduction: '商品简介商品简介',
price: 69.9, price: 69.9,
}, },
{ {
id: 4, id: 4,
name: '商品四', name: '商品四',
image: '/static/presale/buy.png', image: '/static/assistingAgriculture/presale/buy.png',
introduction: '商品简介商品简介', introduction: '商品简介商品简介',
price: 69.9, price: 69.9,
}, },
{ {
id: 5, id: 5,
name: '商品五', name: '商品五',
image: '/static/presale/buy.png', image: '/static/assistingAgriculture/presale/buy.png',
introduction: '商品简介商品简介', introduction: '商品简介商品简介',
price: 69.9, price: 69.9,
}, },
...@@ -264,13 +268,13 @@ const choice = (index) => { ...@@ -264,13 +268,13 @@ const choice = (index) => {
function toCart() { function toCart() {
// TODO: 跳转到筑农严选 // TODO: 跳转到筑农严选
xma.navigateTo({ xma.navigateTo({
url: '/pages/cart/cart', url: '/pages/assistingAgriculture/cart/cart',
}); });
} }
function toDetail() { function toDetail() {
// TODO: 跳转到筑农严选 // TODO: 跳转到筑农严选
xma.navigateTo({ xma.navigateTo({
url: '/pages/detail/detail', url: '/pages/assistingAgriculture/detail/detail',
}); });
} }
</script> </script>
......
src/pages/assistingAgriculture/reviewDetails/reviewDetails.vue
View file @ 43499cc9
...@@ -22,7 +22,10 @@ ...@@ -22,7 +22,10 @@
<view class="revuew-content"> <view class="revuew-content">
<view class="user-info"> <view class="user-info">
<view class="info-content"> <view class="info-content">
<image src="@/static/reviewDetails/avatar.png" mode="aspectFill"></image> <image
src="@/static/assistingAgriculture/reviewDetails/avatar.png"
mode="aspectFill"
></image>
<view class="text-box"> <view class="text-box">
<text class="user-name">不爱吃鱼的小猫咪</text> <text class="user-name">不爱吃鱼的小猫咪</text>
<text class="fb-time">2024-08-03</text> <text class="fb-time">2024-08-03</text>
...@@ -39,7 +42,7 @@ ...@@ -39,7 +42,7 @@
</text> </text>
</view> </view>
<view class="scenic-spot"> <view class="scenic-spot">
<image src="@/static/reviewDetails/fj.png" mode="aspectFill"></image> <image src="@/static/assistingAgriculture/reviewDetails/fj.png" mode="aspectFill"></image>
<view class="scenic-area-details"> <view class="scenic-area-details">
<text class="scenic-name">红枫湖+青岩古镇+云漫湖</text> <text class="scenic-name">红枫湖+青岩古镇+云漫湖</text>
<text class="scenic-type">自然风景</text> <text class="scenic-type">自然风景</text>
......
src/pages/assistingAgriculture/reviewDetails/scenicSpotDetails.vue
View file @ 43499cc9
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<view class="review-details-pages"> <view class="review-details-pages">
<view class="list"> <view class="list">
<view class="item" v-for="i in 10" :key="i"> <view class="item" v-for="i in 10" :key="i">
<image mode="aspectFill" src="@/static/reviewDetails/fj.png"></image> <image mode="aspectFill" src="@/static/assistingAgriculture/reviewDetails/fj.png"></image>
<view class="info-box"> <view class="info-box">
<text>红枫湖景区</text> <text>红枫湖景区</text>
<text>自然风景</text> <text>自然风景</text>
......
src/pages/assistingAgriculture/shop/index.vue
View file @ 43499cc9
...@@ -87,7 +87,7 @@ const activeFilter = ref(false); ...@@ -87,7 +87,7 @@ const activeFilter = ref(false);
function toCart() { function toCart() {
// TODO: 跳转到购物车 // TODO: 跳转到购物车
xma.navigateTo({ xma.navigateTo({
url: '/pages/cart/cart', url: '/pages/assistingAgriculture/cart/cart',
}); });
} }
</script> </script>
......
src/pages/index/index.vue
View file @ 43499cc9
<template> <template>
<view class="container"> <view class="container">
<my-icon name="add-circle" color="#0083ff" />
<view class="top"> <view class="top">
<!-- 搜索 --> <!-- 搜索 -->
<Search background="rgba(255, 255, 255, 0.8)" backIcon="black" @toSearch="toSearch"> <Search background="rgba(255, 255, 255, 0.8)" backIcon="black" @toSearch="toSearch">
...@@ -264,7 +263,7 @@ const getClassification = () => { ...@@ -264,7 +263,7 @@ const getClassification = () => {
item.pic = import.meta.env.VITE_APP_IMG_URL + item.pic; item.pic = import.meta.env.VITE_APP_IMG_URL + item.pic;
}); });
classificationT.value = res.data.slice(0, 4); classificationT.value = res.data.slice(0, 4);
classificationB.value = res.data.slice(4); classificationB.value = res.data.slice(4, 9);
}); });
}; };
// 附近人气美食分页 // 附近人气美食分页
......
src/pages/packageDetails/packageDetails.vue
View file @ 43499cc9
...@@ -141,15 +141,15 @@ ...@@ -141,15 +141,15 @@
<view class="bz"> <view class="bz">
<text class="yh-name">保障：</text> <text class="yh-name">保障：</text>
<view class="icon-box"> <view class="icon-box">
<i class="iconfont icon icon-jinggao" /> <i class="iconfont icon icon-rs-countdown" />
过期退 过期退
</view> </view>
<view class="icon-box"> <view style="margin-left: 64rpx" class="icon-box">
<i class="iconfont icon icon-jinggao" /> <i class="iconfont icon icon-ic_business_refund24px" />
随时退 随时退
</view> </view>
<view class="icon-box"> <view style="margin-left: 64rpx" class="icon-box">
<i class="iconfont icon icon-jinggao" /> <i class="iconfont icon icon-naozhong" />
随时用 随时用
</view> </view>
<i @click="alert" class="iconfont jg icon-jinggao" /> <i @click="alert" class="iconfont jg icon-jinggao" />
...@@ -855,10 +855,10 @@ page { ...@@ -855,10 +855,10 @@ page {
align-items: center; align-items: center;
font-size: 11 * 2rpx; font-size: 11 * 2rpx;
color: #abaaaa; color: #abaaaa;
.icon { .icon {
font-size: 46rpx; font-size: 38rpx;
font-weight: bold; font-weight: bold;
font-weight: 300;
color: #fa5151; color: #fa5151;
} }
} }
......
src/pages/shop/shop.vue
View file @ 43499cc9
...@@ -45,15 +45,14 @@ ...@@ -45,15 +45,14 @@
<text class="tj">推荐</text> <text class="tj">推荐</text>
</view> </view>
<view class="score-icon"> <view class="score-icon">
<!-- <wd-rate <wd-rate
color="#fff" color="#fff"
readonly readonly
v-model="shopInfo.grade" v-model="shopInfo.grade"
size="22rpx" size="22rpx"
space="8rpx" space="8rpx"
:active-color="['#FA5151']" :active-color="['#FA5151']"
/> --> />
<myRate :score="grade" />
</view> </view>
</view> </view>
<view class="shop-business-hours"> <view class="shop-business-hours">
...@@ -314,9 +313,7 @@ import { ...@@ -314,9 +313,7 @@ import {
addImgUrlPrefix, addImgUrlPrefix,
navigationSelect, navigationSelect,
} from '@/utils/common'; } from '@/utils/common';
import myRate from '@/Components/Rating/Rating.vue';
const imgUrl = import.meta.env.VITE_APP_IMG_URL; const imgUrl = import.meta.env.VITE_APP_IMG_URL;
const grade = ref(1.8);
const current = ref(0); const current = ref(0);
const old = reactive({ scrollTop: 0 }); const old = reactive({ scrollTop: 0 });
const activeId = ref(1); const activeId = ref(1);
...@@ -324,8 +321,6 @@ const activeId = ref(1); ...@@ -324,8 +321,6 @@ const activeId = ref(1);
const shopInfo = ref({}); const shopInfo = ref({});
// 店铺轮播图 // 店铺轮播图
const shopSwiperList = ref([]); const shopSwiperList = ref([]);
// 当前位置的经纬度-// 店铺的经纬度
const currentLatitudeAndLongitude = ref({ latitude: 0, longitude: 0 });
// 店铺经纬度 // 店铺经纬度
const shopLocation = ref({ lat: 0, lon: 0 }); const shopLocation = ref({ lat: 0, lon: 0 });
// 团购商品列表 // 团购商品列表
......
src/pages/storeEntry/detail.vue
View file @ 43499cc9
...@@ -5,45 +5,117 @@ ...@@ -5,45 +5,117 @@
<view class="formmain"> <view class="formmain">
<wd-form ref="form" :model="formData" :rules="rules"> <wd-form ref="form" :model="formData" :rules="rules">
<wd-cell-group border> <wd-cell-group border>
<wd-picker label="店铺类型" placeholder="请选择店铺类型" label-width="100px" prop="promotion" <wd-picker
v-model="formData.promotion" :columns="promotionlist" /> label="店铺类型"
<wd-input label="店铺名称" label-width="100px" prop="xm" clearable v-model="formData.xm" placeholder="请选择店铺类型"
placeholder="请输入店铺名称" /> label-width="100px"
<wd-input label="联系电话" label-width="100px" prop="sjh" clearable v-model="formData.sjh" prop="promotion"
placeholder="请输入联系电话" /> v-model="formData.promotion"
<wd-input label="所在地区" label-width="100px" v-model="formData.szdq" prop="szdq" readonly :columns="promotionlist"
placeholder="请选择所在地区" @click="getLocationFn" /> />
<wd-input label="详细地址" label-width="100px" prop="xxdz" clearable v-model="formData.xm" <wd-input
placeholder="请输入详细地址" /> label="店铺名称"
<wd-input label="小区/学校" label-width="100px" v-model="formData.szdq" prop="szdq" readonly placeholder="请选择" label-width="100px"
@click="getLocationFn" /> prop="xm"
clearable
v-model="formData.xm"
placeholder="请输入店铺名称"
/>
<wd-input
label="联系电话"
label-width="100px"
prop="sjh"
clearable
v-model="formData.sjh"
placeholder="请输入联系电话"
/>
<wd-input
label="所在地区"
label-width="100px"
v-model="formData.szdq"
prop="szdq"
readonly
placeholder="请选择所在地区"
@click="getLocationFn"
/>
<wd-input
label="详细地址"
label-width="100px"
prop="xxdz"
clearable
v-model="formData.xm"
placeholder="请输入详细地址"
/>
<wd-input
label="小区/学校"
label-width="100px"
v-model="formData.szdq"
prop="szdq"
readonly
placeholder="请选择"
@click="getLocationFn"
/>
<view class="flex"> <view class="flex">
<view class="logo">LOGO/门头照</view> <view class="logo">LOGO/门头照</view>
<wd-upload :file-list="fileList1" image-mode="aspectFill" :action="action" @change="handleChange1" <wd-upload
:limit="1" class="img1"></wd-upload> :file-list="fileList1"
image-mode="aspectFill"
:action="action"
@change="handleChange1"
:limit="1"
class="img1"
></wd-upload>
</view> </view>
<view class="flex"> <view class="flex">
<view class="logo">营业执照</view> <view class="logo">营业执照</view>
<wd-upload :file-list="fileList1" image-mode="aspectFill" :action="action" @change="handleChange1" <wd-upload
:limit="1" class="img1"></wd-upload> :file-list="fileList1"
image-mode="aspectFill"
:action="action"
@change="handleChange1"
:limit="1"
class="img1"
></wd-upload>
</view> </view>
<view class="flex"> <view class="flex">
<view class="logo">身份证照</view> <view class="logo">身份证照</view>
<wd-upload :file-list="fileList1" image-mode="aspectFill" :action="action" @change="handleChange1" <wd-upload
:limit="1" class="img1"></wd-upload> :file-list="fileList1"
<wd-upload :file-list="fileList1" image-mode="aspectFill" :action="action" @change="handleChange1" image-mode="aspectFill"
:limit="1" class="img1"></wd-upload> :action="action"
@change="handleChange1"
:limit="1"
class="img1"
></wd-upload>
<wd-upload
:file-list="fileList1"
image-mode="aspectFill"
:action="action"
@change="handleChange1"
:limit="1"
class="img1"
></wd-upload>
</view> </view>
<view class="flex"> <view class="flex">
<view class="logo">店铺分类</view> <view class="logo">店铺分类</view>
<view class="text" @click="showclass">请选择</view> <view class="text" @click="showclass">请选择</view>
</view> </view>
<wd-textarea placeholder="请填写评价" label="店铺介绍" label-width="100px" v-model="formData.szdq" prop="szdq" /> <wd-textarea
placeholder="请填写评价"
label="店铺介绍"
label-width="100px"
v-model="formData.szdq"
prop="szdq"
/>
<button type="primary" style="width: 80%">提交</button> <button type="primary" style="width: 80%">提交</button>
</wd-cell-group> </wd-cell-group>
<wd-popup v-model="show" position="bottom" custom-style="height:300px;overflow:auto;" @close="handleClose"> <wd-popup
v-model="show"
position="bottom"
custom-style="height:300px;overflow:auto;"
@close="handleClose"
>
<view class="hcontent"> <view class="hcontent">
<view class="flex1"> <view class="flex1">
<view class="text">取消</view> <view class="text">取消</view>
...@@ -231,7 +303,8 @@ page { ...@@ -231,7 +303,8 @@ page {
.flex { .flex {
display: flex; display: flex;
align-items: flex-start; align-items: flex-start;
padding: var(--wot-input-cell-padding, 10px) var(--wot-input-padding, var(--wot-size-side-padding, 15px)); padding: var(--wot-input-cell-padding, 10px)
var(--wot-input-padding, var(--wot-size-side-padding, 15px));
background-color: var(--wot-input-cell-bg, var(--wot-color-white, rgb(255, 255, 255))); background-color: var(--wot-input-cell-bg, var(--wot-color-white, rgb(255, 255, 255)));
.text { .text {
......
yarn.lock
View file @ 43499cc9
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