Compare commits

..

No commits in common. "73cccb0c2462fbfcea0e6452b59a7f9d933e5499" and "b53fefd79f93c7f1782cfdc6224689db355c758c" have entirely different histories.

7 changed files with 550 additions and 889 deletions

View File

@ -1,33 +1,27 @@
<template> <template>
<!-- fixed -->
<up-popup :show="show" closeable round="10" @close="close"> <up-popup :show="show" closeable round="10" @close="close">
<view class="address-popup"> <view class="address-popup">
<view class="head-title">提货点</view> <view class="head-title">选择提货点</view>
<view class="list-admin"> <view class="list-admin">
<up-search placeholder="请输入提货点名称" @search="searchKeyword" v-model="keyword" <up-search placeholder="请输入提货点名称" @search="searchKeyword" v-model="keyword"
@custom="searchKeyword"></up-search> @custom="searchKeyword"></up-search>
</view> </view>
<scroll-view style="height: 600rpx;padding-bottom: 20rpx;" scroll-y> <scroll-view style="height: 600rpx;padding-bottom: 20rpx;" scroll-y>
<view class="list-li border" v-for="(item,index) in list" :key="index" @click="addressType=index"> <view class="row" v-for="(item,index) in list" :key="index" @click="addressType=index">
<view class="list-li-top"> <view class="content">
<view class=""> <view class="top">
<text>{{item.mer_name}}</text> <view class="name">{{item.mer_name}}</view>
<text v-if="index==0&&item.distance" <u-tag v-if="item.distance" style="pointer-events: none;" :text="item.distance"
style="background-color: #38BE41;color: white;font-size: 18rpx;margin-left: 24rpx;padding: 0 5rpx;">距离最近</text> type="success" plain size="mini"></u-tag>
<text v-if="item.distance" class="distance">步行{{item.distance}}</text>
</view> </view>
<view class="bottom u-line-2">{{item.service_phone}}</view>
</view> </view>
<view class=""> <image v-if="addressType==index" src="@/static/icon/check.png"></image>
{{item.mer_address||'sdsd'}} <image v-else src="@/static/icon/n-check.png"></image>
</view>
<view class="check">
<image style="width: 36rpx;height: 36rpx" v-if="addressType==index"
src="@/static/icon/check.png">
</image>
<image style="width: 36rpx;height: 36rpx" v-else src="@/static/icon/n-check.png"></image>
</view>
</view> </view>
</scroll-view> </scroll-view>
<up-button color="#20B128" shape="circle" @click="submitAddress">确认</up-button> <up-button color="#20B128" shape="circle" @click="submitAddress">确认提货点</up-button>
</view> </view>
</up-popup> </up-popup>
</template> </template>
@ -137,38 +131,6 @@
} }
} }
.border {
border-bottom: 1px solid #F3F3F3;
}
.list-li {
padding: 30rpx 0;
font-size: 24rpx;
position: relative;
.list-li-top {
display: flex;
justify-content: space-between;
margin-bottom: 10rpx;
font-size: 30rpx;
}
.distance {
border: 1px solid #40AE36;
font-size: 18rpx;
color: #40AE36;
margin-left: 20rpx;
padding: 0 5rpx;
}
.check {
position: absolute;
right: 20rpx;
top: 50%;
transform: translateY(-50%);
}
}
@keyframes disappear { @keyframes disappear {
to { to {
opacity: 0; opacity: 0;

View File

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

View File

@ -1,149 +0,0 @@
<template>
<view class="content">
<view class="card" v-for="item in 10">
<view class="head">
<text>PF171504442988969633</text>
<text style="color: #989898;">2023-04-25</text>
</view>
<view class="card-content">
<view class="card-content-l" style="width: 152rpx;height: 152rpx;">
<image style="width: 152rpx;height: 152rpx;" src="../../static/logo.png" mode=""></image>
<view class="status">
未报价
</view>
</view>
<view class="card-content-r">
<view class="title ellipsis">
正宗新疆哈密瓜网纹瓜
</view>
<view class="need">
需求量 100
</view>
<view class="ipt">
<up-input placeholderStyle='fontSize:24rpx' placeholder="点击数入报价数量" v-model="value1"
style="margin-right: 10rpx;background-color:#F6F6F6;border: none;"></up-input>
<up-input placeholderStyle='fontSize:24rpx' style="background-color: #F6F6F6;border: none;"
placeholder="点击数入产品报价" v-model="value2"></up-input>
</view>
</view>
<view class="status-png">
<image :src="errPng" style="width: 108rpx; height: 84rpx;"></image>
</view>
</view>
<view class="card-footer">
共100斤&nbsp; &nbsp;合计:<text style="font-size: 28rpx;color: #FC452F;font-weight: 700;">500.00</text>
</view>
<up-line style="margin-top: 30rpx;" color="#F3F3F3"></up-line>
</view>
<view class="submit-btn">
<up-button shape='circle' color='#20B128' text="提交"></up-button>
</view>
</view>
</template>
<script setup>
import {
ref,
reactive
} from "vue"
const value1 = ref('')
const value2 = ref('')
// url
const successPng = ref('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/739c3202405071458553459.png')
const errPng = ref('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/04c2c202405071501462462.png')
// url
</script>
<style lang="scss">
.content {
padding: 20rpx;
padding-bottom: 150rpx;
.card {
width: 710rpx;
margin: 0 auto;
padding: 20rpx;
box-sizing: border-box;
background-color: white;
.head {
font-size: 28rpx;
display: flex;
justify-content: space-between;
margin-bottom: 30rpx;
}
.card-content {
display: flex;
position: relative;
.card-content-l {
margin-right: 20rpx;
position: relative;
.status {
width: 152rpx;
height: 40rpx;
background-color: rgba(0, 0, 0, .3);
text-align: center;
color: white;
font-size: 24rpx;
line-height: 40rpx;
position: absolute;
bottom: 0;
}
}
.card-content-r {
display: flex;
flex-direction: column;
justify-content: space-between;
.title {
font-size: 30rpx;
width: 500rpx;
}
.need {
color: #777777;
font-size: 24rpx;
}
.ipt {
display: flex;
height: 56rpx;
}
}
.status-png {
position: absolute;
right: 20rpx;
}
}
.card-footer {
margin-top: 30rpx;
text-align: right;
font-size: 28rpx;
color: #060606;
}
}
.submit-btn {
position: fixed;
bottom: 50rpx;
width: 710rpx;
margin: 0 auto;
}
}
.ellipsis {
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
</style>

View File

@ -1,148 +1,18 @@
<template> <template>
<view class="content">
<up-sticky bgColor="#fff">
<view class="head">
<up-search placeholder="请输入提货点名称" @search="searchKeyword" v-model="keyword"
@custom="searchKeyword"></up-search>
<view class=""> <view class="">
<view class="" style="display: flex;justify-content: space-around;margin-top: 24rpx;color:#777777"> <up-navbar placeholder style="z-index: 10080;">
<view :class="{act: tabIndex==1}" @click="tabIndex=1"> <template #left>
订单列表 <view style="font-size: 30rpx;font-weight: bold;" @click="test">报价单</view>
</view> </template>
<view :class="{act: tabIndex==2}" @click="tabIndex=2"> </up-navbar>
报价记录
</view>
</view>
<view style="height: 8rpx;" />
<view class="line" :style="{left:tabIndex==1?tabsLeft+'px':tabsRight+'px'}" />
</view>
</view>
</up-sticky>
<view class="card" v-for="item in 10">
<view class="card-head">
<text>PF171504442988969633</text>
<text style="color:#20B128 ;">待报价</text>
<text style="color:#FC452F ;">已成交</text>
<text style="color:#777777 ;">未成交</text>
</view>
<view style="padding-right: 20rpx;">
<view class="card-content">
<image v-for="(item,index) in 10" style="width: 152rpx;height: 152rpx;margin-right: 20rpx;"
src="../../static/logo.png" mode="">
</image>
</view>
</view>
<view class="total"> dgfsdhjg
<view style="display: flex;align-items: center;color: #777777;"
@click="navgo('/pageQuota/quotation/detail')">
共4件 <up-icon name="arrow-right"></up-icon>
</view>
</view>
<view class="card-foot" v-if='false'>
温馨提示请于2024年05月20日前发货
</view>
</view>
</view> </view>
</template> </template>
<script setup> <script>
import {
ref,
reactive
} from "vue"
const navgo = (url) => {
uni.navigateTo({
url
})
}
//
const keyword = ref('')
const searchKeyword = () => {
console.log("sousuo1")
}
//
// tabsindex
const tabIndex = ref(1)
const {
windowWidth
} = uni.getSystemInfoSync();
const tabsLeft = ref(((windowWidth / 2) - 26) / 2)
const tabsRight = ref(tabsLeft.value + (windowWidth / 2))
// tabsindex
</script> </script>
<style lang="scss"> <style>
.content {
.head {
padding: 20rpx;
background-color: white;
position: relative;
.act {
color: #20B128;
}
.line {
width: 26px;
height: 5rpx;
background-color: #20B128;
border-radius: 50rpx;
position: absolute;
transition: 300ms;
}
}
.card {
width: 710rpx;
margin: 20rpx auto;
background-color: white;
box-sizing: border-box;
border-radius: 16rpx 16rpx 0 0;
position: relative;
.card-head {
padding: 20rpx;
display: flex;
justify-content: space-between;
margin-bottom: 12rpx;
}
.card-content {
padding: 20rpx;
overflow-x: auto;
white-space: nowrap;
padding-right: 152rpx;
}
.total {
width: 152rpx;
height: 160rpx;
position: absolute;
// border: 1px dashed black;
display: flex;
justify-content: space-around;
align-items: center;
top: 100rpx;
right: 20rpx;
background-color: white;
}
.card-foot {
background-color: #FFF1EC;
color: #FC452F;
text-indent: 2em;
font-size: 24rpx;
height: 74rpx;
line-height: 74rpx;
}
}
}
</style> </style>

View File

@ -81,66 +81,58 @@
} }
} }
] ]
}, }, {
{
"root": "pageQuota", "root": "pageQuota",
"pages": [{ "pages": [{
"path": "quotation/index", "path": "quotation/index",
"style": { "style": {
"navigationBarTitleText": "报价单", "navigationBarTitleText": "报价单",
"enablePullDownRefresh": false "enablePullDownRefresh": false,
"navigationStyle": "custom"
} }
}, },
{ {
"path": "quotation/detail", "path": "goodDetail/index",
"style": { "style": {
"navigationBarTitleText": "报价明细", "navigationBarTitleText": "商品详情",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
} }
] ]
} }],
"globalStyle": {
]
},
],
"globalStyle": {
"navigationBarTextStyle": "black", "navigationBarTextStyle": "black",
"navigationBarTitleText": "", "navigationBarTitleText": "",
"navigationBarBackgroundColor": "#fff", "navigationBarBackgroundColor": "#fff",
"backgroundColor": "#fff" "backgroundColor": "#fff"
}, },
// "tabBar": { // "tabBar": {
// "color": "#999999", // "color": "#999999",
// "selectedColor": "#20b128", // "selectedColor": "#20b128",
// "borderStyle": "white", // "borderStyle": "white",
// "backgroundColor": "#FFFFFF", // "backgroundColor": "#FFFFFF",
// "list": [{ // "list": [{
// "pagePath": "pages/index/index", // "pagePath": "pages/index/index",
// "text": "首页", // "text": "首页",
// "iconPath": "static/tab/a.png", // "iconPath": "static/tab/a.png",
// "selectedIconPath": "static/tab/aa.png" // "selectedIconPath": "static/tab/aa.png"
// }, // },
// { // {
// "pagePath": "pages/cart/cart", // "pagePath": "pages/cart/cart",
// "text": "购物车", // "text": "购物车",
// "iconPath": "static/tab/b.png", // "iconPath": "static/tab/b.png",
// "selectedIconPath": "static/tab/ba.png" // "selectedIconPath": "static/tab/ba.png"
// }, // },
// { // {
// "pagePath": "pages/my/my", // "pagePath": "pages/my/my",
// "text": "我的", // "text": "我的",
// "iconPath": "static/tab/c.png", // "iconPath": "static/tab/c.png",
// "selectedIconPath": "static/tab/ca.png" // "selectedIconPath": "static/tab/ca.png"
// } // }
// ] // ]
// }, // },
"uniIdRouter": {} "uniIdRouter": {}
} }

View File

@ -16,15 +16,14 @@
<view>{{shopInfo.mer_name}}</view> <view>{{shopInfo.mer_name}}</view>
<view> <view>
<text>{{shopInfo.service_phone}}</text> <text>{{shopInfo.service_phone}}</text>
<text <text style="color: #20b128;margin-left: 10rpx;font-size: 22rpx;">{{shopInfo.distance}}</text>
style="color: #20b128;margin-left: 10rpx;font-size: 22rpx;">{{shopInfo.distance}}</text>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
<view class="address-btn"> <view class="address-btn">
<view style="width: 80px;"><up-button @click="shopListShow=true" size="small" shape="circle" <view style="width: 80px;"><up-button @click="shopListShow=true" size="small" shape="circle" color="#f6f6f6"
color="#f6f6f6" :customStyle="{color:'#666666'}">修改</up-button></view> :customStyle="{color:'#666666'}">修改</up-button></view>
</view> </view>
</view> </view>
<view v-if="!addressInfo.address_id" class="m-card row"> <view v-if="!addressInfo.address_id" class="m-card row">
@ -44,12 +43,12 @@
</view> </view>
</view> </view>
<view class="address-btn"> <view class="address-btn">
<view style="width: 80px;"><up-button @click="showAddress = true" size="small" shape="circle" <view style="width: 80px;"><up-button @click="showAddress = true" size="small" shape="circle" color="#f6f6f6"
color="#f6f6f6" :customStyle="{color:'#666666'}">修改</up-button></view> :customStyle="{color:'#666666'}">修改</up-button></view>
</view> </view>
</view> </view>
<view class="m-card m-good" v-for="(item,index) in cartList" :key="index"> <view class="m-card m-good" v-for="(item,index) in cartList" :key="index">
<view class="image"> <view class="image" >
<up-image width="160rpx" height="160rpx" :src="item.imgs"></up-image> <up-image width="160rpx" height="160rpx" :src="item.imgs"></up-image>
</view> </view>
<view class="body-content"> <view class="body-content">
@ -116,38 +115,23 @@
</view> </view>
</view> </view>
<addressPopup v-if="addressList.length>0" :show="showAddress" :list="addressList" @close="showAddress=false" <addressPopup v-if="addressList.length>0" :show="showAddress" :list="addressList" @close="showAddress=false" @change="changeAddress" />
@change="changeAddress" /> <shopListPopupVue v-if="merchantList.length>0" :show="shopListShow" :list="merchantList" @close="shopListShow=false" @change="changeShop" @search="searchShop" />
<shopListPopupVue v-if="merchantList.length>0" :show="shopListShow" :list="merchantList"
@close="shopListShow=false" @change="changeShop" @search="searchShop" />
<modal title="尚未设置收货地址" content="您还没有添加收货地址,请点击添加" cancleText="添加地址" confirmText="继续支付" :show="toastAddressShow" <modal title="尚未设置收货地址" content="您还没有添加收货地址,请点击添加" cancleText="添加地址" confirmText="继续支付" :show="toastAddressShow"
@close="addAddress" @change="goPay" /> @close="addAddress" @change="goPay" />
</view> </view>
</template> </template>
<script setup> <script setup>
import { import { onLoad, onShow } from "@dcloudio/uni-app"
onLoad, import { nextTick, ref } from "vue"
onShow
} from "@dcloudio/uni-app"
import {
nextTick,
ref
} from "vue"
import addressPopup from "@/components/addressPopup.vue"; import addressPopup from "@/components/addressPopup.vue";
import shopListPopupVue from "@/components/shopListPopup.vue"; import shopListPopupVue from "@/components/shopListPopup.vue";
import modal from "@/components/modal.vue" import modal from "@/components/modal.vue"
import useCartStore from "@/store/cart.js"; import useCartStore from "@/store/cart.js";
import { import { checkOrderApi } from "@/api/cart.js";
checkOrderApi import { addressListsApi, merchantListApi } from "@/api/user.js";
} from "@/api/cart.js"; import { createOrderApi } from "@/api/order.js";
import {
addressListsApi,
merchantListApi
} from "@/api/user.js";
import {
createOrderApi
} from "@/api/order.js";
const cartStore = useCartStore(); const cartStore = useCartStore();
@ -161,16 +145,16 @@
// //
const addressList = ref([]); const addressList = ref([]);
const getAddressList = () => { const getAddressList = ()=>{
addressListsApi().then(res => { addressListsApi().then(res=>{
addressList.value = res.data.lists; addressList.value = res.data.lists;
addressList.value.forEach(item => { addressList.value.forEach(item=>{
if (item.is_default) { if(item.is_default) {
addressInfo.value = item; addressInfo.value = item;
isAddress.value = true; isAddress.value = true;
} }
}) })
if (!isAddress.value && addressList.value.length > 0) { if(!isAddress.value && addressList.value.length>0){
addressInfo.value = addressList.value[0]; addressInfo.value = addressList.value[0];
isAddress.value = true; isAddress.value = true;
} }
@ -184,8 +168,8 @@
showAddress.value = false; showAddress.value = false;
isAddress.value = true; isAddress.value = true;
} }
const openAddress = () => { const openAddress = ()=>{
if (addressList.length > 0) showAddress.value = true; if(addressList.length>0) showAddress.value=true;
else uni.navigateTo({ else uni.navigateTo({
url: '/pagesOrder/addressEdit/addressEdit' url: '/pagesOrder/addressEdit/addressEdit'
}) })
@ -201,23 +185,23 @@
const shopInfo = ref({ const shopInfo = ref({
mer_id: '' mer_id: ''
}); });
const getMerchantList = (mer_name = null) => { const getMerchantList = (mer_name=null)=>{
merchantListApi({ merchantListApi({
...myAddressInfo.value, ...myAddressInfo.value,
mer_name: mer_name ? mer_name : '' mer_name: mer_name ? mer_name : ''
}).then(res => { }).then(res=>{
merchantList.value = res.data.lists; merchantList.value = res.data.lists;
if (mer_name === null && myAddressInfo.value.long && merchantList.value.length > 0 && !shopInfo if(mer_name===null && myAddressInfo.value.long && merchantList.value.length>0 && !shopInfo.value.mer_id) {
.value.mer_id) {
shopInfo.value = merchantList.value[0]; shopInfo.value = merchantList.value[0];
} }
}) })
} }
getMerchantList(''); getMerchantList('');
// //
const LoadAddress = () => { const LoadAddress = ()=>{
uni.getLocation({ uni.getLocation({
success: (res) => {}, success: (res) => {
},
fail: (err) => { fail: (err) => {
uni.$u.toast('定位失败, 请手动选择提货点!') uni.$u.toast('定位失败, 请手动选择提货点!')
}, },
@ -229,23 +213,23 @@
}) })
} }
LoadAddress(); LoadAddress();
const changeShop = (e) => { const changeShop = (e)=>{
shopInfo.value = e; shopInfo.value = e;
shopListShow.value = false; shopListShow.value = false;
} }
const searchShop = (e) => { const searchShop = (e)=>{
getMerchantList(e) getMerchantList(e)
} }
// //
const addAddress = () => { const addAddress = () => {
toastAddressShow.value = false; toastAddressShow.value = false;
nextTick(() => { nextTick(()=>{
showAddress.value = true; showAddress.value = true;
}) })
} }
// //
const goPay = () => { const goPay = ()=>{
toastAddressShow.value = false; toastAddressShow.value = false;
isAddress.value = true; isAddress.value = true;
submitOrder(); submitOrder();
@ -259,22 +243,22 @@
// //
const cartList = ref([]); const cartList = ref([]);
const orderInfo = ref({}); const orderInfo = ref({});
const checkOrder = () => { const checkOrder = ()=>{
checkOrderApi({ checkOrderApi({
cart_id: cartStore.cartList cart_id: cartStore.cartList
}).then(res => { }).then(res=>{
cartList.value = res.data.cart_list; cartList.value = res.data.cart_list;
orderInfo.value = res.data.order; orderInfo.value = res.data.order;
}) })
} }
const createOrder = () => { const createOrder = ()=>{
createOrderApi({ createOrderApi({
cart_id: cartStore.cartList, cart_id: cartStore.cartList,
address_id: addressInfo.value.address_id, address_id: addressInfo.value.address_id,
mer_id: shopInfo.value.mer_id, mer_id: shopInfo.value.mer_id,
pay_type: 1 pay_type: 1
}).then(res => { }).then(res=>{
if (!res.data?.nonceStr) return uni.$u.toast('支付失败!'); if(!res.data?.nonceStr) return uni.$u.toast('支付失败!');
uni.requestPayment({ uni.requestPayment({
provider: 'wxpay', provider: 'wxpay',
timeStamp: res.data.timeStamp, timeStamp: res.data.timeStamp,
@ -283,38 +267,38 @@
signType: res.data.signType, signType: res.data.signType,
paySign: res.data.paySign, paySign: res.data.paySign,
success: (e) => { success: (e) => {
if (e.errMsg == 'requestPayment:ok') { if(e.errMsg == 'requestPayment:ok'){
uni.showModal({ uni.showModal({
title: '订单支付成功', title: '订单支付成功',
confirmText: '查看订单', confirmText: '查看订单',
cancelText: '继续购买', cancelText: '继续购买',
success: (e) => { success: (e) => {
if (e.confirm) uni.navigateTo({ if(e.confirm) uni.navigateTo({
url: '/pagesOrder/order/order' url: '/pagesOrder/order/order'
}) })
else uni.navigateBack(); else uni.navigateBack();
} }
}) })
} else uni.$u.toast('支付失败') }else uni.$u.toast('支付失败')
}, },
fail: (e) => { fail: (e) => {
uni.$u.toast('用户取消支付') uni.$u.toast('用户取消支付')
} }
}) })
}).catch(err => { }).catch(err=>{
uni.$u.toast('网络错误') uni.$u.toast('网络错误')
}) })
} }
const c_price = (price, index = 0) => { const c_price = (price, index=0)=>{
price = price + ''; price = price + '';
return price.split('.')[index] || (index ? '00' : '0'); return price.split('.')[index] || (index ? '00' : '0');
} }
onLoad(options => { onLoad(options=>{
checkOrder(); checkOrder();
}) })
onShow(() => { onShow(()=>{
getAddressList(); getAddressList();
}) })
</script> </script>

View File

@ -1,11 +1,7 @@
// 导入定义仓库的方法 // 导入定义仓库的方法
import { import { defineStore } from 'pinia';
defineStore
} from 'pinia';
// 导入响应式和计算 // 导入响应式和计算
import { import { ref } from 'vue';
ref
} from 'vue';
const useUserStore = defineStore("user", () => { const useUserStore = defineStore("user", () => {
@ -24,7 +20,7 @@ const useUserStore = defineStore("user", () => {
} }
// #ifdef H5 // #ifdef H5
token.value = "31f74a72e2d05673ec14d2a6408718ef" token.value = "f9421a985006bf3f73bbaff6193da353"
userInfo.value = { userInfo.value = {
avatar: "https://lihaiim.oss-cn-chengdu.aliyuncs.com/image/admin/default_avatar.png", avatar: "https://lihaiim.oss-cn-chengdu.aliyuncs.com/image/admin/default_avatar.png",
id: 9, id: 9,
@ -33,16 +29,11 @@ const useUserStore = defineStore("user", () => {
mobile: "19330904744", mobile: "19330904744",
nickname: "用户1714964250", nickname: "用户1714964250",
supplier: null, supplier: null,
token: "31f74a72e2d05673ec14d2a6408718ef" token: "f9421a985006bf3f73bbaff6193da353"
} }
// #endif // #endif
return { return { userInfo, setUserInfo, token, setToken }
userInfo,
setUserInfo,
token,
setToken
}
}) })
export default useUserStore; export default useUserStore;