Merge branch 'main' of https://git.yuzhankeji.cn/TmOct5/barter-app into main

pages/property/index.vue

@@ -1,164 +1,177 @@
 <template>
-	<view v-if='loaded'>
-		<!-- 用户信息 -->
-		<view class="user">
-			<view class="user-tool" @click="$Router.push({name:'Setting'})">
-				<image src="@/static/icons/user_icon_00.png" mode="widthFix"  />
-			</view>
-			<view class="user-content">
-				<image class="info-cover" :src="base.avatar" mode="aspectFill" />
-				<view class="info-nickname">{{base.nickname}}</view>
-				<view class="info-signa">潮流就是我的态度</view>
-				<view class="info-tags">
-					<text class="info-tags-item identity">{{base.identity.name}}</text>
-					<text class="info-tags-item vip" v-if="base.company_level.name">{{base.company_level.name }}</text>
-				</view>
-			</view>
-			<view class="user-tabs">
-				<view class="user-tabs-item" :class="{'show': tabsIndex === 0}" @click="tabsIndex = 0">管理中心</view>
-				<view class="user-tabs-item" :class="{'show': tabsIndex === 1}" @click="tabsIndex = 1">我的推广</view>
-			</view>
-		</view>
-		<!-- 消息 -->
-		<view class="user-ad">
-			<uni-icons class="user-ad-icon" type="sound-filled" color="#e93340"></uni-icons>
-			<swiper class="user-ad-swiper" :interval="3000" autoplay vertical circular>
-				<swiper-item v-for="(item,index) in message" :key='index'>
-					<view class="user-ad-item">{{item}}</view>
-				</swiper-item>
-			</swiper>
-		</view>
-		<block v-if="tabsIndex === 0">
-			<!-- 我的资产 -->
-			<view class="user-group">
-				<view class="title">
-					<view class="title-text">我的资产</view>
-				</view>
-				<view class="group-flex group-flex-4">
-					<view class="item" @click="showToast">
-						<view class="item-num">{{base.account.token}}</view>
-						<view class="item-title">原石</view>
-					</view>
-					<view class="item" @click="showToast">
-						<view class="item-num">{{base.account.contribution}}</view>
-						<view class="item-title">贡献值</view>
-					</view>
-					<view class="item" @click="$Router.push({name:'Eb'})">
-						<view class="item-num">{{base.account.eb}}</view>
-						<view class="item-title">易币</view>
-					</view>
-					<view class="item" @click="showToast">
-						<view class="item-num">{{base.account.money}}</view>
-						<view class="item-title">零钱</view>
-					</view>
-				</view>
-			</view>
-			<!-- 我的权证 -->
-			<view class="user-group">
-				<view class="title" >
-					<view class="title-text">我的权证</view>
-				</view>
-				<view class="group-flex group-flex-4">
-					<view class="item" @click="$Router.push({name:'NumberWeight'})">
-						<view class="item-num">{{count.warrnats}}</view>
-						<view class="item-title">权证持有</view>
-					</view>
-					<view class="item" @click="$Router.push({name: 'marketManag'})">
-						<view class="item-num">{{count.warrnat_transfer}}</view>
-						<view class="item-title">权证转让</view>
-					</view>
-					<view class="item" @click="$Router.push({name:'ServicesOrder'})">
-						<view class="item-num">{{count.shipment_fuwu_count}}</view>
-						<view class="item-title">已使用</view>
-					</view>
-					<view class="item" @click="$Router.push({name:'MallShipments'})">
-						<view class="item-num">{{count.shipment_goods_count}}</view>
-						<view class="item-title">已提货</view>
-					</view>
-				</view>
-			</view>
-			<!-- 我的权证 -->
-			<view class="user-group">
-				<view class="group-flex group-flex-4">
-					<view class="item" @click="$Router.push({name:'Collection'})">
-						<image class="item-cover" src="@/static/icons/user_icon_02.png" mode="aspectFill" />
-						<view class="item-title">收藏的企业</view>
-					</view>
-					<view class="item" @click="$Router.push({name:'CouponList'})">
-						<image class="item-cover" src="@/static/icons/user_icon_03.png" mode="aspectFill" />
-						<view class="item-title">我的优惠券</view>
-					</view>
-					<view class="item" @click="$Router.push({name:'HistoryShop'})">
-						<image class="item-cover" src="@/static/icons/user_icon_01.png" mode="aspectFill" />
-						<view class="item-title">我的足迹</view>
-					</view>
-					<view class="item" @click="$Router.push({name:'AddressList'})">
-						<image class="item-cover" src="@/static/icons/user_icon_04.png" mode="aspectFill" />
-						<view class="item-title">地址管理</view>
-					</view>
-				</view>
-			</view>
-		</block>
-		<block v-else-if="tabsIndex === 1">
-			<!-- 我的权证 -->
-			<view class="user-group">
-				<view class="title">
-					<view class="title-text">推广数据</view>
-				</view>
-				<view class="group-flex group-flex-2">
-					<view class="item">
-						<view class="item-num">{{relations.children}}</view>
-						<view class="item-title">推广人数</view>
-					</view>
-					<view class="item">
-						<view class="item-num">{{relations.company}}</view>
-						<view class="item-title">推广企业</view>
-					</view>
-				</view>
-			</view>
+	<view v-if='loding'>
+		<block v-if="this.$store.state.token != ''">
+            <!-- 用户信息 -->
+            <view class="user">
+            	<view class="user-tool" @click="$Router.push({name:'Setting'})">
+            		<image src="@/static/icons/user_icon_00.png" mode="widthFix"  />
+            	</view>
+            	<view class="user-content">
+            		<image class="info-cover" :src="base.avatar" mode="aspectFill" />
+            		<view class="info-nickname">{{base.nickname}}</view>
+            		<view class="info-signa">潮流就是我的态度</view>
+            		<view class="info-tags">
+            			<text class="info-tags-item identity" v-if="base.identity">{{base.identity.name}}</text>
+            			<text class="info-tags-item vip" v-if="base.company_level.name">{{base.company_level.name }}</text>
+            		</view>
+            	</view>
+            	<view class="user-tabs">
+            		<view class="user-tabs-item" :class="{'show': tabsIndex === 0}" @click="tabsIndex = 0">管理中心</view>
+            		<view class="user-tabs-item" :class="{'show': tabsIndex === 1}" @click="tabsIndex = 1">我的推广</view>
+            	</view>
+            </view>
+            <!-- 消息 -->
+            <view class="user-ad">
+            	<uni-icons class="user-ad-icon" type="sound-filled" color="#e93340"></uni-icons>
+            	<swiper class="user-ad-swiper" :interval="3000" autoplay vertical circular>
+            		<swiper-item v-for="(item,index) in message" :key='index'>
+            			<view class="user-ad-item">{{item}}</view>
+            		</swiper-item>
+            	</swiper>
+            </view>
+            <block v-if="tabsIndex === 0">
+            	<!-- 我的资产 -->
+            	<view class="user-group">
+            		<view class="title">
+            			<view class="title-text">我的资产</view>
+            		</view>
+            		<view class="group-flex group-flex-4">
+            			<view class="item" @click="showToast">
+            				<view class="item-num">{{base.account.token}}</view>
+            				<view class="item-title">原石</view>
+            			</view>
+            			<view class="item" @click="showToast">
+            				<view class="item-num">{{base.account.contribution}}</view>
+            				<view class="item-title">贡献值</view>
+            			</view>
+            			<view class="item" @click="$Router.push({name:'Eb'})">
+            				<view class="item-num">{{base.account.eb}}</view>
+            				<view class="item-title">易币</view>
+            			</view>
+            			<view class="item" @click="showToast">
+            				<view class="item-num">{{base.account.money}}</view>
+            				<view class="item-title">零钱</view>
+            			</view>
+            		</view>
+            	</view>
+            	<!-- 我的权证 -->
+            	<view class="user-group">
+            		<view class="title" >
+            			<view class="title-text">我的权证</view>
+            		</view>
+            		<view class="group-flex group-flex-4">
+            			<view class="item" @click="$Router.push({name:'NumberWeight'})">
+            				<view class="item-num">{{count.warrnats}}</view>
+            				<view class="item-title">权证持有</view>
+            			</view>
+            			<view class="item" @click="$Router.push({name: 'marketManag'})">
+            				<view class="item-num">{{count.warrnat_transfer}}</view>
+            				<view class="item-title">权证转让</view>
+            			</view>
+            			<view class="item" @click="$Router.push({name:'ServicesOrder'})">
+            				<view class="item-num">{{count.shipment_fuwu_count}}</view>
+            				<view class="item-title">已使用</view>
+            			</view>
+            			<view class="item" @click="$Router.push({name:'MallShipments'})">
+            				<view class="item-num">{{count.shipment_goods_count}}</view>
+            				<view class="item-title">已提货</view>
+            			</view>
+            		</view>
+            	</view>
+            	<!-- 我的权证 -->
+            	<view class="user-group">
+            		<view class="group-flex group-flex-4">
+            			<view class="item" @click="$Router.push({name:'Collection'})">
+            				<image class="item-cover" src="@/static/icons/user_icon_02.png" mode="aspectFill" />
+            				<view class="item-title">收藏的企业</view>
+            			</view>
+            			<view class="item" @click="$Router.push({name:'CouponList'})">
+            				<image class="item-cover" src="@/static/icons/user_icon_03.png" mode="aspectFill" />
+            				<view class="item-title">我的优惠券</view>
+            			</view>
+            			<view class="item" @click="$Router.push({name:'HistoryShop'})">
+            				<image class="item-cover" src="@/static/icons/user_icon_01.png" mode="aspectFill" />
+            				<view class="item-title">我的足迹</view>
+            			</view>
+            			<view class="item" @click="$Router.push({name:'AddressList'})">
+            				<image class="item-cover" src="@/static/icons/user_icon_04.png" mode="aspectFill" />
+            				<view class="item-title">地址管理</view>
+            			</view>
+            		</view>
+            	</view>
+            </block>
+            <block v-else-if="tabsIndex === 1">
+            	<!-- 我的权证 -->
+            	<view class="user-group">
+            		<view class="title">
+            			<view class="title-text">推广数据</view>
+            		</view>
+            		<view class="group-flex group-flex-2">
+            			<view class="item">
+            				<view class="item-num">{{relations.children}}</view>
+            				<view class="item-title">推广人数</view>
+            			</view>
+            			<view class="item">
+            				<view class="item-num">{{relations.company}}</view>
+            				<view class="item-title">推广企业</view>
+            			</view>
+            		</view>
+            	</view>
                 
-			<!-- 排名信息 -->
-			<view class="user-group">
-                <view class="title">
-                	<view class="title-text">推广排名</view>
-                </view>
-				<view class="ranking ranking-after">
-                    <view class="ranking-title">
-                        <view class="ranking-text">全站推广人数</view>
-                        <view class="ranking-number">{{relations.childrenRank}}</view>
+            	<!-- 排名信息 -->
+            	<view class="user-group">
+                    <view class="title">
+                    	<view class="title-text">推广排名</view>
                     </view>
-                    <image class="tips" src="../../static/icons/property_icon_00.png" mode="aspectFill" />
-				</view>
-                <view class="ranking">
-                    <view class="ranking-title">
-                    	<view class="ranking-text">推广企业</view>
-                        <view class="ranking-number">{{relations.companyRank}}</view>
+            		<view class="ranking ranking-after">
+                        <view class="ranking-title">
+                            <view class="ranking-text">全站推广人数</view>
+                            <view class="ranking-number">{{relations.childrenRank}}</view>
+                        </view>
+                        <image class="tips" src="../../static/icons/property_icon_00.png" mode="aspectFill" />
+            		</view>
+                    <view class="ranking">
+                        <view class="ranking-title">
+                        	<view class="ranking-text">推广企业</view>
+                            <view class="ranking-number">{{relations.companyRank}}</view>
+                        </view>
+                        <image class="tips" src="../../static/icons/property_icon_01.png" mode="aspectFill" />
                     </view>
-                    <image class="tips" src="../../static/icons/property_icon_01.png" mode="aspectFill" />
-                </view>
-			</view>
+            	</view>
             	
                 
-			<!-- 推广海报 -->
-            <view class="poster-text">推广海报</view>
+            	<!-- 推广海报 -->
+                <view class="poster-text">推广海报</view>
             	
-			<!-- <carousel :img-list="imgList" url-key="url" @selected="selectedBanner"/> -->
-			<view class="code">
-				<image class="code-img-bg" src="/static/images/share_bg_3.png" mode="aspectFill" />
-				<image class='code-img' :src="shareCode" mode="widthFix" />
-			</view>
+            	<!-- <carousel :img-list="imgList" url-key="url" @selected="selectedBanner"/> -->
+            	<view class="code">
+            		<image class="code-img-bg" src="/static/images/share_bg_3.png" mode="aspectFill" />
+            		<image class='code-img' :src="shareCode" mode="widthFix" />
+            	</view>
                 
-		</block>
-		<!-- 弹窗 -->
-		<u-toast ref="uToast" />
-		<!-- 版权信息 -->
-		<view class="copyright">易品新境 beta 1.0.0</view>
+            </block>
+            <!-- 弹窗 -->
+            <u-toast ref="uToast" />
+            <!-- 版权信息 -->
+            <view class="copyright">易品新境 beta 1.0.0</view>
+        </block>
+        <block v-else>
+            <view class="statusBar">
+            	<view class="statusBar-title">我的资产</view>
+            </view>
+        	<view class="store-login">
+        		<image class="icon" src="@/static/icons/login-icon.png" mode="widthFix"></image>
+        		<view class="sub-title">一键开启您的易货之旅</view>
+        		<button type="default" @click="login">登录</button>
+        	</view>
+        </block>
 	</view>
 </template>
 
 <script>
 	import carousel from '@/components/vear-carousel/vear-carousel'
 	import {getUserInfo , appcode} from '@/apis/interfaces/mine'
+    import userAuth from '@/public/userAuth'
 	export default {
 		components: {
 			carousel
@@ -180,12 +193,15 @@
 				count:'',
 				relations:'',
 				message:'',
-				loaded:false,
+				loding:true,
 				shareCode:''
 			}
 		},
 		onShow(){
-			this.getUserInfo()
+            console.log(this.$store.state.token)
+            if(this.$store.state.token != ''){
+                this.getUserInfo()
+            }
 		},
 		methods: {
 			// 获取用户的基本信息
@@ -195,7 +211,7 @@
 					this.count = res.count
 					this.message = res.message
 					this.relations = res.relations
-					this.loaded = true
+					this.loding = true
 				}).catch(err => {
 					this.$refs.uToast.show({
 						title: err.message,
@@ -228,12 +244,57 @@
 				  type:'error',
 				  duration: 3000
 				})
-			}
+			},
+            
+            // 登录
+            login(){
+            	let auth = new userAuth()
+            	auth.Login().then(res => {
+            		if(res.auth) this.getIndex()
+            	}).catch(err => {
+            		uni.showToast({
+            			title: err.message,
+            			icon : 'none'
+            		})
+            	})
+            }
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+    // 登录提示
+    .store-login{
+    	position: fixed;
+    	top: 0;
+    	left: 0;
+    	width: 100vw;
+    	height: 100vh;
+    	z-index: 9;
+    	background: white;
+    	text-align: center;
+    	@extend .vertical;
+    	button{
+    		margin-top: $margin*3;
+    		display: inline-block;
+    		width: 50%;
+    		height: 90rpx;
+    		line-height: 90rpx;
+    		border-radius: $radius/2;
+    		background: $text-price;
+    		color: white;
+    		font-weight: bold;
+    		font-size: $title-size;
+    	}
+    	.sub-title{
+    		color: $text-gray;
+    		font-size: $title-size-m;
+    	}
+    	.icon{
+    		width: 288rpx;
+    	}
+    }
+    
 	// 退出按钮
 	.out-login{
 		padding: 0 $padding;
@@ -524,4 +585,95 @@
 		font-size: $title-size-sm;
 		color: $text-gray-m;
 	}
+    
+    // Bar
+    .statusBar{
+    	position: fixed;
+    	top: 0;
+    	left: 0;
+    	width: 100%;
+    	z-index: 99;
+    	background: $text-price;
+    	@extend .ios-top;
+    	.statusBar-box{
+    		min-height: 90rpx;
+    		position: relative;
+    		padding: $padding $padding $padding ($padding + 88);
+    		color: white;
+    		.logo{
+    			position: absolute;
+    			left: $padding;
+    			width: 94rpx;
+    			height: 94rpx;
+    			border-radius: 50%;
+                border: 4rpx solid #ed8483;
+                box-sizing: border-box;
+                box-shadow: 0 4rpx 15rpx rgba(109,1,0,.8);
+    		}
+    		.company{
+                width: calc(100% - 94rpx);
+                padding-left: 30rpx;
+                box-sizing: border-box;
+    			.name{
+    				line-height: 40rpx;
+    				@extend .nowrap;
+    				font-size: $title-size;
+                    .name-img {
+                        width: 30rpx;
+                        height: 30rpx;
+                        margin: 7rpx 0 0 15rpx;
+                    }
+    			}
+                .tool {
+                    display: flex;
+                    margin-top: 13rpx;
+                    .faith{
+                    	line-height: 40rpx;
+                        height: 38rpx;
+                    	@extend .nowrap;
+                    	font-size: 24rpx;
+                        background-color: rgba(0,0,0,.15);
+                        padding: 0 15rpx;
+                        border-radius: 60rpx;
+                        margin-right: 30rpx;
+                        display: flex;
+                        .faith-img {
+                            width: 28rpx;
+                            height: 28rpx;
+                            margin: 5rpx 4rpx 0 0;
+                        }
+                    }
+                    .btn{
+                    	line-height: 40rpx;
+                        height: 38rpx;
+                        font-size: 24rpx;
+                        padding: 0 15rpx 0 30rpx;
+                        background-color: #913335;
+                        display: inline-block;
+                        border-radius: 0 60rpx 60rpx 0;
+                        position: relative;
+                        text-transform: uppercase;
+                        .btn-img {
+                            position: absolute;
+                            width: 38rpx;
+                            height: 38rpx;
+                            left: -20rpx;
+                            top: 0;
+                        }
+                    }
+                }
+    		}
+    	}
+    	.statusBar-title{
+    		line-height: 88rpx;
+    		min-height: 88rpx;
+    		color: white;
+    		text-align: center;
+    		font-weight: bold;
+    	}
+    }
+    .content{
+    	padding-top: calc(var(--status-bar-height) + #{$padding * 2} + 65rpx);
+    	padding-bottom: $padding;
+    }
 </style>

pages/vip/index.vue

@@ -96,45 +96,6 @@
                 </view>
             </button>
         </view>
-        
-		<!-- 会员类型 -->
-		<!-- <view class="tabs">
-			<view class="item" :class="{'show': index === tabsIndex}" v-for="(item, index) in identities" :key="index" @click="onTabs(index)">{{item.name}}</view>
-		</view> -->
-		<!-- 会员信息 -->
-		<!-- <view class="cards">
-			<view class="card">
-				<view class="card-content">
-					<image class="cover" src="@/static/dev/good_cover_01.png" mode="aspectFill"></image>
-					<view class="user nowrap">{{user.username}}</view>
-					<view class="sub-time nowrap">{{user.identity.name}}至{{user.identity.ended_at}}</view>
-					<view class="btn" @click="openOrder">开通/续费</view>
-				</view>
-			</view>
-			<view class="cards-back"></view>
-			<image class="cards-angle" src="@/static/imgs/vip-angle-back.png" mode="widthFix"></image>
-		</view> -->
-		<!-- 会员权限 -->
-		<!-- <view class="privilege">
-			<view class="title">开通会员享特权</view>
-			<view class="privilege-box">
-				<view class="item" v-for="(item, index) in rights" :key="index" @click="showRemark(item.name, item.remark)">
-					<image class="icon" :src="item.cover" mode="aspectFill"></image>
-					<view class="text">{{item.name}}</view>
-				</view>
-			</view>
-		</view> -->
-		<!-- 会员 -->
-		<!-- <view class="footer">
-			<button class="footer-btn" type="default" @click="openOrder">￥{{identities[tabsIndex].price}}/年&nbsp;开通</button>
-		</view> -->
-		<!-- 会员服务信息 -->
-		<!-- <view class="notice">
-			<view class="title">开通须知</view>
-			<view class="item">
-				<text>{{description}}</text>
-			</view>
-		</view> -->
 	</view>
 </template>
 
@@ -177,13 +138,6 @@
             this.totalData(2);
 		},
 		methods: {
-			// 切换开通身份
-			// onTabs(index){
-			// 	if(this.tabsIndex === index) return
-			// 	this.tabsIndex = index
-			// 	this.rights	   = this.identities[index].rights
-			// },
-            
             // 切换开通身份
             swiperChange(e) {
             	this.tabsIndex = e.detail.current
@@ -354,7 +308,7 @@
                 border-radius: 60rpx;
                 padding: 0 $padding;
                 box-sizing: border-box;
-                background-image: linear-gradient(to right, #f11a22, #ff252f);
+                background: red;
                 display: flex;
                 .vip-name-icon {
                     width: 50rpx;