diff --git a/.vscode/ftp-kr.json b/.vscode/ftp-kr.json
index 6c0d9ea..24ab598 100644
--- a/.vscode/ftp-kr.json
+++ b/.vscode/ftp-kr.json
@@ -1,5 +1,5 @@
{
- "host": "10.42.0.101",
+ "host": "192.168.43.121",
"username": "xingbangtuan",
"password": "123456",
"remotePath": "/",
diff --git a/.vscode/ftp-kr.sync.cache.json b/.vscode/ftp-kr.sync.cache.json
index 716dc3e..4da87b0 100644
--- a/.vscode/ftp-kr.sync.cache.json
+++ b/.vscode/ftp-kr.sync.cache.json
@@ -1,5 +1,5 @@
{
- "ftp://10.42.0.101:14147@xingbangtuan": {
+ "ftp://192.168.43.121:14147@xingbangtuan": {
"App.vue": {
"type": "-",
"size": 517,
diff --git a/pages/guard/index.vue b/pages/guard/index.vue
index 194fb70..2d8fe1c 100644
--- a/pages/guard/index.vue
+++ b/pages/guard/index.vue
@@ -95,11 +95,20 @@
starId:this.id
},
success:(res)=>{
- uni.showToast({
- title: '守护成功',
- duration: 2000
- });
- that.getshouhuLog()
+ if(res.data.code != 0){
+ uni.showToast({
+ icon: 'none',
+ title: res.data.msg,
+ duration: 2000
+ });
+ }else{
+ uni.showToast({
+ title: '守护成功',
+ duration: 2000
+ });
+ that.getshouhuLog()
+ }
+
}
})
},
diff --git a/pages/my/my.vue b/pages/my/my.vue
index 3b3be1f..4ad91ac 100644
--- a/pages/my/my.vue
+++ b/pages/my/my.vue
@@ -8,7 +8,7 @@
{{info.nick}}
- VIP平民
+ VIP平民
{{info.much}}票
{{info.id}}
@@ -177,12 +177,13 @@ export default {
console.log(this.info)
}
})
+ let that = this
this.request({
url:this.path+'/api/xyb/star/taskList',
success:(res)=>{
let d = res.data;
if(d.code == 0){
- this.isVIP = d.rows[6].isHaveVip == 1 ? true : false
+ that.isVIP = d.rows[6].isHaveVip == "1" ? true : false
}
}
})
diff --git a/pages/support/support.vue b/pages/support/support.vue
index 4e5fb3f..ad293fd 100644
--- a/pages/support/support.vue
+++ b/pages/support/support.vue
@@ -39,23 +39,34 @@
+
+ 我们正在守护{{ nowStar.name }}中：
+
+
+
+
+ 我要加入
+ 守护队伍
+
+
+
【公告】
陪伴是最长情的告白
-
+
-
+
|
|
- {{isVIP ? '您有VIP特权，要守护' + nowStar.name || '' + '吗？': '我要守护爱豆' + nowStar.name || ''}}
+ {{isVIP ? '您有VIP特权，要守护' + nowStar.name || '' + '吗？': '我要守护爱豆' + nowStar.name || ''}}
@@ -86,7 +97,7 @@
-
+
+{{ value.muchPiao }}票
@@ -171,6 +182,9 @@
+
+
+
@@ -227,6 +241,9 @@ export default {
lingqu:true,
piao:500,
isVIP: false,
+ guardPeople: [],
+ guardStatus: '', // 等于一的时候，让他们展示，等于零的时候不展示
+ isGuard: ''
};
},
onLoad(opt) {
@@ -310,8 +327,53 @@ export default {
if(this.hasLogin){
this.getUserInfo();
}
+ console.log('ceshiceshi')
+ this.getGuardPeople();
+ this.judgeGuardShow();
+ this.getshouhuLog();
},
methods:{
+ judgeGuardShow() {
+ let that = this
+ this.request({
+ url: this.path + "/api/xyb/banner/isOpen",
+ data: {
+ starId: this.id
+ },
+ success(res){
+ that.guardStatus = res.data.msg;
+ console.log(that.guardStatus)
+ }
+ })
+ },
+ getshouhuLog(){
+ let that = this
+ this.request({
+ url:that.path + "/api/xyb/star/isShouhuLog",
+ data:{
+ starId:that.id
+ },
+ success:(res)=>{
+ if(res.data.code == 301) that.isGuard = false;
+ else that.isGuard = true;
+ console.log(that.isGuard)
+ }
+ })
+ },
+ // 查询当前明星被哪些会员守护
+ getGuardPeople() {
+ let that = this
+ this.request({
+ url: this.path + "/api/xyb/star/shouhuLogByStarId",
+ data: {
+ starId: this.id
+ },
+ success(res){
+ that.guardPeople = res.data.data
+ console.log(that.guardPeople)
+ }
+ })
+ },
// 领取
lq(){
this.request({
@@ -359,7 +421,7 @@ export default {
if(res.platform == 'ios'){
uni.showModal({
title: '提示',
- content: 'ios不支持购买',
+ content: 'ios暂不支持',
showCancel: false,
success: function (res) {
if (res.confirm) {
@@ -474,19 +536,24 @@ export default {
this.$refs.popupShare.open()
},
select(e, done) {
+ let that = this;
uni.getSystemInfo({
success(res){
- uni.showModal({
- title: '朋友圈',
- content: res.platform == 'ios' ? 'ios功能暂不可用' : '请点击右上角更多进行分享',
- success: function (res) {
- if (res.confirm) {
- console.log('用户点击确定');
- } else if (res.cancel) {
- console.log('用户点击取消');
- }
- }
- });
+ // if(res.platform == 'ios' ){
+ // uni.showModal({
+ // title: '朋友圈',
+ // content: 'ios功能暂不可用',
+ // success: function (res) {
+ // if (res.confirm) {
+ // console.log('用户点击确定');
+ // } else if (res.cancel) {
+ // console.log('用户点击取消');
+ // }
+ // }
+ // });
+ // }else{
+ that.$refs.imagePopup.open();
+ // }
}
})
@@ -792,6 +859,7 @@ export default {
if(this.shengMuch>0){
this.tMuch = this.shengMuch;
this.vote = true;
+ this.dingyues()
}else{
uni.showToast({
title:"票数不足！",
@@ -1416,7 +1484,45 @@ export default {
font-size: 14px;
}
}
-
+ .guard-people {
+ padding: 20rpx;
+ margin: 0 30rpx 10rpx;
+ display: flex;
+ align-items: center;
+ .left {
+ font-size: 30rpx;
+ }
+ > image {
+ width: 70rpx;
+ height: 70rpx;
+ border-radius: 50%;
+ }
+ .right {
+ border-radius: 22rpx;
+ margin-left: auto;
+ width: 256rpx;
+ height: 90rpx;
+ box-shadow: 0 0 10rpx #f0f0f0;
+ display: flex;
+ align-items: center;
+ > image {
+ width: 50rpx;
+ height: 50rpx;
+ margin: 0 40rpx 0 20rpx;
+ }
+ > view {
+ .text-top {
+ color: #333;
+ font-size: 26rpx;
+ margin-bottom: 10rpx;
+ }
+ .text-bottom {
+ font-size: 20rpx;
+ color: rgb(25, 191, 202);
+ }
+ }
+ }
+ }
.top-notice {
display: flex;
font-size: 24rpx;
diff --git a/static/share.png b/static/share.png
new file mode 100644
index 0000000..6f04683
Binary files /dev/null and b/static/share.png differ
diff --git a/static/shouhu.png b/static/shouhu.png
new file mode 100644
index 0000000..82f5389
Binary files /dev/null and b/static/shouhu.png differ