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/34/head
落日晚风 2024-01-02 17:27:50 +08:00
parent 1a07dc4a40
commit 9d7b9c6f44
8 changed files with 782 additions and 503 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
manifest.json
View File

@ -69,7 +69,10 @@
"schemes": "shopro" "schemes": "shopro"
}, },
"ios": { "ios": {
"urlschemewhitelist" : [ "baidumap", "iosamap" ], "urlschemewhitelist": [
"baidumap",
"iosamap"
],
"dSYMs": false, "dSYMs": false,
"privacyDescription": { "privacyDescription": {
"NSPhotoLibraryUsageDescription": "需要同意访问您的相册选取图片才能完善该条目", "NSPhotoLibraryUsageDescription": "需要同意访问您的相册选取图片才能完善该条目",
@ -80,7 +83,9 @@
"urltypes": "shopro", "urltypes": "shopro",
"capabilities": { "capabilities": {
"entitlements": { "entitlements": {
"com.apple.developer.associated-domains" : [ "applinks:shopro.sheepjs.com" ] "com.apple.developer.associated-domains": [
"applinks:shopro.sheepjs.com"
]
} }
}, },
"idfa": true "idfa": true
@ -99,12 +104,18 @@
}, },
"payment": { "payment": {
"weixin": { "weixin": {
"__platform__" : [ "ios", "android" ], "__platform__": [
"ios",
"android"
],
"appid": "wxae7a0c156da9383b", "appid": "wxae7a0c156da9383b",
"UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/" "UniversalLinks": "https://shopro.sheepjs.com/uni-universallinks/__UNI__082C0BA/"
}, },
"alipay": { "alipay": {
"__platform__" : [ "ios", "android" ] "__platform__": [
"ios",
"android"
]
} }
}, },
"share": { "share": {
@ -114,7 +125,9 @@
} }
} }
}, },
"orientation" : [ "portrait-primary" ], "orientation": [
"portrait-primary"
],
"splashscreen": { "splashscreen": {
"androidStyle": "common", "androidStyle": "common",
"iosStyle": "common", "iosStyle": "common",
@ -185,7 +198,9 @@
"lazyCodeLoading": "requiredComponents", "lazyCodeLoading": "requiredComponents",
"usingComponents": {}, "usingComponents": {},
"permission": {}, "permission": {},
"requiredPrivateInfos" : [ "chooseAddress" ] "requiredPrivateInfos": [
"chooseAddress"
]
}, },
"mp-alipay": { "mp-alipay": {
"usingComponents": true "usingComponents": true

4
pages.json
View File

@ -622,7 +622,7 @@
} }
}, },
{ {
"path": "bargainingList", "path": "bargain/list",
"style": { "style": {
"navigationBarTitleText": "砍价列表" "navigationBarTitleText": "砍价列表"
}, },
@ -633,7 +633,7 @@
} }
}, },
{ {
"path": "bargainingDetail", "path": "bargain/detail",
"style": { "style": {
"navigationBarTitleText": "砍价详情" "navigationBarTitleText": "砍价详情"
}, },

0
pages/activity/bargainingDetail.vue → pages/activity/bargain/detail.vue
View File

69
pages/activity/bargainingList.vue → pages/activity/bargain/list.vue
View File

@ -1,4 +1,3 @@
<!-- 砍价列表 TODO @科举：新建一个 bargain 包，然后这个页面挪进去，改成 list.vue。写的时候，要思考怎么更好的融入到当前项目 -->
<template> <template>
<!-- TODO @科举：参考 groupon/list.vue 和 seckill/list.vue 界面，调整下头部，就是从 5 到 11 行的 --> <!-- TODO @科举：参考 groupon/list.vue 和 seckill/list.vue 界面，调整下头部，就是从 5 到 11 行的 -->
<s-layout navbar="inner" title='砍价列表'> <s-layout navbar="inner" title='砍价列表'>
@ -14,8 +13,8 @@
<view class='header'> <view class='header'>
<view class="pic"> <view class="pic">
<view class='swipers'> <view class='swipers'>
<swiper indicator-dots="true" autoplay="true" interval="2500" <swiper indicator-dots="true" autoplay="true" interval="2500" duration="500" vertical="true"
duration="500" vertical="true" circular="true"> circular="true">
<block v-for="(item,index) in state.bargainSuccessList" :key='index'> <block v-for="(item,index) in state.bargainSuccessList" :key='index'>
<swiper-item> <swiper-item>
<view class="acea-row row-middle" style='display:flex'> <view class="acea-row row-middle" style='display:flex'>
@ -36,7 +35,7 @@
<view class='list'> <view class='list'>
<block v-for="(item,index) in state.bargainList" :key="index"> <block v-for="(item,index) in state.bargainList" :key="index">
<view style='display:flex' class='item acea-row row-between-wrapper' <view style='display:flex' class='item acea-row row-between-wrapper'
@tap="openSubscribe('/pages/activity/bargainingDetail?id='+ item.id)"> @tap="openSubscribe('/pages/activity/bargain/detail?id='+ item.id)">
<view class='pictrue'> <view class='pictrue'>
<image :src='item.picUrl'></image> <image :src='item.picUrl'></image>
</view> </view>
@ -71,12 +70,19 @@
</template> </template>
<script setup> <script setup>
import { reactive } from 'vue'; import {
reactive
} from 'vue';
import sheep from '@/sheep'; import sheep from '@/sheep';
import _ from 'lodash'; import _ from 'lodash';
import { onLoad, onReachBottom } from '@dcloudio/uni-app'; import {
import { fen2yuan } from '@/sheep/hooks/useGoods'; onLoad,
onReachBottom
} from '@dcloudio/uni-app';
import {
fen2yuan
} from '@/sheep/hooks/useGoods';
import BargainApi from '@/sheep/api/activity'
const state = reactive({ const state = reactive({
navH: '', navH: '',
returnShow: true, returnShow: true,
@ -101,53 +107,58 @@
loadTitle: '加载更多', loadTitle: '加载更多',
}); });
function getBargainHeader() { async function getBargainHeader() {
// TODO @科举：这个改成 BargainApi.getBargainRecordSummary，使用 await 操作；代码风格要统一 let {
sheep.$api.activity.getBargainRecordSummary().then(res => { code,
state.bargainTotal = res.data.successUserCount; data
state.bargainSuccessList = res.data.successList; } = await BargainApi.getBargainRecordSummary()
}).catch(err => { if (code == 0) {
return state.$util.Tips({ state.bargainTotal = data.successUserCount;
title: err state.bargainSuccessList = data.successList;
} else {
state.$util.Tips({
title: data
}); });
}) }
} }
function getBargainList() { async function getBargainList() {
// TODO @科举：loading 和 loadTitle 改成现在这个项目的风格，包括组件使用 uni-load-more // TODO @科举：loading 和 loadTitle 改成现在这个项目的风格，包括组件使用 uni-load-more
if (state.loadend || state.loading) { if (state.loadend || state.loading) {
return; return;
} }
state.loading = true; state.loading = true;
state.loadTitle = ''; state.loadTitle = '';
// TODO @科举：这个改成 BargainApi.getBargainRecordSummary，使用 await 操作；代码风格要统一 let {
sheep.$api.activity.getBargainActivityPage({ data,
code
} = await BargainApi.getBargainActivityPage({
pageNo: state.page, pageNo: state.page,
pageSize: state.limit pageSize: state.limit
}).then(res => { })
const list = res.data.list; if (code == 0) {
const list = data.list;
const bargainList = _.concat(state.bargainList, list); const bargainList = _.concat(state.bargainList, list);
const loadend = list.length < state.limit; const loadend = list.length < state.limit;
state.loadend = loadend; state.loadend = loadend;
state.loading = false; state.loading = false;
state.loadTitle = loadend ? '已全部加载' : '加载更多'; state.loadTitle = loadend ? '已全部加载' : '加载更多';
// this.$set(this, 'bargainList', bargainList); // this.$set(this, 'bargainList', bargainList);
state.bargainList = res.data.list state.bargainList = data.list
// this.$set(this, 'page', this.page + 1); // this.$set(this, 'page', this.page + 1);
state.page = state.page + 1; state.page = state.page + 1;
}).catch(res => {
} else {
state.loading = false; state.loading = false;
state.loadTitle = '加载更多'; state.loadTitle = '加载更多';
}); }
} }
function openSubscribe(e) { function openSubscribe(e) {
console.log('跳转')
console.log(e) console.log(e)
// TODO @科举：参考 pages/pay/result.vue 页面的 subscribeMessage 方法，写订阅逻辑。 // TODO @科举：参考 pages/pay/result.vue 页面的 subscribeMessage 方法，写订阅逻辑。
// TODO @科举：navigateTo 在项目里，应该是 sheep.$router.go，参考写下 sheep.$router.go(e)
uni.navigateTo({
url: page,
});
return; return;
let page = e; let page = e;
// #ifndef MP // #ifndef MP

51
pages/commission/commission-ranking.vue
View File

File diff suppressed because one or more lines are too long

268
pages/commission/team.vue
View File

@ -1,13 +1,106 @@
<!-- 页面 TODO 芋艿：检查未开发 --> <!-- 页面 TODO 芋艿：检查未开发 -->
<template> <template>
<s-layout title="我的团队" :class="state.scrollTop ? 'team-wrap' : ''" navbar="inner"> <s-layout title="我的团队" :class="state.scrollTop ? 'team-wrap' : ''" navbar="inner">
<view class="header-box" :style="[ <view class="promoter-list">
<view class='promoterHeader bg-color' style='backgroundColor:#e93323!important;height:218rpx;color:#fff'>
<view class='headerCon acea-row row-between' style='padding: 28px 29px 0 29px;'>
<view>
<view class='name' style="color:#fff">推广人数</view>
<view><text class='num'
style="color:#fff">{{(state.getSummary.firstBrokerageUserCount+ state.getSummary.secondBrokerageUserCount)|| 0 }}</text>人
</view>
</view>
<view class='iconfont icon-tuandui'></view>
</view>
</view>
<view style='padding: 0 30rpx;'>
<view class='nav acea-row row-around l1'>
<view :class="state.level === 1 ? 'item on' : 'item'" @click='setType(1)'>
一级({{state.getSummary.firstBrokerageUserCount || 0 }})</view>
<view :class="state.level === 2 ? 'item on' : 'item'" @click='setType(2)'>
二级({{state.getSummary.secondBrokerageUserCount || 0 }})
</view>
</view>
<view class='search acea-row row-between-wrapper'
style="display: flex;height: 100rpx;align-items: center;">
<view class='input'>
<!-- placeholder-class='placeholder' -->
<input placeholder='点击搜索会员名称' v-model="state.nickname" confirm-type='search' name="search" />
<!-- @confirm="submitForm" -->
</view>
<button class='iconfont icon-sousuo2'></button>
<!-- @click="submitForm" -->
</view>
<view class='list'>
<view class="sortNav acea-row row-middle" style="display: flex;align-items: center;">
<view class="sortItem" @click='setSort("userCount","asc")' v-if="sort === 'userCountDESC'">
团队排序
<image src='/static/images/sort1.png'></image>
</view>
<view class="sortItem" @click='setSort("userCount", "desc")'
v-else-if="sort === 'userCountASC'">团队排序
<image src='/static/images/sort3.png'></image>
</view>
<view class="sortItem" @click='setSort("userCount","desc")' v-else>团队排序
<image src='/static/images/sort2.png'></image>
</view>
<view class="sortItem" @click='setSort("price","asc")' v-if="sort === 'priceDESC'">
金额排序
<image src='/static/images/sort1.png'></image>
</view>
<view class="sortItem" @click='setSort("price", "desc")' v-else-if="sort === 'priceASC'">
金额排序
<image src='/static/images/sort3.png'></image>
</view>
<view class="sortItem" @click='setSort("price","desc")' v-else>金额排序
<image src='/static/images/sort2.png'></image>
</view>
<view class="sortItem" @click='setSort("orderCount","asc")' v-if="sort === 'orderCountDESC'">
订单排序
<image src='/static/images/sort1.png'></image>
</view>
<view class="sortItem" @click='setSort("orderCount", "desc")'
v-else-if="sort === 'orderCountASC'">订单排序
<image src='/static/images/sort3.png'></image>
</view>
<view class="sortItem" @click='setSort("orderCount","desc")' v-else>订单排序
<image src='/static/images/sort2.png'></image>
</view>
</view>
<!-- <block v-for="(item,index) in recordList" :key="index">
<view class='item acea-row row-between-wrapper'>
<view class="picTxt acea-row row-between-wrapper">
<view class='pictrue'>
<image :src='item.avatar'></image>
</view>
<view class='text'>
<view class='name line1'>{{item.nickname}}</view>
<view>加入时间: {{ formatDate(item.brokerageTime) }}</view>
</view>
</view>
<view class="right">
<view><text class='num font-color'>{{ item.brokerageUserCount || 0}}</text>人
</view>
<view><text class="num">{{ item.orderCount|| 0}}</text>单</view>
<view><text class="num">{{ fen2yuan(item.brokeragePrice || 0) }}</text>元</view>
</view>
</view>
</block>
<Loading :loaded="status" :loading="loadingList"></Loading>
<block v-if="recordList.length === 0 && isShow">
<emptyPage title="暂无推广人数～"></emptyPage>
</block> -->
</view>
</view>
</view>
<!-- <home></home> -->
<!-- <view 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 v-if="userInfo.parent_user" class="referrer-box ss-flex ss-col-center"> <view v-if="userInfo.parent_user" class="referrer-box ss-flex ss-col-center">
推荐人： 推荐人：
<image class="referrer-avatar ss-m-r-10" :src="sheep.$url.cdn(userInfo.parent_user.avatar)" <image class="referrer-avatar ss-m-r-10" :src="sheep.$url.cdn(userInfo.parent_user.avatar)"
@ -15,7 +108,6 @@
</image> </image>
{{ userInfo.parent_user.nickname }} {{ userInfo.parent_user.nickname }}
</view> </view>
<!-- 团队数据总览 -->
<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">
@ -38,16 +130,16 @@
<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">{{ agentInfo.child_agent_count_all || 0 }}</view> <view class="total-num">{{ agentInfo?.child_agent_count_all || 0 }}</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">{{ agentInfo.child_agent_count_1 || 0 }}</view> <view class="category-num">{{ agentInfo?.child_agent_count_1 || 0 }}</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">{{ agentInfo.child_agent_count_2 || 0 }}</view> <view class="category-num">{{ agentInfo?.child_agent_count_2 || 0 }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -71,7 +163,7 @@
</uni-list> </uni-list>
</view> </view>
<s-empty v-if="state.pagination.total === 0" icon="/static/data-empty.png" text="暂无团队信息"> <s-empty v-if="state.pagination.total === 0" icon="/static/data-empty.png" text="暂无团队信息">
</s-empty> </s-empty> -->
</s-layout> </s-layout>
</template> </template>
@ -83,13 +175,18 @@
} from '@dcloudio/uni-app'; } from '@dcloudio/uni-app';
import { import {
computed, computed,
reactive reactive,
ref
} from 'vue'; } from 'vue';
import _ from 'lodash'; import _ from 'lodash';
import { import {
onPageScroll onPageScroll
} from '@dcloudio/uni-app'; } from '@dcloudio/uni-app';
const statusBarHeight = sheep.$platform.device.statusBarHeight * 2; const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
const agentInfo = computed(() => sheep.$store('user').agentInfo); const agentInfo = computed(() => sheep.$store('user').agentInfo);
const userInfo = computed(() => sheep.$store('user').userInfo); const userInfo = computed(() => sheep.$store('user').userInfo);
@ -111,8 +208,12 @@
last_page: 1, last_page: 1,
}, },
loadStatus: '', loadStatus: '',
// ↓新ui逻辑
level: 1,
nickname: ref('')
}); });
function filterUserNum(num) { function filterUserNum(num) {
if (_.isNil(num)) { if (_.isNil(num)) {
return ''; return '';
@ -168,6 +269,19 @@
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.l1 {
background-color: #fff;
height: 86rpx;
line-height: 86rpx;
font-size: 28rpx;
color: #282828;
border-bottom: 1rpx solid #eee;
border-top-left-radius: 14rpx;
border-top-right-radius: 14rpx;
display: flex;
justify-content: space-around;
}
.header-box { .header-box {
box-sizing: border-box; box-sizing: border-box;
padding: 0 20rpx 20rpx 20rpx; padding: 0 20rpx 20rpx 20rpx;
@ -263,4 +377,142 @@
border-radius: 50%; border-radius: 50%;
} }
} }
.promoter-list .nav {
background-color: #fff;
height: 86rpx;
line-height: 86rpx;
font-size: 28rpx;
color: #282828;
border-bottom: 1rpx solid #eee;
border-top-left-radius: 14rpx;
border-top-right-radius: 14rpx;
margin-top: -30rpx;
}
.promoter-list .nav .item.on {
border-bottom: 5rpx solid;
// $theme-color
color: red;
// $theme-color
}
.promoter-list .search {
width: 100%;
background-color: #fff;
height: 100rpx;
padding: 0 24rpx;
box-sizing: border-box;
border-bottom-left-radius: 14rpx;
border-bottom-right-radius: 14rpx;
}
.promoter-list .search .input {
width: 592rpx;
height: 60rpx;
border-radius: 50rpx;
background-color: #f5f5f5;
text-align: center;
position: relative;
}
.promoter-list .search .input input {
height: 100%;
font-size: 26rpx;
width: 610rpx;
text-align: center;
}
.promoter-list .search .input .placeholder {
color: #bbb;
}
.promoter-list .search .input .iconfont {
position: absolute;
right: 28rpx;
color: #999;
font-size: 28rpx;
top: 50%;
transform: translateY(-50%);
}
.promoter-list .search .iconfont {
font-size: 32rpx;
color: #515151;
height: 60rpx;
line-height: 60rpx;
}
.promoter-list .list {
margin-top: 20rpx;
}
.promoter-list .list .sortNav {
background-color: #fff;
height: 76rpx;
border-bottom: 1rpx solid #eee;
color: #333;
font-size: 28rpx;
border-top-left-radius: 14rpx;
border-top-right-radius: 14rpx;
}
.promoter-list .list .sortNav .sortItem {
text-align: center;
flex: 1;
}
.promoter-list .list .sortNav .sortItem image {
width: 24rpx;
height: 24rpx;
margin-left: 6rpx;
vertical-align: -3rpx;
}
.promoter-list .list .item {
background-color: #fff;
border-bottom: 1rpx solid #eee;
height: 152rpx;
padding: 0 24rpx;
font-size: 24rpx;
color: #666;
}
.promoter-list .list .item .picTxt .pictrue {
width: 106rpx;
height: 106rpx;
border-radius: 50%;
}
.promoter-list .list .item .picTxt .pictrue image {
width: 100%;
height: 100%;
border-radius: 50%;
border: 3rpx solid #fff;
box-shadow: 0 0 10rpx #aaa;
box-sizing: border-box;
}
.promoter-list .list .item .picTxt .text {
// width: 304rpx;
font-size: 24rpx;
color: #666;
margin-left: 14rpx;
}
.promoter-list .list .item .picTxt .text .name {
font-size: 28rpx;
color: #333;
margin-bottom: 13rpx;
}
.promoter-list .list .item .right {
text-align: right;
font-size: 22rpx;
color: #333;
}
.promoter-list .list .item .right .num {
margin-right: 7rpx;
}
</style> </style>

12
sheep/api/promotion/diy/template.js
View File

@ -1,12 +1,12 @@
import request from '@/sheep/request'; import request from '@/sheep/request';
const DiyTemplateApi = { const DiyTemplateApi = {
getUsedDiyTemplate: () => { // getUsedDiyTemplate: () => {
return request({ // return request({
url: '/app-api/promotion/diy-template/used', // url: '/app-api/promotion/diy-template/used',
method: 'GET', // method: 'GET',
}); // });
}, // },
getDiyTemplate: (id) => { getDiyTemplate: (id) => {
return request({ return request({
url: '/app-api/promotion/diy-template/get', url: '/app-api/promotion/diy-template/get',

4
sheep/request/index.js
View File

@ -218,8 +218,8 @@ const request = (config) => {
} }
// 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://api-dashboard.yudao.iocoder.cn' + config.url; // 调用【云端】
config.url = 'http://127.0.0.1:48080' + config.url; // 调用【本地】 // config.url = 'http://127.0.0.1:48080' + config.url; // 调用【本地】
// config.url = 'http://yunai.natapp1.cc' + config.url; // 调用【natapp】 // config.url = 'http://yunai.natapp1.cc' + config.url; // 调用【natapp】
} }
return http.middleware(config); return http.middleware(config);