!13 用户钱包及明细.搜索页修复.个人信息移除多余页面.商品列表字段优化，分类子商品展示
Merge pull request !13 from Bluemark/vue3_tmppull/15/head
芋道源码
Gitee
commit
63c831464d
2
App.vue
2
App.vue
|
|
@ -21,7 +21,7 @@
|
||||||
if (args) {
|
if (args) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// 获取剪贴板
|
// 获取剪贴板
|
||||||
uni.getClipboardData({
|
uni.getClipboardData({
|
||||||
success: (res) => { },
|
success: (res) => { },
|
||||||
});
|
});
|
||||||
|
|
|
||||||
|
|
@ -137,8 +137,8 @@
|
||||||
total: 1,
|
total: 1,
|
||||||
last_page: 1,
|
last_page: 1,
|
||||||
},
|
},
|
||||||
currentSort: 'weigh',
|
// currentSort: 'weigh',
|
||||||
currentOrder: 'desc',
|
// currentOrder: 'desc',
|
||||||
currentTab: 0,
|
currentTab: 0,
|
||||||
filterParams: {},
|
filterParams: {},
|
||||||
curFilter: 0,
|
curFilter: 0,
|
||||||
|
|
@ -148,32 +148,32 @@
|
||||||
tabList: [
|
tabList: [
|
||||||
{
|
{
|
||||||
name: '综合推荐',
|
name: '综合推荐',
|
||||||
value: 'weigh',
|
// value: '',
|
||||||
list: [
|
list: [
|
||||||
{
|
{
|
||||||
label: '综合推荐',
|
label: '综合推荐',
|
||||||
sort: 'weigh',
|
// sort: '',
|
||||||
order: 'desc',
|
// order: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '价格升序',
|
label: '价格升序',
|
||||||
sort: 'price',
|
sort: 'price',
|
||||||
order: 'asc',
|
order: true,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
label: '价格降序',
|
label: '价格降序',
|
||||||
sort: 'price',
|
sort: 'price',
|
||||||
order: 'desc',
|
order: false,
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '销量',
|
name: '销量',
|
||||||
value: 'total_sales',
|
// value: 'salesCount',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
name: '新品优先',
|
name: '新品优先',
|
||||||
value: 'create_time',
|
// value: 'create_time',
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
loadStatus: '',
|
loadStatus: '',
|
||||||
|
|
@ -239,6 +239,7 @@
|
||||||
|
|
||||||
// 点击筛选项
|
// 点击筛选项
|
||||||
const onFilterItem = (val) => {
|
const onFilterItem = (val) => {
|
||||||
|
console.log(val)
|
||||||
if (
|
if (
|
||||||
state.currentSort === state.tabList[0].list[val].sort &&
|
state.currentSort === state.tabList[0].list[val].sort &&
|
||||||
state.currentOrder === state.tabList[0].list[val].order
|
state.currentOrder === state.tabList[0].list[val].order
|
||||||
|
|
@ -258,8 +259,8 @@
|
||||||
async function getList(Sort, Order, categoryId, keyword, page = 1, list_rows = 6) {
|
async function getList(Sort, Order, categoryId, keyword, page = 1, list_rows = 6) {
|
||||||
state.loadStatus = 'loading';
|
state.loadStatus = 'loading';
|
||||||
const res = await sheep.$api.goods.list({
|
const res = await sheep.$api.goods.list({
|
||||||
sort: Sort,
|
sortField: Sort,
|
||||||
order: Order,
|
sortAsc: Order,
|
||||||
category_id: !keyword ? categoryId : '',
|
category_id: !keyword ? categoryId : '',
|
||||||
pageSize:list_rows,
|
pageSize:list_rows,
|
||||||
keyword: keyword,
|
keyword: keyword,
|
||||||
|
|
|
||||||
|
|
@ -82,7 +82,8 @@
|
||||||
});
|
});
|
||||||
if (code === 0) {
|
if (code === 0) {
|
||||||
state.categoryList = {
|
state.categoryList = {
|
||||||
children: data
|
children: data,
|
||||||
|
style: 'first_one'
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -96,17 +97,18 @@
|
||||||
total: 1,
|
total: 1,
|
||||||
last_page: 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) {
|
async function getGoodsList(id, page = 1, list_rows = 6) {
|
||||||
state.loadStatus = 'loading';
|
state.loadStatus = 'loading';
|
||||||
const res = await sheep.$api.goods.list({
|
const res = await sheep.$api.goods.list({
|
||||||
categoryId: id,
|
categoryId: id,
|
||||||
pageSize:list_rows,
|
pageSize: list_rows,
|
||||||
pageNo:page,
|
pageNo: page,
|
||||||
});
|
});
|
||||||
if (res.code === 0) {
|
if (res.code === 0) {
|
||||||
let couponList = _.concat(state.pagination.data, res.data.list);
|
let couponList = _.concat(state.pagination.data, res.data.list);
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,28 @@
|
||||||
uni.hideTabBar();
|
uni.hideTabBar();
|
||||||
|
|
||||||
const template = computed(() => sheep.$store('app').template?.home);
|
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) => {
|
onLoad((options) => {
|
||||||
// #ifdef MP
|
// #ifdef MP
|
||||||
|
|
|
||||||
1043
pages/order/list.vue
1043
pages/order/list.vue
File diff suppressed because it is too large
Load Diff
|
|
@ -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>
|
||||||
|
|
@ -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('yudao收藏列表',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;
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<view class="bg-white ss-p-x-30">
|
<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
|
<uni-easyinput
|
||||||
v-model="userInfo.username"
|
v-model="userInfo.username"
|
||||||
disabled
|
disabled
|
||||||
|
|
@ -53,7 +53,7 @@
|
||||||
</button>
|
</button>
|
||||||
</template>
|
</template>
|
||||||
</uni-easyinput>
|
</uni-easyinput>
|
||||||
</uni-forms-item>
|
</uni-forms-item> -->
|
||||||
|
|
||||||
<uni-forms-item name="nickname" label="昵称">
|
<uni-forms-item name="nickname" label="昵称">
|
||||||
<uni-easyinput
|
<uni-easyinput
|
||||||
|
|
@ -65,7 +65,7 @@
|
||||||
/>
|
/>
|
||||||
</uni-forms-item>
|
</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">
|
<view class="ss-flex ss-col-center ss-h-100">
|
||||||
<radio-group @change="onChangeGender" class="ss-flex ss-col-center">
|
<radio-group @change="onChangeGender" class="ss-flex ss-col-center">
|
||||||
<label class="radio" v-for="item in genderRadioMap" :key="item.value">
|
<label class="radio" v-for="item in genderRadioMap" :key="item.value">
|
||||||
|
|
@ -81,7 +81,7 @@
|
||||||
</label>
|
</label>
|
||||||
</radio-group>
|
</radio-group>
|
||||||
</view>
|
</view>
|
||||||
</uni-forms-item>
|
</uni-forms-item> -->
|
||||||
|
|
||||||
<uni-forms-item name="mobile" label="手机号" @tap="onChangeMobile">
|
<uni-forms-item name="mobile" label="手机号" @tap="onChangeMobile">
|
||||||
<uni-easyinput
|
<uni-easyinput
|
||||||
|
|
@ -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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -327,6 +332,8 @@
|
||||||
state.model = clone(userInfo);
|
state.model = clone(userInfo);
|
||||||
|
|
||||||
if (sheep.$platform.name !== 'H5') {
|
if (sheep.$platform.name !== 'H5') {
|
||||||
|
return;
|
||||||
|
// 这个先注释,要不然小程序保存个人信息有问题,
|
||||||
let { data, error } = await sheep.$api.user.thirdOauthInfo();
|
let { data, error } = await sheep.$api.user.thirdOauthInfo();
|
||||||
if (error === 0) {
|
if (error === 0) {
|
||||||
state.thirdOauthInfo = data;
|
state.thirdOauthInfo = data;
|
||||||
|
|
|
||||||
|
|
@ -1,352 +1,344 @@
|
||||||
<template>
|
<template>
|
||||||
<s-layout class="wallet-wrap" title="钱包">
|
<s-layout class="wallet-wrap" title="钱包">
|
||||||
<!-- 钱包卡片 -->
|
<!-- 钱包卡片 -->
|
||||||
<view class="header-box ss-flex ss-row-center ss-col-center">
|
<view class="header-box ss-flex ss-row-center ss-col-center">
|
||||||
<view class="card-box ui-BG-Main ui-Shadow-Main">
|
<view class="card-box ui-BG-Main ui-Shadow-Main">
|
||||||
<view class="card-head ss-flex ss-col-center">
|
<view class="card-head ss-flex ss-col-center">
|
||||||
<view class="card-title ss-m-r-10">钱包余额（元）</view>
|
<view class="card-title ss-m-r-10">钱包余额（元）</view>
|
||||||
<view
|
<view @tap="state.showMoney = !state.showMoney" class="ss-eye-icon"
|
||||||
@tap="state.showMoney = !state.showMoney"
|
:class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'"></view>
|
||||||
class="ss-eye-icon"
|
</view>
|
||||||
:class="state.showMoney ? 'cicon-eye' : 'cicon-eye-off'"
|
<view class="ss-flex ss-row-between ss-col-center ss-m-t-64">
|
||||||
></view>
|
<view class="money-num">{{ state.showMoney ? userInfo.money : '*****' }}</view>
|
||||||
</view>
|
<button class="ss-reset-button topup-btn" @tap="sheep.$router.go('/pages/pay/recharge')">
|
||||||
<view class="ss-flex ss-row-between ss-col-center ss-m-t-64">
|
充值
|
||||||
<view class="money-num">{{ state.showMoney ? userInfo.money : '*****' }}</view>
|
</button>
|
||||||
<button class="ss-reset-button topup-btn" @tap="sheep.$router.go('/pages/pay/recharge')">
|
</view>
|
||||||
充值
|
</view>
|
||||||
</button>
|
</view>
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
|
|
||||||
<su-sticky>
|
<su-sticky>
|
||||||
<!-- 统计 -->
|
<!-- 统计 -->
|
||||||
<view class="filter-box ss-p-x-30 ss-flex ss-col-center ss-row-between">
|
<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">
|
<button class="ss-reset-button date-btn">
|
||||||
<text>{{ dateFilterText }}</text>
|
<text>{{ dateFilterText }}</text>
|
||||||
<text class="cicon-drop-down ss-seldate-icon"></text>
|
<text class="cicon-drop-down ss-seldate-icon"></text>
|
||||||
</button>
|
</button>
|
||||||
</uni-datetime-picker>
|
</uni-datetime-picker> -->
|
||||||
|
|
||||||
<view class="total-box">
|
<view class="total-box">
|
||||||
<view class="ss-m-b-10">总收入￥{{ state.pagination.income.toFixed(2) }}</view>
|
<!-- state.pagination.income.toFixed(2) -->
|
||||||
<view>总支出￥{{ (-state.pagination.expense).toFixed(2) }}</view>
|
<view class="ss-m-b-10">总收入￥{{ }}</view>
|
||||||
</view>
|
<view>总支出￥{{ }}</view>
|
||||||
</view>
|
<!-- (-state.pagination.expense).toFixed(2) -->
|
||||||
<su-tabs
|
</view>
|
||||||
:list="tabMaps"
|
</view>
|
||||||
@change="onChange"
|
<su-tabs :list="tabMaps" @change="onChange" :scrollable="false" :current="state.currentTab"></su-tabs>
|
||||||
:scrollable="false"
|
</su-sticky>
|
||||||
:current="state.currentTab"
|
<s-empty v-if="state.pagination.total === 0" text="暂无数据" icon="/static/data-empty.png" />
|
||||||
></su-tabs>
|
<!-- 钱包记录 -->
|
||||||
</su-sticky>
|
<view v-if="state.pagination.total > 0">
|
||||||
<s-empty v-if="state.pagination.total === 0" text="暂无数据" icon="/static/data-empty.png" />
|
<view class="wallet-list ss-flex border-bottom" v-for="item in state.pagination.data" :key="item.id">
|
||||||
<!-- 钱包记录 -->
|
<view class="list-content">
|
||||||
<view v-if="state.pagination.total > 0">
|
<view class="title-box ss-flex ss-row-between ss-m-b-20">
|
||||||
<view
|
<!-- <text class="title ss-line-1">{{ item.event_text }}{{ item.memo ? '-' + item.memo : '' }}</text> -->
|
||||||
class="wallet-list ss-flex border-bottom"
|
<text class="title ss-line-1">{{ item.title }}</text>
|
||||||
v-for="item in state.pagination.data"
|
<view class="money">
|
||||||
:key="item.id"
|
<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 class="list-content">
|
</view>
|
||||||
<view class="title-box ss-flex ss-row-between ss-m-b-20">
|
</view>
|
||||||
<text class="title ss-line-1"
|
<text class="time">{{ item.createTime }}</text>
|
||||||
>{{ item.event_text }}{{ item.memo ? '-' + item.memo : '' }}</text
|
</view>
|
||||||
>
|
</view>
|
||||||
<view class="money">
|
</view>
|
||||||
<text v-if="item.amount >= 0" class="add">+{{ item.amount }}</text>
|
<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
|
||||||
<text v-else class="minus">{{ item.amount }}</text>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<text class="time">{{ item.create_time }}</text>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
</view>
|
|
||||||
<uni-load-more
|
|
||||||
v-if="state.pagination.total > 0"
|
|
||||||
:status="state.loadStatus"
|
|
||||||
:content-text="{
|
|
||||||
contentdown: '上拉加载更多',
|
contentdown: '上拉加载更多',
|
||||||
}"
|
}" />
|
||||||
/>
|
</s-layout>
|
||||||
</s-layout>
|
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
<script setup>
|
<script setup>
|
||||||
import { computed, watch, reactive } from 'vue';
|
import {
|
||||||
import { onLoad, onReachBottom } from '@dcloudio/uni-app';
|
computed,
|
||||||
import sheep from '@/sheep';
|
watch,
|
||||||
import dayjs from 'dayjs';
|
reactive
|
||||||
import _ from 'lodash';
|
} from 'vue';
|
||||||
|
import {
|
||||||
|
onLoad,
|
||||||
|
onReachBottom
|
||||||
|
} from '@dcloudio/uni-app';
|
||||||
|
import sheep from '@/sheep';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
import _ from 'lodash';
|
||||||
|
|
||||||
const headerBg = sheep.$url.css('/static/img/shop/user/wallet_card_bg.png');
|
const headerBg = sheep.$url.css('/static/img/shop/user/wallet_card_bg.png');
|
||||||
|
|
||||||
const pagination = {
|
const pagination = {
|
||||||
data: [],
|
data: [],
|
||||||
current_page: 1,
|
current_page: 1,
|
||||||
total: 1,
|
total: 1,
|
||||||
last_page: 1,
|
last_page: 1,
|
||||||
expense: 0,
|
expense: 0,
|
||||||
income: 0,
|
income: 0,
|
||||||
};
|
};
|
||||||
// 数据
|
// 数据
|
||||||
const state = reactive({
|
const state = reactive({
|
||||||
showMoney: false,
|
showMoney: false,
|
||||||
date: [],
|
date: [],
|
||||||
currentTab: 0,
|
currentTab: 0,
|
||||||
pagination,
|
pagination,
|
||||||
loadStatus: '',
|
loadStatus: '',
|
||||||
today: '',
|
today: '',
|
||||||
});
|
});
|
||||||
|
|
||||||
const tabMaps = [
|
const tabMaps = [{
|
||||||
{
|
name: '全部',
|
||||||
name: '全部',
|
// value: 'all',
|
||||||
value: 'all',
|
},
|
||||||
},
|
{
|
||||||
{
|
name: '收入',
|
||||||
name: '收入',
|
value: '1',
|
||||||
value: 'income',
|
},
|
||||||
},
|
{
|
||||||
{
|
name: '支出',
|
||||||
name: '支出',
|
value: '2',
|
||||||
value: 'expense',
|
},
|
||||||
},
|
];
|
||||||
];
|
const userInfo = computed(() => sheep.$store('user').userInfo);
|
||||||
const userInfo = computed(() => sheep.$store('user').userInfo);
|
console.log(userInfo)
|
||||||
|
const dateFilterText = computed(() => {
|
||||||
|
if (state.date[0] === state.date[1]) {
|
||||||
|
return state.date[0];
|
||||||
|
} else {
|
||||||
|
return state.date.join('~');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
const dateFilterText = computed(() => {
|
async function getLogList(page = 1, list_rows = 8) {
|
||||||
if (state.date[0] === state.date[1]) {
|
// state.loadStatus = 'loading';
|
||||||
return state.date[0];
|
let res = await sheep.$api.user.wallet.log({
|
||||||
} else {
|
// type: 'money',
|
||||||
return state.date.join('~');
|
type: tabMaps[state.currentTab].value,
|
||||||
}
|
pageSize: list_rows,
|
||||||
});
|
pageNo: page,
|
||||||
|
// date: appendTimeHMS(state.date),
|
||||||
|
});
|
||||||
|
if (res.code === 0) {
|
||||||
|
let list = _.concat(state.pagination.data, res.data.list);
|
||||||
|
state.pagination = {
|
||||||
|
...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 {
|
||||||
|
state.loadStatus = 'noMore';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
onLoad(async (options) => {
|
||||||
|
state.today = dayjs().format('YYYY-MM-DD');
|
||||||
|
state.date = [state.today, state.today];
|
||||||
|
getLogList();
|
||||||
|
});
|
||||||
|
|
||||||
async function getLogList(page = 1, list_rows = 8) {
|
function onChange(e) {
|
||||||
state.loadStatus = 'loading';
|
state.pagination = pagination;
|
||||||
let res = await sheep.$api.user.wallet.log({
|
state.currentTab = e.index;
|
||||||
type: 'money',
|
getLogList();
|
||||||
tab: tabMaps[state.currentTab].value,
|
}
|
||||||
list_rows,
|
|
||||||
page,
|
|
||||||
date: appendTimeHMS(state.date),
|
|
||||||
});
|
|
||||||
if (res.error === 0) {
|
|
||||||
let list = _.concat(state.pagination.data, res.data.list.data);
|
|
||||||
state.pagination = {
|
|
||||||
...res.data.list,
|
|
||||||
data: list,
|
|
||||||
income: res.data.income,
|
|
||||||
expense: res.data.expense,
|
|
||||||
};
|
|
||||||
if (state.pagination.current_page < state.pagination.last_page) {
|
|
||||||
state.loadStatus = 'more';
|
|
||||||
} else {
|
|
||||||
state.loadStatus = 'noMore';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
onLoad(async (options) => {
|
|
||||||
state.today = dayjs().format('YYYY-MM-DD');
|
|
||||||
state.date = [state.today, state.today];
|
|
||||||
getLogList();
|
|
||||||
});
|
|
||||||
|
|
||||||
function onChange(e) {
|
function onChangeTime(e) {
|
||||||
state.pagination = pagination;
|
state.date[0] = e[0];
|
||||||
state.currentTab = e.index;
|
state.date[1] = e[e.length - 1];
|
||||||
getLogList();
|
state.pagination = pagination;
|
||||||
}
|
getLogList();
|
||||||
|
}
|
||||||
|
|
||||||
function onChangeTime(e) {
|
function appendTimeHMS(arr) {
|
||||||
state.date[0] = e[0];
|
return [arr[0] + ' 00:00:00', arr[1] + ' 23:59:59'];
|
||||||
state.date[1] = e[e.length - 1];
|
}
|
||||||
state.pagination = pagination;
|
|
||||||
getLogList();
|
|
||||||
}
|
|
||||||
|
|
||||||
function appendTimeHMS(arr) {
|
onReachBottom(() => {
|
||||||
return [arr[0] + ' 00:00:00', arr[1] + ' 23:59:59'];
|
if (state.loadStatus !== 'noMore') {
|
||||||
}
|
getLogList(state.pagination.current_page + 1);
|
||||||
|
}
|
||||||
onReachBottom(() => {
|
});
|
||||||
if (state.loadStatus !== 'noMore') {
|
|
||||||
getLogList(state.pagination.current_page + 1);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
// 钱包
|
// 钱包
|
||||||
.header-box {
|
.header-box {
|
||||||
background-color: $white;
|
background-color: $white;
|
||||||
padding: 30rpx;
|
padding: 30rpx;
|
||||||
|
|
||||||
.card-box {
|
.card-box {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
min-height: 300rpx;
|
min-height: 300rpx;
|
||||||
padding: 40rpx;
|
padding: 40rpx;
|
||||||
background-size: 100% 100%;
|
background-size: 100% 100%;
|
||||||
border-radius: 30rpx;
|
border-radius: 30rpx;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
position: relative;
|
position: relative;
|
||||||
z-index: 1;
|
z-index: 1;
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
|
|
||||||
&::after {
|
&::after {
|
||||||
content: '';
|
content: '';
|
||||||
display: block;
|
display: block;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
background: v-bind(headerBg)
|
background: v-bind(headerBg) no-repeat;
|
||||||
no-repeat;
|
pointer-events: none;
|
||||||
pointer-events: none;
|
}
|
||||||
}
|
|
||||||
|
|
||||||
.card-head {
|
.card-head {
|
||||||
color: $white;
|
color: $white;
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.ss-eye-icon {
|
.ss-eye-icon {
|
||||||
font-size: 40rpx;
|
font-size: 40rpx;
|
||||||
color: $white;
|
color: $white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.money-num {
|
.money-num {
|
||||||
font-size: 70rpx;
|
font-size: 70rpx;
|
||||||
line-height: 70rpx;
|
line-height: 70rpx;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
color: $white;
|
color: $white;
|
||||||
font-family: OPPOSANS;
|
font-family: OPPOSANS;
|
||||||
}
|
}
|
||||||
|
|
||||||
.reduce-num {
|
.reduce-num {
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
font-weight: 400;
|
font-weight: 400;
|
||||||
color: $white;
|
color: $white;
|
||||||
}
|
}
|
||||||
|
|
||||||
.topup-btn {
|
.topup-btn {
|
||||||
width: 120rpx;
|
width: 120rpx;
|
||||||
height: 60rpx;
|
height: 60rpx;
|
||||||
line-height: 60rpx;
|
line-height: 60rpx;
|
||||||
border-radius: 30px;
|
border-radius: 30px;
|
||||||
font-size: 26rpx;
|
font-size: 26rpx;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
background-color: $white;
|
background-color: $white;
|
||||||
color: var(--ui-BG-Main);
|
color: var(--ui-BG-Main);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 筛选
|
// 筛选
|
||||||
|
|
||||||
.filter-box {
|
.filter-box {
|
||||||
height: 114rpx;
|
height: 114rpx;
|
||||||
background-color: $bg-page;
|
background-color: $bg-page;
|
||||||
|
|
||||||
.total-box {
|
.total-box {
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
color: $dark-9;
|
color: $dark-9;
|
||||||
}
|
}
|
||||||
|
|
||||||
.date-btn {
|
.date-btn {
|
||||||
background-color: $white;
|
background-color: $white;
|
||||||
line-height: 54rpx;
|
line-height: 54rpx;
|
||||||
border-radius: 27rpx;
|
border-radius: 27rpx;
|
||||||
padding: 0 20rpx;
|
padding: 0 20rpx;
|
||||||
font-size: 24rpx;
|
font-size: 24rpx;
|
||||||
font-weight: 500;
|
font-weight: 500;
|
||||||
color: $dark-6;
|
color: $dark-6;
|
||||||
|
|
||||||
.ss-seldate-icon {
|
.ss-seldate-icon {
|
||||||
font-size: 50rpx;
|
font-size: 50rpx;
|
||||||
color: $dark-9;
|
color: $dark-9;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.tabs-box {
|
.tabs-box {
|
||||||
background: $white;
|
background: $white;
|
||||||
border-bottom: 2rpx solid #eeeeee;
|
border-bottom: 2rpx solid #eeeeee;
|
||||||
}
|
}
|
||||||
|
|
||||||
// tab
|
// tab
|
||||||
.wallet-tab-card {
|
.wallet-tab-card {
|
||||||
.tab-item {
|
.tab-item {
|
||||||
height: 80rpx;
|
height: 80rpx;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
|
||||||
.tab-title {
|
.tab-title {
|
||||||
font-size: 30rpx;
|
font-size: 30rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.cur-tab-title {
|
.cur-tab-title {
|
||||||
font-weight: $font-weight-bold;
|
font-weight: $font-weight-bold;
|
||||||
}
|
}
|
||||||
|
|
||||||
.tab-line {
|
.tab-line {
|
||||||
width: 60rpx;
|
width: 60rpx;
|
||||||
height: 6rpx;
|
height: 6rpx;
|
||||||
border-radius: 6rpx;
|
border-radius: 6rpx;
|
||||||
position: absolute;
|
position: absolute;
|
||||||
left: 50%;
|
left: 50%;
|
||||||
transform: translateX(-50%);
|
transform: translateX(-50%);
|
||||||
bottom: 2rpx;
|
bottom: 2rpx;
|
||||||
background-color: var(--ui-BG-Main);
|
background-color: var(--ui-BG-Main);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 钱包记录
|
// 钱包记录
|
||||||
.wallet-list {
|
.wallet-list {
|
||||||
padding: 30rpx;
|
padding: 30rpx;
|
||||||
background-color: #ffff;
|
background-color: #ffff;
|
||||||
|
|
||||||
.head-img {
|
.head-img {
|
||||||
width: 70rpx;
|
width: 70rpx;
|
||||||
height: 70rpx;
|
height: 70rpx;
|
||||||
border-radius: 50%;
|
border-radius: 50%;
|
||||||
background: $gray-c;
|
background: $gray-c;
|
||||||
}
|
}
|
||||||
|
|
||||||
.list-content {
|
.list-content {
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
flex: 1;
|
flex: 1;
|
||||||
|
|
||||||
.title {
|
.title {
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
color: $dark-3;
|
color: $dark-3;
|
||||||
width: 400rpx;
|
width: 400rpx;
|
||||||
}
|
}
|
||||||
|
|
||||||
.time {
|
.time {
|
||||||
color: $gray-c;
|
color: $gray-c;
|
||||||
font-size: 22rpx;
|
font-size: 22rpx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.money {
|
.money {
|
||||||
font-size: 28rpx;
|
font-size: 28rpx;
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
font-family: OPPOSANS;
|
font-family: OPPOSANS;
|
||||||
.add {
|
|
||||||
color: var(--ui-BG-Main);
|
|
||||||
}
|
|
||||||
|
|
||||||
.minus {
|
.add {
|
||||||
color: $dark-3;
|
color: var(--ui-BG-Main);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
.minus {
|
||||||
</style>
|
color: $dark-3;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</style>
|
||||||
|
|
@ -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);
|
||||||
|
|
|
||||||
|
|
@ -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',
|
||||||
|
|
|
||||||
|
|
@ -6,4 +6,9 @@ export default {
|
||||||
url: 'promotion/decorate/list?page=1',
|
url: 'promotion/decorate/list?page=1',
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
}),
|
}),
|
||||||
|
spids: () =>
|
||||||
|
request2({
|
||||||
|
url: 'product/spu/page?recommendType=best&pageNo=1&pageSize=10',
|
||||||
|
method: 'GET',
|
||||||
|
}),
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -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({
|
||||||
|
|
|
||||||
|
|
@ -1,331 +1,433 @@
|
||||||
import request from '@/sheep/request';
|
import request from '@/sheep/request';
|
||||||
|
import request2 from '@/sheep/request2';
|
||||||
import $platform from '@/sheep/platform';
|
import $platform from '@/sheep/platform';
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
profile: () =>
|
profile: () =>
|
||||||
request({
|
request2({
|
||||||
url: '/user/api/user/profile',
|
url: 'member/user/get',
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
custom: {
|
custom: {
|
||||||
showLoading: false,
|
showLoading: false,
|
||||||
auth: true,
|
auth: true,
|
||||||
},
|
},
|
||||||
}),
|
}),
|
||||||
update: (data) =>
|
balance: () =>
|
||||||
request({
|
request2({
|
||||||
url: '/user/api/user/update',
|
url: '/app-api/pay/wallet/get',
|
||||||
method: 'POST',
|
method: 'GET',
|
||||||
custom: {
|
custom: {
|
||||||
showSuccess: true,
|
showLoading: false,
|
||||||
auth: true,
|
auth: true,
|
||||||
},
|
},
|
||||||
data,
|
}),
|
||||||
}),
|
// profile: () =>
|
||||||
// 账号登录
|
// request({
|
||||||
accountLogin: (data) =>
|
// url: '/user/api/user/profile',
|
||||||
request({
|
// method: 'GET',
|
||||||
url: '/user/api/user/accountLogin',
|
// custom: {
|
||||||
method: 'POST',
|
// showLoading: false,
|
||||||
data,
|
// auth: true,
|
||||||
custom: {
|
// },
|
||||||
showSuccess: true,
|
// }),
|
||||||
loadingMsg: '登录中',
|
// update: (data) =>
|
||||||
},
|
// request({
|
||||||
}),
|
// url: '/user/api/user/update',
|
||||||
// 短信登录
|
// method: 'POST',
|
||||||
smsLogin: (data) =>
|
// custom: {
|
||||||
request({
|
// showSuccess: true,
|
||||||
url: '/user/api/user/smsLogin',
|
// auth: true,
|
||||||
method: 'POST',
|
// },
|
||||||
data,
|
// data,
|
||||||
custom: {
|
// }),
|
||||||
showSuccess: true,
|
update: (data) =>
|
||||||
loadingMsg: '登录中',
|
request2({
|
||||||
},
|
url: 'member/user/update',
|
||||||
}),
|
method: 'PUT',
|
||||||
// 短信注册
|
custom: {
|
||||||
smsRegister: (data) =>
|
showSuccess: true,
|
||||||
request({
|
auth: true,
|
||||||
url: '/user/api/user/smsRegister',
|
},
|
||||||
method: 'POST',
|
data,
|
||||||
data,
|
}),
|
||||||
custom: {
|
// 账号登录
|
||||||
showSuccess: true,
|
accountLogin: (data) =>
|
||||||
loadingMsg: '正在注册',
|
request({
|
||||||
},
|
url: '/user/api/user/accountLogin',
|
||||||
}),
|
method: 'POST',
|
||||||
// 重置密码
|
data,
|
||||||
resetPassword: (data) =>
|
custom: {
|
||||||
request({
|
showSuccess: true,
|
||||||
url: '/user/api/user/resetPassword',
|
loadingMsg: '登录中',
|
||||||
method: 'POST',
|
},
|
||||||
data,
|
}),
|
||||||
custom: {
|
// 短信登录
|
||||||
showSuccess: true,
|
smsLogin: (data) =>
|
||||||
loadingMsg: '验证中',
|
request({
|
||||||
},
|
url: '/user/api/user/smsLogin',
|
||||||
}),
|
method: 'POST',
|
||||||
|
data,
|
||||||
|
custom: {
|
||||||
|
showSuccess: true,
|
||||||
|
loadingMsg: '登录中',
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
// 短信注册
|
||||||
|
smsRegister: (data) =>
|
||||||
|
request({
|
||||||
|
url: '/user/api/user/smsRegister',
|
||||||
|
method: 'POST',
|
||||||
|
data,
|
||||||
|
custom: {
|
||||||
|
showSuccess: true,
|
||||||
|
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(',').map(item=>item*1),
|
||||||
info: (params) =>
|
// spuIds: id.split(',').join(','),
|
||||||
request({
|
},
|
||||||
url: 'user/account',
|
custom: {
|
||||||
method: 'GET',
|
showSuccess: true,
|
||||||
params,
|
auth: true,
|
||||||
custom: {
|
},
|
||||||
showError: false,
|
}),
|
||||||
auth: true,
|
// cancel: (id) =>
|
||||||
},
|
// request({
|
||||||
}),
|
// url: 'user/goodsLog/favorite',
|
||||||
save: (data) =>
|
// method: 'POST',
|
||||||
request({
|
// data: {
|
||||||
url: 'user/account',
|
// goods_ids: id,
|
||||||
method: 'POST',
|
// },
|
||||||
data,
|
// custom: {
|
||||||
custom: {
|
// showSuccess: true,
|
||||||
showSuccess: true,
|
// auth: true,
|
||||||
auth: true,
|
// },
|
||||||
},
|
// }),
|
||||||
}),
|
},
|
||||||
},
|
view: {
|
||||||
//数量接口
|
list: (params) =>
|
||||||
data: () =>
|
request({
|
||||||
request({
|
url: 'user/goodsLog/views',
|
||||||
url: 'user/user/data',
|
method: 'GET',
|
||||||
method: 'GET',
|
params,
|
||||||
custom: {
|
custom: {},
|
||||||
showLoading: false,
|
}),
|
||||||
auth: true,
|
delete: (data) =>
|
||||||
},
|
request({
|
||||||
}),
|
url: 'user/goodsLog/viewDel',
|
||||||
};
|
method: 'DELETE',
|
||||||
|
data,
|
||||||
|
custom: {
|
||||||
|
showSuccess: true,
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
},
|
||||||
|
wallet: {
|
||||||
|
log: (params) =>
|
||||||
|
request2({
|
||||||
|
url: 'pay/wallet-transaction/page',
|
||||||
|
method: 'GET',
|
||||||
|
params,
|
||||||
|
custom: {},
|
||||||
|
}),
|
||||||
|
// 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,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>
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@
|
||||||
<view v-if="tagStyle.show" class="tag-icon-box">
|
<view v-if="tagStyle.show" class="tag-icon-box">
|
||||||
<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src)"></image>
|
<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src)"></image>
|
||||||
</view>
|
</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
|
<view
|
||||||
class="md-goods-content ss-flex-col ss-row-around ss-p-b-20 ss-p-t-20 ss-p-x-16"
|
class="md-goods-content ss-flex-col ss-row-around ss-p-b-20 ss-p-t-20 ss-p-x-16"
|
||||||
:id="elId"
|
:id="elId"
|
||||||
|
|
@ -75,7 +75,7 @@
|
||||||
class="md-goods-title ss-line-1"
|
class="md-goods-title ss-line-1"
|
||||||
:style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
|
:style="[{ color: titleColor, width: titleWidth ? titleWidth + 'rpx' : '' }]"
|
||||||
>
|
>
|
||||||
{{ data.title }}
|
{{ data.title||data.name }}
|
||||||
</view>
|
</view>
|
||||||
<view
|
<view
|
||||||
v-if="goodsFields.subtitle?.show"
|
v-if="goodsFields.subtitle?.show"
|
||||||
|
|
@ -106,12 +106,12 @@
|
||||||
</view>
|
</view>
|
||||||
|
|
||||||
<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"
|
class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
|
||||||
:style="[{ color: originPriceColor }]"
|
:style="[{ color: originPriceColor }]"
|
||||||
>
|
>
|
||||||
<text class="price-unit ss-font-20">{{ priceUnit }}</text>
|
<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>
|
</view>
|
||||||
|
|
||||||
|
|
@ -141,7 +141,7 @@
|
||||||
<view v-if="grouponTag" class="groupon-tag ss-flex ss-row-center">
|
<view v-if="grouponTag" class="groupon-tag ss-flex ss-row-center">
|
||||||
<view class="tag-icon">拼团</view>
|
<view class="tag-icon">拼团</view>
|
||||||
</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 class="lg-goods-content ss-flex-1 ss-flex-col ss-row-between ss-p-b-10 ss-p-t-20">
|
||||||
<view>
|
<view>
|
||||||
<view
|
<view
|
||||||
|
|
@ -149,7 +149,7 @@
|
||||||
class="lg-goods-title ss-line-2"
|
class="lg-goods-title ss-line-2"
|
||||||
:style="[{ color: titleColor }]"
|
:style="[{ color: titleColor }]"
|
||||||
>
|
>
|
||||||
{{ data.title }}
|
{{ data.title||data.name }}
|
||||||
</view>
|
</view>
|
||||||
<view
|
<view
|
||||||
v-if="goodsFields.subtitle?.show"
|
v-if="goodsFields.subtitle?.show"
|
||||||
|
|
@ -177,12 +177,12 @@
|
||||||
{{ isArray(data.price) ? data.price[0] : data.price }}
|
{{ isArray(data.price) ? data.price[0] : data.price }}
|
||||||
</view>
|
</view>
|
||||||
<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"
|
class="goods-origin-price ss-flex ss-col-bottom font-OPPOSANS"
|
||||||
:style="[{ color: originPriceColor }]"
|
:style="[{ color: originPriceColor }]"
|
||||||
>
|
>
|
||||||
<text class="price-unit ss-font-20">{{ priceUnit }}</text>
|
<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>
|
</view>
|
||||||
<view class="ss-m-t-8 ss-flex ss-col-center ss-flex-wrap">
|
<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>
|
<image class="tag-icon" :src="sheep.$url.cdn(tagStyle.src)"></image>
|
||||||
</view>
|
</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 class="sl-goods-content">
|
||||||
<view>
|
<view>
|
||||||
|
|
@ -213,7 +213,7 @@
|
||||||
class="sl-goods-title ss-line-1"
|
class="sl-goods-title ss-line-1"
|
||||||
:style="[{ color: titleColor }]"
|
:style="[{ color: titleColor }]"
|
||||||
>
|
>
|
||||||
{{ data.title }}
|
{{ data.title||data.name }}
|
||||||
</view>
|
</view>
|
||||||
<view
|
<view
|
||||||
v-if="goodsFields.subtitle?.show"
|
v-if="goodsFields.subtitle?.show"
|
||||||
|
|
@ -241,12 +241,12 @@
|
||||||
{{ isArray(data.price) ? data.price[0] : data.price }}
|
{{ isArray(data.price) ? data.price[0] : data.price }}
|
||||||
</view>
|
</view>
|
||||||
<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"
|
class="goods-origin-price ss-m-t-16 font-OPPOSANS ss-flex"
|
||||||
:style="[{ color: originPriceColor }]"
|
:style="[{ color: originPriceColor }]"
|
||||||
>
|
>
|
||||||
<text class="price-unit ss-font-20">{{ priceUnit }}</text>
|
<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>
|
</view>
|
||||||
<view class="ss-m-t-16 ss-flex ss-flex-wrap">
|
<view class="ss-m-t-16 ss-flex ss-flex-wrap">
|
||||||
|
|
@ -313,6 +313,7 @@
|
||||||
original_price: { show: true },
|
original_price: { show: true },
|
||||||
sales: { show: true },
|
sales: { show: true },
|
||||||
stock: { show: true },
|
stock: { show: true },
|
||||||
|
salesCount: { show: true },
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
@ -396,8 +397,8 @@
|
||||||
// 格式化销量、库存信息
|
// 格式化销量、库存信息
|
||||||
const salesAndStock = computed(() => {
|
const salesAndStock = computed(() => {
|
||||||
let text = [];
|
let text = [];
|
||||||
if (props.goodsFields.sales?.show) {
|
if (props.goodsFields.salesCount?.show) {
|
||||||
text.push(formatSales(props.data.sales_show_type, props.data.sales));
|
text.push(formatSales(props.data.sales_show_type, props.data.salesCount));
|
||||||
}
|
}
|
||||||
if (props.goodsFields.stock?.show) {
|
if (props.goodsFields.stock?.show) {
|
||||||
text.push(formatStock(props.data.stock_show_type, props.data.stock));
|
text.push(formatStock(props.data.stock_show_type, props.data.stock));
|
||||||
|
|
|
||||||
|
|
@ -64,6 +64,7 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
const numData = computed(() => sheep.$store('user').numData);
|
const numData = computed(() => sheep.$store('user').numData);
|
||||||
|
console.log('更换后的yuda订单数量',numData)
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<style lang="scss" scoped>
|
<style lang="scss" scoped>
|
||||||
|
|
|
||||||
|
|
@ -62,6 +62,7 @@
|
||||||
|
|
||||||
// 用户信息
|
// 用户信息
|
||||||
const userInfo = computed(() => sheep.$store('user').userInfo);
|
const userInfo = computed(() => sheep.$store('user').userInfo);
|
||||||
|
console.log('用户信息',userInfo)
|
||||||
|
|
||||||
// 是否登录
|
// 是否登录
|
||||||
const isLogin = computed(() => sheep.$store('user').isLogin);
|
const isLogin = computed(() => sheep.$store('user').isLogin);
|
||||||
|
|
|
||||||
|
|
@ -4,214 +4,221 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import Request from 'luch-request';
|
import Request from 'luch-request';
|
||||||
import { baseUrl, apiPath } from '@/sheep/config';
|
import {
|
||||||
|
baseUrl,
|
||||||
|
apiPath
|
||||||
|
} from '@/sheep/config';
|
||||||
import $store from '@/sheep/store';
|
import $store from '@/sheep/store';
|
||||||
import $platform from '@/sheep/platform';
|
import $platform from '@/sheep/platform';
|
||||||
import { showAuthModal } from '@/sheep/hooks/useModal';
|
import {
|
||||||
|
showAuthModal
|
||||||
|
} from '@/sheep/hooks/useModal';
|
||||||
|
|
||||||
const options = {
|
const options = {
|
||||||
// 显示操作成功消息 默认不显示
|
// 显示操作成功消息 默认不显示
|
||||||
showSuccess: false,
|
showSuccess: false,
|
||||||
// 成功提醒 默认使用后端返回值
|
// 成功提醒 默认使用后端返回值
|
||||||
successMsg: '',
|
successMsg: '',
|
||||||
// 显示失败消息 默认显示
|
// 显示失败消息 默认显示
|
||||||
showError: true,
|
showError: true,
|
||||||
// 失败提醒 默认使用后端返回信息
|
// 失败提醒 默认使用后端返回信息
|
||||||
errorMsg: '',
|
errorMsg: '',
|
||||||
// 显示请求时loading模态框 默认显示
|
// 显示请求时loading模态框 默认显示
|
||||||
showLoading: true,
|
showLoading: true,
|
||||||
// loading提醒文字
|
// loading提醒文字
|
||||||
loadingMsg: '加载中',
|
loadingMsg: '加载中',
|
||||||
// 需要授权才能请求 默认放开
|
// 需要授权才能请求 默认放开
|
||||||
auth: false,
|
auth: false,
|
||||||
// ...
|
// ...
|
||||||
};
|
};
|
||||||
|
|
||||||
// Loading全局实例
|
// Loading全局实例
|
||||||
let LoadingInstance = {
|
let LoadingInstance = {
|
||||||
target: null,
|
target: null,
|
||||||
count: 0,
|
count: 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 关闭loading
|
* 关闭loading
|
||||||
*/
|
*/
|
||||||
function closeLoading() {
|
function closeLoading() {
|
||||||
if (LoadingInstance.count > 0) LoadingInstance.count--;
|
if (LoadingInstance.count > 0) LoadingInstance.count--;
|
||||||
if (LoadingInstance.count === 0) uni.hideLoading();
|
if (LoadingInstance.count === 0) uni.hideLoading();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description 请求基础配置 可直接使用访问自定义请求
|
* @description 请求基础配置 可直接使用访问自定义请求
|
||||||
*/
|
*/
|
||||||
const http = new Request({
|
const http = new Request({
|
||||||
baseURL: 'https://api.shopro.sheepjs.com/',
|
baseURL: 'https://api.shopro.sheepjs.com/',
|
||||||
timeout: 8000,
|
timeout: 8000,
|
||||||
method: 'GET',
|
method: 'GET',
|
||||||
header: {
|
header: {
|
||||||
Accept: 'text/json',
|
Accept: 'text/json',
|
||||||
'Content-Type': 'application/json;charset=UTF-8',
|
'Content-Type': 'application/json;charset=UTF-8',
|
||||||
platform: $platform.name,
|
platform: $platform.name,
|
||||||
},
|
},
|
||||||
// #ifdef APP-PLUS
|
// #ifdef APP-PLUS
|
||||||
sslVerify: false,
|
sslVerify: false,
|
||||||
// #endif
|
// #endif
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
// 跨域请求时是否携带凭证（cookies）仅H5支持（HBuilderX 2.6.15+）
|
// 跨域请求时是否携带凭证（cookies）仅H5支持（HBuilderX 2.6.15+）
|
||||||
withCredentials: false,
|
withCredentials: false,
|
||||||
// #endif
|
// #endif
|
||||||
custom: options,
|
custom: options,
|
||||||
});
|
});
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description 请求拦截器
|
* @description 请求拦截器
|
||||||
*/
|
*/
|
||||||
http.interceptors.request.use(
|
http.interceptors.request.use(
|
||||||
(config) => {
|
(config) => {
|
||||||
// console.log(config);
|
// console.log(config);
|
||||||
if (config.custom.auth && !$store('user').isLogin) {
|
if (config.custom.auth && !$store('user').isLogin) {
|
||||||
showAuthModal();
|
showAuthModal();
|
||||||
return Promise.reject();
|
return Promise.reject();
|
||||||
}
|
}
|
||||||
if (config.custom.showLoading) {
|
if (config.custom.showLoading) {
|
||||||
LoadingInstance.count++;
|
LoadingInstance.count++;
|
||||||
LoadingInstance.count === 1 &&
|
LoadingInstance.count === 1 &&
|
||||||
uni.showLoading({
|
uni.showLoading({
|
||||||
title: config.custom.loadingMsg,
|
title: config.custom.loadingMsg,
|
||||||
mask: true,
|
mask: true,
|
||||||
fail: () => {
|
fail: () => {
|
||||||
uni.hideLoading();
|
uni.hideLoading();
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
const token = uni.getStorageSync('token');
|
const token = uni.getStorageSync('token');
|
||||||
if (token) config.header['Authorization'] = token;
|
if (token) config.header['Authorization'] = token;
|
||||||
// TODO 芋艿：特殊处理
|
// TODO 芋艿：特殊处理
|
||||||
if (config.url.indexOf('/app-api/') !== -1) {
|
if (config.url.indexOf('/app-api/') !== -1) {
|
||||||
config.header['Accept'] = '*/*'
|
config.header['Accept'] = '*/*'
|
||||||
config.header['tenant-id'] = '1';
|
config.header['tenant-id'] = '1';
|
||||||
config.header['Authorization'] = 'Bearer test247';
|
config.header['Authorization'] = 'Bearer test247';
|
||||||
}
|
}
|
||||||
return config;
|
return config;
|
||||||
},
|
},
|
||||||
(error) => {
|
(error) => {
|
||||||
return Promise.reject(error);
|
return Promise.reject(error);
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @description 响应拦截器
|
* @description 响应拦截器
|
||||||
*/
|
*/
|
||||||
http.interceptors.response.use(
|
http.interceptors.response.use(
|
||||||
(response) => {
|
(response) => {
|
||||||
// 自动设置登陆令牌
|
// 自动设置登陆令牌
|
||||||
if (response.header.authorization || response.header.Authorization) {
|
if (response.header.authorization || response.header.Authorization) {
|
||||||
$store('user').setToken(response.header.authorization || response.header.Authorization);
|
$store('user').setToken(response.header.authorization || response.header.Authorization);
|
||||||
}
|
}
|
||||||
|
|
||||||
response.config.custom.showLoading && closeLoading();
|
response.config.custom.showLoading && closeLoading();
|
||||||
if (response.data.code !== 0) {
|
if (response.data.code !== 0) {
|
||||||
if (response.config.custom.showError)
|
if (response.config.custom.showError)
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: response.data.msg || '服务器开小差啦,请稍后再试~',
|
title: response.data.msg || '服务器开小差啦,请稍后再试~',
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
mask: true,
|
mask: true,
|
||||||
});
|
});
|
||||||
return Promise.resolve(response.data);
|
return Promise.resolve(response.data);
|
||||||
}
|
}
|
||||||
if (
|
if (
|
||||||
response.data.error === 0 &&
|
response.data.error === 0 &&
|
||||||
response.data.msg !== '' &&
|
response.data.msg !== '' &&
|
||||||
response.config.custom.showSuccess
|
response.config.custom.showSuccess
|
||||||
) {
|
) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: response.config.custom.successMsg || response.data.msg,
|
title: response.config.custom.successMsg || response.data.msg,
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
return Promise.resolve(response.data);
|
return Promise.resolve(response.data);
|
||||||
},
|
},
|
||||||
(error) => {
|
(error) => {
|
||||||
const userStore = $store('user');
|
const userStore = $store('user');
|
||||||
const isLogin = userStore.isLogin;
|
const isLogin = userStore.isLogin;
|
||||||
let errorMessage = '网络请求出错';
|
let errorMessage = '网络请求出错';
|
||||||
if (error !== undefined) {
|
if (error !== undefined) {
|
||||||
switch (error.statusCode) {
|
switch (error.statusCode) {
|
||||||
case 400:
|
case 400:
|
||||||
errorMessage = '请求错误';
|
errorMessage = '请求错误';
|
||||||
break;
|
break;
|
||||||
case 401:
|
case 401:
|
||||||
if (isLogin) {
|
if (isLogin) {
|
||||||
errorMessage = '您的登陆已过期';
|
errorMessage = '您的登陆已过期';
|
||||||
} else {
|
} else {
|
||||||
errorMessage = '请先登录';
|
errorMessage = '请先登录';
|
||||||
}
|
}
|
||||||
userStore.logout(true);
|
userStore.logout(true);
|
||||||
showAuthModal();
|
showAuthModal();
|
||||||
break;
|
break;
|
||||||
case 403:
|
case 403:
|
||||||
errorMessage = '拒绝访问';
|
errorMessage = '拒绝访问';
|
||||||
break;
|
break;
|
||||||
case 404:
|
case 404:
|
||||||
errorMessage = '请求出错';
|
errorMessage = '请求出错';
|
||||||
break;
|
break;
|
||||||
case 408:
|
case 408:
|
||||||
errorMessage = '请求超时';
|
errorMessage = '请求超时';
|
||||||
break;
|
break;
|
||||||
case 429:
|
case 429:
|
||||||
errorMessage = '请求频繁, 请稍后再访问';
|
errorMessage = '请求频繁, 请稍后再访问';
|
||||||
break;
|
break;
|
||||||
case 500:
|
case 500:
|
||||||
errorMessage = '服务器开小差啦,请稍后再试~';
|
errorMessage = '服务器开小差啦,请稍后再试~';
|
||||||
break;
|
break;
|
||||||
case 501:
|
case 501:
|
||||||
errorMessage = '服务未实现';
|
errorMessage = '服务未实现';
|
||||||
break;
|
break;
|
||||||
case 502:
|
case 502:
|
||||||
errorMessage = '网络错误';
|
errorMessage = '网络错误';
|
||||||
break;
|
break;
|
||||||
case 503:
|
case 503:
|
||||||
errorMessage = '服务不可用';
|
errorMessage = '服务不可用';
|
||||||
break;
|
break;
|
||||||
case 504:
|
case 504:
|
||||||
errorMessage = '网络超时';
|
errorMessage = '网络超时';
|
||||||
break;
|
break;
|
||||||
case 505:
|
case 505:
|
||||||
errorMessage = 'HTTP版本不受支持';
|
errorMessage = 'HTTP版本不受支持';
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (error.errMsg.includes('timeout')) errorMessage = '请求超时';
|
if (error.errMsg.includes('timeout')) errorMessage = '请求超时';
|
||||||
// #ifdef H5
|
// #ifdef H5
|
||||||
if (error.errMsg.includes('Network'))
|
if (error.errMsg.includes('Network'))
|
||||||
errorMessage = window.navigator.onLine ? '服务器异常' : '请检查您的网络连接';
|
errorMessage = window.navigator.onLine ? '服务器异常' : '请检查您的网络连接';
|
||||||
// #endif
|
// #endif
|
||||||
}
|
}
|
||||||
|
|
||||||
if (error && error.config) {
|
if (error && error.config) {
|
||||||
if (error.config.custom.showError === false) {
|
if (error.config.custom.showError === false) {
|
||||||
uni.showToast({
|
uni.showToast({
|
||||||
title: error.data?.msg || errorMessage,
|
title: error.data?.msg || errorMessage,
|
||||||
icon: 'none',
|
icon: 'none',
|
||||||
mask: true,
|
mask: true,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
error.config.custom.showLoading && closeLoading();
|
error.config.custom.showLoading && closeLoading();
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
|
||||||
const request = (config) => {
|
const request = (config) => {
|
||||||
if (config.url[0] !== '/') {
|
if (config.url[0] !== '/') {
|
||||||
config.url = '/app-api/' + config.url;
|
config.url = '/app-api/' + config.url;
|
||||||
}
|
}
|
||||||
// TODO 芋艿：额外拼接
|
// TODO 芋艿：额外拼接
|
||||||
if (config.url.indexOf('/app-api/') >= 0) {
|
if (config.url.indexOf('/app-api/') >= 0) {
|
||||||
config.url = 'http://api-dashboard.yudao.iocoder.cn' + config.url; // 调用【云端】
|
// 设置接口地址
|
||||||
// config.url = 'http://127.0.0.1:48080' + config.url; // 调用【本地】
|
config.url = 'http://api-dashboard.yudao.iocoder.cn' + config.url; // 调用【云端】
|
||||||
}
|
// config.url = 'https://app.test.huizhizao.vip/prod-api' + config.url; // 调用【云端】
|
||||||
return http.middleware(config);
|
// config.url = 'http://127.0.0.1:48080' + config.url; // 调用【本地】
|
||||||
|
}
|
||||||
|
return http.middleware(config);
|
||||||
};
|
};
|
||||||
|
|
||||||
export default request;
|
export default request;
|
||||||
|
|
@ -16,7 +16,7 @@ const modal = defineStore({
|
||||||
}
|
}
|
||||||
}),
|
}),
|
||||||
persist: {
|
persist: {
|
||||||
enabled: true,
|
enabled: true,
|
||||||
strategies: [
|
strategies: [
|
||||||
{
|
{
|
||||||
key: 'modal-store',
|
key: 'modal-store',
|
||||||
|
|
|
||||||
|
|
@ -44,8 +44,11 @@ const user = defineStore({
|
||||||
actions: {
|
actions: {
|
||||||
// 获取个人信息
|
// 获取个人信息
|
||||||
async getInfo() {
|
async getInfo() {
|
||||||
const { error, data } = await userApi.profile();
|
const { code, data } = await userApi.profile();
|
||||||
if (error !== 0) return;
|
// 为了兼容 获取用户余额 可能还会用到其他参数
|
||||||
|
const { code:code2, data:data2 } = await userApi.balance();
|
||||||
|
if (code !== 0||code2!=0) return;
|
||||||
|
data.money=data2.balance/100;
|
||||||
this.userInfo = data;
|
this.userInfo = data;
|
||||||
|
|
||||||
return Promise.resolve(data);
|
return Promise.resolve(data);
|
||||||
|
|
@ -62,9 +65,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
|
||||||
|
}};
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue