商城

hdApp/src/admin/member/detail.vue

@@ -155,7 +155,7 @@
           <div class="inp-list-line">
             <div class="line-label">充值金额</div>
             <div class="line-input">
-              <input type="text" placeholder="请输入金额" v-model="rForm.rechargeAmount" :adjust-position="false" class="inp-input" style="text-align:center;" />
+              <input type="digit" placeholder="请输入金额" v-model="rForm.rechargeAmount" :adjust-position="false" class="inp-input" style="text-align:center;" />
             </div>
           </div>
           <div class="inp-list-line" style="margin-top:35upx;">

mallApp/src/pages/home/recent.vue

@@ -42,7 +42,7 @@
                 <view class="show_clear_area flex-row justify-between">
                   <text class="waite_clear_order">
                   待结金额 ¥{{parseFloat(Math.abs(item.balance))}}
-                  <text style="margin-left:30upx;">去结账 》</text>
+                  <text style="margin-left:30upx;text-decoration: underline;">去结账</text>
                   </text>
                 </view>
               </view>
@@ -55,6 +55,7 @@
                 </view>
               </view>
 
+              <view class="button_recharge flex-col" @click.stop="recharge(item)"><text class="text_13">充值</text></view>
               <view class="button_4 flex-col" @click.stop="bug(item)"><text class="text_13">买花</text></view>
 
               </view>
@@ -437,6 +438,24 @@ export default {
             }
           }
         }
+        .button_recharge {
+          height: 80upx;
+          line-height:80upx;
+          text-align:center;
+          background-color:#3385ff;
+          background-size: 137upx 137upx;
+          width: 130upx;
+          position: absolute;
+          right: 270upx;
+          top: 105upx;
+          border-radius:20upx;
+          z-index: 10;
+          .text_13 {
+            color: rgba(255, 255, 255, 1);
+            font-size: 30upx;
+            font-weight:bold;
+          }
+        }
         .button_4 {
           height: 80upx;
           line-height:80upx;

mallApp/src/pages/member/recharge.vue

@@ -1,20 +1,26 @@
 <template>
-	<div class="app-content pay-wrap">
-		<div class="delivery-wrap">
-			<div class="shop-logo-wrap">
-				<div class="logo-img">
+	<view class="app-content pay-wrap">
+		<view class="delivery-wrap">
+			<view class="shop-logo-wrap">
+				<view class="logo-img">
 					<image class="logo" :src="`${constant.imgUrl}/logo4.png`" alt mode="widthFix" ></image>
-					<div class="title">{{ hdInfo.name?hdInfo.name:'' }}</div>
-				</div>
-			</div>
-			<div style="padding:10upx 0 25upx 10upx;font-size:30upx;" v-if="!$util.isEmpty(customInfo)">
-				您好，{{ customInfo.name?customInfo.name:'' }}，<text>请输入要充值金额</text>
-			</div>
-			<div class="module-com pay-input-wrap">
+					<view class="title">{{ hdInfo.name?hdInfo.name:'' }}</view>
+				</view>
+			</view>
+			<view style="padding:10upx 0 25upx 10upx;font-size:30upx;" v-if="!$util.isEmpty(customInfo)">
+				您好，{{ customInfo.name?customInfo.name:'' }}
+				<text v-if="hdInfo.balance >= 0">账户余额：¥{{ hdInfo.balance?parseFloat(hdInfo.balance):0 }}元</text>
+				<text v-else>
+					欠账：¥{{ hdInfo.balance?parseFloat(hdInfo.balance):0 }}元
+					<text>查看账单</text>
+					<text>查看明细</text>
+				</text>
+			</view>
+			<view class="module-com pay-input-wrap">
 				<pay-input-module :focus="inpFocus" :num="amount" @focusFn="focusFn" @blurFn="blurFn" @clickKey="clickKeyFn" />
-			</div>
+			</view>
 
-			<view style="text-align: center;">
+			<view style="text-align: center;" v-if="hdInfo.balance > 0 && (rechargeWeal == 1 || rechargeWeal == 2)">
 
 				<view v-if="rechargeWeal == 1" style="font-size:34upx;">
 					<view v-for="(item,index) in weal" :key="index" style="margin-top:56upx;">
@@ -36,16 +42,16 @@
 
 			</view>
 
-			<div class="btn-wrap">
+			<view class="btn-wrap">
 				<!-- #ifdef MP-WEIXIN -->
 				<button class="button-com green" @click="wexinPayFn">微信支付</button>
 				<!-- #endif -->
-			</div>
-		</div>
+			</view>
+		</view>
 
 		<wangCg :loginStyle.sync="globalLoginStyle" @goToLogin="loginTo()"></wangCg>
 
-	</div>
+	</view>
 </template>
 <script>
 import { mapGetters } from 'vuex'
@@ -77,8 +83,8 @@ export default {
 			payCallData: null,
 			id:0,
 			salt:'',
-			hdInfo:[],
-			customInfo:[],
+			hdInfo:{balance:0},
+			customInfo:{balance:0},
 			loginComeBack:0,
 			rechargeWeal:0,
 			weal:[]
@@ -321,21 +327,18 @@ export default {
 		.logo-img {
 			width: 100%;
 			margin: 10upx auto;
+			display: flex;
 			align-items: center;
 			.logo {
-				width: 100upx;
-				height:100upx;
+				width: 80upx;
+				height: 80upx;
 				border-radius: 10upx;
-				margin-left:10upx;
-				float: left;
+				margin-left: 10upx;
 			}
 			.title{
-				margin-left:20upx;
-				float:left;
-				width:600upx;
-				height:100upx;
-				line-height:100upx;
-				font-size:42upx;
+				margin-left: 20upx;
+				flex: 1;
+				font-size: 42upx;
 				font-weight: bold;
 			}
 		}