add
This commit is contained in:
parent
91c409f11d
commit
945d7b7c4f
|
@ -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);
|
||||
}
|
|
@ -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,17 @@
|
|||
<template>
|
||||
<view class="content">
|
||||
<view class="">
|
||||
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
<script setup>
|
||||
|
||||
</script>
|
||||
|
||||
<style lang="scss">
|
||||
.content {
|
||||
padding: 20rpx;
|
||||
}
|
||||
</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>
|
|
@ -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>
|
21
pages.json
21
pages.json
|
@ -47,11 +47,10 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"path" : "pages/code/code",
|
||||
"style" :
|
||||
{
|
||||
"navigationBarTitleText" : "",
|
||||
"enablePullDownRefresh" : false
|
||||
"path": "pages/code/code",
|
||||
"style": {
|
||||
"navigationBarTitleText": "",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -106,13 +105,19 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"path": "quotation/detail",
|
||||
"path": "aboutUs/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "报价明细",
|
||||
"navigationBarTitleText": "关于我们",
|
||||
"enablePullDownRefresh": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"path": "feedBack/index",
|
||||
"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">
|
||||
|
|
|
@ -19,12 +19,14 @@
|
|||
<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>
|
||||
<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>
|
||||
<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>
|
||||
|
@ -33,7 +35,8 @@
|
|||
<view class="">售后/退款</view>
|
||||
</view> -->
|
||||
<view class="list-item" @click="navTo()">
|
||||
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/abdcd202404261406199643.png"></image>
|
||||
<image src="https://lihai001.oss-cn-chengdu.aliyuncs.com/def/abdcd202404261406199643.png">
|
||||
</image>
|
||||
<view class="">全部订单</view>
|
||||
</view>
|
||||
</view>
|
||||
|
@ -48,8 +51,8 @@
|
|||
|
||||
<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" 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>
|
||||
|
@ -57,10 +60,16 @@
|
|||
</template>
|
||||
|
||||
<script setup>
|
||||
import { ref } from "vue";
|
||||
import {
|
||||
ref
|
||||
} from "vue";
|
||||
import useUserStore from "@/store/user";
|
||||
import { orderCountApi } from "@/api/order.js";
|
||||
import { onShow } from "@dcloudio/uni-app"
|
||||
import {
|
||||
orderCountApi
|
||||
} from "@/api/order.js";
|
||||
import {
|
||||
onShow
|
||||
} from "@dcloudio/uni-app"
|
||||
|
||||
const userStore = useUserStore();
|
||||
|
||||
|
@ -71,19 +80,19 @@
|
|||
receiving: 0,
|
||||
waiting: 0
|
||||
})
|
||||
const getOrderCount = ()=>{
|
||||
orderCountApi().then(res=>{
|
||||
const getOrderCount = () => {
|
||||
orderCountApi().then(res => {
|
||||
orderCount.value = res.data;
|
||||
})
|
||||
}
|
||||
|
||||
const navTo = (type=0) => {
|
||||
const navTo = (type = 0) => {
|
||||
uni.navigateTo({
|
||||
url: `/pagesOrder/order/order?type=${type}`
|
||||
})
|
||||
}
|
||||
|
||||
const logout = ()=>{
|
||||
const logout = () => {
|
||||
userStore.setToken('');
|
||||
userStore.setUserInfo({});
|
||||
uni.reLaunch({
|
||||
|
@ -91,7 +100,7 @@
|
|||
})
|
||||
}
|
||||
|
||||
onShow(()=>{
|
||||
onShow(() => {
|
||||
getOrderCount();
|
||||
})
|
||||
</script>
|
||||
|
@ -161,30 +170,32 @@
|
|||
background-position: right;
|
||||
background-repeat: no-repeat;
|
||||
|
||||
.info-head{
|
||||
.info-head {
|
||||
margin-left: 20rpx;
|
||||
margin-top: 20rpx;
|
||||
margin-bottom: 20rpx;
|
||||
font-size: 32rpx;
|
||||
}
|
||||
|
||||
.info-list{
|
||||
.info-list {
|
||||
height: 110rpx;
|
||||
display: flex;
|
||||
font-size: 26rpx;
|
||||
|
||||
.list-item{
|
||||
.list-item {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
position: relative;
|
||||
image{
|
||||
|
||||
image {
|
||||
width: 64rpx;
|
||||
height: 64rpx;
|
||||
}
|
||||
.badge{
|
||||
|
||||
.badge {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
right: 20%;
|
||||
|
@ -202,7 +213,7 @@
|
|||
}
|
||||
}
|
||||
|
||||
.card{
|
||||
.card {
|
||||
margin: 20rpx;
|
||||
background-color: #fff;
|
||||
border-radius: 14rpx;
|
||||
|
|
|
@ -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>
|
||||
|
@ -190,8 +190,8 @@
|
|||
addressInfo.value = addressList.value[0];
|
||||
isAddress.value = true;
|
||||
}
|
||||
if(addressInfo.value.address_id) {
|
||||
nextTick(()=>{
|
||||
if (addressInfo.value.address_id) {
|
||||
nextTick(() => {
|
||||
addressRef.value.setCheck(addressInfo.value.address_id);
|
||||
})
|
||||
}
|
||||
|
@ -218,7 +218,7 @@
|
|||
if (mer_name === null && myAddressInfo.value.long && merchantList.value.length > 0 && !shopInfo
|
||||
.value.mer_id) {
|
||||
shopInfo.value = merchantList.value[0];
|
||||
nextTick(()=>{
|
||||
nextTick(() => {
|
||||
shopRef.value.setCheck(shopInfo.value.mer_id);
|
||||
})
|
||||
}
|
||||
|
|
|
@ -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