Merge branch 'master' of http://192.168.1.26:3000/dianliang/dl_uniapp

pages/components/notice-index.vue

@@ -327,7 +327,6 @@
 						title: e
 					});
 				})
-
 			},
 			/**
 			 * 初始化数据

pages/mine/points/points.vue

@@ -32,7 +32,7 @@
 				</view>
 			</view>
 			<view v-if="ifHasWaiting" class="daiban-box">
-				<view class="daiban-dom">
+				<view class="daiban-dom" @click="repay()">
 					<uni-icons type="chat-filled" size="18" style="padding-right: 10rpx;"></uni-icons>
           您有一笔<text>{{ wayOrder.points }}</text>积分的提现订单，请及时处理
 					<uni-icons type="right" size="18" style="padding-left: 10rpx;"></uni-icons>
@@ -157,7 +157,7 @@
 							this.ifHasWaiting = true
 						} else {
 							this.wayOrder = null
-							// this.ifHasWaiting = false
+							this.ifHasWaiting = false
 						}
 					} else {
 						this.ifHasWaiting = false
@@ -205,6 +205,34 @@
 				this.$refs.inputDialog.open()
 			},
 
+      repay(){
+        // 关闭窗口后，恢复默认内容
+        entPay(this.wayOrder.orderNo).then(payS => {
+          uni.hideLoading()
+          if (wx.canIUse('requestMerchantTransfer')) {
+            wx.requestMerchantTransfer({
+              mchId: payS.config.mchId,
+              appId: payS.config.appId,
+              package: payS.runData.packageInfo,
+              success: (res) => {
+                // res.err_msg将在页面展示成功后返回应用时返回ok，并不代表付款成功
+                console.log('success:', res);
+                this.initWayOrder()
+                this.initData()
+              },
+              fail: (res) => {
+                console.log('fail:', res);
+              },
+            });
+          } else {
+            wx.showModal({
+              content: '你的微信版本过低，请更新至最新版本。',
+              showCancel: false,
+            });
+          }
+        })
+      },
+
 			dialogInputConfirm(val) {
 				if (val) {
 					uni.showLoading({