cmy пре 3 година
родитељ
комит
f8be072bcd
3 измењених фајлова са 65 додато и 10 уклоњено
  1. 2 2
      pages/money/recharge.vue
  2. 61 6
      pages/user/extension.vue
  3. 2 2
      pages/user/user.vue

+ 2 - 2
pages/money/recharge.vue

@@ -36,7 +36,7 @@
 					</view>
 				</label>
 				<!-- #endif -->
-				<!-- <label>
+				<label>
 					<view class="box">
 						<view class="icon iconfont"><image class="yongjing" src="http://xmpt.liuniu946.com/img/yongjing.png"></image></view>
 						<view class="title-box">
@@ -46,7 +46,7 @@
 						</view>
 						<view class="right"><radio value="yongjing" color=" #5dbc7c" :checked="type == 'yongjing'" /></view>
 					</view>
-				</label> -->
+				</label>
 				
 			</radio-group>
 		</view>

+ 61 - 6
pages/user/extension.vue

@@ -66,13 +66,32 @@
  					<!-- 订单列表 -->
  					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item flex">
  						<view class="title-box flex_item">
- 							<view class="title-avatar"><image :src="item.avatar"></image></view>
+ 							<view class="title-avatar"><image :src="item.avatar||'/static/error/missing-face.png'"></image></view>
  							<view class="list_tpl">
  								<view class="title flex">
- 									<text>{{ item.nickname }}</text>
+ 									<text>{{ item.nickname }}{{item.level}}</text>
+									<view class="itemVip lv1" v-if="item.level == 1">
+										会员
+									</view>
+									<view class="itemVip lv2" v-if="item.level == 2">
+										村代
+									</view>
+									<view class="itemVip lv3" v-if="item.level == 3">
+										镇代
+									</view>
+									<view class="itemVip lv4" v-if="item.level == 4">
+										区代
+									</view>
+									<view class="itemVip lv5" v-if="item.level == 5">
+										市代
+									</view>
+									<view class="itemVip lv6" v-if="item.level == 6">
+										省代
+									</view>
+									<!-- <image src="../../static/img/lv01.png" mode="" v-if="item.level == 1"></image>
 									<image src="../../static/img/lv02.png" mode="" v-if="item.level == 2"></image>
 									<image src="../../static/img/lv03.png" mode="" v-if="item.level == 3"></image>
-									<image src="../../static/img/lv04.png" mode="" v-if="item.level == 4"></image>
+									<image src="../../static/img/lv04.png" mode="" v-if="item.level == 4"></image> -->
  								</view>
  								<view class="time">
  									<text>{{ item.time }}</text>
@@ -196,8 +215,12 @@
  					this.totalLevel =data.totalLevel;
  					// this.all = this.total + this.totalLevel;
  					if (data.list.length > 0) {
- 						this.list = data.list;
- 						navItem.orderList = navItem.orderList.concat(data.list);
+ 						this.list = data.list
+						const D = data.list.map((e) => {
+ 							e.level = +e.level;
+							return e;
+ 						})
+ 						navItem.orderList = navItem.orderList.concat(D);
  						navItem.page++;
  					}
  					this.$nextTick(function(){
@@ -246,6 +269,32 @@
  	background: #ffffff;
  	height: 100%;
  }
+ .itemVip{
+	 font-size: 24rpx;
+	 line-height: 1;
+	 color: #FFFFFF;
+	 border-radius: 99rpx;
+	 padding:10rpx 20rpx;
+	 margin-left: 10rpx;
+ }
+ .lv1{
+	 background-image: linear-gradient(to right,#a9a9a9,#a9a9a9);
+ }
+ .lv2{
+	 background-image: linear-gradient(to right,#ffc107,#ffc107);
+ }
+ .lv3{
+	background-image: linear-gradient(to right,#e51c23,#e51c23);
+ }
+ .lv4{
+	background-image: linear-gradient(to right,#000000,#000000);
+ }
+ .lv5{
+	background-image: linear-gradient(to right,#000000,#000000);
+ }
+ .lv6{
+	 background-image: linear-gradient(to right,#000000,#000000);
+ }
  .content-money {
  	// padding-bottom: 30rpx;
  	background: $page-color-base;
@@ -374,9 +423,14 @@
  	// padding-top: 10rpx;
  	.order-item {
  		padding: 20rpx 30rpx;
+		padding-bottom: 0;
  		line-height: 1.5;
  		.title-box {
  			width: 100%;
+			&.flex_item{
+				border-bottom: 1px dashed #999999  ;
+				padding-bottom: 20rpx;
+			}
  			.title-avatar{
  				width: 100rpx;
  				height: 100rpx;
@@ -395,7 +449,8 @@
  					overflow:hidden;            //超出的文本隐藏
  					text-overflow:ellipsis;     //溢出用省略号显示
  					white-space:nowrap;
-					 justify-content: flex-start;
+					 justify-content: space-between;
+					 
 					image {
 						margin-left: 9rpx;
 						width: 147rpx;

+ 2 - 2
pages/user/user.vue

@@ -143,13 +143,13 @@
 							</view>
 							<text>我的钱包</text>
 						</view>
-						<view class="order-item" @click="navTo('/pages/user/minMember')" hover-class="common-hover"
+						<!-- <view class="order-item" @click="navTo('/pages/user/minMember')" hover-class="common-hover"
 							:hover-stay-time="50" v-if="userInfo.level > 2">
 							<view class="icon icon-b">
 								<image class="icon-img" src="/static/icon/u3.png" mode="aspectFit"></image>
 							</view>
 							<text>我的会员</text>
-						</view>
+						</view> -->
 						<view class="order-item" @click="navTo('/pages/user/extension')" hover-class="common-hover"
 							:hover-stay-time="50" v-if="userInfo.level == 2">
 							<view class="icon icon-b">