Merge branch 'master' of https://gitea.lihaink.cn/weipengfei/purchase-let
This commit is contained in:
commit
ecf8f554a7
|
|
@ -1,27 +1,33 @@
|
||||||
<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="row" v-for="(item,index) in list" :key="index" @click="addressType=index">
|
<view class="list-li border" v-for="(item,index) in list" :key="index" @click="addressType=index">
|
||||||
<view class="content">
|
<view class="list-li-top">
|
||||||
<view class="top">
|
<view class="">
|
||||||
<view class="name">{{item.mer_name}}</view>
|
<text>{{item.mer_name}}</text>
|
||||||
<u-tag v-if="item.distance" style="pointer-events: none;" :text="item.distance"
|
<text v-if="index==0&&item.distance"
|
||||||
type="success" plain size="mini"></u-tag>
|
style="background-color: #38BE41;color: white;font-size: 18rpx;margin-left: 24rpx;padding: 0 5rpx;">距离最近</text>
|
||||||
|
<text v-if="item.distance" class="distance">步行{{item.distance}}</text>
|
||||||
</view>
|
</view>
|
||||||
<view class="bottom u-line-2">{{item.service_phone}}</view>
|
|
||||||
</view>
|
</view>
|
||||||
<image v-if="addressType==index" src="@/static/icon/check.png"></image>
|
<view class="">
|
||||||
<image v-else src="@/static/icon/n-check.png"></image>
|
{{item.mer_address||'sdsd'}}
|
||||||
|
</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>
|
||||||
|
|
@ -131,6 +137,38 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.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;
|
||||||
|
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
||||||
<template>
|
|
||||||
<view class="">
|
|
||||||
商品详情
|
|
||||||
</view>
|
|
||||||
</template>
|
|
||||||
|
|
||||||
<script>
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<style>
|
|
||||||
</style>
|
|
||||||
|
|
@ -0,0 +1,149 @@
|
||||||
|
<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斤 合计:<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>
|
||||||
|
|
@ -1,18 +1,148 @@
|
||||||
<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="">
|
||||||
<up-navbar placeholder style="z-index: 10080;">
|
<view class="" style="display: flex;justify-content: space-around;margin-top: 24rpx;color:#777777">
|
||||||
<template #left>
|
<view :class="{act: tabIndex==1}" @click="tabIndex=1">
|
||||||
<view style="font-size: 30rpx;font-weight: bold;" @click="test">报价单</view>
|
订单列表
|
||||||
</template>
|
</view>
|
||||||
</up-navbar>
|
<view :class="{act: tabIndex==2}" @click="tabIndex=2">
|
||||||
|
报价记录
|
||||||
|
</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>
|
||||||
|
|
||||||
dgfsdhjg
|
<view class="total">
|
||||||
|
<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>
|
<script setup>
|
||||||
|
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>
|
<style lang="scss">
|
||||||
|
.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>
|
||||||
20
pages.json
20
pages.json
|
|
@ -81,25 +81,33 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}, {
|
},
|
||||||
|
{
|
||||||
"root": "pageQuota",
|
"root": "pageQuota",
|
||||||
"pages": [{
|
"pages": [{
|
||||||
"path": "quotation/index",
|
"path": "quotation/index",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "报价单",
|
"navigationBarTitleText": "报价单",
|
||||||
"enablePullDownRefresh": false,
|
"enablePullDownRefresh": false
|
||||||
"navigationStyle": "custom"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "goodDetail/index",
|
"path": "quotation/detail",
|
||||||
"style": {
|
"style": {
|
||||||
"navigationBarTitleText": "商品详情",
|
"navigationBarTitleText": "报价明细",
|
||||||
"enablePullDownRefresh": false
|
"enablePullDownRefresh": false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
]
|
]
|
||||||
}],
|
}
|
||||||
|
|
||||||
|
|
||||||
|
]
|
||||||
|
},
|
||||||
|
|
||||||
|
|
||||||
|
],
|
||||||
|
|
||||||
"globalStyle": {
|
"globalStyle": {
|
||||||
"navigationBarTextStyle": "black",
|
"navigationBarTextStyle": "black",
|
||||||
|
|
|
||||||
|
|
@ -16,14 +16,15 @@
|
||||||
<view>{{shopInfo.mer_name}}</view>
|
<view>{{shopInfo.mer_name}}</view>
|
||||||
<view>
|
<view>
|
||||||
<text>{{shopInfo.service_phone}}</text>
|
<text>{{shopInfo.service_phone}}</text>
|
||||||
<text style="color: #20b128;margin-left: 10rpx;font-size: 22rpx;">{{shopInfo.distance}}</text>
|
<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" color="#f6f6f6"
|
<view style="width: 80px;"><up-button @click="shopListShow=true" size="small" shape="circle"
|
||||||
:customStyle="{color:'#666666'}">修改</up-button></view>
|
color="#f6f6f6" :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">
|
||||||
|
|
@ -43,8 +44,8 @@
|
||||||
</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" color="#f6f6f6"
|
<view style="width: 80px;"><up-button @click="showAddress = true" size="small" shape="circle"
|
||||||
:customStyle="{color:'#666666'}">修改</up-button></view>
|
color="#f6f6f6" :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">
|
||||||
|
|
@ -115,23 +116,38 @@
|
||||||
</view>
|
</view>
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<addressPopup v-if="addressList.length>0" :show="showAddress" :list="addressList" @close="showAddress=false" @change="changeAddress" />
|
<addressPopup v-if="addressList.length>0" :show="showAddress" :list="addressList" @close="showAddress=false"
|
||||||
<shopListPopupVue v-if="merchantList.length>0" :show="shopListShow" :list="merchantList" @close="shopListShow=false" @change="changeShop" @search="searchShop" />
|
@change="changeAddress" />
|
||||||
|
<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 { onLoad, onShow } from "@dcloudio/uni-app"
|
import {
|
||||||
import { nextTick, ref } from "vue"
|
onLoad,
|
||||||
|
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 { checkOrderApi } from "@/api/cart.js";
|
import {
|
||||||
import { addressListsApi, merchantListApi } from "@/api/user.js";
|
checkOrderApi
|
||||||
import { createOrderApi } from "@/api/order.js";
|
} from "@/api/cart.js";
|
||||||
|
import {
|
||||||
|
addressListsApi,
|
||||||
|
merchantListApi
|
||||||
|
} from "@/api/user.js";
|
||||||
|
import {
|
||||||
|
createOrderApi
|
||||||
|
} from "@/api/order.js";
|
||||||
|
|
||||||
const cartStore = useCartStore();
|
const cartStore = useCartStore();
|
||||||
|
|
||||||
|
|
@ -191,7 +207,8 @@
|
||||||
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.value.mer_id) {
|
if (mer_name === null && myAddressInfo.value.long && merchantList.value.length > 0 && !shopInfo
|
||||||
|
.value.mer_id) {
|
||||||
shopInfo.value = merchantList.value[0];
|
shopInfo.value = merchantList.value[0];
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
@ -200,8 +217,7 @@
|
||||||
// 定位
|
// 定位
|
||||||
const LoadAddress = () => {
|
const LoadAddress = () => {
|
||||||
uni.getLocation({
|
uni.getLocation({
|
||||||
success: (res) => {
|
success: (res) => {},
|
||||||
},
|
|
||||||
fail: (err) => {
|
fail: (err) => {
|
||||||
uni.$u.toast('定位失败, 请手动选择提货点!')
|
uni.$u.toast('定位失败, 请手动选择提货点!')
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,11 @@
|
||||||
// 导入定义仓库的方法
|
// 导入定义仓库的方法
|
||||||
import { defineStore } from 'pinia';
|
import {
|
||||||
|
defineStore
|
||||||
|
} from 'pinia';
|
||||||
// 导入响应式和计算
|
// 导入响应式和计算
|
||||||
import { ref } from 'vue';
|
import {
|
||||||
|
ref
|
||||||
|
} from 'vue';
|
||||||
|
|
||||||
const useUserStore = defineStore("user", () => {
|
const useUserStore = defineStore("user", () => {
|
||||||
|
|
||||||
|
|
@ -20,7 +24,7 @@ const useUserStore = defineStore("user", () => {
|
||||||
}
|
}
|
||||||
|
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
token.value = "fe46d0ca2dd4dcabcbd3b4777aa35c22"
|
token.value = "31f74a72e2d05673ec14d2a6408718ef"
|
||||||
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,
|
||||||
|
|
@ -29,11 +33,16 @@ const useUserStore = defineStore("user", () => {
|
||||||
mobile: "19330904744",
|
mobile: "19330904744",
|
||||||
nickname: "用户1714964250",
|
nickname: "用户1714964250",
|
||||||
supplier: null,
|
supplier: null,
|
||||||
token: "fe46d0ca2dd4dcabcbd3b4777aa35c22"
|
token: "31f74a72e2d05673ec14d2a6408718ef"
|
||||||
}
|
}
|
||||||
// #endif
|
// #endif
|
||||||
|
|
||||||
return { userInfo, setUserInfo, token, setToken }
|
return {
|
||||||
|
userInfo,
|
||||||
|
setUserInfo,
|
||||||
|
token,
|
||||||
|
setToken
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
export default useUserStore;
|
export default useUserStore;
|
||||||
Loading…
Reference in New Issue