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

1038
pages/order/list.vue
View File

File diff suppressed because it is too large Load Diff

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

@ -1,264 +1,261 @@
<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" <view class="bg-white form-box ss-p-x-30">
:rules="state.rules" <uni-forms-item name="consignee" label="收货人" class="form-item">
validateTrigger="bind" <uni-easyinput v-model="state.model.consignee" placeholder="请填写收货人姓名" :inputBorder="false"
labelWidth="160" placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal" />
labelAlign="left" </uni-forms-item>
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-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" </uni-easyinput>
placeholder="请输入手机号" </uni-forms-item>
:inputBorder="false" <uni-forms-item name="region" label="省市区" @tap="state.showRegion = true" class="form-item">
placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal" <uni-easyinput v-model="state.model.region" disabled :inputBorder="false"
> :styles="{ disableColor: '#fff', color: '#333' }"
</uni-easyinput> placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
</uni-forms-item> placeholder="请选择省市区">
<uni-forms-item <template v-slot:right>
name="region" <uni-icons type="right"></uni-icons>
label="省市区" </template>
@tap="state.showRegion = true" </uni-easyinput>
class="form-item" </uni-forms-item>
> <uni-forms-item name="address" label="详细地址" :formItemStyle="{ alignItems: 'flex-start' }"
<uni-easyinput :labelStyle="{ lineHeight: '5em' }" class="textarea-item">
v-model="state.model.region" <uni-easyinput :inputBorder="false" type="textarea" v-model="state.model.address"
disabled placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
:inputBorder="false" placeholder="请输入详细地址" clearable></uni-easyinput>
:styles="{ disableColor: '#fff', color: '#333' }" </uni-forms-item>
placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal" </view>
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"
placeholderStyle="color:#BBBBBB;font-size:30rpx;font-weight:400;line-height:normal"
placeholder="请输入详细地址"
clearable
></uni-easyinput>
</uni-forms-item>
</view>
<view class="ss-m-y-20 bg-white ss-p-x-30 ss-flex ss-row-between ss-col-center default-box"> <view class="ss-m-y-20 bg-white ss-p-x-30 ss-flex ss-row-between ss-col-center default-box">
<view class="default-box-title"> 设为默认地址 </view> <view class="default-box-title"> 设为默认地址 </view>
<su-switch style="transform: scale(0.8)" v-model="state.model.is_default"></su-switch> <su-switch style="transform: scale(0.8)" v-model="state.model.is_default"></su-switch>
</view> </view>
</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 :show="state.showRegion" @cancel="state.showRegion = false" @confirm="onRegionConfirm">
<su-region-picker </su-region-picker>
:show="state.showRegion" </s-layout>
@cancel="state.showRegion = false"
@confirm="onRegionConfirm"
>
</su-region-picker>
</s-layout>
</template> </template>
<script setup> <script setup>
import { computed, watch, ref, reactive, unref } from 'vue'; import {
import sheep from '@/sheep'; computed,
import { onLoad, onPageScroll } from '@dcloudio/uni-app'; watch,
import _ from 'lodash'; ref,
import { consignee, mobile, address, region } from '@/sheep/validate/form'; reactive,
unref
} from 'vue';
import sheep from '@/sheep';
import {
onLoad,
onPageScroll
} from '@dcloudio/uni-app';
import _ from 'lodash';
import {
consignee,
mobile,
address,
region
} from '@/sheep/validate/form';
const addressFormRef = ref(null); const addressFormRef = ref(null);
const state = reactive({ const state = reactive({
showRegion: false, showRegion: false,
model: { model: {
consignee: '', consignee: '',
mobile: '', mobile: '',
address: '', address: '',
is_default: false, is_default: false,
region: '', region: '',
}, },
rules: { rules: {
consignee, consignee,
mobile, mobile,
address, address,
region, region,
}, },
}); });
watch( watch(
() => 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,
}, },
); );
const onRegionConfirm = (e) => { const onRegionConfirm = (e) => {
state.model = { state.model = {
...state.model, ...state.model,
...e, ...e,
}; };
state.showRegion = false; state.showRegion = false;
}; };
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);
} }
}); });
} }
}; };
const onSave = async () => { const onSave = async () => {
const validate = await unref(addressFormRef) const validate = await unref(addressFormRef)
.validate() .validate()
.catch((error) => { .catch((error) => {
console.log('error: ', error); console.log('error: ', error);
}); });
if (!validate) return; if (!validate) return;
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({
} else { id: state.model.id,
res = await sheep.$api.user.address.create(state.model); areaId: state.model.district_id,
} defaultStatus: state.model.is_default,
if (res.error === 0) { detailAddress: state.model.address,
sheep.$router.back(); mobile: state.model.mobile,
} name: state.model.consignee
}; });
} else {
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.code === 0) {
sheep.$router.back();
}
};
const onDelete = () => { const onDelete = () => {
uni.showModal({ uni.showModal({
title: '提示', title: '提示',
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
sheep.$router.back(); } = await sheep.$api.user.address.delete(state.model.id);
} if (code === 0) {
} sheep.$router.back();
}, }
}); }
}; },
onLoad(async (options) => { });
getAreaData(); };
if (options.id) { onLoad(async (options) => {
let res = await sheep.$api.user.address.detail(options.id); getAreaData();
if (res.error === 0) { if (options.id) {
state.model = { let res = await sheep.$api.user.address.detail(options.id);
...state.model, if (res.code === 0) {
...res.data, state.model = {
}; ...state.model,
} 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);
state.model = { console.log(data)
...state.model, state.model = {
...data, ...state.model,
}; ...data,
} };
}); }
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
:deep() { :deep() {
.uni-forms-item__label .label-text { .uni-forms-item__label .label-text {
font-size: 28rpx !important; font-size: 28rpx !important;
color: #333333 !important; color: #333333 !important;
line-height: normal !important; line-height: normal !important;
} }
.uni-easyinput__content-input { .uni-easyinput__content-input {
font-size: 28rpx !important; font-size: 28rpx !important;
color: #333333 !important; color: #333333 !important;
line-height: normal !important; line-height: normal !important;
padding-left: 0 !important; padding-left: 0 !important;
} }
.uni-easyinput__content-textarea { .uni-easyinput__content-textarea {
font-size: 28rpx !important; font-size: 28rpx !important;
color: #333333 !important; color: #333333 !important;
line-height: normal !important; line-height: normal !important;
margin-top: 8rpx !important; margin-top: 8rpx !important;
} }
.uni-icons { .uni-icons {
font-size: 40rpx !important; font-size: 40rpx !important;
} }
.is-textarea-icon { .is-textarea-icon {
margin-top: 22rpx; margin-top: 22rpx;
} }
.is-disabled { .is-disabled {
color: #333333; color: #333333;
} }
} }
.default-box { .default-box {
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
height: 100rpx; height: 100rpx;
.default-box-title { .default-box-title {
font-size: 28rpx; font-size: 28rpx;
color: #333333; color: #333333;
line-height: normal; line-height: normal;
} }
} }
.footer-box { .footer-box {
.save-btn { .save-btn {
width: 710rpx; width: 710rpx;
height: 80rpx; height: 80rpx;
border-radius: 40rpx; border-radius: 40rpx;
background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); background: linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
color: $white; color: $white;
} }
.cancel-btn { .cancel-btn {
width: 710rpx; width: 710rpx;
height: 80rpx; height: 80rpx;
border-radius: 40rpx; border-radius: 40rpx;
background: var(--ui-BG); background: var(--ui-BG);
} }
} }
</style> </style>

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({

731
sheep/api/user.js
View File

@ -3,339 +3,414 @@ import request2 from '@/sheep/request2';
import $platform from '@/sheep/platform'; import $platform from '@/sheep/platform';
export default { export default {
profile: () => profile: () =>
request2({ request2({
url: 'member/user/get', url: 'member/user/get',
method: 'GET', method: 'GET',
custom: { custom: {
showLoading: false, showLoading: false,
auth: true, auth: true,
}, },
}), }),
// profile: () => // profile: () =>
// request({ // request({
// url: '/user/api/user/profile', // url: '/user/api/user/profile',
// method: 'GET', // method: 'GET',
// custom: { // custom: {
// showLoading: false, // showLoading: false,
// auth: true, // auth: true,
// }, // },
// }), // }),
update: (data) => // update: (data) =>
request({ // request({
url: '/user/api/user/update', // url: '/user/api/user/update',
method: 'POST', // method: 'POST',
custom: { // custom: {
showSuccess: true, // showSuccess: true,
auth: true, // auth: true,
}, // },
data, // data,
}), // }),
// 账号登录 update: (data) =>
accountLogin: (data) => request2({
request({ url: 'member/user/update',
url: '/user/api/user/accountLogin', method: 'PUT',
method: 'POST', custom: {
data, showSuccess: true,
custom: { auth: true,
showSuccess: true, },
loadingMsg: '登录中', data,
}, }),
}), // 账号登录
// 短信登录 accountLogin: (data) =>
smsLogin: (data) => request({
request({ url: '/user/api/user/accountLogin',
url: '/user/api/user/smsLogin', method: 'POST',
method: 'POST', data,
data, custom: {
custom: { showSuccess: true,
showSuccess: true, loadingMsg: '登录中',
loadingMsg: '登录中', },
}, }),
}), // 短信登录
// 短信注册 smsLogin: (data) =>
smsRegister: (data) => request({
request({ url: '/user/api/user/smsLogin',
url: '/user/api/user/smsRegister', method: 'POST',
method: 'POST', data,
data, custom: {
custom: { showSuccess: true,
showSuccess: true, loadingMsg: '登录中',
loadingMsg: '正在注册', },
}, }),
}), // 短信注册
// 重置密码 smsRegister: (data) =>
resetPassword: (data) => request({
request({ url: '/user/api/user/smsRegister',
url: '/user/api/user/resetPassword', method: 'POST',
method: 'POST', data,
data, custom: {
custom: { showSuccess: true,
showSuccess: true, loadingMsg: '正在注册',
loadingMsg: '验证中', },
}, }),
}), // 重置密码
resetPassword: (data) =>
request({
url: '/user/api/user/resetPassword',
method: 'POST',
data,
custom: {
showSuccess: true,
loadingMsg: '验证中',
},
}),
// 修改密码 // 修改密码
changePassword: (data) => changePassword: (data) =>
request({ request({
url: '/user/api/user/changePassword', url: '/user/api/user/changePassword',
method: 'POST', method: 'POST',
data, data,
custom: { custom: {
showSuccess: true, showSuccess: true,
loadingMsg: '验证中', loadingMsg: '验证中',
}, },
}), }),
// 绑定、更换手机号 // 绑定、更换手机号
changeMobile: (data) => changeMobile: (data) =>
request({ request({
url: '/user/api/user/changeMobile', url: '/user/api/user/changeMobile',
method: 'POST', method: 'POST',
data, data,
custom: { custom: {
showSuccess: true, showSuccess: true,
loadingMsg: '验证中', loadingMsg: '验证中',
}, },
}), }),
// 修改用户名 // 修改用户名
changeUsername: (data) => changeUsername: (data) =>
request({ request({
url: '/user/api/user/changeUsername', url: '/user/api/user/changeUsername',
method: 'POST', method: 'POST',
data, data,
custom: { custom: {
showSuccess: true, showSuccess: true,
loadingMsg: '验证中', loadingMsg: '验证中',
}, },
}), }),
// 更新小程序信息 // 更新小程序信息
updateMpUserInfo: (data) => updateMpUserInfo: (data) =>
request({ request({
url: '/user/api/user/updateMpUserInfo', url: '/user/api/user/updateMpUserInfo',
method: 'POST', method: 'POST',
data, data,
}), }),
// 第三方授权信息 // 第三方授权信息
thirdOauthInfo: () => thirdOauthInfo: () =>
request({ request({
url: '/user/api/user/thirdOauth', url: '/user/api/user/thirdOauth',
method: 'GET', method: 'GET',
params: { params: {
provider: $platform.provider, provider: $platform.provider,
platform: $platform.platform, platform: $platform.platform,
}, },
custom: { custom: {
showLoading: false, showLoading: false,
}, },
}), }),
// 添加分享记录 // 添加分享记录
addShareLog: (data) => addShareLog: (data) =>
request({ request({
url: 'share/add', url: 'share/add',
method: 'POST', method: 'POST',
data, data,
custom: { custom: {
showError: false, showError: false,
}, },
}), }),
share: { share: {
list: (params) => list: (params) =>
request({ request({
url: 'share/list', url: 'share/list',
method: 'GET', method: 'GET',
params, params,
}), }),
}, },
// 账号登出 // 账号登出
logout: (data) => logout: (data) =>
request({ request({
url: '/user/api/user/logout', url: '/user/api/user/logout',
method: 'POST', method: 'POST',
data, data,
}), }),
// 账号注销 // 账号注销
logoff: (data) => logoff: (data) =>
request({ request({
url: '/user/api/user/logoff', url: '/user/api/user/logoff',
method: 'POST', method: 'POST',
data, data,
}), }),
address: { address: {
default: () => default: () =>
request({ request({
url: 'user/address/default', url: 'user/address/default',
method: 'GET', method: 'GET',
custom: { custom: {
showError: false, showError: false,
}, },
}), }),
list: () => list: () =>
request({ request2({
url: 'user/address', url: 'member/address/list',
method: 'GET', method: 'GET',
custom: {}, custom: {},
}), }),
create: (data) => // list: () =>
request({ // request({
url: 'user/address', // url: 'user/address',
method: 'POST', // method: 'GET',
data, // custom: {},
custom: { // }),
showSuccess: true, create: (data) =>
}, request2({
}), url: 'member/address/create',
update: (id, data) => method: 'POST',
request({ data,
url: 'user/address/' + id, custom: {
method: 'PUT', showSuccess: true,
data, },
custom: { }),
showSuccess: true, // create: (data) =>
}, // request({
}), // url: 'user/address',
detail: (id) => // method: 'POST',
request({ // data,
url: 'user/address/' + id, // custom: {
method: 'GET', // showSuccess: true,
}), // },
delete: (id) => // }),
request({ update: ( data) =>
url: 'user/address/' + id, request2({
method: 'DELETE', url: 'member/address/update',
}), method: 'PUT',
}, data,
invoice: { custom: {
list: () => showSuccess: true,
request({ },
url: 'user/invoice', }),
method: 'GET', // update: (id, data) =>
custom: {}, // request({
}), // url: 'user/address/' + id,
create: (data) => // method: 'PUT',
request({ // data,
url: 'user/invoice', // custom: {
method: 'POST', // showSuccess: true,
data, // },
custom: { // }),
showSuccess: true, detail: (id) =>
}, request2({
}), url: 'member/address/get?id=' + id,
update: (id, data) => method: 'GET',
request({ }),
url: 'user/invoice/' + id, // detail: (id) =>
method: 'PUT', // request({
data, // url: 'user/address/' + id,
custom: { // method: 'GET',
showSuccess: true, // }),
}, delete: (id) =>
}), request2({
detail: (id) => url: 'member/address/delete?id=' + id,
request({ method: 'DELETE',
url: 'user/invoice/' + id, }),
method: 'GET', // delete: (id) =>
}), // request({
delete: (id) => // url: 'user/address/' + id,
request({ // method: 'DELETE',
url: 'user/invoice/' + id, // }),
method: 'DELETE', },
}), invoice: {
}, list: () =>
favorite: { request({
list: (params) => url: 'user/invoice',
request({ method: 'GET',
url: 'user/goodsLog/favorite', custom: {},
method: 'GET', }),
params, create: (data) =>
}), request({
do: (id) => url: 'user/invoice',
request({ method: 'POST',
url: 'user/goodsLog/favorite', data,
method: 'POST', custom: {
data: { showSuccess: true,
goods_id: id, },
}, }),
custom: { update: (id, data) =>
showSuccess: true, request({
auth: true, url: 'user/invoice/' + id,
}, method: 'PUT',
}), data,
cancel: (id) => custom: {
request({ showSuccess: true,
url: 'user/goodsLog/favorite', },
method: 'POST', }),
data: { detail: (id) =>
goods_ids: id, request({
}, url: 'user/invoice/' + id,
custom: { method: 'GET',
showSuccess: true, }),
auth: true, delete: (id) =>
}, request({
}), url: 'user/invoice/' + id,
}, method: 'DELETE',
view: { }),
list: (params) => },
request({ favorite: {
url: 'user/goodsLog/views', list: (params) =>
method: 'GET', request2({
params, url: 'product/favorite/page',
custom: {}, method: 'GET',
}), params,
delete: (data) => }),
request({ do: (id) =>
url: 'user/goodsLog/viewDel', request({
method: 'DELETE', url: 'user/goodsLog/favorite',
data, method: 'POST',
custom: { data: {
showSuccess: true, goods_id: id,
}, },
}), custom: {
}, showSuccess: true,
wallet: { auth: true,
log: (params) => },
request({ }),
url: '/user/api/walletLog', // 取消收藏
method: 'GET', cancel: (id) =>
params, request2({
custom: {}, url: 'product/favorite/delete-list',
}), method: 'DELETE',
}, data: {
account: { spuIds: id.split(','),
info: (params) => },
request({ custom: {
url: 'user/account', showSuccess: true,
method: 'GET', auth: true,
params, },
custom: { }),
showError: false, // cancel: (id) =>
auth: true, // request({
}, // url: 'user/goodsLog/favorite',
}), // method: 'POST',
save: (data) => // data: {
request({ // goods_ids: id,
url: 'user/account', // },
method: 'POST', // custom: {
data, // showSuccess: true,
custom: { // auth: true,
showSuccess: true, // },
auth: true, // }),
}, },
}), view: {
}, list: (params) =>
//数量接口 request({
data: () => url: 'user/goodsLog/views',
request({ method: 'GET',
url: 'user/user/data', params,
method: 'GET', custom: {},
custom: { }),
showLoading: false, delete: (data) =>
auth: true, request({
}, url: 'user/goodsLog/viewDel',
}), method: 'DELETE',
data,
custom: {
showSuccess: true,
},
}),
},
wallet: {
log: (params) =>
request({
url: '/user/api/walletLog',
method: 'GET',
params,
custom: {},
}),
},
account: {
info: (params) =>
request({
url: 'user/account',
method: 'GET',
params,
custom: {
showError: false,
auth: true,
},
}),
save: (data) =>
request({
url: 'user/account',
method: 'POST',
data,
custom: {
showSuccess: true,
auth: true,
},
}),
},
//数量接口
// data: () =>
// request({
// url: 'user/user/data',
// method: 'GET',
// custom: {
// showLoading: false,
// auth: true,
// },
// }),
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,
auth: true,
},
}),
}; };

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
}};
} }
}, },