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

订单数量，个人信息修改，收藏，收货地址，全部订单接口简单替换

pull/13/head
落日晚风 2023-11-06 17:50:55 +08:00
parent cfa35b2c6f
commit 627b3d015f
11 changed files with 1207 additions and 1146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

224
pages/order/list.vue
View File

@ -2,25 +2,12 @@
<template> <template>
<s-layout title="我的订单"> <s-layout title="我的订单">
<su-sticky bgColor="#fff"> <su-sticky bgColor="#fff">
<su-tabs <su-tabs :list="tabMaps" :scrollable="false" @change="onTabsChange" :current="state.currentTab"></su-tabs>
:list="tabMaps"
:scrollable="false"
@change="onTabsChange"
:current="state.currentTab"
></su-tabs>
</su-sticky> </su-sticky>
<s-empty <s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单"></s-empty>
v-if="state.pagination.total === 0"
icon="/static/order-empty.png"
text="暂无订单"
></s-empty>
<view v-if="state.pagination.total > 0"> <view v-if="state.pagination.total > 0">
<view <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"
class="bg-white order-list-card-box ss-r-10 ss-m-t-14 ss-m-20" :key="order.id" @tap="onOrderDetail(order.order_sn)">
v-for="order in state.pagination.data"
:key="order.id"
@tap="onOrderDetail(order.order_sn)"
>
<view class="order-card-header ss-flex ss-col-center ss-row-between ss-p-x-20"> <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.order_sn }}</view>
<view class="order-state ss-font-26" :class="formatOrderColor(order.status_code)">{{ <view class="order-state ss-font-26" :class="formatOrderColor(order.status_code)">{{
@ -28,59 +15,41 @@
}}</view> }}</view>
</view> </view>
<view class="border-bottom" v-for="item in order.items" :key="item.id"> <view class="border-bottom" v-for="item in order.items" :key="item.id">
<s-goods-item <s-goods-item :img="item.goods_image" :title="item.goods_title" :skuText="item.goods_sku_text"
:img="item.goods_image" :price="item.goods_price" :score="order.score_amount" :num="item.goods_num">
:title="item.goods_title"
:skuText="item.goods_sku_text"
:price="item.goods_price"
:score="order.score_amount"
:num="item.goods_num"
>
<template #tool> <template #tool>
<view class="ss-flex"> <view class="ss-flex">
<button <button class="ss-reset-button apply-btn" v-if="item.btns.includes('aftersale')"
class="ss-reset-button apply-btn"
v-if="item.btns.includes('aftersale')"
@tap.stop=" @tap.stop="
sheep.$router.go('/pages/order/aftersale/apply', { sheep.$router.go('/pages/order/aftersale/apply', {
item: JSON.stringify(item), item: JSON.stringify(item),
}) })
" ">
>
申请售后 申请售后
</button> </button>
<button <button class="ss-reset-button apply-btn" v-if="item.btns.includes('re_aftersale')"
class="ss-reset-button apply-btn"
v-if="item.btns.includes('re_aftersale')"
@tap.stop=" @tap.stop="
sheep.$router.go('/pages/order/aftersale/apply', { sheep.$router.go('/pages/order/aftersale/apply', {
item: JSON.stringify(item), item: JSON.stringify(item),
}) })
" ">
>
重新售后 重新售后
</button> </button>
<button <button class="ss-reset-button apply-btn" v-if="item.btns.includes('aftersale_info')"
class="ss-reset-button apply-btn"
v-if="item.btns.includes('aftersale_info')"
@tap.stop=" @tap.stop="
sheep.$router.go('/pages/order/aftersale/detail', { sheep.$router.go('/pages/order/aftersale/detail', {
id: item.ext.aftersale_id, id: item.ext.aftersale_id,
}) })
" ">
>
售后详情 售后详情
</button> </button>
<button <button class="ss-reset-button apply-btn" v-if="item.btns.includes('buy_again')"
class="ss-reset-button apply-btn"
v-if="item.btns.includes('buy_again')"
@tap.stop=" @tap.stop="
sheep.$router.go('/pages/goods/index', { sheep.$router.go('/pages/goods/index', {
id: item.goods_id, id: item.goods_id,
}) })
" ">
>
再次购买 再次购买
</button> </button>
</view> </view>
@ -98,23 +67,18 @@
</view> </view>
<view class="ss-flex ss-col-center"> <view class="ss-flex ss-col-center">
<view class="discounts-title pay-color">总金额:</view> <view class="discounts-title pay-color">总金额:</view>
<view class="discounts-money pay-color" v-if="Number(order.order_amount) > 0" <view class="discounts-money pay-color" v-if="Number(order.order_amount) > 0">
>￥{{ order.order_amount }}</view ￥{{ order.order_amount }}</view>
>
<view v-if="order.score_amount && Number(order.order_amount) > 0">+</view> <view v-if="order.score_amount && Number(order.order_amount) > 0">+</view>
<view class="discounts-money pay-color ss-flex ss-col-center" v-if="order.score_amount"> <view class="discounts-money pay-color ss-flex ss-col-center" v-if="order.score_amount">
<image <image :src="sheep.$url.static('/static/img/shop/goods/score1.svg')" class="score-img">
:src="sheep.$url.static('/static/img/shop/goods/score1.svg')" </image>
class="score-img"
></image>
<view>{{ order.score_amount }}</view> <view>{{ order.score_amount }}</view>
</view> </view>
</view> </view>
</view> </view>
<view <!-- :class="order.btns.length > 3 ? 'ss-row-between' : 'ss-row-right'" -->
class="order-card-footer ss-flex ss-col-center ss-p-x-20" <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'"
>
<!-- <su-popover> <!-- <su-popover>
<button class="more-btn ss-reset-button" @click.stop>更多</button> <button class="more-btn ss-reset-button" @click.stop>更多</button>
<template #content> <template #content>
@ -132,88 +96,55 @@
</template> </template>
</su-popover> --> </su-popover> -->
<view class="ss-flex ss-col-center"> <view class="ss-flex ss-col-center">
<button <button v-if="order.btns.includes('groupon')" class="tool-btn ss-reset-button"
v-if="order.btns.includes('groupon')" @tap.stop="onOrderGroupon(order)">
class="tool-btn ss-reset-button"
@tap.stop="onOrderGroupon(order)"
>
{{ order.status_code === 'groupon_ing' ? '邀请拼团' : '拼团详情' }} {{ order.status_code === 'groupon_ing' ? '邀请拼团' : '拼团详情' }}
</button> </button>
<button <button v-if="order.btns.includes('invoice')" class="tool-btn ss-reset-button"
v-if="order.btns.includes('invoice')" @tap.stop="onOrderInvoice(order.invoice?.id)">
class="tool-btn ss-reset-button"
@tap.stop="onOrderInvoice(order.invoice?.id)"
>
查看发票 查看发票
</button> </button>
<button <button v-if="order.btns.length === 0" class="tool-btn ss-reset-button"
v-if="order.btns.length === 0" @tap.stop="onOrderDetail(order.order_sn)">
class="tool-btn ss-reset-button"
@tap.stop="onOrderDetail(order.order_sn)"
>
查看详情 查看详情
</button> </button>
<button <button v-if="order.btns.includes('confirm')" class="tool-btn ss-reset-button"
v-if="order.btns.includes('confirm')" @tap.stop="onConfirm(order)">
class="tool-btn ss-reset-button"
@tap.stop="onConfirm(order)"
>
确认收货 确认收货
</button> </button>
<button <button v-if="order.btns.includes('express')" class="tool-btn ss-reset-button"
v-if="order.btns.includes('express')" @tap.stop="onExpress(order.id)">
class="tool-btn ss-reset-button"
@tap.stop="onExpress(order.id)"
>
查看物流 查看物流
</button> </button>
<button <button v-if="order.btns.includes('apply_refund')" class="tool-btn ss-reset-button"
v-if="order.btns.includes('apply_refund')" @tap.stop="onRefund(order.id)">
class="tool-btn ss-reset-button"
@tap.stop="onRefund(order.id)"
>
申请退款 申请退款
</button> </button>
<button <button v-if="order.btns.includes('re_apply_refund')" class="tool-btn ss-reset-button"
v-if="order.btns.includes('re_apply_refund')" @tap.stop="onRefund(order.id)">
class="tool-btn ss-reset-button"
@tap.stop="onRefund(order.id)"
>
重新退款 重新退款
</button> </button>
<button <button v-if="order.btns.includes('cancel')" class="tool-btn ss-reset-button"
v-if="order.btns.includes('cancel')" @tap.stop="onCancel(order.id)">
class="tool-btn ss-reset-button"
@tap.stop="onCancel(order.id)"
>
取消订单 取消订单
</button> </button>
<button <button v-if="order.btns.includes('comment')" class="tool-btn ss-reset-button"
v-if="order.btns.includes('comment')" @tap.stop="onComment(order.order_sn)">
class="tool-btn ss-reset-button"
@tap.stop="onComment(order.order_sn)"
>
评价晒单 评价晒单
</button> </button>
<button <button v-if="order.btns.includes('delete')" class="delete-btn ss-reset-button"
v-if="order.btns.includes('delete')" @tap.stop="onDelete(order.id)">
class="delete-btn ss-reset-button"
@tap.stop="onDelete(order.id)"
>
删除订单 删除订单
</button> </button>
<button <button v-if="order.btns.includes('pay')" class="tool-btn ss-reset-button ui-BG-Main-Gradient"
v-if="order.btns.includes('pay')" @tap.stop="onPay(order.order_sn)">
class="tool-btn ss-reset-button ui-BG-Main-Gradient"
@tap.stop="onPay(order.order_sn)"
>
继续支付 继续支付
</button> </button>
</view> </view>
@ -222,24 +153,30 @@
</view> </view>
<!-- 加载更多 --> <!-- 加载更多 -->
<uni-load-more <uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
v-if="state.pagination.total > 0"
:status="state.loadStatus"
:content-text="{
contentdown: '上拉加载更多', contentdown: '上拉加载更多',
}" }" @tap="loadmore" />
@tap="loadmore"
/>
</s-layout> </s-layout>
</template> </template>
<script setup> <script setup>
import { computed, reactive } from 'vue'; import {
import { onLoad, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'; computed,
import { formatOrderColor } from '@/sheep/hooks/useGoods'; reactive
} from 'vue';
import {
onLoad,
onReachBottom,
onPullDownRefresh
} from '@dcloudio/uni-app';
import {
formatOrderColor
} from '@/sheep/hooks/useGoods';
import sheep from '@/sheep'; import sheep from '@/sheep';
import _ from 'lodash'; import _ from 'lodash';
import { isEmpty } from 'lodash'; import {
isEmpty
} from 'lodash';
const pagination = { const pagination = {
data: [], data: [],
@ -261,8 +198,7 @@
error: 0, error: 0,
}); });
const tabMaps = [ const tabMaps = [{
{
name: '全部', name: '全部',
value: 'all', value: 'all',
}, },
@ -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) { if (error === 0) {
state.pagination = pagination; state.pagination = pagination;
getOrderList(); getOrderList();
@ -401,7 +339,10 @@
content: '确定要取消订单吗?', content: '确定要取消订单吗?',
success: async function(res) { success: async function(res) {
if (res.confirm) { if (res.confirm) {
const { error, data } = await sheep.$api.order.cancel(orderId); const {
error,
data
} = await sheep.$api.order.cancel(orderId);
if (error === 0) { if (error === 0) {
let index = state.pagination.data.findIndex((order) => order.id === orderId); let index = state.pagination.data.findIndex((order) => order.id === orderId);
state.pagination.data[index] = data; state.pagination.data[index] = data;
@ -418,7 +359,10 @@
content: '确定要删除订单吗?', content: '确定要删除订单吗?',
success: async function(res) { success: async function(res) {
if (res.confirm) { if (res.confirm) {
const { error, data } = await sheep.$api.order.delete(orderId); const {
error,
data
} = await sheep.$api.order.delete(orderId);
if (error === 0) { if (error === 0) {
let index = state.pagination.data.findIndex((order) => order.id === orderId); let index = state.pagination.data.findIndex((order) => order.id === orderId);
state.pagination.data.splice(index, 1); state.pagination.data.splice(index, 1);
@ -438,7 +382,10 @@
// #ifdef MP // #ifdef MP
sheep.$platform.useProvider('wechat').subscribeMessage('order_refund'); sheep.$platform.useProvider('wechat').subscribeMessage('order_refund');
// #endif // #endif
const { error, data } = await sheep.$api.order.applyRefund(orderId); const {
error,
data
} = await sheep.$api.order.applyRefund(orderId);
if (error === 0) { if (error === 0) {
let index = state.pagination.data.findIndex((order) => order.id === orderId); let index = state.pagination.data.findIndex((order) => order.id === orderId);
state.pagination.data[index] = data; state.pagination.data[index] = data;
@ -453,17 +400,17 @@
state.loadStatus = 'loading'; state.loadStatus = 'loading';
let res = await sheep.$api.order.list({ let res = await sheep.$api.order.list({
type: tabMaps[state.currentTab].value, type: tabMaps[state.currentTab].value,
list_rows, pageNo: list_rows,
page, pageNo: page,
}); });
state.error = res.error; state.error = res.code;
if (res.error === 0) { if (res.code === 0) {
let orderList = _.concat(state.pagination.data, res.data.data); let orderList = _.concat(state.pagination.data, res.data.list);
state.pagination = { state.pagination = {
...res.data, ...res.data,
data: orderList, data: orderList,
}; };
console.log(state.pagination)
if (state.pagination.current_page < state.pagination.last_page) { if (state.pagination.current_page < state.pagination.last_page) {
state.loadStatus = 'more'; state.loadStatus = 'more';
} else { } else {
@ -507,6 +454,7 @@
height: 36rpx; height: 36rpx;
margin: 0 4rpx; margin: 0 4rpx;
} }
.tool-btn { .tool-btn {
width: 160rpx; width: 160rpx;
height: 60rpx; height: 60rpx;
@ -519,6 +467,7 @@
margin-right: 0; margin-right: 0;
} }
} }
.delete-btn { .delete-btn {
width: 160rpx; width: 160rpx;
height: 56rpx; height: 56rpx;
@ -562,8 +511,7 @@
font-weight: 500; font-weight: 500;
} }
.order-state { .order-state {}
}
} }
.pay-box { .pay-box {
@ -617,15 +565,19 @@
:deep(.uni-tooltip-popup) { :deep(.uni-tooltip-popup) {
background: var(--ui-BG); background: var(--ui-BG);
} }
.warning-color { .warning-color {
color: #faad14; color: #faad14;
} }
.danger-color { .danger-color {
color: #ff3000; color: #ff3000;
} }
.success-color { .success-color {
color: #52c41a; color: #52c41a;
} }
.info-color { .info-color {
color: #999999; color: #999999;
} }

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

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

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

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

11
pages/user/info.vue
View File

@ -312,12 +312,17 @@
// 保存信息 // 保存信息
async function onSubmit() { 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, avatar: state.model.avatar,
nickname: state.model.nickname, nickname: state.model.nickname,
gender: state.model.gender, // gender: state.model.gender,
}); });
if (error === 0) { if (code === 0) {
getUserInfo(); getUserInfo();
} }
} }

10
sheep/api/app.js
View File

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

10
sheep/api/data.js
View File

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

14
sheep/api/order.js
View File

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

119
sheep/api/user.js
View File

@ -21,10 +21,20 @@ export default {
// auth: true, // auth: true,
// }, // },
// }), // }),
// update: (data) =>
// request({
// url: '/user/api/user/update',
// method: 'POST',
// custom: {
// showSuccess: true,
// auth: true,
// },
// data,
// }),
update: (data) => update: (data) =>
request({ request2({
url: '/user/api/user/update', url: 'member/user/update',
method: 'POST', method: 'PUT',
custom: { custom: {
showSuccess: true, showSuccess: true,
auth: true, auth: true,
@ -177,39 +187,73 @@ export default {
}, },
}), }),
list: () => list: () =>
request({ request2({
url: 'user/address', url: 'member/address/list',
method: 'GET', method: 'GET',
custom: {}, custom: {},
}), }),
// list: () =>
// request({
// url: 'user/address',
// method: 'GET',
// custom: {},
// }),
create: (data) => create: (data) =>
request({ request2({
url: 'user/address', url: 'member/address/create',
method: 'POST', method: 'POST',
data, data,
custom: { custom: {
showSuccess: true, showSuccess: true,
}, },
}), }),
update: (id, data) => // create: (data) =>
request({ // request({
url: 'user/address/' + id, // url: 'user/address',
// method: 'POST',
// data,
// custom: {
// showSuccess: true,
// },
// }),
update: ( data) =>
request2({
url: 'member/address/update',
method: 'PUT', method: 'PUT',
data, data,
custom: { custom: {
showSuccess: true, showSuccess: true,
}, },
}), }),
// update: (id, data) =>
// request({
// url: 'user/address/' + id,
// method: 'PUT',
// data,
// custom: {
// showSuccess: true,
// },
// }),
detail: (id) => detail: (id) =>
request({ request2({
url: 'user/address/' + id, url: 'member/address/get?id=' + id,
method: 'GET', method: 'GET',
}), }),
// detail: (id) =>
// request({
// url: 'user/address/' + id,
// method: 'GET',
// }),
delete: (id) => delete: (id) =>
request({ request2({
url: 'user/address/' + id, url: 'member/address/delete?id=' + id,
method: 'DELETE', method: 'DELETE',
}), }),
// delete: (id) =>
// request({
// url: 'user/address/' + id,
// method: 'DELETE',
// }),
}, },
invoice: { invoice: {
list: () => list: () =>
@ -249,8 +293,8 @@ export default {
}, },
favorite: { favorite: {
list: (params) => list: (params) =>
request({ request2({
url: 'user/goodsLog/favorite', url: 'product/favorite/page',
method: 'GET', method: 'GET',
params, params,
}), }),
@ -266,18 +310,31 @@ export default {
auth: true, auth: true,
}, },
}), }),
// 取消收藏
cancel: (id) => cancel: (id) =>
request({ request2({
url: 'user/goodsLog/favorite', url: 'product/favorite/delete-list',
method: 'POST', method: 'DELETE',
data: { data: {
goods_ids: id, spuIds: id.split(','),
}, },
custom: { custom: {
showSuccess: true, showSuccess: true,
auth: true, auth: true,
}, },
}), }),
// cancel: (id) =>
// request({
// url: 'user/goodsLog/favorite',
// method: 'POST',
// data: {
// goods_ids: id,
// },
// custom: {
// showSuccess: true,
// auth: true,
// },
// }),
}, },
view: { view: {
list: (params) => list: (params) =>
@ -329,9 +386,27 @@ export default {
}), }),
}, },
//数量接口 //数量接口
// data: () =>
// request({
// url: 'user/user/data',
// method: 'GET',
// custom: {
// showLoading: false,
// auth: true,
// },
// }),
data: () => data: () =>
request({ request2({
url: 'user/user/data', url: 'trade/order/get-count',
method: 'GET',
custom: {
showLoading: false,
auth: true,
},
}),
data2: () =>
request2({
url: 'trade/after-sale/get-applying-count',
method: 'GET', method: 'GET',
custom: { custom: {
showLoading: false, showLoading: false,

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

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

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

@ -64,6 +64,7 @@
]; ];
const numData = computed(() => sheep.$store('user').numData); const numData = computed(() => sheep.$store('user').numData);
console.log(numData)
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

13
sheep/store/user.js
View File

@ -62,9 +62,16 @@ const user = defineStore({
// 获取订单、优惠券等其他资产信息 // 获取订单、优惠券等其他资产信息
async getNumData() { async getNumData() {
const { error, data } = await userApi.data(); const { code, data } = await userApi.data();
if (error === 0) { const data2 = await userApi.data2();
this.numData = data; 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
}};
} }
}, },