yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

!13 用户钱包及明细.搜索页修复.个人信息移除多余页面.商品列表字段优化，分类子商品展示 

Merge pull request !13 from Bluemark/vue3_tmp
pull/15/head
芋道源码 2023-11-10 11:27:21 +00:00 committed by Gitee
parent 626338416b bfa440e98c
commit 63c831464d
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
21 changed files with 1781 additions and 1656 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pages/goods/list.vue
View File

@ -137,8 +137,8 @@
total: 1,
last_page: 1,
},
currentSort: 'weigh',
currentOrder: 'desc',
// currentSort: 'weigh',
// currentOrder: 'desc',
currentTab: 0,
filterParams: {},
curFilter: 0,
@ -148,32 +148,32 @@
tabList: [
{
name: '综合推荐',
value: 'weigh',
// value: '',
list: [
{
label: '综合推荐',
sort: 'weigh',
order: 'desc',
// sort: '',
// order: true,
},
{
label: '价格升序',
sort: 'price',
order: 'asc',
order: true,
},
{
label: '价格降序',
sort: 'price',
order: 'desc',
order: false,
},
],
},
{
name: '销量',
value: 'total_sales',
// value: 'salesCount',
},
{
name: '新品优先',
value: 'create_time',
// value: 'create_time',
},
],
loadStatus: '',
@ -239,6 +239,7 @@
// 点击筛选项
const onFilterItem = (val) => {
console.log(val)
if (
state.currentSort === state.tabList[0].list[val].sort &&
state.currentOrder === state.tabList[0].list[val].order
@ -258,8 +259,8 @@
async function getList(Sort, Order, categoryId, keyword, page = 1, list_rows = 6) {
state.loadStatus = 'loading';
const res = await sheep.$api.goods.list({
sort: Sort,
order: Order,
sortField: Sort,
sortAsc: Order,
category_id: !keyword ? categoryId : '',
pageSize:list_rows,
keyword: keyword,

10
pages/index/category.vue
View File

@ -82,7 +82,8 @@
});
if (code === 0) {
state.categoryList = {
children: data
children: data,
style: 'first_one'
};
}
}
@ -96,17 +97,18 @@
total: 1,
last_page: 1,
};
getGoodsList(state.categoryList.children[val].id);
}
// 这段代码本来是在判断里的
getGoodsList(state.categoryList.children[val].id);
// getGoodsList(state.categoryList.children[val].id);
};
async function getGoodsList(id, page = 1, list_rows = 6) {
state.loadStatus = 'loading';
const res = await sheep.$api.goods.list({
categoryId: id,
pageSize:list_rows,
pageNo:page,
pageSize: list_rows,
pageNo: page,
});
if (res.code === 0) {
let couponList = _.concat(state.pagination.data, res.data.list);

22
pages/index/index.vue
View File

@ -26,6 +26,28 @@
uni.hideTabBar();
const template = computed(() => sheep.$store('app').template?.home);
// 在此处拦截改变一下首页轮播图 此处先写死后期复活 放到启动函数里
(async function() {
console.log('原代码首页定制化数据',template)
let {
data
} = await index2Api.decorate();
console.log('首页导航配置化过高无法兼容',JSON.parse(data[1].value))
// 改变首页底部数据 但是没有通过数组id获取商品数据接口
// let {
// data: datas
// } = await index2Api.spids();
// template.value.data[9].data.goodsIds = datas.list.map(item => item.id);
template.value.data[0].data.list = JSON.parse(data[0].value).map(item => {
return {
src: item.picUrl,
url: item.url,
title: item.name,
type: "image"
}
})
}())
onLoad((options) => {
// #ifdef MP

269
pages/order/list.vue
View File

@ -2,119 +2,83 @@
<template>
<s-layout title="我的订单">
<su-sticky bgColor="#fff">
<su-tabs
:list="tabMaps"
:scrollable="false"
@change="onTabsChange"
:current="state.currentTab"
></su-tabs>
<su-tabs :list="tabMaps" :scrollable="false" @change="onTabsChange" :current="state.currentTab"></su-tabs>
</su-sticky>
<s-empty
v-if="state.pagination.total === 0"
icon="/static/order-empty.png"
text="暂无订单"
></s-empty>
<s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单"></s-empty>
<view v-if="state.pagination.total > 0">
<view
class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20"
v-for="order in state.pagination.data"
:key="order.id"
@tap="onOrderDetail(order.order_sn)"
>
<view class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20" v-for="order in state.pagination.data"
:key="order.id" @tap="onOrderDetail(order.no)">
<view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20">
<view class="order-no">订单号：{{ order.order_sn }}</view>
<view class="order-no">订单号：{{ order.no }}</view>
<view class="order-state ss-font-26" :class="formatOrderColor(order.status_code)">{{
order.status_text
order.status
}}</view>
</view>
<view class="border-bottom" v-for="item in order.items" :key="item.id">
<s-goods-item
:img="item.goods_image"
:title="item.goods_title"
:skuText="item.goods_sku_text"
:price="item.goods_price"
:score="order.score_amount"
:num="item.goods_num"
>
<s-goods-item :img="item.picUrl" :title="item.spuName" :skuText="item.properties.length>1? item.properties.reduce((items2,items)=>items2.valueName+' '+items.valueName):item.properties[0].valueName"
:price="item.price/100" :score="order.score_amount" :num="item.count">
<template #tool>
<view class="ss-flex">
<button
class="ss-reset-button apply-btn"
v-if="item.btns.includes('aftersale')"
<!-- <button class="ss-reset-button apply-btn" v-if="item.btns.includes('aftersale')"
@tap.stop="
sheep.$router.go('/pages/order/aftersale/apply', {
item: JSON.stringify(item),
})
"
>
">
申请售后
</button>
<button
class="ss-reset-button apply-btn"
v-if="item.btns.includes('re_aftersale')"
<button class="ss-reset-button apply-btn" v-if="item.btns.includes('re_aftersale')"
@tap.stop="
sheep.$router.go('/pages/order/aftersale/apply', {
item: JSON.stringify(item),
})
"
>
">
重新售后
</button>
<button
class="ss-reset-button apply-btn"
v-if="item.btns.includes('aftersale_info')"
<button class="ss-reset-button apply-btn" v-if="item.btns.includes('aftersale_info')"
@tap.stop="
sheep.$router.go('/pages/order/aftersale/detail', {
id: item.ext.aftersale_id,
})
"
>
">
售后详情
</button>
<button
class="ss-reset-button apply-btn"
v-if="item.btns.includes('buy_again')"
<button class="ss-reset-button apply-btn" v-if="item.btns.includes('buy_again')"
@tap.stop="
sheep.$router.go('/pages/goods/index', {
id: item.goods_id,
})
"
>
">
再次购买
</button>
</button> -->
</view>
</template>
</s-goods-item>
</view>
<view class="pay-box ss-m-t-30 ss-flex ss-row-right ss-p-r-20">
<view v-if="order.total_discount_fee > 0" class="ss-flex ss-col-center ss-m-r-8">
<!-- <view v-if="order.total_discount_fee > 0" class="ss-flex ss-col-center ss-m-r-8">
<view class="discounts-title">优惠:￥</view>
<view class="discounts-money">{{ order.total_discount_fee }}</view>
</view>
<view class="ss-flex ss-col-center ss-m-r-8">
</view> -->
<!-- <view class="ss-flex ss-col-center ss-m-r-8">
<view class="discounts-title">运费:￥</view>
<view class="discounts-money">{{ order.dispatch_amount }}</view>
</view>
</view> -->
<view class="ss-flex ss-col-center">
<view class="discounts-title pay-color">总金额:</view>
<view class="discounts-money pay-color" v-if="Number(order.order_amount) > 0"
>￥{{ order.order_amount }}</view
>
<view v-if="order.score_amount && Number(order.order_amount) > 0">+</view>
<view class="discounts-title pay-color">共{{count}}件商品,总金额:</view>
<view class="discounts-money pay-color" v-if="Number(order.payPrice) > 0">
￥{{ order.payPrice/100 }}</view>
<view v-if="order.score_amount && Number(order.payPrice) > 0">+</view>
<view class="discounts-money pay-color ss-flex ss-col-center" v-if="order.score_amount">
<image
:src="sheep.$url.static('/static/img/shop/goods/score1.svg')"
class="score-img"
></image>
<image :src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="score-img">
</image>
<view>{{ order.score_amount }}</view>
</view>
</view>
</view>
<view
class="order-card-footer ss-flex ss-col-center ss-p-x-20"
:class="order.btns.length > 3 ? 'ss-row-between' : 'ss-row-right'"
>
<!-- :class="order.btns.length > 3 ? 'ss-row-between' : 'ss-row-right'" -->
<view class="order-card-footer ss-flex ss-col-center ss-p-x-20">
<!-- <su-popover>
<button class="more-btn ss-reset-button" @click.stop>更多</button>
<template #content>
@ -132,114 +96,87 @@
</template>
</su-popover> -->
<view class="ss-flex ss-col-center">
<button
v-if="order.btns.includes('groupon')"
class="tool-btn ss-reset-button"
@tap.stop="onOrderGroupon(order)"
>
<!-- <button v-if="order.btns.includes('groupon')" class="tool-btn ss-reset-button"
@tap.stop="onOrderGroupon(order)">
{{ order.status_code === 'groupon_ing' ? '邀请拼团' : '拼团详情' }}
</button>
<button
v-if="order.btns.includes('invoice')"
class="tool-btn ss-reset-button"
@tap.stop="onOrderInvoice(order.invoice?.id)"
>
<button v-if="order.btns.includes('invoice')" class="tool-btn ss-reset-button"
@tap.stop="onOrderInvoice(order.invoice?.id)">
查看发票
</button>
<button
v-if="order.btns.length === 0"
class="tool-btn ss-reset-button"
@tap.stop="onOrderDetail(order.order_sn)"
>
<button v-if="order.btns.length === 0" class="tool-btn ss-reset-button"
@tap.stop="onOrderDetail(order.order_sn)">
查看详情
</button>
<button
v-if="order.btns.includes('confirm')"
class="tool-btn ss-reset-button"
@tap.stop="onConfirm(order)"
>
<button v-if="order.btns.includes('confirm')" class="tool-btn ss-reset-button"
@tap.stop="onConfirm(order)">
确认收货
</button>
<button
v-if="order.btns.includes('express')"
class="tool-btn ss-reset-button"
@tap.stop="onExpress(order.id)"
>
<button v-if="order.btns.includes('express')" class="tool-btn ss-reset-button"
@tap.stop="onExpress(order.id)">
查看物流
</button>
<button
v-if="order.btns.includes('apply_refund')"
class="tool-btn ss-reset-button"
@tap.stop="onRefund(order.id)"
>
<button v-if="order.btns.includes('apply_refund')" class="tool-btn ss-reset-button"
@tap.stop="onRefund(order.id)">
申请退款
</button>
<button
v-if="order.btns.includes('re_apply_refund')"
class="tool-btn ss-reset-button"
@tap.stop="onRefund(order.id)"
>
<button v-if="order.btns.includes('re_apply_refund')" class="tool-btn ss-reset-button"
@tap.stop="onRefund(order.id)">
重新退款
</button>
<button
v-if="order.btns.includes('cancel')"
class="tool-btn ss-reset-button"
@tap.stop="onCancel(order.id)"
>
<button v-if="order.btns.includes('cancel')" class="tool-btn ss-reset-button"
@tap.stop="onCancel(order.id)">
取消订单
</button>
<button
v-if="order.btns.includes('comment')"
class="tool-btn ss-reset-button"
@tap.stop="onComment(order.order_sn)"
>
<button v-if="order.btns.includes('comment')" class="tool-btn ss-reset-button"
@tap.stop="onComment(order.order_sn)">
评价晒单
</button>
<button
v-if="order.btns.includes('delete')"
class="delete-btn ss-reset-button"
@tap.stop="onDelete(order.id)"
>
<button v-if="order.btns.includes('delete')" class="delete-btn ss-reset-button"
@tap.stop="onDelete(order.id)">
删除订单
</button>
<button
v-if="order.btns.includes('pay')"
class="tool-btn ss-reset-button ui-BG-Main-Gradient"
@tap.stop="onPay(order.order_sn)"
>
<button v-if="order.btns.includes('pay')" class="tool-btn ss-reset-button ui-BG-Main-Gradient"
@tap.stop="onPay(order.order_sn)">
继续支付
</button>
</button> -->
</view>
</view>
</view>
</view>
<!-- 加载更多 -->
<uni-load-more
v-if="state.pagination.total > 0"
:status="state.loadStatus"
:content-text="{
<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
contentdown: '上拉加载更多',
}"
@tap="loadmore"
/>
}" @tap="loadmore" />
</s-layout>
</template>
<script setup>
import { computed, reactive } from 'vue';
import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app';
import { formatOrderColor } from '@/sheep/hooks/useGoods';
import {
computed,
reactive
} from 'vue';
import {
onLoad,
onReachBottom,
onPullDownRefresh
} from '@dcloudio/uni-app';
import {
formatOrderColor
} from '@/sheep/hooks/useGoods';
import sheep from '@/sheep';
import _ from 'lodash';
import { isEmpty } from 'lodash';
import {
isEmpty
} from 'lodash';
const pagination = {
data: [],
@ -261,26 +198,25 @@
error: 0,
});
const tabMaps = [
{
const tabMaps = [{
name: '全部',
value: 'all',
// value: 'all',
},
{
name: '待付款',
value: 'unpaid',
value: 0,
},
{
name: '待发货',
value: 'nosend',
value: 10,
},
{
name: '待收货',
value: 'noget',
value: 20,
},
{
name: '待评价',
value: 'nocomment',
value: 30,
},
];
@ -348,7 +284,9 @@
// 正常的确认收货流程
const { error } = await sheep.$api.order.confirm(order.id);
const {
error
} = await sheep.$api.order.confirm(order.id);
if (error === 0) {
state.pagination = pagination;
getOrderList();
@ -399,9 +337,12 @@
uni.showModal({
title: '提示',
content: '确定要取消订单吗?',
success: async function (res) {
success: async function(res) {
if (res.confirm) {
const { error, data } = await sheep.$api.order.cancel(orderId);
const {
error,
data
} = await sheep.$api.order.cancel(orderId);
if (error === 0) {
let index = state.pagination.data.findIndex((order) => order.id === orderId);
state.pagination.data[index] = data;
@ -416,9 +357,12 @@
uni.showModal({
title: '提示',
content: '确定要删除订单吗?',
success: async function (res) {
success: async function(res) {
if (res.confirm) {
const { error, data } = await sheep.$api.order.delete(orderId);
const {
error,
data
} = await sheep.$api.order.delete(orderId);
if (error === 0) {
let index = state.pagination.data.findIndex((order) => order.id === orderId);
state.pagination.data.splice(index, 1);
@ -433,12 +377,15 @@
uni.showModal({
title: '提示',
content: '确定要申请退款吗?',
success: async function (res) {
success: async function(res) {
if (res.confirm) {
// #ifdef MP
sheep.$platform.useProvider('wechat').subscribeMessage('order_refund');
// #endif
const { error, data } = await sheep.$api.order.applyRefund(orderId);
const {
error,
data
} = await sheep.$api.order.applyRefund(orderId);
if (error === 0) {
let index = state.pagination.data.findIndex((order) => order.id === orderId);
state.pagination.data[index] = data;
@ -452,19 +399,20 @@
async function getOrderList(page = 1, list_rows = 5) {
state.loadStatus = 'loading';
let res = await sheep.$api.order.list({
type: tabMaps[state.currentTab].value,
list_rows,
page,
status: tabMaps[state.currentTab].value,
pageSize: list_rows,
pageNo: page,
commentStatus: tabMaps[state.currentTab].value==30?false:null
});
state.error = res.error;
if (res.error === 0) {
let orderList = _.concat(state.pagination.data, res.data.data);
state.error = res.code;
if (res.code === 0) {
let orderList = _.concat(state.pagination.data, res.data.list);
state.pagination = {
...res.data,
data: orderList,
};
if (state.pagination.current_page < state.pagination.last_page) {
console.log(state.pagination)
if (state.pagination.data.length < state.pagination.total) {
state.loadStatus = 'more';
} else {
state.loadStatus = 'noMore';
@ -482,7 +430,7 @@
// 加载更多
function loadmore() {
if (state.loadStatus !== 'noMore') {
getOrderList(state.pagination.current_page + 1);
getOrderList(parseInt((state.pagination.data.length/5)+1));
}
}
@ -495,7 +443,7 @@
onPullDownRefresh(() => {
state.pagination = pagination;
getOrderList();
setTimeout(function () {
setTimeout(function() {
uni.stopPullDownRefresh();
}, 800);
});
@ -507,6 +455,7 @@
height: 36rpx;
margin: 0 4rpx;
}
.tool-btn {
width: 160rpx;
height: 60rpx;
@ -519,6 +468,7 @@
margin-right: 0;
}
}
.delete-btn {
width: 160rpx;
height: 56rpx;
@ -562,8 +512,7 @@
font-weight: 500;
}
.order-state {
}
.order-state {}
}
.pay-box {
@ -617,15 +566,19 @@
:deep(.uni-tooltip-popup) {
background: var(--ui-BG);
}
.warning-color {
color: #faad14;
}
.danger-color {
color: #ff3000;
}
.success-color {
color: #52c41a;
}
.info-color {
color: #999999;
}

141
pages/user/address/edit.vue
View File

@ -1,69 +1,33 @@
<template>
<s-layout :title="state.model.id ? '编辑地址' : '新增地址'">
<uni-forms
ref="addressFormRef"
v-model="state.model"
:rules="state.rules"
validateTrigger="bind"
labelWidth="160"
labelAlign="left"
border
:labelStyle="{ fontWeight: 'bold' }"
>
<uni-forms ref="addressFormRef" v-model="state.model" :rules="state.rules" validateTrigger="bind"
labelWidth="160" labelAlign="left" border :labelStyle="{ fontWeight: 'bold' }">
<view class="bg-white form-box ss-p-x-30">
<uni-forms-item name="consignee" label="收货人" class="form-item">
<uni-easyinput
v-model="state.model.consignee"
placeholder="请填写收货人姓名"
:inputBorder="false"
placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
/>
<uni-easyinput v-model="state.model.consignee" placeholder="请填写收货人姓名" :inputBorder="false"
placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal" />
</uni-forms-item>
<uni-forms-item name="mobile" label="手机号" class="form-item">
<uni-easyinput
v-model="state.model.mobile"
type="number"
placeholder="请输入手机号"
:inputBorder="false"
placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
>
<uni-easyinput v-model="state.model.mobile" type="number" placeholder="请输入手机号" :inputBorder="false"
placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal">
</uni-easyinput>
</uni-forms-item>
<uni-forms-item
name="region"
label="省市区"
@tap="state.showRegion = true"
class="form-item"
>
<uni-easyinput
v-model="state.model.region"
disabled
:inputBorder="false"
<uni-forms-item name="region" label="省市区" @tap="state.showRegion = true" class="form-item">
<uni-easyinput v-model="state.model.region" disabled :inputBorder="false"
:styles="{ disableColor: '#fff', color: '#333' }"
placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
placeholder="请选择省市区"
>
placeholder="请选择省市区">
<template v-slot:right>
<uni-icons type="right"></uni-icons>
</template>
</uni-easyinput>
</uni-forms-item>
<uni-forms-item
name="address"
label="详细地址"
:formItemStyle="{ alignItems: 'flex-start' }"
:labelStyle="{ lineHeight: '5em' }"
class="textarea-item"
>
<uni-easyinput
:inputBorder="false"
type="textarea"
v-model="state.model.address"
<uni-forms-item name="address" label="详细地址" :formItemStyle="{ alignItems: 'flex-start' }"
:labelStyle="{ lineHeight: '5em' }" class="textarea-item">
<uni-easyinput :inputBorder="false" type="textarea" v-model="state.model.address"
placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
placeholder="请输入详细地址"
clearable
></uni-easyinput>
placeholder="请输入详细地址" clearable></uni-easyinput>
</uni-forms-item>
</view>
@ -74,30 +38,39 @@
</uni-forms>
<su-fixed bottom :opacity="false" bg="" placeholder :noFixed="false" :index="10">
<view class="footer-box ss-flex-col ss-row-between ss-p-20">
<view class="ss-m-b-20"
><button class="ss-reset-button save-btn ui-Shadow-Main" @tap="onSave">保存</button></view
>
<view class="ss-m-b-20"><button class="ss-reset-button save-btn ui-Shadow-Main"
@tap="onSave">保存</button></view>
<button v-if="state.model.id" class="ss-reset-button cancel-btn" @tap="onDelete">
删除
</button>
</view>
</su-fixed>
<!-- 省市区弹窗 -->
<su-region-picker
:show="state.showRegion"
@cancel="state.showRegion = false"
@confirm="onRegionConfirm"
>
<su-region-picker :show="state.showRegion" @cancel="state.showRegion = false" @confirm="onRegionConfirm">
</su-region-picker>
</s-layout>
</template>
<script setup>
import { computed, watch, ref, reactive, unref } from 'vue';
import {
computed,
watch,
ref,
reactive,
unref
} from 'vue';
import sheep from '@/sheep';
import { onLoad, onPageScroll } from '@dcloudio/uni-app';
import {
onLoad,
onPageScroll
} from '@dcloudio/uni-app';
import _ from 'lodash';
import { consignee, mobile, address, region } from '@/sheep/validate/form';
import {
consignee,
mobile,
address,
region
} from '@/sheep/validate/form';
const addressFormRef = ref(null);
const state = reactive({
@ -120,10 +93,10 @@
() => state.model.province_name,
(newValue) => {
if (newValue) {
state.model.region = `${state.model.province_name}-${state.model.city_name}-${state.model.district_name}`;
state.model.region =
`${state.model.province_name}-${state.model.city_name}-${state.model.district_name}`;
}
},
{
}, {
deep: true,
},
);
@ -137,7 +110,7 @@
const getAreaData = () => {
if (_.isEmpty(uni.getStorageSync('areaData'))) {
sheep.$api.data.area().then((res) => {
if (res.error === 0) {
if (res.code === 0) {
uni.setStorageSync('areaData', res.data);
}
});
@ -153,11 +126,24 @@
let res = null;
if (state.model.id) {
res = await sheep.$api.user.address.update(state.model.id, state.model);
res = await sheep.$api.user.address.update({
id: state.model.id,
areaId: state.model.district_id,
defaultStatus: state.model.is_default,
detailAddress: state.model.address,
mobile: state.model.mobile,
name: state.model.consignee
});
} else {
res = await sheep.$api.user.address.create(state.model);
res = await sheep.$api.user.address.create({
areaId: state.model.district_id,
defaultStatus: state.model.is_default,
detailAddress: state.model.address,
mobile: state.model.mobile,
name: state.model.consignee
});
}
if (res.error === 0) {
if (res.code === 0) {
sheep.$router.back();
}
};
@ -166,10 +152,12 @@
uni.showModal({
title: '提示',
content: '确认删除此收货地址吗？',
success: async function (res) {
success: async function(res) {
if (res.confirm) {
const { error } = await sheep.$api.user.address.delete(state.model.id);
if (res.error === 0) {
const {
code
} = await sheep.$api.user.address.delete(state.model.id);
if (code === 0) {
sheep.$router.back();
}
}
@ -180,16 +168,25 @@
getAreaData();
if (options.id) {
let res = await sheep.$api.user.address.detail(options.id);
if (res.error === 0) {
if (res.code === 0) {
state.model = {
...state.model,
...res.data,
district_id: res.data.areaId,
is_default: res.data.defaultStatus,
address: res.data.detailAddress,
mobile: res.data.mobile,
consignee: res.data.name,
id: res.data.id,
province_name: res.data.areaName.split(' ')[0],
city_name: res.data.areaName.split(' ')[1],
district_name: res.data.areaName.split(' ')[2]
};
}
}
if (options.data) {
let data = JSON.parse(options.data);
console.log(data)
state.model = {
...state.model,
...data,

31
pages/user/goods-collect.vue
View File

@ -35,25 +35,26 @@
<label
class="check-box ss-flex ss-col-center ss-p-l-10"
v-if="state.editMode"
@tap="onSelect(item.goods_id)"
@tap="onSelect(item.spuId)"
>
<radio
:checked="state.selectedCollectList.includes(item.goods_id)"
:checked="state.selectedCollectList.includes(item.spuId)"
color="var(--ui-BG-Main)"
style="transform: scale(0.8)"
@tap.stop="onSelect(item.goods_id)"
@tap.stop="onSelect(item.spuId)"
/>
</label>
<!-- :skuText="item.goods.subtitle" -->
<s-goods-item
:title="item.goods.title"
:img="item.goods.image"
:price="item.goods.price[0]"
:skuText="item.goods.subtitle"
:title="item.spuName"
:img="item.picUrl"
:price="item.price"
priceColor="#FF3000"
:titleWidth="400"
@tap="
sheep.$router.go('/pages/goods/index', {
id: item.goods_id,
id: item.spuId,
})
"
>
@ -126,15 +127,17 @@
async function getData(page = 1, list_rows = 6) {
state.loadStatus = 'loading';
let res = await sheep.$api.user.favorite.list({
list_rows,
page,
pageSize:list_rows,
pageNo:page,
});
if (res.error === 0) {
let orderList = _.concat(state.pagination.data, res.data.data);
if (res.code === 0) {
console.log('yudao收藏列表',res)
let orderList = _.concat(state.pagination.data, res.data.list);
state.pagination = {
...res.data,
data: orderList,
};
// 没有原接口文档不太理解这字段意思
if (state.pagination.current_page < state.pagination.last_page) {
state.loadStatus = 'more';
} else {
@ -173,8 +176,8 @@
async function onCancel() {
if (state.selectedCollectList) {
state.selectedCollectList = state.selectedCollectList.toString();
const { error } = await sheep.$api.user.favorite.cancel(state.selectedCollectList);
if (error === 0) {
const { code } = await sheep.$api.user.favorite.cancel(state.selectedCollectList);
if (code === 0) {
state.editMode = false;
state.selectedCollectList = [];
state.selectAll = false;

21
pages/user/info.vue
View File

@ -36,7 +36,7 @@
</view>
<view class="bg-white ss-p-x-30">
<uni-forms-item name="username" label="用户名" @tap="onChangeUsername" class="label-box">
<!-- <uni-forms-item name="username" label="用户名" @tap="onChangeUsername" class="label-box">
<uni-easyinput
v-model="userInfo.username"
disabled
@ -53,7 +53,7 @@
</button>
</template>
</uni-easyinput>
</uni-forms-item>
</uni-forms-item> -->
<uni-forms-item name="nickname" label="昵称">
<uni-easyinput
@ -65,7 +65,7 @@
/>
</uni-forms-item>
<uni-forms-item name="gender" label="性别">
<!-- <uni-forms-item name="gender" label="性别">
<view class="ss-flex ss-col-center ss-h-100">
<radio-group @change="onChangeGender" class="ss-flex ss-col-center">
<label class="radio" v-for="item in genderRadioMap" :key="item.value">
@ -81,7 +81,7 @@
</label>
</radio-group>
</view>
</uni-forms-item>
</uni-forms-item> -->
<uni-forms-item name="mobile" label="手机号" @tap="onChangeMobile">
<uni-easyinput
@ -312,12 +312,17 @@
// 保存信息
async function onSubmit() {
const { error, data } = await sheep.$api.user.update({
// const { error, data } = await sheep.$api.user.update({
// avatar: state.model.avatar,
// nickname: state.model.nickname,
// gender: state.model.gender,
// });
const { code, data } = await sheep.$api.user.update({
avatar: state.model.avatar,
nickname: state.model.nickname,
gender: state.model.gender,
// gender: state.model.gender,
});
if (error === 0) {
if (code === 0) {
getUserInfo();
}
}
@ -327,6 +332,8 @@
state.model = clone(userInfo);
if (sheep.$platform.name !== 'H5') {
return;
// 这个先注释,要不然小程序保存个人信息有问题,
let { data, error } = await sheep.$api.user.thirdOauthInfo();
if (error === 0) {
state.thirdOauthInfo = data;

94
pages/user/wallet/money.vue
View File

@ -5,11 +5,8 @@
<view class="card-box ui-BG-Main ui-Shadow-Main">
<view class="card-head ss-flex ss-col-center">
<view class="card-title ss-m-r-10">钱包余额（元）</view>
<view
@tap="state.showMoney = !state.showMoney"
class="ss-eye-icon"
:class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'"
></view>
<view @tap="state.showMoney = !state.showMoney" class="ss-eye-icon"
:class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'"></view>
</view>
<view class="ss-flex ss-row-between ss-col-center ss-m-t-64">
<view class="money-num">{{ state.showMoney ? userInfo.money : '*****' }}</view>
@ -23,60 +20,55 @@
<su-sticky>
<!-- 统计 -->
<view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
<uni-datetime-picker v-model="state.data" type="daterange" @change="onChangeTime" :end="state.today">
<!-- <uni-datetime-picker v-model="state.data" type="daterange" @change="onChangeTime" :end="state.today">
<button class="ss-reset-button date-btn">
<text>{{ dateFilterText }}</text>
<text class="cicon-drop-down ss-seldate-icon"></text>
</button>
</uni-datetime-picker>
</uni-datetime-picker> -->
<view class="total-box">
<view class="ss-m-b-10">总收入￥{{ state.pagination.income.toFixed(2) }}</view>
<view>总支出￥{{ (-state.pagination.expense).toFixed(2) }}</view>
<!-- state.pagination.income.toFixed(2) -->
<view class="ss-m-b-10">总收入￥{{ }}</view>
<view>总支出￥{{ }}</view>
<!-- (-state.pagination.expense).toFixed(2) -->
</view>
</view>
<su-tabs
:list="tabMaps"
@change="onChange"
:scrollable="false"
:current="state.currentTab"
></su-tabs>
<su-tabs :list="tabMaps" @change="onChange" :scrollable="false" :current="state.currentTab"></su-tabs>
</su-sticky>
<s-empty v-if="state.pagination.total === 0" text="暂无数据" icon="/static/data-empty.png" />
<!-- 钱包记录 -->
<view v-if="state.pagination.total > 0">
<view
class="wallet-list ss-flex border-bottom"
v-for="item in state.pagination.data"
:key="item.id"
>
<view class="wallet-list ss-flex border-bottom" v-for="item in state.pagination.data" :key="item.id">
<view class="list-content">
<view class="title-box ss-flex ss-row-between ss-m-b-20">
<text class="title ss-line-1"
>{{ item.event_text }}{{ item.memo ? '-' + item.memo : '' }}</text
>
<!-- <text class="title ss-line-1">{{ item.event_text }}{{ item.memo ? '-' + item.memo : '' }}</text> -->
<text class="title ss-line-1">{{ item.title }}</text>
<view class="money">
<text v-if="item.amount >= 0" class="add">+{{ item.amount }}</text>
<text v-else class="minus">{{ item.amount }}</text>
<text v-if="(item.amount >= 0||item.price>=0)" class="add">+{{ item.amount||item.price }}</text>
<text v-else class="minus">{{ item.price }}</text>
</view>
</view>
<text class="time">{{ item.create_time }}</text>
<text class="time">{{ item.createTime }}</text>
</view>
</view>
</view>
<uni-load-more
v-if="state.pagination.total > 0"
:status="state.loadStatus"
:content-text="{
<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
contentdown: '上拉加载更多',
}"
/>
}" />
</s-layout>
</template>
<script setup>
import { computed, watch, reactive } from 'vue';
import { onLoad, onReachBottom } from '@dcloudio/uni-app';
import {
computed,
watch,
reactive
} from 'vue';
import {
onLoad,
onReachBottom
} from '@dcloudio/uni-app';
import sheep from '@/sheep';
import dayjs from 'dayjs';
import _ from 'lodash';
@ -101,22 +93,21 @@
today: '',
});
const tabMaps = [
{
const tabMaps = [{
name: '全部',
value: 'all',
// value: 'all',
},
{
name: '收入',
value: 'income',
value: '1',
},
{
name: '支出',
value: 'expense',
value: '2',
},
];
const userInfo = computed(() => sheep.$store('user').userInfo);
console.log(userInfo)
const dateFilterText = computed(() => {
if (state.date[0] === state.date[1]) {
return state.date[0];
@ -126,22 +117,23 @@
});
async function getLogList(page = 1, list_rows = 8) {
state.loadStatus = 'loading';
// state.loadStatus = 'loading';
let res = await sheep.$api.user.wallet.log({
type: 'money',
tab: tabMaps[state.currentTab].value,
list_rows,
page,
date: appendTimeHMS(state.date),
// type: 'money',
type: tabMaps[state.currentTab].value,
pageSize: list_rows,
pageNo: page,
// date: appendTimeHMS(state.date),
});
if (res.error === 0) {
let list = _.concat(state.pagination.data, res.data.list.data);
if (res.code === 0) {
let list = _.concat(state.pagination.data, res.data.list);
state.pagination = {
...res.data.list,
...res.data,
data: list,
income: res.data.income,
expense: res.data.expense,
};
console.log('交易数据',state.pagination)
if (state.pagination.current_page < state.pagination.last_page) {
state.loadStatus = 'more';
} else {
@ -205,8 +197,7 @@
position: absolute;
top: 0;
left: 0;
background: v-bind(headerBg)
no-repeat;
background: v-bind(headerBg) no-repeat;
pointer-events: none;
}
@ -340,6 +331,7 @@
font-size: 28rpx;
font-weight: bold;
font-family: OPPOSANS;
.add {
color: var(--ui-BG-Main);
}

10
sheep/api/app.js
View File

@ -107,16 +107,20 @@ export default {
title: '上传中',
});
return new Promise((resolve, reject) => {
// 此处先换成yudao
uni.uploadFile({
url: baseUrl + '/file/api/upload',
url: 'http://api-dashboard.yudao.iocoder.cn' + '/app-api/infra/file/upload',
filePath: file,
name: 'file',
formData: {
group,
},
header: {
Accept: 'text/json',
Authorization: token,
// Accept: 'text/json',
// Authorization: token,
Accept : '*/*',
'tenant-id' :'1',
Authorization: 'Bearer test247',
},
success: (uploadFileRes) => {
let result = JSON.parse(uploadFileRes.data);

10
sheep/api/data.js
View File

@ -1,11 +1,17 @@
import request from '@/sheep/request';
import request2 from '@/sheep/request2';
export default {
area: () =>
request({
url: 'data/area',
request2({
url: 'system/area/tree',
method: 'GET',
}),
// area: () =>
// request({
// url: 'data/area',
// method: 'GET',
// }),
faq: () =>
request({
url: 'data/faq',

5
sheep/api/index2.js
View File

@ -6,4 +6,9 @@ export default {
url: 'promotion/decorate/list?page=1',
method: 'GET',
}),
spids: () =>
request2({
url: 'product/spu/page?recommendType=best&pageNo=1&pageSize=10',
method: 'GET',
}),
};

14
sheep/api/order.js
View File

@ -1,4 +1,5 @@
import request from '@/sheep/request';
import request2 from '@/sheep/request2';
export default {
// 订单详情
@ -33,14 +34,23 @@ export default {
}),
// 订单列表
list: (params) =>
request({
url: 'order/order',
request2({
url: 'trade/order/page',
method: 'GET',
params,
custom: {
showLoading: false,
},
}),
// list: (params) =>
// request({
// url: 'order/order',
// method: 'GET',
// params,
// custom: {
// showLoading: false,
// },
// }),
// 计算订单信息
calc: (data) =>
request({

154
sheep/api/user.js
View File

@ -1,20 +1,49 @@
import request from '@/sheep/request';
import request2 from '@/sheep/request2';
import $platform from '@/sheep/platform';
export default {
profile: () =>
request({
url: '/user/api/user/profile',
request2({
url: 'member/user/get',
method: 'GET',
custom: {
showLoading: false,
auth: true,
},
}),
balance: () =>
request2({
url: '/app-api/pay/wallet/get',
method: 'GET',
custom: {
showLoading: false,
auth: true,
},
}),
// profile: () =>
// request({
// url: '/user/api/user/profile',
// method: 'GET',
// custom: {
// showLoading: false,
// auth: true,
// },
// }),
// update: (data) =>
// request({
// url: '/user/api/user/update',
// method: 'POST',
// custom: {
// showSuccess: true,
// auth: true,
// },
// data,
// }),
update: (data) =>
request({
url: '/user/api/user/update',
method: 'POST',
request2({
url: 'member/user/update',
method: 'PUT',
custom: {
showSuccess: true,
auth: true,
@ -167,39 +196,73 @@ export default {
},
}),
list: () =>
request({
url: 'user/address',
request2({
url: 'member/address/list',
method: 'GET',
custom: {},
}),
// list: () =>
// request({
// url: 'user/address',
// method: 'GET',
// custom: {},
// }),
create: (data) =>
request({
url: 'user/address',
request2({
url: 'member/address/create',
method: 'POST',
data,
custom: {
showSuccess: true,
},
}),
update: (id, data) =>
request({
url: 'user/address/' + id,
// create: (data) =>
// request({
// url: 'user/address',
// method: 'POST',
// data,
// custom: {
// showSuccess: true,
// },
// }),
update: ( data) =>
request2({
url: 'member/address/update',
method: 'PUT',
data,
custom: {
showSuccess: true,
},
}),
// update: (id, data) =>
// request({
// url: 'user/address/' + id,
// method: 'PUT',
// data,
// custom: {
// showSuccess: true,
// },
// }),
detail: (id) =>
request({
url: 'user/address/' + id,
request2({
url: 'member/address/get?id=' + id,
method: 'GET',
}),
// detail: (id) =>
// request({
// url: 'user/address/' + id,
// method: 'GET',
// }),
delete: (id) =>
request({
url: 'user/address/' + id,
request2({
url: 'member/address/delete?id=' + id,
method: 'DELETE',
}),
// delete: (id) =>
// request({
// url: 'user/address/' + id,
// method: 'DELETE',
// }),
},
invoice: {
list: () =>
@ -239,8 +302,8 @@ export default {
},
favorite: {
list: (params) =>
request({
url: 'user/goodsLog/favorite',
request2({
url: 'product/favorite/page',
method: 'GET',
params,
}),
@ -256,18 +319,32 @@ export default {
auth: true,
},
}),
// 取消收藏
cancel: (id) =>
request({
url: 'user/goodsLog/favorite',
method: 'POST',
request2({
url: 'product/favorite/delete-list',
method: 'DELETE',
data: {
goods_ids: id,
spuIds: id.split(',').map(item=>item*1),
// spuIds: id.split(',').join(','),
},
custom: {
showSuccess: true,
auth: true,
},
}),
// cancel: (id) =>
// request({
// url: 'user/goodsLog/favorite',
// method: 'POST',
// data: {
// goods_ids: id,
// },
// custom: {
// showSuccess: true,
// auth: true,
// },
// }),
},
view: {
list: (params) =>
@ -289,12 +366,19 @@ export default {
},
wallet: {
log: (params) =>
request({
url: '/user/api/walletLog',
request2({
url: 'pay/wallet-transaction/page',
method: 'GET',
params,
custom: {},
}),
// log: (params) =>
// request({
// url: '/user/api/walletLog',
// method: 'GET',
// params,
// custom: {},
// }),
},
account: {
info: (params) =>
@ -319,9 +403,27 @@ export default {
}),
},
//数量接口
// data: () =>
// request({
// url: 'user/user/data',
// method: 'GET',
// custom: {
// showLoading: false,
// auth: true,
// },
// }),
data: () =>
request({
url: 'user/user/data',
request2({
url: 'trade/order/get-count',
method: 'GET',
custom: {
showLoading: false,
auth: true,
},
}),
data2: () =>
request2({
url: 'trade/after-sale/get-applying-count',
method: 'GET',
custom: {
showLoading: false,

9
sheep/components/s-address-item/s-address-item.vue
View File

@ -9,13 +9,14 @@
class="ss-m-r-10"
size="small"
custom-style="background-color: var(--ui-BG-Main); border-color: var(--ui-BG-Main); color: #fff;"
v-if="props.item.is_default"
v-if="props.item.defaultStatus"
text="默认"
></uni-tag>
{{ props.item.province_name }} {{ props.item.city_name }} {{ props.item.district_name }}
{{ props.item.areaName }}
<!-- {{ props.item.city_name }} {{ props.item.district_name }} -->
</view>
<view class="address-text">{{ props.item.address }}</view>
<view class="person-text">{{ props.item.consignee }} {{ props.item.mobile }}</view>
<view class="address-text">{{ props.item.detailAddress }}</view>
<view class="person-text">{{ props.item.name }} {{ props.item.mobile }}</view>
</view>
<view v-else><view class="address-text ss-m-b-10">请选择收货地址</view></view>
<slot>

29
sheep/components/s-goods-column/s-goods-column.vue
View File

@ -65,7 +65,7 @@
<view v-if="tagStyle.show" class="tag-icon-box">
<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src)"></image>
</view>
<image class="md-img-box" :src="sheep.$url.cdn(data.image)" mode="widthFix"></image>
<image class="md-img-box" :src="sheep.$url.cdn(data.image||data.picUrl)" mode="widthFix"></image>
<view
class="md-goods-content ss-flex-col ss-row-around ss-p-b-20 ss-p-t-20 ss-p-x-16"
:id="elId"
@ -75,7 +75,7 @@
class="md-goods-title ss-line-1"
:style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
>
{{ data.title }}
{{ data.title||data.name }}
</view>
<view
v-if="goodsFields.subtitle?.show"
@ -106,12 +106,12 @@
</view>
<view
v-if="goodsFields.original_price?.show && data.original_price > 0"
v-if="(goodsFields.original_price?.show||goodsFields.marketPrice?.show) &&( data.original_price > 0|| data.marketPrice > 0)"
class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
:style="[{ color: originPriceColor }]"
>
<text class="price-unit ss-font-20">{{ priceUnit }}</text>
<view class="ss-m-l-8">{{ data.original_price }}</view>
<view class="ss-m-l-8">{{ data.original_price||data.marketPrice }}</view>
</view>
</view>
@ -141,7 +141,7 @@
<view v-if="grouponTag" class="groupon-tag ss-flex ss-row-center">
<view class="tag-icon">拼团</view>
</view>
<image class="lg-img-box" :src="sheep.$url.cdn(data.image)" mode="aspectFill"></image>
<image class="lg-img-box" :src="sheep.$url.cdn(data.image||data.picUrl)" mode="aspectFill"></image>
<view class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20">
<view>
<view
@ -149,7 +149,7 @@
class="lg-goods-title ss-line-2"
:style="[{ color: titleColor }]"
>
{{ data.title }}
{{ data.title||data.name }}
</view>
<view
v-if="goodsFields.subtitle?.show"
@ -177,12 +177,12 @@
{{ isArray(data.price) ? data.price[0] : data.price }}
</view>
<view
v-if="goodsFields.original_price?.show && data.original_price > 0"
v-if="(goodsFields.original_price?.show||goodsFields.marketPrice?.show) &&( data.original_price > 0|| data.marketPrice > 0)"
class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
:style="[{ color: originPriceColor }]"
>
<text class="price-unit ss-font-20">{{ priceUnit }}</text>
<view class="ss-m-l-8">{{ data.original_price }}</view>
<view class="ss-m-l-8">{{ data.original_price||data.marketPrice }}</view>
</view>
</view>
<view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
@ -204,7 +204,7 @@
<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src)"></image>
</view>
<image class="sl-img-box" :src="sheep.$url.cdn(data.image)" mode="aspectFill"></image>
<image class="sl-img-box" :src="sheep.$url.cdn(data.image||data.picUrl)" mode="aspectFill"></image>
<view class="sl-goods-content">
<view>
@ -213,7 +213,7 @@
class="sl-goods-title ss-line-1"
:style="[{ color: titleColor }]"
>
{{ data.title }}
{{ data.title||data.name }}
</view>
<view
v-if="goodsFields.subtitle?.show"
@ -241,12 +241,12 @@
{{ isArray(data.price) ? data.price[0] : data.price }}
</view>
<view
v-if="goodsFields.original_price?.show && data.original_price > 0"
v-if="(goodsFields.original_price?.show||goodsFields.marketPrice?.show) &&( data.original_price > 0|| data.marketPrice > 0)"
class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
:style="[{ color: originPriceColor }]"
>
<text class="price-unit ss-font-20">{{ priceUnit }}</text>
<view class="ss-m-l-8">{{ data.original_price }}</view>
<view class="ss-m-l-8">{{ data.original_price||data.marketPrice }}</view>
</view>
</view>
<view class="ss-m-t-16 ss-flex ss-flex-wrap">
@ -313,6 +313,7 @@
original_price: { show: true },
sales: { show: true },
stock: { show: true },
salesCount: { show: true },
};
},
},
@ -396,8 +397,8 @@
// 格式化销量、库存信息
const salesAndStock = computed(() => {
let text = [];
if (props.goodsFields.sales?.show) {
text.push(formatSales(props.data.sales_show_type, props.data.sales));
if (props.goodsFields.salesCount?.show) {
text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
}
if (props.goodsFields.stock?.show) {
text.push(formatStock(props.data.stock_show_type, props.data.stock));

1
sheep/components/s-order-card/s-order-card.vue
View File

@ -64,6 +64,7 @@
];
const numData = computed(() => sheep.$store('user').numData);
console.log('更换后的yuda订单数量',numData)
</script>
<style lang="scss" scoped>

1
sheep/components/s-user-card/s-user-card.vue
View File

@ -62,6 +62,7 @@
// 用户信息
const userInfo = computed(() => sheep.$store('user').userInfo);
console.log('用户信息',userInfo)
// 是否登录
const isLogin = computed(() => sheep.$store('user').isLogin);

11
sheep/request2/index.js
View File

@ -4,10 +4,15 @@
*/
import Request from 'luch-request';
import { baseUrl, apiPath } from '@/sheep/config';
import {
baseUrl,
apiPath
} from '@/sheep/config';
import $store from '@/sheep/store';
import $platform from '@/sheep/platform';
import { showAuthModal } from '@/sheep/hooks/useModal';
import {
showAuthModal
} from '@/sheep/hooks/useModal';
const options = {
// 显示操作成功消息 默认不显示
@ -208,7 +213,9 @@ const request = (config) => {
}
// TODO 芋艿：额外拼接
if (config.url.indexOf('/app-api/') >= 0) {
// 设置接口地址
config.url = 'http://api-dashboard.yudao.iocoder.cn' + config.url; // 调用【云端】
// config.url = 'https://app.test.huizhizao.vip/prod-api' + config.url; // 调用【云端】
// config.url = 'http://127.0.0.1:48080' + config.url; // 调用【本地】
}
return http.middleware(config);

20
sheep/store/user.js
View File

@ -44,8 +44,11 @@ const user = defineStore({
actions: {
// 获取个人信息
async getInfo() {
const { error, data } = await userApi.profile();
if (error !== 0) return;
const { code, data } = await userApi.profile();
// 为了兼容 获取用户余额 可能还会用到其他参数
const { code:code2, data:data2 } = await userApi.balance();
if (code !== 0||code2!=0) return;
data.money=data2.balance/100;
this.userInfo = data;
return Promise.resolve(data);
@ -62,9 +65,16 @@ const user = defineStore({
// 获取订单、优惠券等其他资产信息
async getNumData() {
const { error, data } = await userApi.data();
if (error === 0) {
this.numData = data;
const { code, data } = await userApi.data();
const data2 = await userApi.data2();
if (code === 0&&data2.code===0) {
console.log('订单数据',data);
this.numData = {order_num:{
noget:data.deliveredCount,
unpaid:data.unpaidCount,
nocomment:data.uncommentedCount,
aftersale:data2.data
}};
}
},