diff --git a/pages/mine/points/points.vue b/pages/mine/points/points.vue
index 40387b4..3068cfa 100644
--- a/pages/mine/points/points.vue
+++ b/pages/mine/points/points.vue
@@ -11,7 +11,14 @@
{{pointsBalance}}
- 提现
+
+ 提现
+
+
+ 1积分=1元
+
+
+
@@ -24,6 +31,9 @@
+
+ 您有一笔金额为10元的提现订单，请及时处理
+
@@ -32,7 +42,8 @@
:class="index==menuIndex?'dl-menu click':'dl-menu'">{{item}}
-
+
@@ -56,8 +67,8 @@
-
+
@@ -86,6 +97,8 @@
return {
//是否是会员
ifMember: true,
+ //是否有待处理订单
+ ifHasWaiting: false,
menus: ['积分收支明细'],
menuIndex: 0,
//积分明细
@@ -113,7 +126,8 @@
//下来刷新状态
isTriggered: false,
userId: null,
- pointsBalance: 0
+ pointsBalance: 0,
+ money: ""
}
},
@@ -146,7 +160,18 @@
}
})
},
+ /**
+ * 计算提现的积分等于多少钱
+ * @param {Object} val
+ */
+ getEndMoney(val) {
+ if (!val) {
+ this.money = "0"
+ } else {
+ this.money = (val / 10).toFixed(2) + ""
+ }
+ },
/**
* 提现
*/
@@ -297,6 +322,27 @@
color: white;
border-radius: 40rpx;
}
+
+ .tips {
+ color: #929292;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ font-size: 22rpx;
+ }
+ }
+
+ .daiban-box {
+ width: 100%;
+ padding-top: 10rpx;
+ font-size: 28rpx;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+
+ text {
+ color: #FC1F3E;
+ }
}
.huiyuan-box {
@@ -409,11 +455,19 @@
}
.no-member {
- height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 450rpx);
+ height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 460rpx);
}
.member {
- height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 340rpx);
+ height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 350rpx);
+ }
+
+ .no-member-and-wating {
+ height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 520rpx);
+ }
+
+ .member-and-wating {
+ height: calc(100vh - var(--status-bar-height) - var(--window-bottom) - 400rpx);
}
.data-list {
diff --git a/pages/notice/detail.vue b/pages/notice/detail.vue
index fce09b7..b26ad7a 100644
--- a/pages/notice/detail.vue
+++ b/pages/notice/detail.vue
@@ -498,24 +498,12 @@
//海报
this.$refs.canvas.canvasCreate();
} else if ('wx' == dataObj.item.name) {
- this.onShareAppMessage()
+
} else if ('jb' == dataObj.item.name) {
this.goReportForm()
}
},
- /**
- * 微信分享
- * @param {Object} res
- */
- onShareAppMessage(res) {
- if (res.from === 'button') { // 来自页面内分享按钮
- console.log(res.target)
- }
- return {
- title: '【' + this.noticeDetail.platformName + '】' + this.noticeDetail.title,
- path: '/pages/notice/detail?id=' + this.noticeDetail.id
- }
- },
+
dialogConfirm() {
console.log('点击确认')
this.$tab.navigateTo('/pages/mine/card/my-card')
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
index 977cba2..1001ef7 100644
--- a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -13,6 +13,7 @@
+ 到账金额：{{money}}元
@@ -104,13 +105,21 @@
iconPath: {
type: String,
default: ''
- }
+ },
+ tixian: {
+ type: Boolean,
+ default: false
+ },
+ money: {
+ type: String,
+ default: ''
+ },
},
data() {
return {
dialogType: 'error',
focus: false,
- val: ""
+ val: "",
}
},
computed: {
@@ -138,6 +147,9 @@
},
value(val) {
this.val = val
+ },
+ val(val) {
+ this.$emit("getEndMoney", val)
}
},
created() {
@@ -284,6 +296,14 @@
color: #555;
}
+ .dl-tixian-text {
+ font-size: 25rpx;
+
+ text {
+ color: #FC1F3E;
+ }
+ }
+
.uni-popup__success {
color: #4cd964;
}
diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
index a6d61a9..612cc87 100644
--- a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -85,15 +85,33 @@
return this.title || t("uni-popup.shareTitle")
}
},
+ /**
+ * 微信分享
+ * @param {Object} res
+ */
+ onShareAppMessage(res) {
+ if (res.from === 'button') { // 来自页面内分享按钮
+ console.log(res.target)
+ }
+ return {
+ title: '【' + this.noticeDetail.platformName + '】' + this.noticeDetail.title,
+ path: '/pages/notice/detail?id=' + this.noticeDetail.id
+ }
+ },
methods: {
+
/**
* 选择内容
*/
select(item, index) {
- this.$emit('select', {
- item,
- index
- })
+ if ('wx' == item.name) {
+ this.close()
+ } else {
+ this.$emit('select', {
+ item,
+ index
+ })
+ }
this.close()
},
/**