个人中心

pages/index/aboutUS.vue

@@ -20,17 +20,40 @@
 			return {
 				detail:'',
 			    unionID:'',
+				memberTitle:'',
 			}
 		},
 		onLoad(opt) {
 			this.unionID=opt.unionID
-			this.getExplain();
+			this.memberTitle=opt.memberTitle
+			if(this.memberTitle){
+				this.getAboutMember();
+				uni.setNavigationBarTitle({
+					title: this.memberTitle,
+				});
+			}else{
+				this.getExplain();
+			}
+			
 		},
 		onShow() {
 			
 		},
 		methods: {
-			
+			getAboutMember(){
+				uni.showLoading({
+					title: '加载中'
+				})
+				this.$http('miniApp2/sys/getAboutMember', {
+				    unionID:this.unionID
+				}, 'GET').then(res => {
+					uni.hideLoading();
+					this.detail = res.data;
+					this.detail = this.detail.replace(/\<img/gi, '<img style="max-width:100%;height:auto" ');
+					//console.log('list+=', this.queryShopList);
+				
+				})
+			},
 			getExplain(){
 				uni.showLoading({
 					title: '加载中'

pages/index/couponShare.vue

@@ -20,7 +20,7 @@
 						<span>{{detail.actName}}</span>
 					</view>
 					<view class="time" v-if="detail.startTime">
-						有效期：{{detail.startTime.slice(0,10)}}-{{detail.endTime.slice(0,10)}}</view>
+						有效期：{{detail.startTime.slice(0,10)}}至{{detail.endTime.slice(0,10)}}</view>
 					<view class="time" v-else>有效期：领取后{{detail.endOffsetDays}}天有效</view>
 				</view>
 
@@ -183,9 +183,13 @@
 							 icon:'none',
 							 duration: 3000
 						});
-						uni.switchTab({
-							url:'../index/index'
-						})
+						setTimeout(function() {
+							uni.switchTab({
+								url:'../index/index'
+							})
+						}, 2000);
+						
+						
 					}
 					//this.getData();
 					

pages/index/vipCard.vue

@@ -1,8 +1,8 @@
 <template>
 	<view class="box">
 
-		<view class="headerBox">
-			<view class="vip">
+		<!-- <view class="headerBox">
+			 <view class="vip">
 				<view class="headerTop">
 					<image src="http://dmsphoto.66km.com.cn/thFiles/785A657B-2FA6-4B22-A356-D555BFE2E18D.png" mode="" style="width: 80rpx;height: 80rpx;"></image>
 					<view class="headerRight">
@@ -22,7 +22,7 @@
 					<view class="kahao">卡号 {{vipData.cardCode}}</view>
 
 				</view>
-			</view>
+			</view> 
 
 			<view class="tab">
 				<view>
@@ -34,19 +34,27 @@
 					<view :class="{line:tabIndex==2}"></view>
 				</viw>
 			</view>
-		</view>
-
+		</view> -->
+
+       <view class="newTop">
+		   <view class="newTopCont">
+			   <image src="../../static/timg/icon_vip.png" mode="" class="topVipIcon"></image>
+			   <span style="padding-right: 10rpx;padding-left: 10rpx;">卡号</span>
+			   <span>{{vipData.cardCode}}</span>
+		   </view>
+	   </view>
+	   <view class="btnBox" @click="dis=!dis">
+	   	<image v-if="dis" src="../../static/img/icon_selectY.png" mode="" style="width: 36rpx;height: 36rpx;">
+	   	</image>
+	   	<image v-else src="../../static/img/icon_selectN.png" mode="" style="width: 36rpx;height: 36rpx;">
+	   	</image>
+	   	<view style="margin-left: 10rpx;color: #3C3C3C;font-size: 24rpx;">不展示剩余为0项</view>
+	   </view>
+	   
 
 		<!-- 计次 -->
 		<view class="mainBox" v-if="tabIndex==1">
-			<view class="btnBox" @click="dis=!dis">
-				<image v-if="dis" src="../../static/img/icon_selectY.png" mode="" style="width: 36rpx;height: 36rpx;">
-				</image>
-				<image v-else src="../../static/img/icon_selectN.png" mode="" style="width: 36rpx;height: 36rpx;">
-				</image>
-				<view style="margin-left: 10rpx;color: #3C3C3C;font-size: 24rpx;">不展示剩余为0项</view>
-			</view>
-
+			
 			<view v-for="(item,index) in vipData.cardTimeList">
 				<view v-if="AmountQtyJs(item.list)" class="itemBox">
 				<view class="itemTop">
@@ -387,6 +395,20 @@
 </script>
 
 <style scoped>
+	.topVipIcon{
+		width: 41rpx;height: 40rpx;
+	}
+	.newTopCont{
+		border-radius: 16rpx;line-height: 40rpx;
+		border: 1px solid #EAC799;font-size: 28rpx;
+		padding: 19rpx 26rpx;color: #F7D4B5;
+		display: flex;
+	}
+	.newTop{
+		background-color: #171723;
+		padding: 10rpx 24rpx;
+		padding-bottom: 50rpx;
+	}
 	.box {
 		min-height: 100vh;
 		padding-bottom: 60rpx;
@@ -507,7 +529,10 @@
 	}
 
 	.btnBox {
-		display: flex;
+		display: flex;background: #F4F5F7;
+		border-radius: 24rpx 24rpx 0rpx 0rpx;
+		padding: 26rpx 24rpx;
+		margin-top: -24rpx;
 	}
 
 

pages/user/user.vue

@@ -10,33 +10,75 @@
 				<view class="mes">
 					<view class="nick">
 						<view class="nickName" v-if="nickName">{{nickName}}</view>
-						<view class="grade" v-if="numList.levelName">{{numList.levelName}}</view>
+						<view class="grade" v-if="numList.levelName&&showSetting.isShowLevel">{{numList.levelName}}</view>
 					</view>
 					<view class="phone">{{phone}}  <span @click="seeQr">{{numList.customerInfo.wxMiniV2OpenID?' / 已绑定微信>':' / 未绑定微信>'}}</span> </view>
 				</view>
 			</view>
 
 			<view class="headerBox">
-				<view class="quan" @click="gonavigateTo('../index/discountCard')">
+				<view class="quan" @click="gonavigateTo('../index/discountCard')" v-if="showSetting.isShowCoupon">
 					<view class="numStr">{{numList.count?numList.count:0}}</view>
 					<view class="nameStr">优惠券</view>
 				</view>
-				<view class="quan" @click="gonavigateTo('../integral/integral?totalIntegral='+numList.totalIntegral)">
+				<view class="quan" v-if="showSetting.isShowIntergral" @click="gonavigateTo('../integral/integral?totalIntegral='+numList.totalIntegral)">
 					<view class="numStr">{{numList.totalIntegral?numList.totalIntegral:0}}</view>
 					<view class="nameStr">积分</view>
 				</view>
-				<view class="quan" @click="gonavigateTo('../index/vipCard')">
+				<view class="quan" v-if="showSetting.isShowCard" @click="gonavigateTo('../index/vipCard')">
 					<view class="numStr">{{numList.cardNum?numList.cardNum:0}}</view>
 					<view class="nameStr">会员卡</view>
 				</view>
-				<view class="quan" @click="gonavigateTo('../subPack/vipCard')">
-					<view class="numStr2">{{numList.currentLevel.levelName}}</view>
-					<view class="nameStr">{{numList.currentLevel.endTime?numList.currentLevel.endTime.slice(0,10):'永久'}}</view>
-				</view>
 
 			</view>
+			<view class="remindBox" v-if="numList.remindType!=0">
+			  <view class="remindLeft">
+				  <span>您有</span>
+				  <span style="color: #FFFD00;">{{numList.remindIntegral}}</span>
+				  <span v-if="numList.remindType==1">积分将于本月天内过期</span>
+				  <span v-if="numList.remindType==2">积分将于30天内过期</span>
+			  </view>
+			  <view class="useremind" @click="useremind">去使用></view>
+			</view>
 
 		</view>
+		<view class="marginTop"></view>
+        <!-- 卡制度-->
+		<view v-if="showSetting.isShowCardSystem">
+				<view >
+				<swiper class="swiper2" circular  :autoplay="false" :interval="interval"
+								:duration="duration" :indicator-dots="true" indicator-color="#CCCCCC" :indicator-active-color="'#'+themeColor">
+				
+					<swiper-item v-for="(item,index) in f2csystemlist">
+						<view class="cardBox">
+						  <view class="cardTOp" :style="{background:'url('+item.Banner+')'}">
+							  <img class="vipBsIcon" v-if="item.growthState==1"  src="http://dmsphoto.66km.com.cn/thFiles/91FCABC6-775C-47CA-B7D4-3579A4DE8497.png" alt="">
+						      <view class="cardName">{{item.system.name}}</view>
+							  <!-- 当前卡制度-->
+							  <view class="cardtimeBox" v-if="item.growthState==1">
+								  <view class="cardtimeLeft">成长值 {{numList.f2ccard.growthValue}}/{{item.system.growthvalueup}}</view>
+								  <view class="cartimeRight">有效期 {{numList.f2ccard.expireTime.slice(0,10)}}</view>
+							  </view>
+							  <view class="cardtimeBox" v-if="item.growthState==2">
+								  <view class="cardtimeLeft">高于该等级</view>
+							  </view>
+							  <view class="cardtimeBox" v-if="item.growthState==3">
+							  	 <view class="cardtimeLeft">还差多{{item.addGrowth}}成长值</view>
+							  </view>
+						  </view>
+						  <view class="cardCont">
+							  <view class="cardLine" v-for="(c,cindex) in item.contents">
+								  <view class="cardLineImgBox"></view>
+								  <view class="cardlineTitle">{{c.title}}</view>
+							  </view>
+						  </view>
+						</view>
+					</swiper-item>
+				</swiper>
+			</view>
+			
+		</view>
+      
 
 		<!-- 我的订单 -->
 		<view class="orderBox">
@@ -95,7 +137,7 @@
 		</view>
 
 		<!-- 店铺信息 -->
-		<view class="shopBox" v-if="userInfo">
+		<view class="shopBox" v-if="userInfo&showSetting.isShowCardShop">
 
 			<view class="shopCont">
 				<view class="shopName">{{numList.shopInfo.shopName}}</view>
@@ -147,20 +189,6 @@
 
 		<!-- 我的 相关 -->
 		<view class="rowBoxBg">
-			<view class="rowBox" @click="gonavigateTo('../subPack/depositList')">
-				<view class="leftView">
-					<image src="../../static/img/icon_me1.png" mode="" class="liftIcon"></image>
-					<view class="rowTitle">我的寄存</view>
-				</view>
-				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</view> 
-			 <view class="rowBox" @click="gonavigateTo('../subPack/rescueOrder')">
-				<view class="leftView">
-					<image src="../../static/img/icon_me1.png" mode="" class="liftIcon"></image>
-					<view class="rowTitle">救援订单</view>
-				</view>
-				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</view> 
 			<view class="rowBox" @click="gonavigateTo('../user/expertServices')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me1.png" mode="" class="liftIcon"></image>
@@ -168,8 +196,6 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
-
-
 			<view class="rowBox" @click="gonavigateTo('./addCar/cailist?type=3')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me2.png" mode="" class="liftIcon"></image>
@@ -177,8 +203,6 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
-
-
 			<view class="rowBox" @click="gonavigateTo('myBespeak')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me3.png" mode="" class="liftIcon"></image>
@@ -186,8 +210,6 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
-
-
 			<view class="rowBox" @click="gonavigateTo('historySpend')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me4.png" mode="" class="liftIcon"></image>
@@ -195,7 +217,6 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
-
 			<view class="rowBox" @click="gonavigateTo('checkReport')">
 				<view class="leftView">
 					<image src="../../static/img/icon_me5.png" mode="" class="liftIcon"></image>
@@ -203,28 +224,32 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
-
-			<view class="rowBox" @click="gonavigateTo('myAppraise')">
+			<view class="rowBox" @click="gonavigateTo('../subPack/depositList')">
 				<view class="leftView">
-					<image src="../../static/img/icon_pingjia.png" mode="" class="liftIcon"></image>
-					<view class="rowTitle">我的评价</view>
+					<image src="../../static/timg/icon_jydd.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">我的寄存</view>
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</view>
-			<button open-type="share" class="rowBox">
+			</view> 
+			 <view class="rowBox" @click="gonavigateTo('../subPack/rescueOrder')">
 				<view class="leftView">
-					<image src="../../static/img/icon_me6.png" mode="" class="liftIcon"></image>
-					<view class="rowTitle">分享给好友</view>
+					<image src="../../static/timg/sos.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">救援订单</view>
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
-			</button>
-			<view class="rowBox" @click="gonavigateTo('feedBack')">
+			</view> 
+			
+		</view>
+		<view class="rowBoxBg">
+			<view class="rowBox" @click="gonavigateTo('myAppraise')">
 				<view class="leftView">
-					<image src="../../static/img/icon_me7.png" mode="" class="liftIcon"></image>
-					<view class="rowTitle">意见反馈</view>
+					<image src="../../static/img/icon_pingjia.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">我的评价</view>
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
+		</view>
+		<view class="rowBoxBg" v-if="kkshow">
 			<view class="rowBox" @click="gonavigateTo('../partner/partner')"
 				v-if="numList.customerInfo.pState==1&&numList.shopSettings.partnerDisabled">
 				<view class="leftView">
@@ -241,6 +266,49 @@
 				</view>
 				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
 			</view>
+		</view>
+		<view class="rowBoxBg">
+			<view class="rowBox" v-if="showSetting.isShowTel">
+				<view class="leftView">
+					<image src="../../static/timg/icon_qingchu.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">{{showSetting.telTitle}}</view>
+				</view>
+				<view class="rowRight">{{showSetting.tel}}</view>
+			</view>
+			<view class="rowBox" v-if="showSetting.isShowMember" @click="gomember(showSetting.memberTitle)">
+				<view class="leftView">
+					<image src="../../static/timg/icon_yijian.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">{{showSetting.memberTitle}}</view>
+				</view>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
+			</view> 
+			<view class="rowBox" v-if="showSetting.isShowAbout" @click="gonavigateaboutUS">
+				<view class="leftView">
+					<image src="../../static/timg/icon_fenxiang.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">{{showSetting.aboutTitle}}</view>
+				</view>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
+			</view> 
+			
+		</view>
+		<view class="rowBoxBg">
+		
+			<button open-type="share" class="rowBox">
+				<view class="leftView">
+					<image src="../../static/img/icon_me6.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">分享给好友</view>
+				</view>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
+			</button>
+			<view class="rowBox" @click="gonavigateTo('feedBack')">
+				<view class="leftView">
+					<image src="../../static/img/icon_me7.png" mode="" class="liftIcon"></image>
+					<view class="rowTitle">意见反馈</view>
+				</view>
+				<image src="../../static/img/big_rightArrow.png" mode="" class="big_rightArrow"></image>
+			</view>
+			
+			
 			<!-- <view class="rowBox" @click="gonavigateTo('../report/working?id=56D5F8C1-9F11-40BA-8937-B4AABD4666B5')">
 				<view class="leftView">
 					<image src="../../static/img/icon_kehuzhuanjieshao.png" mode="" class="liftIcon"></image>
@@ -322,6 +390,11 @@
 				release_version: '',
 				qrimg:'',
 				qrSHow:false,
+				kkshow:false,
+				duration:500,
+				interval:3000,
+				showSetting:'',
+				f2csystemlist:'',
 			}
 		},
 		onLoad(opt) {
@@ -415,6 +488,22 @@
 					url: 'ShopAppraiseList?shopID=' + this.numList.shopInfo.id
 				})
 			},
+			useremind(){
+				uni.navigateTo({
+					url: '../integral/integral'
+				})
+			},
+			gonavigateaboutUS(){
+				uni.navigateTo({
+					url: '../index/aboutUS?unionID='+this.numList.customerInfo.unionID
+				})
+				
+			},
+			gomember(memberTitle){
+				uni.navigateTo({
+					url: '../index/aboutUS?unionID='+this.numList.customerInfo.unionID+'&memberTitle='+memberTitle
+				})
+			},
 			getVersionInfo() {
 				this.$http('miniApp2/sys/getVersionInfo', {
 					appId: this.ext.appId,
@@ -480,6 +569,13 @@
                         }, 1000); */
 						that.queryMyDetail()
 						
+						if(this.numList.customerInfo.pState==1&&this.numList.shopSettings.partnerDisabled){
+							this.kkshow=true
+						}
+						if(this.numList.customerInfo.rebateState==1&&this.numList.shopSettings.introductionDisabled){
+							this.kkshow=true
+						}
+						
 					}
 				})
 			},
@@ -548,8 +644,8 @@
 					this.headImg = res.data.openUser.headImg;
 					this.nickName = res.data.openUser.nickName;
 					this.phone = res.data.openUser.mobilePhone;
-
-
+                    this.showSetting=res.data.showSetting
+                    this.f2csystemlist=res.data.f2csystemlist
 				})
 			},
 			gonavigateTo(url) {
@@ -608,6 +704,77 @@
 </script>
 
 <style scoped>
+.remindBox{
+	width: 596rpx;
+	box-shadow: 0rpx 0rpx 8rpx 0rpx rgba(153,153,153,0.1);
+	background: rgba(255,255,255,0.1);
+	display: flex;justify-content: space-between;
+	    margin: 0 auto;font-size: 22rpx;
+		padding: 9rpx 20rpx;
+		color: #FFFFFF;
+		line-height: 30rpx;
+}
+.useremind{
+	font-weight: 500;
+	color: #FFFD00;
+}
+.swiper2{
+		height: 495rpx;
+	/* 	margin-top: -100rpx; */
+}
+.marginTop{
+	margin-top: -90rpx;
+}
+.cardBox{
+	width: 702rpx;
+	height: 495rpx;
+	background: #FFFFFF;
+	border-radius: 22rpx;
+	margin-left:24rpx ;
+	
+	    overflow: hidden;
+}
+.cardCont{
+	display: flex;
+	flex-wrap: wrap;
+}
+.cardLineImgBox{
+	width: 84rpx;
+	height: 84rpx;
+	background: linear-gradient(150deg, #222439 0%, #1A2027 100%);
+	border-radius: 50%;
+	margin: 0 auto;
+	margin-top: 30rpx;
+}
+.cardlineTitle{
+	color: #3C3C3C;font-size: 24rpx;
+	line-height: 33rpx;padding-top: 10rpx;
+}
+.cardLine{
+	width: 25%;
+	text-align: center;
+}
+.rowRight{
+	color: #666666;font-size: 28rpx;padding-right: 32rpx;
+}
+.cardTOp{
+	height: 155rpx;
+	background-size: 100% 100%;
+	position: relative;
+	
+}
+.vipBsIcon{
+	position: absolute;width: 112rpx;height: 33rpx;top: 0;right: 0;
+}
+.cardName{
+	font-weight: 500;font-size: 30rpx;padding-top: 30rpx;padding-left: 30rpx;
+	color: #50402A;
+}
+.cardtimeBox{
+	display: flex;justify-content: space-between;
+	color: #786140;font-size: 24rpx;
+	padding-top: 20rpx;padding-left: 30rpx;padding-right: 20rpx;
+}
 	.qrBox{
 		position: fixed;
 		width: 100vw;
@@ -775,8 +942,7 @@
 
 
 	.headerBox {
-		padding: 30rpx 24rpx;
-
+		padding: 16rpx 24rpx;
 		display: flex;
 		justify-content: space-around;
 	}
@@ -785,14 +951,13 @@
 		display: flex;
 		flex-direction: column;
 		align-items: center;
-		height: 120rpx;
 	}
 
 	.numStr {
-		font-size: 40rpx;
+		font-size: 32rpx;
 		font-weight: bold;
 		color: #FFFFFF;
-		line-height: 56rpx;
+		line-height: 45rpx;
 	}
     .numStr2{
 		font-size: 40rpx;
@@ -811,7 +976,7 @@
 		background: #FFFFFF;
 		padding: 30rpx 20rpx;
 		border-radius: 10rpx;
-		margin-top: -100rpx;
+		margin-top: 20rpx;
 	}
 
 

utils/request.js

@@ -9,7 +9,7 @@ import $store from '../store'
 const extConfig = uni.getExtConfigSync();		
 console.log(extConfig)
 const baseUrl=extConfig.url+'/'
-//const baseUrl='http://192.168.0.146:20187/'
+//const baseUrl='http://192.168.0.127:20189/'
 //const baseUrl='http://192.168.0.174:20187/'
 //const baseUrl='http://dms.66km.com.cn/'