激励广告+信息流广告

src/pages.json

@@ -663,6 +663,12 @@
 					"style": {
 						"navigationBarTitleText": "购买协议"
 					}
+				},
+				{
+					"path": "sign/result",
+					"style": {
+						"navigationBarTitleText": "签到成功"
+					}
 				}
 			]
 		}

src/pages/accountDetails/teaBaby.vue

@@ -15,7 +15,7 @@
     <view class="con">
       <view class="list" v-for="(item, index) in list" :key="index">
         <view class="list_head flex_r flex_ac flex_jb">
-          <view class="head_name">{{ type(item.type) }}</view>
+          <view class="head_name">{{ chabaoList[item.type] }}</view>
           <view :class="['head_price',item.act == '+' ? 'g_color' : '']">{{item.act}}{{ item.num }}</view>
         </view>
         <view class="list_con flex_r flex_ac flex_jb">
@@ -46,7 +46,8 @@ export default {
         { title: "支出", sauts: 2 }
       ],
       list: [],
-      page: 1
+      page: 1,
+      chabaoList: []
     };
   },
   onShow: function() {
@@ -65,6 +66,7 @@ export default {
       post("v1/my/chabao", data).then(res => {
         uni.hideLoading();
         if (res.code === 0) {
+          this.chabaoList = JSON.parse(res.data.chabaoList)
           if (res.data.data.data.length > 0) {
             this.list = this.list.concat(res.data.data.data);
           } else {

src/pages/sign/index.vue

@@ -124,6 +124,7 @@
 </template>
 <script>
 let page = 1;
+let rewardedVideoAd = null; //签到广告
 import { post } from "@/request/api.js";
 export default {
     components: {},
@@ -169,6 +170,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 (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: {

src/pagesC/settledMerchant/appPay.vue

@@ -16,6 +16,9 @@
     >
       返回APP
     </button>
+    <!-- <div class="ad" v-if="!isShow">
+        <ad-custom unit-id="adunit-a5a3ec14cf5d3b02" bindload="adLoad" binderror="adError" bindclose="adClose"></ad-custom>
+    </div> -->
     <!-- <button
       open-type="launchApp"
       class="back"
@@ -104,6 +107,15 @@ export default {
       });
     },
   },
+  // adLoad() {
+  //   console.log('原生模板广告加载成功')
+  // },
+  // adError(err) {
+  //   console.error('原生模板广告加载失败', err)
+  // },
+  // adClose() {
+  //   console.log('原生模板广告关闭')
+  // },
 };
 </script>
 <style scoped lang="scss">
@@ -127,11 +139,18 @@ export default {
   background-color: #fff;
 }
 button {
-  margin: 150rpx 30rpx;
+  margin: 150rpx 30rpx 50rpx;
 }
 
 .back {
   color: #fff;
   background-color: rgb(38, 148, 238);
 }
+
+.ad{
+  border-radius: 20rpx;
+  overflow: hidden;
+  margin: 30rpx;
+  background-color: #F5F6F8;
+}
 </style>

src/pagesC/shoppingMallType/index.vue

@@ -359,7 +359,7 @@ export default {
                     content: data,
                     success: (res) => {
                       uni.showToast({
-                        title: "商品链接已复制，请转到淘宝APP查看",
+                        title: "链接已复制，请转到淘宝APP查看",
                         icon: "none",
                         duration: 2000,
                       });

src/pagesC/shoppingMallType/order/list.vue

@@ -62,18 +62,28 @@
           <view class="price-box flex_r flex_ac">
             <view class="item flex_c flex_ac">
               <span class="k">实付</span>
-              <span class="v">{{ li.order_amount }}</span>
+              <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>
               </uni-tooltip>
             </view>
+            <view class="item flex_c flex_ac">
+              <span class="k">预估茶宝收益</span>
+              <uni-tooltip
+                class="tooltip"
+                :content="'买单收益：' + li.chabao +'茶宝'"
+                placement="bottom"
+              >
+                <span class="v">{{ li.chabao }}</span>
+              </uni-tooltip>
+            </view>
           </view>
           <view class="time"
             >付款时间：{{
@@ -220,10 +230,12 @@ export default {
       });
     },
     toDetails(da) {
-      this.goto("/pagesC/shoppingMallType/p_details", {
-        goods_sign: da.goods_sign,
-        type: da.type,
-      });
+      if (da.type == 1) {
+        this.goto("/pagesC/shoppingMallType/p_details", {
+          goods_sign: da.goods_sign,
+          type: da.type,
+        });
+      }
     },
     // 分类
     getIcon() {
@@ -462,7 +474,7 @@ page {
   margin: 16rpx 0 0;
   background-color: #f4f4f4;
   .item {
-    width: 50%;
+    width: 33%;
     .k {
       font-size: 26rpx;
       color: #868686;
@@ -472,7 +484,7 @@ page {
       font-size: 30rpx;
       color: #000;
     }
-    .v::before {
+    .v1::before {
       content: "￥";
       font-size: 24rpx;
       color: #000;
@@ -493,7 +505,7 @@ page {
 ::v-deep .uni-tooltip-popup {
   border-radius: 8rpx !important;
   padding: 6rpx 12rpx !important;
-  left: 20% !important;
+  left: 4% !important;
 }
 .a-order .price-box .btn {
   box-sizing: border-box;
@@ -603,8 +615,9 @@ page {
 }
 
 .tagcolor2 {
-  border-color: #4cd964;
-  color: #4cd964;
+  
+  border-color: #dd524d;
+  color: #dd524d;
 }
 
 .tagcolor3 {
@@ -613,8 +626,8 @@ page {
 }
 
 .tagcolor4 {
-  border-color: #dd524d;
-  color: #dd524d;
+  border-color: #4cd964;
+  color: #4cd964;
 }
 
 .tagcolor5 {

src/pagesC/sign/result.vue

@@ -0,0 +1,86 @@
+<template>
+  <div class="body">
+    <div class="flex_c flex_ac flex_jc">
+      <image
+        src="https://teaclub.oss-cn-chengdu.aliyuncs.com/mall/success.png"
+      ></image>
+      <span class="tip">签到成功！</span>
+    </div>
+    <div class="box">
+      <!-- <div class="title">此次签到奖励</div>
+      <div class="flex_r flex_ac flex_jb">
+        <span class="key">茶宝</span>
+        <span class="value">+190</span>
+      </div> -->
+    </div>
+    <div class="ad">
+        <ad-custom unit-id="adunit-a5a3ec14cf5d3b02" bindload="adLoad" binderror="adError" bindclose="adClose"></ad-custom>
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  methods: {},
+  adLoad() {
+    console.log('原生模板广告加载成功')
+  },
+  adError(err) {
+    console.error('原生模板广告加载失败', err)
+  },
+  adClose() {
+    console.log('原生模板广告关闭')
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.body {
+  padding-top: 80rpx;
+  margin: 30rpx;
+  border-radius: 20rpx;
+  background-color: #fff;
+
+  image {
+    width: 150rpx;
+    height: 150rpx;
+  }
+
+  .tip {
+    font-size: 38rpx;
+    font-weight: bold;
+    color: #000;
+    padding-top: 50rpx;
+  }
+
+  .box {
+    padding: 80rpx 30rpx 0;
+
+    .title {
+      font-size: 30rpx;
+      font-weight: bold;
+      color: #000;
+      padding-bottom: 40rpx;
+    }
+    .key,
+    .value {
+      font-size: 28rpx;
+    }
+    .key {
+      color: #494949;
+    }
+    .value {
+      color: #000;
+    }
+  }
+  .ad{
+    border-radius: 20rpx;
+    overflow: hidden;
+    padding-top: 30rpx;
+    background-color: #F5F6F8;
+  }
+}
+</style>