充值

mallApp/src/pages.json

@@ -1,5 +1,5 @@
 {
-    "pages": [{ "path": "pages/home/recent", "style": { "navigationBarTitleText": "我买过的店" } },
+    "pages": [{ "path": "pages/home/recent", "style": { "navigationBarTitleText": "我买过的" } },
         { "path": "pages/home/index", "style": { "navigationBarTitleText": "首页" } },
         { "path": "pages/home/category", "style": { "navigationBarTitleText": "花束花礼" } },
         { "path": "pages/home/shop", "style": { "navigationBarTitleText": "门店" } },

mallApp/src/pages/home/recent.vue

@@ -14,10 +14,10 @@
 
         <view style="background-color:white;margin-bottom:20upx;display: flex;justify-content: space-around;">
           <button class="admin-button-com mini-btn blue" style="padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="">修改密码</button>
-          <button class="admin-button-com mini-btn blue" style="padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="">改进建议</button>
+          <button class="admin-button-com mini-btn blue" style="padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="">提建议</button>
           <button class="admin-button-com mini-btn blue" style="padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="">我的地址</button>
           <button class="admin-button-com mini-btn blue" style="padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="">采购统计</button>
-          <button class="admin-button-com mini-btn blue" style="padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="logout()">退出登录</button>
+          <button class="admin-button-com mini-btn blue" style="padding-top:18upx;padding-bottom:18upx;border:none;margin-top:10upx;" @click="logout()">退出</button>
         </view>
 
         <view class="ghs_list_area flex-col justify-end">
@@ -38,8 +38,20 @@
                 <view class="tag_2" @click="showTip()"> <text>结账记录</text> </view>
                 <view class="tag_2" @click="getBuyList()"> <text>买花记录</text> </view>
               </view>
+
+              <block v-if="Number(item.balance)>0">
+                <view class="box_6 flex-row">
+                  <view class="show_clear_area flex-row justify-between">
+                    <text class="waite_clear_order" style="color:#3385ff;">
+                        <text>可用余额 ¥{{ item.balance ? parseFloat(item.balance) : 0 }}</text>
+                    </text>
+                  </view>
+                </view>
+              </block>
+
               <view class="button_4 flex-col" @click.stop="bug(item)"><text class="text_13">买花</text></view>
               <view class="button_6 flex-col" @click.stop="recharge(item)" v-if="item.rechargeWeal != 0"><text class="text_13">充值</text></view>
+
             </view>
 
         </view>
@@ -337,19 +349,19 @@ export default {
         margin-top: 40upx;
       }
       .box_9 {
-        height: 65upx;
-        padding: 23upx 0 22upx 30upx;
+        height: 70upx;
+        padding: 23upx 0 22upx 0upx;
+        display: flex;
+        justify-content: space-around;
         .tag_2 {
           background-color: rgba(255, 255, 255, 1);
           border-radius: 8px;
-          height: 60upx;
-          line-height:60upx;
+          height: 65upx;
+          line-height:65upx;
           border: 2px solid rgba(221, 221, 221, 1);
           color: rgba(51, 51, 51, 1);
           font-size: 30upx;
-          margin:0 50upx 0 0;
           text-align:center;
-          float:left;
           padding-left:20upx;
           padding-right:20upx;
         }
@@ -440,8 +452,8 @@ export default {
         }
       }
       .button_4 {
-        height: 80upx;
-        line-height:80upx;
+        height: 95upx;
+        line-height:95upx;
         text-align:center;
         background-color:#FF2842;
         background-size: 137upx 137upx;
@@ -474,8 +486,8 @@ export default {
         }
       }
       .button_6 {
-        height: 80upx;
-        line-height:80upx;
+        height: 95upx;
+        line-height:95upx;
         text-align:center;
         background-color:#FF2842;
         background-size: 137upx 137upx;

mallApp/src/pages/member/rechargeResult.vue

@@ -4,10 +4,8 @@
         <view class="top-view"> </view>
         <view class="result-view">
           <view :class="['iconfont', 'iconchenggong']"></view>
-          <view class="result-title">付款成功</view>
-          <view class="result-title" v-if="Number(customInfo.remainDebtAmount)>0">剩余欠款：{{ customInfo.remainDebtAmount }}元</view>
-          <view class="result-title" v-else>欠款已全部结清</view>
-          <button class="admin-button-com big" style="width:70vw;margin-top:20upx;" @click="goBack">返回</button>  
+          <view class="result-title">充值成功</view>
+          <button class="admin-button-com big" style="width:60vw;margin-top:50upx;" @click="goBack">返回</button>  
         </view>
       </view>
     </view>
@@ -19,12 +17,6 @@
       return {
 
       }
-    },
-    computed: {
-
-    },
-    onLoad() {
-      
     },
     methods: {
       init(){
@@ -126,7 +118,7 @@
       display: flex;
       flex-direction: column;
       align-items: center;
-      padding: 30upx 70upx 70upx 70upx;
+      padding: 80upx 0upx 70upx 0upx;
       width: 100%;
       background: #ffffff;
       border-radius: 20upx;