weipengfei
/
purchase-let
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并

This commit is contained in:
weipengfei 2024-05-06 18:07:07 +08:00
parent 3f641219cd 6d48c1c8d0
commit a8fae1ab1c
5 changed files with 952 additions and 859 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

227
components/shopListPopup.vue
View File

@ -1,137 +1,142 @@
<template> <template>
<up-popup :show="show" closeable round="10" @close="close"> <!-- fixed -->
<view class="address-popup"> <up-popup :show="show" closeable round="10" @close="close">
<view class="head-title">选择提货点</view> <view class="address-popup">
<view class="list-admin"> <view class="head-title">选择提货点</view>
<up-search placeholder="请输入提货点名称" @search="searchKeyword" v-model="keyword" @custom="searchKeyword"></up-search> <view class="list-admin">
</view> <up-search placeholder="请输入提货点名称" @search="searchKeyword" v-model="keyword"
<scroll-view style="height: 600rpx;padding-bottom: 20rpx;" scroll-y> @custom="searchKeyword"></up-search>
<view class="row" v-for="(item,index) in list" :key="index" @click="addressType=index"> </view>
<view class="content"> <scroll-view style="height: 600rpx;padding-bottom: 20rpx;" scroll-y>
<view class="top"> <view class="row" v-for="(item,index) in list" :key="index" @click="addressType=index">
<view class="name">{{item.mer_name}}</view> <view class="content">
<u-tag v-if="item.distance" style="pointer-events: none;" :text="item.distance" type="success" plain size="mini"></u-tag> <view class="top">
</view> <view class="name">{{item.mer_name}}</view>
<view class="bottom u-line-2">{{item.service_phone}}</view> <u-tag v-if="item.distance" style="pointer-events: none;" :text="item.distance"
</view> type="success" plain size="mini"></u-tag>
<image v-if="addressType==index" src="@/static/icon/check.png"></image> </view>
<image v-else src="@/static/icon/n-check.png"></image> <view class="bottom u-line-2">{{item.service_phone}}</view>
</view> </view>
</scroll-view> <image v-if="addressType==index" src="@/static/icon/check.png"></image>
<up-button color="#20B128" shape="circle" @click="submitAddress">确认提货点</up-button> <image v-else src="@/static/icon/n-check.png"></image>
</view> </view>
</up-popup> </scroll-view>
<up-button color="#20B128" shape="circle" @click="submitAddress">确认提货点</up-button>
</view>
</up-popup>
</template> </template>
<script setup> <script setup>
import { ref } from "vue" import {
ref
} from "vue"
const addressType = ref(-1) const addressType = ref(-1)
const props = defineProps({ const props = defineProps({
show: { show: {
type: Boolean, type: Boolean,
default: false default: false
}, },
list: { list: {
type: Array, type: Array,
default: ()=>[] default: () => []
} }
}) })
const emit = defineEmits(['close', 'change', 'search']); const emit = defineEmits(['close', 'change', 'search']);
const close = () => { const close = () => {
emit('close'); emit('close');
} }
const submitAddress = () => { const submitAddress = () => {
emit('change', props.list[addressType.value]); emit('change', props.list[addressType.value]);
} }
const keyword = ref('') const keyword = ref('')
const searchKeyword = ()=>{ const searchKeyword = () => {
emit('search', keyword.value); emit('search', keyword.value);
} }
const navTo = (url)=>{ const navTo = (url) => {
uni.navigateTo({ uni.navigateTo({
url: url url: url
}) })
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.address-popup { .address-popup {
padding: 30rpx; padding: 30rpx;
.head-title { .head-title {
font-weight: bold; font-weight: bold;
text-align: center; text-align: center;
margin-bottom: 20rpx; margin-bottom: 20rpx;
} }
.list-admin { .list-admin {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
margin-bottom: 20rpx; margin-bottom: 20rpx;
.admin-btn { .admin-btn {
display: flex; display: flex;
color: #20B128; color: #20B128;
.btn { .btn {
margin-left: 20rpx; margin-left: 20rpx;
display: flex; display: flex;
align-items: center; align-items: center;
&:active { &:active {
color: rgba(#20B128, 0.8); color: rgba(#20B128, 0.8);
transition: background-color 0.5s; transition: background-color 0.5s;
animation: disappear 0.5s 0.5s forwards; animation: disappear 0.5s 0.5s forwards;
} }
} }
} }
} }
.row { .row {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: space-between; justify-content: space-between;
padding-bottom: 20rpx; padding-bottom: 20rpx;
border-bottom: 1rpx solid #f6f6f6; border-bottom: 1rpx solid #f6f6f6;
margin-bottom: 20rpx; margin-bottom: 20rpx;
&:last-child { &:last-child {
border-bottom: none; border-bottom: none;
margin-bottom: 0; margin-bottom: 0;
} }
.content { .content {
.top { .top {
display: flex; display: flex;
view { view {
margin-right: 20rpx; margin-right: 20rpx;
} }
} }
.bottom {} .bottom {}
} }
image { image {
width: 40rpx; width: 40rpx;
height: 40rpx; height: 40rpx;
flex-shrink: 0; flex-shrink: 0;
} }
} }
} }
@keyframes disappear { @keyframes disappear {
to { to {
opacity: 0; opacity: 0;
/* 渐隐 */ /* 渐隐 */
transform: scale(0); transform: scale(0);
/* 缩小 */ /* 缩小 */
} }
} }
</style> </style>

11
pageQuota/goodDetail/index.vue Normal file
View File

@ -0,0 +1,11 @@
<template>
<view class="">
商品详情
</view>
</template>
<script>
</script>
<style>
</style>

18
pageQuota/quotation/index.vue Normal file
View File

@ -0,0 +1,18 @@
<template>
<view class="">
<up-navbar placeholder style="z-index: 10080;">
<template #left>
<view style="font-size: 30rpx;font-weight: bold;" @click="test">报价单</view>
</template>
</up-navbar>
dgfsdhjg
</view>
</template>
<script>
</script>
<style>
</style>

247
pages.json
View File

@ -1,119 +1,138 @@
{ {
"easycom": { "easycom": {
"autoscan": true, "autoscan": true,
// 注意一定要放在custom里，否则无效，https://ask.dcloud.net.cn/question/131175 // 注意一定要放在custom里，否则无效，https://ask.dcloud.net.cn/question/131175
"custom": { "custom": {
"^u--(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue", "^u--(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
"^up-(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue", "^up-(.*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue",
"^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue" "^u-([^-].*)": "@/uni_modules/uview-plus/components/u-$1/u-$1.vue"
} }
}, },
"pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页，参考：https://uniapp.dcloud.io/collocation/pages
{ {
"path": "pages/login/login", "path": "pages/login/login",
"style": { "style": {
"navigationBarTitleText": "登录", "navigationBarTitleText": "登录",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
"navigationBarTitleText": "购物", "navigationBarTitleText": "购物",
"disableScroll": true, "disableScroll": true,
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path": "pages/cart/cart", "path": "pages/cart/cart",
"style": { "style": {
"navigationBarTitleText": "购物车", "navigationBarTitleText": "购物车",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom" "navigationStyle": "custom"
} }
}, },
{ {
"path": "pages/my/my", "path": "pages/my/my",
"style": { "style": {
"navigationBarTitleText": "个人中心", "navigationBarTitleText": "个人中心",
"enablePullDownRefresh": false, "enablePullDownRefresh": false,
"navigationStyle": "custom" "navigationStyle": "custom"
} }
} }
], ],
"subPackages": [{ "subPackages": [{
"root": "pagesOrder", "root": "pagesOrder",
"pages": [{ "pages": [{
"path": "order/order", "path": "order/order",
"style": { "style": {
"navigationBarTitleText": "我的订单", "navigationBarTitleText": "我的订单",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path": "detail/detail", "path": "detail/detail",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path": "addressList/addressList", "path": "addressList/addressList",
"style": { "style": {
"navigationBarTitleText": "地址管理", "navigationBarTitleText": "地址管理",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path": "addressEdit/addressEdit", "path": "addressEdit/addressEdit",
"style": { "style": {
"navigationBarTitleText": "", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, },
{ {
"path": "settle/settle", "path": "settle/settle",
"style": { "style": {
"navigationBarTitleText": "确认订单", "navigationBarTitleText": "确认订单",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
] ]
}], }, {
"globalStyle": { "root": "pageQuota",
"navigationBarTextStyle": "black", "pages": [{
"navigationBarTitleText": "", "path": "quotation/index",
"navigationBarBackgroundColor": "#fff", "style": {
"backgroundColor": "#fff" "navigationBarTitleText": "报价单",
}, "enablePullDownRefresh": false,
// "tabBar": { "navigationStyle": "custom"
// "color": "#999999", }
// "selectedColor": "#20b128", },
// "borderStyle": "white", {
// "backgroundColor": "#FFFFFF", "path": "goodDetail/index",
// "list": [{ "style": {
// "pagePath": "pages/index/index", "navigationBarTitleText": "商品详情",
// "text": "首页", "enablePullDownRefresh": false
// "iconPath": "static/tab/a.png", }
// "selectedIconPath": "static/tab/aa.png" }
// }, ]
// { }],
// "pagePath": "pages/cart/cart",
// "text": "购物车",
// "iconPath": "static/tab/b.png",
// "selectedIconPath": "static/tab/ba.png"
// },
// { "globalStyle": {
// "pagePath": "pages/my/my", "navigationBarTextStyle": "black",
// "text": "我的", "navigationBarTitleText": "",
// "iconPath": "static/tab/c.png", "navigationBarBackgroundColor": "#fff",
// "selectedIconPath": "static/tab/ca.png" "backgroundColor": "#fff"
// } },
// "tabBar": {
// "color": "#999999",
// "selectedColor": "#20b128",
// "borderStyle": "white",
// "backgroundColor": "#FFFFFF",
// "list": [{
// "pagePath": "pages/index/index",
// "text": "首页",
// "iconPath": "static/tab/a.png",
// "selectedIconPath": "static/tab/aa.png"
// },
// {
// "pagePath": "pages/cart/cart",
// "text": "购物车",
// "iconPath": "static/tab/b.png",
// "selectedIconPath": "static/tab/ba.png"
// },
// ] // {
// }, // "pagePath": "pages/my/my",
"uniIdRouter": {} // "text": "我的",
// "iconPath": "static/tab/c.png",
// "selectedIconPath": "static/tab/ca.png"
// }
// ]
// },
"uniIdRouter": {}
} }

1300
pages/index/index.vue
View File

File diff suppressed because it is too large Load Diff