1

pages/mine/points/points.vue

@@ -11,7 +11,14 @@
 					</view>
 					<view class="left-dom-bottom">{{pointsBalance}}</view>
 				</view>
-				<view class="right-dom" @click="outData()">提现</view>
+				<view>
+					<view class="right-dom" @click="outData()">提现</view>
+					<view class="tips">
+						<uni-icons type="info" size="12"></uni-icons>
+						1积分=1元
+					</view>
+				</view>
+
 			</view>
 			<view v-if="!ifMember" class="huiyuan-box">
 				<view class="dl-member-box" @click="goMemberCard()">
@@ -24,6 +31,9 @@
 					</view>
 				</view>
 			</view>
+			<view v-if="ifHasWaiting" class="daiban-box">
+				您有一笔金额为<text>10</text>元的提现订单，请及时处理
+			</view>
 			<view class="data-list-box">
 				<view class="content-box">
 					<view class="dl-opt-box">
@@ -32,7 +42,8 @@
 								:class="index==menuIndex?'dl-menu click':'dl-menu'">{{item}}</view>
 						</view>
 					</view>
-					<view :class="['data-list',!ifMember?'no-member':'member']">
+					<view
+						:class="['data-list',!ifMember?(ifHasWaiting?'no-member-and-wating':'no-member'):(ifHasWaiting?'member-and-wating':'member')]">
 						<scroll-view style="height: 100%;" scroll-y="true" @scrolltolower="onReachBottomCus"
 							refresher-enabled @refresherrefresh="onRefresherrefresh" :refresher-triggered="isTriggered">
 							<view class="item-dom" v-for="(item,index) in dataList">
@@ -56,8 +67,8 @@
 		</view>
 		<!-- 输入框示例 -->
 		<uni-popup ref="inputDialog" type="dialog">
-			<uni-popup-dialog ref="inputClose" mode="input" title="积分提现" placeholder="请输入提现金额"
+			<uni-popup-dialog tixian="true" inputType="number" :money="money" ref="inputClose" mode="input" title="积分提现"
-				@confirm="dialogInputConfirm"></uni-popup-dialog>
+				placeholder="请输入提现金额" @confirm="dialogInputConfirm" @getEndMoney="getEndMoney"></uni-popup-dialog>
 		</uni-popup>
 	</view>
 </template>
@@ -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 {

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')

uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue

@@ -13,6 +13,7 @@
 			<slot>
 				<input class="uni-dialog-input" v-model="val" :type="inputType" :placeholder="placeholderText"
 					:focus="focus">
+				<view v-if="tixian && ''!=money" class="dl-tixian-text">到账金额：<text>{{money}}</text>元</view>
 			</slot>
 		</view>
 		<view class="uni-dialog-button-group">
@@ -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;
 	}

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', {
+				if ('wx' == item.name) {
-					item,
+					this.close()
-					index
+				} else {
-				})
+					this.$emit('select', {
+						item,
+						index
+					})
+				}
 				this.close()
 			},
 			/**