Merge branch 'master' of https://gitea.lihaink.cn/weipengfei/purchase-let
This commit is contained in:
commit
ed8e85904b
|
|
@ -5,8 +5,13 @@ export const OpurchaseGoodsOfferListApi = (data) => {
|
|||
return request.get('/operation/OpurchaseGoodsOffer/list', data);
|
||||
}
|
||||
|
||||
|
||||
//报价单提交
|
||||
export const OpurchaseGoodsOfferApi = (data) => {
|
||||
return request.post('/operation/OpurchaseGoodsOffer/offer', data);
|
||||
}
|
||||
|
||||
|
||||
//报价单提交
|
||||
export const aboutUsApi = (data) => {
|
||||
return request.post('/operation/OpurchaseGoodsOffer/offer', data);
|
||||
}
|
||||
|
|
@ -1,141 +1,148 @@
|
|||
<template>
|
||||
<up-popup :show="show" closeable round="10" @close="close" :safeAreaInsetBottom="false">
|
||||
<view class="good-popup">
|
||||
<view class="head-title">
|
||||
{{datas.is_bulk ? '称重商品' : '计件商品'}}
|
||||
</view>
|
||||
<view class="row">
|
||||
<view>商品名称</view>
|
||||
<view>{{datas.name || datas.goods_name}}</view>
|
||||
</view>
|
||||
<view class="row">
|
||||
<view>商品单位</view>
|
||||
<view>{{datas.unit_name}}</view>
|
||||
</view>
|
||||
<view class="row">
|
||||
<view>商品价格</view>
|
||||
<view>¥ {{datas.sell}}</view>
|
||||
</view>
|
||||
<view class="row">
|
||||
<view>小计</view>
|
||||
<view style="color: #F55726;">¥ {{subtotal}}</view>
|
||||
</view>
|
||||
<view v-if="datas.is_bulk" class="row">
|
||||
<view>购买重量<text style="color: #F55726;">*</text></view>
|
||||
<view style="flex: 1;">
|
||||
<up-input v-model="datas.cart_num" type="number" border="none" placeholder="请输入购买重量" inputAlign="right"></up-input>
|
||||
</view>
|
||||
</view>
|
||||
<view v-else class="row">
|
||||
<view>购买数量<text style="color: #F55726;">*</text></view>
|
||||
<view style="flex: 1;">
|
||||
<up-input v-model="datas.cart_num" type="number" border="none" placeholder="请输入购买数量" inputAlign="right"></up-input>
|
||||
</view>
|
||||
</view>
|
||||
<view class="row" style="padding-top: 30px;padding-bottom: 30rpx;">
|
||||
<view style="width: 30%;margin-right: 30rpx;">
|
||||
<up-button @click="close" color="#f7f7f7"><text style="color: #333;">取消</text></up-button>
|
||||
</view>
|
||||
<view style="flex: 1;">
|
||||
<up-button @click="change" color="#20b128">确定</up-button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</up-popup>
|
||||
<up-popup :show="show" closeable round="10" @close="close" :safeAreaInsetBottom="false">
|
||||
<view class="good-popup">
|
||||
<view class="head-title">
|
||||
{{datas.is_bulk ? '称重商品' : '计件商品'}}
|
||||
</view>
|
||||
<view class="row">
|
||||
<view>商品名称</view>
|
||||
<view>{{datas.name || datas.goods_name}}</view>
|
||||
</view>
|
||||
<view class="row">
|
||||
<view>商品单位</view>
|
||||
<view>{{datas.unit_name}}</view>
|
||||
</view>
|
||||
<view class="row">
|
||||
<view>商品价格</view>
|
||||
<view>¥ {{datas.sell}}</view>
|
||||
</view>
|
||||
<view class="row">
|
||||
<view>小计</view>
|
||||
<view style="color: #F55726;">¥ {{subtotal}}</view>
|
||||
</view>
|
||||
<view v-if="datas.is_bulk" class="row">
|
||||
<view>购买重量<text style="color: #F55726;">*</text></view>
|
||||
<view style="flex: 1;">
|
||||
<up-input v-model="datas.cart_num" :cursorSpacing='120' type="number" border="none"
|
||||
placeholder="请输入购买重量" inputAlign="right"></up-input>
|
||||
</view>
|
||||
</view>
|
||||
<view v-else class="row">
|
||||
<view>购买数量<text style="color: #F55726;">*</text></view>
|
||||
<view style="flex: 1;">
|
||||
<up-input v-model="datas.cart_num" :cursorSpacing='120' type="number" border="none"
|
||||
placeholder="请输入购买数量" inputAlign="right"></up-input>
|
||||
</view>
|
||||
</view>
|
||||
<view class="row" style="padding-top: 30px;padding-bottom: 30rpx;">
|
||||
<view style="width: 30%;margin-right: 30rpx;">
|
||||
<up-button @click="close" color="#f7f7f7"><text style="color: #333;">取消</text></up-button>
|
||||
</view>
|
||||
<view style="flex: 1;">
|
||||
<up-button @click="change" color="#20b128">确定</up-button>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</up-popup>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { computed, ref } from "vue"
|
||||
import { toast } from "../uni_modules/uview-plus";
|
||||
import {
|
||||
computed,
|
||||
ref
|
||||
} from "vue"
|
||||
import {
|
||||
toast
|
||||
} from "../uni_modules/uview-plus";
|
||||
|
||||
const props = defineProps({
|
||||
show: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
})
|
||||
|
||||
const datas = ref({
|
||||
cart_num: ''
|
||||
});
|
||||
const setData = (e)=>{
|
||||
datas.value = e;
|
||||
}
|
||||
const props = defineProps({
|
||||
show: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
})
|
||||
|
||||
const emit = defineEmits(['close', 'change']);
|
||||
const close = () => {
|
||||
emit('close');
|
||||
}
|
||||
const datas = ref({
|
||||
cart_num: ''
|
||||
});
|
||||
const setData = (e) => {
|
||||
datas.value = e;
|
||||
}
|
||||
|
||||
const change = () => {
|
||||
if(subtotal.value<=0) {
|
||||
uni.$u.toast('金额不可小于等于0');
|
||||
datas.value.cart_num = '';
|
||||
return ;
|
||||
}
|
||||
emit('change', datas.value);
|
||||
}
|
||||
|
||||
const subtotal = computed(()=>{
|
||||
let num = +datas.value.cart_num || 0;
|
||||
let sell = +datas.value.sell;
|
||||
return Math.ceil(num * sell * 100) / 100
|
||||
})
|
||||
|
||||
defineExpose({
|
||||
setData
|
||||
})
|
||||
const emit = defineEmits(['close', 'change']);
|
||||
const close = () => {
|
||||
emit('close');
|
||||
}
|
||||
|
||||
const change = () => {
|
||||
if (subtotal.value <= 0) {
|
||||
uni.$u.toast('金额不可小于等于0');
|
||||
datas.value.cart_num = '';
|
||||
return;
|
||||
}
|
||||
emit('change', datas.value);
|
||||
}
|
||||
|
||||
const subtotal = computed(() => {
|
||||
let num = +datas.value.cart_num || 0;
|
||||
let sell = +datas.value.sell;
|
||||
return Math.ceil(num * sell * 100) / 100
|
||||
})
|
||||
|
||||
defineExpose({
|
||||
setData
|
||||
})
|
||||
</script>
|
||||
|
||||
<style scoped lang="scss">
|
||||
.good-popup {
|
||||
padding: 30rpx;
|
||||
.good-popup {
|
||||
padding: 30rpx;
|
||||
|
||||
.head-title {
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
.head-title {
|
||||
font-weight: bold;
|
||||
text-align: center;
|
||||
margin-bottom: 20rpx;
|
||||
}
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding-bottom: 20rpx;
|
||||
border-bottom: 1rpx solid #f6f6f6;
|
||||
margin-bottom: 20rpx;
|
||||
.row {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
padding-bottom: 20rpx;
|
||||
border-bottom: 1rpx solid #f6f6f6;
|
||||
margin-bottom: 20rpx;
|
||||
|
||||
&:last-child {
|
||||
border-bottom: none;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
&:last-child {
|
||||
border-bottom: none;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.content {
|
||||
.top {
|
||||
display: flex;
|
||||
.content {
|
||||
.top {
|
||||
display: flex;
|
||||
|
||||
view {
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
}
|
||||
view {
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
}
|
||||
|
||||
.bottom {}
|
||||
}
|
||||
.bottom {}
|
||||
}
|
||||
|
||||
image {
|
||||
width: 40rpx;
|
||||
height: 40rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
image {
|
||||
width: 40rpx;
|
||||
height: 40rpx;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes disappear {
|
||||
to {
|
||||
opacity: 0;
|
||||
/* 渐隐 */
|
||||
transform: scale(0);
|
||||
/* 缩小 */
|
||||
}
|
||||
}
|
||||
@keyframes disappear {
|
||||
to {
|
||||
opacity: 0;
|
||||
/* 渐隐 */
|
||||
transform: scale(0);
|
||||
/* 缩小 */
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
<template>
|
||||
<view style="padding: 20rpx;" v-html="datas">
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
ref
|
||||
} from "vue"
|
||||
import {
|
||||
aboutUsApi
|
||||
} from "@/api/quotation.js"
|
||||
|
||||
const datas = ref('<p>四川里海科技有限公司，成立于2019年，位于四川省泸州市，是一家以从事互联网和相关服务为主的企业。企业注册资本1000万人民币，实缴资本826万人民币。<\/p>')
|
||||
|
||||
const getDatas = () => {
|
||||
aboutUsApi().then(res => {
|
||||
datas.value = res
|
||||
})
|
||||
}
|
||||
// getDatas()
|
||||
</script>
|
||||
|
||||
<style>
|
||||
</style>
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
<template>
|
||||
<view class="">
|
||||
detail文件
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
</script>
|
||||
|
||||
<style>
|
||||
</style>
|
||||
|
|
@ -0,0 +1,186 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<view class="cell-li">
|
||||
<view class="cell-tit">
|
||||
反馈类型
|
||||
</view>
|
||||
<view class="" style="display: flex;margin: 20rpx 0;">
|
||||
<view class="types">
|
||||
注册
|
||||
</view>
|
||||
<view class="types">
|
||||
注册
|
||||
</view>
|
||||
</view>
|
||||
<view class="type-detail" @click="showTypeDetail=true">
|
||||
<text>未收到短信</text>
|
||||
<up-icon name="arrow-down"></up-icon>
|
||||
</view>
|
||||
<up-picker confirmColor='#20B128' @confirm='confirm' @cancel='showTypeDetail=false' :show="showTypeDetail"
|
||||
:columns="columns"></up-picker>
|
||||
|
||||
</view>
|
||||
|
||||
<view class="cell-li">
|
||||
<view class="cell-tit" style="margin-bottom: 20rpx;">
|
||||
反馈内容
|
||||
</view>
|
||||
<up-textarea v-model="cont" style="background-color: #F5F5F5;" placeholder="请输入内容" count></up-textarea>
|
||||
</view>
|
||||
|
||||
<view class="cell-li">
|
||||
<view class="cell-tit" style="margin-bottom: 20rpx;">
|
||||
图片上传
|
||||
</view>
|
||||
<up-upload :fileList="fileList1" @afterRead="afterRead" @delete="deletePic" name="1" multiple
|
||||
:maxCount="10"></up-upload>
|
||||
</view>
|
||||
|
||||
<view class="cell-li">
|
||||
<view class="cell-tit" style="margin-bottom: 20rpx;">
|
||||
联系方式
|
||||
</view>
|
||||
<up-input placeholder="请填写您的姓名" style="background-color: #F5F5F5;margin-bottom: 20rpx;" border="surround"
|
||||
v-model="formData.name"></up-input>
|
||||
<up-input placeholder="请输入您的电话或者邮箱" style="background-color: #F5F5F5;" border="surround"
|
||||
v-model="formData.phone"></up-input>
|
||||
</view>
|
||||
<view class="btn">
|
||||
<up-button text="提交反馈" shape='circle' color="#20B128"></up-button>
|
||||
<view style="display: flex;align-items: center;margin-top: 20rpx;">
|
||||
<view style="margin: 0 auto; display: flex;" @click="navgo('/pageQuota/feedBack/list')">
|
||||
反馈记录 <up-icon name="arrow-right"></up-icon>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import {
|
||||
ref,
|
||||
reactive
|
||||
} from "vue"
|
||||
const showTypeDetail = ref(false)
|
||||
const columns = reactive([
|
||||
['中国', '美国', '日本']
|
||||
]);
|
||||
const confirm = (e) => {
|
||||
console.log(e)
|
||||
showTypeDetail.value = false
|
||||
}
|
||||
const cont = ref('')
|
||||
|
||||
const formData = reactive({
|
||||
name: "",
|
||||
phone: ''
|
||||
|
||||
})
|
||||
|
||||
const navgo = (url) => {
|
||||
uni.navigateTo({
|
||||
url
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
// 上传
|
||||
const fileList1 = ref([]);
|
||||
|
||||
// 删除图片
|
||||
const deletePic = (event) => {
|
||||
fileList1.value.splice(event.index, 1);
|
||||
};
|
||||
|
||||
// 新增图片
|
||||
const afterRead = async (event) => {
|
||||
// 当设置 mutiple 为 true 时, file 为数组格式，否则为对象格式
|
||||
let lists = [].concat(event.file);
|
||||
let fileListLen = fileList1.value.length;
|
||||
lists.map((item) => {
|
||||
fileList1.value.push({
|
||||
...item,
|
||||
status: 'uploading',
|
||||
message: '上传中',
|
||||
});
|
||||
});
|
||||
for (let i = 0; i < lists.length; i++) {
|
||||
const result = await uploadFilePromise(lists[i].url);
|
||||
let item = fileList1.value[fileListLen];
|
||||
fileList1.value.splice(fileListLen, 1, {
|
||||
...item,
|
||||
status: 'success',
|
||||
message: '',
|
||||
url: result,
|
||||
});
|
||||
fileListLen++;
|
||||
}
|
||||
};
|
||||
|
||||
const uploadFilePromise = (url) => {
|
||||
return new Promise((resolve, reject) => {
|
||||
let a = uni.uploadFile({
|
||||
url: 'http://192.168.2.21:7001/upload', // 仅为示例，非真实的接口地址
|
||||
filePath: url,
|
||||
name: 'file',
|
||||
formData: {
|
||||
user: 'test',
|
||||
},
|
||||
success: (res) => {
|
||||
setTimeout(() => {
|
||||
resolve(res.data.data);
|
||||
}, 1000);
|
||||
},
|
||||
});
|
||||
});
|
||||
};
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.content {
|
||||
padding: 20rpx;
|
||||
min-height: 100vh;
|
||||
background-color: white;
|
||||
|
||||
.cell-li {
|
||||
margin-bottom: 50rpx;
|
||||
}
|
||||
|
||||
.cell-tit {
|
||||
position: relative;
|
||||
|
||||
}
|
||||
|
||||
.cell-tit::after {
|
||||
content: '';
|
||||
width: 5rpx;
|
||||
height: 20rpx;
|
||||
border-radius: 20rpx;
|
||||
background-color: #20B128;
|
||||
position: absolute;
|
||||
left: -10rpx;
|
||||
top: 5rpx;
|
||||
|
||||
}
|
||||
|
||||
.types {
|
||||
width: 150rpx;
|
||||
height: 70rpx;
|
||||
background-color: #20B128;
|
||||
color: white;
|
||||
text-align: center;
|
||||
line-height: 70rpx;
|
||||
border-radius: 50rpx;
|
||||
margin-right: 20rpx;
|
||||
}
|
||||
|
||||
.type-detail {
|
||||
background-color: #F5F5F5;
|
||||
padding: 20rpx;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
<template>
|
||||
<view class="">
|
||||
list列表
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script>
|
||||
</script>
|
||||
|
||||
<style>
|
||||
</style>
|
||||
|
|
@ -1,163 +0,0 @@
|
|||
<template>
|
||||
<view class="">
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<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>
|
||||
|
||||
</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>
|
||||
|
|
@ -69,8 +69,9 @@
|
|||
<up-button shape='circle' color='#20B128' @click="submit" text="提交"></up-button>
|
||||
</view>
|
||||
</view>
|
||||
<up-empty v-else mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
|
||||
<up-empty @click='test2' v-else mode="data" icon="http://cdn.uviewui.com/uview/empty/data.png">
|
||||
</up-empty>
|
||||
<button @click="test2">叫我按钮</button>
|
||||
</up-transition>
|
||||
<!-- 报价记录 -->
|
||||
<up-transition :show="showGoods2" mode="slide-right">
|
||||
|
|
@ -138,6 +139,12 @@
|
|||
OpurchaseGoodsOfferListApi
|
||||
} from "@/api/quotation.js"
|
||||
|
||||
const test2 = () => {
|
||||
console.log("点解")
|
||||
uni.navigateTo({
|
||||
url: '/pages/index/index'
|
||||
})
|
||||
}
|
||||
// 状态图片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')
|
||||
|
|
|
|||
|
|
@ -1,148 +0,0 @@
|
|||
<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="" style="display: flex;justify-content: space-around;margin-top: 24rpx;color:#777777">
|
||||
<view :class="{act: tabIndex==1}" @click="tabIndex=1">
|
||||
订单列表
|
||||
</view>
|
||||
<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>
|
||||
|
||||
<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>
|
||||
</template>
|
||||
|
||||
<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>
|
||||
|
||||
<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>
|
||||
147
pages.json
147
pages.json
|
|
@ -47,72 +47,91 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/code/code",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : "",
|
||||
"enablePullDownRefresh" : false
|
||||
}
|
||||
"path": "pages/code/code",
|
||||
"style": {
|
||||
"navigationBarTitleText": "",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
}
|
||||
|
||||
],
|
||||
"subPackages": [{
|
||||
"root": "pagesOrder",
|
||||
"pages": [{
|
||||
"path": "order/order",
|
||||
"style": {
|
||||
"navigationBarTitleText": "我的订单",
|
||||
"enablePullDownRefresh": false,
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "detail/detail",
|
||||
"style": {
|
||||
"navigationBarTitleText": "",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "addressList/addressList",
|
||||
"style": {
|
||||
"navigationBarTitleText": "地址管理",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "addressEdit/addressEdit",
|
||||
"style": {
|
||||
"navigationBarTitleText": "",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "settle/settle",
|
||||
"style": {
|
||||
"navigationBarTitleText": "确认订单",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"root": "pageQuota",
|
||||
"pages": [{
|
||||
"path": "quotation/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "报价单",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "quotation/detail",
|
||||
"style": {
|
||||
"navigationBarTitleText": "报价明细",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
}
|
||||
|
||||
],
|
||||
"subPackages": [{
|
||||
"root": "pagesOrder",
|
||||
"pages": [{
|
||||
"path": "order/order",
|
||||
"style": {
|
||||
"navigationBarTitleText": "我的订单",
|
||||
"enablePullDownRefresh": false,
|
||||
"navigationStyle": "custom"
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "detail/detail",
|
||||
"style": {
|
||||
"navigationBarTitleText": "",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "addressList/addressList",
|
||||
"style": {
|
||||
"navigationBarTitleText": "地址管理",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "addressEdit/addressEdit",
|
||||
"style": {
|
||||
"navigationBarTitleText": "",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "settle/settle",
|
||||
"style": {
|
||||
"navigationBarTitleText": "确认订单",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"root": "pageQuota",
|
||||
"pages": [{
|
||||
"path": "quotation/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "报价单",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "aboutUs/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "关于我们",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "feedBack/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "意见反馈",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "feedBack/list",
|
||||
"style": {
|
||||
"navigationBarTitleText": "反馈记录",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "feedBack/detail",
|
||||
"style": {
|
||||
"navigationBarTitleText": "反馈详情",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<view class="content">
|
||||
<up-navbar placeholder style="z-index: 10080;">
|
||||
<template #left>
|
||||
<view style="font-size: 30rpx;font-weight: bold;" @click="test">惠农批发{{targetHeight}} </view>
|
||||
<view style="font-size: 30rpx;font-weight: bold;" @click="test">惠农批发 </view>
|
||||
</template>
|
||||
</up-navbar>
|
||||
<view class="navbar">
|
||||
|
|
@ -173,6 +173,18 @@
|
|||
getCurrentInstance
|
||||
} from 'vue';
|
||||
|
||||
|
||||
|
||||
const test = () => {
|
||||
uni.navigateTo({
|
||||
url: '/pageQuota/quotation/index'
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/*商品列表滚动隐藏头部导航 */
|
||||
const instance = getCurrentInstance(); // 获取组件实例
|
||||
const targetHeight = ref(0)
|
||||
|
|
@ -185,11 +197,6 @@
|
|||
|
||||
}
|
||||
/*商品列表滚动隐藏头部导航结束 */
|
||||
const test = () => {
|
||||
uni.navigateTo({
|
||||
url: '/pageQuota/quotation/index'
|
||||
})
|
||||
}
|
||||
|
||||
const cartStore = useCartStore();
|
||||
const show = ref(0);
|
||||
|
|
|
|||
391
pages/my/my.vue
391
pages/my/my.vue
|
|
@ -1,211 +1,222 @@
|
|||
<template>
|
||||
<view>
|
||||
<up-navbar title="我的" bgColor="rgba(0,0,0,0)" :autoBack="true">
|
||||
</up-navbar>
|
||||
<view class="user-info">
|
||||
<image class="bg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp"
|
||||
mode="widthFix"></image>
|
||||
<view class="u-card">
|
||||
<up-avatar :src="userInfo.avatar" size="80"></up-avatar>
|
||||
<view class="content">
|
||||
<view class="u-phone">{{userInfo.nickname}}</view>
|
||||
<view class="u-id">ID: {{userInfo.id}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view>
|
||||
<up-navbar title="我的" bgColor="rgba(0,0,0,0)" :autoBack="true">
|
||||
</up-navbar>
|
||||
<view class="user-info">
|
||||
<image class="bg" src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/e3a7b202404261113002322.webp"
|
||||
mode="widthFix"></image>
|
||||
<view class="u-card">
|
||||
<up-avatar :src="userInfo.avatar" size="80"></up-avatar>
|
||||
<view class="content">
|
||||
<view class="u-phone">{{userInfo.nickname}}</view>
|
||||
<view class="u-id">ID: {{userInfo.id}}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="order-info-box">
|
||||
<view class="order-info">
|
||||
<view class="info-head">我的订单</view>
|
||||
<view class="info-list">
|
||||
<view class="list-item" @click="navTo(1)">
|
||||
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f335a202404261401535608.png"></image>
|
||||
<view class="">待付款</view>
|
||||
<view class="badge" v-if="orderCount.no_pay">{{orderCount.no_pay}}</view>
|
||||
</view>
|
||||
<view class="list-item" @click="navTo(2)">
|
||||
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/45241202404261403353935.png"></image>
|
||||
<view class="">待收货</view>
|
||||
<view class="badge" v-if="orderCount.receiving">{{orderCount.receiving}}</view>
|
||||
</view>
|
||||
<!-- <view class="list-item">
|
||||
<view class="order-info-box">
|
||||
<view class="order-info">
|
||||
<view class="info-head">我的订单</view>
|
||||
<view class="info-list">
|
||||
<view class="list-item" @click="navTo(1)">
|
||||
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/f335a202404261401535608.png">
|
||||
</image>
|
||||
<view class="">待付款</view>
|
||||
<view class="badge" v-if="orderCount.no_pay">{{orderCount.no_pay}}</view>
|
||||
</view>
|
||||
<view class="list-item" @click="navTo(2)">
|
||||
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/45241202404261403353935.png">
|
||||
</image>
|
||||
<view class="">待收货</view>
|
||||
<view class="badge" v-if="orderCount.receiving">{{orderCount.receiving}}</view>
|
||||
</view>
|
||||
<!-- <view class="list-item">
|
||||
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/96915202404261403582769.png"></image>
|
||||
<view class="">售后/退款</view>
|
||||
</view> -->
|
||||
<view class="list-item" @click="navTo()">
|
||||
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/abdcd202404261406199643.png"></image>
|
||||
<view class="">全部订单</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="list-item" @click="navTo()">
|
||||
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/abdcd202404261406199643.png">
|
||||
</image>
|
||||
<view class="">全部订单</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view class="card">
|
||||
<up-cell-group>
|
||||
<up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell>
|
||||
</up-cell-group>
|
||||
</view>
|
||||
<view class="card">
|
||||
<up-cell-group>
|
||||
<up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell>
|
||||
</up-cell-group>
|
||||
</view>
|
||||
|
||||
<view class="card">
|
||||
<up-cell-group>
|
||||
<up-cell title="意见反馈" :isLink="true"></up-cell>
|
||||
<up-cell title="关于我们" :isLink="true"></up-cell>
|
||||
<up-cell title="退出登录" :isLink="true" @click="logout"></up-cell>
|
||||
</up-cell-group>
|
||||
</view>
|
||||
</view>
|
||||
<view class="card">
|
||||
<up-cell-group>
|
||||
<up-cell title="意见反馈" :isLink="true" url="/pageQuota/feedBack/index"></up-cell>
|
||||
<up-cell title="关于我们" :isLink="true" url="/pageQuota/aboutUs/index"></up-cell>
|
||||
<up-cell title="退出登录" :isLink="true" @click="logout"></up-cell>
|
||||
</up-cell-group>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref } from "vue";
|
||||
import useUserStore from "@/store/user";
|
||||
import { orderCountApi } from "@/api/order.js";
|
||||
import { onShow } from "@dcloudio/uni-app"
|
||||
|
||||
const userStore = useUserStore();
|
||||
|
||||
const userInfo = userStore.userInfo;
|
||||
|
||||
const orderCount = ref({
|
||||
no_pay: 0,
|
||||
receiving: 0,
|
||||
waiting: 0
|
||||
})
|
||||
const getOrderCount = ()=>{
|
||||
orderCountApi().then(res=>{
|
||||
orderCount.value = res.data;
|
||||
})
|
||||
}
|
||||
|
||||
const navTo = (type=0) => {
|
||||
uni.navigateTo({
|
||||
url: `/pagesOrder/order/order?type=${type}`
|
||||
})
|
||||
}
|
||||
|
||||
const logout = ()=>{
|
||||
userStore.setToken('');
|
||||
userStore.setUserInfo({});
|
||||
uni.reLaunch({
|
||||
url: '/pages/login/login'
|
||||
})
|
||||
}
|
||||
|
||||
onShow(()=>{
|
||||
getOrderCount();
|
||||
})
|
||||
import {
|
||||
ref
|
||||
} from "vue";
|
||||
import useUserStore from "@/store/user";
|
||||
import {
|
||||
orderCountApi
|
||||
} from "@/api/order.js";
|
||||
import {
|
||||
onShow
|
||||
} from "@dcloudio/uni-app"
|
||||
|
||||
const userStore = useUserStore();
|
||||
|
||||
const userInfo = userStore.userInfo;
|
||||
|
||||
const orderCount = ref({
|
||||
no_pay: 0,
|
||||
receiving: 0,
|
||||
waiting: 0
|
||||
})
|
||||
const getOrderCount = () => {
|
||||
orderCountApi().then(res => {
|
||||
orderCount.value = res.data;
|
||||
})
|
||||
}
|
||||
|
||||
const navTo = (type = 0) => {
|
||||
uni.navigateTo({
|
||||
url: `/pagesOrder/order/order?type=${type}`
|
||||
})
|
||||
}
|
||||
|
||||
const logout = () => {
|
||||
userStore.setToken('');
|
||||
userStore.setUserInfo({});
|
||||
uni.reLaunch({
|
||||
url: '/pages/login/login'
|
||||
})
|
||||
}
|
||||
|
||||
onShow(() => {
|
||||
getOrderCount();
|
||||
})
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.user-info {
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
width: 750rpx;
|
||||
height: 450rpx;
|
||||
/* #ifdef H5 */
|
||||
height: 350rpx;
|
||||
/* #endif */
|
||||
.user-info {
|
||||
overflow: hidden;
|
||||
position: relative;
|
||||
width: 750rpx;
|
||||
height: 450rpx;
|
||||
/* #ifdef H5 */
|
||||
height: 350rpx;
|
||||
/* #endif */
|
||||
|
||||
.bg {
|
||||
width: 100%;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
z-index: 1;
|
||||
}
|
||||
.bg {
|
||||
width: 100%;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
z-index: 1;
|
||||
}
|
||||
|
||||
.u-card {
|
||||
box-sizing: border-box;
|
||||
padding: 50rpx 0 50rpx 50rpx;
|
||||
display: flex;
|
||||
position: absolute;
|
||||
bottom: 50rpx;
|
||||
left: 0;
|
||||
z-index: 2;
|
||||
.u-card {
|
||||
box-sizing: border-box;
|
||||
padding: 50rpx 0 50rpx 50rpx;
|
||||
display: flex;
|
||||
position: absolute;
|
||||
bottom: 50rpx;
|
||||
left: 0;
|
||||
z-index: 2;
|
||||
|
||||
.content {
|
||||
width: 500rpx;
|
||||
padding-left: 30rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
.content {
|
||||
width: 500rpx;
|
||||
padding-left: 30rpx;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
|
||||
.u-phone {
|
||||
font-size: 32rpx;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
.u-phone {
|
||||
font-size: 32rpx;
|
||||
margin-bottom: 16rpx;
|
||||
}
|
||||
|
||||
.u-id {
|
||||
font-size: 24rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
.u-id {
|
||||
font-size: 24rpx;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.order-info-box {
|
||||
margin: 20rpx;
|
||||
height: 140rpx;
|
||||
position: relative;
|
||||
.order-info-box {
|
||||
margin: 20rpx;
|
||||
height: 140rpx;
|
||||
position: relative;
|
||||
|
||||
.order-info {
|
||||
height: 220rpx;
|
||||
width: 710rpx;
|
||||
background-color: #fff;
|
||||
border-radius: 14rpx;
|
||||
position: absolute;
|
||||
top: -80rpx;
|
||||
left: 0;
|
||||
z-index: 3;
|
||||
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a8863202404261349533191.png');
|
||||
background-size: 35% 100%;
|
||||
background-position: right;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
.info-head{
|
||||
margin-left: 20rpx;
|
||||
margin-top: 20rpx;
|
||||
margin-bottom: 20rpx;
|
||||
font-size: 32rpx;
|
||||
}
|
||||
|
||||
.info-list{
|
||||
height: 110rpx;
|
||||
display: flex;
|
||||
font-size: 26rpx;
|
||||
|
||||
.list-item{
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
image{
|
||||
width: 64rpx;
|
||||
height: 64rpx;
|
||||
}
|
||||
.badge{
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 20%;
|
||||
width: 30rpx;
|
||||
height: 30rpx;
|
||||
border-radius: 50%;
|
||||
text-align: center;
|
||||
line-height: 30rpx;
|
||||
font-size: 22rpx;
|
||||
color: #fff;
|
||||
background-color: #F55726;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.card{
|
||||
margin: 20rpx;
|
||||
background-color: #fff;
|
||||
border-radius: 14rpx;
|
||||
overflow: hidden;
|
||||
}
|
||||
.order-info {
|
||||
height: 220rpx;
|
||||
width: 710rpx;
|
||||
background-color: #fff;
|
||||
border-radius: 14rpx;
|
||||
position: absolute;
|
||||
top: -80rpx;
|
||||
left: 0;
|
||||
z-index: 3;
|
||||
background-image: url('https://lihai001.oss-cn-chengdu.aliyuncs.com/def/a8863202404261349533191.png');
|
||||
background-size: 35% 100%;
|
||||
background-position: right;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
.info-head {
|
||||
margin-left: 20rpx;
|
||||
margin-top: 20rpx;
|
||||
margin-bottom: 20rpx;
|
||||
font-size: 32rpx;
|
||||
}
|
||||
|
||||
.info-list {
|
||||
height: 110rpx;
|
||||
display: flex;
|
||||
font-size: 26rpx;
|
||||
|
||||
.list-item {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
|
||||
image {
|
||||
width: 64rpx;
|
||||
height: 64rpx;
|
||||
}
|
||||
|
||||
.badge {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 20%;
|
||||
width: 30rpx;
|
||||
height: 30rpx;
|
||||
border-radius: 50%;
|
||||
text-align: center;
|
||||
line-height: 30rpx;
|
||||
font-size: 22rpx;
|
||||
color: #fff;
|
||||
background-color: #F55726;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.card {
|
||||
margin: 20rpx;
|
||||
background-color: #fff;
|
||||
border-radius: 14rpx;
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
|
|
@ -112,14 +112,14 @@
|
|||
</view>
|
||||
</view>
|
||||
<view style="width: 200rpx;">
|
||||
<up-button color="#20B128" shape="circle" @click="submitOrder" :throttleTime="1000">提交订单</up-button>
|
||||
<up-button color="#20B128" shape="circle" @click="submitOrder" :throttleTime="1000">预付款提交</up-button>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<addressPopup ref="addressRef" :show="showAddress" :list="addressList" @close="showAddress=false"
|
||||
@change="changeAddress" />
|
||||
<shopListPopupVue ref="shopRef" :show="shopListShow" :list="merchantList"
|
||||
@close="shopListShow=false" @change="changeShop" @search="searchShop" />
|
||||
<shopListPopupVue ref="shopRef" :show="shopListShow" :list="merchantList" @close="shopListShow=false"
|
||||
@change="changeShop" @search="searchShop" />
|
||||
<modal title="尚未设置收货地址" content="您还没有添加收货地址，请点击添加" cancleText="添加地址" confirmText="继续支付" :show="toastAddressShow"
|
||||
@close="addAddress" @change="goPay" />
|
||||
</view>
|
||||
|
|
@ -160,7 +160,7 @@
|
|||
|
||||
|
||||
// 选择地址
|
||||
const addressRef = ref(null);
|
||||
const addressRef = ref(null);
|
||||
const showAddress = ref(false);
|
||||
const addressInfo = ref({});
|
||||
const changeAddress = (e) => {
|
||||
|
|
@ -174,32 +174,32 @@
|
|||
url: '/pagesOrder/addressEdit/addressEdit'
|
||||
})
|
||||
}
|
||||
|
||||
// 地址相关
|
||||
const addressList = ref([]);
|
||||
const getAddressList = () => {
|
||||
addressListsApi().then(res => {
|
||||
addressList.value = res.data.lists;
|
||||
addressList.value.forEach(item => {
|
||||
if (item.is_default) {
|
||||
addressInfo.value = item;
|
||||
isAddress.value = true;
|
||||
}
|
||||
})
|
||||
if (!isAddress.value && addressList.value.length > 0) {
|
||||
addressInfo.value = addressList.value[0];
|
||||
isAddress.value = true;
|
||||
}
|
||||
if(addressInfo.value.address_id) {
|
||||
nextTick(()=>{
|
||||
addressRef.value.setCheck(addressInfo.value.address_id);
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 地址相关
|
||||
const addressList = ref([]);
|
||||
const getAddressList = () => {
|
||||
addressListsApi().then(res => {
|
||||
addressList.value = res.data.lists;
|
||||
addressList.value.forEach(item => {
|
||||
if (item.is_default) {
|
||||
addressInfo.value = item;
|
||||
isAddress.value = true;
|
||||
}
|
||||
})
|
||||
if (!isAddress.value && addressList.value.length > 0) {
|
||||
addressInfo.value = addressList.value[0];
|
||||
isAddress.value = true;
|
||||
}
|
||||
if (addressInfo.value.address_id) {
|
||||
nextTick(() => {
|
||||
addressRef.value.setCheck(addressInfo.value.address_id);
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 提货点相关
|
||||
const shopRef = ref(null);
|
||||
const shopRef = ref(null);
|
||||
const shopListShow = ref(false);
|
||||
const merchantList = ref([]);
|
||||
const myAddressInfo = ref({
|
||||
|
|
@ -218,9 +218,9 @@
|
|||
if (mer_name === null && myAddressInfo.value.long && merchantList.value.length > 0 && !shopInfo
|
||||
.value.mer_id) {
|
||||
shopInfo.value = merchantList.value[0];
|
||||
nextTick(()=>{
|
||||
shopRef.value.setCheck(shopInfo.value.mer_id);
|
||||
})
|
||||
nextTick(() => {
|
||||
shopRef.value.setCheck(shopInfo.value.mer_id);
|
||||
})
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
@ -264,10 +264,10 @@
|
|||
|
||||
// 提交订单
|
||||
const submitOrder = () => {
|
||||
if (!shopInfo.value.mer_id) {
|
||||
uni.$u.toast('请先选择提货点');
|
||||
return shopListShow.value = true;
|
||||
}
|
||||
if (!shopInfo.value.mer_id) {
|
||||
uni.$u.toast('请先选择提货点');
|
||||
return shopListShow.value = true;
|
||||
}
|
||||
if (!isAddress.value) return toastAddressShow.value = true;
|
||||
createOrder();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ const useUserStore = defineStore("user", () => {
|
|||
|
||||
// #ifdef H5
|
||||
|
||||
token.value = "c13a559d04e18ddcc685eebb35c89c0f"
|
||||
token.value = "1d5c66dda1a45860d7df55ad6ae59998"
|
||||
// token.value = "95b24dd6d2dda836fe07854b08ba0944"
|
||||
userInfo.value = {
|
||||
avatar: "https://lihaiim.oss-cn-chengdu.aliyuncs.com/image/admin/default_avatar.png",
|
||||
|
|
@ -35,7 +35,7 @@ const useUserStore = defineStore("user", () => {
|
|||
mobile: "19330904744",
|
||||
nickname: "用户1714964250",
|
||||
supplier: null,
|
||||
token: "c13a559d04e18ddcc685eebb35c89c0f"
|
||||
token: "1d5c66dda1a45860d7df55ad6ae59998"
|
||||
}
|
||||
// #endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue