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-07 17:49:02 +08:00
parent 627b3d015f
commit a9afb6452d
15 changed files with 563 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pages/goods/list.vue
View File

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

6
pages/index/category.vue
View File

@ -82,7 +82,8 @@
});
if (code === 0) {
state.categoryList = {
children: data
children: data,
style: 'first_one'
};
}
}
@ -96,9 +97,10 @@
total: 1,
last_page: 1,
};
getGoodsList(state.categoryList.children[val].id);
}
// 这段代码本来是在判断里的
getGoodsList(state.categoryList.children[val].id);
// getGoodsList(state.categoryList.children[val].id);
};
async function getGoodsList(id, page = 1, list_rows = 6) {

10
pages/index/index.vue
View File

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

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

@ -131,7 +131,7 @@
pageNo:page,
});
if (res.code === 0) {
console.log(res)
console.log('yudao收藏列表',res)
let orderList = _.concat(state.pagination.data, res.data.list);
state.pagination = {
...res.data,

10
pages/user/info.vue
View File

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

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

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

5
sheep/api/index2.js
View File

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

23
sheep/api/user.js
View File

@ -12,6 +12,15 @@ export default {
auth: true,
},
}),
balance: () =>
request2({
url: '/app-api/pay/wallet/get',
method: 'GET',
custom: {
showLoading: false,
auth: true,
},
}),
// profile: () =>
// request({
// url: '/user/api/user/profile',
@ -316,7 +325,8 @@ export default {
url: 'product/favorite/delete-list',
method: 'DELETE',
data: {
spuIds: id.split(','),
spuIds: id.split(',').map(item=>item*1),
// spuIds: id.split(',').join(','),
},
custom: {
showSuccess: true,
@ -356,12 +366,19 @@ export default {
},
wallet: {
log: (params) =>
request({
url: '/user/api/walletLog',
request2({
url: 'pay/wallet-transaction/page',
method: 'GET',
params,
custom: {},
}),
// log: (params) =>
// request({
// url: '/user/api/walletLog',
// method: 'GET',
// params,
// custom: {},
// }),
},
account: {
info: (params) =>

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

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

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

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

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

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

11
sheep/request2/index.js
View File

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

7
sheep/store/user.js
View File

@ -45,7 +45,10 @@ const user = defineStore({
// 获取个人信息
async getInfo() {
const { code, data } = await userApi.profile();
if (code !== 0) return;
// 为了兼容 获取用户余额 可能还会用到其他参数
const { code:code2, data:data2 } = await userApi.balance();
if (code !== 0||code2!=0) return;
data.money=data2.balance/100;
this.userInfo = data;
return Promise.resolve(data);
@ -65,7 +68,7 @@ const user = defineStore({
const { code, data } = await userApi.data();
const data2 = await userApi.data2();
if (code === 0&&data2.code===0) {
console.log(data);
console.log('订单数据',data);
this.numData = {order_num:{
noget:data.deliveredCount,
unpaid:data.unpaidCount,