余额=>茶币

src/pages.json

@@ -241,14 +241,14 @@
 			"style": {
 				"navigationBarTitleText": "享好物"
 			}
-		},
-		{
-			"path": "pages/shoppingMall/index",
-			"style": {
-				"navigationBarTitleText": "商城购物",
-				"navigationStyle": "custom"
-			}
 		}
+		// {
+		// 	"path": "pages/shoppingMall/index",
+		// 	"style": {
+		// 		"navigationBarTitleText": "商城购物",
+		// 		"navigationStyle": "custom"
+		// 	}
+		// }
 	],
 	"subPackages": [
 		{

src/pages/index/index.vue

@@ -423,7 +423,7 @@ export default {
     computed: {},
     watch: {},
     onReachBottom() {
-        if (this.Query.page < this.pageData.last_page) this.getList();
+        if (this.Query.page <= this.pageData.last_page) this.getList();
     },
 };
 </script>

src/pages/my/index.vue

@@ -16,7 +16,7 @@
                         <view class="user_name flex_r flex_ae ellipsis">
                             <view class="flex_r flex_ac">
                                 <view @click="goto('/pages/my/userinfo')" :style="{'color':localInfo.is_consume > 0?'#18bb88' : ''}">{{ userinfo.nickname }}</view>
-                                <image  v-for="i in localInfo.is_consume" :key="i" class="consume" src="/static/my/consume.png" />
+                                <image  v-for="i in localInfo.is_consume" :key="i" class="consume" src="https://teaclub.oss-cn-chengdu.aliyuncs.com/static/icon/consume.png" />
                                 <image v-if="localInfo.bounty_hunter == 1" class="consume" src="https://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/logo/202402/hunter.png" />
                             </view>
                             <text v-if="isAuthentication">({{ userinfo.is_authentication == 0 ? "未实名" : "已实名" }})</text>
@@ -75,7 +75,7 @@
                     <div class="i_num flex_c flex_ac">
                         <!-- <div class="i_num flex_c flex_ac" @click="goto('/pagesB/my/shuZhiWallet')"> -->
                         <p class="flex_r flex_ac flex_jc">
-                            <image src="/static/wallet/4.png" class="ico" /><span>我的余额</span></p>
+                            <image src="/static/wallet/6.png" class="ico" /><span>茶币</span></p>
                         <p class="dinB tc">{{localInfo.property||0}}</p>
                     </div>
                     
@@ -86,7 +86,7 @@
                     </div>
                     <!-- <div class="i_num flex_c flex_ac" @click="goto('/pages/accountDetails/teaBaby')">
                         <p class="flex_r flex_ac flex_jc">
-                            <image src="/static/wallet/6.png" class="ico" /><span>茶宝</span></p>
+                            <image src="https://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/icon/13.png" class="ico" /><span>茶宝</span></p>
                         <p class="dinB tc">{{userinfo.cha_bao||0}}</p>
                     </div> -->
                 <!-- </div> -->
@@ -98,7 +98,7 @@
                     </div>
                     <div class="i_num flex_c flex_ae mar_t30" @click="goto('/pages/accountDetails/teaBaby')">
                         <p class="flex_r flex_ac flex_jc">
-                            <image src="/static/wallet/6.png" class="ico" /><span>茶宝</span></p>
+                            <image src="https://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/icon/13.png" class="ico" /><span>茶宝</span></p>
                         <p class="dinB">{{userinfo.cha_bao||0}}</p>
                     </div>
                     

src/pages/settledMerchant/index.vue

@@ -161,7 +161,7 @@ export default {
     },
     mounted() {},
     onReachBottom() {
-        if (this.Query.page < this.pageData.last_page) this.getList();
+        if (this.Query.page <= this.pageData.last_page) this.getList();
     },
 };
 </script>

src/pages/to-pay-list/index.vue

@@ -182,8 +182,8 @@
                 <view class="list_con g_color">￥{{ userinfo.user_money }}</view>
             </view>
             <view class="order_list flex_r flex_ac flex_jb" v-if="['2','3', '4', '5', '7', '8'].includes(Data.type) && isAct">
-                <view class="list_name">我的余额</view>
-                <view class="list_con g_color">￥{{ localInfo.property }}</view>
+                <view class="list_name">我的茶币</view>
+                <view class="list_con g_color">{{ localInfo.property }}</view>
             </view>
             <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 1">
                 <view class="list_name">可用TeaC</view>
@@ -194,13 +194,13 @@
                 <view class="list_con g_color">{{ userinfo.cha_bao }}</view>
             </view>
             <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 1">
-                <view class="list_name">余额</view>
+                <view class="list_name">茶币</view>
                 <view class="list_con g_color">￥{{ localInfo.property }}</view>
             </view>
         </view>
         <view class="msginfo" v-if="Data.type == 1">
             <view class="title">特别提示</view>
-            <view>1、寄卖服务费只能使用您的余额抵扣或微信支付</view>
+            <view>1、寄卖服务费只能使用您的茶币抵扣或微信支付</view>
         </view>
         <!-- 订单信息-end -->
         <!-- 底部操作栏 -->
@@ -344,9 +344,9 @@ export default {
                     this.amountTotal = this.$h.Add(wpt,this.amountTotal)
                     ps = this.$h.Add(ps, wp);
                 }
-                let um = 0; //数智生活余额
-                if (this.isAct) um = this.localInfo.property; //数智生活余额
-                let userBalance = this.$h.Add(this.userinfo.user_money, um); //用户总余额（数智生活余额+云宝）
+                let um = 0; //可用茶币
+                if (this.isAct) um = this.localInfo.property; //可用茶币
+                let userBalance = this.$h.Add(this.userinfo.user_money, um); //用户总余额（可用茶币+云宝）
     
                 let b = this.$h.Sub(a, userBalance); //待支付金额
                 let b1 = this.$h.Sub(ps, userBalance); //待支付金额 - 零售&批发&云宝货易 运费必须现金支付
@@ -355,7 +355,7 @@ export default {
                 if (type == 1) {
                     // b1 = this.$h.Sub(ps, this.userinfo.user_money); //用云宝计算后 待支付价格
                     b1 = this.$h.Sub(ps,um); // 寄卖服务待支付价格不使用云宝
-                    let sp = this.$h.Sub(wy,um);  //寄卖服务费只能用数智生活余额支付或微信支付
+                    let sp = this.$h.Sub(wy,um);  //寄卖服务费只能用数智生活茶币抵扣或微信支付
                     obligation = b1 > 0 ? b1 : 0; 
                     obligation = this.$h.Add(obligation,sp > 0 ? sp : 0);
                 }

src/pagesB/cinema/confirmOrder.vue

@@ -84,11 +84,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.actuallypaid ? "将优先使用余额支付" : "将使用余额抵扣部分支付"
+            let str = um > this.actuallypaid ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的数智生活余额 ${um} 元，` + str,
+                    content: `您的可用茶币为 ${um}，` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

src/pagesB/directCharge/coupon.vue

@@ -138,11 +138,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.actuallypaid ? "将优先使用余额支付" : "将使用余额抵扣部分支付"
+            let str = um > this.actuallypaid ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的数智生活余额 ${um} 元，` + str,
+                    content: `您的可用茶币为 ${um}，` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

src/pagesB/directCharge/payment.vue

@@ -117,11 +117,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.actuallypaid ? "将优先使用余额支付" : "将使用余额抵扣部分支付"
+            let str = um > this.actuallypaid ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的数智生活余额 ${um} 元，` + str,
+                    content: `您的可用茶币为 ${um}，` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

src/pagesB/hotel/hotelDetail.vue

@@ -173,11 +173,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.actuallypaid ? "将优先使用余额支付" : "将使用余额抵扣部分支付"
+            let str = um > this.actuallypaid ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的数智生活余额 ${um} 元，` + str,
+                    content: `您的可用茶币为 ${um}，` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

src/pagesB/my/myWallet.vue

@@ -9,12 +9,12 @@
                 </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>
+                        <image src="@/static/wallet/4.png" class="ico" /><span>我的茶币</span></p>
                     <p class="dinB">{{localInfo.property}}</p>
                 </div> -->
                 <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>
+                        <image src="https://teaclub.oss-cn-chengdu.aliyuncs.com/CloudShop/icon/13.png" class="ico" /><span>茶宝</span></p>
                     <p class="dinB">{{userinfo.cha_bao}}</p>
                 </div>
                 <!-- <div class="i_num" @click="goto('/pagesB/accountDetails/TeaC')">

src/pagesB/my/shuZhiWallet.vue

@@ -9,7 +9,7 @@
         </view>
         <div class="h_top">
             <div class="balance_box">
-                <div class="b_teg">我的余额(元)</div>
+                <div class="b_teg">我的茶币(元)</div>
                 <div class="dinB balance">{{ localInfo.property }}</div>
             </div>
         </div>

src/pagesB/orderingfood/friend.vue

@@ -70,7 +70,7 @@
                 <div class="u_info">
                     <div class="p1 flex_r flex_ac">
                         <span :style="{'color':i.is_consume==1?'#18bb88':''}">{{ i.nickname || classID[type] }}</span>
-                        <image v-if="i.is_consume == 1" class="consume" src="/static/my/consume.png" />
+                        <image v-if="i.is_consume == 1" class="consume" src="https://teaclub.oss-cn-chengdu.aliyuncs.com/static/icon/consume.png" />
                     </div>
                     <div class="p1">手机号：{{ i.mobile }}</div>
                     <div class="p3">加入时间：{{ $day(i.reg_time * 1000).format("YYYY-MM-DD HH:mm:ss") }}</div>

src/pagesB/orderingfood/orderlist.vue

@@ -180,7 +180,7 @@ export default {
     onShow() {},
     mounted() {},
     onReachBottom() {
-        if (this.Query.page < this.pageData.last_page) this.getList();
+        if (this.Query.page <= this.pageData.last_page) this.getList();
     },
     // 监听卸载页面  同等于  返回拦截
     onUnload() {

src/pagesB/orderingfood/payTheBill.vue

@@ -128,11 +128,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.actuallypaid ? "将优先使用余额支付" : "将使用余额抵扣部分支付"
+            let str = um > this.actuallypaid ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的数智生活余额 ${um} 元，` + str,
+                    content: `您的可用茶币为 ${um}，` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

src/pagesB/prepaidRefill/index.vue

@@ -119,11 +119,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.selectItem.actual_price ? "将优先使用余额支付" : "将使用余额抵扣部分支付"
+            let str = um > this.selectItem.actual_price ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的数智生活余额 ${um} 元，` + str,
+                    content: `您的可用茶币为 ${um}，` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

src/pagesB/scenicSpotTicket/scenicDetail.vue

@@ -167,11 +167,11 @@ export default {
             let that = this
             let localInfo = uni.getStorageSync("localInfo");
             let um = localInfo.property;
-            let str = um > this.actuallypaid ? "将优先使用余额支付" : "将使用余额抵扣部分支付"
+            let str = um > this.actuallypaid ? "将优先使用茶币抵扣" : "将使用茶币抵扣部分支付"
             if(um > 0){
                 uni.showModal({
                     title: "温馨提示",
-                    content: `您的数智生活余额 ${um} 元，` + str,
+                    content: `您的可用茶币为 ${um}，` + str,
                     showCancel: true,
                     confirmText: "确认",
                     confirmColor: "#f02f2f",

src/pagesC/settledMerchant/business.vue

@@ -93,7 +93,7 @@ export default {
     onShow() {},
     mounted() {},
     onReachBottom() {
-        if (this.Query.page < this.pageData.last_page) this.getList();
+        if (this.Query.page <= this.pageData.last_page) this.getList();
     },
 };
 </script>

src/pagesC/settledMerchant/index.vue

@@ -121,7 +121,7 @@ export default {
     onShow() {},
     mounted() {},
     onReachBottom() {
-        if (this.Query.page < this.pageData.last_page) this.getList();
+        if (this.Query.page <= this.pageData.last_page) this.getList();
     },
 };
 </script>

src/pagesC/settledMerchant/myBusiness.vue

@@ -99,7 +99,7 @@ export default {
     },
     mounted() {},
     onReachBottom() {
-        if (this.Query.page < this.pageData.last_page) this.getList();
+        if (this.Query.page <= this.pageData.last_page) this.getList();
     },
 };
 </script>

src/pagesC/settledMerchant/pay.vue

@@ -31,7 +31,7 @@
                 <span>{{ discounts.chabao || 0 }}</span>
             </div>
             <div class="li flex_r flex_jb">
-                <span>可用余额</span>
+                <span>可用茶币</span>
                 <span>{{ user_money || 0 }}</span>
             </div>
         </div>
@@ -41,7 +41,7 @@
                 <span class="p color fw-700">待支付</span>
             </div>
             <div class="li flex_r flex_ac flex_jb color right">
-                <span class="dis">余额抵扣：￥{{ user_money }}</span>
+                <span class="dis">茶币抵扣：{{ user_money }}</span>
                 <span class=" fw-700">
                     ￥{{ (Math.floor(((Number(Body.money) - Number(user_money) - Number(discounts.discount))) * 100) / 100 >= 0
                     ? Math.floor(((Number(Body.money) - Number(user_money) - Number(discounts.discount))) * 100) / 100 : 0) || 0 }}
@@ -58,7 +58,7 @@
         <!-- <div class="subBtn flex_r flex_ac flex_jb">
             <div class="subBtn_left flex_c">
                 <span class="sum">合计：<span class="yuan">￥</span>{{ Math.floor((Number(Body.money) - Number(discounts.discount)) * 100) / 100 || 0 }}</span>
-                <span class="dis">余额抵扣：￥{{ user_money }}</span>
+                <span class="dis">茶币抵扣：{{ user_money }}</span>
             </div>
             <div class="subBtn_center">
                 <span class="yuan">￥</span><span>
@@ -138,7 +138,7 @@ export default {
             let that = this
             uni.showModal({
                 title: "温馨提示",
-                content: "你将支付该订单，请核对支付金额正确后点击“确认”。\r\n 请注意:平台余额支付无需密码，点击“确认”就会支付成功。",
+                content: "你将支付该订单，请核对支付金额正确后点击“确认”。\r\n 请注意:平台茶币抵扣无需密码，点击“确认”就会支付成功。",
                 showCancel: true,
                 confirmText: "确认",
                 confirmColor: "#f02f2f",

src/pagesC/shoppingMallType/p_details.vue

@@ -59,7 +59,7 @@
       </view>
     </view>
     <view class="mall flex_r flex_ac">
-      <img src="/static/img/shop.png" alt="" class="mall_img" />
+      <img src="https://teaclub.oss-cn-chengdu.aliyuncs.com/mall/shop.png" alt="" class="mall_img" />
       <view class="text7 bottom">{{ detail.mall_name }}</view>
     </view>
     <!-- 标题信息栏-end -->