diff --git a/App.vue b/App.vue index a7e0720..0174f25 100644 --- a/App.vue +++ b/App.vue @@ -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', diff --git a/common/js/config.js b/common/js/config.js index be66c07..b374848 100644 --- a/common/js/config.js +++ b/common/js/config.js @@ -8,7 +8,7 @@ var config = { // 腾讯地图key mpKey: '', //客服地址 - webSocket : 'https://miaogou.cdlfjy.com/', + webSocket : 'wss://miaogou.cdlfjy.com', //本地端主动给服务器ping的时间, 0 则不开启 , 单位秒 pingInterval: 1500 }; diff --git a/components/ns-login/ns-login.vue b/components/ns-login/ns-login.vue index 521348b..31bbd88 100644 --- a/components/ns-login/ns-login.vue +++ b/components/ns-login/ns-login.vue @@ -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(){ diff --git a/components/payment/payment.vue b/components/payment/payment.vue index 45e9c0e..3636ce5 100644 --- a/components/payment/payment.vue +++ b/components/payment/payment.vue @@ -19,9 +19,9 @@ 当前{{ balance |moneyFormat }} - + - + @@ -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 diff --git a/manifest.json b/manifest.json index 8d0fddf..0521b32 100644 --- a/manifest.json +++ b/manifest.json @@ -76,6 +76,7 @@ // "version" : "1.2.0", // "provider" : "wx2b03c6e691cd7370" // } + "serviceProviderTicket" : "lyBy46wZhpT1CufMdv3hjl4GoiqOTDEQJ4jzK/Bdgbp7tSPVA+GnFpbEOqonmg95mLN88ZgH+EjENA81Q/7zIBA7dHm8h1luiOI=", "requiredPrivateInfos" : [ "chooseLocation", "getLocation", "chooseAddress" ] }, "mp-alipay" : { diff --git a/pages.json b/pages.json index 2181d94..e16c420 100644 --- a/pages.json +++ b/pages.json @@ -1014,7 +1014,8 @@ { "path": "member/balance_transfer", "style": { - "navigationStyle": "custom" + // "navigationStyle": "custom" + "navigationBarTitleText": "转账" } }, { diff --git a/pages_promotion/fenxiao/index.vue b/pages_promotion/fenxiao/index.vue index e351cdd..0674d95 100644 --- a/pages_promotion/fenxiao/index.vue +++ b/pages_promotion/fenxiao/index.vue @@ -17,7 +17,7 @@ - + {{ info.fenxiao_name }} {{ info.level_name }} diff --git a/pages_promotion/fenxiao/ranking_list.vue b/pages_promotion/fenxiao/ranking_list.vue index 560d906..51a7957 100644 --- a/pages_promotion/fenxiao/ranking_list.vue +++ b/pages_promotion/fenxiao/ranking_list.vue @@ -29,22 +29,22 @@ - + - 业绩 - {{ info.today_commission}} + 推广业绩 + {{info.one_commission}} - + - 业绩排行 - 您排行第{{ ranking }}名 + 管理业绩 + {{ info.two_commission}} @@ -74,10 +74,10 @@ - 业绩排行 + 业绩排行 推广排行 - + {{ index + 1 }} diff --git a/pages_promotion/fenxiao/withdraw_apply.vue b/pages_promotion/fenxiao/withdraw_apply.vue index 47765fb..3783411 100644 --- a/pages_promotion/fenxiao/withdraw_apply.vue +++ b/pages_promotion/fenxiao/withdraw_apply.vue @@ -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: '请先添加提现方式' }); diff --git a/pages_rush/futures/details.vue b/pages_rush/futures/details.vue index 1b39cf7..bfdacfa 100644 --- a/pages_rush/futures/details.vue +++ b/pages_rush/futures/details.vue @@ -32,7 +32,7 @@ 采购数量：{{ info.total }}{{ info.unit || '件' }} - 销售商：{{ info.seller_nickname }} + 销售商：{{ info.buyer_name }} diff --git a/pages_rush/futures/order.vue b/pages_rush/futures/order.vue index 5c566cf..c1eedfa 100644 --- a/pages_rush/futures/order.vue +++ b/pages_rush/futures/order.vue @@ -33,7 +33,8 @@ {{ item.goods_name }} - 销售商：{{item.seller_nickname }} + + 销售商：{{tabs_active=='myorderpay'?item.buyer_name:item.seller_nickname || ''}} 数量：{{ item.total }} @@ -44,7 +45,13 @@ - 采购价：￥{{item.price}} + 采购价： + + ￥{{item.price}} + ￥{{item.unit_price}} + + + @@ -61,7 +68,6 @@ - @@ -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(); diff --git a/pages_rush/futures/order_details.vue b/pages_rush/futures/order_details.vue index 2db2fa3..e2b887e 100644 --- a/pages_rush/futures/order_details.vue +++ b/pages_rush/futures/order_details.vue @@ -18,7 +18,7 @@ 卖家昵称 - {{ info.seller_nickname }} + {{ info.seller_nickname ||'' }} 买家昵称 @@ -100,7 +100,7 @@ - + 最高出售价:{{price_range.max_price}} 去充值 确定出售 @@ -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 { } }; -