Merge branch 'main' of https://gitlab.com/tea28/client

src/App.vue

@@ -1,51 +1,51 @@
 <script>
-	export default {
-		globalData:{
-		    userInfo: {},
-		    shopInfo: {
-		        shop_name: "数字茶城",
-		        desc: "数字茶城"
-		    },
-		    openId: '',
-		    authorizeWindow: true, //是否可以打开用户信息授权页面，避免重复打开
-		    bindPhoneWindow: true, //是否可以打开绑定手机号码页面，避免重复打开
-		    hasUpdate: false, // 小程序是否有更新版本 默认为没有
-		    newVersionInfo: {
-		        num: "1.0.0",
-		        desc: "数字茶城上线啦！",
-		        updateInfo: [] // 数组形式描述一下具体更新了什么内容
-		    }, // 当前小程序最新版本信息
-		    msgTmp: null ,//订阅消息模板id信息
-			systemUserInfo:''
-		},
-		errTips(msg, duration, open){
-		    uni.showToast({
-		        title: msg,
-		        icon:'none',
-		        duration: duration ? duration : 1200,
-		        mask: true
-		    })
-		},
-		// 接口未传递有效参数值的错误提示
-		parameter(authName) {
-		    throw new Error("'" + authName + "' cat\'t be empty!");
-		},
-		onLaunch() {
-			var logs = uni.getStorageSync('logs') || []
-			logs.unshift(Date.now())
-			uni.setStorageSync('logs', logs);
-			uni.setStorageSync('mallName', "数字茶城");
-		},
-		onShow() {
-			console.log('App Show')
-		},
-		onHide() {
-			console.log('App Hide')
-		}
-	}
+export default {
+  globalData: {
+    userInfo: {},
+    shopInfo: {
+      shop_name: "数字茶城",
+      desc: "数字茶城",
+    },
+    openId: "",
+    authorizeWindow: true, //是否可以打开用户信息授权页面，避免重复打开
+    bindPhoneWindow: true, //是否可以打开绑定手机号码页面，避免重复打开
+    hasUpdate: false, // 小程序是否有更新版本 默认为没有
+    newVersionInfo: {
+      num: "1.0.0",
+      desc: "数字茶城上线啦！",
+      updateInfo: [], // 数组形式描述一下具体更新了什么内容
+    }, // 当前小程序最新版本信息
+    msgTmp: null, //订阅消息模板id信息
+    systemUserInfo: "",
+  },
+  errTips(msg, duration, open) {
+    uni.showToast({
+      title: msg,
+      icon: "none",
+      duration: duration ? duration : 1200,
+      mask: true,
+    });
+  },
+  // 接口未传递有效参数值的错误提示
+  parameter(authName) {
+    throw new Error("'" + authName + "' cat't be empty!");
+  },
+  onLaunch() {
+    var logs = uni.getStorageSync("logs") || [];
+    logs.unshift(Date.now());
+    uni.setStorageSync("logs", logs);
+    uni.setStorageSync("mallName", "数字茶城");
+  },
+  onShow() {
+    console.log("App Show");
+  },
+  onHide() {
+    console.log("App Hide");
+  },
+};
 </script>
 
 <style>
-	/*每个页面公共css */
-	@import "./app.scss";
+/*每个页面公共css */
+@import "./app.scss";
 </style>

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;
@@ -112,4 +113,8 @@ uni-input {
 .noticeBar .uni-noticebar{
     margin: 0 !important;
     padding: 0 !important;
+}
+
+.corFE2C15{
+    color: #FE2C15 !important;
 }

src/main.js

@@ -6,6 +6,11 @@ Vue.config.productionTip = false
 // import uView from "uview-ui";
 // Vue.use(uView);
 
+// 此文件配置进入app即运行的方法
+require('@/utils/run_now.js');
+
+import "@/static/font/DIN/din.css";
+
 import md5 from 'js-md5';
 Vue.prototype.$md5 = md5;
 
@@ -23,18 +28,6 @@ Vue.mixin(share)
 import highPrecision from "@/utils/highPrecision";
 Vue.prototype.$h = highPrecision;
 
-Vue.prototype.tidyTpye = (da) => {
-    switch(da) {
-        case '1': return "零售专区";
-        case '2': return "批发专区";
-        case '3': return "精品专区";
-        case '4': return "今日值得买";
-        case '5': return "茶宝兑换";
-        case '6': return "天天捡漏";
-        default: return ""
-    }
-}
-
 // 自动适配接口域名
 import hosts from "@/request/config";
 Vue.prototype.$hosts = hosts;
@@ -46,6 +39,9 @@ Vue.prototype.$up = up;
 // 页面跳转
 import { goto } from '@/utils/myfun.js';
 Vue.prototype.goto = goto;
+// 专区判断
+import { tidyTpye } from '@/utils/myfun.js';
+Vue.prototype.tidyTpye = tidyTpye;
 
 App.mpType = 'app'
 

src/manifest.json

@@ -89,10 +89,10 @@
         // 	"port": 80
         // },
         "template" : "index.html",
-        "router" : {
-            "mode" : "history",
-            "base" : ""
-        },
+        // "router" : {
+        //     "mode" : "history",
+        //     "base" : ""
+        // },
         "optimization" : {
             "treeShaking" : {
                 "enable" : true

src/pages.json

@@ -311,6 +311,12 @@
 				"style": {
 					"navigationBarTitleText": "开票结果"
 				}
+			},
+			{
+				"path": "accountDetails/TeaC",
+				"style": {
+					"navigationBarTitleText": "TeaC明细"
+				}
 			}
 		 ]
 	}],
@@ -321,8 +327,8 @@
 	// 	}
 	// },
 	"tabBar": {
-		"color": "#505050",
-		"selectedColor": "#12B280",
+		"color": "#FE2C15",
+		"selectedColor": "#FCB736",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [

src/pages/account/consignment.vue

@@ -31,7 +31,7 @@
 let page = 1;
 let app=getApp();
 var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 import notGoods from '@/components/not-goods/index.vue'
 import uniPopup from '@/components/uni-popup/uni-popup.vue'
 	export default {

src/pages/account/conversion.vue

@@ -25,7 +25,7 @@
   </div>
 </template>
 <script>
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 let app = getApp();
 var appEv = app.$vm.$options;
 export default {

src/pages/account/giveAsPresent.vue

@@ -50,7 +50,7 @@
 let page = 1;
 let app = getApp();
 var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 // import mPicker from '@/components/jarvis-picker/m-picker.vue';
 export default {
   data() {

src/pages/account/wealth.vue

@@ -1,87 +1,126 @@
 <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="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 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>
-			</view>
-			<view class="list flex_c flex_ac"  @click="goIntegral">
-				<view class="list_name">批发积分</view>
-				<view class="list_text flex_r flex_ae">{{userinfo.integral}}</view>
-			</view>
-		</view>
-		
-		
-	</view>
+  <view class="container">
+    <!-- 财富列表 -->
+    <view class="con flex_r flex_ac flex_jb mar_t16">
+      <view class="list flex_c flex_ac" @click="goAccMoney">
+        <view class="list_name">余额</view>
+        <view class="list_text f_dinB">{{ userinfo.user_money }}</view>
+      </view>
+      <view class="list flex_c flex_ac" @click="goIntegral">
+        <view class="list_name">批发券</view>
+        <view class="list_text f_dinB">{{ userinfo.integral }}</view>
+      </view>
+    </view>
+    <view class="con flex_r flex_ac mar_t16">
+      <view class="list flex_c flex_ac" @click="goDetail">
+        <view class="list_name">茶宝</view>
+        <view class="list_text f_dinB">{{ userinfo.cha_bao }}</view>
+      </view>
+      <view class="list flex_c flex_ac" @click="goto('/pagesB/accountDetails/TeaC')">
+        <view class="list_name">TeaC</view>
+        <view class="list_text f_dinB">{{ userinfo.teac }}</view>
+      </view>
+    </view>
+  </view>
 </template>
-
 <script>
-let page = 1;
-let app=getApp();
-var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
-	export default {
-		data() {
-			return {
-				details:{},
-				userinfo: undefined, // 获取用户信息
-			};
-		},
-		onLoad:function(){
-			this.userinfo = uni.getStorageSync("userinfo");
-		},
-		methods:{
-			goDetail:function(integralType,pageName){
-				uni.navigateTo({
-					url:'/pages/accountDetails/teaBaby'
-				})
-			},
-			goAccMoney:function(){
-				uni.navigateTo({
-					url:'/pages/accountDetails/running'
-				})
-			},
-			goIntegral(){
-				uni.navigateTo({
-					url:'/pages/accountDetails/integral'
-				})
-			}
-		}
-	}
+export default {
+  data() {
+    return {
+      details: {},
+      userinfo: undefined, // 获取用户信息
+    };
+  },
+  onLoad: function() {
+    this.userinfo = uni.getStorageSync("userinfo");
+  },
+  methods: {
+    goDetail: function(integralType, pageName) {
+      uni.navigateTo({
+        url: "/pages/accountDetails/teaBaby",
+      });
+    },
+    goAccMoney: function() {
+      uni.navigateTo({
+        url: "/pages/accountDetails/running",
+      });
+    },
+    goIntegral() {
+      uni.navigateTo({
+        url: "/pages/accountDetails/integral",
+      });
+    },
+  },
+};
 </script>
-
 <style lang="scss">
 // 页面配置
-page{background-color: #F4F4F4;}
+page {
+  background-color: #f4f4f4;
+}
+
 // 页面配置-end
 
 // 财富列表
-.list2{margin-bottom: 40rpx;width: 180rpx;}
-.list{width: calc(100% / 3);}
-.list_name{font-size: 26rpx;color:#404040;margin-bottom: 30rpx;}
-.con{width: 100%;overflow: hidden;padding:40rpx;box-sizing: border-box;background: #fff;}
-.con2{width: 100%;overflow: hidden;padding:40rpx 40rpx 0;box-sizing: border-box;background: #fff;}
-.list_name2{font-size: 26rpx;color:#3F3F3F;font-family: "SourceHanSansCN-Medium";margin-bottom: 30rpx;}
-.list_text{font-size: 30rpx;color: #1BBD89;font-family: "SourceHanSansCN-Medium";font-weight: 500;line-height: 1;}
-.list_text2{font-size: 30rpx;color: #FD9F33;font-family: "SourceHanSansCN-Medium";font-weight: 500;line-height: 1;}
-.list_text text{font-size: 22rpx;color: #1BBD89;font-family: "SourceHanSansCN-Medium";font-weight: 500;line-height: 1;}
+.list2 {
+  margin-bottom: 40rpx;
+  width: 180rpx;
+}
+
+.list {
+  width: calc(100% / 3);
+}
+
+.list_name {
+  font-size: 26rpx;
+  color: #404040;
+  margin-bottom: 30rpx;
+}
+
+.con {
+  width: 100%;
+  overflow: hidden;
+  padding: 40rpx;
+  box-sizing: border-box;
+  background: #fff;
+}
+
+.con2 {
+  width: 100%;
+  overflow: hidden;
+  padding: 40rpx 40rpx 0;
+  box-sizing: border-box;
+  background: #fff;
+}
+
+.list_name2 {
+  font-size: 26rpx;
+  color: #3f3f3f;
+  font-family: "SourceHanSansCN-Medium";
+  margin-bottom: 30rpx;
+}
+
+.list_text {
+  font-size: 30rpx;
+  color: #1bbd89;
+  line-height: 1;
+}
+
+.list_text2 {
+  font-size: 30rpx;
+  color: #fd9f33;
+  font-family: "SourceHanSansCN-Medium";
+  font-weight: 500;
+  line-height: 1;
+}
+
+.list_text text {
+  font-size: 22rpx;
+  color: #1bbd89;
+  font-family: "SourceHanSansCN-Medium";
+  font-weight: 500;
+  line-height: 1;
+}
+
 // 财富列表-end
-</style>
+</style>

src/pages/accountDetails/integral.vue

@@ -16,14 +16,12 @@
     <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" v-if="item.type == 0">零售收货发放积分</view>
-          <view class="head_name" v-else-if="item.type == 1">批发扣除积分</view>
-          <view class="head_name" v-else-if="item.type == 2">退货积分</view>
-          <view class="head_price g_color">{{item.act}}{{ item.num }}</view>
+          <view class="head_name">{{ type(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">
           <view class="list_balance">{{ item.create_time }}</view>
-          <view class="list_time">余额{{ item.after }}</view>
+          <view class="list_time">积分余额{{ item.after }}</view>
           
         </view>
       </view>
@@ -36,7 +34,7 @@
 let page = 1;
 let app = getApp();
 var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 import notGoods from "@/components/not-goods/index.vue";
 export default {
   components: {
@@ -55,7 +53,7 @@ export default {
       page: 1,
     };
   },
-  onShow: function () {
+  onShow() {
     this.page = 1;
     this.list = [];
     this.loadData();
@@ -102,10 +100,22 @@ export default {
       this.loadData();
     },
   },
+  computed: {
+    type() {
+      return (va) => {
+        switch (va) {
+          case 0: return "零售收货发放积分";
+          case 1: return "批发扣除积分";
+          case 2: return "退货积分";
+          default: return "";
+        }
+      }
+    }
+  },
   /**
    * 页面上拉触底事件的处理函数
    */
-  onReachBottom: function () {
+  onReachBottom() {
     if (page != -1) {
       var that = this;
       setTimeout(function () {

src/pages/accountDetails/running.vue

@@ -34,7 +34,7 @@
 let page = 1;
 let app = getApp();
 var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 import notGoods from "@/components/not-goods/index.vue";
 export default {
   components: {

src/pages/accountDetails/teaBaby.vue

@@ -30,8 +30,8 @@
           <view :class="['head_price',item.act == '+' ? 'g_color' : '']">{{item.act}}{{ item.num }}</view>
         </view>
         <view class="list_con flex_r flex_ac flex_jb">
-          <!-- <view class="list_time">{{ item.integerType }}333</view> -->
-          <view class="list_balance">{{ item.create_time }}</view>
+          <view class="list_time">{{ item.create_time }}</view>
+          <view class="list_balance">茶宝余额{{ item.after }}</view>
         </view>
       </view>
       <not-goods v-if="haveGoods" textStr="暂无积分信息"></not-goods>
@@ -43,7 +43,7 @@
 let page = 1;
 let app = getApp();
 var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 import notGoods from "@/components/not-goods/index.vue";
 export default {
   components: {
@@ -109,6 +109,29 @@ export default {
       this.loadData();
     }
   },
+  computed: {
+    type() {
+      return (va) => {
+        let is = uni.getStorageSync("isAuthentication");
+        switch (va) {
+          case 0: return "购物送茶宝";
+          case 1: return "签到送茶宝";
+          case 2: return "批发使用茶宝";
+          case 3: return "退款加茶宝";
+          case 4: return "提现转茶宝";
+          case 5: return "支出赠送茶宝";
+          case 6: return "兑换产品使用茶宝";
+          case 7: return "手动调整茶宝";
+          case 8: return "核销后送茶宝";
+          case 9: return "余额转化茶宝";
+          case 10: return "收到赠送茶宝";
+          case 11: return is ? "实名送茶宝" : "注册送茶宝";
+          case 12: return "分享用户送茶宝";
+          default: return "";
+        }
+      }
+    }
+  },
   /**
    * 页面上拉触底事件的处理函数
    */

src/pages/accountDetails/topup.vue

@@ -20,7 +20,7 @@
 let page = 1;
 let app = getApp();
 var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 import notGoods from "@/components/not-goods/index.vue";
 export default {
   components: {

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)">赠<text class="corFE2C15">{{ i.give_cha_bao }}</text>茶宝</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)">限时赠送<text class="corFE2C15">{{ i.teac }}</text>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>
@@ -68,7 +75,7 @@
 let app = getApp();
 var appEv = app.$vm.$options;
 import swiperBanner from "@/components/swiperBanner"; //轮播
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 export default {
     name: "Appindex",
     components: {
@@ -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/invi-img/index.vue

@@ -60,7 +60,7 @@
 let app = getApp();
 var appEv = app.$vm.$options;
 var util = require("@/utils/utils.js");
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 // import { ReqApi } from "@/utils/reqTools.js";
 // var reqApi = new ReqApi();
 // import { base64ToPath } from "@/js_sdk/image-tools.js";

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

@@ -12,96 +12,56 @@
             </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">
         <view class="total_con flex_c flex_ac flex_jc">
-          <view class="total_num"
-            >{{ myQuanTeaFriendNum || 0 }}<text>人</text></view
-          >
+          <view class="total_num">{{ myQuanTeaFriendNum || 0 }}<text>人</text></view>
           <view class="total_text">社区总数</view>
         </view>
+        <div class="total_info">
+          本日新增：{{ myChayoyTotal.day }}<br />
+          本周新增：{{ myChayoyTotal.week }}<br />
+          本月新增：{{ myChayoyTotal.month }}<br />
+        </div>
       </view>
       <view class="tea_info flex_r flex_ac">
-        <view
-          class="info_list flex_c flex_ac flex_jc borRight"
-          @tap="getToTeaList"
-        >
+        <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>
         </view>
         <view class="info_list flex_c flex_ac flex_jc">
-          <view class="list_num"
-            >{{ myZhuanTeaFriendNum || 0 }}<text>人</text></view
-          >
+          <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>
         </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;
@@ -120,10 +80,18 @@ export default {
       myQuanTeaFriendNum: "",
       wxcode: "",
       mobile: "",
+
+      myChayoyTotal: {},
+      myChayoyDirect: {},
+      myChayoyIndirect: {},
     };
   },
-  onLoad: function () {
+  onLoad: function() {
     this.loadData();
+
+    this.getmyChayoyTotal()
+    this.getmyChayoyDirect()
+    this.getmyChayoyIndirect()
   },
   methods: {
     loadData() {
@@ -137,8 +105,31 @@ export default {
         }
       });
     },
+
+    getmyChayoyTotal() {
+      post("/my/myChayoyTotal").then((res) => {
+        if (res.code === 0) {
+          this.myChayoyTotal = res.data.data;
+        }
+      });
+    },
+    getmyChayoyDirect() {
+      post("/my/myChayoyDirect").then((res) => {
+        if (res.code === 0) {
+          this.myChayoyDirect = res.data.data;
+        }
+      });
+    },
+    getmyChayoyIndirect() {
+      post("/my/myChayoyIndirect").then((res) => {
+        if (res.code === 0) {
+          this.myChayoyIndirect = res.data.data;
+        }
+      });
+    },
+
     // 填写我的信息
-    setUserInfo: function () {
+    setUserInfo: function() {
       let that = this;
       let data = {
         phone: this.mobile,
@@ -159,7 +150,7 @@ export default {
       }
     },
     // 复制微信号
-    copyText: function () {
+    copyText: function() {
       let that = this;
       if (that.higherInfo.higherNumber == "") {
         appEv.errTips("用户暂未设置微信");
@@ -172,7 +163,7 @@ export default {
       });
     },
     // 复制账号
-    copyAccount: function (e) {
+    copyAccount: function(e) {
       uniCopy({
         content: e,
         success: (res) => {},
@@ -180,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("用户暂未设置电话");
@@ -208,16 +199,17 @@ export default {
   },
 };
 </script>
-
 <style lang="scss" scoped>
 page {
   background: #f5f5f5;
 }
+
 // 页面配置
 .container {
   padding: 20rpx 30rpx;
   box-sizing: border-box;
 }
+
 // 页面配置-end
 
 // 顶部
@@ -225,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;
@@ -246,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;
@@ -265,6 +264,7 @@ page {
   font-size: 22rpx;
   margin-left: 12rpx;
 }
+
 .level {
   width: 74rpx;
   height: 26rpx;
@@ -273,6 +273,7 @@ page {
   font-size: 20rpx;
   line-height: 1;
 }
+
 .head_time {
   width: 100%;
   height: 60rpx;
@@ -281,13 +282,15 @@ page {
   font-size: 22rpx;
   color: #606060;
 }
+
 .head_info {
   width: 100%;
   overflow: hidden;
   padding: 40rpx 24rpx 20rpx;
   box-sizing: border-box;
-  
+
 }
+
 // 顶部-end
 
 // 茶友数量
@@ -295,119 +298,81 @@ page {
   font-size: 36rpx;
   color: #1cbe8c;
 }
+
 .total_num {
   font-size: 40rpx;
   color: #232323;
 }
+
 .list_text {
-  font-size: 22rpx;
+  font-size: 26rpx;
   color: #606060;
 }
+
 .list_num text {
-  font-size: 24rpx;
+  font-size: 26rpx;
   color: #1cbe8c;
 }
+
 .total_num text {
-  font-size: 24rpx;
+  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: 22rpx;
+  font-size: 26rpx;
   color: #606060;
   margin-top: 12rpx;
 }
+
+.total_info {
+  font-size: 22rpx;
+  color: #333;
+  margin-left: 32rpx;
+}
+
+.untotal_info {
+  font-size: 22rpx;
+  color: #333;
+  margin-top: 20rpx;
+}
+
 .tea_con {
   width: 100%;
   overflow: hidden;
   border-radius: 8rpx;
   background: #fff;
 }
+
 .tea_info {
   width: 100%;
-  height: 156rpx;
-  padding: 16rpx 0;
+  // height: 156rpx;s
+  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

@@ -1,72 +1,37 @@
 <template>
   <view class="container">
-    <view
-      class="content"
-      :style="userinfo.is_authentication == 1 ? 'padding-top:30rpx;' : ''"
-    >
+    <view class="content" :style="isShiMing ? '' : 'padding-top:30rpx;'">
       <!-- 用户信息 -->
       <view class="uerInfo mar_t16 flex_r">
         <view class="user_img">
-          <image
-            @click="upheadimg"
-            class="image"
-            :src="userinfo.head_pic"
-            mode=""
-          ></image>
-          <view
-            class="coupon_info flex_r flex_ac"
-            v-if="isShiMing"
-            @tap="goToAutonym"
-          >
+          <image @click="upheadimg" class="image" :src="userinfo.head_pic" mode=""></image>
+          <view class="coupon_info flex_r flex_ac" @tap="goToAutonym" v-if="isShiMing">
             完成实名认证，享受更多权益
-            <image
-              src="/static/my/f_close.png"
-              mode="widthFix"
-              class="close_icon"
-              @tap.stop="closeAuto"
-            >
+            <image src="/static/my/f_close.png" mode="widthFix" class="close_icon" @tap.stop="closeAuto">
             </image>
-            <view class="sj_icon"></view>
           </view>
         </view>
-        <block v-if="userinfo && userinfo != ''">
+        <block v-if="userinfo.nickname">
           <view class="user_con flex_c">
             <view class="user_name flex_r flex_ae ellipsis">
               <view @click="goto('/pages/my/userinfo')">{{
                 userinfo.nickname
-              }}</view>
-              <text
-                >({{
-                  userinfo.is_authentication == 0 ? "未实名" : "已实名"
-                }})</text
-              >
+                }}</view>
+              <text v-if="isAuthentication">({{ userinfo.is_authentication == 0 ? "未实名" : "已实名" }})</text>
             </view>
             <view class="flex_r flex_ac">
               <view class="user_level clearfix">
-                <image
-                  class="level_img"
-                  src="/static/my/huangguan.png"
-                  mode=""
-                ></image>
+                <image class="level_img" src="/static/my/huangguan.png" mode=""></image>
                 <view class="level_text">{{ userinfo.level_name }}</view>
               </view>
             </view>
             <view class="user_account flex_r flex_ac mar_t10">
               <view class="account">账号：{{ userinfo.mobile }}</view>
-              <view
-                class="copy_account flex_r flex_ac flex_jc"
-                @tap="copyText(userinfo.mobile)"
-                >复制</view
-              >
+              <view class="copy_account flex_r flex_ac flex_jc" @tap="copyText(userinfo.mobile)">复制</view>
             </view>
           </view>
           <view class="user_option flex_r flex_ac flex_je">
-            <image
-              class="code_img"
-              src="/static/my/f_img_code.png"
-              @tap="getImgPage"
-              mode=""
-            ></image>
+            <image class="code_img" src="/static/my/f_img_code.png" @tap="getImgPage" mode=""></image>
             <!-- <image class="code_img" src="/static/my/setting.png" @tap="getToSetting"></image> -->
           </view>
         </block>
@@ -77,294 +42,137 @@
         </block>
       </view>
       <!-- 用户信息-end -->
-
       <!-- 账户信息 -->
       <view class="acc_info">
-        <view class="acc_head flex_r flex_ac flex_jb">
-          <view class="acc_price"
-            >账号余额￥<text>{{ userinfo.user_money }}</text></view
-          >
-          <view class="C flex_r flex_ac">
+        <view class="acc_head flex_r flex_jb">
+          <view class="acc_price">
+            <view class="price_txt">账号余额(元)</view>
+            <view class="price_num f_dinB">{{ userinfo.user_money }}</view>
+          </view>
+          <view class="C flex_r">
             <navigator class="recharge flex_r flex_ac flex_jc" url="/pages/account/conversion" hover-class="none">转化</navigator>
-            <!-- <navigator class="recharge flex_r flex_ac flex_jc" url="/pages/top-up/index" hover-class="none">
-							充值</navigator> -->
-            <view class="withdraw flex_r flex_ac flex_jc" @tap="getToCash"
-              >提现</view
-            >
+            <!-- <navigator class="recharge flex_r flex_ac flex_jc" url="/pages/top-up/index" hover-class="none">充值</navigator> -->
+            <view class="withdraw flex_r flex_ac flex_jc" @tap="getToCash">提现</view>
           </view>
         </view>
         <view class="info_con flex_r flex_jb">
           <view class="info_list flex_c flex_jb">
             <view class="list_name">昨日收益(元)</view>
-            <view class="list_text">{{ userinfo.yesterdayProfit || 0 }}</view>
+            <view class="list_text f_dinB">{{ userinfo.yesterdayProfit || 0 }}</view>
           </view>
           <view class="info_list flex_c flex_jb" @tap="getToAccMoney">
             <view class="list_name">茶宝</view>
-            <view class="list_text">{{ userinfo.cha_bao || 0 }}</view>
+            <view class="list_text f_dinB">{{ userinfo.cha_bao || 0 }}</view>
           </view>
-          <!-- 					<view class="info_list flex_c flex_jb" @tap="getToBean">
-						<view class="list_name">拼豆</view>
-						<view class="list_text">{{userInfoAccount.accountBean}}</view>
-					</view> -->
           <view class="info_list flex_c flex_jb" @tap="getToTeaList">
             <view class="list_name">社区(人)</view>
-            <view class="list_text">{{ allChaYou || 0 }}</view>
+            <view class="list_text f_dinB">{{ allChaYou || 0 }}</view>
           </view>
         </view>
-        <view class="acc_hint mar_t50" @tap="SetHint"
-          >如何快速晋升身份权益？看这里>></view
-        >
+        <view class="acc_hint mar_t50" @tap="SetHint">如何快速晋升身份权益？看这里>></view>
       </view>
       <!-- 账户信息-end -->
     </view>
-
     <!-- 功能列表 -->
     <view class="fun_container">
       <view class="fun mar_t30">
         <view class="fun_title">我的账户</view>
         <view class="fun_con mar_t50 flex_r flex_ac flex_jb">
           <!-- <navigator class="fun_list flex_c flex_ac" url="/pages/top-up/index" hover-class="none">
-						<image class="fun_img" src="/static/my/recharge.png" mode=""></image>
-						<view class="fun_text">充值</view>
-					</navigator> -->
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/account/wealth"
-            hover-class="none"
-          >
+            <image class="fun_img" src="/static/my/recharge.png" mode=""></image>
+            <view class="fun_text">充值</view>
+          </navigator> -->
+          <navigator class="fun_list flex_c flex_ac" url="/pages/account/wealth" hover-class="none">
             <image class="fun_img" src="/static/my/wealth.png" mode=""></image>
             <view class="fun_text">财富</view>
           </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/account/consignment"
-            hover-class="none"
-          >
+          <navigator class="fun_list flex_c flex_ac" url="/pages/account/consignment" hover-class="none">
             <image class="fun_img" src="/static/my/consign.png" mode=""></image>
             <view class="fun_text">寄售</view>
           </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/account/giveAsPresent"
-            hover-class="none"
-          >
+          <navigator class="fun_list flex_c flex_ac" url="/pages/account/giveAsPresent" hover-class="none">
             <image class="fun_img" src="/static/my/give.png" mode=""></image>
             <view class="fun_text">赠送</view>
           </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pagesB/my/assistant"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/assistant.png"
-              mode=""
-            ></image>
+          <navigator class="fun_list flex_c flex_ac" url="/pagesB/my/assistant" hover-class="none">
+            <image class="fun_img" src="/static/my/assistant.png" mode=""></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 flex_jb">
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/my-pintuan/index"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/pintaun_icon.png"
-              mode=""
-            ></image>
-            <view class="fun_text">我的拼团</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/group-list/index"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/my_pintuan.png"
-              mode=""
-            ></image>
-            <view class="fun_text">发起拼团</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/group-order/index"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/dingdan_icon.png"
-              mode=""
-            ></image>
-            <view class="fun_text">拼团订单</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/acc-money-list/index"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/pintaunjin_icon.png"
-              mode=""
-            ></image>
-            <view class="fun_text">拼团金明细</view>
+          <navigator class="fun_list flex_c flex_ac" @click="getImgPage" hover-class="none">
+            <image class="fun_img" src="/static/my/sharePoster.png" mode=""></image>
+            <view class="fun_text">分享海报</view>
           </navigator>
         </view>
-      </view> -->
+      </view>
       <view class="fun mar_t30">
         <view class="fun_title">账户明细</view>
         <view class="fun_con mar_t50 flex_r flex_ac flex_jb">
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/accountDetails/running"
-            hover-class="none"
-          >
+          <navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/running" hover-class="none">
             <image class="fun_img" src="/static/my/fund.png" mode=""></image>
             <view class="fun_text">流水明细</view>
           </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/accountDetails/withdraw"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/withdraw.png"
-              mode=""
-            ></image>
+          <navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/withdraw" hover-class="none">
+            <image class="fun_img" src="/static/my/withdraw.png" mode=""></image>
             <view class="fun_text">提现明细</view>
           </navigator>
-          <!-- <navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/topup" hover-class="none">
-						<image class="fun_img" src="/static/my/topup.png" mode=""></image>
-						<view class="fun_text">充值明细</view>
-					</navigator> -->
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/accountDetails/integral"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/inte-list.png"
-              mode=""
-            ></image>
+          <!-- <navigator class="fun_list flex_c flex_ac" url="/pages/accountDetails/integral" hover-class="none">
+            <image class="fun_img" src="/static/my/inte-list.png" mode=""></image>
             <view class="fun_text">积分明细</view>
-          </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pagesB/invoice/invoiceList"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/assistantHistory.png"
-              mode=""
-            ></image>
+          </navigator> -->
+          <navigator class="fun_list flex_c flex_ac" url="/pagesB/invoice/invoiceList" hover-class="none">
+            <image class="fun_img" src="/static/my/assistantHistory.png" mode=""></image>
             <view class="fun_text">开票历史</view>
           </navigator>
         </view>
       </view>
       <view class="fun mar_t30">
-        <view class="fun_title flex_r flex_ac flex_jb"
-          >我的订单
-          <navigator
-            class="more flexr flex_ac"
-            url="/pages/szw-order-list/index?status=0"
-            hover-class="none"
-          >
+        <view class="fun_title flex_r flex_ac flex_jb">我的订单
+          <navigator class="more flexr flex_ac" url="/pages/szw-order-list/index?status=0" hover-class="none">
             全部订单
             <image class="more_img" src="/static/my/more.png" mode=""></image>
           </navigator>
         </view>
         <view class="fun_con mar_t50 flex_r flex_ac flex_jb">
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/szw-order-list/index?status=1"
-            hover-class="none"
-          >
+          <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=1" hover-class="none">
             <image class="fun_img" src="/static/my/payment.png" mode=""></image>
             <view class="fun_text">待付款</view>
           </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/szw-order-list/index?status=2"
-            hover-class="none"
-          >
+          <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=5" hover-class="none">
+            <image class="fun_img" src="/static/my/pickInStore.png" mode=""></image>
+            <view class="fun_text">待自提</view>
+          </navigator>
+          <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=2" hover-class="none">
             <image class="fun_img" src="/static/my/deliver.png" mode=""></image>
             <view class="fun_text">待发货</view>
           </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/szw-order-list/index?status=3"
-            hover-class="none"
-          >
+          <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=3" hover-class="none">
             <image class="fun_img" src="/static/my/take.png" mode=""></image>
             <view class="fun_text">待收货</view>
           </navigator>
-          <!-- <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=5"
-						hover-class="none">
-						<image class="fun_img" src="/static/my/evaluate.png" mode=""></image>
-						<view class="fun_text">待评价</view>
-					</navigator> -->
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/szw-order-list/index?status=4"
-            hover-class="none"
-          >
+          <navigator class="fun_list flex_c flex_ac" url="/pages/szw-order-list/index?status=4" hover-class="none">
             <image class="fun_img" src="/static/my/refund.png" mode=""></image>
-            <view class="fun_text">已收货</view>
+            <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 flex_jb">
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/about/index"
-            hover-class="none"
-          >
+          <navigator class="fun_list flex_c flex_ac" url="/pages/about/index" hover-class="none">
             <image class="fun_img" src="/static/my/about.png" mode=""></image>
             <view class="fun_text">关于我们</view>
           </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/notice/index"
-            hover-class="none"
-          >
-            <image
-              class="fun_img"
-              src="/static/my/feedback.png"
-              mode=""
-            ></image>
+          <navigator class="fun_list flex_c flex_ac" url="/pages/notice/index" hover-class="none">
+            <image class="fun_img" src="/static/my/feedback.png" mode=""></image>
             <view class="fun_text">用户须知</view>
           </navigator>
-          <navigator
-            class="fun_list flex_c flex_ac"
-            url="/pages/course/index"
-            hover-class="none"
-          >
+          <navigator class="fun_list flex_c flex_ac" url="/pages/course/index" hover-class="none">
             <image class="fun_img" src="/static/my/green.png" mode=""></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"
-                mode=""
-              ></image>
+            <button open-type="contact" style="background: #fff; border: 0; line-height: 1; padding: 0">
+              <image class="fun_img" src="/static/my/service.png" mode=""></image>
               <view class="fun_text">在线客服</view>
             </button>
           </view>
@@ -373,24 +181,17 @@
     </view>
     <view class="fz_w_text mar_t20 mar_b20">让数字经济赋能美好生活！</view>
     <!-- 功能列表-end -->
-
     <!-- 授权 -->
-    <authorize-module
-      v-if="showAuth"
-      :shopInfo="shopInfo"
-      @authGetTelSuccess="onauthGetTelSuccess"
-    />
+    <authorize-module v-if="showAuth" :shopInfo="shopInfo" @authGetTelSuccess="onauthGetTelSuccess" />
     <!-- 授权-end -->
   </view>
 </template>
-
 <script>
-let page = 1;
 let app = getApp();
 var appEv = app.$vm.$options;
-import authorizeModule from "@/components/authorize-module/index";
 import uniCopy from "@/utils/copy";
-import { get, post } from "@/request/api.js";
+import authorizeModule from "@/components/authorize-module/index";
+import { post } from "@/request/api.js";
 export default {
   components: {
     authorizeModule,
@@ -402,7 +203,7 @@ export default {
       shopInfo: {}, // 商铺信息
       userInfoAccount: {}, // 账户数据
       customerServiceWeiXin: "", // 客服微信
-      isShiMing: true,
+      isShiMing: true, //未实名提示弹窗
       agentName: "", // 缘起
       user_id: undefined,
       userinfo: undefined, // 获取用户信息
@@ -412,33 +213,30 @@ export default {
       // isGetUserInfo:false,
       invited: "",
 
-      updataUserimg: {},
-
       allChaYou: "",
+
+      isAuthentication: true, //是否开启实名模块
     };
   },
-  onLoad: function (options) {
+  created() {
+    this.isAuthentication = uni.getStorageSync("isAuthentication");
+  },
+  onLoad(options) {
     //推荐人ID
     if (options.invite) {
       app.globalData.agentId = options.invite;
       this.invited = options.invite;
     }
-    post("/my/chayou").then((res) => {
-      if (res.code === 0) {
-        this.allChaYou = res.data.data.below + res.data.data.lower_level;
-      }
-    });
+    this.closeAuto(); //关闭实名功能
+    this.getchayou(); //获取茶友
   },
-  onShow: function () {
+  onShow() {
     let token = uni.getStorageSync("token");
-
     this.userinfo = uni.getStorageSync("userinfo");
-    this.isShiMing = this.userinfo.is_authentication == 0 ? true : false;
 
     if (!token) {
       this.login();
-    }
-    if (token) {
+    } else {
       this.getuserInfo();
     }
   },
@@ -450,10 +248,10 @@ export default {
         success(res) {
           if (res.code) {
             // wx.request({
-            // 	url: `https://api.weixin.qq.com/sns/jscode2session?appid=wx8ebee994ea7c5af3&secret=f80039555c022bf0a805bed83358fa01&js_code=${res.code}&grant_type=authorization_code`,
-            // 	success:(res)=>{
-            // 		console.log(res);
-            // 	}
+            //  url: `https://api.weixin.qq.com/sns/jscode2session?appid=wx8ebee994ea7c5af3&secret=f80039555c022bf0a805bed83358fa01&js_code=${res.code}&grant_type=authorization_code`,
+            //  success:(res)=>{
+            //    console.log(res);
+            //  }
             // })
 
             post("appletLogin", {
@@ -467,7 +265,7 @@ export default {
                 } else {
                   that.unid = res.data.unid;
                   that.shopInfo = app.globalData.shopInfo;
-                  that.showAuth = true;
+                  that.showAuth = true; //调取授权弹窗
                 }
               }
             });
@@ -480,6 +278,7 @@ export default {
       this.goto("/pages/my/login");
       // #endif
     },
+    // 获取手机号
     onauthGetTelSuccess(da) {
       this.showAuth = false;
       post("getMobile", {
@@ -492,18 +291,19 @@ export default {
         }
       });
     },
+    // 获取userinfo
     getuserInfo() {
       post("/user/userinfo").then((res) => {
         if (res.code === 0) {
           uni.setStorageSync("userinfo", res.data.data);
           this.userinfo = res.data.data;
-          this.isShiMing = this.userinfo.is_authentication == 0 ? true : false;
+          if (this.isAuthentication) this.isShiMing = this.userinfo.is_authentication == 0;
+          else this.isShiMing = false;
         }
       });
     },
-
     //授权并登录
-    onAuthSuccess: function () {
+    onAuthSuccess() {
       var that = this;
       uni.showLoading({
         mask: true,
@@ -515,53 +315,42 @@ export default {
     },
     // 跳转到实名页面
     goToAutonym() {
-      // post('/user/isPayAuth').then(res => {
-      // 	if(res.code === 0){
-      // 		if(res.data.)
-      // 	}
-      // })
-      // return
-      uni.navigateTo({
-        url: "/pages/autonym-submit/index",
-      });
+      this.goto("/pages/autonym-submit/index")
     },
-    // 关闭实名信息
+    // 关闭实名信息 提示
     closeAuto() {
       this.isShiMing = false;
     },
     // 未开放提示信息
-    SetHint: function () {
+    SetHint() {
       uni.navigateTo({
         url: "/pages/tea-rule/index",
       });
     },
-
     // 跳转到分享页面
-    getImgPage: function () {
-      let that = this;
-      if (this.userinfo.is_authentication == 1) {
-        uni.navigateTo({
-          url: "/pages/invi-img/index",
-        });
+    getImgPage() {
+      if (this.isAuthentication) {
+        if (this.userinfo.is_authentication == 1) {
+          this.goto("/pages/invi-img/index")
+        } else {
+          appEv.errTips("您还未实名");
+          this.goToAutonym();
+        }
       } else {
-        appEv.errTips("您还未实名");
-        uni.navigateTo({
-          url: "/pages/autonym-submit/index",
-        });
+        this.goto("/pages/invi-img/index")
       }
     },
     // 跳转到提现页面
-    getToCash: function () {
-      let that = this;
-      if (this.userinfo.is_authentication == 1) {
-        uni.navigateTo({
-          url: "/pages/cash/index",
-        });
+    getToCash() {
+      if (this.isAuthentication) {
+        if (this.userinfo.is_authentication == 1) {
+          this.goto("/pages/cash/index")
+        } else {
+          appEv.errTips("您还未实名");
+          this.goToAutonym();
+        }
       } else {
-        appEv.errTips("您还未实名");
-        uni.navigateTo({
-          url: "/pages/autonym-submit/index",
-        });
+        this.goto("/pages/cash/index")
       }
     },
     // 复制账号
@@ -573,38 +362,37 @@ export default {
       });
     },
     // 跳转到用户设置页面
-    getToSetting: function () {
+    getToSetting: function() {
       uni.navigateTo({
         url: "/pages/setting/index",
       });
     },
     // 跳转到我的茶友页面
-    getToTeaList: function () {
+    getToTeaList: function() {
       uni.navigateTo({
         url: "/pages/my-tea-list/index",
       });
     },
     // 跳转到拼豆页面
-    getToBean: function () {
+    getToBean: function() {
       uni.navigateTo({
         url: "/pages/bean-info/index",
       });
     },
     // 跳转到拼团金页面
-    getToAccMoney: function () {
+    getToAccMoney: function() {
       uni.navigateTo({
         url: "/pages/my-acc-money/my-acc-money",
       });
     },
-
     // 更换头像
     upheadimg() {
       let that = this;
       uni.chooseImage({
         count: 1, // 最多可以选择的图片张数，默认9
-        sizeType: ["compressed"], // original 原图，compressed 压缩图，默认二者都有
+        sizeType: ["original"], // original 原图，compressed 压缩图，默认二者都有
         sourceType: ["album", "camera"], // album 从相册选图，camera 使用相机，默认二者都有
-        success: function (res) {
+        success: function(res) {
           var arr = res.tempFiles;
           that.$up(arr[0].path).then((res) => {
             post("user/setup", {
@@ -618,10 +406,17 @@ export default {
         },
       });
     },
+    // 获取茶友
+    getchayou() {
+      post("my/chayou").then((res) => {
+        if (res.code === 0) {
+          this.allChaYou = res.data.data.below + res.data.data.lower_level;
+        }
+      });
+    }
   },
 };
 </script>
-
 <style lang="scss">
 // 页面配置
 page {
@@ -649,16 +444,6 @@ page {
   width: 26rpx;
 }
 
-.sj_icon {
-  position: absolute;
-  top: 100%;
-  left: 60rpx;
-  border-top: 16rpx solid rgba(0, 0, 0, 0.8);
-  border-right: 16rpx solid transparent;
-  border-left: 16rpx solid transparent;
-  border-bottom: 0;
-}
-
 .coupon_info {
   position: absolute;
   top: -70rpx;
@@ -757,6 +542,7 @@ page {
   width: 140rpx;
   text-align: right;
 }
+
 // 用户信息-end
 
 // 账户信息
@@ -765,11 +551,18 @@ page {
   overflow: hidden;
 }
 
-.acc_price {
+.acc_price .price_txt {
   font-size: 24rpx;
   color: #fff;
 }
 
+.acc_price .price_num {
+  font-size: 50rpx;
+  color: #fff;
+  // font-weight: bold;
+  // font-family: "SourceHanSansSC-Bold";
+}
+
 .info_list:nth-child(1) {
   padding-left: 0;
 }
@@ -779,6 +572,13 @@ page {
   color: #ffffff;
 }
 
+.list_text {
+  font-size: 36rpx;
+  color: #fff;
+  // font-family: "SourceHanSansSC-Bold";
+  // font-weight: bold;
+}
+
 .info_list:nth-last-child(1) {
   border-right: 0;
 }
@@ -786,7 +586,7 @@ page {
 .info_con {
   width: 100%;
   overflow: hidden;
-  margin-top: 60rpx;
+  margin-top: 40rpx;
 }
 
 .acc_hint {
@@ -796,20 +596,6 @@ page {
   color: #fff;
 }
 
-.acc_price text {
-  font-size: 46rpx;
-  font-family: "SourceHanSansSC-Bold";
-  color: #fff;
-}
-
-.list_text {
-  font-size: 34rpx;
-  font-size: 34rpx;
-  font-family: "SourceHanSansSC-Bold";
-  font-weight: bold;
-  color: #fff;
-}
-
 .info_list {
   width: calc(100% / 3);
   height: 78rpx;
@@ -844,11 +630,11 @@ page {
   width: 100%;
   overflow: hidden;
   background: url("~@/static/my/myBack.png") no-repeat;
+  background-size: 100% 100%;
   border-radius: 16rpx;
   padding: 30rpx;
   box-sizing: border-box;
   margin-top: 50rpx;
-  background-size: 100% 100%;
 }
 
 // 账户信息-end
@@ -915,11 +701,13 @@ page {
   box-sizing: border-box;
   border-radius: 6rpx;
   overflow: hidden;
+
   .level_img,
   .level_text {
     // vertical-align: middle;
     float: left;
   }
+
   .level_text {
     font-size: 28rpx;
     margin-left: 12rpx;
@@ -927,4 +715,4 @@ page {
 }
 
 // 功能列表-end
-</style>
+</style>

src/pages/my/login.vue

@@ -27,7 +27,7 @@
             </view>
         </view>
         <view @click="login" :class="{bagBtn:true,corg:ISFill}">登录</view>
-        <view class="btnTxt" @click="signIn = !signIn">立即注册</view>
+        <view class="btnTxt" @click="signIn = !signIn">{{ signIn ? "老用户登录" : "还没有账号"}}</view>
         <!-- <view class="btnTxt" @click="LoginType = LoginType == 1 ? 0 : 1">
       {{ LoginType == 1 ? "密码登录" : "验证码登录" }}
     </view> -->
@@ -36,7 +36,7 @@
 <script>
 let app = getApp();
 var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 export default {
     name: "login",
     data() {

src/pages/my/userinfo.vue

@@ -14,7 +14,7 @@
 <script>
 let app = getApp();
 let appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 export default {
     data() {
         return {

src/pages/partner/index.vue

@@ -4,7 +4,7 @@
   </div>
 </template>
 <script>
-import { get, post } from '@/request/api.js';
+import { post } from '@/request/api.js';
 export default {
   name: 'partner',
   data () {

src/pages/product/p_details.vue

@@ -28,7 +28,7 @@
       <view v-else class="price" :class="type == 2 ? 'samll' : ''">
         <view>
           <text class="p_favour" v-if="(type == 2)"
-            >￥{{ detail.trade_price }}  + {{detail.trade_num}}批发积分 + {{detail.treasure_price}}茶宝</text
+            >￥{{ detail.trade_price }}  + {{detail.trade_num}}批发券 + {{detail.treasure_price}}茶宝</text
           >
 		  <view v-if="type == 6">
 			  <text class="un_p_favour">￥{{
@@ -48,7 +48,7 @@
             ￥{{detail.cost_price}} + {{detail.treasure_price}}茶宝
           </text>
         </view>
-        <span class="p_trade" v-if="(type == 1)">送 {{detail.trade_give_num}} 批发积分</span>
+        <span class="p_trade" v-if="(type == 1)">送 {{detail.trade_give_num}} 批发券</span>
         <span class="p_trade" v-if="(type == 3 || type == 4)">送 {{detail.give_cha_bao}} 茶宝</span>
       </view>
       <view class="price_span flex_r flex_ac flex_je">
@@ -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 -->
@@ -108,7 +115,7 @@
           <view class="goods_con flex_c flex_jb">
             <view class="shop_names">{{ detail.goods_name }}</view>
             <view class="goods_msg" v-if="type == 2"
-              >{{ detail.trade_price }}元+{{ detail.trade_num }}批发积分+{{
+              >{{ detail.trade_price }}元+{{ detail.trade_num }}批发券+{{
                 detail.treasure_price
               }}茶宝</view
             >
@@ -186,7 +193,7 @@
 let page = 1;
 let app = getApp();
 var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 import uniPopup from "@/components/uni-popup/uni-popup.vue";
 import jyfParser from "@/components/jyf-parser/jyf-parser.vue";
 import swiperBanner from "@/components/swiperBanner";
@@ -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)">赠<text class="corFE2C15">{{ i.give_cha_bao }}</text>茶宝</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)">限时赠送<text class="corFE2C15">{{ i.teac }}</text>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>
@@ -27,7 +34,7 @@
 let page = 1;
 let app = getApp();
 var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 import uniPopup from '@/components/uni-popup/uni-popup.vue'
 import notGoods from "@/components/not-goods/index.vue";
 export default {
@@ -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/product/productTeaBaby.vue

@@ -22,7 +22,7 @@
 let page = 1;
 let app = getApp();
 var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 export default {
     data() {
         return {

src/pages/product/productWholesale.vue

@@ -5,7 +5,7 @@
             <image class="list_img" :src="item.original_img"></image>
             <view class="list_info flex_c flex_jb">
                 <view class="info_name">{{item.goods_name}}</view>
-                <view class="info_msg">{{item.price}}元+{{item.trade_num}}批发积分+{{item.cha_bao}}茶宝</view>
+                <view class="info_msg">{{item.price}}元+{{item.trade_num}}批发券+{{item.cha_bao}}茶宝</view>
                 <view class="info_btn_con flex_r flex_je">
                     <view class="info_btn flex_r flex_ac flex_jc">购买</view>
                 </view>
@@ -18,7 +18,7 @@
 let page = 1;
 let app = getApp();
 var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 export default {
     data() {
         return {

src/pages/protocol/index.vue

@@ -18,7 +18,7 @@
 
 <script>
 import jyfParser from '@/components/jyf-parser/jyf-parser.vue'
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 	export default {
 		components:{
 			jyfParser

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)">赠<text class="corFE2C15">{{ i.give_cha_bao }}</text>茶宝</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)">限时赠送<text class="corFE2C15">{{ i.teac }}</text>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>
@@ -97,7 +73,7 @@ let page = 1;
 let app = getApp();
 var appEv = app.$vm.$options;
 import uniPopup from "@/components/uni-popup/uni-popup";
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 export default {
   components: { uniPopup },
   data() {
@@ -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/speed-up/index.vue

@@ -69,7 +69,7 @@ let tim
 let page = 1;
 let app=getApp();
 var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 import cmdProgress from "@/components/cmd-progress/cmd-progress.vue"
 	export default {
 		components: {cmdProgress},

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

@@ -25,10 +25,9 @@
                     <view class="addr-text">{{ orderInfo.address }}</view>
                 </view>
             </view>
-            <!-- <view class="logistics_btn" v-if="orderInfo.logistics && orderInfo.logistics.logistics_no && orderInfo.logistics.logistics_business" @tap="goLogistics">
-                <view class="l_box" v-if="orderInfo.logistics.statusMsg && orderInfo.logistics.statusMsg != ''">{{ orderInfo.logistics.statusMsg }}</view>
-                <view class="l_box" v-else>已发货：{{ orderInfo.logistics.logistics_business }}，快递单号：{{ orderInfo.logistics.logistics_no }}</view>
-            </view> -->
+            <view class="logistics_btn" v-if="[1].includes(orderInfo.order_status)" @tap="goLogistics">
+                <view class="l_box">已发货：{{ orderInfo.shipping_name }}，快递单号：{{ orderInfo.shipping_code }}</view>
+            </view>
 
             <view class="goods-list">
                 <view class="goods-info_box">
@@ -62,7 +61,7 @@
                 <view class="li_box" v-if="orderInfo.total_amount">商品合计：
                     <view class="info_data">{{ orderInfo.total_amount }}</view>
                 </view>
-                <!-- <view class="li_box" v-if="orderInfo.orderTypes == 2">批发积分：
+                <!-- <view class="li_box" v-if="orderInfo.orderTypes == 2">批发券：
                     <view class="info_data">{{ orderInfo.totalPfInt }}</view>
                 </view> -->
                 <!-- <view class="li_box" v-if="orderInfo.orderTypes == 2">茶宝：
@@ -75,14 +74,11 @@
                     <template v-if="orderInfo.order_status != 5">
                         <view class="btn cancel-btn" @tap="toCancel" v-if="[0,1].includes(orderInfo.order_status)">取消订单</view>
                         <view class="btn topay-btn" @tap="toPay" v-if="[0,2].includes(orderInfo.pay_status)">立即支付</view>
-                        <view class="btn topay-btn" @tap="toTake" v-if="[0, 1,7].includes(orderInfo.order_status)&&[1].includes(orderInfo.pay_status)">确认收货</view>
-                                        <view
-                class="btn topay-btn"
-                @tap="toCode(orderInfo)"
-                v-if="
-                  [8].includes(orderInfo.order_status)
-                "
-                >待自提</view>
+                        <view class="btn topay-btn" @tap="toTake" v-if="[0,1,7].includes(orderInfo.order_status)&&[1].includes(orderInfo.pay_status)">确认收货</view>
+                        <view class="btn topay-btn" @tap="toCode(orderInfo)" v-if="[8].includes(orderInfo.order_status)">待自提</view>
+                    </template>
+                    <template v-else>
+                        <view class="btn cancel-btn" @tap="removeItem">删除</view>
                     </template>
                     <view class="btn cancel-btn" @tap="goBack">返回</view>
                 </view>
@@ -93,7 +89,7 @@
 <script>
 // var toPayOpre = new ToPayOpre();
 var utils = require("@/utils/utils.js");
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 var app = getApp();
 var appEv = app.$vm.$options;
 export default {
@@ -262,11 +258,34 @@ export default {
 
         // 跳转物流详情
         goLogistics() {
-            uni.navigateTo({
-                url: "/pages/logistics/index?id=" +
-                    this.orderInfo.orderDetail.orderDetaillId,
-            });
+            // uni.navigateTo({
+            //     url: "/pages/logistics/index?id=" +
+            //         this.orderInfo.orderDetail.orderDetaillId,
+            // });
         },
+
+        removeItem(){
+            let that = this;
+            uni.showModal({
+                content: "亲，确认删除本订单吗？",
+                confirmText: "确认删除",
+                confirmColor: "#fa2f2e",
+                cancelText: "取消",
+                cancelColor: "#bbb",
+                success(res) {
+                    if (res.confirm) {
+                        post("my/orderDel", {
+                            order_id: that.order_id,
+                        }).then(res => {
+                            if (res.code === 0) {
+                                appEv.errTips(res.msg);
+                                that.goBack();
+                            }
+                        });
+                    }
+                },
+            });
+        }
     },
     computed: {
         tidyStatus() {

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

@@ -2,91 +2,44 @@
   <view class="container">
     <view class="status-box">
       <view class="status_tap_box" style="position: relative">
-        <view
-          @tap="statusTap"
-          class="status-label"
-          v-for="(item, index) in statusType"
-          :key="index"
-          :class="item[0] == currentType ? 'active' : ''"
-          :data-index="item[0]"
-        >
-          {{ item[1] }}
-        </view>
+        <view @tap="statusTap" class="status-label" v-for="(item, index) in statusType" :key="index" :class="item[0] == currentType ? 'active' : ''" :data-index="item[0]">{{ item[1] }}</view>
       </view>
     </view>
     <not-goods v-if="haveGoods" textStr="抱歉！暂无相关订单" />
     <view class="order-list" v-if="orderList && orderList.length > 0">
       <view v-for="(li, index) in orderList" :key="index">
-        <!-- 未付款 -->
         <view class="a-order">
           <view class="overflow" :data-id="li.id">
             <view class="list-title flex_r flex_ac flex_jb ellipsis">
-              <view :class="['fz_text', 'typetag', 'tagcolor' + li.type]">{{
-                tidyTpye(li.type)
-              }}</view>
-              <view class="fz_text">{{
-                tidyStatus([li.pay_status, li.order_status])
-              }}</view>
+              <view :class="['fz_text', 'typetag', 'tagcolor' + li.type]">{{ tidyTpye(li.type) }}</view>
+              <view class="fz_text">{{ tidyStatus([li.pay_status, li.order_status]) }}</view>
             </view>
-            <view
-              class="goods-info flex_r flex_ac flex_jb"
-              :data-type="li.type"
-              @tap="toDetails(li)"
-            >
+            <view class="goods-info flex_r flex_ac flex_jb" :data-type="li.type" @tap="toDetails(li)">
               <view class="goods-info-bar overflow flex_r flex_ac">
                 <view class="imgs_bar img-box">
-                  <image
-                    :src="li.original_img"
-                    mode="cover"
-                    class="goods-img"
-                  ></image>
+                  <image :src="li.original_img" mode="cover" class="goods-img"></image>
                 </view>
-                <view class="goods_name ellipsis2">{{
-                  li.goods_name || ""
-                }}</view>
+                <view class="goods_name ellipsis2">{{ li.goods_name || "" }}</view>
               </view>
               <view class="goodsDetail_info">
-                <view class="goods_price r_color"
-                  >￥<text class="r_color">{{ li.total_amount }}</text></view
-                >
+                <view class="goods_price r_color">￥<text class="r_color">{{ li.total_amount }}</text></view>
                 <view class="unimport">共{{ li.goods_num }}件</view>
               </view>
             </view>
           </view>
           <view class="price-box flex_r flex_ac">
             <template v-if="li.order_status != 5">
-              <view
-                class="btn cancel-btn"
-                v-if="[0, 1].includes(li.order_status)"
-                @tap="toCancel(li)"
-                >取消订单</view
-              >
-              <view
-                class="btn topay-btn"
-                v-if="[0, 2].includes(li.pay_status)"
-                @tap="toPay(li)"
-                >立即支付</view
-              >
-              <view
-                class="btn topay-btn"
-                @tap="toTake(li)"
-                v-if="
-                  [0, 1, 7].includes(li.order_status) &&
-                  [1].includes(li.pay_status)
-                "
-                >确认收货</view>
-                <view
-                class="btn topay-btn"
-                @tap="toCode(li)"
-                v-if="
-                  [8].includes(li.order_status)
-                "
-                >待自提</view>
+              <view class="btn cancel-btn" v-if="[0].includes(li.order_status)" @tap="toCancel(li)">取消订单</view>
+              <view class="btn topay-btn" v-if="[0,2].includes(li.pay_status)" @tap="toPay(li)">立即支付</view>
+              <view class="btn topay-btn" @tap="toTake(li)" v-if="[0,1,7].includes(li.order_status) && [1].includes(li.pay_status)">确认收货</view>
+              <view class="btn topay-btn" @tap="toCode(li)" v-if="[8].includes(li.order_status)">待自提</view>
+            </template>
+            <template v-else>
+              <view class="btn cancel-btn" @tap="removeItem(li.order_id)">删除</view>
             </template>
             <view class="btn cancel-btn" @click="toDetails(li)">查看订单</view>
           </view>
         </view>
-        <!-- 未付款 end -->
       </view>
     </view>
     <view class="loading-indicator opacity">{{ loadingTip }}</view>
@@ -97,7 +50,7 @@ var page = 1;
 var app = getApp();
 var appEv = app.$vm.$options;
 import notGoods from "@/components/not-goods/index";
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 import { ToPayOpre } from "@/utils/reqTools.js";
 var toPayOpre = new ToPayOpre();
 export default {
@@ -110,9 +63,10 @@ export default {
       statusType: [
         ["0", "全部"],
         ["1", "待付款"],
+        ["5", "待自提"],
         ["2", "待发货"],
         ["3", "待收货"],
-        ["4", "已收货"],
+        ["4", "已完成"],
       ],
       orderList: [],
       currentType: "0",
@@ -232,8 +186,7 @@ export default {
     toTake(e) {
       let that = this;
       uni.showModal({
-        content:
-          "亲，“确定收货”代表着本订单的交付流程已经完成，不再支持任何形式的退换货。",
+        content: "亲，“确定收货”代表着本订单的交付流程已经完成，不再支持任何形式的退换货。",
         confirmText: "确认收货",
         confirmColor: "#fa2f2e",
         cancelText: "取消",
@@ -252,7 +205,7 @@ export default {
         },
       });
     },
-    toCode(e){
+    toCode(e) {
       this.goto("/pagesB/order/verificationCode", { id: e.order_id });
     },
     //菜单切换
@@ -262,6 +215,30 @@ export default {
       this.currentType = curType;
       this.clearData(false, this.loadData);
     },
+
+    //删除订单
+    removeItem(order_id){
+      let that = this;
+      uni.showModal({
+        content: "亲，确认删除本订单吗？",
+        confirmText: "确认删除",
+        confirmColor: "#fa2f2e",
+        cancelText: "取消",
+        cancelColor: "#bbb",
+        success(res) {
+          if (res.confirm) {
+            post("my/orderDel", {
+              order_id
+            }).then(res => {
+                if (res.code === 0) {
+                  appEv.errTips(res.msg);
+                  that.loadData();
+                }
+            });
+          }
+        },
+      });
+    }
   },
   computed: {
     // 0  支付状态   1 订单状态
@@ -289,7 +266,7 @@ export default {
           case 2:
             return "批发专区";
           case 3:
-            return "精品专区";
+            return "精品优选";
           case 4:
             return "今日值得买";
           case 5:
@@ -599,22 +576,27 @@ page {
   font-size: 22rpx;
   font-weight: 500;
 }
+
 .tagcolor1 {
   border-color: #007aff;
   color: #007aff;
 }
+
 .tagcolor2 {
   border-color: #4cd964;
   color: #4cd964;
 }
+
 .tagcolor3 {
   border-color: #f0ad4e;
   color: #f0ad4e;
 }
+
 .tagcolor4 {
   border-color: #dd524d;
   color: #dd524d;
 }
+
 .tagcolor5 {
   border-color: #4335d6;
   color: #4335d6;

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

@@ -44,7 +44,7 @@
         <view class="goods_con flex_c flex_jc flex_jb">
           <view class="goods_name ellipsis2">{{ goodsInfo.goods_name }}</view>
           <view class="goods_msg" v-if="Data.type == 2"
-            >{{ goodsInfo.trade_price }}元+{{ goodsInfo.trade_num }}批发积分+{{
+            >{{ goodsInfo.trade_price }}元+{{ goodsInfo.trade_num }}批发券+{{
               goodsInfo.treasure_price
             }}茶宝</view
           >
@@ -84,11 +84,11 @@
       </view>
       <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type == 2">
         <view class="flex_r flex_ac">
-          <view class="list_name">批发积分</view>
+          <view class="list_name">批发券</view>
           <view class="list_con p_color">(可用{{ userinfo.integral }})</view>
         </view>
         <view class="list_con"
-          >{{ $h.Mul(goodsInfo.trade_num, Data.num) }} 批发积分</view
+          >{{ $h.Mul(goodsInfo.trade_num, Data.num) }} 批发券</view
         >
       </view>
       <view class="order_list flex_r flex_ac flex_jb" v-if="Data.type != 5">
@@ -104,7 +104,7 @@
       </view>
       <view
         class="order_list flex_r flex_ac flex_jb"
-        v-if="Data.type != 4 && Data.type != 5"
+        v-if="['1','2','3'].includes(Data.type)"
       >
         <view class="list_name">可用余额</view>
         <view class="list_con p_color">￥{{ userinfo.user_money }}</view>
@@ -129,7 +129,7 @@
 let page = 1;
 let app = getApp();
 var appEv = app.$vm.$options;
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 import { ToPayOpre } from "@/utils/reqTools.js";
 let toPayOpre = new ToPayOpre();
 import userAddress from "pages/xghc-addrress/userAddress";
@@ -171,20 +171,14 @@ export default {
             if (res.code === 0) this.freight = res.data.freight;
 
             // 计算待支付
-            let p =
-              this.Data.type == 2
-                ? this.goodsInfo.trade_price
-                : this.goodsInfo.cost_price; //商品单价
-            let y = this.Data.is_sell == 1 ? 0 : this.freight; // 运费   寄售的话退运费为0
-            if(this.Data.prom_type == "1"){
-              y = 0
-            }
-            let a = (p * this.Data.num + y * this.Data.num) * 100; //商品总价
-            let b = (a - this.userinfo.user_money * 100) / 100; //待支付金额
-            if (["4", "6"].includes(this.Data.type)) this.obligation = a / 100;
-            else if (this.Data.type == 5) {
-              this.obligation = a / 100;
-            } else this.obligation = b > 0 ? b : 0;
+            let p = this.Data.type == 2 ? this.goodsInfo.trade_price : this.goodsInfo.cost_price; //商品单价
+            let y = (this.Data.is_sell == 1 || this.Data.prom_type == 1) ? 0 : this.freight; // 运费   寄售的话退运费为0
+            // let a = p * this.Data.num + y * this.Data.num; //商品总价
+            // let b = a - this.userinfo.user_money; //待支付金额
+            let a = this.$h.Mul(p,this.Data.num) + this.$h.Mul(y,this.Data.num); //商品总价
+            let b = this.$h.Sub(a,this.userinfo.user_money); //待支付金额
+            if (["4", "5", "6"].includes(this.Data.type)) this.obligation = a;
+            else this.obligation = b > 0 ? b : 0;
           });
         }
       });

src/pages/top-up/index.vue

@@ -120,7 +120,7 @@ let app = getApp();
 var appEv = app.$vm.$options;
 import { ToPayOpre } from "@/utils/reqTools.js";
 var toPayOpre = new ToPayOpre();
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 export default {
   data() {
     return {

src/pages/xghc-addrress/userAddress.vue

@@ -85,7 +85,7 @@
     </uni-popup>
 </template>
 <script>
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 import AddressParse from './zh-address-parse.min.js'
 let app = getApp();
 var appEv = app.$vm.$options;

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/pagesB/invoice/Billingresult.vue

@@ -34,7 +34,7 @@
   </div>
 </template>
 <script>
-import { get, post } from '@/request/api.js';
+import { post } from '@/request/api.js';
 let app=getApp();
 var appEv = app.$vm.$options;
 export default {

src/pagesB/invoice/editinvoice.vue

@@ -114,7 +114,7 @@
 </template>
 <script>
 import uniPopup from "@/components/uni-popup/uni-popup.vue";
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 let app = getApp();
 var appEv = app.$vm.$options;
 export default {

src/pagesB/invoice/invoiceList.vue

@@ -17,7 +17,7 @@
   </div>
 </template>
 <script>
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 var app = getApp();
 var appEv = app.$vm.$options;
 export default {

src/pagesB/my/assistant.vue

@@ -58,7 +58,7 @@
   </div>
 </template>
 <script>
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 var app = getApp();
 var appEv = app.$vm.$options;
 export default {

src/pagesB/order/verificationCode.vue

@@ -18,7 +18,7 @@
 </template>
 
 <script>
-import { get, post } from "@/request/api.js";
+import { post } from "@/request/api.js";
 var app = getApp();
 var appEv = app.$vm.$options;
 import uqcode from "@/components/uqrcode/uqrcode.vue";

src/pagesB/test/index.vue

@@ -2,7 +2,7 @@
   <div class='test'>test</div>
 </template>
 <script>
-import { get, post } from '@/request/api.js';
+import { post } from '@/request/api.js';
 export default {
   name: 'test',
   data () {

src/request/config.js

@@ -13,6 +13,7 @@ if(process.env.UNI_PLATFORM==="h5"){
 export default apis==1?{
 	Hhost: "https://shop-api.haocha13.cn/v1/",
 }:{
+	// Hhost: "https://shop-api.haocha13.cn/v1/",  //正式接口
 	Hhost: "https://test-api.haocha13.cn/v1/",
-	// Hhost: "https://shop-api.haocha13.cn/v1/",
+	// Hhost: "https://tea-api.otcpay12.top/v1/",
 }

src/static/font/DIN/din.css

@@ -0,0 +1,36 @@
+@font-face {
+  font-family: 'dinM';
+  src: local('dinM'), url(./DIN-Medium.otf) format('opentype');
+}
+@font-face {
+  font-family: 'dinB';
+  src: local('dinB'), url(./DIN-Bold.otf) format('opentype');
+}
+
+.f_din {
+  font-family: "dinM" !important;
+  /* font-size: 12px; */
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.f_dinB {
+  font-family: "dinB" !important;
+  /* font-size: 12px; */
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* 
+100 - Thin
+200 - Extra Light (Ultra Light)
+300 - Light
+400 - Regular (Normal、Book、Roman)
+500 - Medium
+600 - Semi Bold (Demi Bold)
+700 - Bold
+800 - Extra Bold (Ultra Bold)
+900 - Black (Heavy)
+*/

src/utils/myfun.js

@@ -1,7 +1,7 @@
 // 返回两个日期之间的月份
 export function getDiffDate(minDate, maxDate) {
-  let startDate = new Date(minDate.replace(/-/g,'/'));
-  let endDate = new Date(maxDate.replace(/-/g,'/'));
+  let startDate = new Date(minDate.replace(/-/g, '/'));
+  let endDate = new Date(maxDate.replace(/-/g, '/'));
   let months = [];
   //把时间的天数都设置成当前月第一天
   startDate.setDate(1)
@@ -22,7 +22,9 @@ export function getDiffDate(minDate, maxDate) {
   return months;
 }
 
-export function times(date, ym, txt) {
+// 时间格式化
+export function times(date, ym) {
+  date = new Date(date.replace(/-/g, '/'));
   var y = date.getFullYear();
   var m = date.getMonth() + 1;
   m = m < 10 ? "0" + m : m;
@@ -34,24 +36,14 @@ export function times(date, ym, txt) {
   minute = minute < 10 ? "0" + minute : minute;
   var second = date.getSeconds();
   second = second < 10 ? "0" + second : second;
-  if(txt === 1){
-    if (ym === "mds") {
-      return m + "月" + d + "日 " + h + ":" + minute;
-    }
-  } else if(txt === 2){
-    if (ym === "ymds") {
-      return y + "." + m + "." + d + " " + h + ":" + minute;
-    }
-  } else {
-    if (ym == "ym") {
-      return y + "-" + m;
-    }
-    else if (ym == "ymd") {
-      return y + "-" + m + "-" + d;
-    }
-    else if (ym == "ymds") {
-      return y + "-" + m + "-" + d + " " + h + ":" + minute + ":" + second;
-    }
+  if (ym == "ym") {
+    return y + "-" + m;
+  }
+  else if (ym == "ymd") {
+    return y + "-" + m + "-" + d;
+  }
+  else if (ym == "ymds") {
+    return y + "-" + m + "-" + d + " " + h + ":" + minute + ":" + second;
   }
 }
 
@@ -67,12 +59,12 @@ export function RtoH(color) {
 }
 // 将hex颜色转成rgb
 export function HtoR(hex, opacity) {
-  var RGBA = "rgba(" + parseInt("0x" + hex.slice(1, 3)) + "," + parseInt("0x" + hex.slice(3, 5)) + "," + parseInt( "0x" + hex.slice(5, 7)) + "," + opacity + ")";
+  var RGBA = "rgba(" + parseInt("0x" + hex.slice(1, 3)) + "," + parseInt("0x" + hex.slice(3, 5)) + "," + parseInt("0x" + hex.slice(5, 7)) + "," + opacity + ")";
   // return { red: parseInt("0x" + hex.slice(1, 3)), green: parseInt("0x" + hex.slice(3, 5)), blue: parseInt("0x" + hex.slice(5, 7)), rgba: RGBA }
   return RGBA;
 }
 
-  // 189 **** 0222
+// 189 **** 0222
 export function phoneNumA(value) {
   if (value && value.length > 8) {
     return `${value.substring(0, 3)} ${"*".repeat(value.length - 7).replace(/(.{4})/g, "$1 ")}${value.length % 4 ? " " : ""}${value.slice(-4)}`;
@@ -80,12 +72,12 @@ export function phoneNumA(value) {
   return value;
 }
 
-//$goto
+// goto
 export function goto(url, json) {
   let params = "";
-  if(json){
+  if (json) {
     params = [];
-    let da = Object.keys(json).map(function(key) {
+    let da = Object.keys(json).map(function (key) {
       if (json[key]) return encodeURIComponent(key) + "=" + encodeURIComponent(json[key]);
     });
     da.forEach(e => {
@@ -96,4 +88,17 @@ export function goto(url, json) {
   uni.navigateTo({
     url: url + '?' + params
   });
+}
+
+// tidyTpye
+export function tidyTpye(va) {
+  switch (va) {
+    case '1': return "零售专区";
+    case '2': return "批发专区";
+    case '3': return "精品优选";
+    case '4': return "今日值得买";
+    case '5': return "茶宝兑换";
+    case '6': return "天天捡漏";
+    default: return ""
+  }
 }

src/utils/run_now.js

@@ -0,0 +1,7 @@
+import { post } from "@/request/api.js";
+// 此执行为获取实名认证的开关状态
+post('isAuthentication').then(res => {
+    if (res.code === 0) {
+        uni.setStorageSync("isAuthentication", res.data.data);
+    }
+})