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

Merge remote-tracking branch 'origin/master-vue3' into master-vue3

pull/32/head
owen 2023-12-23 22:29:33 +08:00
parent 4d5a4bce70 2bfd7474cf
commit 52299cf7ba
49 changed files with 906 additions and 900 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
App.vue
View File

@ -1,46 +1,39 @@
<script setup> <script setup>
import { import { onLaunch, onShow, onError } from '@dcloudio/uni-app';
onLaunch, import { ShoproInit } from './sheep';
onShow,
onError
} from '@dcloudio/uni-app';
import {
ShoproInit
} from './sheep';
onLaunch(() => { onLaunch(() => {
// 隐藏原生导航栏 使用自定义底部导航 // 隐藏原生导航栏 使用自定义底部导航
uni.hideTabBar(); uni.hideTabBar();
// 加载Shopro底层依赖 // 加载Shopro底层依赖
ShoproInit(); ShoproInit();
}); });
onError((err) => { onError((err) => {
console.log('AppOnError:', err); console.log('AppOnError:', err);
}); });
onShow((options) => { onShow((options) => {
// #ifdef APP-PLUS // #ifdef APP-PLUS
// 获取urlSchemes参数 // 获取urlSchemes参数
const args = plus.runtime.arguments; const args = plus.runtime.arguments;
if (args) {} if (args) {
}
// 获取剪贴板 // 获取剪贴板
uni.getClipboardData({ uni.getClipboardData({
success: (res) => {}, success: (res) => { },
}); });
// #endif // #endif
// #ifdef MP-WEIXIN // #ifdef MP-WEIXIN
// 确认收货回调结果 // 确认收货回调结果
console.log(options, 'options'); console.log(options,'options');
// #endif // #endif
});
});
</script> </script>
<style lang="scss"> <style lang="scss">
@import '@/sheep/scss/index.scss'; @import '@/sheep/scss/index.scss';
</style> </style>

205
pages/commission/components/account-info.vue
View File

@ -1,108 +1,117 @@
<!-- 账户 --> <!-- 账户 -->
<template> <template>
<view class="account-card"> <view class="account-card">
<view class="account-card-box"> <view class="account-card-box">
<view class="ss-flex ss-row-between card-box-header"> <view class="ss-flex ss-row-between card-box-header">
<view class="ss-flex"> <view class="ss-flex">
<view class="header-title ss-m-r-16">账户信息</view> <view class="header-title ss-m-r-16">账户信息</view>
<button <button class="ss-reset-button look-btn ss-flex" @tap="state.showMoney = !state.showMoney">
class="ss-reset-button look-btn ss-flex" <uni-icons :type="state.showMoney ? 'eye-filled' : 'eye-slash-filled'" color="#A57A55"
@tap="state.showMoney = !state.showMoney" size="20"></uni-icons>
> </button>
<uni-icons </view>
:type="state.showMoney ? 'eye-filled' : 'eye-slash-filled'" <view class="ss-flex" @tap="sheep.$router.go('/pages/user/wallet/commission')">
color="#A57A55" <view class="header-title ss-m-r-4">查看明细</view>
size="20" <text class="cicon-play-arrow"></text>
></uni-icons> </view>
</button> </view>
</view> <!-- 收益 -->
<view class="ss-flex" @tap="sheep.$router.go('/pages/user/wallet/commission')"> <view class="card-content ss-flex">
<view class="header-title ss-m-r-4">查看明细</view> <view class="ss-flex-1 ss-flex-col ss-col-center">
<text class="cicon-play-arrow"></text> <view class="item-title">当前佣金(元)</view>
</view> <view class="item-detail">
</view> {{ state.showMoney ? userInfo.brokeragePrice || '0.00' : '***' }}
<!-- 收益 --> </view>
<view class="card-content ss-flex"> </view>
<view class="ss-flex-1 ss-flex-col ss-col-center"> <view class="ss-flex-1 ss-flex-col ss-col-center">
<view class="item-title">总收益(元)</view> <view class="item-title">昨天的佣金(元)</view>
<view class="item-detail"> <view class="item-detail">
{{ state.showMoney ? agentInfo.total_income || '0.00' : '***' }} {{ state.showMoney ? userInfo.yesterdayPrice || '0.00' : '***' }}
</view> </view>
</view> </view>
<view class="ss-flex-1 ss-flex-col ss-col-center"> <view class="ss-flex-1 ss-flex-col ss-col-center">
<view class="item-title">我的佣金(元)</view> <view class="item-title">累计已提(元)</view>
<view class="item-detail"> <view class="item-detail">
{{ state.showMoney ? userInfo.commission || '0.00' : '***' }} {{ state.showMoney ? userInfo.withdrawPrice || '0.00' : '***' }}
</view> </view>
</view> </view>
<view class="ss-flex-1 ss-flex-col ss-col-center"> </view>
<view class="item-title">我的消费(元)</view> </view>
<view class="item-detail"> </view>
{{ state.showMoney ? userInfo.total_consume || '0.00' : '***' }}
</view>
</view>
</view>
</view>
</view>
</template> </template>
<script setup> <script setup>
import sheep from '@/sheep'; import sheep from '@/sheep';
import { computed, reactive } from 'vue'; import {
computed,
reactive,
onMounted
} from 'vue';
const userInfo = computed(() => sheep.$store('user').userInfo); const userInfo = computed(() => sheep.$store('user').userInfo);
const agentInfo = computed(() => sheep.$store('user').agentInfo); const agentInfo = computed(() => sheep.$store('user').agentInfo);
const state = reactive({ const state = reactive({
showMoney: false, showMoney: false,
}); });
onMounted(async () => {
let res = await sheep.$api.commission.getSummary();
userInfo = res.data;
})
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.account-card { .account-card {
width: 694rpx; width: 694rpx;
margin: 0 auto; margin: 0 auto;
padding: 2rpx; padding: 2rpx;
background: linear-gradient(180deg, #ffffff 0.88%, #fff9ec 100%); background: linear-gradient(180deg, #ffffff 0.88%, #fff9ec 100%);
border-radius: 12rpx; border-radius: 12rpx;
z-index: 3; z-index: 3;
position: relative; position: relative;
.account-card-box {
background: #ffefd6; .account-card-box {
.card-box-header { background: #ffefd6;
padding: 0 30rpx;
height: 72rpx; .card-box-header {
box-shadow: 0px 2px 6px #f2debe; padding: 0 30rpx;
.header-title { height: 72rpx;
font-size: 24rpx; box-shadow: 0px 2px 6px #f2debe;
font-weight: 500;
color: #a17545; .header-title {
line-height: 30rpx; font-size: 24rpx;
} font-weight: 500;
.cicon-play-arrow { color: #a17545;
color: #a17545; line-height: 30rpx;
font-size: 24rpx; }
line-height: 30rpx;
} .cicon-play-arrow {
} color: #a17545;
.card-content { font-size: 24rpx;
height: 190rpx; line-height: 30rpx;
background: #fdfae9; }
.item-title { }
font-size: 24rpx;
font-weight: 500; .card-content {
color: #cba67e; height: 190rpx;
line-height: 30rpx; background: #fdfae9;
margin-bottom: 24rpx;
} .item-title {
.item-detail { font-size: 24rpx;
font-size: 36rpx; font-weight: 500;
font-family: OPPOSANS; color: #cba67e;
font-weight: bold; line-height: 30rpx;
color: #692e04; margin-bottom: 24rpx;
line-height: 30rpx; }
}
} .item-detail {
} font-size: 36rpx;
} font-family: OPPOSANS;
</style> font-weight: bold;
color: #692e04;
line-height: 30rpx;
}
}
}
}
</style>

218
pages/commission/components/commission-info.vue
View File

@ -1,126 +1,126 @@
<!-- 分销商信息 --> <!-- 分销商信息 -->
<template> <template>
<!-- 用户资料 --> <!-- 用户资料 -->
<view class="user-card ss-flex ss-col-bottom"> <view class="user-card ss-flex ss-col-bottom">
<view class="card-top ss-flex ss-row-between"> <view class="card-top ss-flex ss-row-between">
<view class="ss-flex"> <view class="ss-flex">
<view class="head-img-box"> <view class="head-img-box">
<image class="head-img" :src="sheep.$url.cdn(userInfo.avatar)" mode="aspectFill"></image> <image class="head-img" :src="sheep.$url.cdn(userInfo.avatar)" mode="aspectFill"></image>
</view> </view>
<view class="ss-flex-col"> <view class="ss-flex-col">
<view class="user-name">{{ userInfo.nickname }}</view> <view class="user-name">{{ userInfo.nickname }}</view>
<view class="user-info-box ss-flex"> <view class="user-info-box ss-flex">
<view class="tag-box ss-flex" v-if="agentInfo.level_info"> <view class="tag-box ss-flex" v-if="agentInfo.level_info">
<image <image v-if="agentInfo.level_info?.image" class="tag-img"
v-if="agentInfo.level_info?.image" :src="sheep.$url.cdn(agentInfo.level_info?.image)" mode="aspectFill">
class="tag-img" </image>
:src="sheep.$url.cdn(agentInfo.level_info?.image)" <text class="tag-title">{{ agentInfo.level_info?.name }}</text>
mode="aspectFill" </view>
> <view class="ss-iconfont uicon-arrow-right" style="color: #fff; font-size: 28rpx">
</image> </view>
<text class="tag-title">{{ agentInfo.level_info?.name }}</text> </view>
</view> </view>
<view class="ss-iconfont uicon-arrow-right" style="color: #fff; font-size: 28rpx"> </view>
</view> </view>
</view> </view>
</view>
</view>
</view>
</view>
</template> </template>
<script setup> <script setup>
import sheep from '@/sheep'; import sheep from '@/sheep';
import { computed, reactive } from 'vue'; import {
computed,
reactive
} from 'vue';
const userInfo = computed(() => sheep.$store('user').userInfo); const userInfo = computed(() => sheep.$store('user').userInfo);
const agentInfo = computed(() => sheep.$store('user').agentInfo); const agentInfo = computed(() => sheep.$store('user').agentInfo);
const headerBg = sheep.$url.css('/static/img/shop/commission/background.png'); const headerBg = sheep.$url.css('/static/img/shop/commission/background.png');
console.log(userInfo);
const state = reactive({ const state = reactive({
showMoney: false, showMoney: false,
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
// 用户资料卡片 // 用户资料卡片
.user-card { .user-card {
width: 690rpx; width: 690rpx;
height: 192rpx; height: 192rpx;
margin: -88rpx 20rpx 0 20rpx; margin: -88rpx 20rpx 0 20rpx;
padding-top: 88rpx; padding-top: 88rpx;
background: v-bind(headerBg) no-repeat; background: v-bind(headerBg) no-repeat;
background-size: 100% 100%; background-size: 100% 100%;
.head-img-box { .head-img-box {
margin-right: 20rpx; margin-right: 20rpx;
width: 100rpx; width: 100rpx;
height: 100rpx; height: 100rpx;
border-radius: 50%; border-radius: 50%;
position: relative; position: relative;
background: #fce0ad; background: #fce0ad;
.head-img { .head-img {
width: 92rpx; width: 92rpx;
height: 92rpx; height: 92rpx;
border-radius: 50%; border-radius: 50%;
position: absolute; position: absolute;
top: 50%; top: 50%;
left: 50%; left: 50%;
transform: translate(-50%, -50%); transform: translate(-50%, -50%);
} }
} }
.card-top { .card-top {
box-sizing: border-box; box-sizing: border-box;
padding-bottom: 34rpx; padding-bottom: 34rpx;
.user-name {
font-size: 32rpx;
font-weight: bold;
color: #692e04;
line-height: 30rpx;
margin-bottom: 20rpx;
}
.log-btn { .user-name {
width: 84rpx; font-size: 32rpx;
height: 42rpx; font-weight: bold;
border: 2rpx solid rgba(#ffffff, 0.33); color: #692e04;
border-radius: 21rpx; line-height: 30rpx;
font-size: 22rpx; margin-bottom: 20rpx;
font-weight: 400; }
color: #ffffff;
margin-bottom: 20rpx;
}
.look-btn { .log-btn {
color: #fff; width: 84rpx;
width: 40rpx; height: 42rpx;
height: 40rpx; border: 2rpx solid rgba(#ffffff, 0.33);
} border-radius: 21rpx;
} font-size: 22rpx;
font-weight: 400;
color: #ffffff;
margin-bottom: 20rpx;
}
.user-info-box { .look-btn {
.tag-box { color: #fff;
background: #ff6000; width: 40rpx;
border-radius: 18rpx; height: 40rpx;
line-height: 36rpx; }
}
.tag-img { .user-info-box {
width: 36rpx; .tag-box {
height: 36rpx; background: #ff6000;
border-radius: 50%; border-radius: 18rpx;
margin-left: -2rpx; line-height: 36rpx;
}
.tag-title { .tag-img {
font-size: 24rpx; width: 36rpx;
padding: 0 10rpx; height: 36rpx;
font-weight: 500; border-radius: 50%;
line-height: 36rpx; margin-left: -2rpx;
color: #fff; }
}
} .tag-title {
} font-size: 24rpx;
} padding: 0 10rpx;
</style> font-weight: 500;
line-height: 36rpx;
color: #fff;
}
}
}
}
</style>

230
pages/commission/goods.vue
View File

@ -1,137 +1,123 @@
<!-- 页面 --> <!-- 页面 -->
<template> <template>
<s-layout title="推广商品" :onShareAppMessage="state.shareInfo"> <s-layout title="推广商品" :onShareAppMessage="state.shareInfo">
<view class="goods-item ss-m-20" v-for="item in state.pagination.data" :key="item.id"> <view class="goods-item ss-m-20" v-for="item in state.pagination.data" :key="item.id">
<s-goods-item <s-goods-item size="lg" :img="item.picUrl" :title="item.name" :subTitle="item.subtitle" :price="item.price"
size="lg" :originPrice="item.original_price" priceColor="#333"
:img="item.image" @tap="sheep.$router.go('/pages/goods/index', { id: item.id })">
:title="item.title" <template #rightBottom>
:subTitle="item.subtitle" <view class="ss-flex ss-row-between">
:price="item.price[0]" <view class="commission-num">预计佣金：￥{{ item.commission }}</view>
:originPrice="item.original_price" <button class="ss-reset-button share-btn ui-BG-Main-Gradient" @tap.stop="onShareGoods(item)">
priceColor="#333" 分享赚
@tap="sheep.$router.go('/pages/goods/index', { id: item.id })" </button>
> </view>
<template #rightBottom> </template>
<view class="ss-flex ss-row-between"> </s-goods-item>
<view class="commission-num">预计佣金：￥{{ item.commission }}</view> </view>
<button <s-empty v-if="state.pagination.total === 0" icon="/static/goods-empty.png" text="暂无推广商品"></s-empty>
class="ss-reset-button share-btn ui-BG-Main-Gradient" <!-- 加载更多 -->
@tap.stop="onShareGoods(item)" <uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
>
分享赚
</button>
</view>
</template>
</s-goods-item>
</view>
<s-empty
v-if="state.pagination.total === 0"
icon="/static/goods-empty.png"
text="暂无推广商品"
></s-empty>
<!-- 加载更多 -->
<uni-load-more
v-if="state.pagination.total > 0"
:status="state.loadStatus"
:content-text="{
contentdown: '上拉加载更多', contentdown: '上拉加载更多',
}" }" @tap="loadmore" />
@tap="loadmore" </s-layout>
/>
</s-layout>
</template> </template>
<script setup> <script setup>
import sheep from '@/sheep'; import sheep from '@/sheep';
import $share from '@/sheep/platform/share'; import $share from '@/sheep/platform/share';
import { onLoad, onReachBottom } from '@dcloudio/uni-app'; import {
import { computed, reactive } from 'vue'; onLoad,
import _ from 'lodash'; onReachBottom
import { showShareModal } from '@/sheep/hooks/useModal'; } from '@dcloudio/uni-app';
import {
computed,
reactive
} from 'vue';
import _ from 'lodash';
import {
showShareModal
} from '@/sheep/hooks/useModal';
const state = reactive({ const state = reactive({
pagination: { pagination: {
data: [], data: [],
current_page: 1, current_page: 1,
total: 1, total: 1,
last_page: 1, last_page: 1,
}, },
loadStatus: '', loadStatus: '',
shareInfo: {}, shareInfo: {},
}); });
function onShareGoods(goodsInfo) { function onShareGoods(goodsInfo) {
state.shareInfo = $share.getShareInfo( state.shareInfo = $share.getShareInfo({
{ title: goodsInfo.title,
title: goodsInfo.title, image: sheep.$url.cdn(goodsInfo.image),
image: sheep.$url.cdn(goodsInfo.image), desc: goodsInfo.subtitle,
desc: goodsInfo.subtitle, params: {
params: { page: '2',
page: '2', query: goodsInfo.id,
query: goodsInfo.id, },
}, }, {
}, type: 'goods', // 商品海报
{ title: goodsInfo.title, // 商品标题
type: 'goods', // 商品海报 image: sheep.$url.cdn(goodsInfo.image), // 商品主图
title: goodsInfo.title, // 商品标题 price: goodsInfo.price[0], // 商品价格
image: sheep.$url.cdn(goodsInfo.image), // 商品主图 original_price: goodsInfo.original_price, // 商品原价
price: goodsInfo.price[0], // 商品价格 }, );
original_price: goodsInfo.original_price, // 商品原价 showShareModal();
}, }
); async function getGoodsList(page = 1, list_rows = 8) {
showShareModal(); state.pagination.current_page = page;
} state.loadStatus = 'loading';
let res = await sheep.$api.commission.goods({
pageSize: list_rows,
pageNo: page,
});
if (res.code === 0) {
let orderList = _.concat(state.pagination.data, res.data.list);
state.pagination = {
...res.data,
data: orderList,
};
if (state.pagination.data.length < state.pagination.total) {
state.loadStatus = 'more';
} else {
state.loadStatus = 'noMore';
}
}
}
async function getGoodsList(page = 1, list_rows = 8) { onLoad(async () => {
state.loadStatus = 'loading'; getGoodsList();
let res = await sheep.$api.commission.goods({ });
list_rows,
page,
});
if (res.error === 0) {
let orderList = _.concat(state.pagination.data, res.data.data);
state.pagination = {
...res.data,
data: orderList,
};
if (state.pagination.current_page < state.pagination.last_page) {
state.loadStatus = 'more';
} else {
state.loadStatus = 'noMore';
}
}
}
onLoad(async () => { // 加载更多
getGoodsList(); function loadmore() {
}); if (state.loadStatus !== 'noMore') {
getGoodsList(state.pagination.current_page + 1);
}
}
// 加载更多 // 上拉加载更多
function loadmore() { onReachBottom(() => {
if (state.loadStatus !== 'noMore') { loadmore();
getGoodsList(state.pagination.current_page + 1); });
}
}
// 上拉加载更多
onReachBottom(() => {
loadmore();
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.goods-item { .goods-item {
.commission-num { .commission-num {
font-size: 24rpx; font-size: 24rpx;
font-weight: 500; font-weight: 500;
color: $red; color: $red;
} }
.share-btn { .share-btn {
width: 120rpx; width: 120rpx;
height: 50rpx; height: 50rpx;
border-radius: 25rpx; border-radius: 25rpx;
} }
} }
</style> </style>

738
pages/commission/order.vue
View File

@ -1,417 +1,411 @@
<!-- 分销订单 --> <!-- 分销订单 -->
<template> <template>
<s-layout title="分销订单" :class="state.scrollTop ? 'order-warp' : ''" navbar="inner"> <s-layout title="分销订单" :class="state.scrollTop ? 'order-warp' : ''" navbar="inner">
<view <view class="header-box" :style="[
class="header-box"
:style="[
{ {
marginTop: '-' + Number(statusBarHeight + 88) + 'rpx', marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
paddingTop: Number(statusBarHeight + 108) + 'rpx', paddingTop: Number(statusBarHeight + 108) + 'rpx',
}, },
]" ]">
> <!-- 团队数据总览 -->
<!-- 团队数据总览 --> <view class="team-data-box ss-flex ss-col-center ss-row-between">
<view class="team-data-box ss-flex ss-col-center ss-row-between"> <view class="data-card">
<view class="data-card"> <view class="total-item">
<view class="total-item"> <view class="item-title">团队订单数量（单）</view>
<view class="item-title">团队订单数量（单）</view> <view class="total-num">
<view class="total-num"> {{ state.agentInfo.child_order_count_all || 0 }}
{{ state.agentInfo.child_order_count_all || 0 }} </view>
</view> </view>
</view> <view class="category-item ss-flex">
<view class="category-item ss-flex"> <view class="ss-flex-1">
<view class="ss-flex-1"> <view class="item-title">一级订单</view>
<view class="item-title">一级订单</view> <view class="category-num">
<view class="category-num"> {{ state.agentInfo.child_order_count_1 || 0 }}
{{ state.agentInfo.child_order_count_1 || 0 }} </view>
</view> </view>
</view> <view class="ss-flex-1">
<view class="ss-flex-1"> <view class="item-title">二级订单</view>
<view class="item-title">二级订单</view> <view class="category-num">
<view class="category-num"> {{ state.agentInfo.child_order_count_2 || 0 }}
{{ state.agentInfo.child_order_count_2 || 0 }} </view>
</view> </view>
</view> </view>
</view> </view>
</view> <view class="data-card">
<view class="data-card"> <view class="total-item">
<view class="total-item"> <view class="item-title">团队订单金额（元）</view>
<view class="item-title">团队订单金额（元）</view> <view class="total-num">
<view class="total-num"> {{ state.agentInfo.child_order_money_all || '0.00' }}
{{ state.agentInfo.child_order_money_all || '0.00' }} </view>
</view> </view>
</view> <view class="category-item ss-flex">
<view class="category-item ss-flex"> <view class="ss-flex-1">
<view class="ss-flex-1"> <view class="item-title">一级订单</view>
<view class="item-title">一级订单</view> <view class="category-num">
<view class="category-num"> {{ state.agentInfo.child_order_money_1 || '0.00' }}
{{ state.agentInfo.child_order_money_1 || '0.00' }} </view>
</view> </view>
</view> <view class="ss-flex-1">
<view class="ss-flex-1"> <view class="item-title">二级订单</view>
<view class="item-title">二级订单</view> <view class="category-num">
<view class="category-num"> {{ state.agentInfo.child_order_money_2 || '0.00' }}
{{ state.agentInfo.child_order_money_2 || '0.00' }} </view>
</view> </view>
</view> </view>
</view> </view>
</view> </view>
</view> <!-- 自购 -->
<!-- 自购 --> <view class="direct-box ss-flex ss-row-between">
<view class="direct-box ss-flex ss-row-between"> <view class="direct-item">
<view class="direct-item"> <view class="item-title">自购分销订单数量（单）</view>
<view class="item-title">自购分销订单数量（单）</view> <view class="item-value">
<view class="item-value"> {{ state.agentInfo.child_order_count_0 || 0 }}
{{ state.agentInfo.child_order_count_0 || 0 }} </view>
</view> </view>
</view> <view class="direct-item">
<view class="direct-item"> <view class="item-title">自购分销订单金额（元）</view>
<view class="item-title">自购分销订单金额（元）</view> <view class="item-value">
<view class="item-value"> {{ state.agentInfo.child_order_money_0 || '0.00' }}
{{ state.agentInfo.child_order_money_0 || '0.00' }} </view>
</view> </view>
</view> </view>
</view> </view>
</view>
<!-- tab --> <!-- tab -->
<su-sticky bgColor="#fff"> <su-sticky bgColor="#fff">
<su-tabs <su-tabs :list="tabMaps" :scrollable="false" :current="state.currentTab" @change="onTabsChange">
:list="tabMaps" </su-tabs>
:scrollable="false" </su-sticky>
:current="state.currentTab"
@change="onTabsChange"
>
</su-tabs>
</su-sticky>
<!-- 订单 --> <!-- 订单 -->
<view class="order-box"> <view class="order-box">
<view class="order-item" v-for="item in state.pagination.data" :key="item"> <view class="order-item" v-for="item in state.pagination.data" :key="item">
<view class="order-header"> <view class="order-header">
<view class="no-box ss-flex ss-col-center ss-row-between"> <view class="no-box ss-flex ss-col-center ss-row-between">
<text class="order-code">订单编号：{{ item.order.order_sn }}</text> <text class="order-code">订单编号：{{ item.order.order_sn }}</text>
<text class="order-state">{{ item.order_item.status_text }}</text> <text class="order-state">{{ item.order_item.status_text }}</text>
</view> </view>
<view class="order-from ss-flex ss-col-center ss-row-between"> <view class="order-from ss-flex ss-col-center ss-row-between">
<view class="from-user ss-flex ss-col-center"> <view class="from-user ss-flex ss-col-center">
<text>下单人：</text> <text>下单人：</text>
<image class="user-avatar" :src="sheep.$url.cdn(item.buyer.avatar)" mode="aspectFill"> <image class="user-avatar" :src="sheep.$url.cdn(item.buyer.avatar)" mode="aspectFill">
</image> </image>
<text class="user-name">{{ item.buyer.nickname }}</text> <text class="user-name">{{ item.buyer.nickname }}</text>
</view> </view>
<view class="order-time">{{ item.create_time }}</view> <view class="order-time">{{ item.create_time }}</view>
</view> </view>
</view> </view>
<s-goods-item <s-goods-item class="border-bottom" :img="item.order_item.goods_image"
class="border-bottom" :title="item.order_item.goods_title" :skuText="item.order_item.goods_sku_text"
:img="item.order_item.goods_image" :price="item.order_item.goods_price" :num="item.order_item.goods_num">
:title="item.order_item.goods_title" <template #rightBottom>
:skuText="item.order_item.goods_sku_text" <view class="ss-flex commission-box ss-row-between ss-m-t-10">
:price="item.order_item.goods_price" <view class="ss-flex">
:num="item.order_item.goods_num" <text class="name">佣金：</text>
> <text class="commission-num">{{ item.rewards[0]?.commission }}</text>
<template #rightBottom> </view>
<view class="ss-flex commission-box ss-row-between ss-m-t-10"> <view class="order-status">
<view class="ss-flex"> {{ item.commission_order_status_text }}
<text class="name">佣金：</text> </view>
<text class="commission-num">{{ item.rewards[0]?.commission }}</text> </view>
</view> </template>
<view class="order-status"> </s-goods-item>
{{ item.commission_order_status_text }} </view>
</view> <!-- 数据为空 -->
</view> <s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单">
</template> </s-empty>
</s-goods-item> <!-- 加载更多 -->
</view> <uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
<!-- 数据为空 -->
<s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单">
</s-empty>
<!-- 加载更多 -->
<uni-load-more
v-if="state.pagination.total > 0"
:status="state.loadStatus"
:content-text="{
contentdown: '上拉加载更多', contentdown: '上拉加载更多',
}" }" @tap="loadmore" />
@tap="loadmore" </view>
/> <!-- </view> -->
</view> </s-layout>
<!-- </view> -->
</s-layout>
</template> </template>
<script setup> <script setup>
import sheep from '@/sheep'; import sheep from '@/sheep';
import { onLoad, onReachBottom } from '@dcloudio/uni-app'; import {
import { computed, reactive } from 'vue'; onLoad,
import _ from 'lodash'; onReachBottom
import { onPageScroll } from '@dcloudio/uni-app'; } from '@dcloudio/uni-app';
import {
computed,
reactive
} from 'vue';
import _ from 'lodash';
import {
onPageScroll
} from '@dcloudio/uni-app';
const statusBarHeight = sheep.$platform.device.statusBarHeight * 2; const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png'); const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
onPageScroll((e) => { onPageScroll((e) => {
if (e.scrollTop > 100) { if (e.scrollTop > 100) {
state.scrollTop = false; state.scrollTop = false;
} else { } else {
state.scrollTop = true; state.scrollTop = true;
} }
}); });
const state = reactive({ const state = reactive({
pagination: { pagination: {
data: [], data: [],
current_page: 1, current_page: 1,
total: 1, total: 1,
last_page: 1, last_page: 1,
}, },
loadStatus: '', loadStatus: '',
currentTab: 0, currentTab: 0,
agentInfo: {}, agentInfo: {},
scrollTop: false, scrollTop: false,
}); });
const tabMaps = [ const tabMaps = [{
{ name: '全部',
name: '全部', value: 'all',
value: 'all', },
}, // {
// { // name: '不计入',
// name: '不计入', // value: 'no'
// value: 'no' // },
// }, {
{ name: '已计入',
name: '已计入', value: 'yes',
value: 'yes', },
}, {
{ name: '已扣除',
name: '已扣除', value: 'back',
value: 'back', },
}, {
{ name: '已取消',
name: '已取消', value: 'cancel',
value: 'cancel', },
}, ];
]; // 切换选项卡
// 切换选项卡 function onTabsChange(e) {
function onTabsChange(e) { state.pagination = {
state.pagination = { data: [],
data: [], current_page: 1,
current_page: 1, total: 1,
total: 1, last_page: 1,
last_page: 1, };
}; state.currentTab = e.index;
state.currentTab = e.index; getOrderList();
getOrderList(); }
}
// 获取订单列表 // 获取订单列表
async function getOrderList(page = 1, list_rows = 5) { async function getOrderList(page = 1, list_rows = 5) {
state.loadStatus = 'loading'; state.loadStatus = 'loading';
let res = await sheep.$api.commission.order({ let res = await sheep.$api.commission.order({
type: tabMaps[state.currentTab].value, type: tabMaps[state.currentTab].value,
list_rows, list_rows,
page, page,
}); });
if (res.error === 0) { if (res.error === 0) {
let orderList = _.concat(state.pagination.data, res.data.data); let orderList = _.concat(state.pagination.data, res.data.data);
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 {
state.loadStatus = 'noMore'; state.loadStatus = 'noMore';
} }
} }
} }
async function getAgentInfo() { async function getAgentInfo() {
const { error, data, msg } = await sheep.$api.commission.agent(); const {
if (error === 0) { error,
state.agentInfo = data; data,
} msg
} } = await sheep.$api.commission.agent();
if (error === 0) {
state.agentInfo = data;
}
}
onLoad(() => { onLoad(() => {
getAgentInfo(); getAgentInfo();
getOrderList(); getOrderList();
}); });
// 加载更多 // 加载更多
function loadmore() { function loadmore() {
if (state.loadStatus !== 'noMore') { if (state.loadStatus !== 'noMore') {
getOrderList(state.pagination.current_page + 1); getOrderList(state.pagination.current_page + 1);
} }
} }
// 上拉加载更多 // 上拉加载更多
onReachBottom(() => { onReachBottom(() => {
loadmore(); loadmore();
}); });
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.header-box { .header-box {
box-sizing: border-box; box-sizing: border-box;
padding: 0 20rpx 20rpx 20rpx; padding: 0 20rpx 20rpx 20rpx;
width: 750rpx; width: 750rpx;
background: v-bind(headerBg) no-repeat, background: v-bind(headerBg) no-repeat,
linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient)); linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
background-size: 750rpx 100%; background-size: 750rpx 100%;
// 团队信息总览
.team-data-box {
.data-card {
width: 305rpx;
background: #ffffff;
border-radius: 20rpx;
padding: 20rpx;
.total-item { // 团队信息总览
margin-bottom: 30rpx; .team-data-box {
.data-card {
width: 305rpx;
background: #ffffff;
border-radius: 20rpx;
padding: 20rpx;
.item-title { .total-item {
font-size: 24rpx; margin-bottom: 30rpx;
font-weight: 500;
color: #999999;
line-height: normal;
margin-bottom: 20rpx;
}
.total-num { .item-title {
font-size: 38rpx; font-size: 24rpx;
font-weight: 500; font-weight: 500;
color: #333333; color: #999999;
font-family: OPPOSANS; line-height: normal;
} margin-bottom: 20rpx;
} }
.category-num { .total-num {
font-size: 26rpx; font-size: 38rpx;
font-weight: 500; font-weight: 500;
color: #333333; color: #333333;
font-family: OPPOSANS; font-family: OPPOSANS;
} }
} }
}
// 直推 .category-num {
.direct-box { font-size: 26rpx;
margin-top: 20rpx; font-weight: 500;
color: #333333;
font-family: OPPOSANS;
}
}
}
.direct-item { // 直推
width: 340rpx; .direct-box {
background: #ffffff; margin-top: 20rpx;
border-radius: 20rpx;
padding: 20rpx;
box-sizing: border-box;
.item-title { .direct-item {
font-size: 22rpx; width: 340rpx;
font-weight: 500; background: #ffffff;
color: #999999; border-radius: 20rpx;
margin-bottom: 6rpx; padding: 20rpx;
} box-sizing: border-box;
.item-value { .item-title {
font-size: 38rpx; font-size: 22rpx;
font-weight: 500; font-weight: 500;
color: #333333; color: #999999;
font-family: OPPOSANS; margin-bottom: 6rpx;
} }
}
}
}
// 订单 .item-value {
.order-box { font-size: 38rpx;
.order-item { font-weight: 500;
background: #ffffff; color: #333333;
border-radius: 10rpx; font-family: OPPOSANS;
margin: 20rpx; }
}
}
}
.order-footer { // 订单
padding: 20rpx; .order-box {
font-size: 24rpx; .order-item {
color: #999; background: #ffffff;
} border-radius: 10rpx;
margin: 20rpx;
.order-header { .order-footer {
.no-box { padding: 20rpx;
padding: 20rpx; font-size: 24rpx;
color: #999;
}
.order-code { .order-header {
font-size: 26rpx; .no-box {
font-weight: 500; padding: 20rpx;
color: #333333;
}
.order-state { .order-code {
font-size: 26rpx; font-size: 26rpx;
font-weight: 500; font-weight: 500;
color: var(--ui-BG-Main); color: #333333;
} }
}
.order-from { .order-state {
padding: 20rpx; font-size: 26rpx;
font-weight: 500;
color: var(--ui-BG-Main);
}
}
.from-user { .order-from {
font-size: 24rpx; padding: 20rpx;
font-weight: 400;
color: #666666;
.user-avatar { .from-user {
width: 26rpx; font-size: 24rpx;
height: 26rpx; font-weight: 400;
border-radius: 50%; color: #666666;
margin-right: 8rpx;
}
.user-name { .user-avatar {
font-size: 24rpx; width: 26rpx;
font-weight: 400; height: 26rpx;
color: #999999; border-radius: 50%;
} margin-right: 8rpx;
} }
.order-time { .user-name {
font-size: 24rpx; font-size: 24rpx;
font-weight: 400; font-weight: 400;
color: #999999; color: #999999;
} }
} }
}
.commission-box { .order-time {
.name { font-size: 24rpx;
font-size: 24rpx; font-weight: 400;
font-weight: 400; color: #999999;
color: #999999; }
} }
} }
.commission-num { .commission-box {
font-size: 30rpx; .name {
font-weight: 500; font-size: 24rpx;
color: $red; font-weight: 400;
font-family: OPPOSANS; color: #999999;
}
}
&::before { .commission-num {
content: '￥'; font-size: 30rpx;
font-size: 22rpx; font-weight: 500;
} color: $red;
} font-family: OPPOSANS;
.order-status { &::before {
line-height: 30rpx; content: '￥';
padding: 0 10rpx; font-size: 22rpx;
border-radius: 30rpx; }
margin-left: 20rpx; }
font-size: 24rpx;
color: var(--ui-BG-Main); .order-status {
} line-height: 30rpx;
} padding: 0 10rpx;
} border-radius: 30rpx;
</style> margin-left: 20rpx;
font-size: 24rpx;
color: var(--ui-BG-Main);
}
}
}
</style>

2
pages/index/index.vue
View File

@ -1,3 +1,4 @@
<!-- 首页，支持店铺装修 -->
<template> <template>
<view v-if="template"> <view v-if="template">
<s-layout title="首页" navbar="custom" tabbar="/pages/index/index" :bgStyle="template.page" <s-layout title="首页" navbar="custom" tabbar="/pages/index/index" :bgStyle="template.page"
@ -20,7 +21,6 @@
} from '@dcloudio/uni-app'; } from '@dcloudio/uni-app';
import sheep from '@/sheep'; import sheep from '@/sheep';
import $share from '@/sheep/platform/share'; import $share from '@/sheep/platform/share';
import index2Api from '@/sheep/api/index2';
// 隐藏原生tabBar // 隐藏原生tabBar
uni.hideTabBar(); uni.hideTabBar();

2
pages/index/page.vue
View File

@ -1,3 +1,4 @@
<!-- 自定义页面：支持装修 -->
<template> <template>
<s-layout <s-layout
:title="page.name" :title="page.name"
@ -38,6 +39,7 @@
} }
// #endif // #endif
// TODO @疯狂：貌似这里还没接上哈
const { error, data } = await sheep.$api.app.page(id); const { error, data } = await sheep.$api.app.page(id);
if (error === 0) { if (error === 0) {
page.name = data.name; page.name = data.name;

1
pages/index/user.vue
View File

@ -1,3 +1,4 @@
<!-- 个人中心：支持装修 -->
<template> <template>
<s-layout <s-layout
title="我的" title="我的"

2
pages/pay/recharge.vue
View File

@ -85,7 +85,7 @@
// #endif // #endif
sheep.$router.go('/pages/pay/index', { sheep.$router.go('/pages/pay/index', {
id: data.payOrderId, id: data.payOrderId,
type: 'recharge' orderType: 'recharge'
}); });
} }

9
pages/user/wallet/score.vue
View File

@ -8,12 +8,11 @@
}, },
]"> ]">
<view class="header-bg"> <view class="header-bg">
<view class="bg"></view> <view class="bg" />
</view> </view>
<view class="score-box ss-flex-col ss-row-center ss-col-center"> <view class="score-box ss-flex-col ss-row-center ss-col-center">
<view class="ss-m-b-30"> <view class="ss-m-b-30">
<text class="all-title ss-m-r-8">当前积分</text> <text class="all-title ss-m-r-8">当前积分</text>
<!-- <text class="cicon-help-o"></text> -->
</view> </view>
<text class="all-num">{{ userInfo.point || 0 }}</text> <text class="all-num">{{ userInfo.point || 0 }}</text>
</view> </view>
@ -100,7 +99,6 @@
name: '全部', name: '全部',
value: 'all', value: 'all',
}, },
// { // {
// name: '收入', // name: '收入',
// value: 'income', // value: 'income',
@ -147,6 +145,7 @@
// } // }
} }
} }
onLoad(async (options) => { onLoad(async (options) => {
state.today = dayjs().format('YYYY-MM-DD'); state.today = dayjs().format('YYYY-MM-DD');
state.date = [state.today, state.today]; state.date = [state.today, state.today];
@ -166,10 +165,6 @@
getLogList(); getLogList();
} }
function appendTimeHMS(arr) {
return [arr[0] + ' 00:00:00', arr[1] + ' 23:59:59'];
}
function onLoadMore() { function onLoadMore() {
// if (state.loadStatus !== 'noMore') { // if (state.loadStatus !== 'noMore') {
getLogList(pagination.current_page + 1); getLogList(pagination.current_page + 1);

13
sheep/api/app.js
View File

@ -13,19 +13,6 @@ export default {
showLoading: false, showLoading: false,
}, },
}), }),
// 同步客户端页面到后端
pageSync: (pages) =>
request({
url: 'pageSync',
method: 'POST',
data: {
pages,
},
custom: {
showError: false,
showLoading: false,
},
}),
// 自定义页面 // 自定义页面
page: (id) => page: (id) =>
request({ request({

130
sheep/api/commission.js
View File

@ -1,65 +1,71 @@
import request from '@/sheep/request'; import request from '@/sheep/request';
export default { export default {
// 分销商详情 // 分销商详情
agent: () => agent: () =>
request({ request({
url: 'commission/agent', url: 'commission/agent',
method: 'GET', method: 'GET',
custom: { custom: {
showLoading: false, showLoading: false,
showError: false, showError: false,
}, },
}), }),
// 分销表单 // 分销表单
form: () => form: () =>
request({ request({
url: 'commission/agent/form', url: 'commission/agent/form',
method: 'GET', method: 'GET',
}), }),
// 申请分销商 // 申请分销商
apply: (data) => apply: (data) =>
request({ request({
url: 'commission/agent/apply', url: 'commission/agent/apply',
method: 'POST', method: 'POST',
data, data,
custom: { custom: {
showSuccess: true, showSuccess: true,
}, },
}), }),
// 分销动态 // 分销动态
log: (params) => log: (params) =>
request({ request({
url: 'commission/log', url: 'commission/log',
method: 'GET', method: 'GET',
params, params,
}), }),
// 分销订单 // 分销订单
order: (params) => order: (params) =>
request({ request({
url: 'commission/order', url: 'commission/order',
method: 'GET', method: 'GET',
params, params,
}), }),
// 分销商品
goods: (params) => // 分销商品
request({ goods: (params) =>
url: 'commission/goods', request({
method: 'GET', url: '/app-api/product/spu/page',
params, method: 'GET',
}), params,
// 我的团队 }),
team: (params) => // 我的团队
request({ team: (params) =>
url: 'commission/agent/team', request({
method: 'GET', url: 'commission/agent/team',
params, method: 'GET',
}), params,
// 佣金转余额 }),
transfer: (data) => // 佣金转余额
request({ transfer: (data) =>
url: 'commission/agent/transfer', request({
method: 'POST', url: 'commission/agent/transfer',
data, method: 'POST',
}), data,
}; }),
getSummary: (data) =>
request({
url: '/app-api/trade/brokerage-user/get-summary',
method: 'GET',
}),
};

14
sheep/api/member/auth.js
View File

@ -37,6 +37,20 @@ const AuthUtil = {
method: 'POST', method: 'POST',
}); });
}, },
// 创建微信 JS SDK 初始化所需的签名
createWeixinMpJsapiSignature: (url) => {
return request({
url: '/app-api/member/auth/create-weixin-jsapi-signature',
method: 'POST',
params: {
url
},
custom: {
showError: false,
showLoading: false,
},
})
},
}; };
export default AuthUtil; export default AuthUtil;

12
sheep/api/third.js
View File

@ -75,18 +75,6 @@ export default {
}, },
}), }),
// 网页jssdk
jssdk: (data) =>
request({
url: 'third/wechat/jssdk',
method: 'GET',
data,
custom: {
showError: false,
showLoading: false,
},
}),
// 小程序订阅消息 // 小程序订阅消息
subscribeTemplate: (params) => subscribeTemplate: (params) =>
request({ request({

2
sheep/components/s-auth-modal/s-auth-modal.vue
View File

@ -51,7 +51,7 @@
<image <image
class="auto-login-img" class="auto-login-img"
:src="sheep.$url.static('/static/img/shop/platform/wechat.png')" :src="sheep.$url.static('/static/img/shop/platform/wechat.png')"
></image> />
</button> </button>
<!-- iOS登录 --> <!-- iOS登录 -->

1
sheep/components/s-block/s-block.vue
View File

@ -1,3 +1,4 @@
<!-- 装修组件容器 -->
<template> <template>
<view :style="[elStyles, elBackground]"><slot /></view> <view :style="[elStyles, elBackground]"><slot /></view>
</template> </template>

2
sheep/components/s-coupon-block/s-coupon-block.vue
View File

@ -1,4 +1,4 @@
<!-- 优惠券组 --> <!-- 装修营销组件：优惠券 -->
<template> <template>
<scroll-view class="scroll-box" scroll-x scroll-anchoring> <scroll-view class="scroll-box" scroll-x scroll-anchoring>
<view class="coupon-box ss-flex"> <view class="coupon-box ss-flex">

15
sheep/components/s-coupon-card/s-coupon-card.vue
View File

@ -1,3 +1,4 @@
<!-- 装修用户组件：用户卡券 -->
<template> <template>
<view class="ss-coupon-menu-wrap ss-flex ss-col-center"> <view class="ss-coupon-menu-wrap ss-flex ss-col-center">
<view class="menu-item ss-flex-col ss-row-center ss-col-center" v-for="item in props.list" :key="item.title" <view class="menu-item ss-flex-col ss-row-center ss-col-center" v-for="item in props.list" :key="item.title"
@ -41,13 +42,13 @@
path: '/pages/coupon/list', path: '/pages/coupon/list',
type: 'expired', type: 'expired',
}, },
// { {
// title: '领券中心', title: '领券中心',
// value: '0', value: '0',
// icon: '/static/img/shop/order/all_coupon.png', icon: '/static/img/shop/order/all_coupon.png',
// path: '/pages/coupon/list', path: '/pages/coupon/list',
// type: 'all', type: 'all',
// }, },
]; ];
}, },
}, },

1
sheep/components/s-custom-navbar/s-custom-navbar.vue
View File

@ -1,3 +1,4 @@
<!-- 顶部导航栏 -->
<template> <template>
<navbar <navbar
:alway="isAlway" :alway="isAlway"

1
sheep/components/s-float-menu/s-float-menu.vue
View File

@ -1,3 +1,4 @@
<!-- 装修基础组件：悬浮按钮 -->
<template> <template>
<!-- 模态背景：展开时显示，点击后折叠 --> <!-- 模态背景：展开时显示，点击后折叠 -->
<view class="modal-bg" v-if="fabRef?.isShow" @click="handleCollapseFab"></view> <view class="modal-bg" v-if="fabRef?.isShow" @click="handleCollapseFab"></view>

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

@ -1,3 +1,4 @@
<!-- 装修商品组件：商品卡片 -->
<template> <template>
<!-- 商品卡片 --> <!-- 商品卡片 -->
<view> <view>

7
sheep/components/s-goods-shelves/s-goods-shelves.vue
View File

@ -1,3 +1,4 @@
<!-- 装修商品组件：商品栏 -->
<template> <template>
<view> <view>
<!-- 布局1. 两列商品，图片左文案右 --> <!-- 布局1. 两列商品，图片左文案右 -->
@ -27,7 +28,7 @@
:bottomRadius="data.borderRadiusBottom" :bottomRadius="data.borderRadiusBottom"
:titleWidth="(454 - marginRight * 2 - data.space * 2 - marginLeft * 2) / 2" :titleWidth="(454 - marginRight * 2 - data.space * 2 - marginLeft * 2) / 2"
@click="sheep.$router.go('/pages/goods/index', { id: item.id })" @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
></s-goods-column> />
</view> </view>
</view> </view>
<!-- 布局. 三列商品：图片上文案下 --> <!-- 布局. 三列商品：图片上文案下 -->
@ -56,7 +57,7 @@
:topRadius="data.borderRadiusTop" :topRadius="data.borderRadiusTop"
:bottomRadius="data.borderRadiusBottom" :bottomRadius="data.borderRadiusBottom"
@click="sheep.$router.go('/pages/goods/index', { id: item.id })" @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
></s-goods-column> />
</view> </view>
</view> </view>
@ -79,7 +80,7 @@
:titleColor="data.fields.name?.color" :titleColor="data.fields.name?.color"
:titleWidth="(750 - marginRight * 2 - data.space * 4 - marginLeft * 2) / 3" :titleWidth="(750 - marginRight * 2 - data.space * 4 - marginLeft * 2) / 3"
@click="sheep.$router.go('/pages/goods/index', { id: item.id })" @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
></s-goods-column> />
</view> </view>
</view> </view>
</scroll-view> </scroll-view>

1
sheep/components/s-hotzone-block/s-hotzone-block.vue
View File

@ -1,3 +1,4 @@
<!-- 装修图文组件：热区 -->
<template> <template>
<view class="hotzone-wrap"> <view class="hotzone-wrap">
<image :src="sheep.$url.cdn(data.imgUrl)" style="width: 100%" mode="widthFix"></image> <image :src="sheep.$url.cdn(data.imgUrl)" style="width: 100%" mode="widthFix"></image>

1
sheep/components/s-image-banner/s-image-banner.vue
View File

@ -1,3 +1,4 @@
<!-- 装修图文组件：图片轮播 -->
<template> <template>
<su-swiper <su-swiper
:list="imgList" :list="imgList"

3
sheep/components/s-image-block/s-image-block.vue
View File

@ -1,6 +1,7 @@
<!-- 装修图文组件：图片展示 -->
<template> <template>
<view @tap="sheep.$router.go(data?.url)"> <view @tap="sheep.$router.go(data?.url)">
<su-image :src="sheep.$url.cdn(data.imgUrl)" mode="widthFix"></su-image> <su-image :src="sheep.$url.cdn(data.imgUrl)" mode="widthFix" />
</view> </view>
</template> </template>

1
sheep/components/s-image-cube/s-image-cube.vue
View File

@ -1,3 +1,4 @@
<!-- 装修图文组件：广告魔方 -->
<template> <template>
<view class="ss-cube-wrap" :style="[parseAdWrap]"> <view class="ss-cube-wrap" :style="[parseAdWrap]">
<view v-for="(item, index) in data.list" :key="index"> <view v-for="(item, index) in data.list" :key="index">

1
sheep/components/s-line-block/s-line-block.vue
View File

@ -1,3 +1,4 @@
<!-- 装修基础组件：分割线 -->
<template> <template>
<su-subline v-bind="data"></su-subline> <su-subline v-bind="data"></su-subline>
</template> </template>

1
sheep/components/s-menu-button/s-menu-button.vue
View File

@ -1,3 +1,4 @@
<!-- 装修基础组件：菜单导航（金刚区） -->
<template> <template>
<!-- 包裹层 --> <!-- 包裹层 -->
<view <view

1
sheep/components/s-menu-grid/s-menu-grid.vue
View File

@ -1,3 +1,4 @@
<!-- 装修基础组件：宫格导航 -->
<template> <template>
<uni-grid :showBorder="Boolean(data.border)" :column="data.column"> <uni-grid :showBorder="Boolean(data.border)" :column="data.column">
<uni-grid-item <uni-grid-item

1
sheep/components/s-menu-list/s-menu-list.vue
View File

@ -1,3 +1,4 @@
<!-- 装修基础组件：列表导航 -->
<template> <template>
<view class="menu-list-wrap"> <view class="menu-list-wrap">
<uni-list :border="true"> <uni-list :border="true">

2
sheep/components/s-notice-block/s-notice-block.vue
View File

@ -11,7 +11,7 @@
:speed="50" :speed="50"
:color="data.textColor" :color="data.textColor"
@tap="sheep.$router.go(data.contents[0].url)" @tap="sheep.$router.go(data.contents[0].url)"
></su-notice-bar> />
</view> </view>
</template> </template>

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

@ -1,3 +1,4 @@
<!-- 装修用户组件：用户订单 -->
<template> <template>
<view class="ss-order-menu-wrap ss-flex ss-col-center"> <view class="ss-order-menu-wrap ss-flex ss-col-center">
<view <view

4
sheep/components/s-richtext-block/s-richtext-block.vue
View File

@ -1,3 +1,4 @@
<!-- 装修营销组件：营销文章 -->
<template> <template>
<view <view
:style="[ :style="[
@ -16,6 +17,7 @@
<script setup> <script setup>
import { reactive, onMounted } from 'vue'; import { reactive, onMounted } from 'vue';
import ArticleApi from '@/sheep/api/promotion/article'; import ArticleApi from '@/sheep/api/promotion/article';
const props = defineProps({ const props = defineProps({
data: { data: {
type: Object, type: Object,
@ -26,9 +28,11 @@
default() {}, default() {},
}, },
}); });
const state = reactive({ const state = reactive({
content: '', content: '',
}); });
onMounted(async () => { onMounted(async () => {
const { data } = await ArticleApi.getArticle(props.data.id); const { data } = await ArticleApi.getArticle(props.data.id);
state.content = data.content; state.content = data.content;

2
sheep/components/s-title-block/s-title-block.vue
View File

@ -1,4 +1,4 @@
<!-- 页面 --> <!-- 装修商品组件：标题栏 -->
<template> <template>
<view <view
class="ss-title-wrap ss-flex ss-col-center" class="ss-title-wrap ss-flex ss-col-center"

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

@ -1,4 +1,4 @@
<!-- 页面 --> <!-- 装修用户组件：用户卡片 -->
<template> <template>
<view class="ss-user-info-wrap ss-p-t-50"> <view class="ss-user-info-wrap ss-p-t-50">
<view class="ss-flex ss-col-center ss-row-between ss-m-b-20"> <view class="ss-flex ss-col-center ss-row-between ss-m-b-20">
@ -23,7 +23,7 @@
</view> </view>
</view> </view>
<!-- TODO @芋艿：用户接入 -->
<!-- 提示绑定手机号 先隐藏 yudao 需要再修改 --> <!-- 提示绑定手机号 先隐藏 yudao 需要再修改 -->
<!-- <view <!-- <view
class="bind-mobile-box ss-flex ss-row-between ss-col-center" class="bind-mobile-box ss-flex ss-row-between ss-col-center"

2
sheep/components/s-video-block/s-video-block.vue
View File

@ -1,4 +1,4 @@
<!-- --> <!-- 装修图文组件：视频播放 -->
<template> <template>
<su-video <su-video
class="sss" class="sss"

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

@ -1,3 +1,4 @@
<!-- 装修用户组件：用户资产 -->
<template> <template>
<!-- TODO @惠智造：代码合并有问题，可以看看 --> <!-- TODO @惠智造：代码合并有问题，可以看看 -->
<view class="ss-wallet-menu-wrap ss-flex ss-col-center"> <view class="ss-wallet-menu-wrap ss-flex ss-col-center">

3
sheep/index.js
View File

@ -46,8 +46,9 @@ function ShoproDebug() {
// }); // });
// #endif // #endif
// TODO 芋艿：可以打印路由
// 同步前端页面到后端 // 同步前端页面到后端
$api.app.pageSync(ROUTES); // console.log(ROUTES)
} }
export default sheep; export default sheep;

55
sheep/libs/sdk-h5-weixin.js
View File

@ -3,70 +3,67 @@
* 更多微信网页开发sdk方法,详见:https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html * 更多微信网页开发sdk方法,详见:https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html
*/ */
import jweixin from 'weixin-js-sdk'; import jweixin, { ready } from 'weixin-js-sdk';
import $helper from '@/sheep/helper'; import $helper from '@/sheep/helper';
import third from '@/sheep/api/third'; import third from '@/sheep/api/third';
import AuthUtil from '@/sheep/api/member/auth';
let configSuccess = false; let configSuccess = false;
export default { export default {
//判断是否在微信中 // 判断是否在微信中
isWechat() { isWechat() {
const ua = window.navigator.userAgent.toLowerCase(); const ua = window.navigator.userAgent.toLowerCase();
if (ua.match(/micromessenger/i) == 'micromessenger') { // noinspection EqualityComparisonWithCoercionJS
return true; return ua.match(/micromessenger/i) == 'micromessenger';
} else {
return false;
}
}, },
isReady(api) { isReady(api) {
jweixin.ready(api); jweixin.ready(api);
}, },
// 初始化JSSDK // 初始化 JSSDK
async init(callback) { async init(callback) {
if (!this.isWechat()) { if (!this.isWechat()) {
$helper.toast('请使用微信网页浏览器打开'); $helper.toast('请使用微信网页浏览器打开');
return; return;
} }
// 调用后端接口，获得 JSSDK 初始化所需的签名
const url = location.href.split('#')[0]; const url = location.href.split('#')[0];
const { code, data } = await AuthUtil.createWeixinMpJsapiSignature(url);
const { error, data } = await third.wechat.jssdk({ if (code === 0) {
platform: 'officialAccount',
payload: encodeURIComponent(
JSON.stringify({
url,
}),
),
});
if (error === 0) {
jweixin.config({ jweixin.config({
debug: false, debug: false,
appId: data.appId, appId: data.appId,
timestamp: data.timestamp, timestamp: data.timestamp,
nonceStr: data.nonceStr, nonceStr: data.nonceStr,
signature: data.signature, signature: data.signature,
jsApiList: data.jsApiList, jsApiList: ['chooseWXPay'], // TODO 芋艿：后续可以设置更多权限；
openTagList: data.openTagList, openTagList: data.openTagList
}); });
} }
// 监听结果
configSuccess = true; configSuccess = true;
jweixin.error((err) => { jweixin.error((err) => {
configSuccess = false; configSuccess = false;
console.error('微信 JSSDK 初始化失败', err);
// $helper.toast('微信JSSDK:' + err.errMsg); // $helper.toast('微信JSSDK:' + err.errMsg);
}); });
jweixin.ready(() => {
if (configSuccess) {
console.log('微信 JSSDK 初始化成功');
}
})
// 回调
if (callback) { if (callback) {
callback(data); callback(data);
} }
}, },
//在需要定位页面调用 //在需要定位页面调用 TODO 芋艿：未测试
getLocation(callback) { getLocation(callback) {
this.isReady(() => { this.isReady(() => {
jweixin.getLocation({ jweixin.getLocation({
@ -81,7 +78,7 @@ export default {
}); });
}, },
//获取微信收货地址 //获取微信收货地址 TODO 芋艿：未测试
openAddress(callback) { openAddress(callback) {
this.isReady(() => { this.isReady(() => {
jweixin.openAddress({ jweixin.openAddress({
@ -97,7 +94,7 @@ export default {
}); });
}, },
// 微信扫码 // 微信扫码 TODO 芋艿：未测试
scanQRCode(callback) { scanQRCode(callback) {
this.isReady(() => { this.isReady(() => {
jweixin.scanQRCode({ jweixin.scanQRCode({
@ -113,7 +110,7 @@ export default {
}); });
}, },
// 更新微信分享信息 // 更新微信分享信息 TODO 芋艿：未测试
updateShareInfo(data, callback = null) { updateShareInfo(data, callback = null) {
this.isReady(() => { this.isReady(() => {
const shareData = { const shareData = {
@ -137,7 +134,7 @@ export default {
}); });
}, },
// 打开坐标位置 // 打开坐标位置 TODO 芋艿：未测试
openLocation(data, callback) { openLocation(data, callback) {
this.isReady(() => { this.isReady(() => {
jweixin.openLocation({ jweixin.openLocation({
@ -148,7 +145,7 @@ export default {
}); });
}, },
// 选择图片 // 选择图片 TODO 芋艿：未测试
chooseImage(callback) { chooseImage(callback) {
this.isReady(() => { this.isReady(() => {
jweixin.chooseImage({ jweixin.chooseImage({
@ -162,7 +159,7 @@ export default {
}); });
}, },
//微信支付 //微信支付 TODO 芋艿：未测试
wxpay(data, callback) { wxpay(data, callback) {
this.isReady(() => { this.isReady(() => {
jweixin.chooseWXPay({ jweixin.chooseWXPay({

26
sheep/platform/pay.js
View File

@ -8,7 +8,7 @@ import PayOrderApi from '@/sheep/api/pay/order';
/** /**
* 支付 * 支付
* *
* @param {String} payment = ['wechat','alipay','wallet','offline'] - 支付方式 * @param {String} payment = ['wechat','alipay','wallet','mock'] - 支付方式
* @param {String} orderType = ['goods','recharge','groupon'] - 订单类型 * @param {String} orderType = ['goods','recharge','groupon'] - 订单类型
* @param {String} id - 订单号 * @param {String} id - 订单号
*/ */
@ -33,8 +33,8 @@ export default class SheepPay {
wallet: () => { wallet: () => {
this.walletPay(); this.walletPay();
}, },
offline: () => { mock: () => {
this.offlinePay(); this.mockPay();
} }
}, },
WechatMiniProgram: { WechatMiniProgram: {
@ -47,8 +47,8 @@ export default class SheepPay {
wallet: () => { wallet: () => {
this.walletPay(); this.walletPay();
}, },
offline: () => { mock: () => {
this.offlinePay(); this.mockPay();
} }
}, },
App: { App: {
@ -61,8 +61,8 @@ export default class SheepPay {
wallet: () => { wallet: () => {
this.walletPay(); this.walletPay();
}, },
offline: () => { mock: () => {
this.offlinePay(); this.mockPay();
} }
}, },
H5: { H5: {
@ -75,8 +75,8 @@ export default class SheepPay {
wallet: () => { wallet: () => {
this.walletPay(); this.walletPay();
}, },
offline: () => { mock: () => {
this.offlinePay(); this.mockPay();
} }
}, },
}; };
@ -182,10 +182,10 @@ export default class SheepPay {
code === 0 && this.payResult('success'); code === 0 && this.payResult('success');
} }
// 货到付款 TODO 芋艿：待接入 // 模拟支付
async offlinePay() { async mockPay() {
const { error } = await this.prepay(); const { code } = await this.prepay('mock');
error === 0 && this.payResult('success'); code === 0 && this.payResult('success');
} }
// 支付宝复制链接支付 TODO 芋艿：待接入 // 支付宝复制链接支付 TODO 芋艿：待接入

6
sheep/platform/provider/wechat/officialAccount.js
View File

@ -20,6 +20,7 @@ async function load() {
// 微信公众号登陆 // 微信公众号登陆
async function login(code = '') { async function login(code = '') {
// 获取登陆地址 // 获取登陆地址
debugger
if (!code) { if (!code) {
const loginResult = await getLoginUrl(); const loginResult = await getLoginUrl();
if (loginResult.error === 0 && loginResult.data.login_url) { if (loginResult.error === 0 && loginResult.data.login_url) {
@ -38,6 +39,7 @@ async function login(code = '') {
// 微信公众号绑定 // 微信公众号绑定
async function bind(code = '') { async function bind(code = '') {
debugger
// 获取绑定地址 // 获取绑定地址
if (code === '') { if (code === '') {
const loginResult = await getLoginUrl('bind'); const loginResult = await getLoginUrl('bind');
@ -57,6 +59,7 @@ async function bind(code = '') {
// 微信公众号解除绑定 // 微信公众号解除绑定
async function unbind() { async function unbind() {
debugger
const { error } = await third.wechat.unbind({ const { error } = await third.wechat.unbind({
platform: 'officialAccount', platform: 'officialAccount',
}); });
@ -65,6 +68,7 @@ async function unbind() {
// 获取公众号登陆地址 // 获取公众号登陆地址
function getLoginUrl(event = 'login') { function getLoginUrl(event = 'login') {
debugger
let page = getRootUrl() + 'pages/index/login'; let page = getRootUrl() + 'pages/index/login';
return third.wechat.oauthLogin({ return third.wechat.oauthLogin({
@ -80,6 +84,7 @@ function getLoginUrl(event = 'login') {
// 此处使用前端发送code在后端解密，防止用户在后端过长时间停留 // 此处使用前端发送code在后端解密，防止用户在后端过长时间停留
function loginByCode(code) { function loginByCode(code) {
debugger
return third.wechat.login({ return third.wechat.login({
platform: 'officialAccount', platform: 'officialAccount',
shareInfo: uni.getStorageSync('shareLog') || {}, shareInfo: uni.getStorageSync('shareLog') || {},
@ -93,6 +98,7 @@ function loginByCode(code) {
// 此处使用前端发送code在后端解密，防止用户在后端过长时间停留 // 此处使用前端发送code在后端解密，防止用户在后端过长时间停留
function bindByCode(code) { function bindByCode(code) {
debugger
return third.wechat.bind({ return third.wechat.bind({
platform: 'officialAccount', platform: 'officialAccount',
payload: encodeURIComponent( payload: encodeURIComponent(

2
sheep/platform/provider/wechat/openPlatform.js
View File

@ -1,5 +1,4 @@
// 登录 // 登录
import { isEmpty } from 'lodash';
import third from '@/sheep/api/third'; import third from '@/sheep/api/third';
const load = async () => {}; const load = async () => {};
@ -11,6 +10,7 @@ const login = () => {
provider: 'weixin', provider: 'weixin',
onlyAuthorize: true, onlyAuthorize: true,
}); });
debugger
if (loginRes.errMsg == 'login:ok') { if (loginRes.errMsg == 'login:ok') {
const res = await third.wechat.login({ const res = await third.wechat.login({
platform: 'openPlatform', platform: 'openPlatform',

4
sheep/request2/index.js
View File

@ -95,8 +95,8 @@ http.interceptors.request.use(
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['terminal'] = '20'; config.header['terminal'] = '20';
config.header['Authorization'] = 'Bearer test247'; config.header['Authorization'] = 'Bearer test247';
} }
return config; return config;
}, },

7
sheep/store/app.js
View File

@ -61,18 +61,21 @@ const app = defineStore({
$router.error('NetworkError'); $router.error('NetworkError');
} }
// 加载装修配置
await adaptTemplate(this.template, templateId) await adaptTemplate(this.template, templateId)
const res = await appApi.init(templateId); const res = await appApi.init(templateId);
if (res.error === 0) { if (res.error === 0) {
this.info = res.data.app; this.info = res.data.app;
this.platform = res.data.platform; this.platform = res.data.platform;
// TODO 芋艿：未接入
// this.template = res.data.template; // this.template = res.data.template;
this.has_wechat_trade_managed = res.data.has_wechat_trade_managed; // this.has_wechat_trade_managed = res.data.has_wechat_trade_managed;
// if (!res.data.template) { // if (!res.data.template) {
// $router.error('TemplateError'); // $router.error('TemplateError');
// } // }
this.chat = res.data.chat; // TODO 芋艿：未接入
// this.chat = res.data.chat;
// 加载主题 // 加载主题
const sysStore = sys(); const sysStore = sys();

1
sheep/ui/su-navbar/su-navbar.vue
View File

@ -1,3 +1,4 @@
<!-- 自定义导航栏 -->
<template> <template>
<view class="uni-navbar" :class="{ 'uni-dark': dark }"> <view class="uni-navbar" :class="{ 'uni-dark': dark }">
<view <view

1
sheep/ui/su-notice-bar/su-notice-bar.vue
View File

@ -1,3 +1,4 @@
<!-- 公告栏组件 -->
<template> <template>
<view <view
v-if="show" v-if="show"

2
sheep/ui/su-status-bar/su-status-bar.vue
View File

@ -1,10 +1,10 @@
<!-- 自定义状态栏 -->
<template> <template>
<view :style="{ height: statusBarHeight }" class="uni-status-bar"><slot /></view> <view :style="{ height: statusBarHeight }" class="uni-status-bar"><slot /></view>
</template> </template>
<script setup> <script setup>
import sheep from '@/sheep'; import sheep from '@/sheep';
import { computed } from 'vue';
const statusBarHeight = sheep.$platform.device.statusBarHeight + 'px'; const statusBarHeight = sheep.$platform.device.statusBarHeight + 'px';
</script> </script>

1
sheep/ui/su-tabbar-item/su-tabbar-item.vue
View File

@ -1,3 +1,4 @@
<!-- 自定义底部导航项 -->
<template> <template>
<view class="u-tabbar-item" :style="[addStyle(customStyle)]"> <view class="u-tabbar-item" :style="[addStyle(customStyle)]">
<view v-if="isCenter" class="tabbar-center-item"> <view v-if="isCenter" class="tabbar-center-item">

1
sheep/ui/su-tabbar/su-tabbar.vue
View File

@ -1,3 +1,4 @@
<!-- 底部导航栏 -->
<template> <template>
<view class="u-tabbar"> <view class="u-tabbar">
<view <view