diff --git a/common/config.js b/common/config.js
index 313c899..5eb9aa2 100644
--- a/common/config.js
+++ b/common/config.js
@@ -8,13 +8,13 @@
// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
// h5
-// const ROOTPATH1 = "https://web.hnsiyao.cn/czg/"; //
-// const ROOTPATH = "https://web.hnsiyao.cn/czg/"; //后台服务域名
-// const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
+const ROOTPATH1 = "https://web.hnsiyao.cn/czg/"; //
+const ROOTPATH = "https://web.hnsiyao.cn/czg/"; //后台服务域名
+const ROOTPATH2 = "https://dj-h5.hnsiyao.cn"; //后台服务域名
-const ROOTPATH1 = "https://web-api.hnsiyao.cn/czg/"; //
-const ROOTPATH = "https://web-api.hnsiyao.cn/czg/"; //后台服务域名
-const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
+// const ROOTPATH1 = "https://web-api.hnsiyao.cn/czg/"; //
+// const ROOTPATH = "https://web-api.hnsiyao.cn/czg/"; //后台服务域名
+// const ROOTPATH2 = "https://video-h5.hnsiyao.cn"; //后台服务域名
// const ROOTPATH1 = "http://192.168.1.41:8100/czg/"; //
// const ROOTPATH = "http://192.168.1.41:8100/czg/"; //后台服务域名
diff --git a/components/pop-choujiang.vue b/components/pop-choujiang.vue
index b5a5aa1..e204f22 100644
--- a/components/pop-choujiang.vue
+++ b/components/pop-choujiang.vue
@@ -468,35 +468,13 @@
tipContent = `恭喜您，获得 ${name}${this.result.type==2?(this.result.number+'元'):''} ！`
}
const _this = this;
- uni.showModal({
- content: tipContent,
- showCancel: false,
- success() {
- const {
- orderId,
- id
- } = _this.result
- _this.$Request.postJson('app/discSpinning/receive', _this.result).then(res => {
- _this.result = ''
- console.log(res)
- if (res.code == 0) {
- uni.showToast({
- title: '领取成功',
- icon: 'none'
- })
- _this.getRedPack()
- } else {
- uni.showToast({
- title: '领取失败',
- icon: 'none'
- })
- }
- })
- },
- complete: () => {
- this.prizeing = false
- }
+ uni.showToast({
+ title: tipContent,
+ icon: 'none'
})
+ _this.getRedPack()
+ this.prizeing = false
+
},
// 抽奖转盘绘制完成
handleDrawFinish(res) {
diff --git a/components/pop-ling-qu - 副本.vue b/components/pop-ling-qu - 副本.vue
deleted file mode 100644
index fe60cdb..0000000
--- a/components/pop-ling-qu - 副本.vue
+++ /dev/null
@@ -1,175 +0,0 @@
-
-
-
-
- 恭喜您获得
-
-
-
-
-
-
- 物品
-
-
-
-
- {{result.number}}
- 元
-
-
- 现金红包
-
-
-
-
-
- 立即领取
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/components/pop-ling-qu.vue b/components/pop-ling-qu.vue
index 7239156..b19f46b 100644
--- a/components/pop-ling-qu.vue
+++ b/components/pop-ling-qu.vue
@@ -49,28 +49,7 @@
close() {
console.log('抽奖弹窗关闭');
this.show = false
- if(!this.result){
- return
- }
- const {
- orderId,
- id
- } = this.result
- this.$Request.postJson('app/discSpinning/receive', this.result).then(res => {
- this.result = ''
- console.log(res)
- if (res.code == 0) {
- console.log('抽奖领取成功');
- const key=res.data==0?'isBindAliPay':undefined
- this.$emit('close',key)
- if(key&&key=='isBindAliPay'){
- uni.navigateTo({
- url:'/me/invite/zhifubao'
- })
- }
- } else {
- }
- })
+ this.$emit('close',key)
}
}
}
diff --git a/manifest.json b/manifest.json
index 83042e1..d605929 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "斯耀短剧",
"appid" : "__UNI__E0B05B1",
"description" : "",
- "versionName" : "1.1.8",
- "versionCode" : 118,
+ "versionName" : "1.1.9",
+ "versionCode" : 119,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/me/choujiang/choujiang.vue b/me/choujiang/choujiang.vue
index a6290e9..0e42d19 100644
--- a/me/choujiang/choujiang.vue
+++ b/me/choujiang/choujiang.vue
@@ -485,9 +485,9 @@
tipContent = `恭喜您，获得 ${name}${this.result.type==2?(this.result.number+'元'):''} ！`
this.showLingPop({...this.result})
const cacheData={...this.result}
- setTimeout(()=>{
- this.$Request.postJson('app/discSpinning/receive',cacheData )
- },1000)
+ // setTimeout(()=>{
+ // this.$Request.postJson('app/discSpinning/receive',cacheData )
+ // },1000)
}
console.log(this.result);
this.result=''
diff --git a/me/detail/detail.nvue b/me/detail/detail.nvue
index 2a9af73..19b6ff1 100644
--- a/me/detail/detail.nvue
+++ b/me/detail/detail.nvue
@@ -832,8 +832,8 @@
} else {
uni.hideLoading()
uni.showToast({
- icon: res.msg,
- title: '支付失败!'
+ icon: "none",
+ title: res.msg
});
}
diff --git a/me/invite/cashDetail.vue b/me/invite/cashDetail.vue
index 8ddd715..2b781b7 100644
--- a/me/invite/cashDetail.vue
+++ b/me/invite/cashDetail.vue
@@ -54,9 +54,12 @@
-
- 提现账号
+
+ 实名认证
+
红包明细
@@ -132,7 +135,7 @@
用户在平台中对奖励提现的，适用以下规则：
- 1，用户的收益达到最低提现金额要求后，可以申请提现。每日发起前10笔提现为自动到账，超出则需第二个工作日后到账。
+ 1，用户的收益达到最低提现金额要求后，可以申请提现，每日只可以提现一笔。
2，用户需要通过支付宝提现，需按照要求绑定支付宝账号并填写提现金额或其他提现所需信息，请确保提供的信息准确无误，以免提现失败。
@@ -142,9 +145,9 @@
(2)高峰期提现人数多会导致网络拥堵，显示提现成功之后72小时内属于正常现象，请耐心等候。
- 4，每日23:00至次日11:00为系统维护时间，活动的对应奖励可能延迟到账。提现通常会在72小时内到账，如遇双休日、节假日，提现到账时间可能会延长。活动高峰期间，由于网络拥堵，用户可能存在短时间内无法提现的情况。平台将尽最大努力及时恢复提现功能，但无需因此承担任何责任。
+ 4，每日08:00至次日18:00为提现时间，活动的对应奖励可能延迟到账。提现通常会在72小时内到账，如遇双休日、节假日，提现到账时间可能会延长。活动高峰期间，由于网络拥堵，用户可能存在短时间内无法提现的情况。平台将尽最大努力及时恢复提现功能，但无需因此承担任何责任。
- `,
+ `,
money: '',
mayMoney: '0',
shouxufei: '',
@@ -173,7 +176,6 @@
userId: '',
zhifubao: '',
zhifubaoName: '',
- certNum: '',
list: [],
page: 1,
limit: 10,
@@ -192,11 +194,18 @@
onShow() {
this.token = uni.getStorageSync('token')
this.userId = uni.getStorageSync('userId')
- this.zhifubao = uni.getStorageSync('zhiFuBao')
- this.zhifubaoName = uni.getStorageSync('zhiFuBaoName')
- this.certNum = uni.getStorageSync('certNum')
this.getcashMoney()
-
+ this.$u.api.userinfo().then(res => {
+ if (res.code === 0) {
+ if (res.data.certName) {
+ this.zhifubaoName = res.data.certName;
+ }
+ if (res.data.accountNo) {
+ this.zhifubao = res.data.accountNo;
+ }
+
+ }
+ })
},
onReachBottom: function() {
if (this.page * this.limit < this.totalCount) {
@@ -385,6 +394,15 @@
});
},
+ /**
+ * 实名认证
+ */
+ realName() {
+ uni.navigateTo({
+ url: '/me/invite/realName'
+ });
+ },
+
/**
* 绑定支付宝
*/
@@ -419,7 +437,7 @@
that.getcashMoney()
}, 1500)
- } else if (res.code == 9991) {
+ } else if (res.code == 9999) {
uni.showToast({
title: res.msg,
icon: 'none'
@@ -430,6 +448,17 @@
});
}, 1500)
+ } else if (res.code == 9991) {
+ uni.showToast({
+ title: res.msg,
+ icon: 'none'
+ })
+ setTimeout(function() {
+ uni.navigateTo({
+ url: '/me/invite/realName'
+ });
+ }, 1500)
+
} else {
uni.showToast({
title: res.msg,
@@ -447,136 +476,78 @@
let cashMoney = that.cashMoney;
if (token) {
- if (that.zhifubao && that.zhifubaoName) {
- if (!/^\d+(\.\d{1,2})?$/.test(that.money)) {
- uni.showToast({
- icon: 'none',
- title: '请输入正确金额，不能包含中文，英文，特殊字符和小数'
- });
- return;
- }
- let shouxufei = parseFloat(that.money * that.shouxufei).toFixed(2);
- if (parseFloat(that.mayMoney).toFixed(2) >= parseFloat(that.money)) {
- // if (parseFloat(that.mayMoney).toFixed(1) >= parseFloat(that.money) + shouxufei * 1) {
- if (parseFloat(that.money).toFixed(2) >= parseFloat(cashMoney)) {
- if (that.shouxufei > 0) {
-
- uni.showModal({
- title: "提现申请提示",
- content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + that
- .money + '元\n\n收款人账号：' + that.zhifubao + '',
- // content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + that
- // .money + '元\n\n提现手续费：' + shouxufei +
- // '\n\n收款人账号：' + that.zhifubao + '',
- success: (e) => {
- if (e.confirm) {
- // that.money = money
- that.getMoney();
- that.getMoneyDetail();
- }
- }
- });
- } else {
- uni.showModal({
- title: "提现申请提示",
- content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + that
- .money + '元\n\n收款人账号：' + that.zhifubao +
- '',
- success: (e) => {
- if (e.confirm) {
- // that.money = money
- that.getMoney();
- that.getMoneyDetail();
- }
- }
- });
- }
-
- } else {
- uni.showToast({
- icon: 'none',
- title: "提现金额必须大于或等于" + cashMoney + "元才可提现"
- });
- }
- } else {
- uni.showToast({
- icon: 'none',
- title: "您的余额不足"
- });
- }
- } else {
- uni.navigateTo({
- url: "/me/invite/zhifubao"
- })
+
+ if (!/^\d+(\.\d{1,2})?$/.test(that.money)) {
+ uni.showToast({
+ icon: 'none',
+ title: '请输入正确金额，不能包含中文，英文，特殊字符和小数'
+ });
+ return;
}
- } else {
- uni.navigateTo({
- url: '/pages/login/login'
- });
- }
- },
- getOut1(money) {
- let that = this;
- let token = that.token
- let userId = that.userId
- if (token) {
- if (that.zhifubao && that.zhifubaoName) {
- if (parseFloat(this.mayMoney).toFixed(1) >= parseFloat(money)) {
- if (parseFloat(money).toFixed(1) >= 10) {
- if (this.shouxufei > 0) {
- let shouxufei = parseFloat(money * this.shouxufei).toFixed(2);
- uni.showModal({
- title: '提现申请提示',
- content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + money +
- '元\n\n收款人账号：' + that.zhifubao + '',
- // content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + money +
- // '元\n\n提现手续费：' + shouxufei +
- // '\n\n收款人账号：' + that.zhifubao + '',
- confirmColor: '#ff7581',
- success: e => {
- if (e.confirm) {
- this.money = money
- that.getMoney();
- // uni.showToast({
- // icon: 'none',
- // title: '提现成功'
- // })
- }
+ let shouxufei = parseFloat(that.money * that.shouxufei).toFixed(2);
+ if (parseFloat(that.mayMoney).toFixed(2) >= parseFloat(that.money)) {
+ // if (parseFloat(that.mayMoney).toFixed(1) >= parseFloat(that.money) + shouxufei * 1) {
+ if (parseFloat(that.money).toFixed(2) >= parseFloat(cashMoney)) {
+ if (that.shouxufei > 0) {
+ uni.showModal({
+ title: "提现申请提示",
+ content: '每日只可提现一次',
+ success: (e) => {
+ if (e.confirm) {
+ uni.showModal({
+ title: "提现申请提示",
+ content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + that
+ .money + '元\n\n收款人账号：' + that.zhifubao + '',
+ // content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + that
+ // .money + '元\n\n提现手续费：' + shouxufei +
+ // '\n\n收款人账号：' + that.zhifubao + '',
+ success: (e) => {
+ if (e.confirm) {
+ // that.money = money
+ that.getMoney();
+ that.getMoneyDetail();
+ }
+ }
+ });
}
- });
- } else {
- uni.showModal({
- title: '提现申请提示',
- content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + money +
- '元\n\n收款人账号：' + that.zhifubao +
- '',
- success: e => {
- if (e.confirm) {
- this.money = money
- that.getMoney();
- // uni.showToast({
- // icon: 'none',
- // title: '提现成功'
- // })
- }
- }
- });
- }
- } else {
- uni.showToast({
- icon: 'none',
- title: '提现金额必须大于或等于10元才可提现'
+ }
});
+
+ } else {
+ uni.showModal({
+ title: "提现申请提示",
+ content: '每日只可提现一次',
+ success: (e) => {
+ if (e.confirm) {
+ uni.showModal({
+ title: "提现申请提示",
+ content: '请仔细确认收款人信息\n\n收款人姓名:' + that.zhifubaoName + '\n\n提现金额:' + that
+ .money + '元\n\n收款人账号：' + that.zhifubao +
+ '',
+ success: (e) => {
+ if (e.confirm) {
+ // that.money = money
+ that.getMoney();
+ that.getMoneyDetail();
+ }
+ }
+ });
+ }
+ }
+ });
+
}
+
} else {
uni.showToast({
icon: 'none',
- title: '您的余额不足'
+ title: "提现金额必须大于或等于" + cashMoney + "元才可提现"
});
}
} else {
- uni.navigateTo({
- url: '/me/invite/zhifubao'
+ uni.showToast({
+ icon: 'none',
+ title: "您的余额不足"
});
}
} else {
@@ -585,6 +556,7 @@
});
}
}
+
}
};
diff --git a/me/invite/realName.vue b/me/invite/realName.vue
new file mode 100644
index 0000000..133e86a
--- /dev/null
+++ b/me/invite/realName.vue
@@ -0,0 +1,177 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ 请正确填写收款人的银行卡号和真实的收款人姓名
+ 手机号需是银行卡预留手机号
+ 银行卡号需与收款人姓名一致
+ 身份证信息仅可使用一次
+ 否则将无法正常收款，请须知
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/me/invite/zhifubao.vue b/me/invite/zhifubao.vue
index 5439ba7..6c0483c 100644
--- a/me/invite/zhifubao.vue
+++ b/me/invite/zhifubao.vue
@@ -4,14 +4,9 @@
-
-
-
-
请正确填写收款人的支付宝账户和真实的收款人姓名
- 身份证姓名需与支付宝姓名一致
- 身份证信息仅可使用一次
否则将无法正常收款，请须知
@@ -27,7 +22,6 @@
return {
zhiFuBao: '',
zhiFuBaoName: '',
- certNum: '',
logining: false
}
},
@@ -43,9 +37,7 @@
if (res.data.zhiFuBaoName) {
this.zhiFuBaoName = res.data.zhiFuBaoName;
}
- if (res.data.certNo) {
- this.certNum = res.data.certNo;
- }
+
}
})
}
@@ -63,7 +55,6 @@
toLogin() {
let zhiFuBao = this.zhiFuBao
let zhiFuBaoName = this.zhiFuBaoName
- let certNum = this.certNum
if (!zhiFuBao) {
uni.showToast({
@@ -75,21 +66,15 @@
title: '请设置收款人支付宝账号',
icon: 'none'
})
- } else if (!certNum) {
- uni.showToast({
- title: '请设置收款人身份证账号',
- icon: 'none'
- })
} else {
this.logining = true
- this.$u.post('app/user/updateUser?zhiFuBao=' + zhiFuBao + '&certName=' + zhiFuBaoName + '&certNum=' + certNum).then(
+ this.$u.post('app/user/bindAlipay?zhiFuBao=' + zhiFuBao + '&certName=' + zhiFuBaoName).then(
res => {
this.logining = false
console.log(res);
if(res.code===0){
uni.setStorageSync('zhiFuBao', zhiFuBao)
uni.setStorageSync('zhiFuBaoName', zhiFuBaoName)
- uni.setStorageSync('certNum', certNum)
uni.showToast({
title: '修改成功',
icon: 'none',
diff --git a/pages.json b/pages.json
index 22d8c3e..e758487 100644
--- a/pages.json
+++ b/pages.json
@@ -373,6 +373,17 @@
}
}
},
+ {
+ "path": "invite/realName",
+ "style": {
+ "navigationBarTitleText": "实名认证",
+ "h5": {
+ "titleNView": {
+ "backgroundColor": "#FFFFFF"
+ }
+ }
+ }
+ },
{
"path": "invite/zhifubao",
"style": {