2-23-1

pages/user/index.vue

@@ -73,9 +73,12 @@
                 <view class="name" v-if="userInfo.uid">
 									<view class="nickname line1">{{userInfo.nickname}}</view>
                   <image class="live" :src="userInfo.vip_icon" v-if="userInfo.vip_icon"></image>
-                  <view class="vip" v-if="userInfo.is_money_level> 0 && stu">
+                  <!-- <view class="vip" v-if="userInfo.is_money_level> 0 && stu">
                     <image src="/static/images/svip.png"></image>
-                  </view>
+                  </view> -->
+				  <view class="vip" v-if="userInfo.area_level> 0 && isLogin">
+				   （{{userInfo.area_level == 1 ?'门店': (userInfo.area_level == 2? '社区': '城市')}}）
+				  </view>
                 </view>
                 <view class="num" v-if="userInfo.phone" @click="goEdit()">
                   <view class="num-txt">ID：{{userInfo.uid}}</view>
@@ -207,10 +210,10 @@
               <text class="num">{{userInfo.couponCount || 0}}</text>
               <view class="txt">优惠券</view>
             </view>
-            <view class="num-item" @click="goMenuPage('/pages/users/user_integral/index')">
+           <!-- <view class="num-item" @click="goMenuPage('/pages/users/user_integral/index')">
               <text class="num">{{userInfo.integral || 0}}</text>
               <view class="txt">积分</view>
-            </view>
+            </view> -->
             <view class="num-item" @click="goMenuPage('/pages/users/user_goods_collection/index')">
               <text class="num">{{userInfo.collectCount || 0}}</text>
               <view class="txt">收藏</view>
@@ -219,6 +222,22 @@
               <text class="num">{{userInfo.visit_num || 0}}</text>
               <view class="txt">浏览记录</view>
             </view>
+			<view class="num-item" >
+			  <text class="num">{{userInfo.achievement || 0}}</text>
+			  <view class="txt">业绩</view>
+			</view>
+			<view class="num-item" >
+			  <text class="num">{{userInfo.award_range || 0}}</text>
+			  <view class="txt">分红额度</view>
+			</view>
+			<view class="num-item" >
+			  <text class="num">{{userInfo.award_piece || 0}}</text>
+			  <view class="txt">分红值</view>
+			</view>
+			<view class="num-item" v-if="userInfo.partner == 1">
+			  <text class="num">{{userInfo.award_piece_partner || 0}}</text>
+			  <view class="txt">董事分红</view>
+			</view>
           </view>
           <!-- 新人礼物 -->
           <view class="num-wrapper on" v-if="!userInfo.uid">
@@ -1322,13 +1341,15 @@
     position: relative;
     display: flex;
     align-items: center;
-    justify-content: space-between;
+    // justify-content: space-between;
+	justify-content: flex-start;
     margin-top: 22rpx;
     color: #333;
     margin: 30rpx 30rpx 25rpx 30rpx;
     border-radius: 16rpx;
-    height: 160rpx;
-		
+    // height: 160rpx;
+	padding: 20rpx 0 0;
+	flex-wrap: wrap;
 		&.on{
 			height: 128rpx;
 			margin-top: -68rpx;
@@ -1368,9 +1389,10 @@
     }
 
     .num-item {
-      width: 33.33%;
+      // width: 33.33%;
+	  width: 25%;
       text-align: center;
-
+	margin-bottom: 20rpx;
       &~.num-item {
         position: relative;
 

pages/users/login/index.vue

@@ -2,8 +2,8 @@
 	<view class="login-wrapper" :style="colorStyle">
 		<view class="login-top"></view>
 		<view class="shading">
-			<image :src="logoUrl" v-if="logoUrl" />
-			<image src="../static/logo2.png" v-else />
+			<image :src="logoUrl" />
+			<!-- <image src="../static/logo2.png" v-else /> -->
 		</view>
 		<view class="whiteBg" v-if="formItem === 1">
 			<view class="tips">

pages/users/promoter-list/index.vue

@@ -6,10 +6,10 @@
 						@confirm="submitForm" confirm-type='search' name="search"></input></view>
 				<!-- <button class='iconfont icon-sousuo2' @click="submitForm"></button> -->
 			</view>
-			<!-- <view class='nav acea-row row-around' v-if="brokerageLevel == 2">
+			<view class='nav acea-row row-around' v-if="brokerageLevel == 2">
 				<view :class="grade == 0 ? 'item on' : 'item'" @click='setType(0)'>一级({{total}})</view>
 				<view :class="grade == 1 ? 'item on' : 'item'" @click='setType(1)'>二级({{totalLevel}})</view>
-			</view> -->
+			</view>
 			<timeSlot @changeTime="changeTime"></timeSlot>
 			<view class='list' v-if="recordList.length">
 				<view class="top_num">
@@ -86,7 +86,7 @@
 				count:0,
 				price:0,
 				brokerageLevel:0,
-				uid: 6,
+				uid: '',
 				spread: {},
 			};
 		},
@@ -153,7 +153,7 @@
 			// 	this.keyword = e.detail.value;
 			// },
 			submitForm: function() {
-				this.uid = 0;
+				this.uid = '';
 				this.spread = {};
 				this.page = 1;
 				this.limit = 20;

pages/users/user_payment/index.vue

@@ -152,7 +152,10 @@
 				deep:true
 			}
 		},
-		onLoad(options) {
+		onLoad(options) {
+			if(options.action) {
+				this.active = options.action
+			}
 			// #ifdef H5
 			this.from = this.$wechat.isWeixin() ? "weixinh5" : "alipay"
 			// #endif