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

.

This commit is contained in:
sunday 2024-10-03 20:44:35 +08:00
parent 5931f2021d
commit 9b5d11565b
15 changed files with 256 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
App.vue
View File

@ -82,7 +82,6 @@ export default {
if (this.$util.isWeiXin()) {
this.$util.getUrlCode(urlParams => {
if (urlParams.source_member) uni.setStorageSync('source_member', urlParams.source_member);
if (urlParams.code == undefined) {
this.$api.sendRequest({
url: '/wechat/api/wechat/authcode',

2
common/js/config.js
View File

@ -8,7 +8,7 @@ var config = {
// 腾讯地图key
mpKey: '',
//客服地址
webSocket : 'https://miaogou.cdlfjy.com/',
webSocket : 'wss://miaogou.cdlfjy.com',
//本地端主动给服务器ping的时间, 0 则不开启 , 单位秒
pingInterval: 1500
};

6
components/ns-login/ns-login.vue
View File

@ -727,19 +727,19 @@ export default {
},
// 承诺书 注册 - 显示弹框
promiseRegisterShow(){
this.request_type = 'register';
if (!uni.getStorageSync('source_member')){
uni.showModal({
title: '请扫推广码注册',
mask: true,
duration: 2000,
showCancel: false,
success: function () {
}
success: function () {}
});
}else {
this.request_type = 'register';
this.$refs.registerPopup.open()
}
// this.$refs.registerPopup.open()
},
// 承诺书 注册 - 申请注册
promiseRegister(){

19
components/payment/payment.vue
View File

@ -19,9 +19,9 @@
<view class="money">当前{{ balance |moneyFormat }} </view>
<button @click="$util.redirectTo('/pages_tool/recharge/list')">去充值</button>
</view>
<ns-switch class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
<ns-switch v-if="isOnline" class="balance-switch" @change="useBalance" :checked="isBalance == 1"></ns-switch>
</view>
<block v-if="payMoney > 0">
<block v-if="payMoney > 0 && isOnline">
<block v-if="payTypeList.length">
<view class="payment-item" v-for="(item, index) in payTypeList" :key="index"
@click="payIndex = index">
@ -94,6 +94,7 @@
// 预售页面判断
sale: true,
isBalance: 0,
isOnline: true,
balance: 0
};
},
@ -113,7 +114,7 @@
let money = 0;
if (this.payInfo) {
money = this.payInfo.pay_money;
if (this.balanceDeduct && this.isBalance && this.balanceUsable) {
if (this.balanceDeduct && this.isBalance && this.balanceUsable&&this.isOnline) {
money = this.payInfo.pay_money - this.balanceDeduct;
}
}
@ -126,9 +127,13 @@
this.$refs.choosePaymentPopup.close();
},
// 使用余额
useBalance(e) {
useBalance(e,isOnline=true) {
this.isOnline=isOnline;
if(e){
this.isBalance=e;
if(isOnline){
}
}else{
this.isBalance = this.isBalance ? 0 : 1;
this.$emit('useBalance', this.isBalance)
@ -141,6 +146,12 @@
});
return;
}
if(!this.isOnline && (this.payInfo.pay_money-this.balanceDeduct)>0){
this.$util.showToast({
title: '您余额不足！'
});
return;
}
uni.showLoading({
title: '支付中...',
mask: true

1
manifest.json
View File

@ -76,6 +76,7 @@
// "version" : "1.2.0",
// "provider" : "wx2b03c6e691cd7370"
// }
"serviceProviderTicket" : "lyBy46wZhpT1CufMdv3hjl4GoiqOTDEQJ4jzK/Bdgbp7tSPVA+GnFpbEOqonmg95mLN88ZgH+EjENA81Q/7zIBA7dHm8h1luiOI=",
"requiredPrivateInfos" : [ "chooseLocation", "getLocation", "chooseAddress" ]
},
"mp-alipay" : {

3
pages.json
View File

@ -1014,7 +1014,8 @@
{
"path": "member/balance_transfer",
"style": {
"navigationStyle": "custom"
// "navigationStyle": "custom"
"navigationBarTitleText": "转账"
}
},
{

2
pages_promotion/fenxiao/index.vue
View File

@ -17,7 +17,7 @@
<!-- <text class="level-name ">{{ info.level_name }}</text> -->
</view>
<view class="member-info">
<view @click="toLevel()" class="member-info-box">
<view class="member-info-box">
<text class="name">{{ info.fenxiao_name }}</text>
</view>
<view class="recommend" v-if="info.level_num > 0">{{ info.level_name }}</view>

16
pages_promotion/fenxiao/ranking_list.vue
View File

@ -29,22 +29,22 @@
<view class="fenxiao-index-other">
<view class="all-money-item">
<view class="img-wrap">
<text class="iconfont icon-fenxiao"></text>
<!-- <text class="iconfont icon-fenxiao"></text> -->
</view>
<view class="all-money-tit-wrap">
<text class="all-money-tit">业绩</text>
<text class="all-money-num">{{ info.today_commission}}</text>
<text class="all-money-tit">推广业绩</text>
<text class="all-money-num">{{info.one_commission}}</text>
</view>
</view>
</view>
<view class="fenxiao-index-other">
<view class="all-money-item">
<view class="img-wrap">
<text class="iconfont icon-baixingbeng"></text>
<!-- <text class="iconfont icon-baixingbeng"></text> -->
</view>
<view class="all-money-tit-wrap">
<text class="all-money-tit">业绩排行</text>
<text class="all-money-num">您排行第{{ ranking }}名</text>
<text class="all-money-tit">管理业绩</text>
<text class="all-money-num">{{ info.two_commission}}</text>
</view>
</view>
</view>
@ -74,10 +74,10 @@
</view>
</view>
<view class="title-rakn-text" v-if="type == 'profit'">业绩排行</view>
<view class="title-rakn-text" v-if="type == 'profit'&&!1">业绩排行</view>
<view class="title-rakn-text" v-if="type == 'invited_num'">推广排行</view>
<view class="ranking-list">
<view class="ranking-list" v-if="!1">
<view class="ranking-item" v-for="(item, index) in list" :key="index">
<view class="ranking price-font">{{ index + 1 }}</view>
<view class="content">

2
pages_promotion/fenxiao/withdraw_apply.vue
View File

@ -187,7 +187,7 @@ export default {
return true;
},
withdraw() {
if (!this.bankAccountInfo.withdraw_type && !isBalance) {
if (!this.bankAccountInfo.withdraw_type && !this.isBalance) {
this.$util.showToast({
title: '请先添加提现方式'
});

2
pages_rush/futures/details.vue
View File

@ -32,7 +32,7 @@
采购数量：<text class="info-num">{{ info.total }}{{ info.unit || '件' }}</text>
</view>
<view class="info-block">
销售商：<text class="info-num">{{ info.seller_nickname }}</text>
销售商：<text class="info-num">{{ info.buyer_name }}</text>
</view>
</view>
</view>

20
pages_rush/futures/order.vue
View File

@ -33,7 +33,8 @@
</view>
<view class="right">
<view class="goods-name">{{ item.goods_name }}</view>
<view class="goods-name" >销售商：{{item.seller_nickname }}</view>
<!-- <view class="goods-name" v-if="tabs_active!='myorderpay'">销售商：{{item.seller_nickname || '' }}</view> -->
<view class="goods-name">销售商：{{tabs_active=='myorderpay'?item.buyer_name:item.seller_nickname || ''}}</view>
<view class="goods-num">数量：{{ item.total }}</view>
<view v-if="pageType=='release'">
<view class="goods-info">
@ -44,7 +45,13 @@
</view>
</view>
<view class="goods-info" v-if="pageType =='stock' || pageType=='all'">
采购价：<view class="goods-info-price"><text class="goods-info-unit">￥</text>{{item.price}}</view>
采购价：<view class="goods-info-price">
<text class="goods-info-unit" v-if="tabs_active=='myorderpay'&&pageType=='all'">￥{{item.price}}</text>
<text class="goods-info-unit" v-else>￥{{item.unit_price}}</text>
<!-- <text class="goods-info-unit" v-if="pageType =='stock' && tabs_active=='myorderend'">￥{{item.unit_price}}</text> -->
<!-- <text class="goods-info-unit" v-if="pageType=='all' && (tabs_active=='myorderend' || tabs_active=='myorderpay')">￥{{item.price}}</text> -->
</view>
</view>
</view>
</view>
@ -61,7 +68,6 @@
</mescroll-uni>
<pay-pop txt="支付密码" :pwdlength="6" ref="payPop" @pwd_e="pwdEvend" />
<ns-payment ref="choosePaymentPopup"></ns-payment>
<ns-payment ref="choosePaymentMergePopup"></ns-payment>
<!--登录弹框-->
<ns-login ref="login"></ns-login>
<!--加载动画-->
@ -83,8 +89,9 @@ export default {
tabs_active: 'all',
tabs: [],
page_titles: {
all: '全部订单',
stock: '库存中订单',
6: '我的订单',
all: '采购订单',
stock: '我的库存',
release: '销售中订单',
sold: '已售卖订单',
},
@ -109,6 +116,7 @@ export default {
onLoad(option) {
// 获取需要显示的订单类型
this.pageType=option.status || 'release';
console.log(this.pageType);
if(option.status == 'release'){
this.tabs_active = 6;
this.tabs = [
@ -155,7 +163,7 @@ export default {
this.orderData = orderData;
this.payMoney = parseFloat(orderData.pay_money);
// this.isBalance
this.$refs.choosePaymentPopup.useBalance(1);
this.$refs.choosePaymentPopup.useBalance(1,false);
this.orderPay(orderData);
// this.$refs.payPop.Open();

9
pages_rush/futures/order_details.vue
View File

@ -18,7 +18,7 @@
<view class="info-list">
<view class="info-list-block">
<view class="left">卖家昵称</view>
<view class="right">{{ info.seller_nickname }}</view>
<view class="right">{{ info.seller_nickname ||'' }}</view>
</view>
<view class="info-list-block" >
<view class="left">买家昵称</view>
@ -100,7 +100,7 @@
<input type="digit" class="input" v-model="transfer_price" :placeholder="'最高出售价:'+ price_range.max_price" />
</view>
</view>
<!-- <view class="transfer-price-tips">转让价格必须大于{{ price_range.min_price }}并且小于等于{{ price_range.max_price }}！</view> -->
<view class="transfer-price-tips">最高出售价:{{price_range.max_price}}</view>
<view class="rinfo" @click="$util.redirectTo('/pages_tool/recharge/list')">去充值</view>
<view class="transfer-price-button">
<view class="transfer-buttons" @click="sale">确定出售</view>
@ -324,7 +324,7 @@ export default {
});
return false;
}
if(parseFloat(_this.transfer_price) <= 0){
if(parseFloat(_this.transfer_price) <= 0 || _this.transfer_price=='.'){
_this.$util.showToast({
title: '转售价格必须大于0',
mask: true,
@ -332,6 +332,7 @@ export default {
});
return false;
}
if(parseFloat(_this.transfer_price) > parseFloat(_this.price_range.max_price)){
_this.$util.showToast({
title: '转售价格必须小于等于'+ _this.price_range.max_price,
@ -421,7 +422,6 @@ export default {
}
};
</script>
<style lang="scss" scoped>
.order-details{
background: #fafcff;//fafcff
@ -618,6 +618,7 @@ export default {
height: 40rpx;
line-height: 30rpx;
color: #b5b2b3;
text-align: center;
}
.transfer-price{
display: inline-flex;

4
pages_tool/member/balance_transfer.vue
View File

@ -22,7 +22,7 @@
</view>
<view class="bootom">
<view>
<text class="color-tip">可用余额：{{ $lang('common.currencySymbol') }}{{ withdrawInfo.member_info.balance | moneyFormat }}</text>
<text class="color-tip">可用余额：{{ $lang('common.currencySymbol') }}{{ withdrawInfo.member_info.balance_money | moneyFormat }}</text>
</view>
</view>
</view>
@ -131,7 +131,7 @@ export default {
});
return false;
}
if (parseFloat(this.withdrawMoney) > parseFloat(this.withdrawInfo.member_info.balance)) {
if (parseFloat(this.withdrawMoney) > parseFloat(this.withdrawInfo.member_info.balance_money)) {
this.$util.showToast({
title: '转出金额超出可用现金额'
});

196
pages_tool/recharge/list.vue
View File

@ -44,7 +44,7 @@
<text v-if="item.coupon_id != ''">，优惠券X{{ item.coupon_id.split(',').length }}</text>
</view>
<view>
{{ explain || '充值任意金额后，会存到您的账户资金中'}}
充值任意金额后，会存到您的账户余额中
</view>
</view>
</view>
@ -80,18 +80,74 @@
</view>
</view>
</uni-popup>
<uni-popup ref="bacKPopup" >
<view class="backInfo">
<view class="tip">银行卡充值说明</view>
<view class="explain_tip">{{backConfig.explain}}</view>
<view class="back_info">
<view>开户名称 :{{backConfig.bank_name}}</view>
<view>开户行 :{{backConfig.branch_bank_name}}</view>
<view>账号:{{backConfig.bank_account}}</view>
<view v-if="backConfig.certificate_no!=''">纳税识别号:{{backConfig.certificate_no}}</view>
<view v-if="backConfig.address!=''">经营地址:{{backConfig.address}}</view>
</view>
<button class="copy-account" type="primary" @click="copyAccount">我知晓(并复制)</button>
</view>
</uni-popup>
<uni-popup ref="provePopup" type="bottom" :maskClick="true">
<view class="backInfo">
<view class="tip">提交充值信息</view>
<view class="explain_tip">(请勿恶意提交，一旦发现恶意提交，将会封号处理，充值后请您耐心等待，我们将会逐次处理</view>
<view class="back_info">
<view class="back_tip">
<view v-if="bankAccountInfo!=''">
<view>银行卡:{{bankAccountInfo.bank_account}}</view>
<view>持卡人:{{bankAccountInfo.realname}}</view>
<view>联系人:{{bankAccountInfo.mobile}}</view>
</view>
<view class="back-bing" v-else @click="$util.redirectTo('/pages_tool/member/account',{back:'/pages_tool/recharge/list'})">去绑定银行卡</view>
</view>
<view class="help">请使用本卡向平台账号转账</view>
<view class="form-list">
<view class="form-list-block">
<view class="left">充值金额</view>
<view class="right"><input class="uni-input" v-model="amount" placeholder="请输入打款金额" /></view>
</view>
<view class="form-list-block">
<view class="left">用户留言</view>
<view class="right"><input class="uni-input" v-model="remark" placeholder="请输入留言" /></view>
</view>
</view>
<view class="help">注:充值到当前账号中,请输入打款金额与实际转账金额相同</view>
</view>
<button class="copy-account" type="primary" @click="AccountSubmit">确认提交</button>
</view>
</uni-popup>
<!-- 选择支付方式弹窗 -->
<ns-payment ref="choosePaymentPopup" :payMoney="payMoney" @confirm="toPay"></ns-payment>
<block v-if="parseInt(backConfig.is_bank) ==1">
<button class="add-account" style="background-color: #ff8257;color: #fff;" @click="openBackChoosePayment">银行卡充值</button>
<button class="add-account" type="default" @click="openBack">提交打款信息</button>
</block>
<button class="add-account" type="primary" :disabled="recharge_id > 0 ? false : true" @click="openChoosePayment">充值</button>
<loading-cover ref="loadingCover"></loading-cover>
</view>
</template>
<script>
export default {
export default {
data() {
return {
list: [],
explain:'',
backConfig:{
address: "",
bank_account:"",
bank_name: "",
branch_bank_name: "",
certificate_no: "",
is_bank: "",
is_use: "",
},
balanceInfo: {
balance: 0,
balance_money: 0
@ -99,17 +155,21 @@
isIndex: -1,
recharge_id: '',
amount: '',
remark: '',
payMoney: 0,
keywordsInfo: {
price: 0,
minPrice: 1,
maxPrice: 30
}
},
bankAccountInfo:''
};
},
onLoad() {
this.getData();
},
onShow() {
this.getUserInfo();
this.getData();
},
methods: {
openRecharge() {
@ -195,6 +255,11 @@
let msg = res.message;
let explain = res.explain||'';
this.explain=explain;
let config = res.config ||'';
this.backConfig=config;
if(config.is_bank==1){
this.getBankAccountInfo();
}
if (res.code == 0 && res.data) {
newArr = res.data.list;
} else {
@ -268,6 +333,58 @@
uni.setStorageSync('paySource', 'recharge');
if (this.amount !== '') this.payMoney = parseFloat(this.amount);
this.$refs.choosePaymentPopup.open();
},
openBackChoosePayment(){
this.$refs.bacKPopup.open();
},
openBack(){
this.$refs.provePopup.open();
},
copyAccount(){
let text =this.backConfig.bank_name+this.backConfig.bank_account
this.$util.copy(text,()=>{
this.$refs.bacKPopup.close();
})
},
/**
* 银行账号信息
*/
getBankAccountInfo() {
this.$api.sendRequest({
url: '/api/memberbankaccount/defaultinfo',
success: res => {
if (res.code >= 0 && res.data) {
this.bankAccountInfo = res.data;
}
}
});
},
AccountSubmit(){ //提交银行打款
let _this=this;
this.$api.sendRequest({
url: '/memberrecharge/api/ordercreate/backCreate',
data: {
face_value: this.amount,
remark: this.remark,
...this.bankAccountInfo
},
success: res => {
if (res.data && res.code == 0) {
uni.showModal({
title:'提示',
showCancel:false,
content:'已经提交成功,请等待审核!切勿重复提交',
complete(){
_this.$refs.provePopup.close();
}
})
} else {
this.$util.showToast({
title: res.message
});
}
}
});
}
}
};
@ -317,20 +434,82 @@
padding: $padding 0;
background-color: #fff;
border-radius: $border-radius;
.title {
font-size: 32rpx;
font-weight: bold;
}
.explain_list {
view {
font-size: $font-size-sub;
color: $color-tip;
}
}
}
.backInfo{
width: 100%;
.tip {
padding: $margin-both;
text-align: center;
font-size: $font-size-toolbar;
}
.explain_tip{
color: #ff5500;
padding: 20rpx;
}
.back_info{
padding: 20rpx;
.back_tip{
border: 1px dotted #5500ff;
margin: auto;
padding: 10px 30px;
}
.help{
color: #ccc;
font-size: 10px;
}
.back-bing{
display: flex;
justify-content: flex-end;
margin-top: 12px;
color: #5555ff;
}
}
.copy-account{
background-color: #ff5500;
padding: 20rpx;
margin: 20rpx;
}
.form-list {
margin: 10px 0 10px 0;
.form-list-block {
width: 100%;
color: #000000;
height: 90rpx;
line-height: 90rpx;
display: inline-flex;
flex-direction: row;
flex-wrap: nowrap;
align-content: center;
align-items: center;
justify-content: space-between;
.left {
height: 70rpx;
font-size: 30rpx;
width: 240rpx;
}
.right {
font-size: 30rpx;
width: calc(100% - 240rpx);
input {
height: 70rpx;
text-align: right;
font-size: 30rpx;
color: #898989;
}
}
}
}
}
.rechargeList {
.tip {
@ -338,14 +517,11 @@
text-align: center;
font-size: $font-size-toolbar;
}
.input {
text-align: center;
text {
margin-left: 10rpx;
}
margin-bottom: $margin-updown;
}

22
pages_tool/recharge/order_list.vue
View File

@ -14,12 +14,14 @@
</view>
</view>
<view class="order-body">
<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">{{TextArr[orderItem.status]}}</view>
</view>
<view class="back" v-if="orderItem.remark!=''">留言:{{orderItem.remark||''}}</view>
<view class="back" v-if="orderItem.status=='1'&&orderItem.relate_type=='back_transfer'">{{orderItem.refuse}}</view>
<view class="goods-img color-base-text">
￥<text>{{ orderItem.buy_price }}</text>
</view>
<view class="goods-sub-section">
<view class="<strong>goods-name</strong> color-tip " v-if="orderItem.point > 0 || orderItem.growth > 0">赠送:</view>
<view class="goods-name color-tip " v-if="orderItem.point > 0">{{ orderItem.point }}积分</view>
@ -38,11 +40,15 @@
<ns-login ref="login"></ns-login>
</view>
</template>
<script>
export default {
data() {
return {
TextArr:{
1:'待审核',
2:'充值成功',
3:'拒绝',
},
orderList: []
};
},
@ -124,15 +130,16 @@ export default {
}
.order-body {
height: 155rpx;
height: 200rpx;
position: relative;
.back{
margin-top: 30rpx;
}
.goods_info_flex {
display: flex;
justify-content: space-between;
align-items: center;
padding-top: 30rpx;
.goods-name {
display: -webkit-box;
-webkit-box-orient: vertical;
@ -142,7 +149,6 @@ export default {
font-weight: 500;
}
}
.goods-img {
font-size: $font-size-tag;
font-weight: 500;