付宝=>消费金

签到去除广告
商品详情页文字放大

src/pages/index/index.vue

@@ -23,7 +23,7 @@
                 <!-- 公告-end -->
             </view>
             <!-- 专区入口 -->
-            <div class="l_tabBar flex_r flex_jb">
+            <div class="l_tabBar flex_r flex_jb" v-if="tabs.length > 0">
                 <div class="item" v-for="(i,s) in tabs" :key="s" @click="goto(i.url)">
                     <img :src="i.ico" alt="" class="ico">
                     <!-- <div class="tit">{{ i.tit }}</div> -->

src/pages/my/index.vue

@@ -53,7 +53,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/6.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>
                     

src/pages/product/p_details.vue

@@ -500,18 +500,18 @@ page {
     width: 400rpx;
 
     .p_favour {
-        font-size: 36rpx;
+        font-size: 38rpx;
     }
     .p_favour_teac{
         font-size: 30rpx;
     }
     .p_trade_teac {
-        font-size: 20rpx;
+        font-size: 24rpx;
         // margin-left: 20rpx;
     }
 
     .un_p_favour {
-        font-size: 26rpx;
+        font-size: 28rpx;
         text-decoration: line-through;
         margin-left: 16rpx;
 
@@ -521,7 +521,7 @@ page {
     }
 
     .p_trade {
-        font-size: 20rpx;
+        font-size: 24rpx;
         margin-left: 20rpx;
     }
 }
@@ -763,7 +763,7 @@ page {
 
     .product-txt,
     .product-text {
-        font-size: 22rpx;
+        font-size: 26rpx;
         color: #787878;
     }
 
@@ -776,7 +776,7 @@ page {
     }
 
     .fenxiang {
-        font-size: 22rpx;
+        font-size: 26rpx;
         background: rgba(250, 46, 24, 0.08);
         display: inline-block;
         border-radius: 6rpx;

src/pages/shoppingMall/index.vue

@@ -161,7 +161,7 @@
                 <span>￥{{ i.coupon_discount / 100 }}</span>
               </view>
               <view class="quan">
-                <span>赠付宝：</span>
+                <span>赠消费金：</span>
                 <span>
                   {{
                     Math.floor(
@@ -207,7 +207,7 @@
                 <span>￥{{ i.coupon_discount }}</span>
               </view>
               <view class="quan">
-                <span>赠付宝：</span>
+                <span>赠消费金：</span>
                 <span>
                   {{
                     Math.floor(
@@ -253,7 +253,7 @@
                 <span>￥{{ i.coupon_discount }}</span>
               </view>
               <view class="quan">
-                <span>赠付宝：</span>
+                <span>赠消费金：</span>
                 <span>
                   {{
                     Math.floor(
@@ -297,7 +297,7 @@
                 <span>￥{{ i.coupon_discount }}</span>
               </view> -->
               <view class="quan">
-                <span>赠付宝：</span>
+                <span>赠消费金：</span>
                 <span>
                   {{
                     Math.floor(
@@ -373,7 +373,7 @@
                   <span>￥{{ i.coupon_discount }}</span>
                 </view> -->
                 <view class="quan">
-                  <span>赠付宝：</span>
+                  <span>赠消费金：</span>
                   <span>
                     {{
                       Math.floor(
@@ -605,7 +605,7 @@ export default {
               let obj = JSON.parse(res.data).goods_search_response.goods_list;
               console.log(obj);
 
-              if (page <= 1) that.goods = [];
+              // if (page <= 1) that.goods = [];
               if (obj.length > 0) {
                 obj.forEach((e) => {
                   that.goods.push(e);
@@ -839,9 +839,10 @@ export default {
                 console.log(obj);
                 if (page <= 1) that.goods = [];
                 if (obj.length > 0) {
-                    obj.forEach((e) => {
-                        that.goods.push(e);
-                    });
+                    // obj.forEach((e) => {
+                    //     that.goods.push(e);
+                    // });
+                    that.goods.push(...that.goods,...obj)
                 } else {
                     if (page == 1) {
                         that.haveGoods = true;

src/pages/sign/index.vue

@@ -62,7 +62,7 @@
         <!-- 精品推荐 -->
         <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>
+            <view class="bou_title">数智生活</view>
             <image class="bou_img" src="/static/sgin/right.png" mode=""></image>
         </view>
         <div class="l_tabBar flex_r flex_jb">
@@ -167,36 +167,36 @@ export default {
             color: '#999',
             selectedColor: '#E68B1E',
         })
-        if(wx.createRewardedVideoAd){
-            rewardedVideoAd = wx.createRewardedVideoAd({ adUnitId: 'adunit-9e59954cb0c189f0' })
-            rewardedVideoAd.onLoad(() => {
-                console.log('onLoad event emit')
-            })
-            rewardedVideoAd.onError((err) => {
-                console.log('onError event emit', err)
-            })
-            rewardedVideoAd.onClose(res => {
-                console.log(res,"======");
+        // if(wx.createRewardedVideoAd){
+        //     rewardedVideoAd = wx.createRewardedVideoAd({ adUnitId: 'adunit-9e59954cb0c189f0' })
+        //     rewardedVideoAd.onLoad(() => {
+        //         console.log('onLoad event emit')
+        //     })
+        //     rewardedVideoAd.onError((err) => {
+        //         console.log('onError event emit', err)
+        //     })
+        //     rewardedVideoAd.onClose(res => {
+        //         console.log(res,"======");
                 
-                // 用户点击了【关闭广告】按钮
-                if (res && res.isEnded) {
-                // 正常播放结束，可以下发游戏奖励
-                    let data = {
-                        time: (new Date().getTime() / 1000).toFixed(0)
-                    }
-                    post("v1/user/doSign", data).then((res) => {
-                        if (res.code === 0) {
-                            this.loadData();
-                            this.goto("/pagesC/sign/result")
-                        } else {
-                            this.$toast(res.msg);
-                        }
-                    });
-                } else {
-                // 播放中途退出，不下发游戏奖励
-                }
-            })
-        }
+        //         // 用户点击了【关闭广告】按钮
+        //         if (res && res.isEnded) {
+        //         // 正常播放结束，可以下发游戏奖励
+        //             let data = {
+        //                 time: (new Date().getTime() / 1000).toFixed(0)
+        //             }
+        //             post("v1/user/doSign", data).then((res) => {
+        //                 if (res.code === 0) {
+        //                     this.loadData();
+        //                     this.goto("/pagesC/sign/result")
+        //                 } else {
+        //                     this.$toast(res.msg);
+        //                 }
+        //             });
+        //         } else {
+        //         // 播放中途退出，不下发游戏奖励
+        //         }
+        //     })
+        // }
     },
     onHide() {},
     methods: {
@@ -214,26 +214,26 @@ export default {
         },
         // 签到
         setSignIn() {
-            // let data = {
-            //     time: (new Date().getTime() / 1000).toFixed(0)
-            // }
-            // post("v1/user/doSign", data).then((res) => {
-            //     if (res.code === 0) {
-            //         this.loadData();
-            //     } else {
-            //         this.$toast(res.msg);
-            //     }
-            // });
-            rewardedVideoAd.show()
-            .catch(() => {
-                rewardedVideoAd.load()
-                .then(() => {
-                    rewardedVideoAd.show()
-                })
-                .catch(err => {
-                    console.log('激励视频 广告显示失败')
-                })
-            })
+            let data = {
+                time: (new Date().getTime() / 1000).toFixed(0)
+            }
+            post("v1/user/doSign", data).then((res) => {
+                if (res.code === 0) {
+                    this.loadData();
+                } else {
+                    this.$toast(res.msg);
+                }
+            });
+            // rewardedVideoAd.show()
+            // .catch(() => {
+            //     rewardedVideoAd.load()
+            //     .then(() => {
+            //         rewardedVideoAd.show()
+            //     })
+            //     .catch(err => {
+            //         console.log('激励视频 广告显示失败')
+            //     })
+            // })
         },
         // 横幅活动
         getActivityList() {

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

@@ -182,7 +182,7 @@
                 <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_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">
@@ -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);
                 }
@@ -678,7 +678,7 @@ page {
 
 // 订单信息
 .list_name {
-    width: 120rpx;
+    width: 134rpx;
     font-size: 26rpx;
     text-align-last: justify;
     color: rgba(0, 0, 0, 0.8);

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,7 +9,7 @@
                 </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')">

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/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/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/index.vue

@@ -127,7 +127,7 @@
                 <span>￥{{ i.coupon_discount / 100 }}</span>
               </view>
               <view class="quan">
-                <span>赠付宝：</span>
+                <span>赠消费金：</span>
                 <span>{{
                   Math.floor(
                     (i.min_group_price / 100) *
@@ -181,7 +181,7 @@
                 <span>￥{{ i.coupon_discount }}</span>
               </view>
               <view class="quan">
-                <span>赠付宝：</span>
+                <span>赠消费金：</span>
                 <span>
                   {{
                     Math.floor(
@@ -236,7 +236,7 @@
                 <span>￥{{ i.coupon_discount }}</span>
               </view>
               <view class="quan">
-                <span>赠付宝：</span>
+                <span>赠消费金：</span>
                 <span>
                   {{
                     Math.floor(
@@ -289,7 +289,7 @@
               <span>￥{{ i.coupon_discount }}</span>
             </view> -->
               <view class="quan">
-                <span>赠付宝：</span>
+                <span>赠消费金：</span>
                 <span>
                   {{
                     Math.floor(

src/pagesC/shoppingMallType/order/list.vue

@@ -66,10 +66,10 @@
               <span class="v1 v">{{ li.order_amount }}</span>
             </view>
             <view class="item flex_c flex_ac">
-              <span class="k">预估付宝收益</span>
+              <span class="k">预估消费金收益</span>
               <uni-tooltip
                 class="tooltip"
-                :content="'买单收益：' + li.income_amount+'付宝'"
+                :content="'买单收益：' + li.income_amount+'消费金'"
                 placement="bottom"
               >
                 <span class="v">{{ li.income_amount }}</span>