qianggou
/
uniapp
forked from zhongyuanhaiju/uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

xx

This commit is contained in:
zoomtk@126.com 2023-04-20 15:20:26 +08:00
parent c73a175145
commit 08a53d7359
26 changed files with 231 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
App.vue
View File

@ -5,7 +5,6 @@ export default {
mixins: [auth], mixins: [auth],
onLaunch: function() { onLaunch: function() {
uni.hideTabBar(); uni.hideTabBar();
// #ifdef MP // #ifdef MP
const updateManager = uni.getUpdateManager(); const updateManager = uni.getUpdateManager();
updateManager.onCheckForUpdate(function(res) { updateManager.onCheckForUpdate(function(res) {
@ -165,7 +164,6 @@ export default {
if (res.code == 0) { if (res.code == 0) {
var wxJS = new Weixin(); var wxJS = new Weixin();
wxJS.init(res.data.jssdk_config); wxJS.init(res.data.jssdk_config);
let share_data = JSON.parse(JSON.stringify(res.data.share_config.data)); let share_data = JSON.parse(JSON.stringify(res.data.share_config.data));
if (share_data) { if (share_data) {
wxJS.setShareData( wxJS.setShareData(
@ -180,10 +178,8 @@ export default {
} }
); );
} }
let hideOptionMenu = res.data.share_config.permission.hideOptionMenu; let hideOptionMenu = res.data.share_config.permission.hideOptionMenu;
let hideMenuItems = res.data.share_config.permission.hideMenuItems; let hideMenuItems = res.data.share_config.permission.hideMenuItems;
if (hideOptionMenu) { if (hideOptionMenu) {
wxJS.weixin.hideOptionMenu(); //屏蔽分享好友等按钮 wxJS.weixin.hideOptionMenu(); //屏蔽分享好友等按钮
} else { } else {

10
components/diy-components/diy-goods-list.vue
View File

@ -21,7 +21,7 @@
</view> </view>
<view class="give-diamond" v-if="parseFloat(item.give_diamond) > 0"> <view class="give-diamond" v-if="parseFloat(item.give_diamond) > 0">
<image class="give-diamond-image" :src="$util.img('public/static/img/futures/give_diamond.png')" mode="widthFix"></image> <image class="give-diamond-image" :src="$util.img('public/static/img/futures/give_diamond.png')" mode="widthFix"></image>
{{ parseFloat(item.give_diamond) }}颗钻石 {{ parseFloat(item.give_diamond) }}颗猕猴桃
</view> </view>
<template v-if="goodsValue.tag"> <template v-if="goodsValue.tag">
<view class="tag-wrap" v-if="goodsValue.tag.value == 'label' && item.label_name"> <view class="tag-wrap" v-if="goodsValue.tag.value == 'label' && item.label_name">
@ -112,7 +112,7 @@
</view> </view>
<view class="give-diamond" v-if="parseFloat(item.give_diamond) > 0"> <view class="give-diamond" v-if="parseFloat(item.give_diamond) > 0">
<image class="give-diamond-image" :src="$util.img('public/static/img/futures/give_diamond.png')" mode="widthFix"></image> <image class="give-diamond-image" :src="$util.img('public/static/img/futures/give_diamond.png')" mode="widthFix"></image>
{{ parseFloat(item.give_diamond) }}颗钻石 {{ parseFloat(item.give_diamond) }}颗猕猴桃
</view> </view>
<template v-if="goodsValue.tag"> <template v-if="goodsValue.tag">
<view class="tag-wrap" v-if="goodsValue.tag.value == 'label' && item.label_name"> <view class="tag-wrap" v-if="goodsValue.tag.value == 'label' && item.label_name">
@ -164,8 +164,7 @@
goodsValue.goodsNameStyle.control || goodsValue.goodsNameStyle.control ||
(goodsValue.tag && goodsValue.tag.value != 'hidden') || (goodsValue.tag && goodsValue.tag.value != 'hidden') ||
goodsValue.priceStyle.mainControl || goodsValue.priceStyle.mainControl ||
goodsValue.priceStyle.lineControl goodsValue.priceStyle.lineControl">
">
<view v-if="goodsValue.goodsNameStyle.control" class="goods-name" <view v-if="goodsValue.goodsNameStyle.control" class="goods-name"
:style="{ color: goodsValue.theme == 'diy' ? goodsValue.goodsNameStyle.color : '', fontWeight: goodsValue.goodsNameStyle.fontWeight ? 'bold' : '' }" :style="{ color: goodsValue.theme == 'diy' ? goodsValue.goodsNameStyle.color : '', fontWeight: goodsValue.goodsNameStyle.fontWeight ? 'bold' : '' }"
:class="[{ 'using-hidden': goodsValue.nameLineMode == 'single' }, { 'multi-hidden': goodsValue.nameLineMode == 'multiple' }]"> :class="[{ 'using-hidden': goodsValue.nameLineMode == 'single' }, { 'multi-hidden': goodsValue.nameLineMode == 'multiple' }]">
@ -353,7 +352,8 @@
<style lang="scss" scoped> <style lang="scss" scoped>
.give-diamond{ .give-diamond{
width: 145rpx; max-width:200rpx;
// max-width:200rpx;
display: inline-flex; display: inline-flex;
flex-direction: row; flex-direction: row;
flex-wrap: nowrap; flex-wrap: nowrap;

30
components/diy-components/diy-member-info.vue
View File

@ -101,20 +101,9 @@
<view class="account-item" @click="redirect('/pages_tool/member/balance_detail',{'from_type':'diamond'})"> <view class="account-item" @click="redirect('/pages_tool/member/balance_detail',{'from_type':'diamond'})">
<view class="value price-font">{{ memberInfo ? memberInfo.diamond : '--' }}</view> <view class="value price-font">{{ memberInfo ? memberInfo.diamond : '--' }}</view>
<!-- <view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.diamond != undefined ? parseInt(fenxiaoInfo.diamond) : '--' }}</view> --> <!-- <view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.diamond != undefined ? parseInt(fenxiaoInfo.diamond) : '--' }}</view> -->
<view class="title">钻石</view> <view class="title">猕猴桃</view>
</view> </view>
<!-- <view class="solid"></view>-->
<!-- <view class="account-item" @click="redirect('/pages_promotion/fenxiao/bill')">-->
<!-- <view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.contribution != undefined ? fenxiaoInfo.contribution : '&#45;&#45;' }}</view>-->
<!-- <view class="title">贡献值</view>-->
<!-- </view>-->
<!-- <view class="solid"></view>-->
<!-- <view class="account-item" @click="redirect('/pages_promotion/fenxiao/bill')">-->
<!-- <view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.house_purchase != undefined ? fenxiaoInfo.house_purchase : '&#45;&#45;' }}</view>-->
<!-- <view class="title">购房券</view>-->
<!-- </view>-->
</view> </view>
<view class="super-member" v-if="superMember" :style="superMemberStyle"> <view class="super-member" v-if="superMember" :style="superMemberStyle">
<block v-if="value.style == 1 || value.style == 2"> <block v-if="value.style == 1 || value.style == 2">
<view class="super-info"> <view class="super-info">
@ -139,12 +128,10 @@
</block> </block>
</view> </view>
</view> </view>
<view <view
class="account-info" class="account-info"
v-show="value.style == 2" v-show="value.style == 2"
:style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }" :style="{ 'margin-left': parseInt(value.infoMargin) * 2 + 'rpx', 'margin-right': parseInt(value.infoMargin) * 2 + 'rpx' }">
>
<view class="account-item" @click="redirect('/pages_tool/member/balance')"> <view class="account-item" @click="redirect('/pages_tool/member/balance')">
<view class="value price-font">{{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}</view> <view class="value price-font">{{ memberInfo ? (parseFloat(memberInfo.balance) + parseFloat(memberInfo.balance_money)).toFixed(2) : '--' }}</view>
<view class="title">余额</view> <view class="title">余额</view>
@ -159,16 +146,6 @@
<view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.diamond != undefined ? fenxiaoInfo.diamond : '--' }}</view> <view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.diamond != undefined ? fenxiaoInfo.diamond : '--' }}</view>
<view class="title">钻石</view> <view class="title">钻石</view>
</view> </view>
<!-- <view class="solid"></view>-->
<!-- <view class="account-item" @click="redirect('/pages_promotion/fenxiao/bill')">-->
<!-- <view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.contribution != undefined ? fenxiaoInfo.contribution : '&#45;&#45;' }}</view>-->
<!-- <view class="title">贡献值</view>-->
<!-- </view>-->
<!-- <view class="solid"></view>-->
<!-- <view class="account-item" @click="redirect('/pages_promotion/fenxiao/bill')">-->
<!-- <view class="value price-font">{{ fenxiaoInfo && fenxiaoInfo.house_purchase != undefined ? fenxiaoInfo.house_purchase : '&#45;&#45;' }}</view>-->
<!-- <view class="title">购房券</view>-->
<!-- </view>-->
</view> </view>
</view> </view>
@ -187,7 +164,6 @@
<view class="popup-bottom"><text class="iconfont iconfont-delete icon-close-guanbi" @click="closeMemberQrcode"></text></view> <view class="popup-bottom"><text class="iconfont iconfont-delete icon-close-guanbi" @click="closeMemberQrcode"></text></view>
</view> </view>
</uni-popup> </uni-popup>
<!-- 完善会员资料 --> <!-- 完善会员资料 -->
<view @touchmove.prevent.stop class="member-complete-info-popup"> <view @touchmove.prevent.stop class="member-complete-info-popup">
<uni-popup ref="completeInfoPopup" type="bottom" :maskClick="false"> <uni-popup ref="completeInfoPopup" type="bottom" :maskClick="false">
@ -208,12 +184,10 @@
<text class="label">昵称</text> <text class="label">昵称</text>
<input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" /> <input type="nickname" placeholder="请输入昵称" v-model="nickName" @blur="blurNickName" />
</view> </view>
<button type="default" class="save-btn" @click="saveCompleteInfo" :disabled="isDisabled">保存</button> <button type="default" class="save-btn" @click="saveCompleteInfo" :disabled="isDisabled">保存</button>
</view> </view>
</uni-popup> </uni-popup>
</view> </view>
<ns-login ref="login"></ns-login> <ns-login ref="login"></ns-login>
</view> </view>
</template> </template>

32
components/payment/payment.vue
View File

@ -11,12 +11,13 @@
<view class="pay-money"> <view class="pay-money">
<text class="money">支付金额{{ payMoney|moneyFormat }}元</text> <text class="money">支付金额{{ payMoney|moneyFormat }}元</text>
</view> </view>
<view class="payment-item" style="height: 78px;" v-if="balanceDeduct > 0 && balanceUsable && balanceConfig == 1">
<view class="payment-item" v-if="balanceDeduct > 0 && balanceUsable && balanceConfig == 1">
<view class="iconfont icon-yue"></view> <view class="iconfont icon-yue"></view>
<view class="info-wrap"> <view class="info-wrap">
<text class="name">余额抵扣</text> <text class="name">余额抵扣</text>
<view class="money">可用¥{{ balanceDeduct|moneyFormat }}</view> <view class="money">可用{{ balanceDeduct|moneyFormat }}</view>
<view class="money">当前{{ balance |moneyFormat }} </view>
<button @click="$util.redirectTo('/pages_tool/recharge/list')">去充值</button>
</view> </view>
<ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch> <ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
</view> </view>
@ -47,13 +48,9 @@
<script> <script>
import uniPopup from '@/components/uni-popup/uni-popup.vue'; import uniPopup from '@/components/uni-popup/uni-popup.vue';
import nsSwitch from '@/components/ns-switch/ns-switch.vue'; import nsSwitch from '@/components/ns-switch/ns-switch.vue';
// #ifdef H5 // #ifdef H5
import { import {Weixin} from 'common/js/wx-jssdk.js';
Weixin
} from 'common/js/wx-jssdk.js';
// #endif // #endif
export default { export default {
name: 'payment', name: 'payment',
components: { components: {
@ -129,9 +126,13 @@
this.$refs.choosePaymentPopup.close(); this.$refs.choosePaymentPopup.close();
}, },
// 使用余额 // 使用余额
useBalance() { useBalance(e) {
if(e){
this.isBalance=e;
}else{
this.isBalance = this.isBalance ? 0 : 1; this.isBalance = this.isBalance ? 0 : 1;
this.$emit('useBalance', this.isBalance) this.$emit('useBalance', this.isBalance)
}
}, },
confirm() { confirm() {
if (this.payTypeList.length == 0 && this.payMoney > 0) { if (this.payTypeList.length == 0 && this.payMoney > 0) {
@ -511,10 +512,9 @@
height: calc(100% - 270rpx); height: calc(100% - 270rpx);
} }
} }
.popup-footer { .popup-footer {
height: 100rpx; height: 100rpx;
margin-top:30px;
.confirm-btn { .confirm-btn {
height: 72rpx; height: 72rpx;
line-height: 72rpx; line-height: 72rpx;
@ -523,7 +523,6 @@
margin: 20rpx 30rpx 0; margin: 20rpx 30rpx 0;
border-radius: $border-radius; border-radius: $border-radius;
} }
&.bottom-safe-area { &.bottom-safe-area {
padding-bottom: constant(safe-area-inset-bottom); padding-bottom: constant(safe-area-inset-bottom);
padding-bottom: env(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom);
@ -589,11 +588,18 @@
font-size: $font-size-base; font-size: $font-size-base;
flex: 1; flex: 1;
} }
.money { .money {
color: $color-tip; color: $color-tip;
font-size: $font-size-tag; font-size: $font-size-tag;
} }
.confirm-btn {
height: 72rpx;
line-height: 72rpx;
color: #fff;
text-align: center;
margin: 20rpx 30rpx 0;
border-radius: $border-radius;
}
} }
.box { .box {

16
pages/goods/detail.vue
View File

@ -48,9 +48,7 @@
</text> </text>
<text class="price-symbol price-font"> <text class="price-symbol price-font">
.{{ .{{
parseFloat(goodsSkuDetail.discount_price) parseFloat(goodsSkuDetail.discount_price).toFixed(2).split('.')[1]
.toFixed(2)
.split('.')[1]
}} }}
</text> </text>
</template> </template>
@ -81,17 +79,11 @@
<template v-else> <template v-else>
<text class="price price-font"> <text class="price price-font">
{{ {{
parseFloat(goodsSkuDetail.price) parseFloat(goodsSkuDetail.price).toFixed(2).split('.')[0]
.toFixed(2)
.split('.')[0]
}} }}
</text> </text>
<text class="price-symbol price-font"> <text class="price-symbol price-font">
.{{ .{{parseFloat(goodsSkuDetail.price).toFixed(2).split('.')[1]}}
parseFloat(goodsSkuDetail.price)
.toFixed(2)
.split('.')[1]
}}
</text> </text>
</template> </template>
</template> </template>
@ -104,7 +96,7 @@
<!--</view>--> <!--</view>-->
<view class="give-diamond" v-if="parseFloat(goodsSkuDetail.give_diamond) > 0"> <view class="give-diamond" v-if="parseFloat(goodsSkuDetail.give_diamond) > 0">
<image class="give-diamond-image" :src="$util.img('public/static/img/futures/give_diamond.png')" mode="widthFix"></image> <image class="give-diamond-image" :src="$util.img('public/static/img/futures/give_diamond.png')" mode="widthFix"></image>
{{ parseFloat(goodsSkuDetail.give_diamond) }}颗钻石 {{ parseFloat(goodsSkuDetail.give_diamond) }}颗猕猴桃
</view> </view>
<view class="follow-and-share"> <view class="follow-and-share">
<text class="follow iconfont icon-share" @click="openSharePopup()"></text> <text class="follow iconfont icon-share" @click="openSharePopup()"></text>

2
pages_promotion/fenxiao/goods_list.vue
View File

@ -27,7 +27,7 @@
</view> </view>
</view> </view>
</view> </view>
<view class="empty" v-if="goodsList.length == 0"><ns-empty :isIndex="false" text="暂无分销商品"></ns-empty></view> <view class="empty" v-if="goodsList.length == 0"><ns-empty :isIndex="false" text="暂无商品"></ns-empty></view>
</block> </block>
</mescroll-uni> </mescroll-uni>
<view class="active-btn" v-if="goodsList.length"> <view class="active-btn" v-if="goodsList.length">

11
pages_promotion/fenxiao/index.vue
View File

@ -59,7 +59,7 @@
<view class="icon-wrap"><image :src="$util.img('public/uniapp/fenxiao/index/tixian.png')" mode="widthFix"></image></view> <view class="icon-wrap"><image :src="$util.img('public/uniapp/fenxiao/index/tixian.png')" mode="widthFix"></image></view>
<view class="info"> <view class="info">
<view class="title">{{ fenxiaoWords.withdraw }}明细</view> <view class="title">{{ fenxiaoWords.withdraw }}明细</view>
<view class="desc">累计{{ fenxiaoWords.account }}￥{{ info.total_commission | moneyFormat }}</view> <view class="desc">累计{{ fenxiaoWords.account }}{{ info.total_commission | moneyFormat }}</view>
</view> </view>
</view> </view>
<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/order')"> <view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/order')">
@ -104,13 +104,13 @@
<view class="desc">您的排名为{{ invitedNumRanking }}位</view> <view class="desc">您的排名为{{ invitedNumRanking }}位</view>
</view> </view>
</view> </view>
<view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/level')" v-if="levelList.length"> <!-- <view class="menu-item" @click="$util.redirectTo('/pages_promotion/fenxiao/level')" v-if="levelList.length">
<view class="icon-wrap"><image :src="$util.img('public/uniapp/fenxiao/index/team_reward.png')" mode="widthFix"></image></view> <view class="icon-wrap"><image :src="$util.img('public/uniapp/fenxiao/index/team_reward.png')" mode="widthFix"></image></view>
<view class="info"> <view class="info">
<view class="title">等级说明</view> <view class="title">个人业绩</view>
<view class="desc">{{ fenxiaoWords.concept }}等级说明</view> <view class="desc">{{ fenxiaoWords.concept }}等级说明</view>
</view> </view>
</view> </view> -->
</view> </view>
</block> </block>
<ns-copyright></ns-copyright> <ns-copyright></ns-copyright>
@ -121,7 +121,6 @@
</view> </view>
<ns-login ref="login"></ns-login> <ns-login ref="login"></ns-login>
<loading-cover ref="loadingCover"></loading-cover> <loading-cover ref="loadingCover"></loading-cover>
<uni-popup ref="taskPopup" type="bottom"> <uni-popup ref="taskPopup" type="bottom">
<view class="deliverytype-popup-layer popup-layer" v-if="levelInfo"> <view class="deliverytype-popup-layer popup-layer" v-if="levelInfo">
<view class="head-wrap"> <view class="head-wrap">
@ -143,7 +142,6 @@
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
<uni-popup type="bottom" ref="tips"> <uni-popup type="bottom" ref="tips">
<view class="popup"> <view class="popup">
<view class="popup-header"> <view class="popup-header">
@ -158,7 +156,6 @@
</uni-popup> </uni-popup>
</view> </view>
</template> </template>
<script> <script>
import fenxiaoWords from '@/common/js/fenxiao-words.js'; import fenxiaoWords from '@/common/js/fenxiao-words.js';
import uniPopup from '@/components/uni-popup/uni-popup.vue'; import uniPopup from '@/components/uni-popup/uni-popup.vue';

19
pages_promotion/fenxiao/level.vue
View File

@ -4,7 +4,6 @@
<view class="level-top"> <view class="level-top">
<image :src="$util.img('public/uniapp/level/level-top-bg.png')"></image> <image :src="$util.img('public/uniapp/level/level-top-bg.png')"></image>
</view> </view>
<swiper :autoplay="false" :duration="500" class="level-swiper" previous-margin="50rpx" next-margin="50rpx" @change="swiperChange" :current="curr"> <swiper :autoplay="false" :duration="500" class="level-swiper" previous-margin="50rpx" next-margin="50rpx" @change="swiperChange" :current="curr">
<swiper-item v-for="(item, index) in levelList" :key="index"> <swiper-item v-for="(item, index) in levelList" :key="index">
<view class="level-item" :class="{'curr': index == curr}"> <view class="level-item" :class="{'curr': index == curr}">
@ -22,12 +21,12 @@
</view> </view>
<view class="level-rate"> <view class="level-rate">
<view class="rate-item" v-if="config.level > 0"> <view class="rate-item" v-if="config.level > 0">
<view class="title">一级分佣比率</view> <view class="title">管理业绩</view>
<view class="rate">{{ item.one_rate }}<text class="percentage">%</text></view> <view class="rate">{{ item.one_rate }}<text class="percentage"></text></view>
</view> </view>
<view class="rate-item" v-if="config.level > 1"> <view class="rate-item" v-if="config.level > 1">
<view class="title">二级分佣比率</view> <view class="title">推广业绩</view>
<view class="rate">{{ item.two_rate }}<text class="percentage">%</text></view> <view class="rate">{{ item.two_rate }}<text class="percentage"></text></view>
</view> </view>
<view class="rate-item" v-if="config.level > 2"> <view class="rate-item" v-if="config.level > 2">
<view class="title">三级分佣比率</view> <view class="title">三级分佣比率</view>
@ -56,19 +55,19 @@
<view class="flex-box"> <view class="flex-box">
<view class="title"> <view class="title">
{{item.title}} {{item.title}}
<text class="iconfont icon-wenxiao" @click="openTips(item)"></text> <!-- <text class="iconfont icon-wenxiao" @click="openTips(item)"></text> -->
</view> </view>
<view class="status" :class="{'complete': item.progress == 100}">{{ item.progress == 100 ? '已完成' : '未完成' }}</view> <!-- <view class="status" :class="{'complete': item.progress == 100}">{{ item.progress == 100 ? '已完成' : '未完成' }}</view> -->
</view> </view>
<view class="progress"> <view class="progress">
<progress :percent="item.progress" activeColor="#E7B667" stroke-width="4" /> <!-- <progress :percent="item.progress" activeColor="#E7B667" stroke-width="4" /> -->
</view> </view>
<view class="flex-box"> <view class="flex-box">
<view class="desc">{{item.desc}}</view> <view class="desc">{{item.desc}}</view>
<view class="rate price-font"> <!-- <view class="rate price-font">
<text class="complete">{{ item.value }}</text> <text class="complete">{{ item.value }}</text>
<text class="num">/{{ item.condition }}</text> <text class="num">/{{ item.condition }}</text>
</view> </view> -->
</view> </view>
</view> </view>
</view> </view>

8
pages_promotion/fenxiao/order.vue
View File

@ -16,7 +16,6 @@
<text class="status-name color-text-green" v-else-if="orderItem.is_settlement == 1">已结算</text> <text class="status-name color-text-green" v-else-if="orderItem.is_settlement == 1">已结算</text>
<text class="status-name color-text-orange" v-else>待结算</text> <text class="status-name color-text-orange" v-else>待结算</text>
</view> </view>
<view class="order-body"> <view class="order-body">
<view class="goods-wrap"> <view class="goods-wrap">
<view class="goods-img"> <view class="goods-img">
@ -26,8 +25,8 @@
<view class="top-wrap"> <view class="top-wrap">
<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view> <view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
<view> <view>
<text class="color-tip">返{{ fenxiaoWords.account }}</text> <text class="color-tip"> {{ fenxiaoWords.account }}</text>
<text class="price-color price-style small">{{ $lang('common.currencySymbol') }}</text> <!-- <text class="price-color price-style small">{{ $lang('common.currencySymbol') }}</text> -->
<text class="price-color price-style large" >{{ parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}</text> <text class="price-color price-style large" >{{ parseFloat(orderItem.commission).toFixed(2).split(".")[0] }}</text>
<text class="price-color price-style small">.{{ parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}</text> <text class="price-color price-style small">.{{ parseFloat(orderItem.commission).toFixed(2).split(".")[1] }}</text>
</view> </view>
@ -60,7 +59,6 @@
<view class="total"> <view class="total">
<text>合计：</text> <text>合计：</text>
<text class="price-color">{{ $lang('common.currencySymbol') }}</text> <text class="price-color">{{ $lang('common.currencySymbol') }}</text>
<text class="price-color font-size-toolbar" >{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}</text> <text class="price-color font-size-toolbar" >{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[0] }}</text>
<text class="price-color">.{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}</text> <text class="price-color">.{{ parseFloat(orderItem.real_goods_money).toFixed(2).split(".")[1] }}</text>
</view> </view>
@ -76,7 +74,6 @@
</view> </view>
</view> </view>
</mescroll-uni> </mescroll-uni>
<ns-login ref="login"></ns-login> <ns-login ref="login"></ns-login>
<loading-cover ref="loadingCover"></loading-cover> <loading-cover ref="loadingCover"></loading-cover>
</view> </view>
@ -187,6 +184,7 @@ export default {
this.$refs.mescroll.refresh(); this.$refs.mescroll.refresh();
}, },
toDetail(e) { toDetail(e) {
return false;
this.$util.redirectTo('/pages_promotion/fenxiao/order_detail', { this.$util.redirectTo('/pages_promotion/fenxiao/order_detail', {
id: e id: e
}); });

4
pages_promotion/fenxiao/ranking_list.vue
View File

@ -16,7 +16,7 @@
<text class="name">{{info.nickname}}</text> <text class="name">{{info.nickname}}</text>
</view> </view>
<view class="withdrawal" <view class="withdrawal"
@click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')" v-if="type == 'profit'">点击提现</view> @click="$util.redirectTo('/pages_promotion/fenxiao/withdraw_apply')" v-if="type == 'profit'">转入余额</view>
<view class="withdrawal" <view class="withdrawal"
@click="$util.redirectTo('/pages_promotion/fenxiao/team')" v-if="type == 'invited_num'">我的团队</view> @click="$util.redirectTo('/pages_promotion/fenxiao/team')" v-if="type == 'invited_num'">我的团队</view>
@ -32,7 +32,7 @@
<text class="iconfont icon-fenxiao"></text> <text class="iconfont icon-fenxiao"></text>
</view> </view>
<view class="all-money-tit-wrap"> <view class="all-money-tit-wrap">
<text class="all-money-tit">业绩佣金</text> <text class="all-money-tit">业绩</text>
<text class="all-money-num">{{ info.today_commission}}</text> <text class="all-money-num">{{ info.today_commission}}</text>
</view> </view>
</view> </view>

3
pages_promotion/fenxiao/relation.vue
View File

@ -21,7 +21,7 @@
<view class="top-wrap"> <view class="top-wrap">
<view class="goods-name font-size-base">{{ orderItem.sku_name }}</view> <view class="goods-name font-size-base">{{ orderItem.sku_name }}</view>
<view> <view>
<text class="color-tip">返{{ fenxiaoWords.account }}</text> <text class="color-tip">{{ fenxiaoWords.account }}</text>
<text class="price-color font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text> <text class="price-color font-size-goods-tag">{{ $lang('common.currencySymbol') }}</text>
<text class="price-color font-size-toolbar">{{ orderItem.commission }}</text> <text class="price-color font-size-toolbar">{{ orderItem.commission }}</text>
</view> </view>
@ -133,6 +133,7 @@ export default {
this.$forceUpdate(); this.$forceUpdate();
}, },
toDetail(e) { toDetail(e) {
return;
this.$util.redirectTo('/pages_promotion/fenxiao/order_detail', { this.$util.redirectTo('/pages_promotion/fenxiao/order_detail', {
id: e id: e
}); });

10
pages_promotion/fenxiao/team.vue
View File

@ -54,12 +54,10 @@
</block> </block>
</block> </block>
</mescroll-uni> </mescroll-uni>
<ns-login ref="login"></ns-login> <ns-login ref="login"></ns-login>
<loading-cover ref="loadingCover"></loading-cover> <loading-cover ref="loadingCover"></loading-cover>
</view> </view>
</template> </template>
<script> <script>
import fenxiaoWords from 'common/js/fenxiao-words.js'; import fenxiaoWords from 'common/js/fenxiao-words.js';
export default { export default {
@ -68,12 +66,12 @@ export default {
category: [ category: [
{ {
id: 0, id: 0,
name: '一级', name: '联创',
number: 0 number: 0
}, },
{ {
id: 1, id: 1,
name: '二级', name: '推广',
number: 2 number: 2
} }
], ],
@ -99,10 +97,8 @@ export default {
return; return;
} }
}, 1000); }, 1000);
if(this.fenxiaoWords && this.fenxiaoWords.my_team) this.$langConfig.title(this.fenxiaoWords.my_team); if(this.fenxiaoWords && this.fenxiaoWords.my_team) this.$langConfig.title(this.fenxiaoWords.my_team);
this.getFenXiaoLevel(); this.getFenXiaoLevel();
if (uni.getStorageSync('token')) { if (uni.getStorageSync('token')) {
this.token = uni.getStorageSync('token'); this.token = uni.getStorageSync('token');
} else { } else {
@ -192,7 +188,6 @@ export default {
} }
}; };
</script> </script>
<style lang="scss"> <style lang="scss">
.team-cate { .team-cate {
padding: 0 30rpx; padding: 0 30rpx;
@ -204,7 +199,6 @@ export default {
position: fixed; position: fixed;
left: 0; left: 0;
top: var(--window-top); top: var(--window-top);
.cate-li { .cate-li {
flex: 1; flex: 1;
display: flex; display: flex;

12
pages_promotion/fenxiao/withdraw_apply.vue
View File

@ -24,7 +24,7 @@
<image :src="$util.img('public/uniapp/member/apply_withdrawal/tixian.png')" mode="widthFix"></image> <image :src="$util.img('public/uniapp/member/apply_withdrawal/tixian.png')" mode="widthFix"></image>
</view> </view>
</view> </view>
<view class="iconfont icon-right"></view> <!-- <view class="iconfont icon-right"></view> -->
</view> </view>
<view class="empty-box"></view> <view class="empty-box"></view>
<view class="withdraw-wrap"> <view class="withdraw-wrap">
@ -36,7 +36,7 @@
</view> </view>
<view class="bootom"> <view class="bootom">
<view> <view>
<text class="color-tip">可提现佣金：{{ $lang('common.currencySymbol') }}{{ withdrawInfo.account | moneyFormat }}</text> <text class="color-tip">可提现：{{ $lang('common.currencySymbol') }}{{ withdrawInfo.account | moneyFormat }}</text>
<text class="all-tx color-base-text" @click="allTx">全部提现</text> <text class="all-tx color-base-text" @click="allTx">全部提现</text>
</view> </view>
</view> </view>
@ -50,11 +50,9 @@
<view <view
class="btn color-base-border ns-gradient-otherpages-member-widthdrawal-withdrawal" class="btn color-base-border ns-gradient-otherpages-member-widthdrawal-withdrawal"
:class="{ disabled: withdrawMoney == '' || withdrawMoney == 0 }" :class="{ disabled: withdrawMoney == '' || withdrawMoney == 0 }"
@click="withdraw" @click="withdraw">
>
提现 提现
</view> </view>
<view class="recoend" @click="toWithdrawal"><view class="recoend-con">提现记录</view></view> <view class="recoend" @click="toWithdrawal"><view class="recoend-con">提现记录</view></view>
<loading-cover ref="loadingCover"></loading-cover> <loading-cover ref="loadingCover"></loading-cover>
</view> </view>
@ -69,7 +67,7 @@ export default {
bankAccountInfo: {}, bankAccountInfo: {},
withdrawMoney: '', withdrawMoney: '',
isSub: false, isSub: false,
isBalance: 0, isBalance: 1,
payList: null payList: null
}; };
}, },
@ -174,6 +172,7 @@ export default {
} }
let money = this.withdrawConfigInfo.max > this.withdrawInfo.account ? this.withdrawInfo.account : this.withdrawConfigInfo.max; let money = this.withdrawConfigInfo.max > this.withdrawInfo.account ? this.withdrawInfo.account : this.withdrawConfigInfo.max;
if (parseFloat(this.withdrawMoney) > 0 && (parseFloat(this.withdrawMoney) > parseFloat(money))) { if (parseFloat(this.withdrawMoney) > 0 && (parseFloat(this.withdrawMoney) > parseFloat(money))) {
console.log(money,this.withdrawMoney)
this.$util.showToast({ this.$util.showToast({
title: '提现金额超出可提现金额' title: '提现金额超出可提现金额'
}); });
@ -277,6 +276,7 @@ export default {
} }
}, },
goAccount() { goAccount() {
return;
this.$util.redirectTo( this.$util.redirectTo(
'/pages_tool/member/account', '/pages_tool/member/account',
{ {

14
pages_rush/components/pay-pop/pay-pop.vue
View File

@ -5,26 +5,26 @@
<view class="box" :class="AlertObj[AlertClass][AlertClassUp]"> <view class="box" :class="AlertObj[AlertClass][AlertClassUp]">
<view class="bottom"> <view class="bottom">
<view class="bg"> <view class="bg">
<image src="./static/bg.png" mode="widthFix" /> <image :src="$util.img('public/picture/pass/bg.png')" mode="widthFix" />
</view> </view>
<view class="tle"> <view class="tle">
<view class="tle_lft"> <view class="tle_lft">
<image src="./static/pwd.png" mode="widthFix" /> <image :src="$util.img('public/picture/pass/pwd.png')" mode="widthFix" />
<view class="tle_1">{{txt}}</view> <view class="tle_1">{{txt}}</view>
<view class="tle_2">(长度{{pwdlength}}位)</view> <view class="tle_2">(长度{{pwdlength}}位)</view>
</view> </view>
<view class="tle_rgt" @tap.stop="is_vis=!is_vis"> <view class="tle_rgt" @tap.stop="is_vis=!is_vis">
<block v-if="is_vis"> <block v-if="is_vis">
<image src="./static/yj2.png" mode="widthFix" /> <image :src="$util.img('public/picture/pass/yj2.png')" mode="widthFix" />
</block> </block>
<block v-else> <block v-else>
<image src="./static/yj1.png" mode="widthFix" /> <image :src="$util.img('public/picture/pass/yj1.png')" mode="widthFix" />
</block> </block>
</view> </view>
</view> </view>
<view class="pwd_box" @click.stop> <view class="pwd_box" @click.stop>
<view class="pwd-text" :class="{active:(idx==k)}" v-for="(v,k) in pwdlength" :key="k"> <view class="pwd-text" :class="{active:(idx==k)}" v-for="(v,k) in pwdlength" :key="k">
{{star_lis[k]}} {{star_lis[k] ||''}}
</view> </view>
</view> </view>
<view class="pwd_info"> <view class="pwd_info">
@ -36,13 +36,13 @@
@tap="click(k+1)">{{k+1}}</button> @tap="click(k+1)">{{k+1}}</button>
<button class="s_li s_o" type="primary" plain="true" @tap=click(0)>0</button> <button class="s_li s_o" type="primary" plain="true" @tap=click(0)>0</button>
<button class="s_li s_sq" type="primary" plain="true" @tap="Close"> <button class="s_li s_sq" type="primary" plain="true" @tap="Close">
<image src="./static/sq.png" mode="widthFix" /> <image :src="$util.img('public/picture/pass/sq.png')" mode="widthFix" />
</button> </button>
</view> </view>
<view class="s_rgt"> <view class="s_rgt">
<view class="s_cx"> <view class="s_cx">
<button class="s_li s_x" type="primary" plain="true" @tap="del"> <button class="s_li s_x" type="primary" plain="true" @tap="del">
<image src="./static/ht.png" mode="widthFix" /> <image :src="$util.img('public/picture/pass/ht.png')" mode="widthFix" />
</button> </button>
</view> </view>
<view class="s_qd"> <view class="s_qd">

2
pages_rush/components/pay-pop/static/szjp.scss
View File

@ -129,7 +129,7 @@
.solt { .solt {
width: 96vw; width: 96vw;
background: #f5f5f5; background: #f5f5f5;
padding: 40rpx 2vw; padding: 10rpx 2vw;
display: flex; display: flex;
align-items: center; align-items: center;
border-top: 1px solid #ccc; border-top: 1px solid #ccc;

3
pages_rush/futures/details.vue
View File

@ -157,10 +157,8 @@ export default {
this.$refs.payPop.Open() this.$refs.payPop.Open()
}, },
pwdEvend(pass){ pwdEvend(pass){
console.log('密码是：', pass)
this.orderCreateData.payPassword=pass; this.orderCreateData.payPassword=pass;
this.orderCreate(); //创建订单 this.orderCreate(); //创建订单
}, },
// 获取商品列表 // 获取商品列表
getDetail(id) { getDetail(id) {
@ -176,7 +174,6 @@ export default {
// 开启倒计时 // 开启倒计时
this.countDown(); this.countDown();
} }
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
}, },
fail: res => { fail: res => {

6
pages_rush/futures/my_shop.vue
View File

@ -43,7 +43,7 @@
<i class="icondiy icon-system-arrow-right-s-line"></i> <i class="icondiy icon-system-arrow-right-s-line"></i>
</view> </view>
</view> </view>
<view class="point">您已完成{{user.business_num}}次寄售</view> <view class="point">您已完成{{user.business_num}}次购买</view>
</view> </view>
</view> </view>
<!--登录弹框--> <!--登录弹框-->
@ -126,7 +126,6 @@ export default {
this.end_time = this.user.punish_time || 0; this.end_time = this.user.punish_time || 0;
// 开启倒计时 // 开启倒计时
this.countDown(); this.countDown();
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
} }
}, },
@ -149,7 +148,6 @@ export default {
} }
}, 1000) }, 1000)
}, },
}, },
onBackPress(options) { onBackPress(options) {
if (options.from === 'navigateBack') return false; if (options.from === 'navigateBack') return false;
@ -158,12 +156,10 @@ export default {
} }
}; };
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.my-shop{ .my-shop{
background: #f5f6fa; background: #f5f6fa;
min-height: 100vh; min-height: 100vh;
.top{ .top{
width: 100%; width: 100%;
position: relative; position: relative;

44
pages_rush/futures/order.vue
View File

@ -20,10 +20,11 @@
<!--订单列表--> <!--订单列表-->
<mescroll-uni ref="mescroll" @getData="getList" top="170"> <mescroll-uni ref="mescroll" @getData="getList" top="170">
<block slot="list"> <block slot="list">
<view class="orderNum">总订单: {{orderCount}} 单</view>
<view class="list" v-if="list.length > 0"> <view class="list" v-if="list.length > 0">
<view class="list-block" v-for="(item,index) in list" :key="index"> <view class="list-block" v-for="(item,index) in list" :key="index">
<view class="block-top"> <view class="block-top">
<view class="left">订单号：{{ item.order_no }}</view> <view class="left">订单号：{{ item.order_no || 'NO00000'}}</view>
<view class="right">{{statusText(item)}}</view> <view class="right">{{statusText(item)}}</view>
</view> </view>
<view class="block-content"> <view class="block-content">
@ -32,15 +33,24 @@
</view> </view>
<view class="right"> <view class="right">
<view class="goods-name">{{ item.goods_name }}</view> <view class="goods-name">{{ item.goods_name }}</view>
<view class="goods-name" >销售商：{{item.buyer_name }}</view>
<view class="goods-num">数量：{{ item.total }}</view> <view class="goods-num">数量：{{ item.total }}</view>
<view v-if="pageType=='release'">
<view class="goods-info"> <view class="goods-info">
总计：<view class="goods-info-price"><text class="goods-info-unit">￥</text>{{ item.unit_price }}</view> 采购价：<view class="goods-info-price"><text class="goods-info-unit">￥</text>{{item.unit_price}}</view>
</view>
<view class="goods-info" >
售卖价：<view class="goods-info-price"><text class="goods-info-unit">￥</text>{{ item.price }}</view>
</view>
</view>
<view class="goods-info" v-if="pageType =='stock' || pageType=='all'">
采购价：<view class="goods-info-price"><text class="goods-info-unit">￥</text>{{item.unit_price}}</view>
</view> </view>
</view> </view>
</view> </view>
<view class="buttons"> <view class="buttons">
<view v-if="item.status=='6'" class="button-item color-base-text color-base-border" @click="quickPay(item)">支付</view> <view v-if="item.status=='6' && tabs_active=='myorderpay'" class="button-item color-base-text color-base-border" @click="quickPay(item)">支付</view>
<view v-else class="button-item" @click="$util.redirectTo('/pages_rush/futures/order_details',{ futures_id: item.id })">查看详情</view> <view v-else class="button-item" @click="$util.redirectTo('/pages_rush/futures/order_details',{futures_id: item.id,'pagetype':pageType })">查看详情</view>
</view> </view>
</view> </view>
</view> </view>
@ -49,6 +59,7 @@
</view> </view>
</block> </block>
</mescroll-uni> </mescroll-uni>
<pay-pop txt="支付密码" :pwdlength="6" ref="payPop" @pwd_e="pwdEvend" />
<ns-payment ref="choosePaymentPopup"></ns-payment> <ns-payment ref="choosePaymentPopup"></ns-payment>
<ns-payment ref="choosePaymentMergePopup"></ns-payment> <ns-payment ref="choosePaymentMergePopup"></ns-payment>
<!--登录弹框--> <!--登录弹框-->
@ -60,6 +71,7 @@
<script> <script>
import nsPayment from '@/components/payment/payment.vue'; import nsPayment from '@/components/payment/payment.vue';
import orderMethod from '../order/public/js/orderMethod.js'; import orderMethod from '../order/public/js/orderMethod.js';
import payPop from '@/pages_rush/components/pay-pop/pay-pop.vue';
export default { export default {
data() { data() {
return { return {
@ -67,6 +79,7 @@ export default {
payMoney: 0, payMoney: 0,
payMoneyMerge: 0, payMoneyMerge: 0,
searchText: '', searchText: '',
pageType: 'release',
tabs_active: 'all', tabs_active: 'all',
tabs: [], tabs: [],
page_titles: { page_titles: {
@ -76,6 +89,7 @@ export default {
sold: '已售卖订单', sold: '已售卖订单',
}, },
list: [], list: [],
orderCount:0,
status_text: { status_text: {
1 : '库存', 1 : '库存',
2 : '正在销售', 2 : '正在销售',
@ -88,11 +102,13 @@ export default {
}; };
}, },
components: { components: {
payPop,
nsPayment nsPayment
}, },
mixins: [orderMethod], mixins: [orderMethod],
onLoad(option) { onLoad(option) {
// 获取需要显示的订单类型 // 获取需要显示的订单类型
this.pageType=option.status || 'release';
if(option.status == 'release'){ if(option.status == 'release'){
this.tabs_active = 6; this.tabs_active = 6;
this.tabs = [ this.tabs = [
@ -136,10 +152,16 @@ export default {
}, },
methods: { methods: {
quickPay(orderData){ quickPay(orderData){
console.log(orderData);
this.orderData = orderData; this.orderData = orderData;
this.payMoney = parseFloat(orderData.pay_money); this.payMoney = parseFloat(orderData.pay_money);
// this.isBalance
this.$refs.choosePaymentPopup.useBalance(1);
this.orderPay(orderData); this.orderPay(orderData);
// this.$refs.payPop.Open();
},
pwdEvend(){
}, },
statusText(item){ statusText(item){
switch (item.status){ switch (item.status){
@ -183,6 +205,7 @@ export default {
}, },
success: res => { success: res => {
if(parseInt(res.code) === 0){ if(parseInt(res.code) === 0){
this.orderCount=res.data.count||0;
mescroll.endSuccess(Object.keys(res.data.list).length); mescroll.endSuccess(Object.keys(res.data.list).length);
//设置列表数据 //设置列表数据
if (parseInt(mescroll.num) === 1){ if (parseInt(mescroll.num) === 1){
@ -279,10 +302,16 @@ export default {
background-color: #d86351; background-color: #d86351;
} }
} }
.orderNum{
height: 20px;
padding: 30rpx;
background: #fff;
margin: 15px 15px 0;
border-radius: 10px;
}
.list{ .list{
width: calc(100vw - (30rpx * 2)); width: calc(100vw - (30rpx * 2));
padding: 30rpx; padding: 30rpx;
.list-block{ .list-block{
padding: 20rpx; padding: 20rpx;
margin-bottom: 30rpx; margin-bottom: 30rpx;
@ -316,7 +345,7 @@ export default {
} }
} }
.block-content{ .block-content{
--content-height--: 150rpx; --content-height--: 240rpx;
height: var(--content-height--); height: var(--content-height--);
width: 100%; width: 100%;
padding: 10rpx 0; padding: 10rpx 0;
@ -368,6 +397,7 @@ export default {
font-size: 26rpx; font-size: 26rpx;
height: 50rpx; height: 50rpx;
.goods-info-price{ .goods-info-price{
// margin-left: 5px;
color: #e05c3b; color: #e05c3b;
.goods-info-unit{ .goods-info-unit{
font-size: 24rpx; font-size: 24rpx;

75
pages_rush/futures/order_details.vue
View File

@ -17,28 +17,32 @@
<!--信息列表--> <!--信息列表-->
<view class="info-list"> <view class="info-list">
<view class="info-list-block"> <view class="info-list-block">
<view class="left">用户昵称</view> <view class="left">卖家昵称</view>
<view class="right">{{ info.seller_nickname }}</view> <view class="right">{{ info.seller_nickname }}</view>
</view> </view>
<view class="info-list-block" > <view class="info-list-block" >
<view class="left">买家姓名</view> <view class="left">买家昵称</view>
<view class="right ">{{ info.buyer_name }}</view> <view class="right ">{{ info.buyer_name ||'' }}</view>
</view> </view>
<view class="info-list-block"> <view class="info-list-block">
<view class="left">订单金额</view> <view class="left">订单金额</view>
<view class="right right-price">￥{{ info.unit_price }}元</view> <view class="right right-price">￥{{ info.unit_price }}元</view>
</view> </view>
<view class="info-list-block"> <!-- <view class="info-list-block">
<view class="left">服务费</view> <view class="left">服务费</view>
<view class="right right-price">{{ info.service_price }}</view> <view class="right right-price">{{ info.service_price }}</view>
</view> </view>
<view class="info-list-block"> <view class="info-list-block">
<view class="left">实际收入</view> <view class="left">实际收入</view>
<view class="right right-price">{{ info.real_income }}</view> <view class="right right-price">{{ info.real_income }}</view>
</view> </view> -->
<view class="info-list-block"> <view class="info-list-block">
<view class="left">订单编号<text class="copy-buttons" @click="$util.copy(info.order_no)">复制</text></view> <view class="left">订单编号<text class="copy-buttons" @click="$util.copy(info.order_no)">复制</text></view>
<view class="right">{{ info.order_no }}</view> <view class="right">{{ info.order_no ||'NO000000'}}</view>
</view>
<view class="info-list-block">
<view class="left">采购数量</view>
<view class="right">{{info.total}}</view>
</view> </view>
<view class="info-list-block"> <view class="info-list-block">
<view class="left">购买时间</view> <view class="left">购买时间</view>
@ -58,7 +62,7 @@
</view> </view>
</view> </view>
<!--操作按钮--> <!--操作按钮-->
<view class="buttons"> <view class="buttons" v-if="pageType=='stock'" >
<view class="buttons-item buttons-item-pickup" @click="openWarehouseShopConfirm" v-if="parseInt(info.status) === 1 && info.order_id !== 0">自提产品</view> <view class="buttons-item buttons-item-pickup" @click="openWarehouseShopConfirm" v-if="parseInt(info.status) === 1 && info.order_id !== 0">自提产品</view>
<view class="buttons-item buttons-item-sale" @click="$refs.saleGoods.open()" v-if="parseInt(info.status) === 1">出售商品</view> <view class="buttons-item buttons-item-sale" @click="$refs.saleGoods.open()" v-if="parseInt(info.status) === 1">出售商品</view>
<view class="buttons-item buttons-item-undercarriage" @click="$refs.undercarriageConfirm.open()" v-if="parseInt(info.status) === 2">下架商品</view> <view class="buttons-item buttons-item-undercarriage" @click="$refs.undercarriageConfirm.open()" v-if="parseInt(info.status) === 2">下架商品</view>
@ -82,21 +86,22 @@
<view class="info-content">{{ service_charge }}</view> <view class="info-content">{{ service_charge }}</view>
</view> </view>
<view class="transfer-info-block"> <view class="transfer-info-block">
<view class="info-title">实际收入</view> <view class="info-title">商家应收</view>
<view class="info-content">{{ real_income }}</view> <view class="info-content">{{ real_income }}</view>
</view> </view>
<view class="transfer-info-block"> <view class="transfer-info-block">
<view class="info-title">建议售价</view> <view class="info-title">建议售价</view>
<view class="info-content">{{ price_range.max_price }}</view> <view class="info-content">{{proposedPrice}}</view>
</view> </view>
</view> </view>
<view class="transfer-price"> <view class="transfer-price">
<view>请输入转售价格：</view> <view>请输入转售价格：</view>
<view> <view>
<input type="number" class="input" v-model="transfer_price"/> <input type="number" class="input" v-model="transfer_price" :placeholder="'最高出售价:'+ price_range.max_price" />
</view> </view>
</view> </view>
<view class="transfer-price-tips">转让价格必须大于{{ price_range.min_price }}并且小于等于{{ price_range.max_price }}！</view> <!-- <view class="transfer-price-tips">转让价格必须大于{{ price_range.min_price }}并且小于等于{{ price_range.max_price }}！</view> -->
<view class="rinfo" @click="$util.redirectTo('/pages_tool/recharge/list')">去充值</view>
<view class="transfer-price-button"> <view class="transfer-price-button">
<view class="transfer-buttons" @click="sale">确定出售</view> <view class="transfer-buttons" @click="sale">确定出售</view>
</view> </view>
@ -108,14 +113,16 @@
</uni-popup> </uni-popup>
<!-- 下架确认弹框 --> <!-- 下架确认弹框 -->
<uni-popup ref="undercarriageConfirm" type="dialog" class="order-remarks-content"> <uni-popup ref="undercarriageConfirm" type="dialog" class="order-remarks-content">
<uni-popup-dialog mode="base" content="确认下架售卖中的商品吗！" @close="$refs.undercarriageConfirm.close()" @confirm="undercarriage"></uni-popup-dialog> <uni-popup-dialog mode="base" content="确认下架售卖中的商品吗"
@close="$refs.undercarriageConfirm.close()"
@confirm="undercarriage">
</uni-popup-dialog>
</uni-popup> </uni-popup>
<!--登录弹框--> <!--登录弹框-->
<ns-login ref="login"></ns-login> <ns-login ref="login"></ns-login>
<!--加载动画--> <!--加载动画-->
<loading-cover ref="loadingCover"></loading-cover> <loading-cover ref="loadingCover"></loading-cover>
</view> </view>
<!-- 仓库卖出确认 增加数量选择 --> <!-- 仓库卖出确认 增加数量选择 -->
<uni-popup ref="warehouseConfirm" type="bottom"> <uni-popup ref="warehouseConfirm" type="bottom">
<view class="sku-info" style="height: 22vh;background: white"> <view class="sku-info" style="height: 22vh;background: white">
@ -146,15 +153,12 @@
</template> </template>
</template> </template>
</view> </view>
</view> </view>
</uni-popup> </uni-popup>
</template> </template>
<script> <script>
import uniPopup from '@/pages_rush/components/uni-popup-new/uni-popup.vue'; import uniPopup from '@/pages_rush/components/uni-popup-new/uni-popup.vue';
import uniPopupDialog from '@/pages_rush/components/uni-popup-dialog/uni-popup-dialog.vue'; import uniPopupDialog from '@/pages_rush/components/uni-popup-dialog/uni-popup-dialog.vue';
export default { export default {
components: { components: {
uniPopup, uniPopup,
@ -173,19 +177,23 @@ export default {
6 : '待支付', 6 : '待支付',
7 : '捡漏', 7 : '捡漏',
}, },
confing: {},
price_range: {}, price_range: {},
transfer_price: 0.00,// 转售价格 proposedPrice: '',// 建议转售价格
transfer_price: '',// 转售价格
split_message: '',// 拆单确认信息 split_message: '',// 拆单确认信息
service_charge: 0.00, // 手续费 service_charge: 0.00, // 手续费
real_income: 0.00,// 实际收入 real_income: 0.00,// 实际收入
memberAddress: null, // 会员收货地址 memberAddress: null, // 会员收货地址
is_pickup: false is_pickup: false,
pageType: '',
}; };
}, },
mixins: [], mixins: [],
onLoad(option) { onLoad(option) {
this.getMemberAddress() this.getMemberAddress()
this.futures_id = option.futures_id || 0; this.futures_id = option.futures_id || 0;
this.pageType = option.pagetype;
this.getDetail(); this.getDetail();
}, },
onShow() {}, onShow() {},
@ -212,7 +220,6 @@ export default {
this.info = res.data; this.info = res.data;
this.getSet(); this.getSet();
} }
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
}, },
fail: res => { fail: res => {
@ -226,18 +233,22 @@ export default {
url: '/futures/api/futures/getBasicsConfig', url: '/futures/api/futures/getBasicsConfig',
success: res => { success: res => {
if (parseInt(res.code) === 0) { if (parseInt(res.code) === 0) {
this.config=res.data;
this.price_range = res.data.price_range; this.price_range = res.data.price_range;
//获取最小值 和 最大值 //获取最小值 和 最大值
let unitPrice = this.info.unit_price; const unitPrice = this.info.unit_price;
let minPrice = unitPrice * (parseFloat(this.price_range.min) / 100); let minPrice = unitPrice * (parseFloat(this.price_range.min) / 100);
let maxPrice = unitPrice * (parseFloat(this.price_range.max) / 100); let maxPrice = unitPrice * (parseFloat(this.price_range.max) / 100);
let proposedPrice = unitPrice * (parseFloat(res.data.proposed_range) / 100); //建议出售价格
this.proposedPrice =(parseFloat(unitPrice) + parseFloat(proposedPrice)).toFixed(2);
this.price_range.min_price = (parseFloat(unitPrice) + parseFloat(minPrice)).toFixed(2); this.price_range.min_price = (parseFloat(unitPrice) + parseFloat(minPrice)).toFixed(2);
this.price_range.max_price = (parseFloat(unitPrice) + parseFloat(maxPrice)).toFixed(2); this.price_range.max_price = (parseFloat(unitPrice) + parseFloat(maxPrice)).toFixed(2);
this.transfer_price = this.price_range.max_price;// 默认 当前售价为最高价格 let service = (this.proposedPrice * (parseFloat(res.data.service_price) / 100)).toFixed(2); //总计服务费
// 计算手续费 // 计算技术手续费
this.service_charge = (this.transfer_price * (parseFloat(res.data.service_price) / 100)).toFixed(2); this.service_charge = (service * (parseFloat(res.data.technical_range) / 100)).toFixed(2);
// 计算实际收入 // 计算商家佣金
this.real_income = (parseFloat(this.transfer_price) - parseFloat(this.service_charge)).toFixed(2); this.real_income = (parseFloat(service) - parseFloat(this.service_charge)).toFixed(2);
} }
} }
}); });
@ -297,9 +308,7 @@ export default {
success: res => { success: res => {
console.log() console.log()
this.memberAddress = res.member_address; this.memberAddress = res.member_address;
this.$forceUpdate(); this.$forceUpdate();
} }
}) })
}, },
@ -307,9 +316,9 @@ export default {
sale(agree_split_order = 0){ sale(agree_split_order = 0){
let _this = this; let _this = this;
// 判断价格 // 判断价格
if(parseFloat(_this.transfer_price) <= parseFloat(_this.price_range.min_price)){ if(parseFloat(_this.transfer_price) <= 0){
_this.$util.showToast({ _this.$util.showToast({
title: '转售价格必须大于'+ _this.price_range.min_price, title: '转售价格必须大于0',
mask: true, mask: true,
duration: 1500, duration: 1500,
}); });
@ -410,7 +419,6 @@ export default {
background: #fafcff;//fafcff background: #fafcff;//fafcff
min-height: calc(100vh - (30rpx * 2)); min-height: calc(100vh - (30rpx * 2));
padding: 30rpx; padding: 30rpx;
.top{ .top{
--top-height--: 150rpx; --top-height--: 150rpx;
width: calc(100% - (20rpx * 2)); width: calc(100% - (20rpx * 2));
@ -464,7 +472,6 @@ export default {
} }
} }
.info-list{ .info-list{
.info-list-block{ .info-list-block{
background: #ffffff; background: #ffffff;
margin-top: 20rpx; margin-top: 20rpx;
@ -550,6 +557,12 @@ export default {
} }
} }
} }
.rinfo{
display: flex;
justify-content: flex-end;
margin-top: 22px;
color: royalblue;
}
.transfer-info{ .transfer-info{
width: 100%; width: 100%;
padding: 10px 0; padding: 10px 0;

27
pages_rush/futures/payment.js
View File

@ -24,25 +24,28 @@ export default {
if (this.isSub) return; if (this.isSub) return;
this.isSub = true; this.isSub = true;
var data = this.$util.deepClone(this.orderCreateData); var data = this.$util.deepClone(this.orderCreateData);
let _this=this;
this.$api.sendRequest({ this.$api.sendRequest({
url: '/futures/api/ordercreate/create', url: '/futures/api/ordercreate/create',
data, data,
success: res => { success: res => {
uni.hideLoading(); uni.hideLoading();
if (res.code >= 0) { if (res.code >= 0) {
uni.showModal({
console.log(res); title: '秒杀成功请及时付款',
content: res.message,
// if (parseFloat(this.orderPaymentData.pay_money) > 0) { cancelText: '继续抢购',
// let orderCreateData = uni.getStorageSync('giftcardOrderCreateData'); confirmText: '去付款',
// orderCreateData.out_trade_no = res.data; success: res => {
// uni.setStorageSync('giftcardOrderCreateData', orderCreateData); if (res.confirm) {
// this.$refs.choosePaymentPopup.getPayInfo(res.data); _this.$util.redirectTo('/pages_rush/futures/order', {status: 'all'});
// this.isSub = false;
// } else {
// }
}else{ }else{
_this.$util.redirectTo('/pages_rush/futures/seckill');
}
}
})
} else {
this.isSub = false;
this.$util.showToast({ this.$util.showToast({
title: res.message title: res.message
}); });

32
pages_rush/futures/seckill.vue
View File

@ -4,6 +4,11 @@
<!--顶部内容--> <!--顶部内容-->
<view class="seckill-top"> <view class="seckill-top">
<image class="top-background-image" :src="$util.img('public/static/img/futures/seckill-bg.png')" mode="widthFix"></image> <image class="top-background-image" :src="$util.img('public/static/img/futures/seckill-bg.png')" mode="widthFix"></image>
<view class="seckill-gz" @click="openPopup()">规则</view>
<view class="tip">
<view class="title">商品全部实物销售</view>
<view class="content">本区域销售的商品均为商家已经生产并承诺全额补货</view>
</view>
<view class="seckill-count-down" v-if="h > 0 || i > 0 || s > 0"> <view class="seckill-count-down" v-if="h > 0 || i > 0 || s > 0">
<text v-if="parseInt(activity_status) === 1">距开始</text> <text v-if="parseInt(activity_status) === 1">距开始</text>
<text v-else>距结束</text> <text v-else>距结束</text>
@ -14,10 +19,6 @@
<text class="count-down-time">{{ s }}</text> <text class="count-down-time">{{ s }}</text>
秒 秒
</view> </view>
<view class="tip" @click="openPopup()">
<view class="title">商品全部实物销售</view>
<view class="content">本区域销售的商品均为商家已经生产并承诺全额补货(查看规则)</view>
</view>
</view> </view>
<!--商品列表--> <!--商品列表-->
<mescroll-uni ref="mescroll" @getData="getList" top="350"> <mescroll-uni ref="mescroll" @getData="getList" top="350">
@ -57,8 +58,7 @@
class="not-list-image" class="not-list-image"
v-if="parseInt(activity_status) === 1" v-if="parseInt(activity_status) === 1"
:src="$util.img('public/static/img/futures/futures_not_started.png')" :src="$util.img('public/static/img/futures/futures_not_started.png')"
mode="widthFix" mode="widthFix"></image>
></image>
<image <image
class="not-list-image" class="not-list-image"
v-if="parseInt(activity_status) === 2" v-if="parseInt(activity_status) === 2"
@ -228,16 +228,28 @@ export default {
.seckill { .seckill {
background: #fafcff; background: #fafcff;
min-height: 100vh; min-height: 100vh;
.seckill-top { .seckill-top {
width: 100vw; width: 100vw;
position: relative; position: relative;
.top-background-image { .top-background-image {
width: 100%; width: 100%;
} }
.seckill-gz{
color: rgb(255, 255, 255);
font-size: 20px;
top: 2px;
margin-left: 10px;
position: absolute;
display: flex;
flex-direction: column;
align-items: flex-end;
width: 100%;
-webkit-transform: scale(0.85);
transform: scale(0.85);
}
.seckill-count-down { .seckill-count-down {
position: absolute; position: absolute;
top: 150rpx; top: 260rpx;
left: 0; left: 0;
width: 100%; width: 100%;
text-align: center; text-align: center;
@ -270,7 +282,7 @@ export default {
} }
.tip { .tip {
position: absolute; position: absolute;
top: 198rpx; top: 130rpx;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
@ -288,7 +300,7 @@ export default {
text-align: center; text-align: center;
} }
.content { .content {
font-size: 26rpx; font-size: 32rpx;
color: #fff; color: #fff;
} }
} }

12
pages_tool/member/account_edit.vue
View File

@ -17,13 +17,18 @@
</picker> </picker>
</view> </view>
<view class="edit-item" v-if="formData.withdraw_type == 'bank'"> <view class="edit-item" v-if="formData.withdraw_type == 'bank'">
<text class="tit">银行名称</text> <text class="tit">开户行</text>
<input class="desc uni-input" type="text" maxlength="50" placeholder="请输入银行名称" v-model.trim="formData.branch_bank_name" /> <input class="desc uni-input" type="text" maxlength="50" placeholder="请输入开户银行名称" v-model.trim="formData.branch_bank_name" />
</view> </view>
<view class="edit-item" v-if="formData.withdraw_type != 'wechatpay'"> <view class="edit-item" v-if="formData.withdraw_type != 'wechatpay'">
<text class="tit">提现账号</text> <text class="tit">提现账号</text>
<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入提现账号" v-model.trim="formData.bank_account" /> <input class="desc uni-input" type="text" maxlength="30" placeholder="请输入提现账号" v-model.trim="formData.bank_account" />
</view> </view>
<view class="edit-item">
<text class="tit">开户地址</text>
<input class="desc uni-input" type="text" maxlength="30" placeholder="请输入开户地址" v-model.trim="formData.bank_address" />
</view>
<view class="btn"> <view class="btn">
<button type="primary" class="add" @click="saveAccount">{{ $lang('save') }}</button> <button type="primary" class="add" @click="saveAccount">{{ $lang('save') }}</button>
</view> </view>
@ -41,6 +46,7 @@ export default {
mobile: '', mobile: '',
withdraw_type: '', withdraw_type: '',
bank_account: '', bank_account: '',
bank_address: '',
branch_bank_name: '' branch_bank_name: ''
}, },
payList: [], payList: [],
@ -88,6 +94,7 @@ export default {
this.formData.bank_account = res.data.bank_account; this.formData.bank_account = res.data.bank_account;
this.formData.branch_bank_name = res.data.branch_bank_name; this.formData.branch_bank_name = res.data.branch_bank_name;
this.formData.withdraw_type = res.data.withdraw_type; this.formData.withdraw_type = res.data.withdraw_type;
this.formData.bank_address = res.data.bank_address;
} }
this.getTransferType(); this.getTransferType();
if (this.$refs.loadingCover) this.$refs.loadingCover.hide(); if (this.$refs.loadingCover) this.$refs.loadingCover.hide();
@ -218,6 +225,7 @@ export default {
mobile: this.formData.mobile, mobile: this.formData.mobile,
withdraw_type: this.formData.withdraw_type, withdraw_type: this.formData.withdraw_type,
bank_account: this.formData.bank_account, bank_account: this.formData.bank_account,
bank_address: this.formData.bank_address,
branch_bank_name: this.formData.branch_bank_name branch_bank_name: this.formData.branch_bank_name
}, },
success: res => { success: res => {

6
pages_tool/member/assets.vue
View File

@ -52,16 +52,16 @@
<view v-if="member_info.is_fenxiao == 1" class="assets-box assets-fenxiao"> <view v-if="member_info.is_fenxiao == 1" class="assets-box assets-fenxiao">
<view class="assets-title"> <view class="assets-title">
<text class="color-base-bg"></text> <text class="color-base-bg"></text>
<text>分销资产</text> <text>业绩资产</text>
</view> </view>
<view class="assets-list"> <view class="assets-list">
<view class="assets-li"> <view class="assets-li">
<view>￥{{ fenxiao_info.account ||0 }}</view> <view>￥{{ fenxiao_info.account ||0 }}</view>
<view>可提现佣金</view> <view>可提现</view>
</view> </view>
<view class="assets-li"> <view class="assets-li">
<view>￥{{ fenxiao_info.account_withdraw_apply ||0}}</view> <view>￥{{ fenxiao_info.account_withdraw_apply ||0}}</view>
<view>提现中佣金</view> <view>提现中</view>
</view> </view>
<view class="assets-li"> <view class="assets-li">
<view>{{ accountInfo.fenxiao_order_count ||0}}</view> <view>{{ accountInfo.fenxiao_order_count ||0}}</view>

8
pages_tool/member/info.vue
View File

@ -78,6 +78,9 @@
<text class="cell-more"></text> <text class="cell-more"></text>
</view> </view>
<!-- 注销 --> <!-- 注销 -->
<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('cancellation')" v-if="addonIsExist.membercancel && memberConfig.is_enable == 1"> <view class="info-list-cell info-list-con" hover-class="cell-hover" @click="modifyInfo('cancellation')" v-if="addonIsExist.membercancel && memberConfig.is_enable == 1">
<text class="cell-tit">{{ $lang('cancellation') }}</text> <text class="cell-tit">{{ $lang('cancellation') }}</text>
@ -85,6 +88,10 @@
<text class="cell-more"></text> <text class="cell-more"></text>
</view> </view>
<view class="info-list-cell info-list-con" hover-class="cell-hover" @click="$util.redirectTo('/pages_tool/help/list')">
<text class="cell-tit">隐私政策</text>
<text class="cell-more"></text>
</view>
<!-- 语言 --> <!-- 语言 -->
<!-- <view class="info-list-cell info-item info-list-con" hover-class="cell-hover" @click="modifyInfo('language')"> <!-- <view class="info-list-cell info-item info-list-con" hover-class="cell-hover" @click="modifyInfo('language')">
<text class="cell-tit">{{ $lang('lang') }}</text> <text class="cell-tit">{{ $lang('lang') }}</text>
@ -96,7 +103,6 @@
<text class="cell-tit color-base-text"></text> <text class="cell-tit color-base-text"></text>
</view> --> </view> -->
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<!-- #endif --> <!-- #endif -->
<view class="save-item" @click="logout"> <view class="save-item" @click="logout">
<button type="primary">{{ $lang('logout') }}</button> <button type="primary">{{ $lang('logout') }}</button>

33
pages_tool/recharge/list.vue
View File

@ -5,41 +5,34 @@
<view class="recharge-title">充值</view> <view class="recharge-title">充值</view>
<view class="account-box"> <view class="account-box">
<view class="label">账户余额</view> <view class="label">账户余额</view>
<view class="value"><text class="price-font">{{balanceInfo.balance}}</text><text>元</text></view> <view class="value"><text class="price-font">{{balanceInfo.balance}}</text><text></text></view>
</view> </view>
<view class="recharge-box"> <view class="recharge-box">
<view class="recharge-box-title">选择充值金额 <view class="recharge-box-title">选择充值金额
<view @click="toOrderList"><text class="color-base-text">充值记录</text></view> <view @click="toOrderList"><text class="color-base-text">充值记录</text></view>
</view> </view>
<view class="box-content"> <view class="box-content">
<view v-if="list.length" class="content-item" v-for="(item, index) in list" :key="index" @click="itemClick(index, item.recharge_id, item.buy_price)" <view v-if="list.length" class="content-item" v-for="(item, index) in list" :key="index" @click="itemClick(index, item.recharge_id, item.buy_price)"
:class="isIndex == index ? 'active' : ''"> :class="isIndex == index ? 'active' : ''">
<view class="price1 "> <view class="price1 ">
<text class="price-font">{{ parseFloat(item.face_value).toFixed(0) }}</text> <text class="price-font">{{ parseFloat(item.face_value).toFixed(0) }}</text>
<text>元</text> <text></text>
</view> </view>
<view class="price2">售价 {{ item.buy_price }} 元</view> <view class="price2">售价 {{ item.buy_price }} </view>
</view> </view>
<view class="content-item" @click="openRecharge()"> <view class="content-item" @click="openRecharge()">
<view class="price1 "> <view class="price1 ">
<text class="other">其他金额</text> <text class="other">其他金额</text>
</view> </view>
</view> </view>
</view> </view>
<view class="box-text" v-if="isIndex !== -1"> <view class="box-text" v-if="isIndex !== -1">
注：充值 {{ list[isIndex].face_value }} 元赠送： <!-- 注：充值 {{ list[isIndex].face_value }} 元赠送：
<text>{{ list[isIndex].point }} 积分，</text> <text>{{ list[isIndex].point }} 积分，</text>
<text>{{ list[isIndex].growth }} 成长值</text> <text>{{ list[isIndex].growth }} 成长值</text>
<text v-if="list[isIndex].coupon_id != ''">，优惠券X{{ list[isIndex].coupon_id.split(',').length }}</text> <text v-if="list[isIndex].coupon_id != ''">，优惠券X{{ list[isIndex].coupon_id.split(',').length }}</text> -->
</view> </view>
</view> </view>
</view> </view>
<view class="explain"> <view class="explain">
<view class="title">充值说明</view> <view class="title">充值说明</view>
@ -51,7 +44,7 @@
<text v-if="item.coupon_id != ''">，优惠券X{{ item.coupon_id.split(',').length }}</text> <text v-if="item.coupon_id != ''">，优惠券X{{ item.coupon_id.split(',').length }}</text>
</view> </view>
<view> <view>
充值任意金额后，会存到您的账户资金中 {{ explain || '充值任意金额后，会存到您的账户资金中'}}
</view> </view>
</view> </view>
</view> </view>
@ -59,10 +52,10 @@
<view class="rechargeList"> <view class="rechargeList">
<view class="tip">请输入充值金额</view> <view class="tip">请输入充值金额</view>
<view class="input color-tip"> <view class="input color-tip">
{{keywordsInfo.price?keywordsInfo.price:'金额'}}<text class="color-base-text">元</text> {{keywordsInfo.price?keywordsInfo.price:'金额'}}<text class="color-base-text"></text>
</view> </view>
<view class="input color-tip"> <view class="input color-tip">
<text class="color-base-text" v-if="payMoney > 0">售价{{payMoney}}元</text> <text class="color-base-text" v-if="payMoney > 0">售价{{payMoney}}</text>
</view> </view>
<view class="keywords"> <view class="keywords">
<view class="keywords-left"> <view class="keywords-left">
@ -77,7 +70,8 @@
<view class="active" @click="keywordsDown(9)">9</view> <view class="active" @click="keywordsDown(9)">9</view>
<view class=""></view> <view class=""></view>
<view class="active" @click="keywordsDown(0)">0</view> <view class="active" @click="keywordsDown(0)">0</view>
<view class=""></view> <!-- <view class=""></view> -->
<view class="active" @click="keywordsDown('.')">.</view>
</view> </view>
<view class="keywords-right"> <view class="keywords-right">
<view @click="delPrice"><text class="iconfont icon-close"></text></view> <view @click="delPrice"><text class="iconfont icon-close"></text></view>
@ -92,12 +86,12 @@
<loading-cover ref="loadingCover"></loading-cover> <loading-cover ref="loadingCover"></loading-cover>
</view> </view>
</template> </template>
<script> <script>
export default { export default {
data() { data() {
return { return {
list: [], list: [],
explain:'',
balanceInfo: { balanceInfo: {
balance: 0, balance: 0,
balance_money: 0 balance_money: 0
@ -118,7 +112,6 @@
this.getData(); this.getData();
}, },
methods: { methods: {
openRecharge() { openRecharge() {
this.isIndex = -1; this.isIndex = -1;
this.payMoney = 0; this.payMoney = 0;
@ -168,7 +161,6 @@
title: "请输入充值金额" title: "请输入充值金额"
}) })
} }
}, },
//输入框聚焦 //输入框聚焦
cumberFocus() { cumberFocus() {
@ -201,6 +193,8 @@
success: res => { success: res => {
let newArr = []; let newArr = [];
let msg = res.message; let msg = res.message;
let explain = res.explain||'';
this.explain=explain;
if (res.code == 0 && res.data) { if (res.code == 0 && res.data) {
newArr = res.data.list; newArr = res.data.list;
} else { } else {
@ -210,7 +204,6 @@
} }
//设置列表数据 //设置列表数据
this.list = newArr; //追加新数据 this.list = newArr; //追加新数据
if(this.list.length > 0){ if(this.list.length > 0){
this.isIndex = 0; this.isIndex = 0;
this.recharge_id = this.list[0]['recharge_id']; this.recharge_id = this.list[0]['recharge_id'];

3
pages_tool/recharge/order_list.vue
View File

@ -17,8 +17,7 @@
<view class="goods_info_flex"><view class="goods-name font-size-base">充值成功</view></view> <view class="goods_info_flex"><view class="goods-name font-size-base">充值成功</view></view>
<view class="goods-img color-base-text"> <view class="goods-img color-base-text">
￥ ￥<text>{{ orderItem.buy_price }}</text>
<text>{{ orderItem.buy_price }}</text>
</view> </view>
<view class="goods-sub-section"> <view class="goods-sub-section">