main
liudan 2 years ago
parent 2ed302a77a
commit 3c5b40c426
  1. 2
      env.js
  2. 4
      pages.json
  3. 10
      pages/app/commission/commission-log.vue
  4. 3
      pages/app/commission/goods.vue
  5. 4
      pages/app/commission/index.vue
  6. 10
      pages/app/commission/order.vue
  7. 6
      pages/app/commission/share-log.vue
  8. 2
      pages/app/commission/team.vue
  9. 16
      pages/app/components/sh-collapse-item.vue
  10. 19
      pages/index/homeActivities/homeActivities.vue
  11. 6
      pages/order/detail.vue
  12. 26
      pages/order/list.vue
  13. 36
      pages/order/payment/method.vue
  14. 3
      pages/user/address/edit.vue
  15. 3
      pages/user/favorite.vue
  16. 14
      pages/user/wallet/index.vue
  17. 1
      pages/user/wallet/score-balance.vue
  18. 294
      pages/user/wallet/top-up.vue
  19. 5
      pages/user/wallet/withdraw.vue
  20. BIN
      static/images/empty.png

@ -12,7 +12,7 @@ export const API_URL = `${BASE_URL}/addons/shopro/`
export const IMG_URL = 'https://fx.njrenzhou.cn'
//高德地图开发者Web服务key,逆坐标解析必须
export const MAP_KEY = '265849207*********39753dc'
export const MAP_KEY = '213ff5240e12efbd4c2ec6b7e2f02c6c'
//后台是否开通直播权限,根据情况在manifest.json中引入直播插件,并在pages.json中打开直播页面
export const HAS_LIVE = false

@ -522,7 +522,9 @@
{
"path": "payment/method",
"style": {
"navigationBarTitleText": "收银台"
"navigationBarTitleText": "收银台",
"navigationBarBackgroundColor": "#21222B",
"navigationBarTextStyle": "white"
},
"meta": {
"auth": true,

@ -7,7 +7,7 @@
<view class="head-box u-flex">
<view class="head-title">总收益</view>
<button class="u-reset-button look-btn" @tap="showMoney = !showMoney">
<view class="u-iconfont" :class="showMoney ? 'uicon-eye-fill' : 'uicon-eye-off'" style="color: #fff;font-size: 50rpx;"></view>
<view class="u-iconfont" :class="showMoney ? 'uicon-eye-fill' : 'uicon-eye-off'" style="color: #09090B;font-size: 50rpx;"></view>
</button>
</view>
<view class="card-num">{{ showMoney ? agentInfo.total_income || '0.00' : '***' }}</view>
@ -50,7 +50,7 @@
<!-- 佣金明细列表 -->
<view class="log-item u-flex u-row-between" v-for="item in rewardLog" :key="item.id">
<view class="item-left u-flex">
<image class="log-img" :src="item.buyer.avatar" mode=""></image>
<!-- <image class="log-img" :src="item.buyer.avatar" mode=""></image> -->
<view class="">
<view class="log-name">{{ item.buyer.nickname }}</view>
<view class="log-notice">{{ $u.timeFormat(item.createtime, 'yyyy.mm.dd') }}</view>
@ -74,7 +74,7 @@
mode="range"
start-text="开始"
end-text="结束"
active-bg-color="#7063d2"
active-bg-color="#7063D2"
active-color="#fff"
range-bg-color="#e5e2ff"
range-color="#7063d2"
@ -99,9 +99,9 @@ export default {
cancel: '已取消'
},
classType: {
'-1': '#EB2B3D',
'-1': '#FFFFFF',
'0': '#05C3A1',
'1': '#7063D2',
'1': '#DD5C3D',
'-2': '#EEEEEE'
},
statusList: [

@ -113,11 +113,12 @@ page {
border-radius:20rpx;
border-bottom: 1rpx solid rgba(#dfdfdf, 0.5);
position: relative;
margin-bottom:20rpx;
.share-btn {
position: absolute;
bottom: 30rpx;
right: 30rpx;
width: 160rpx;
width: 130rpx;
line-height: 60rpx;
background: #F0D2A0;
box-shadow: 0px 7rpx 11rpx 2rpx rgba(124, 103, 214, 0.34);

@ -703,7 +703,7 @@ export default {
.card-top {
padding: 40rpx 40rpx 30rpx;
margin-bottom: 30rpx;
border-bottom: 1px solid rgba(#fff, 0.12);
// border-bottom: 1px solid rgba(#fff, 0.12);
.user-name {
line-height: 30rpx;
margin-bottom: 20rpx;
@ -808,7 +808,7 @@ export default {
.log-scroll {
height: 380rpx;
.log-item-box {
height: 78rpx;
height: 100rpx;
.log-time {
font-size: 26rpx;
font-family: Alibaba PuHuiTi;

@ -75,7 +75,7 @@
</view>
</view>
<view class="content_box">
<view class="content_box" style="padding:0 24rpx;">
<scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
<!-- 订单列表 -->
<view class="order-list" v-for="item in orderList" :key="item.id">
@ -273,7 +273,7 @@ export default {
.direct-item {
width: 341rpx;
height: 117rpx;
// height: 117rpx;
background: linear-gradient(0deg, #E1BC7D, #F0D2A0);
border-radius: 20rpx;
@ -287,7 +287,8 @@ export default {
.item-value {
font-size: 36rpx;
font-weight: 600;
color:#030300
color:#030300;
margin-top: 23rpx;
}
}
}
@ -297,7 +298,7 @@ export default {
.data-card {
width: 340rpx;
border-radius: 20rpx;
padding: 20rpx;
padding: 30rpx;
background: linear-gradient(0deg, #E1BC7D, #F0D2A0);
@ -388,6 +389,7 @@ export default {
//
.order-list {
background-color: #fff;
border-radius: 20rpx;
margin-top: 20rpx;
.order-head {
padding: 20rpx;

@ -16,7 +16,7 @@
</view>
</view>
<view class="content_box">
<view class="content_box" style="padding: 0 24rpx;">
<scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
<!-- 分享记录列表 -->
<view class="log-list u-flex" v-for="item in shareLogList" :key="item.id">
@ -135,7 +135,7 @@ export default {
<style lang="scss">
// nav
.head_box {
height: 280rpx;
height: 240rpx;
// background: url($IMG_URL+'/imgs/commission/share_head_bg.png') no-repeat;
background-size: 100% auto;
position: relative;
@ -190,7 +190,7 @@ export default {
.log-list {
background-color: #333440;
padding: 30rpx;
margin: 10rpx 0;
margin: 20rpx 0;
align-items: flex-start;
border-radius: 15rpx;

@ -48,7 +48,7 @@
</view>
</view>
<view class="content_box">
<view class="content_box" style="padding:0 24rpx">
<scroll-view scroll-y="true" @scrolltolower="loadMore" class="scroll-box">
<!-- 团队列表 -->
<view class="team-box">

@ -86,16 +86,18 @@ export default {
<style lang="scss">
.sh-collapse-box {
background-color: #fff;
// background-color: #fff;
.collapse-head {
padding: 0rpx 28rpx;
height: 132rpx;
border-bottom: 1rpx solid #eee;
background: #333440;
border-radius: 15rpx;
// border-bottom: 1rpx solid #eee;
.head-img {
width: 66rpx;
height: 66rpx;
width: 80rpx;
height: 80rpx;
border-radius: 50%;
margin-right: 45rpx;
margin-right: 21rpx;
}
.arrow-btn {
background: none;
@ -118,9 +120,9 @@ export default {
.name-box {
margin-bottom: 12rpx;
.name-text {
font-size: 26rpx;
font-size: 24rpx;
font-weight: 500;
color: #111111;
color: #FFFFFF;
}
.tag-box {
background: rgba(0, 0, 0, 0.2);

@ -1,5 +1,5 @@
<template>
<view style="padding-bottom:30rpx;">
<view style="padding:30rpx 0;">
<view class="list">
<view class="listItem" @tap="goDetail(item)" v-for="(item,index) in list" :key="index">
<view class="img">
@ -15,7 +15,10 @@
</view>
</view>
</view>
<view class="empty" v-if="list.length==0">
<image src="/static/images/empty.png" mode="widthFix"></image>
<view class="emptyText">暂无内容</view>
</view>
</view>
</template>
@ -46,6 +49,18 @@
</script>
<style lang="scss">
.empty{
margin:20% auto 0 auto;
text-align: center;
image{
width:30%;
height:auto;
}
.emptyText{
color:#ffffff;
margin:30upx;
}
}
.listItem{
margin:0 24upx;
background: #aaaaaa;

@ -723,8 +723,10 @@ export default {
justify-content: flex-end;
// margin-bottom: 20rpx;
.delete-btn {
background: #ffeeee;
color: #e50808;
// background: #ffeeee;
// color: #e50808;
color:#09090B;
border: 1px solid #222222;
width: 160rpx;
line-height: 60rpx;
border-radius: 30rpx;

@ -71,8 +71,12 @@
</view>
<!-- 空白页 -->
<shopro-empty v-if="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_groupon.png'"
tipText="暂无商品,还有更多好货等着你噢~"></shopro-empty>
<view class="empty" v-if="isEmpty">
<image src="../../static/images/empty.png" mode="widthFix"></image>
<view class="emptyText">暂无商品还有更多好货等着你噢~</view>
</view>
<!-- <shopro-empty v-if="isEmpty" :image="$IMG_URL + '/imgs/empty/empty_groupon.png'">
tipText="暂无商品,还有更多好货等着你噢~"></shopro-empty> -->
<!-- 更多 -->
<u-loadmore v-show="orderList.length" height="80rpx" :status="loadStatus" icon-type="flower"
color="#ccc" />
@ -243,6 +247,18 @@
</script>
<style lang="scss">
.empty{
margin:20% auto 0 auto;
text-align: center;
image{
width:30%;
height:auto;
}
.emptyText{
color:#ffffff;
margin:30upx;
}
}
.order-nav {
// background: #fff;
height: 80rpx;
@ -344,8 +360,10 @@
}
.obtn3 {
background: #ffeeee;
color: #e50808;
// background: #ffeeee;
border: 1px solid #09090B;
// color: #e50808;
color:#09090B;
width: 180rpx;
line-height: 70rpx;
border-radius: 35rpx;

@ -1,6 +1,6 @@
<!-- 收银台 -->
<template>
<view class="pay-method-wrap">
<view class="pay-method-wrap" style="padding:34rpx 24rpx 0 24rpx;">
<view class="u-flex-col u-col-center money-box" v-if="orderDetail.total_fee">
<text class="time" v-show="isCountDown">{{ timeText }}</text>
<view class="money">{{ orderDetail.total_fee }}</view>
@ -201,20 +201,25 @@
<style lang="scss">
.money-box {
background: #fff;
height: 250rpx;
height: 260rpx;
background: #FFFFFF;
box-shadow: 0px 6rpx 16rpx 0rpx rgba(25,25,25,0.05);
border-radius: 20rpx;
margin-bottom: 20rpx;
padding-top: 30rpx;
// padding-top: 30rpx;
display: flex;
align-items: center;
justify-content: center;
.time {
font-size: 28rpx;
color: #c4c4c4;
// color: #c4c4c4;
color:#09090B;
}
.money {
color: #e1212b;
color: #09090B;
font-size: 60rpx;
margin-top: 60rpx;
margin-top: 39rpx;
&::before {
content: '¥';
@ -224,14 +229,19 @@
}
.pay-box {
/deep/.u-radio-group{
box-shadow: 0px 6rpx 16rpx 0px rgba(25,25,25,0.05);
border-radius: 20rpx;
overflow: hidden;
}
.pay-item {
height: 90rpx;
height: 130rpx;
padding: 0 30rpx;
font-size: 26rpx;
background: #fff;
width: 750rpx;
// width: 750rpx;
border-bottom: 1rpx solid #eeeeee;
&:last-child {
border-bottom: none;
}
@ -246,10 +256,10 @@
.pay-btn {
width: 690rpx;
line-height: 80rpx;
line-height: 100rpx;
background: linear-gradient(90deg, rgba(240, 199, 133, 1), rgba(246, 214, 157, 1));
border-radius: 40rpx;
color: rgba(#fff, 0.9);
color: #111111;
margin: 100rpx auto 0;
}
</style>

@ -3,7 +3,7 @@
<view class="address-wrap" style="padding:0 24rpx;padding-top:46rpx;">
<u-form :model="model" :rules="rules" ref="uForm" :errorType="errorType">
<!-- 地址定位 -->
<view class="location-item u-flex u-row-between u-p-20 u-m-b-20" @tap="getLocation">
<view class="location-item u-flex u-row-between u-m-b-20" @tap="getLocation">
<view class="u-flex">
<text class="u-iconfont uicon-map-fill" style="#a76f0d;"></text>
<text>{{ chooseAddress }}</text>
@ -262,6 +262,7 @@ export default {
//
.location-item {
font-size: 28rpx;
padding:29rpx 20rpx;
font-weight: 500;
background-color: #fff;
// color: rgba(167, 111, 13, 1);

@ -153,8 +153,9 @@ export default {
color: #999;
.all-num {
color: #21222B;
color: #F0D2A0;
font-size: 36rpx;
margin:0 8rpx;
}
}

@ -42,7 +42,7 @@
<!-- 钱包记录 -->
<view class="wallet-list u-flex" v-for="item in walletLog" :key="item.id">
<image class="head-img u-m-r-20" :src="item.avatar" mode=""></image>
<!-- <image class="head-img u-m-r-20" :src="item.avatar" mode=""></image> -->
<view class="list-content">
<view class="title-box u-flex u-row-between">
<text class="title u-ellipsis-1">{{ item.type_name }}{{ item.title ? '-' + item.title : '' }}</text>
@ -177,10 +177,11 @@
<style lang="scss">
//
.wallet-list {
width: 750rpx;
padding: 30rpx;
background-color: #ffff;
border-bottom: 1rpx solid #eeeeee;
// width: 750rpx;
padding: 30rpx 0;
margin:0 30rpx;
// background-color: #ffff;
border-bottom: 1rpx solid #333440;
.head-img {
width: 70rpx;
@ -203,6 +204,9 @@
.time {
color: #808292;
font-size: 26rpx;
display: block;
margin-top:30rpx;
}
}

@ -150,6 +150,7 @@ export default {
// bottom: 0;
transform: translateX(-50%);
width: 710rpx;
z-index:9999;
// height: 90rpx;
// background: rgba(255, 255, 255, 1);
// border-radius: 30rpx 30rpx 0px 0px;

@ -1,4 +1,290 @@
<!-- 充值 -->
<template>
<view class="draw-money-wrap u-p-b-30">
<view class="head-box">
<shopro-navbar :background="{ background: navBackground }" :backTextStyle="{ color: '#fff' }" backText="充值"
backIconColor="#fff"></shopro-navbar>
<!-- 账户 -->
<view class="wallet-num-box u-flex u-row-between">
<view class="">
<view class="num-title">账户余额</view>
<view class="wallet-num">{{ userInfo.money || '0.00' }}</view>
</view>
<button class="u-reset-button log-btn"
@tap="$Router.push({ path: '/pages/user/wallet/top-up-log' })">充值记录</button>
</view>
</view>
<!-- 充值输入卡片-->
<view class="draw-card">
<view class="card-title">充值金额</view>
<view class="input-box u-flex u-col-center">
<view calss="unit"></view>
<input class="u-flex-1 u-p-l-10" type="digit" @focus="onTopupFous" @input="onTopupInput" v-model="money"
placeholder-style="font-size: 30rpx; font-weight: 500;color:#C2C7CF;" placeholder="请输入充值金额" />
</view>
<!-- 快捷充值 -->
<view class="top-up-content u-p-b-30" v-if="initRecharge.moneys.length">
<view class="card-title">快捷充值</view>
<view class="u-flex u-flex-wrap">
<view class="top-up-card u-flex u-row-center u-col-center u-m-b-30 u-m-r-30"
:class="{'top-up-active':curMoneyCard === index}" v-for="(item,index) in initRecharge.moneys"
:key="index" @tap="selectCard(index)">
<view class="top-up-value">
{{item.money}}
</view>
</view>
</view>
</view>
<button class="u-reset-button save-btn" :style="{opacity:!money ? 0.7 : 1 }" :disabled="!money"
@tap="confirmTopup">确认充值</button>
</view>
<!-- 充值说明 -->
<view class="draw-notice">
<view class="title">充值说明</view>
<view class="draw-list">1.充值为在线支付即时到账不支持退款</view>
<view class="draw-list">
2.充值后金额会自动进入您的余额账户请注意查收
</view>
</view>
</view>
</template>
<script>
import { mapState, mapActions, mapGetters } from 'vuex';
import FormValidate from '@/shopro/validate/form';
import wechat from '@/shopro/wechat/wechat';
export default {
components: {},
data() {
return {
money: '', //
showModal: false,
curMoneyCard: '',
navBackground: 'none'
};
},
computed: {
...mapGetters(['userInfo', 'initRecharge'])
},
async onLoad() {},
onPageScroll(e) {
this.navBackground = e.scrollTop > 50 ?
`url(${this.$IMG_URL}/imgs/user/draw_money_head_bg.png) no-repeat top / 100% auto` : 'none';
},
methods: {
//
onTopupInput(e) {
this.$nextTick(() => {
this.money = this.clearNoNum(e.detail.value)
})
},
//
onTopupFous() {
this.curMoneyCard = ''
},
//
selectCard(index) {
this.curMoneyCard = index
this.money = this.initRecharge.moneys[index].money
},
confirmTopup() {
const that = this;
if (this.money <= 0) {
this.$u.toast('请选择或输入充值金额');
return;
}
that.$http(
'money.recharge', {
recharge_money: that.money
},
'确认中...'
).then(res => {
if (res.code === 1) {
that.money = '';
that.$Router.push({
path: `/pages/order/payment/method`,
query: {
orderId: res.data.id,
orderType: 'recharge'
}
});
} else {
that.$u.toast(res.msg);
}
});
},
//
clearNoNum(val) {
if (val == ".") {
val = "0.";
}
val = val.replace(/[^\d.]/g, "");
//.
val = val.replace(/^\./g, "");
//..
val = val.replace(/\.{2,}/g, ".");
//.
val = val
.replace(".", "$#$")
.replace(/\./g, "")
.replace("$#$", ".");
//
val = val.replace(/^(-)*(\d+)\.(\d\d).*$/, "$1$2.$3");
if (val.indexOf(".") < 0 && val != "") {
// 0102
val = parseFloat(val);
}
return val
}
}
};
</script>
<style lang="scss">
.head-box {
// background: url($IMG_URL+'/imgs/user/draw_money_head_bg.png') no-repeat;
// background-size: 100% auto;
min-height: 400rpx;
padding-bottom: var(--status-bar-height);
//
.wallet-num-box {
padding: 46rpx 40rpx 0;
align-items: baseline;
.num-title {
font-size: 30rpx;
font-weight: 500;
color: #ffffff;
margin-bottom: 20rpx;
}
.wallet-num {
font-size: 60rpx;
font-weight: 500;
color: #F0D2A0;
}
.log-btn {
width: 170rpx;
height: 60rpx;
line-height: 60rpx;
border:1px solid #F0D2A0;
// background: rgba(255, 255, 255, 0.1);
border-radius: 30rpx;
padding: 0;
font-size: 24rpx;
font-weight: 500;
color: #F0D2A0;
}
}
}
//
.draw-card {
background-color: #fff;
border-radius: 20rpx;
width: 690rpx;
min-height: 400rpx;
margin: -70rpx auto 30rpx;
padding: 30rpx;
.card-title {
font-size: 30rpx;
font-weight: 500;
color: #333333;
margin-bottom: 30rpx;
}
.input-box {
width: 624rpx;
border-bottom: 1rpx solid #eee;
height: 100rpx;
margin-bottom: 40rpx;
.unit {
font-size: 48rpx;
color: #333;
}
}
.save-btn {
width: 616rpx;
height: 86rpx;
line-height: 86rpx;
// background: linear-gradient(-90deg, #a36fff, #5336ff);
background: #F0D2A0;
box-shadow: 0px 7rpx 11rpx 2rpx rgba(124, 103, 214, 0.34);
border-radius: 43rpx;
font-size: 30rpx;
font-weight: 500;
color: #ffffff;
}
//
.top-up-card {
width: 190rpx;
height: 124rpx;
background: #F7F6FB;
border-radius: 12rpx;
transition: all linear 0.2s;
&:nth-of-type(3n) {
margin-right: 0 !important;
}
.top-up-value {
font-size: 36rpx;
font-weight: 500;
color: #999999;
&::after {
content: '元';
font-size: 24rpx;
}
}
}
.top-up-active {
background: #564BBD;
transition: all linear 0.2s;
.top-up-value {
color: #fff
}
}
}
//
.draw-notice {
width: 684rpx;
min-height: 180rpx;
background: #ffffff;
border-radius: 20rpx;
padding: 30rpx 35rpx;
margin: 20rpx auto;
.title {
font-size: 30rpx;
font-weight: 500;
color: #333333;
margin-bottom: 30rpx;
}
.draw-list {
font-size: 24rpx;
font-weight: 400;
color: #999999;
margin-bottom: 10rpx;
}
}
</style>
<!-- 充值 -->
<template>
<view class="draw-money-wrap u-p-b-30">
<view class="head-box">
@ -154,7 +440,8 @@
//
.wallet-num-box {
padding: 20rpx 40rpx 0;
padding: 46rpx 40rpx 0;
align-items: baseline;
.num-title {
font-size: 30rpx;
@ -217,12 +504,13 @@
width: 616rpx;
height: 86rpx;
line-height: 86rpx;
background: linear-gradient(-90deg, #a36fff, #5336ff);
// background: linear-gradient(-90deg, #a36fff, #5336ff);
background: #F0D2A0;
box-shadow: 0px 7rpx 11rpx 2rpx rgba(124, 103, 214, 0.34);
border-radius: 43rpx;
font-size: 30rpx;
font-weight: 500;
color: #ffffff;
color: #09090B;
}
//

@ -339,7 +339,7 @@ export default {
.head-box {
// background: url($IMG_URL+'/imgs/user/draw_money_head_bg.png') no-repeat;
background-size: 100% auto;
min-height: 400rpx;
min-height: 300rpx;
padding-bottom: var(--status-bar-height);
//
.wallet-num-box {
@ -378,7 +378,8 @@ export default {
border-radius: 20rpx;
width: 690rpx;
min-height: 530rpx;
margin: -70rpx auto 0;
// margin: -70rpx auto 0;
margin: 0rpx auto 0;
padding: 30rpx;
.card-title {
font-size: 30rpx;

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Loading…
Cancel
Save