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

api/business/member.js

@@ -209,6 +209,14 @@ export function getMemberCoupon() {
 	})
 }
 
+//查询在途提现订单
+export function getOnWayOrder() {
+	return request({
+		url: '/member/points/getOnWayOrder',
+		method: 'get',
+	})
+}
+
 //积分提现
 export function payout(data) {
 	return request({

config.js

@@ -1,8 +1,8 @@
 // 应用全局配置
 module.exports = {
 	// baseUrl: 'https://www.ddtg.site/noticeApi',
-	baseUrl: 'https://www.ddtg.site/noticeApi',
+	// baseUrl: 'https://www.ddtg.site/noticeApi',
-	// baseUrl: 'http://192.168.1.4:8099',
+	baseUrl: 'http://192.168.1.4:8099',
 	// 应用信息
 	appInfo: {
 		// 应用名称

pages/mine/points/points.vue

@@ -15,7 +15,7 @@
 					<view class="right-dom" @click="outData()">提现</view>
 					<view class="tips">
 						<uni-icons type="info" size="12"></uni-icons>
-						1积分=1元
+						1积分=0.1元
 					</view>
 				</view>
 
@@ -31,8 +31,8 @@
 					</view>
 				</view>
 			</view>
-			<view v-if="ifHasWaiting" class="daiban-box">
+			<view v-if="wayOrder!=null" class="daiban-box">
-				您有一笔金额为<text>10</text>元的提现订单，请及时处理
+				您有一笔<text>{{ wayOrder.points }}</text>积分的提现订单，请及时处理
 			</view>
 			<view class="data-list-box">
 				<view class="content-box">
@@ -68,7 +68,7 @@
 		<!-- 输入框示例 -->
 		<uni-popup ref="inputDialog" type="dialog">
 			<uni-popup-dialog tixian="true" inputType="number" :money="money" ref="inputClose" mode="input" title="积分提现"
-				placeholder="请输入提现金额" @confirm="dialogInputConfirm" @getEndMoney="getEndMoney"></uni-popup-dialog>
+				placeholder="请输入提现积分" @confirm="dialogInputConfirm" @getEndMoney="getEndMoney"></uni-popup-dialog>
 		</uni-popup>
 	</view>
 </template>
@@ -80,7 +80,8 @@
 	} from '@/utils/common.js'
 	import {
 		pointList,
-		payout
+		payout,
+    getOnWayOrder
 	} from '@/api/business/member.js'
 	import {
 		toast
@@ -101,6 +102,7 @@
 				ifHasWaiting: false,
 				menus: ['积分收支明细'],
 				menuIndex: 0,
+        wayOrder:{},
 				//积分明细
 				dataList: [{
 					fromCode: "",
@@ -137,8 +139,24 @@
 			this.pointsBalance = option.pointsBalance
 			this.initData()
 		},
+    onShow(){
+		  this.initWayOrder()
+    },
 
 		methods: {
+		  initWayOrder(){
+        getOnWayOrder().then(res=>{
+          if(res.code == 200) {
+            console.log(res,'res')
+            if (res.data){
+              this.wayOrder = res.data
+            } else {
+              this.wayOrder = null
+            }
+          }
+        })
+      },
+
 			/**
 			 * 格式化数字
 			 * @param {Object} number
@@ -188,7 +206,6 @@
 						points: val
 					}).then(res => {
 						if (res.code == 200) {
-
 							// 关闭窗口后，恢复默认内容
 							entPay(res.data.orderNo).then(payS => {
 								uni.hideLoading()