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

Merge branch 'master' of https://gitea.lihaink.cn/weipengfei/purchase-let

This commit is contained in:
weipengfei 2024-05-11 16:45:40 +08:00
parent 31dfb56c17 2e7e193da9
commit 65d74155b5
9 changed files with 1278 additions and 1020 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
components/shopListPopup.vue
View File

@ -27,7 +27,7 @@
</view> </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>
@ -56,8 +56,8 @@
} }
const submitAddress = () => { const submitAddress = () => {
let e = props.list.find(item=>item.mer_id==addressType.value); let e = props.list.find(item => item.mer_id == addressType.value);
if(addressType.value<=0 || !e) return uni.$u.toast('请选择提货点'); if (addressType.value <= 0 || !e) return uni.$u.toast('请选择提货点');
emit('change', e); emit('change', e);
} }
@ -72,7 +72,7 @@
}) })
} }
const setCheck = (e)=>{ const setCheck = (e) => {
addressType.value = e; addressType.value = e;
} }
defineExpose({ defineExpose({

15
pageQuota/Balance/bindAccout.vue Normal file
View File

@ -0,0 +1,15 @@
<template>
<view class="content">
<view class="head">
<!-- -->
</view>
</view>
</template>
<script>
</script>
<style>
</style>

11
pageQuota/Balance/detail.vue Normal file
View File

@ -0,0 +1,11 @@
<template>
<view class="">
明细
</view>
</template>
<script>
</script>
<style>
</style>

165
pageQuota/Balance/index.vue Normal file
View File

@ -0,0 +1,165 @@
<template>
<view class="content">
<view class="total">
<view class="">
账户总余额(元)
</view>
<view style="font-size: 36rpx;">
￥1860.00
</view>
</view>
<view class="action">
<view class="">
提现至
</view>
<view style="font-weight: bold;">
请选择提现账户
</view>
<view style="display: flex;align-items: center;color: #20B128;"
@click="navgo('/pageQuota/Balance/bindAccout')">
<text>绑定账户</text> <up-icon color="#20B128" name="arrow-right"></up-icon>
</view>
</view>
<view class="form">
<!-- 注意，如果需要兼容微信小程序，最好通过setRules方法设置rules规则 -->
<up-form labelPosition="left" borderBottom :label-style="{fontSize:'30rpx'}" :model="model1" :rules="rules"
ref="form1" labelWidth='70'>
<up-form-item label="银行卡" prop="userInfo.name" borderBottom ref="item1">
<template #right>
<view style="display: flex;align-items: center;">
<text style="color: #20B128;">选择银行</text> <up-icon color="#20B128"
name="arrow-right"></up-icon>
</view>
</template>
</up-form-item>
<up-form-item label="持卡人" prop="userInfo.name" borderBottom ref="item1">
<up-input style="border: none;" v-model="form.name" placeholder="请输入持卡人姓名" />
</up-form-item>
<up-form-item label="银行账户" prop="userInfo.name" borderBottom ref="item1">
<up-input style="border: none;" v-model="form.name" placeholder="请输入银行账户" />
</up-form-item>
<up-form-item label="开户网点" prop="userInfo.name" borderBottom ref="item1">
<up-input style="border: none;" v-model="form.name" placeholder="请输入开户网点" />
</up-form-item>
<up-form-item label="提现金额" prop="userInfo.name" borderBottom ref="item1">
<up-input style="border: none;" v-model="form.name" placeholder="请输入提现金额" />
</up-form-item>
</up-form>
</view>
<view class="submit-btn">
<up-button text="提现" shape="circle" color="#50C758"></up-button>
</view>
</view>
</template>
<script setup>
import {
ref,
reactive
} from 'vue';
const navgo = (url) => {
uni.navigateTo({
url
})
}
const form = reactive({
name: ""
})
// 使用 reactive 创建响应式状态
const state = reactive({
showSex: false,
model1: {
userInfo: {
name: 'uview-plus UI',
sex: '',
},
},
actions: [{
name: '男'
},
{
name: '女'
},
{
name: '保密'
},
],
rules: {
'userInfo.name': {
type: 'string',
required: true,
message: '请填写姓名',
trigger: ['blur', 'change'],
},
'userInfo.sex': {
type: 'string',
max: 1,
required: true,
message: '请选择男或女',
trigger: ['blur', 'change'],
},
},
radio: '',
switchVal: false,
});
// 使用 ref 创建响应式引用
const formRef = ref(null);
// 定义方法
function sexSelect(e) {
state.model1.userInfo.sex = e.name;
if (formRef.value) {
formRef.value.validateField('userInfo.sex');
}
}
</script>
<style lang="scss">
.content {
padding: 20rpx;
.total {
background-color: #50C758;
border-radius: 16rpx 16rpx 16rpx 16rpx;
color: white;
display: flex;
justify-content: space-between;
padding: 42rpx 30rpx;
font-size: 30rpx;
margin-bottom: 30rpx;
}
.action {
background-color: white;
border-radius: 16rpx 16rpx 16rpx 16rpx;
padding: 30rpx;
display: flex;
justify-content: space-between;
margin-bottom: 30rpx;
}
.form {
padding: 28rpx 30rpx;
background-color: white;
border-radius: 20rpx;
}
}
.submit-btn {
position: fixed;
bottom: 146rpx;
width: 710rpx;
}
</style>

25
pageQuota/quotation/index.vue
View File

@ -58,10 +58,17 @@
v-model="item.price"></up-input> v-model="item.price"></up-input>
</view> </view>
</view> </view>
<view class="status-png" v-if="tabIndex==2"> <!-- <view class="status-png" v-if="tabIndex==2">
<image :src="item.is_adopt?successPng:errPng" style="width: 108rpx; height: 84rpx;"> <image v-if="is_storage==1 && is_adopt == 1" :src="waitPng"
style="width: 108rpx; height: 84rpx;">
</image> </image>
</view> <image v-else-if="is_storage==0 && is_adopt == 1" :src="waitPng"
style="width: 108rpx; height: 84rpx;">
</image>
<image v-else :src="waitPng" style="width: 108rpx; height: 84rpx;">
</image>
</view> -->
</view> </view>
<view class="card-footer" v-if="item.nums && item.price"> <view class="card-footer" v-if="item.nums && item.price">
共{{item.nums}}{{item.unit_name}}&nbsp; &nbsp;合计:<text 共{{item.nums}}{{item.unit_name}}&nbsp; &nbsp;合计:<text
@ -114,7 +121,15 @@
</view> </view>
</view> </view>
<view class="status-png" v-if="tabIndex==2"> <view class="status-png" v-if="tabIndex==2">
<image :src="item.is_adopt?successPng:errPng" style="width: 108rpx; height: 84rpx;"> <!-- <image :src="item.is_adopt?successPng:errPng" style="width: 108rpx; height: 84rpx;">
</image> -->
<image v-if="is_storage==1 && is_adopt == 1" :src="successPng"
style="width: 108rpx; height: 84rpx;">
</image>
<image v-else-if="is_storage==0 && is_adopt == 1" :src="errPng"
style="width: 108rpx; height: 84rpx;">
</image>
<image v-else :src="waitPng" style="width: 108rpx; height: 84rpx;">
</image> </image>
</view> </view>
</view> </view>
@ -160,6 +175,8 @@
// 状态图片url // 状态图片url
const successPng = ref('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/739c3202405071458553459.png') 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') const errPng = ref('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/04c2c202405071501462462.png')
const waitPng = ref('https://lihai001.oss-cn-chengdu.aliyuncs.com/attach/274ad202405111523222891.png')
// 状态图片url结束 // 状态图片url结束

20
pages.json
View File

@ -110,6 +110,26 @@
"navigationBarTitleText": "关于我们", "navigationBarTitleText": "关于我们",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
}, {
"path": "Balance/index",
"style": {
"navigationBarTitleText": "我的余额",
"enablePullDownRefresh": false
}
},
{
"path": "Balance/bindAccout",
"style": {
"navigationBarTitleText": "绑定账户",
"enablePullDownRefresh": false
}
},
{
"path": "Balance/detail",
"style": {
"navigationBarTitleText": "明细",
"enablePullDownRefresh": false
}
}, },
{ {
"path": "feedBack/index", "path": "feedBack/index",

39
pages/index/index.vue
View File

@ -22,8 +22,8 @@
<view class='headScoll' ref='headscroll' :style="{height:isScroll?'0':'200rpx'}"> <view class='headScoll' ref='headscroll' :style="{height:isScroll?'0':'200rpx'}">
<scroll-view class="head-view" scroll-x> <scroll-view class="head-view" scroll-x>
<view class="list"> <view class="list">
<view class="item" :class="{'item-active': topActive===item.id}" v-for="(item, index) in goodClassList" <view class="item" :class="{'item-active': topActive===item.id}"
:key="index" @click="changeOne(item, index)"> v-for="(item, index) in goodClassList" :key="index" @click="changeOne(item, index)">
<view class="c-img"><up-image height="100rpx" width="100rpx" :src="item.pic"></up-image></view> <view class="c-img"><up-image height="100rpx" width="100rpx" :src="item.pic"></up-image></view>
<view class="c-text u-line-1">{{item.name}}</view> <view class="c-text u-line-1">{{item.name}}</view>
</view> </view>
@ -42,8 +42,8 @@
<view class="head-title">全部分类</view> <view class="head-title">全部分类</view>
<scroll-view scroll-y style="height: 600rpx;"> <scroll-view scroll-y style="height: 600rpx;">
<view class="list"> <view class="list">
<view class="item" :class="{'item-active': topActive===item.id}" v-for="(item, index) in goodClassList" <view class="item" :class="{'item-active': topActive===item.id}"
:key="index" @click="changeOne(item, index)"> v-for="(item, index) in goodClassList" :key="index" @click="changeOne(item, index)">
<view class="c-img"><up-image height="100rpx" width="100rpx" :src="item.pic"></up-image> <view class="c-img"><up-image height="100rpx" width="100rpx" :src="item.pic"></up-image>
</view> </view>
<view class="c-text u-line-1">{{item.name}}</view> <view class="c-text u-line-1">{{item.name}}</view>
@ -54,8 +54,8 @@
</viewPopup> </viewPopup>
<view class="scroll-box"> <view class="scroll-box">
<scroll-view class="left" scroll-y> <scroll-view class="left" scroll-y>
<view class="item u-line-1" :class="{'item-active': leftActive===item.id}" v-for="(item, index) in goodClassTow" <view class="item u-line-1" :class="{'item-active': leftActive===item.id}"
:key="index" @click="changeTwo(item, index)">{{item.name}} v-for="(item, index) in goodClassTow" :key="index" @click="changeTwo(item, index)">{{item.name}}
</view> </view>
<view style="width: 100%;height: 450rpx;"></view> <view style="width: 100%;height: 450rpx;"></view>
</scroll-view> </scroll-view>
@ -77,24 +77,28 @@
<view class="item" :class="{'order-active': where.order==''}" @click="changeOrder('')">综合</view> <view class="item" :class="{'order-active': where.order==''}" @click="changeOrder('')">综合</view>
<view class="item" :class="{'order-active': where.order=='desc'||where.order=='asc'}" <view class="item" :class="{'order-active': where.order=='desc'||where.order=='asc'}"
@click="changeOrder(where.order=='asc'?'desc':'asc')">价格</view> @click="changeOrder(where.order=='asc'?'desc':'asc')">价格</view>
<view class="item" :class="{'order-active': where.order=='sales'}" @click="changeOrder('sales')">销量</view> <view class="item" :class="{'order-active': where.order=='sales'}"
@click="changeOrder('sales')">销量</view>
</view> </view>
</view> </view>
<viewPopup v-if="show===2" @close="show=0"> <viewPopup v-if="show===2" @close="show=0">
<view class="cateOne"> <view class="cateOne">
<scroll-view scroll-y style="height: 230rpx;"> <scroll-view scroll-y style="height: 230rpx;">
<view class="classify-list"> <view class="classify-list">
<view class="classify-list-item u-line-1" :class="{'item-active': rightActive===item.id}" <view class="classify-list-item u-line-1"
v-for="(item, index) in goodClassThree" :key="index" @click="changeThree(item, index)"> :class="{'item-active': rightActive===item.id}"
v-for="(item, index) in goodClassThree" :key="index"
@click="changeThree(item, index)">
{{item.name}} {{item.name}}
</view> </view>
</view> </view>
</scroll-view> </scroll-view>
</view> </view>
</viewPopup> </viewPopup>
<scroll-view class="list" id='drag_area' style="overscroll-behavior: none;" @scroll="hideHeadView" scroll-y <scroll-view class="list" id='drag_area' style="overscroll-behavior: none;" @scroll="hideHeadView"
@scrolltolower="loadMoreGood"> scroll-y @scrolltolower="loadMoreGood">
<view class="shop-item" v-for="(item, index) in goodList" :key="item.id" @click="openGoodPopup(item)"> <view class="shop-item" v-for="(item, index) in goodList" :key="item.id"
@click="openGoodPopup(item)">
<view class="shop-img"> <view class="shop-img">
<up-image width="120rpx" height="120rpx" :src="item.imgs"></up-image> <up-image width="120rpx" height="120rpx" :src="item.imgs"></up-image>
</view> </view>
@ -102,9 +106,10 @@
<view class="title"> <view class="title">
<view class="name u-line-2">{{item.name}}</view> <view class="name u-line-2">{{item.name}}</view>
<view class="tip u-line-1"> <view class="tip u-line-1">
<text>{{item.brand_name}}|</text> <text>{{item.spec}}</text>
<text>{{item.class_name}}|</text> <!-- <text>{{item.brand_name}}|</text> -->
<text>{{item.unit_name}}</text> <!-- <text>{{item.class_name}}|</text> -->
<!-- <text>{{item.unit_name}}</text> -->
</view> </view>
</view> </view>
<view class="price-btn"> <view class="price-btn">
@ -206,7 +211,7 @@
leftActive.value = goodClassTow.value[0]?.id || ''; leftActive.value = goodClassTow.value[0]?.id || '';
rightActive.value = goodClassThree.value[0]?.id || ''; rightActive.value = goodClassThree.value[0]?.id || '';
getGoodList(); getGoodList();
if(!item.isLoading) getgoodClassList(topActive.value); // 判断是否加载过数据, 加载过则不进行加载,节约资源 if (!item.isLoading) getgoodClassList(topActive.value); // 判断是否加载过数据, 加载过则不进行加载,节约资源
} }
const leftActive = ref(0); const leftActive = ref(0);
@ -217,7 +222,7 @@
goodClassThree.value = item?.children || []; goodClassThree.value = item?.children || [];
rightActive.value = goodClassThree.value[0]?.id || ''; rightActive.value = goodClassThree.value[0]?.id || '';
getGoodList(); getGoodList();
if(!item.isLoading) getgoodClassList(leftActive.value); // 判断是否加载过数据, 加载过则不进行加载,节约资源 if (!item.isLoading) getgoodClassList(leftActive.value); // 判断是否加载过数据, 加载过则不进行加载,节约资源
} }
const rightActive = ref(0); const rightActive = ref(0);

1
pages/my/my.vue
View File

@ -46,6 +46,7 @@
<view class="card"> <view class="card">
<up-cell-group> <up-cell-group>
<up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell> <up-cell title="我的地址" :isLink="true" url="/pagesOrder/addressList/addressList"></up-cell>
<up-cell title="我的余额" :isLink="true" url="/pageQuota/Balance/index"></up-cell>
</up-cell-group> </up-cell-group>
</view> </view>

50
pagesOrder/order/order.vue
View File

@ -19,8 +19,9 @@
<scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="loadMoreGood"> <scroll-view scroll-y style="height: 100%;width: 100%;" @scrolltolower="loadMoreGood">
<view class="page-box"> <view class="page-box">
<view v-if="list.length>0" class="list"> <view v-if="list.length>0" class="list">
<good v-for="(item, index) in list" :datas="item" :key="index" :type="k" @cancleOrder="cancleOrder" <good v-for="(item, index) in list" :datas="item" :key="index" :type="k"
@takeOrder="takeOrder" @rePay="rePay" @purchaseAgain="purchaseAgain"></good> @cancleOrder="cancleOrder" @takeOrder="takeOrder" @rePay="rePay"
@purchaseAgain="purchaseAgain"></good>
</view> </view>
<view v-if="!where[k].loading&&list.length==0" style="padding-top: 100rpx;"> <view v-if="!where[k].loading&&list.length==0" style="padding-top: 100rpx;">
<up-empty text="订单空空如也" <up-empty text="订单空空如也"
@ -41,32 +42,55 @@
</swiper-item> </swiper-item>
</swiper> </swiper>
<orderCanclePopup :show="showCancel" @close="showCancel=false" @change="submitCancel" /> <orderCanclePopup :show="showCancel" @close="showCancel=false" @change="submitCancel" />
<modal :show="showTake" title="确认收货" content="请确认您已收到货" @close="showTake=false" @change="confirmReceipt"></modal> <modal :show="showTake" title="确认收货" content="请确认您已收到货" @close="showTake=false" @change="confirmReceipt">
</modal>
</view> </view>
</template> </template>
<script setup> <script setup>
import { onLoad, onUnload } from "@dcloudio/uni-app" import {
import { ref } from 'vue'; onLoad,
onUnload
} from "@dcloudio/uni-app"
import {
ref
} from 'vue';
import good from "./component/good.vue"; import good from "./component/good.vue";
import orderCanclePopup from "@/components/orderCanclePopup.vue" import orderCanclePopup from "@/components/orderCanclePopup.vue"
import modal from "@/components/modal.vue" import modal from "@/components/modal.vue"
import { cancelOrderApi, rePaymentApi, confirmReceiptApi, orderListApi, purchaseAgainApi } from "@/api/order.js" import {
cancelOrderApi,
rePaymentApi,
confirmReceiptApi,
orderListApi,
purchaseAgainApi
} from "@/api/order.js"
const tabsActive = ref(0) const tabsActive = ref(0)
const changeTab = ({ index }) => { const changeTab = ({
index
}) => {
tabsActive.value = index; tabsActive.value = index;
swiperCurrent.value = index; swiperCurrent.value = index;
} }
const tablist = ref([ const tablist = ref([{
{ name: '全部' }, name: '全部'
{ name: '待付款' }, },
{ name: '待收货' }, {
name: '待付款'
},
{
name: '待收货'
},
// { name: '退款/售后' }, // { name: '退款/售后' },
]); ]);
const swiperCurrent = ref(0); const swiperCurrent = ref(0);
const animationfinish = ({ detail: { current } }) => { const animationfinish = ({
detail: {
current
}
}) => {
swiperCurrent.value = current; swiperCurrent.value = current;
tabsActive.value = current; tabsActive.value = current;
if (swiperCurrent.value == 0 && orderList.value[0].length == 0) getOrderList(0); if (swiperCurrent.value == 0 && orderList.value[0].length == 0) getOrderList(0);
@ -270,6 +294,6 @@
.page-box { .page-box {
margin: 20rpx; margin: 20rpx;
.list {} // .list {}
} }
</style> </style>