我的红包

ghsApp/src/pages.json

@@ -401,7 +401,7 @@
 			"root": "pagesArrears",
 			"pages": [
 				{ "path": "list", "style": { "navigationBarTitleText": "客户赊账", "enablePullDownRefresh": true } },
-				{ "path": "details", "style": { "navigationBarTitleText": "赊账订单", "enablePullDownRefresh": false } },
+				{ "path": "details", "style": { "navigationBarTitleText": "挂账订单", "enablePullDownRefresh": false } },
 				{ "path": "clearResult", "style": { "navigationBarTitleText": "结果"} }
 			]
 		},

ghsApp/src/pagesClient/member/detail.vue

@@ -14,10 +14,10 @@
                   <view style="font-size:26upx;">
                     ID {{userInfo.sn}}
                     <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 10000" style="margin-left:15upx;color:green;">没有下过单</text>
-                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 7" style="margin-left:15upx;color:green;">超1周未下单</text>
-                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 30" style="margin-left:15upx;color:green;">超1个月未下单</text>
-                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 180" style="margin-left:15upx;color:green;">超半年未下单</text>
-                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 365" style="margin-left:15upx;color:green;">超1年未下单</text>
+                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 7" style="margin-left:15upx;color:green;">1周未下单</text>
+                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 30" style="margin-left:15upx;color:green;">1个月未下单</text>
+                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 180" style="margin-left:15upx;color:green;">半年未下单</text>
+                    <text v-if="userInfo.overTimeUnExpend && userInfo.overTimeUnExpend == 365" style="margin-left:15upx;color:green;">1年未下单</text>
 
                     <text v-if="Number(userInfo.black)==2" style="color:red;font-weight:bold;margin-left:15upx;">黑名单</text>
                     <text v-if="Number(userInfo.delStatus)==1" style="color:red;font-weight:bold;margin-left:15upx;">已删除</text>
@@ -127,7 +127,7 @@
         <view class="input-line-wrap">
 
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/pagesArrears/details',query: {id: userInfo.id}})">
-              <div class="tui-title">赊账订单</div>
+              <div class="tui-title">挂账订单</div>
             </tui-list-cell>
 
             <tui-list-cell class="line-cell" :hover="false" :arrow="true" @click="pageTo({ url: '/admin/clear/customList',query: {customId: userInfo.id}})">

mallApp/src/pages/member/recharge.vue

@@ -261,7 +261,7 @@ export default {
 			}
 		},
 		paySuccess() {
-			this.$util.pageTo({url: '/pages/member/rechargeResult?id='+this.hdId+'&salt='+this.salt+'&hdId='+this.hdId,type: 2})
+			this.$util.pageTo({url: '/pages/member/rechargeResult?id='+this.hdId+'&salt='+this.salt+'&hdId='+this.hdId+'&account='+this.account,type: 2})
 		},
 		payFail() {
 		},

mallApp/src/pages/member/rechargeResult.vue

@@ -12,6 +12,7 @@
             </view>
             <view class="confirm-btn-wrap">
               <button class="confirm-btn" @click="goBack">我知道了</button>
+              <button class="confirm-btn" @click="myHb">我的红包</button>
             </view>
             <!-- #ifdef MP-WEIXIN -->
             <view style="width:100%;height:10upx;background-color:white;margin-top:60upx;"></view>
@@ -38,6 +39,11 @@
     methods: {
       init(){
       },
+      myHb(){
+        let account = this.option.account?this.option.account:0
+        let hdId = this.option.hdId?this.option.hdId:0
+        this.pageTo({url:"/pages/hb/list?hdId="+hdId+"&account="+account})
+      },
       goBack(){
         uni.navigateBack()
       }
@@ -117,7 +123,7 @@
         align-items: center;
         justify-content: center;
         transition: all 0.3s ease;
-        margin: 0 auto 25upx;
+        margin: 0 auto 35upx;
       }
       .tech-support {
         font-size: 30upx;