1.我的页面排版调整

2.添加余额充值赠送权益显示
3.话费充值说明改接口获取

src/pages.json

@@ -12,14 +12,14 @@
 				"navigationBarTitleText": "福利"
 			}
 		},
-		{
-			"path": "pages/orderingfood/merchantlist",
-			"style": {
-				"navigationBarTitleText": "数智生活",
-				"onReachBottomDistance": 200,
-				"navigationStyle": "custom"
-			}
-		},
+		// {
+		// 	"path": "pages/orderingfood/merchantlist",
+		// 	"style": {
+		// 		"navigationBarTitleText": "数智生活",
+		// 		"onReachBottomDistance": 200,
+		// 		"navigationStyle": "custom"
+		// 	}
+		// },
 		{
 			"path": "pages/my/index",
 			"style": {
@@ -62,12 +62,6 @@
 				"navigationBarTitleText": "收货地址"
 			}
 		},
-		{
-			"path": "pages/protocol/index",
-			"style": {
-				"navigationBarTitleText": "购买协议"
-			}
-		},
 		{
 			"path": "pages/invi-img/index",
 			"style": {
@@ -75,36 +69,36 @@
 				"navigationStyle": "custom"
 			}
 		},
-		{
-			"path": "pages/account/wealth",
-			"style": {
-				"navigationBarTitleText": "财富"
-			}
-		},
-		{
-			"path": "pages/account/consignment",
-			"style": {
-				"navigationBarTitleText": "寄卖"
-			}
-		},
+		// {
+		// 	"path": "pages/account/wealth",
+		// 	"style": {
+		// 		"navigationBarTitleText": "财富"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/account/consignment",
+		// 	"style": {
+		// 		"navigationBarTitleText": "寄卖"
+		// 	}
+		// },
 		{
 			"path": "pages/account/giveAsPresent",
 			"style": {
 				"navigationBarTitleText": "赠送"
 			}
 		},
-		{
-			"path": "pages/account/conversion",
-			"style": {
-				"navigationBarTitleText": "转化"
-			}
-		},
-		{
-			"path": "pages/speed-up/index",
-			"style": {
-				"navigationBarTitleText": "加速"
-			}
-		},
+		// {
+		// 	"path": "pages/account/conversion",
+		// 	"style": {
+		// 		"navigationBarTitleText": "转化"
+		// 	}
+		// },
+		// {
+		// 	"path": "pages/speed-up/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "加速"
+		// 	}
+		// },
 		{
 			"path": "pages/accountDetails/running",
 			"style": {
@@ -123,12 +117,12 @@
 				"navigationBarTitleText": "充值明细"
 			}
 		},
-		{
-			"path": "pages/accountDetails/integral",
-			"style": {
-				"navigationBarTitleText": "批发券明细"
-			}
-		},
+		// {
+		// 	"path": "pages/accountDetails/integral",
+		// 	"style": {
+		// 		"navigationBarTitleText": "批发券明细"
+		// 	}
+		// },
 		{
 			"path": "pages/accountDetails/teaBaby",
 			"style": {
@@ -153,12 +147,12 @@
 				"navigationBarTitleText": "基本信息"
 			}
 		},
-		{
-			"path": "pages/top-up/index",
-			"style": {
-				"navigationBarTitleText": "充值"
-			}
-		},
+		// {
+		// 	"path": "pages/top-up/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "充值"
+		// 	}
+		// },
 		{
 			"path": "pages/aytonym-status/index",
 			"style": {
@@ -322,15 +316,15 @@
 					}
 				},
 				{
-					"path": "directCharge/orderDetail",
+					"path": "directCharge/coupon",
 					"style": {
-						"navigationBarTitleText": ""
+						"navigationBarTitleText": "优惠券"
 					}
 				},
 				{
-					"path": "directCharge/coupon",
+					"path": "directCharge/orderDetail",
 					"style": {
-						"navigationBarTitleText": "优惠券"
+						"navigationBarTitleText": "订单详情" //卡券&直充
 					}
 				},
 				{
@@ -348,7 +342,7 @@
 				{
 					"path": "hotel/hotel",
 					"style": {
-						"navigationBarTextStyle":"white",
+						"navigationBarTextStyle": "white",
 						"navigationStyle": "custom"
 					}
 				},
@@ -361,7 +355,7 @@
 				{
 					"path": "hotel/orderDetail",
 					"style": {
-						"navigationBarTitleText": ""
+						"navigationBarTitleText": "酒店民宿" //订单详情
 					}
 				},
 				{
@@ -373,7 +367,7 @@
 				{
 					"path": "scenicSpotTicket/scenic",
 					"style": {
-						"navigationBarTextStyle":"white",
+						"navigationBarTextStyle": "white",
 						"navigationStyle": "custom"
 					}
 				},
@@ -401,20 +395,39 @@
 						"navigationBarTitleText": "充值详情"
 					}
 				},
+				{
+					"path": "topUp/Local",
+					"style": {
+						"navigationBarTitleText": "充值"
+					}
+				},
+
 				{
 					"path": "my/shuZhiWallet",
 					"style": {
-						"navigationBarTextStyle":"white",
+						"navigationBarTitleText": "数智生活",
+						"navigationBarTextStyle": "white",
 						"navigationStyle": "custom"
 					}
 				},
 				{
-					"path": "topUp/Local",
+					"path": "my/myWallet",
 					"style": {
-						"navigationBarTitleText": "充值"
+						"navigationBarTitleText": "我的财富"
+					}
+				},
+				{
+					"path": "accountDetails/ConsumptionCharge",
+					"style": {
+						"navigationBarTitleText": "消费金明细"
+					}
+				},
+				{
+					"path": "accountDetails/TeaC",
+					"style": {
+						"navigationBarTitleText": "TeaC明细"
 					}
 				},
-
 				{
 					"path": "order/verificationCode",
 					"style": {
@@ -446,12 +459,6 @@
 						"navigationBarTitleText": "开票结果"
 					}
 				},
-				{
-					"path": "accountDetails/TeaC",
-					"style": {
-						"navigationBarTitleText": "TeaC明细"
-					}
-				},
 				{
 					"path": "address/list",
 					"style": {
@@ -475,12 +482,6 @@
 			]
 		}
 	],
-	"preloadRule": {
-		"pages/orderingfood/merchantlist": {
-			"network": "all",
-			"packages": ["pagesB"]
-		}
-	},
 	"tabBar": {
 		"color": "#999",
 		"selectedColor": "#18bb88",
@@ -493,12 +494,6 @@
 				"selectedIconPath": "static/nav/home.png",
 				"text": "首页"
 			},
-			// {
-			// 	"pagePath": "pages/orderingfood/merchantlist",
-			// 	"iconPath": "static/nav/local_.png",
-			// 	"selectedIconPath": "static/nav/local.png",
-			// 	"text": "数智生活"
-			// },
 			{
 				"pagePath": "pages/sign/index",
 				"iconPath": "static/nav/benefits_.png",
@@ -521,7 +516,7 @@
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
-		"navigationBarTitleText": "uniapp",
+		"navigationBarTitleText": "茶付宝",
 		"navigationBarBackgroundColor": "#fff",
 		"backgroundColor": "#fff",
 		"app-plus": {

src/pages/index/index.vue

@@ -27,12 +27,14 @@
             </view> -->
             <!-- 金刚区-end -->
             
+            <!-- 专区入口 -->
             <div class="l_tabBar flex_r flex_jb">
                 <div class="item" v-for="(i,s) in tabs" :key="s" @click="isActivation(i.url)">
                     <img :src="i.ico" alt="" class="ico">
                     <!-- <div class="tit">{{ i.tit }}</div> -->
                 </div>
             </div>
+            <!-- 专区-end -->
 
             <!-- 活动 -->
             <view class="activity" v-if="homeImg.length">
@@ -44,8 +46,14 @@
             </view>
             <!-- 活动-end -->
         </view>
+        
+        <view class="bou_head flex_r flex_ac flex_jc">
+            <image class="bou_img" src="/static/sgin/left.png" mode=""></image>
+            <view class="bou_title">今日推荐</view>
+            <image class="bou_img" src="/static/sgin/right.png" mode=""></image>
+        </view>
         <view class="list_bar">
-            <div class="tit">猜你喜欢</div>
+            <!-- <div class="tit">猜你喜欢</div> -->
             <view class="product-list">
                 <view class="product" v-for="(i, s) in productList" :key="s" @click="NavToGoodsDetail(i.id, i.type)">
                     <view class="image-view">
@@ -338,9 +346,28 @@ export default {
         }
     }
 }
-
 // 金刚区-end
 
+.bou_head {
+    width: 100%;
+    height: 114rpx;
+    // margin-top: 50rpx;
+
+    .bou_img {
+        width: 92rpx;
+        height: 30rpx;
+    }
+
+    .bou_title {
+        height: 30rpx;
+        line-height: 30rpx;
+        font-size: 36rpx;
+        color: #121212;
+        font-weight: bold;
+        margin: 0 36rpx;
+    }
+}
+
 // 活动
 .activity {
     .act_one_img {

src/pages/my/index.vue

@@ -44,15 +44,18 @@
                 <img src="@/static/my/regional.png" alt="" srcset="" class="ico">
                 <span class="txtinfo">区域服务节点：{{ localInfo.regional }}</span>
             </view>
+            <!-- 节点-end -->
             <!-- 账户信息 -->
             <view class="acc_info flex_r flex_jse">
-                <div class="i_num" @click="goto('/pages/accountDetails/teaBaby')">
-                    <p>茶宝</p>
-                    <p class="dinB">{{userinfo.cha_bao}}</p>
+                <div class="i_num" @click="goto('/pagesB/accountDetails/ConsumptionCharge')">
+                    <p class="flex_r flex_ac flex_jc">
+                        <image src="@/static/wallet/3.png" class="ico" /><span>消费金</span></p>
+                    <p class="dinB">{{localInfo.integral}}</p>
                 </div>
-                <div class="i_num" @click="goto('/pagesB/accountDetails/TeaC')">
-                    <p>TeaC</p>
-                    <p class="dinB">{{userinfo.teac}}</p>
+                <div class="i_num" @click="goto('/pagesB/my/shuZhiWallet')">
+                    <p class="flex_r flex_ac flex_jc">
+                        <image src="@/static/wallet/4.png" class="ico" /><span>余额</span></p>
+                    <p class="dinB">{{localInfo.property}}</p>
                 </div>
             </view>
             <!-- 账户信息-end -->
@@ -62,27 +65,31 @@
             <view class="fun mar_t30">
                 <view class="fun_title">数智生活</view>
                 <view class="fun_con mar_t50 flex_r flex_ac">
-                    <navigator class="fun_list flex_c flex_ac" url="/pagesB/my/shuZhiWallet" hover-class="none">
-                        <image class="fun_img" src="/static/my/deposit.png"></image>
+                    <navigator class="fun_list flex_c flex_ac" url="/pagesB/my/myWallet" hover-class="none">
+                        <image class="fun_img" src="/static/my918/9.png"></image>
                         <view class="fun_text">我的财富</view>
                     </navigator>
                     <navigator class="fun_list flex_c flex_ac" url="/pagesB/orderingfood/orderlist" hover-class="none">
-                        <image class="fun_img" src="/static/my/order_history.png"></image>
+                        <image class="fun_img" src="/static/my918/10.png"></image>
                         <view class="fun_text">历史订单</view>
                     </navigator>
                     <navigator class="fun_list flex_c flex_ac" @click="activation" hover-class="none">
-                        <image class="fun_img" src="/static/my/upgrade.png"></image>
+                        <image class="fun_img" src="/static/my918/11.png"></image>
                         <view class="fun_text">激活升级</view>
                     </navigator>
                     <navigator v-if="localInfo.level_id>1" class="fun_list flex_c flex_ac" url="/pagesB/orderingfood/group" hover-class="none">
-                        <image class="fun_img" src="/static/my/l_group.png"></image>
+                        <image class="fun_img" src="/static/my918/12.png"></image>
                         <view class="fun_text">我的用户</view>
                     </navigator>
+                    <navigator class="fun_list flex_c flex_ac" url="/pages/account/giveAsPresent" hover-class="none">
+                        <image class="fun_img" src="/static/my918/13.png"></image>
+                        <view class="fun_text">赠送</view>
+                    </navigator>
                 </view>
             </view>
             <view class="fun mar_t30">
-                <view class="fun_title">数智云店</view>
-                <view class="fun_con mar_t50 flex_r flex_ac">
+                <!-- <view class="fun_title">数智云店</view> -->
+                <!-- <view class="fun_con mar_t50 flex_r flex_ac">
                     <navigator class="fun_list flex_c flex_ac" url="/pages/account/wealth" hover-class="none">
                         <image class="fun_img" src="/static/my/wealth.png"></image>
                         <view class="fun_text">财富</view>
@@ -91,16 +98,12 @@
                         <image class="fun_img" src="/static/my/consign.png"></image>
                         <view class="fun_text">寄卖</view>
                     </navigator>
-                    <navigator class="fun_list flex_c flex_ac" url="/pages/account/giveAsPresent" hover-class="none">
-                        <image class="fun_img" src="/static/my/give.png"></image>
-                        <view class="fun_text">赠送</view>
-                    </navigator>
-                </view>
-                <view class="fun_con mar_t50 flex_r flex_ac">
-                    <!-- <navigator class="fun_list flex_c flex_ac" url="/pages/account/conversion" hover-class="none">
+                </view> -->
+                <!-- <view class="fun_con mar_t50 flex_r flex_ac">
+                    <navigator class="fun_list flex_c flex_ac" url="/pages/account/conversion" hover-class="none">
                         <image class="fun_img" src="/static/my/10.png"></image>
                         <view class="fun_text">转化</view>
-                    </navigator> -->
+                    </navigator>
                     <navigator class="fun_list flex_c flex_ac" @tap="getToCash" hover-class="none">
                         <image class="fun_img" src="/static/my/13.png"></image>
                         <view class="fun_text">提现</view>
@@ -113,8 +116,8 @@
                         <image class="fun_img" src="/static/my/withdraw.png"></image>
                         <view class="fun_text">提现明细</view>
                     </navigator>
-                </view>
-                <view class="fun_tit mar_t50 flex_r flex_ac flex_jb">
+                </view> -->
+                <view class="fun_title flex_r flex_ac flex_jb">
                     <view>云店订单</view>
                     <view class="moarbtn" @click="goto('/pages/szw-order-list/index')">
                         <text>查看全部</text>
@@ -159,16 +162,12 @@
                         <image class="fun_img" src="/static/my/assistantHistory.png"></image>
                         <view class="fun_text">开票历史</view>
                     </navigator>
-                    <navigator class="fun_list flex_c flex_ac" @click="goto('/pages/my/userinfo')" hover-class="none">
-                        <image class="fun_img" src="/static/my/h_n.png"></image>
-                        <view class="fun_text">头像昵称</view>
-                    </navigator>
-                </view>
-                <view class="fun_con mar_t50 flex_r flex_ac">
                     <navigator class="fun_list flex_c flex_ac" @click="goto('/pages/agreement/index',{tit:'新手教程',type:1})" hover-class="none">
                         <image class="fun_img" src="/static/my/green.png"></image>
                         <view class="fun_text">新手教程</view>
                     </navigator>
+                </view>
+                <view class="fun_con mar_t50 flex_r flex_ac">
                     <navigator class="fun_list flex_c flex_ac" @click="goto('/pages/agreement/index',{tit:'关于我们',type:7})" hover-class="none">
                         <image class="fun_img" src="/static/my/about.png"></image>
                         <view class="fun_text">关于我们</view>
@@ -177,6 +176,10 @@
                         <image class="fun_img" src="/static/my/feedback.png"></image>
                         <view class="fun_text">用户须知</view>
                     </navigator>
+                    <navigator class="fun_list flex_c flex_ac" @click="goto('/pages/my/userinfo')" hover-class="none">
+                        <image class="fun_img" src="/static/my/h_n.png"></image>
+                        <view class="fun_text">头像昵称</view>
+                    </navigator>
                     <view class="fun_list flex_c flex_ac">
                         <button open-type="contact" style="background: #fff; border: 0; line-height: 1; padding: 0">
                             <image class="fun_img" src="/static/my/service.png"></image>
@@ -208,9 +211,9 @@ export default {
     data() {
         return {
             token: uni.getStorageSync("token"),
-            shopInfo: {},   // 商铺信息
-            isShiMing: true,    //未实名提示弹窗
-            userinfo: {},   // 获取用户信息
+            shopInfo: {}, // 商铺信息
+            isShiMing: true, //未实名提示弹窗
+            userinfo: {}, // 获取用户信息
             unid: "",
             invited: "",
             allChaYou: "",
@@ -278,7 +281,7 @@ export default {
                 }
             });
         },
-        SoHAuth(){
+        SoHAuth() {
             this.$refs.autho.onSoHAuth();
         },
         // 获取userinfo
@@ -379,12 +382,18 @@ export default {
         },
         typeto(va) {
             switch (va) {
-                case 1: return "VIP";
-                case 2: return "群主";
-                case 3: return "合伙人";
-                case 4: return "副总";
-                case 5: return "联合发起人";
-                default: return ""
+                case 1:
+                    return "VIP";
+                case 2:
+                    return "群主";
+                case 3:
+                    return "合伙人";
+                case 4:
+                    return "副总";
+                case 5:
+                    return "联合发起人";
+                default:
+                    return ""
             }
         }
     },
@@ -502,20 +511,24 @@ page {
         font-size: 20rpx;
     }
 }
-.live_name{
+
+.live_name {
     background-color: #f1d3a8;
     padding: 2rpx 8rpx;
     margin-top: 10rpx;
     border-radius: 8rpx;
-    .live_ico{
+
+    .live_ico {
         width: 26rpx;
         height: 26rpx;
         margin-right: 6rpx;
     }
-    span{
+
+    span {
         font-size: 22rpx;
     }
 }
+
 // 用户信息-end
 
 .regional {
@@ -543,24 +556,30 @@ page {
 .acc_info {
     width: 100%;
     overflow: hidden;
-    background: url("~@/static/my/myBack.png") no-repeat;
+    background: url("http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/7748b9c0380c76907a8a5ba82514f496f9ce55e5png");
     background-size: 100% 100%;
     border-radius: 16rpx;
-    padding: 30rpx;
+    padding: 36rpx 0;
     box-sizing: border-box;
     margin-top: 38rpx;
 
     .i_num {
         text-align: center;
-        font-size: 30rpx;
+        font-size: 34rpx;
 
         p {
-            color: #fff;
+            color: #BE7329;
+        }
+
+        .ico {
+            width: 42rpx;
+            height: 42rpx;
+            margin-right: 12rpx;
         }
 
         .dinB {
-            margin-top: 10rpx;
-            font-size: 36rpx;
+            margin-top: 14rpx;
+            font-size: 40rpx;
         }
     }
 }
@@ -662,17 +681,20 @@ page {
     }
 }
 
-.moarbtn{
+.moarbtn {
     font-size: 22rpx;
     color: #999;
-    .iconfont{
+
+    .iconfont {
         text-decoration-skip: 20rpx;
         margin-left: 6rpx;
         color: #999;
     }
-    text{
+
+    text {
         vertical-align: middle;
     }
 }
+
 // 功能列表-end
 </style>

src/pages/protocol/index.vue

@@ -1,80 +0,0 @@
-<template>
-    <view class="container">
-        <!-- 内容 -->
-        <view class="content mar_t20">
-            <mp-html :content="detail.cont"></mp-html>
-            <mp-html :content="detail.content"></mp-html>
-        </view>
-        <!-- 内容-end -->
-    </view>
-</template>
-
-<script>
-import mpHtml from "@/uni_modules/mp-html/components/mp-html/mp-html.vue"
-import { post } from "@/request/api.js";
-export default {
-    components: {
-        mpHtml,
-    },
-    data() {
-        return {
-            detail: "",
-            type: "",
-        };
-    },
-    onLoad: function (e) {
-        this.type = e.type;
-        this.loadData();
-    },
-    methods: {
-        loadData: function () {
-            let that = this;
-            let data = {
-                type: this.type,
-            };
-            post("v1/ShuZiTeaYW/shop/getPurchaseAgreement", data).then(
-                (res) => {
-                    if (res.status == 200) {
-                        that.detail = res.data;
-                    }
-                }
-            );
-        },
-    },
-};
-</script>
-
-<style lang="scss">
-// 页面配置
-page {
-    background: #f5f5f5;
-}
-// 页面配置-end
-
-// 顶部
-.head {
-    width: 100%;
-    overflow: hidden;
-    background: #fff;
-    padding: 40rpx 20rpx;
-    box-sizing: border-box;
-    font-size: 26rpx;
-    color: #232323;
-    font-family: "SourceHanSansCN-Medium";
-    font-weight: 500;
-}
-// 顶部-end
-
-// 内容
-.content {
-    width: 100%;
-    overflow: hidden;
-    background: #fff;
-    padding: 40rpx 20rpx;
-    box-sizing: border-box;
-    font-size: 24rpx;
-    color: #363636;
-    font-family: "SourceHanSansCN-Medium";
-}
-// 内容-end
-</style>

src/pagesB/accountDetails/ConsumptionCharge.vue

@@ -0,0 +1,99 @@
+<template>
+    <div class="ConsumptionCharge">
+        <div class="detailList" v-if="List.length">
+            <div class="li" v-for="(i,s) in List" :key="s">
+                <p class="flex_r flex_jb">
+                    <span>
+                        <span>{{i.act}}</span>
+                        <span class="s2">{{ parseFloat(i.num).toFixed(2) }}</span>
+                    </span>
+                </p>
+                <p class="flex_r flex_jb">
+                    <span class="s3">{{ i.create_time }}</span>
+                    <view class="s3">余额{{ i.after }}</view>
+                </p>
+            </div>
+        </div>
+        <div class="zanwu" v-else>
+            <img src="http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/5a3c6b1e2d098aa6695394c927c38586545188b8png" alt="" class="zanwuimg">
+            <view class="zanwutxt">暂无消费金明细</view>
+        </div>
+    </div>
+</template>
+
+<script>
+import { post } from "@/request/api.js";
+export default {
+    name: "ConsumptionCharge",
+    props: {},
+    components: {},
+    data() {
+        return {
+            localInfo: {
+                property:0
+            },
+            List: [],
+            Query: {
+                page: 1,
+                rows: 20
+            },
+        };
+    },
+    methods: {
+        getList() {
+            post("local/getIntegralLog",this.Query).then(res => {
+                if (res.code == 0) {
+                    this.last_page = res.data.last_page;
+                    let list = res.data.data;
+                    this.List = [...this.List, ...list]
+                    this.Query.page++
+                }
+            })
+        },
+        async getLU() {
+            this.localInfo = await uni.Luserfun();
+        },
+    },
+    onLoad(da) {
+        this.getList();
+        this.getLU();
+    },
+    onShow() {},
+    mounted() {},
+    onReachBottom() {
+        if (this.Query.page < this.last_page) this.getlists();
+    },
+};
+</script>
+
+<style scoped lang='scss'>
+.detailList{
+    width: calc(100% - 64rpx);
+    border-radius: 12rpx;
+    background-color: #fff;
+    margin-left: 32rpx;
+    .li{
+        padding: 22rpx 30rpx;
+        border-bottom: 1px solid rgba($color: #d3aa79, $alpha: 0.3);
+        p{
+            margin-bottom: 8rpx;
+            font-size: 30rpx;
+            &:last-child{
+                margin-bottom: 0;
+                font-size: 25rpx;
+                color: #999;
+            }
+        }
+        .s2{
+            font-weight: bold;
+            &::before{
+                content: "￥";
+                font-size: 25rpx;
+            }
+        }
+        &:last-child{
+            border: none;
+        }
+    }
+}
+</style>

src/pagesB/my/myWallet.vue

@@ -1,9 +1,43 @@
 <template>
     <div class="myWallet">
-        
+        <div class="acc_info">
+            <view class="flex_r flex_jse acc_row">
+                <div class="i_num" @click="goto('/pagesB/accountDetails/ConsumptionCharge')">
+                    <p class="flex_r flex_ac flex_jc">
+                        <image src="@/static/wallet/3.png" class="ico" /><span>消费金</span></p>
+                    <p class="dinB">{{localInfo.integral}}</p>
+                </div>
+                <div class="i_num" @click="goto('/pagesB/my/shuZhiWallet')">
+                    <p class="flex_r flex_ac flex_jc">
+                        <image src="@/static/wallet/4.png" class="ico" /><span>余额</span></p>
+                    <p class="dinB">{{localInfo.property}}</p>
+                </div>
+                <div class="i_num">
+                    <p class="flex_r flex_ac flex_jc">
+                        <image src="@/static/wallet/5.png" class="ico" /><span>原始股</span></p>
+                    <p class="dinB">{{localInfo.original_equity}}</p>
+                </div>
+            </view>
+            <view class="flex_r flex_jse">
+                <div class="i_num" @click="goto('/pages/accountDetails/teaBaby')">
+                    <p class="flex_r flex_ac flex_jc">
+                        <image src="@/static/wallet/6.png" class="ico" /><span>茶宝</span></p>
+                    <p class="dinB">{{userinfo.cha_bao}}</p>
+                </div>
+                <div class="i_num" @click="goto('/pages/accountDetails/running')">
+                    <p class="flex_r flex_ac flex_jc">
+                        <image src="@/static/wallet/7.png" class="ico" /><span>云宝</span></p>
+                    <p class="dinB">{{userinfo.user_money}}</p>
+                </div>
+                <div class="i_num" @click="goto('/pagesB/accountDetails/TeaC')">
+                    <p class="flex_r flex_ac flex_jc">
+                        <image src="@/static/wallet/8.png" class="ico" /><span>TeaC</span></p>
+                    <p class="dinB">{{userinfo.teac}}</p>
+                </div>
+            </view>
+        </div>
     </div>
 </template>
-  
 <script>
 import { post } from "@/request/api.js";
 export default {
@@ -11,7 +45,10 @@ export default {
     props: {},
     components: {},
     data() {
-        return {};
+        return {
+            userinfo:  uni.getStorageSync("userinfo"), // 获取用户信息
+            localInfo: uni.getStorageSync("localInfo"),
+        };
     },
     methods: {},
     onLoad(da) {},
@@ -19,6 +56,41 @@ export default {
     mounted() {},
 };
 </script>
-  
 <style scoped lang='scss'>
+.myWallet{
+    padding: 30rpx 32rpx;
+}
+// 账户信息
+.acc_info {
+    width: 100%;
+    overflow: hidden;
+    background: url("http://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/head_pic/7748b9c0380c76907a8a5ba82514f496f9ce55e5png");
+    background-size: 100% 100%;
+    border-radius: 16rpx;
+    padding: 36rpx 0;
+    box-sizing: border-box;
+
+    .i_num {
+        font-size: 30rpx;
+        text-align: center;
+        
+        p {
+            color: #BE7329;
+        }
+
+        .ico {
+            width: 40rpx;
+            height: 40rpx;
+            margin-right: 12rpx;
+        }
+
+        .dinB {
+            margin-top: 10rpx;
+            font-size: 32rpx;
+        }
+    }
+    .acc_row{
+        margin-bottom: 38rpx;
+    }
+}
 </style>

src/pagesB/my/shuZhiWallet.vue

@@ -58,8 +58,9 @@ import { post } from "@/request/api.js";
     },
     methods: {
         getList() {
-            post("local/revenue").then(res => {
+            post("local/revenue",this.Query).then(res => {
                 if (res.code == 0) {
+                    this.last_page = res.data.last_page;
                     let list = res.data.data;
                     this.List = [...this.List, ...list]
                     this.Query.page++
@@ -88,7 +89,7 @@ import { post } from "@/request/api.js";
     onShow() {},
     mounted() {},
     onReachBottom() {
-        if (this.Query.page < this.merchant.last_page) this.getlists();
+        if (this.Query.page < this.last_page) this.getlists();
     },
   }
 </script>

src/pagesB/prepaidRefill/index.vue

@@ -36,12 +36,7 @@
         <div class="msgbar">
             <div class="tit">话费充值说明</div>
             <div class="msg_con">
-                <p>1. 请您仔细核对号码，刷新页面后注意号码是否变动；若充错号码，建议您尽快联系机主自行协商解决。</p>
-                <p>2. 话费充值平均到账时间1-10分钟内，个别订单会因为运营商原因导致时间会长一些。若遇运营商系统维护、充值高峰期等，可能会有部分延迟。</p>
-                <p>3. 162、165、167、 170  、171  等虚拟运营商号码不支持充值，携号转网的手机号码充值失败率较高。</p>
-                <p>4. 若充值失败，系统将自动退还款项。</p>
-                <p>5. 充值发票由运营商提供，您可以到当地营业厅打印发票，或登陆网上营业厅下载电子发票，具体政策请咨询对应运营商客服。</p>
-                <p>6. 如有其他问题，可在“我的”->“我的服务”->“在线客服”联系客服。</p>
+                <p v-for="(i,s) in Desc" :key="s">{{ i }}</p>
             </div>
         </div>
         <div class="footbtn" @click="onpay">立即支付</div>
@@ -65,7 +60,8 @@ export default {
             },
             userinfo: uni.getStorageSync("userinfo"),
             gameArea: "",
-            selectItem: {}
+            selectItem: {},
+            Desc: {}, //充值说明
         };
     },
     methods: {
@@ -153,10 +149,18 @@ export default {
                 }else if (res.code == 0 && res.data == 200) this.goto("/pagesB/orderingfood/orderlist")
             });
         },
+        getdesc() {
+            post("local/ofpay/desc").then((res) => {
+                if (res.code == 0) {
+                    this.Desc = res.data[0];
+                }
+            });
+        },
     },
     onLoad(da) {
         this.qda.phoneno = this.userinfo.mobile;
         this.getCallingList();
+        this.getdesc();
     },
     watch: {},
     onShow() {},

src/pagesB/topUp/Local.vue

@@ -9,22 +9,33 @@
         <div class="items">
             <div class="tit">请选择充值金额</div>
             <div class="li flex_r">
-                <div :class="{ li_it: 1, active: qda.amount == i }" v-for="(i, s) in CallingList" :key="s" @click="selectMoney(i)" >{{ i }}元</div>
+                <div :class="{ li_it: 1, active: qda.amount == i.money }" v-for="(i, s) in CallingList" :key="s" @click="selectMoney(i)">{{ i.money }}元</div>
             </div>
         </div>
-            <div class="checkbox-box flex_r flex_ac">
-                <checkbox-group @change="checkboxChange" class="flex_r flex_ac">
-                    <label class="checkbox flex_r flex_ac">
-                        <checkbox class="checkboxCom" value="agree" />
-                        <view>我同意</view>
-                    </label>
-                    <span @click="goto('/pages/agreement/index',{tit:'充值协议',type:28})" class="hover_a">《充值协议》</span>
-                </checkbox-group>
+        <div class="money card">
+            <div class="li flex_r flex_jb">
+                <span>赠送茶宝</span>
+                <span>{{ selectItem.user_money || 0 }}</span>
             </div>
+            <div class="li flex_r flex_jb">
+                <span>赠送原始股</span>
+                <span>{{ selectItem.original_equity || 0 }}</span>
+            </div>
+        </div>
+        <div class="checkbox-box flex_r flex_ac">
+            <checkbox-group @change="checkboxChange" class="flex_r flex_ac">
+                <label class="checkbox flex_r flex_ac">
+                    <checkbox class="checkboxCom" value="agree" />
+                    <view>我同意</view>
+                </label>
+                <span @click="goto('/pages/agreement/index',{tit:'充值协议',type:28})" class="hover_a">《充值协议》</span>
+            </checkbox-group>
+        </div>
         <div class="footbtn" @click="onpay">立即充值</div>
+        
+        <image class="adv_img" :src="advertisingImg"></image>
     </div>
 </template>
-
 <script>
 import { post } from "@/request/api.js";
 import { ToPayOpre } from "@/utils/reqTools.js";
@@ -37,11 +48,12 @@ export default {
         return {
             CallingList: [], //可充话费列表
             qda: {
-                trade_type: "jsapi", 
+                trade_type: "jsapi",
             },
             userinfo: uni.getStorageSync("userinfo"),
             selectItem: {},
             isDisabled: false, //是否同意充值协议
+            advertisingImg: "", //广告图片
         };
     },
     methods: {
@@ -58,9 +70,9 @@ export default {
                 },
             });
         },
-        selectMoney(va){
+        selectMoney(va) {
             this.selectItem = va
-            this.qda.amount = va
+            this.qda.amount = va.money
         },
         getCallingList() {
             post("v1/user/rechargeList").then((res) => {
@@ -74,10 +86,9 @@ export default {
             if (!this.isDisabled) {
                 uni.showToast({ title: '请阅读并同意相关协议', icon: 'none' })
                 return;
-            }
-            else this.payok();
+            } else this.payok();
         },
-        payok(){
+        payok() {
             let that = this
             post("v1/user/recharge", this.qda).then((res) => {
                 if (res.code == 0 && res.data?.data?.paySign) {
@@ -101,34 +112,45 @@ export default {
                 this.isDisabled = true
             }
         },
+        getAdvImg() {
+            post("v1/adImgages").then((res) => {
+                if (res.code === 0) {
+                    this.advertisingImg = res.data.data;
+                }
+            });
+        },
     },
     onLoad(da) {
         this.qda.phoneno = this.userinfo.mobile;
         this.getCallingList();
+        this.getAdvImg();
     },
     watch: {},
     onShow() {},
     mounted() {},
 };
 </script>
-
 <style scoped lang='scss'>
 .BalanceRecharge {
     min-height: 100vh;
     background-color: #fff;
     padding: 28rpx 32rpx;
 }
+
 .input_phone {
     border-bottom: 1rpx solid rgba($color: #000, $alpha: 0.15);
     padding: 12rpx 16rpx;
     margin-bottom: 60rpx;
+
     .inp {
         font-size: 40rpx;
     }
-    .ico{
+
+    .ico {
         font-size: 50rpx;
         font-weight: bold;
     }
+
     .phonemsg {
         width: 100%;
         font-size: 24rpx;
@@ -136,18 +158,22 @@ export default {
         color: #666;
     }
 }
+
 .items {
-    margin-bottom: 60rpx;
+    margin-bottom: 30rpx;
+
     .tit {
         font-size: 26rpx;
         color: #666;
         margin-bottom: 20rpx;
     }
+
     .li {
         display: grid;
         justify-content: space-between;
         grid-template-columns: repeat(auto-fill, 210rpx);
     }
+
     .li_it {
         font-size: 38rpx;
         font-weight: 600;
@@ -159,6 +185,7 @@ export default {
         border: 1rpx solid rgba($color: #000, $alpha: 0.15);
         margin-bottom: 16rpx;
         color: #555;
+
         &.active {
             color: #18bb88;
             border-color: #18bb88;
@@ -166,6 +193,7 @@ export default {
         }
     }
 }
+
 .footbtn {
     width: calc(100% - 60rpx);
     height: 80rpx;
@@ -181,17 +209,60 @@ export default {
 }
 
 .checkbox-box {
-    margin-top: 60rpx;
-    margin-bottom: -20px;
     font-size: 28rpx;
+    margin-bottom: 50rpx;
+
     text {
         color: #44a92f;
     }
+
     .checkbox .checkboxCom {
         transform: scale(0.84);
         -webkit-transform: scale(0.84);
     }
 }
+
+.card {
+    background-color: #fff;
+    border-radius: 16rpx;
+    margin-bottom: 30rpx;
+    padding: 28rpx 30rpx;
+    font-size: 32rpx;
+    box-shadow: 4rpx 4rpx 12rpx 6rpx rgba($color: #000, $alpha: 0.15);
+
+    &:last-child {
+        margin-bottom: 0;
+    }
+}
+
+.money {
+    margin-bottom: 50rpx;
+
+    .li {
+        margin-bottom: 16rpx;
+
+        &:last-child {
+            margin-bottom: 0;
+        }
+
+        span {
+            font-size: 30rpx;
+        }
+    }
+
+    .corg {
+        color: #18bb88;
+        margin-left: 12rpx;
+    }
+}
+
+
+.adv_img {
+    border-radius: 12rpx;
+    width: 690rpx;
+    height: 345rpx;
+    margin: 0 auto;
+}
 </style>
 <style lang='scss'>
 .BalanceRecharge {

src/utils/run_now.js

@@ -100,20 +100,20 @@ Array.prototype.remove = function (val) {
 //     }
 // });
 
-uni.stableToken = () => {
-    return new Promise((resolve, reject) => {
-        let stable_token = getCache("stable_token");
-        if (!stable_token) {
-            getStableAccessToken({
-                grant_type: "client_credential",
-                appid: "wx8ebee994ea7c5af3",
-                secret: "f80039555c022bf0a805bed83358fa01",
-            }).then(res => {
-                if (res.access_token) {
-                    setCache("stable_token", res.access_token, res.expires_in - 20);
-                    resolve(res.access_token)
-                }
-            })
-        } else resolve(stable_token)
-    })
-}
+// uni.stableToken = () => {
+//     return new Promise((resolve, reject) => {
+//         let stable_token = getCache("stable_token");
+//         if (!stable_token) {
+//             getStableAccessToken({
+//                 grant_type: "client_credential",
+//                 appid: "wx8ebee994ea7c5af3",
+//                 secret: "f80039555c022bf0a805bed83358fa01",
+//             }).then(res => {
+//                 if (res.access_token) {
+//                     setCache("stable_token", res.access_token, res.expires_in - 20);
+//                     resolve(res.access_token)
+//                 }
+//             })
+//         } else resolve(stable_token)
+//     })
+// }