Skip to content

M
mallapp
Commit 3728a664 authored by zhangjianguo's avatar zhangjianguo
Browse files
Options

订阅的修改

parent 83eb6cac
Hide whitespace changes
Inline Side-by-side
Showing with 160 additions and 163 deletions
pages.json
View file @ 3728a664
......@@ -195,6 +195,12 @@
]
}
],
"plugins": {
"live-player-plugin": {
"version": "1.0.1",
"provider": "wx2b03c6e691cd7370"
}
},
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "",
......
pages/coupon/details/details.vue
View file @ 3728a664
......@@ -90,24 +90,6 @@ export default {
},
methods: {
init(coupon_id) {
uni.showNavigationBarLoading();
let h = this.apiheader();
this.request(
{
url: "",
header: h,
data: {
r: "api/coupon/detail",
coupon_id:coupon_id
},
},
(res) => {
this.g = res.data.list
uni.hideNavigationBarLoading();
}
);
},
receive(id){
this.request2(
{
......
pages/order/index/index.vue
View file @ 3728a664
......@@ -369,6 +369,8 @@ export default {
},
methods: {
getOrderStatus() {
this.msg.pageIndex = 1;
this.g = [];
this.payInfo.OpenId=uni.getStorageSync('mall_UserInfo').OpenId;
this.request2(
{
......@@ -404,7 +406,7 @@ export default {
submitReviceGoodHandler() { //确认收货
let that = this
uni.requestSubscribeMessage({
tmplIds: that.template_message_list,
tmplIds: that.g[0].template_message_list,
complete(res) {
that.request2(
{
......@@ -489,41 +491,46 @@ export default {
this.payExit = true;
},
confirm() { //取消订单
this.showModal = false;
if(this.Cancelmsg.Type==2 && this.Cancelmsg.Remark==''){
let that = this
that.showModal = false;
if(that.Cancelmsg.Type==2 && that.Cancelmsg.Remark==''){
uni.showToast({
title:'备注不能为空',
icon:'none'
})
return
}
this.request2(
{
url: '/api/AppletOrder/CancelAppletGoodsOrderInfo',
data: this.Cancelmsg
},
(res) => {
if(this.Cancelmsg.Type==1){
uni.showToast({
title:res.message,
icon:'none'
})
this.g.splice(this.index, 1);
}else{
uni.showToast({
title: "取消成功，请等待审核",
position: "bottom",
icon: "none",
duration: 2000,
});
this.msg.pageIndex = 1;
this.g = [];
this.init();
}
}
);
uni.requestSubscribeMessage({
tmplIds: that.g[0].template_message_list,
complete (res) {
that.request2(
{
url: '/api/AppletOrder/CancelAppletGoodsOrderInfo',
data: that.Cancelmsg
},
(res) => {
if(that.Cancelmsg.Type==1){
uni.showToast({
title:res.message,
icon:'none'
})
that.g.splice(that.index, 1);
}else{
uni.showToast({
title: "取消成功，请等待审核",
position: "bottom",
icon: "none",
duration: 2000,
});
that.msg.pageIndex = 1;
that.g = [];
that.init();
}
}
);
}
})
},
closeGoodListHandler() {
this.goodData = [];
......
pages/order/order-detail.vue
View file @ 3728a664
......@@ -413,8 +413,8 @@ export default {
submitReviceGoodHandler() {
let that = this
uni.requestSubscribeMessage({
tmplIds: that.template_message_list,
complete(res) {
tmplIds: that.orders.template_message_list,
complete(res) {
that.request2(
{
url: '/api/AppletOrder/SetAppletOrderGoodsReceiving',
......@@ -439,8 +439,9 @@ export default {
this.Cancelmsg.Remark = ''
},
confirm() {
this.showModal = false;
if(this.Cancelmsg.Type==2 && this.Cancelmsg.Remark==''){
let that = this
that.showModal = false;
if(that.Cancelmsg.Type==2 && that.Cancelmsg.Remark==''){
uni.showToast({
title:'备注不能为空',
icon:'none'
......@@ -448,25 +449,35 @@ export default {
return
}
let pages = getCurrentPages(); // 当前页面
let beforePage = pages[pages.length - 2]; // 前一个页面
this.request2(
{
url: '/api/AppletOrder/CancelAppletGoodsOrderInfo',
data: this.Cancelmsg
},
(res) => {
uni.showToast({
title:res.message,
icon:'none'
})
this.init();
// setTimeout(()=>{
// success: function() {
// beforePage.onLoad(); // 执行前一个页面的created方法
// }
// },1000)
}
);
uni.requestSubscribeMessage({//订阅消息 退款和审核通知
tmplIds: that.orders.template_message_list,
complete (res) {
that.request2(
{
url: '/api/AppletOrder/CancelAppletGoodsOrderInfo',
data: that.Cancelmsg
},
(res) => {
uni.showToast({
title:res.message,
icon:'none'
})
that.init();
if (pages.length > 1) {//返回上一个页面
var beforePage = pages[pages.length - 2]; //获取上一个页面实例对象
setTimeout(()=>{
uni.navigateBack({
success: function() {
beforePage.$vm.getOrderStatus();
}
});
},500)
}
}
);
}
})
},
openAfterHandler() {
this.showAfter = true;
......
pages/share/cash/cash.vue
View file @ 3728a664
......@@ -90,22 +90,6 @@
</view>
</view>
</u-popup>
<u-popup v-model="show2"
mode="center"
border-radius="16"
length="80%"
>
<view style="background: #fff;display: flex;flex-direction: column;align-items: center">
<view style="display: flex;flex-direction: column;align-items: center;padding: 15px;text-align: center;">
<Text >提示</Text>
<Text style='margin-top: 10px;'>今日剩余提現金額=平台毎日可提現金額-今日所有用戸提現金額</Text>
</view>
<view style="width: 100%;height: 1px;background: #f5f5f5;"></view>
<view style="width: 100%;height: 45px;display: flex;align-items: center;justify-content: center;" @click="show2=false">
<Text :style="{'color':mainColor}">我知道了</Text>
</view>
</view>
</u-popup>
</template>
</view>
......@@ -210,83 +194,90 @@
},
getapply(){
if(this.msg.AppliedMoney==''){
uni.showToast({
title: "请输入提现金额",
icon: "none"
});
return false
}
if(this.txmode==''){
uni.showToast({
title: "请选择提现方式",
icon: "none"
});
return false
}
if(this.msg.WithdrawalWay==2|| this.msg.WithdrawalWay==3 || this.msg.WithdrawalWay==4){
if(this.msg.AccountName==''){
uni.showToast({
title: "账户名称不能为空",
icon: "none"
});
return false
}
if(this.msg.AccountNumber==''){
uni.showToast({
title: "账户号不能为空",
icon: "none"
});
return false
}
if(this.msg.BankName=='' && this.msg.WithdrawalWay==4){
uni.showToast({
title: "银行名称不能为空",
icon: "none"
});
return false
}
}
if(this.cash.MinimumWithdrawalLimit!=-1){
if(this.msg.AppliedMoney<this.cash.MinimumWithdrawalLimit){
uni.showToast({
title: "提现金额大于等于"+this.cash.MinimumWithdrawalLimit,
icon: "none"
});
return false
}
}
if(this.msg.AppliedMoney>this.cash.CommissionWithdrawal){
uni.showToast({
title: '余额不足',
icon: "none"
});
return false
}
this.msg.Fee = Number(this.msg.Fee);
this.msg.RemitMoney = this.msg.AppliedMoney - this.msg.Fee; //最终提现要减去 手续费
uni.showNavigationBarLoading();
this.request2(
{
url: '/api/AppletUser/SetUserDistrbutorWithdrawDeposit',
data: this.msg
},
(res) => {
uni.hideNavigationBarLoading()
uni.showToast({
title: res.message,
icon: "none"
});
this.init()
uni.navigateTo({
url: '/pages/cash-detail/cash-detail'
});
let that = this
uni.requestSubscribeMessage({
tmplIds: that.cash.template_message_list,
complete (res) {
if(that.msg.AppliedMoney==''){
uni.showToast({
title: "请输入提现金额",
icon: "none"
});
return false
}
if(that.txmode==''){
uni.showToast({
title: "请选择提现方式",
icon: "none"
});
return false
}
if(that.msg.WithdrawalWay==2|| that.msg.WithdrawalWay==3 || that.msg.WithdrawalWay==4){
if(that.msg.AccountName==''){
uni.showToast({
title: "账户名称不能为空",
icon: "none"
});
return false
}
if(that.msg.AccountNumber==''){
uni.showToast({
title: "账户号不能为空",
icon: "none"
});
return false
}
if(that.msg.BankName=='' && that.msg.WithdrawalWay==4){
uni.showToast({
title: "银行名称不能为空",
icon: "none"
});
return false
}
}
if(that.cash.MinimumWithdrawalLimit!=-1){
if(that.msg.AppliedMoney<that.cash.MinimumWithdrawalLimit){
uni.showToast({
title: "提现金额大于等于"+that.cash.MinimumWithdrawalLimit,
icon: "none"
});
return false
}
}
if(that.msg.AppliedMoney>that.cash.CommissionWithdrawal){
uni.showToast({
title: '余额不足',
icon: "none"
});
return false
}
that.msg.Fee = Number(that.msg.Fee);
that.msg.RemitMoney = that.msg.AppliedMoney - that.msg.Fee; //最终提现要减去 手续费
uni.showNavigationBarLoading();
that.request2(
{
url: '/api/AppletUser/SetUserDistrbutorWithdrawDeposit',
data: that.msg
},
(res) => {
uni.hideNavigationBarLoading()
uni.showToast({
title: res.message,
icon: "none"
});
that.init()
uni.navigateTo({
url: '/pages/cash-detail/cash-detail'
});
}
);
}
);
})
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment