feat：TeaC更能模块

src/app.scss

@@ -28,9 +28,10 @@ view, text, div {word-break: break-all;color:#333;font-family: "SourceHanSansSC-
 /* CDN 服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
 @font-face {
     font-family: 'iconfont';  /* Project id 3748689 */
-    src: url('//at.alicdn.com/t/c/font_3748689_ko4q3vq3k8a.woff2?t=1672035098208') format('woff2'),
-         url('//at.alicdn.com/t/c/font_3748689_ko4q3vq3k8a.woff?t=1672035098208') format('woff'),
-         url('//at.alicdn.com/t/c/font_3748689_ko4q3vq3k8a.ttf?t=1672035098208') format('truetype');
+    src: 
+         url('//at.alicdn.com/t/c/font_3748689_lacilu0uhw.woff2?t=1675073172975') format('woff2'),
+         url('//at.alicdn.com/t/c/font_3748689_lacilu0uhw.woff?t=1675073172975') format('woff'),
+         url('//at.alicdn.com/t/c/font_3748689_lacilu0uhw.ttf?t=1675073172975') format('truetype');
   }
 .iconfont {
     font-family: "iconfont" !important;

src/pages.json

@@ -311,6 +311,12 @@
 				"style": {
 					"navigationBarTitleText": "开票结果"
 				}
+			},
+			{
+				"path": "accountDetails/TeaC",
+				"style": {
+					"navigationBarTitleText": "TeaC明细"
+				}
 			}
 		 ]
 	}],

src/pages/account/wealth.vue

@@ -1,24 +1,14 @@
 <template>
 	<view class="container">
 		<!-- 财富列表 -->
-		<!-- <view class="con flex_r flex_ac mar_t16">
-			<view class="list flex_c flex_ac" @click="goFund">
-				<view class="list_name">余额</view>
-				<view class="list_text flex_r flex_ae"><text>￥</text>{{details.commission}}</view>
-			</view>
-			<view class="list flex_c flex_ac" @click="goAccMoney">
-				<view class="list_name">拼团金</view>
-				<view class="list_text flex_r flex_ae"><text>￥</text>{{details.spellMoney}}</view>
-			</view>
-			<view class="list flex_c flex_ac">
-			</view>
-		</view> -->
-		
-		<view class="con flex_r flex_ac flex_jb mar_t16">
+		<view class="con flex_r flex_ac mar_t16">
 			<view class="list flex_c flex_ac"  @click="goAccMoney">
 				<view class="list_name">余额</view>
 				<view class="list_text flex_r flex_ae">{{userinfo.user_money}}</view>
 			</view>
+		</view>
+		
+		<view class="con flex_r flex_ac flex_jb mar_t16">
 			<view class="list flex_c flex_ac"  @click="goDetail">
 				<view class="list_name">茶宝</view>
 				<view class="list_text flex_r flex_ae">{{userinfo.cha_bao}}</view>
@@ -27,6 +17,10 @@
 				<view class="list_name">批发积分</view>
 				<view class="list_text flex_r flex_ae">{{userinfo.integral}}</view>
 			</view>
+			<view class="list flex_c flex_ac"  @click="goto('/pagesB/accountDetails/TeaC')">
+				<view class="list_name">TeaC</view>
+				<view class="list_text flex_r flex_ae">{{userinfo.teac}}</view>
+			</view>
 		</view>
 		
 		

src/pages/index/index.vue

@@ -52,11 +52,18 @@
                     <view class="content-view">
                         <view :class="['product-title', 'ellipsis1']">{{ i.goods_name }}</view>
                         <view class="product-price">
-                            <text class="product-price-original"><text class="product-unit">￥</text>{{ i.price }}</text>
+                            <text class="product-price-original">{{ i.price }}</text>
                             <!-- <text class="product-price-favour">￥{{i.originalPrice}}</text> -->
                             <!-- <text class="product-tip">{{i.tip}}</text> -->
+                            <text class="product-text" v-if="[3,4].includes(i.type)">赠{{ i.give_cha_bao + "茶宝" }}</text>
+                        </view>
+                        <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发积分" }}</view>
+                        <!-- <view class="product-txt">赠送{{ i.give_integral ? i.give_integral + "批发积分" : i.give_cha_bao + "茶宝" }}</view> -->
+                        <view class="product-txt" v-if="[3,4].includes(i.type)">限时赠送{{ i.teac }}TeaC</view>
+                        <view class="product-txt fenxiang" v-if="[3,4].includes(i.type)"> 
+                            <text class="iconfont">&#xe604;</text>
+                            <text class="red">分享约获得 {{ i.first_teac }} TeaC</text>
                         </view>
-                        <view class="product-txt">赠送{{ i.give_integral ? i.give_integral + "批发积分" : i.give_cha_bao + "茶宝" }}</view>
                     </view>
                 </view>
             </view>
@@ -370,6 +377,11 @@ export default {
     .product-price-original {
         color: #18bb88;
         font-size: 32rpx;
+        font-weight: bold;
+        &:before{
+            content:"￥";
+            font-size: 20rpx;
+        }
     }
 
     .product-price-favour {
@@ -392,9 +404,25 @@ export default {
         color: #18bb88;
     }
 
-    .product-txt {
+    .product-txt,.product-text {
         font-size: 22rpx;
         color: #787878;
+        .iconfont{
+            margin-right: 6rpx;
+        }
+    }
+    .product-text {
+        margin-left: 16rpx;
+    }
+    .red{
+        color: #FA2E18;
+    }
+    .fenxiang{
+        font-size: 20rpx;
+        background: rgba(250,46,24, 0.08);
+        display: inline-block;
+        border-radius: 6rpx;
+        padding: 0 16rpx;
     }
 }
 </style>

src/pages/my-tea-list/index.vue

@@ -12,35 +12,19 @@
             </view>
             <view class="flex_r flex_ac mar_t16">
               <view class="account">{{ higherInfo.mobile || "" }}</view>
-              <view class="copyBalance" @tap="copyAccount(higherInfo.mobile)"
-                >复制</view
-              >
+              <view class="copyBalance" @tap="copyAccount(higherInfo.mobile)">复制</view>
             </view>
           </view>
         </view>
-
         <view class="head_option flex_r flex_ac">
-          <!-- <image
-            class="option_weixin"
-            src="/static/img/weixin.png"
-            mode=""
-            @tap="copyText"
-          ></image> -->
+          <!-- <image class="option_weixin" src="/static/img/weixin.png" mode="" @tap="copyText"></image> -->
           <view class="option_hr"></view>
-          <image
-            class="option_phone"
-            src="/static/img/dianhua.png"
-            mode=""
-            @tap="dial(higherInfo.mobile)"
-          ></image>
+          <image class="option_phone" src="/static/img/dianhua.png" mode="" @tap="dial(higherInfo.mobile)"></image>
         </view>
       </view>
-      <view class="head_time flex_r flex_ac"
-        >注册时间：{{ $day(higherInfo.reg_time * 1000).format('YYYY-MM-DD HH:mm:ss') }}</view
-      >
+      <view class="head_time flex_r flex_ac">注册时间：{{ $day(higherInfo.reg_time * 1000).format('YYYY-MM-DD HH:mm:ss') }}</view>
     </view>
     <!-- 顶部-end -->
-
     <!-- 茶友数量 -->
     <view class="tea_con mar_t30">
       <view class="tea_total flex_r flex_ac flex_jc">
@@ -58,58 +42,26 @@
         <view class="info_list flex_c flex_ac flex_jc borRight" @tap="getToTeaList">
           <view class="list_num">{{ myTeaFriendNum || 0 }}<text>人</text></view>
           <view class="list_text">推广用户</view>
-        <div class="untotal_info">
-          本日新增：{{ myChayoyDirect.day }}<br />
-          本周新增：{{ myChayoyDirect.week }}<br />
-          本月新增：{{ myChayoyDirect.month }}<br />
-        </div>
+          <div class="untotal_info">
+            本日新增：{{ myChayoyDirect.day }}<br />
+            本周新增：{{ myChayoyDirect.week }}<br />
+            本月新增：{{ myChayoyDirect.month }}<br />
+          </div>
         </view>
         <view class="info_list flex_c flex_ac flex_jc">
           <view class="list_num">{{ myZhuanTeaFriendNum || 0 }}<text>人</text></view>
           <view class="list_text">转介绍用户</view>
-        <div class="untotal_info">
-          本日新增：{{ myChayoyIndirect.day }}<br />
-          本周新增：{{ myChayoyIndirect.week }}<br />
-          本月新增：{{ myChayoyIndirect.month }}<br />
-        </div>
+          <div class="untotal_info">
+            本日新增：{{ myChayoyIndirect.day }}<br />
+            本周新增：{{ myChayoyIndirect.week }}<br />
+            本月新增：{{ myChayoyIndirect.month }}<br />
+          </div>
         </view>
       </view>
     </view>
     <!-- 茶友数量-end -->
-
-    <!-- <view class="setBtn flex_r flex_ac flex_jc" @tap="setContact"
-      >设置联系方式</view
-    > -->
-
-    <!-- 设置联系方式 -->
-    <popup ref="popup" type="center">
-      <view class="msg_con">
-        <view class="msg_head flex_r flex_ac flex_jb">
-          <view class="msg_title">填写信息</view>
-          <image
-            class="msg_close"
-            src="/static/cuowu_icon.png"
-            mode=""
-            @tap="closePopup"
-          ></image>
-        </view>
-        <view class="from">
-          <view class="from_list">
-            <input type="text" v-model="wxcode" placeholder="请输入微信号" />
-          </view>
-          <view class="from_list">
-            <input type="text" v-model="mobile" placeholder="请输入手机号" />
-          </view>
-          <view class="confimBtn flex_r flex_ac flex_jc" @tap="setUserInfo"
-            >提交</view
-          >
-        </view>
-      </view>
-    </popup>
-    <!-- 设置联系方式-end -->
   </view>
 </template>
-
 <script>
 let app = getApp();
 var appEv = app.$vm.$options;
@@ -134,7 +86,7 @@ export default {
       myChayoyIndirect: {},
     };
   },
-  onLoad: function () {
+  onLoad: function() {
     this.loadData();
 
     this.getmyChayoyTotal()
@@ -177,7 +129,7 @@ export default {
     },
 
     // 填写我的信息
-    setUserInfo: function () {
+    setUserInfo: function() {
       let that = this;
       let data = {
         phone: this.mobile,
@@ -198,7 +150,7 @@ export default {
       }
     },
     // 复制微信号
-    copyText: function () {
+    copyText: function() {
       let that = this;
       if (that.higherInfo.higherNumber == "") {
         appEv.errTips("用户暂未设置微信");
@@ -211,7 +163,7 @@ export default {
       });
     },
     // 复制账号
-    copyAccount: function (e) {
+    copyAccount: function(e) {
       uniCopy({
         content: e,
         success: (res) => {},
@@ -219,22 +171,22 @@ export default {
       });
     },
     // 设置联系方式
-    setContact: function () {
+    setContact: function() {
       let that = this;
       that.$refs.popup.open();
     },
     // 关闭窗口
-    closePopup: function () {
+    closePopup: function() {
       this.$refs.popup.close();
     },
     // 跳转到我的茶友列表
-    getToTeaList: function () {
+    getToTeaList: function() {
       uni.navigateTo({
         url: "/pages/tea-list/index",
       });
     },
     // 拨打电话
-    dial: function (e) {
+    dial: function(e) {
       let that = this;
       if (that.higherInfo.higherPhone == "") {
         appEv.errTips("用户暂未设置电话");
@@ -247,16 +199,17 @@ export default {
   },
 };
 </script>
-
 <style lang="scss" scoped>
 page {
   background: #f5f5f5;
 }
+
 // 页面配置
 .container {
   padding: 20rpx 30rpx;
   box-sizing: border-box;
 }
+
 // 页面配置-end
 
 // 顶部
@@ -264,20 +217,24 @@ page {
   font-size: 24rpx;
   color: #7f7f7f;
 }
+
 .option_weixin {
   width: 42rpx;
   height: 35rpx;
 }
+
 .option_phone {
   width: 36rpx;
   height: 36rpx;
   margin-left: 30rpx;
 }
+
 .user_name {
   font-size: 30rpx;
   color: #363638;
   margin-right: 12rpx;
 }
+
 .head {
   width: 100%;
   overflow: hidden;
@@ -285,18 +242,21 @@ page {
   background: #fff;
   border-bottom: 3rpx solid rgba(0, 0, 0, 0.12);
 }
+
 .head_img {
   width: 79rpx;
   height: 79rpx;
   margin-right: 30rpx;
   border-radius: 50%;
 }
+
 .option_hr {
   width: 3rpx;
   height: 66rpx;
   background: rgba(0, 0, 0, 0.12);
   margin-left: 30rpx;
 }
+
 .copyBalance {
   padding: 0 10rpx;
   background: #1cbe8c;
@@ -304,6 +264,7 @@ page {
   font-size: 22rpx;
   margin-left: 12rpx;
 }
+
 .level {
   width: 74rpx;
   height: 26rpx;
@@ -312,6 +273,7 @@ page {
   font-size: 20rpx;
   line-height: 1;
 }
+
 .head_time {
   width: 100%;
   height: 60rpx;
@@ -320,13 +282,15 @@ page {
   font-size: 22rpx;
   color: #606060;
 }
+
 .head_info {
   width: 100%;
   overflow: hidden;
   padding: 40rpx 24rpx 20rpx;
   box-sizing: border-box;
-  
+
 }
+
 // 顶部-end
 
 // 茶友数量
@@ -334,129 +298,81 @@ page {
   font-size: 36rpx;
   color: #1cbe8c;
 }
+
 .total_num {
   font-size: 40rpx;
   color: #232323;
 }
+
 .list_text {
   font-size: 26rpx;
   color: #606060;
 }
+
 .list_num text {
   font-size: 26rpx;
   color: #1cbe8c;
 }
+
 .total_num text {
   font-size: 26rpx;
   color: #232323;
 }
+
 .borRight {
   border-right: 3rpx solid rgba(0, 0, 0, 0.12);
 }
+
 .info_list {
   height: 100%;
   width: 50%;
   box-sizing: border-box;
 }
+
 .total_text {
   font-size: 26rpx;
   color: #606060;
   margin-top: 12rpx;
 }
-.total_info{
+
+.total_info {
   font-size: 22rpx;
   color: #333;
   margin-left: 32rpx;
 }
-.untotal_info{
+
+.untotal_info {
   font-size: 22rpx;
   color: #333;
-  margin-top: 32rpx;
+  margin-top: 20rpx;
 }
+
 .tea_con {
   width: 100%;
   overflow: hidden;
   border-radius: 8rpx;
   background: #fff;
 }
+
 .tea_info {
   width: 100%;
   // height: 156rpx;s
-  padding: 16rpx 0;
+  padding: 26rpx 0;
   box-sizing: border-box;
 }
+
 .tea_total {
   width: 100%;
   height: 260rpx;
   border-bottom: 3rpx solid rgba(0, 0, 0, 0.12);
 }
+
 .total_con {
   width: 164rpx;
   height: 164rpx;
   border: 6rpx solid #1cbe8c;
   border-radius: 50%;
 }
-// 茶友数量-end
-
-// 设置联系方式
-.setBtn {
-  width: 100%;
-  height: 83rpx;
-  background: #1cbe8c;
-  color: #ffffff;
-  font-size: 36rpx;
-  border-radius: 4rpx;
-  margin-top: 128rpx;
-}
-// 设置联系方式-end
 
-// 设置联系方式弹窗
-.msg_close {
-  width: 31rpx;
-  height: 31rpx;
-}
-.msg_title {
-  font-size: 28rpx;
-  color: #252525;
-}
-.from_list input {
-  width: 100%;
-  height: 100%;
-}
-.msg_con {
-  width: 650rpx;
-  overflow: hidden;
-  border-radius: 12rpx;
-  background: #fff;
-}
-.from {
-  width: 100%;
-  overflow: hidden;
-  padding: 24rpx 30rpx;
-  box-sizing: border-box;
-}
-.confimBtn {
-  width: 100%;
-  height: 60rpx;
-  background: #1cbe8c;
-  color: #ffffff;
-  font-size: 34rpx;
-}
-.msg_head {
-  width: 100%;
-  height: 88rpx;
-  padding: 0 30rpx;
-  box-sizing: border-box;
-  border-bottom: 3rpx solid rgba(0, 0, 0, 0.12);
-}
-.from_list {
-  width: 100%;
-  height: 60rpx;
-  padding: 0 30rpx;
-  box-sizing: border-box;
-  border-radius: 2rpx;
-  margin-bottom: 24rpx;
-  background: #efefef;
-}
-// 设置联系方式弹窗-end
-</style>
+// 茶友数量-end
+</style>

src/pages/my/index.vue

@@ -234,7 +234,7 @@
 						<image class="fun_img" src="/static/my/topup.png" mode=""></image>
 						<view class="fun_text">充值明细</view>
 					</navigator> -->
-          <navigator
+          <!-- <navigator
             class="fun_list flex_c flex_ac"
             url="/pages/accountDetails/integral"
             hover-class="none"
@@ -245,7 +245,7 @@
               mode=""
             ></image>
             <view class="fun_text">积分明细</view>
-          </navigator>
+          </navigator> -->
           <navigator
             class="fun_list flex_c flex_ac"
             url="/pagesB/invoice/invoiceList"

src/pages/product/p_details.vue

@@ -62,6 +62,13 @@
     <!-- 标题信息栏 -->
     <view class="title_info">
       <view class="goods_name">{{ detail.goods_name }}</view>
+      <view class="goods_teac flex_r flex_jb" v-if="['3','4'].includes(type)">
+        <view class="product-txt">限时赠送{{ detail.teac }}TeaC</view>
+        <view class="product-txt fenxiang"> 
+            <text class="iconfont">&#xe604;</text>
+            <text class="red">分享约获得 {{ detail.first_teac }} TeaC</text>
+        </view>
+      </view>
       <view class="goods_subName">{{ detail.goodsMsg }}</view>
     </view>
     <!-- 标题信息栏-end -->
@@ -726,4 +733,25 @@ page {
 }
 
 // 购买或加入购物车弹窗-end
+
+.goods_teac{
+  
+    .product-txt,.product-text {
+        font-size: 22rpx;
+        color: #787878;
+    }
+    .product-text {
+        margin-left: 16rpx;
+    }
+    .red{
+        color: #FA2E18;
+    }
+    .fenxiang{
+        font-size: 22rpx;
+        background: rgba(250,46,24, 0.08);
+        display: inline-block;
+        border-radius: 6rpx;
+        padding: 0 16rpx;
+    }
+}
 </style>

src/pages/product/productRetail.vue

@@ -12,9 +12,16 @@
                         <text class="product-price-favour" v-if="type==6">{{(i.cost_price)}}</text>
                         <text class="product-price-original">{{ (i.price) }}</text>
                         <!-- <text class="product-tip">{{i.tip}}</text> -->
+                            <text class="product-text" v-if="['3','4'].includes(type)">赠{{ i.give_cha_bao + "茶宝" }}</text>
+                    </view>
+                    <view class="product-txt" v-if="type == 1">赠送{{ i.give_integral + "批发积分" }}</view>
+                    <!-- <view class="product-txt" v-if="type != 6">赠送{{ i.give_integral ? i.give_integral + "批发积分" : i.give_cha_bao + "茶宝" }}</view> -->
+                    <view class="product-txt" v-if="type == 6">每<text class="green">{{i.interval_time}}</text> 分钟降价 <text class="green">{{i.drop_range * 100}}%</text> </view>
+                    <view class="product-txt" v-if="['3','4'].includes(type)">限时赠送{{ i.teac }}TeaC</view>
+                    <view class="product-txt fenxiang" v-if="['3','4'].includes(type)">
+                        <text class="iconfont">&#xe604;</text>
+                        <text class="red">分享约获得{{ i.first_teac }}TeaC</text>
                     </view>
-                    <view class="product-txt" v-if="type != 6">赠送{{ i.give_integral ? i.give_integral + "批发积分" : i.give_cha_bao + "茶宝" }}</view>
-                    <view class="product-txt" v-else>每<text class="green">{{i.interval_time}}</text> 分钟降价 <text class="green">{{i.drop_range * 100}}%</text> </view>
                 </view>
             </view>
         </view>
@@ -160,6 +167,7 @@ page {
         width: 100%;
         height: 42.5vw;
         object-fit: cover;
+        // background-color: rgba(24,187,136, 0.6);
     }
 
     .content-view{
@@ -182,7 +190,8 @@ page {
 
     .product-price-original {
         color: #18bb88;
-        font-size: 28rpx;
+        font-size: 32rpx;
+        font-weight: bold;
         &:before{
             content:"￥";
             font-size: 20rpx;
@@ -219,9 +228,25 @@ page {
         color: #18bb88;
     }
 
-    .product-txt {
+    .product-txt,.product-text {
         font-size: 22rpx;
         color: #787878;
+        .iconfont{
+            margin-right: 6rpx;
+        }
+    }
+    .product-text {
+        margin-left: 16rpx;
+    }
+    .red{
+        color: #FA2E18;
+    }
+    .fenxiang{
+        font-size: 20rpx;
+        background: rgba(250,46,24, 0.08);
+        display: inline-block;
+        border-radius: 6rpx;
+        padding: 0 16rpx;
     }
 }
 </style>

src/pages/sign/index.vue

@@ -24,24 +24,9 @@
           <view class="info_text">累计签到({{ totalSign || 0 }}次）</view>
         </view>
         <view class="info_con">
-          <image
-            class="info_img"
-            :src="
-              nextSign > 0
-                ? '/static/sgin/p_back2.png'
-                : '/static/sgin/p_back.png'
-            "
-            mode=""
-          />
-          <view class="info_texts flex_r flex_ac flex_jc" v-if="nextSign > 0">{{
-            timer
-          }}</view>
-          <view
-            class="info_texts flex_r flex_ac flex_jc"
-            @tap="setSignIn"
-            v-else
-            >立即签到</view
-          >
+          <image class="info_img" :src="nextSign > 0 ? '/static/sgin/p_back2.png' : '/static/sgin/p_back.png'" mode="" />
+          <view class="info_texts flex_r flex_ac flex_jc" v-if="nextSign > 0">{{ timer }}</view>
+          <view class="info_texts flex_r flex_ac flex_jc" @tap="setSignIn" v-else>立即签到</view>
         </view>
       </view>
       <view class="sign_time flex_r flex_ac flex_je mar_t20">
@@ -49,7 +34,6 @@
       </view>
     </view>
     <!-- 签到信息-end -->
-
     <!-- 精品推荐 -->
     <view class="bou_head flex_r flex_ac flex_jc">
       <image class="bou_img" src="/static/sgin/left.png" mode=""></image>
@@ -57,33 +41,25 @@
       <image class="bou_img" src="/static/sgin/right.png" mode=""></image>
     </view>
     <view class="product-list">
-      <view
-        class="product"
-        v-for="(i, s) in goods"
-        :key="s"
-        @click="NavToGoodsDetail(i.id, i.type)"
-      >
+      <view class="product" v-for="(i, s) in goods" :key="s" @click="NavToGoodsDetail(i.id, i.type)">
         <view class="image-view">
           <image class="product-image" :src="i.original_img"></image>
         </view>
         <view class="content-view">
-          <view :class="['product-title', 'ellipsis1']">{{
-            i.goods_name
-          }}</view>
-          <view class="product-price">
-            <text class="product-price-original"
-              ><text class="product-unit">￥</text>{{ i.price }}</text
-            >
-            <!-- <text class="product-price-favour">￥{{i.originalPrice}}</text> -->
-            <!-- <text class="product-tip">{{i.tip}}</text> -->
-          </view>
-          <view class="product-txt"
-            >赠送{{
-              i.give_integral
-                ? i.give_integral + "批发积分"
-                : i.give_cha_bao + "茶宝"
-            }}</view
-          >
+            <view :class="['product-title', 'ellipsis1']">{{ i.goods_name }}</view>
+            <view class="product-price">
+                <text class="product-price-original">{{ i.price }}</text>
+                <!-- <text class="product-price-favour">￥{{i.originalPrice}}</text> -->
+                <!-- <text class="product-tip">{{i.tip}}</text> -->
+                <text class="product-text" v-if="['3','4'].includes(i.type)">赠{{ i.give_cha_bao + "茶宝" }}</text>
+            </view>
+            <view class="product-txt" v-if="i.type == 1">赠送{{ i.give_integral + "批发积分" }}</view>
+            <!-- <view class="product-txt">赠送{{ i.give_integral ? i.give_integral + "批发积分" : i.give_cha_bao + "茶宝" }}</view> -->
+            <view class="product-txt" v-if="['3','4'].includes(i.type)">限时赠送{{ i.teac }}TeaC</view>
+            <view class="product-txt fenxiang" v-if="['3','4'].includes(i.type)"> 
+                <text class="iconfont">&#xe604;</text>
+                <text class="red">分享约获得 {{ i.first_teac }} TeaC</text>
+            </view>
         </view>
       </view>
       <view class="fz_w_text mar_t20 mar_b20">让数字经济赋能美好生活！</view>
@@ -133,9 +109,9 @@ export default {
   methods: {
     loadData() {
       let data = {
-            time:(new Date().getTime() / 1000).toFixed(0)
-        }
-      post("/user/sign",data).then((res) => {
+        time: (new Date().getTime() / 1000).toFixed(0)
+      }
+      post("/user/sign", data).then((res) => {
         if (res.code == 0) {
           this.todaySign = res.data.today_sign;
           this.totalSign = res.data.total_sign;
@@ -157,17 +133,17 @@ export default {
         }
 
         let hour =
-          parseInt(timer / 3600) > 9
-            ? parseInt(timer / 3600)
-            : "0" + parseInt(timer / 3600);
+          parseInt(timer / 3600) > 9 ?
+          parseInt(timer / 3600) :
+          "0" + parseInt(timer / 3600);
         let min =
-          parseInt((timer / 60) % 60) > 9
-            ? parseInt((timer / 60) % 60)
-            : "0" + parseInt((timer / 60) % 60);
+          parseInt((timer / 60) % 60) > 9 ?
+          parseInt((timer / 60) % 60) :
+          "0" + parseInt((timer / 60) % 60);
         let sec =
-          parseInt(timer % 60) > 9
-            ? parseInt(timer % 60)
-            : "0" + parseInt(timer % 60);
+          parseInt(timer % 60) > 9 ?
+          parseInt(timer % 60) :
+          "0" + parseInt(timer % 60);
 
         date = hour + ":" + min + ":" + sec;
         // console.log(date);
@@ -179,9 +155,9 @@ export default {
       if (this.canClick) {
         this.canClick = false;
         let data = {
-            time:(new Date().getTime() / 1000).toFixed(0)
+          time: (new Date().getTime() / 1000).toFixed(0)
         }
-        post("user/doSign",data).then((res) => {
+        post("user/doSign", data).then((res) => {
           if (res.code === 0) {
             this.nextSign = res.data.next_sign
             this.loadData();
@@ -190,7 +166,7 @@ export default {
           }
         });
         setTimeout(() => {
-            this.canClick = true
+          this.canClick = true
         }, 2000);
       }
     },
@@ -504,10 +480,12 @@ page {
   width: 100%;
   height: 114rpx;
   margin-top: 50rpx;
+
   .bou_img {
     width: 89rpx;
     height: 30rpx;
   }
+
   .bou_title {
     font-size: 36rpx;
     color: #121212;
@@ -523,6 +501,7 @@ page {
   width: 100%;
   flex-wrap: wrap;
   flex-direction: row;
+
   .product {
     // width: 50%;
     // padding: 20rpx 10rpx;
@@ -535,6 +514,7 @@ page {
     // border: 1px solid #eee;
     border-radius: 5px;
     box-shadow: 4rpx 4rpx 26rpx 2rpx rgba(17, 18, 29, 0.08);
+
     &:nth-child(2n) {
       margin-left: 3%;
     }
@@ -568,6 +548,11 @@ page {
   .product-price-original {
     color: #18bb88;
     font-size: 32rpx;
+    font-weight: bold;
+    &:before{
+        content:"￥";
+        font-size: 20rpx;
+    }
   }
 
   .product-price-favour {
@@ -589,10 +574,25 @@ page {
     font-size: 24rpx;
     color: #18bb88;
   }
-
-  .product-txt {
-    font-size: 22rpx;
-    color: #787878;
+  .product-txt, .product-text {
+      font-size: 22rpx;
+      color: #787878;
+      .iconfont{
+          margin-right: 6rpx;
+      }
+  }
+  .product-text {
+      margin-left: 16rpx;
+  }
+  .red{
+      color: #FA2E18;
+  }
+  .fenxiang{
+      font-size: 20rpx;
+      background: rgba(250,46,24, 0.08);
+      display: inline-block;
+      border-radius: 6rpx;
+      padding: 0 16rpx;
   }
 }
 </style>

src/pages/szw-order-list/index.vue

@@ -266,7 +266,7 @@ export default {
           case 2:
             return "批发专区";
           case 3:
-            return "精品专区";
+            return "精品优选";
           case 4:
             return "今日值得买";
           case 5:

src/pagesB/accountDetails/TeaC.vue

@@ -0,0 +1,212 @@
+<template>
+  <view class="container">
+    <!-- 顶部导航 -->
+    <!-- <view class="Tab_con flex_r flex_ac flex_jb">
+      <view
+        class="tab_list flex_r flex_ac"
+        :class="current == index ? 'active' : ''"
+        v-for="(item, index) in TabList"
+        :key="index"
+        @tap="SetStatus(index)"
+        >{{ item.title }}</view
+      >
+    </view> -->
+    <!-- 顶部导航-end -->
+    <!-- 积分列表 -->
+    <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_price',item.act == '+' ? 'g_color' : '']">{{item.act}}{{ item.num }}</view>
+          <view class="head_name">{{ type(item.type) }}</view>
+        </view>
+        <view class="list_con flex_r flex_ac flex_jb">
+          <view class="list_balance">{{ item.create_time }}</view>
+          <view class="list_time">TeaC余额{{ item.after }}</view>
+          
+        </view>
+      </view>
+      <not-goods v-if="haveGoods" textStr="暂无积分信息"></not-goods>
+    </view>
+    <!-- 积分列表 -->
+  </view>
+</template>
+<script>
+let page = 1;
+let app = getApp();
+var appEv = app.$vm.$options;
+import { post } from "@/request/api.js";
+import notGoods from "@/components/not-goods/index.vue";
+export default {
+  components: {
+    notGoods,
+  },
+  data() {
+    return {
+      haveGoods: false, // 是否有商品
+      current: 0,
+      TabList: [
+        { title: "全部", sauts: 0 },
+        // { title: "收益", sauts: 1 },
+        // { title: "支出", sauts: 2 },
+      ],
+      list: [],
+      page: 1,
+    };
+  },
+  onShow() {
+    this.page = 1;
+    this.list = [];
+    this.loadData();
+  },
+  methods: {
+    loadData: function () {
+      let that = this;
+      let data = {
+        type: this.current == 0 ? "" : this.current,
+        page: page,
+        limit: 10,
+      };
+      uni.showLoading({ mask: true });
+      post("/my/teac", data).then((res) => {
+        uni.hideLoading();
+        if (res.code === 0) {
+          if (res.data.data.data.length > 0) {
+            this.list = this.list.concat(res.data.data.data);
+          } else {
+            if (this.page == 1) {
+              this.haveGoods = true;
+              this.page = -1;
+            } else {
+              this.page = -1;
+              appEv.errTips("暂无更多");
+            }
+          }
+        } else {
+          if (page == 1) {
+            this.haveGoods = true;
+            this.page = -1;
+          } else {
+            this.page = -1;
+            appEv.errTips("暂无更多");
+          }
+        }
+      });
+    },
+    SetStatus(i) {
+      this.current = i;
+      page = 1;
+      this.list = [];
+      this.haveGoods = false;
+      this.loadData();
+    },
+  },
+  computed: {
+    type() {
+      return (va) => {
+        switch (va) {
+          case 0: return "零售收货发放积分";
+          case 1: return "批发扣除积分";
+          case 2: return "退货积分";
+          default: return "";
+        }
+      }
+    }
+  },
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+    if (page != -1) {
+      var that = this;
+      setTimeout(function () {
+        ++page;
+        that.loadData();
+      }, 800);
+    }
+  },
+};
+</script>
+<style lang="scss">
+// 页面配置
+// 页面配置-end
+
+// 顶部列表
+.tab_list {
+  height: 100%;
+  box-sizing: border-box;
+  font-size: 30rpx;
+  color: #808080;
+}
+
+.Tab_con {
+  width: 100%;
+  height: 92rpx;
+  background: #fff;
+  padding: 0 30rpx;
+  box-sizing: border-box;
+}
+
+.active {
+  color: #1bbd89;
+  border-bottom: 6rpx solid #1bbd89;
+}
+
+// 顶部列表-end
+
+// 资金列表
+.con {
+  // border-top: 16rpx solid #f4f4f4;
+}
+
+.list_con {
+  width: 100%;
+  overflow: hidden;
+}
+
+.list_head {
+  width: 100%;
+  overflow: hidden;
+}
+
+.list_time {
+  font-size: 24rpx;
+  color: #a1a1a1;
+}
+
+.list_balance {
+  font-size: 24rpx;
+  color: #a1a1a1;
+}
+
+.head_price {
+  font-size: 32rpx;
+  font-family: "SourceHanSansCN-Medium";
+}
+
+.head_name {
+  font-size: 30rpx;
+  color: #212121;
+  font-family: "SourceHanSansCN-Medium";
+}
+
+.list {
+  width: 100%;
+  overflow: hidden;
+  padding: 30rpx;
+  box-sizing: border-box;
+  border-bottom: 3rpx solid #f4f4f4;
+}
+
+// 资金列表-end
+
+// 状态颜色
+.g_color {
+  color: #1bbd89;
+}
+
+.y_color {
+  color: #f15b21;
+}
+
+// 状态颜色-end
+</style>

src/utils/myfun.js

@@ -95,7 +95,7 @@ export function tidyTpye(va) {
   switch (va) {
     case '1': return "零售专区";
     case '2': return "批发专区";
-    case '3': return "精品专区";
+    case '3': return "精品优选";
     case '4': return "今日值得买";
     case '5': return "茶宝兑换";
     case '6': return "天天捡漏";