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

2
App.vue
View File

@ -21,7 +21,7 @@
if (args) { if (args) {
} }
// 获取剪贴板 // 获取剪贴板
uni.getClipboardData({ uni.getClipboardData({
success: (res) => { }, success: (res) => { },
}); });

23
pages/goods/list.vue
View File

@ -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,

10
pages/index/category.vue
View File

@ -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);

10
pages/index/index.vue
View File

@ -27,11 +27,19 @@
uni.hideTabBar(); uni.hideTabBar();
const template = computed(() => sheep.$store('app').template?.home); const template = computed(() => sheep.$store('app').template?.home);
// 在此处拦截改变一下首页轮播图 此处先写死后期复活
// 在此处拦截改变一下首页轮播图 此处先写死后期复活 放到启动函数里
(async function() { (async function() {
console.log('原代码首页定制化数据',template)
let { let {
data data
} = await index2Api.decorate(); } = 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 => { template.value.data[0].data.list = JSON.parse(data[0].value).map(item => {
return { return {
src: item.picUrl, src: item.picUrl,

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

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

10
pages/user/info.vue
View File

@ -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
@ -332,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;

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

@ -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>

5
sheep/api/index2.js
View File

@ -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',
}),
}; };

23
sheep/api/user.js
View File

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

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

@ -64,7 +64,7 @@
]; ];
const numData = computed(() => sheep.$store('user').numData); const numData = computed(() => sheep.$store('user').numData);
console.log(numData) console.log('更换后的yuda订单数量',numData)
</script> </script>
<style lang="scss" scoped> <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); const userInfo = computed(() => sheep.$store('user').userInfo);
console.log(userInfo) console.log('用户信息',userInfo)
// 是否登录 // 是否登录
const isLogin = computed(() => sheep.$store('user').isLogin); const isLogin = computed(() => sheep.$store('user').isLogin);

349
sheep/request2/index.js
View File

@ -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;

2
sheep/store/modal.js
View File

@ -16,7 +16,7 @@ const modal = defineStore({
} }
}), }),
persist: { persist: {
enabled: true, enabled: true,
strategies: [ strategies: [
{ {
key: 'modal-store', key: 'modal-store',

7
sheep/store/user.js
View File

@ -45,7 +45,10 @@ const user = defineStore({
// 获取个人信息 // 获取个人信息
async getInfo() { async getInfo() {
const { code, data } = await userApi.profile(); 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; this.userInfo = data;
return Promise.resolve(data); return Promise.resolve(data);
@ -65,7 +68,7 @@ const user = defineStore({
const { code, data } = await userApi.data(); const { code, data } = await userApi.data();
const data2 = await userApi.data2(); const data2 = await userApi.data2();
if (code === 0&&data2.code===0) { if (code === 0&&data2.code===0) {
console.log(data); console.log('订单数据',data);
this.numData = {order_num:{ this.numData = {order_num:{
noget:data.deliveredCount, noget:data.deliveredCount,
unpaid:data.unpaidCount, unpaid:data.unpaidCount,