DaMoWang 2 年 前
コミット
e2790eb638

+ 4 - 0
src/app.scss

@@ -113,4 +113,8 @@ uni-input {
 .noticeBar .uni-noticebar{
     margin: 0 !important;
     padding: 0 !important;
+}
+
+.corFE2C15{
+    color: #FE2C15 !important;
 }

+ 2 - 2
src/pages.json

@@ -327,8 +327,8 @@
 	// 	}
 	// },
 	"tabBar": {
-		"color": "#505050",
-		"selectedColor": "#12B280",
+		"color": "#FE2C15",
+		"selectedColor": "#FCB736",
 		"borderStyle": "black",
 		"backgroundColor": "#ffffff",
 		"list": [

+ 115 - 66
src/pages/account/wealth.vue

@@ -1,77 +1,126 @@
 <template>
-	<view class="container">
-		<!-- 财富列表 -->
-		<view class="con flex_r flex_ac mar_t16">
-			<view class="list flex_c flex_ac"  @click="goAccMoney">
-				<view class="list_name">余额</view>
-				<view class="list_text flex_r flex_ae">{{userinfo.user_money}}</view>
-			</view>
-		</view>
-		
-		<view class="con flex_r flex_ac flex_jb mar_t16">
-			<view class="list flex_c flex_ac"  @click="goDetail">
-				<view class="list_name">茶宝</view>
-				<view class="list_text flex_r flex_ae">{{userinfo.cha_bao}}</view>
-			</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 class="list flex_c flex_ac"  @click="goto('/pagesB/accountDetails/TeaC')">
-				<view class="list_name">TeaC</view>
-				<view class="list_text flex_r flex_ae">{{userinfo.teac}}</view>
-			</view>
-		</view>
-		
-		
-	</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>
 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'
-			})
-		}
-	}
-}
+  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>

+ 2 - 2
src/pages/index/index.vue

@@ -55,11 +55,11 @@
                             <text class="product-price-original">{{ i.price }}</text>
                             <!-- <text class="product-price-favour">¥{{i.originalPrice}}</text> -->
                             <!-- <text class="product-tip">{{i.tip}}</text> -->
-                            <text class="product-text" v-if="[3,4].includes(i.type)">赠{{ i.give_cha_bao + "茶宝" }}</text>
+                            <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)">限时赠送{{ i.teac }}TeaC</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>

+ 67 - 260
src/pages/my/index.vue

@@ -4,24 +4,10 @@
       <!-- 用户信息 -->
       <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"
-            @tap="goToAutonym"
-            v-if="isShiMing"
-          >
+          <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>
         </view>
@@ -30,35 +16,22 @@
             <view class="user_name flex_r flex_ae ellipsis">
               <view @click="goto('/pages/my/userinfo')">{{
                 userinfo.nickname
-              }}</view>
+                }}</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>
@@ -69,7 +42,6 @@
         </block>
       </view>
       <!-- 用户信息-end -->
-
       <!-- 账户信息 -->
       <view class="acc_info">
         <view class="acc_head flex_r flex_jb">
@@ -79,11 +51,8 @@
           </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">
@@ -100,221 +69,87 @@
             <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 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=5"
-            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"
-          >
+          <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>
           </navigator>
@@ -323,45 +158,21 @@
       <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>
@@ -370,17 +181,11 @@
     </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 app = getApp();
 var appEv = app.$vm.$options;
@@ -413,7 +218,7 @@ export default {
       isAuthentication: true, //是否开启实名模块
     };
   },
-  created () {
+  created() {
     this.isAuthentication = uni.getStorageSync("isAuthentication");
   },
   onLoad(options) {
@@ -431,7 +236,7 @@ export default {
 
     if (!token) {
       this.login();
-    }else {
+    } else {
       this.getuserInfo();
     }
   },
@@ -443,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", {
@@ -492,7 +297,7 @@ export default {
         if (res.code === 0) {
           uni.setStorageSync("userinfo", res.data.data);
           this.userinfo = res.data.data;
-          if(this.isAuthentication) this.isShiMing = this.userinfo.is_authentication == 0;
+          if (this.isAuthentication) this.isShiMing = this.userinfo.is_authentication == 0;
           else this.isShiMing = false;
         }
       });
@@ -524,27 +329,27 @@ export default {
     },
     // 跳转到分享页面
     getImgPage() {
-      if(this.isAuthentication){
+      if (this.isAuthentication) {
         if (this.userinfo.is_authentication == 1) {
           this.goto("/pages/invi-img/index")
-        }else{
+        } else {
           appEv.errTips("您还未实名");
           this.goToAutonym();
         }
-      }else{
+      } else {
         this.goto("/pages/invi-img/index")
       }
     },
     // 跳转到提现页面
     getToCash() {
-      if(this.isAuthentication){
+      if (this.isAuthentication) {
         if (this.userinfo.is_authentication == 1) {
           this.goto("/pages/cash/index")
-        }else{
+        } else {
           appEv.errTips("您还未实名");
           this.goToAutonym();
         }
-      }else{
+      } else {
         this.goto("/pages/cash/index")
       }
     },
@@ -557,25 +362,25 @@ 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",
       });
@@ -587,7 +392,7 @@ export default {
         count: 1, // 最多可以选择的图片张数,默认9
         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", {
@@ -602,7 +407,7 @@ export default {
       });
     },
     // 获取茶友
-    getchayou(){
+    getchayou() {
       post("my/chayou").then((res) => {
         if (res.code === 0) {
           this.allChaYou = res.data.data.below + res.data.data.lower_level;
@@ -612,7 +417,6 @@ export default {
   },
 };
 </script>
-
 <style lang="scss">
 // 页面配置
 page {
@@ -738,6 +542,7 @@ page {
   width: 140rpx;
   text-align: right;
 }
+
 // 用户信息-end
 
 // 账户信息
@@ -746,7 +551,7 @@ page {
   overflow: hidden;
 }
 
-.acc_price .price_txt{
+.acc_price .price_txt {
   font-size: 24rpx;
   color: #fff;
 }
@@ -896,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;
@@ -908,4 +715,4 @@ page {
 }
 
 // 功能列表-end
-</style>
+</style>

+ 2 - 2
src/pages/product/productRetail.vue

@@ -12,12 +12,12 @@
                         <text class="product-price-favour" v-if="type==6">{{(i.cost_price)}}</text>
                         <text class="product-price-original">{{ (i.price) }}</text>
                         <!-- <text class="product-tip">{{i.tip}}</text> -->
-                            <text class="product-text" v-if="['3','4'].includes(type)">赠{{ i.give_cha_bao + "茶宝" }}</text>
+                            <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)">限时赠送{{ i.teac }}TeaC</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>

+ 2 - 2
src/pages/sign/index.vue

@@ -51,11 +51,11 @@
                 <text class="product-price-original">{{ i.price }}</text>
                 <!-- <text class="product-price-favour">¥{{i.originalPrice}}</text> -->
                 <!-- <text class="product-tip">{{i.tip}}</text> -->
-                <text class="product-text" v-if="['3','4'].includes(i.type)">赠{{ i.give_cha_bao + "茶宝" }}</text>
+                <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)">限时赠送{{ i.teac }}TeaC</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>

BIN
src/static/my/sharePoster.png


BIN
src/static/nav/hehuoren.png


BIN
src/static/nav/hehuoren_select.png


BIN
src/static/nav/qiandao.png


BIN
src/static/nav/qiandao_select.png


BIN
src/static/nav/shouye.png


BIN
src/static/nav/shouye_select.png


BIN
src/static/nav/wode.png


BIN
src/static/nav/wode_select.png