优化

pages.json

@@ -403,7 +403,7 @@
             "path" : "pages/user/myReservation/myReservation",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -411,7 +411,7 @@
             "path" : "pages/user/myReservation/reservationListDetails",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -420,7 +420,7 @@
             "path" : "pages/user/preengaged/preengaged",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -428,7 +428,7 @@
             "path" : "pages/user/preengaged/preengagedListDetails",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -437,7 +437,7 @@
             "path" : "pages/user/myPile/myPile",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -445,7 +445,7 @@
             "path" : "pages/user/myPile/pileManagement",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -453,7 +453,7 @@
             "path" : "pages/MyInvoice/invoiceManagement",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -461,7 +461,7 @@
             "path" : "pages/MyInvoice/issueInvoice",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -469,7 +469,7 @@
             "path" : "pages/MyInvoice/invioceExplain",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -477,7 +477,7 @@
             "path" : "pages/MyInvoice/invioceResult",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -485,7 +485,7 @@
             "path" : "pages/MyInvoice/invoiceDetail",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -493,7 +493,7 @@
             "path" : "pages/MyInvoice/invoicePreview",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -501,7 +501,7 @@
             "path" : "pages/MyInvoice/invoiceTitleManagement",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -509,7 +509,7 @@
             "path" : "pages/MyInvoice/editInvoiceTitle",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -517,7 +517,7 @@
             "path" : "pages/parking/registration",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -526,7 +526,7 @@
 				    "path" : "pages/parking/temCarNumber",
 				    "style" :                                                                                    
 				    {
-				        "navigationBarTitleText": "",
+				        
 				        "enablePullDownRefresh": false
 				    }
 				    
@@ -535,7 +535,7 @@
             "path" : "pages/parking/request",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -544,7 +544,7 @@
             "path" : "pages/parking/outPayment",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -553,7 +553,7 @@
             "path" : "pages/parking/paymentResult",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -562,7 +562,7 @@
             "path" : "pages/user/appointmentExplain",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -570,7 +570,7 @@
             "path" : "pages/user/receiveCoupon",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -578,7 +578,7 @@
             "path" : "pages/monthlyCardActivity/monthlyCardBuy",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -586,7 +586,7 @@
             "path" : "pages/monthlyCardActivity/monthlyCardList",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -598,7 +598,7 @@
             "path" : "pages/monthlyCardActivity/openResult",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -607,7 +607,7 @@
             "path" : "pages/monthlyCardActivity/openResult",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -616,7 +616,7 @@
             "path" : "pages/user/dataSet",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -625,7 +625,7 @@
             "path" : "pages/user/contactService",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -635,7 +635,7 @@
             "path" : "pages/user/mine",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -644,7 +644,7 @@
             "path" : "pages/user/company-vip",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -655,7 +655,7 @@
             "path" : "pages/index/all",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -664,7 +664,7 @@
             "path" : "pages/newPage/stationDetailVmode/stationDetailVmode",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -673,7 +673,7 @@
             "path" : "pages/newPage/mineVmode/mineVmode",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -682,7 +682,7 @@
             "path" : "pages/newPage/mineVmode/notLogin",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -691,7 +691,7 @@
             "path" : "pages/newPage/chargeMoney/chargeMoney",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -700,7 +700,7 @@
             "path" : "pages/newPage/chargeMoney/financialDetails",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -709,7 +709,7 @@
             "path" : "pages/newPage/chargeMoney/topUp",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -718,7 +718,7 @@
             "path" : "pages/newPage/chargeMoney/withdraw",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -727,7 +727,7 @@
             "path" : "pages/newPage/chargeMoney/transferResult",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -737,7 +737,7 @@
             "path" : "pages/discountCard/productDetails",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -746,7 +746,7 @@
             "path" : "pages/discountCard/confirmOrder",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -755,7 +755,7 @@
             "path" : "pages/discountCard/paymentSuccess",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -764,7 +764,7 @@
             "path" : "pages/discountCard/myOrder",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -773,7 +773,7 @@
             "path" : "pages/discountCard/orderDetails",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -782,7 +782,7 @@
             "path" : "pages/service/service",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -791,7 +791,7 @@
             "path" : "pages/cardBag/cardBag",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -800,7 +800,7 @@
             "path" : "pages/cardBag/cardDetails",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
 		},
@@ -808,7 +808,7 @@
             "path" : "pages/index/activity",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
 
@@ -817,7 +817,7 @@
             "path" : "pages/index/openyed",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -826,7 +826,7 @@
             "path" : "pages/user/member/member",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -835,7 +835,7 @@
             "path" : "pages/user/member/index",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -844,7 +844,7 @@
         	"path" : "pages/user/sharePicc",
         	"style" : 
         	{
-        		"navigationBarTitleText" : "",
+        		
         		"enablePullDownRefresh" : false
         	}
         }
@@ -852,7 +852,7 @@
             "path" : "pages/cardBag/cardBagNew",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -861,7 +861,7 @@
             "path" : "pages/cardBag/cardDetail",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+              
                 "enablePullDownRefresh": false
             }
             
@@ -870,7 +870,7 @@
             "path" : "pages/cardBag/nonactivatedCard",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             
@@ -879,7 +879,7 @@
             "path" : "pages/cardBag/getCard",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "",
+                
                 "enablePullDownRefresh": false
             }
             

pages/cardBag/cardDetail.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<ujp-navbar title="会员卡详情">
+		<ujp-navbar title="会员卡详情" :isBack="isMe" >
 			<view slot="right" style="margin-right: 10px;">
 
 				<view class="iconfont qr-code"  @click="openModalBl=true">
@@ -151,7 +151,7 @@
 						绑定账号
 					</view>
 					<view class="item-value">
-						{{userInfo.phone}}
+						{{getphone(userInfo.phone)}}
 					</view>
 				</view>
 				<view class="item">
@@ -159,7 +159,8 @@
 						绑定车辆
 					</view>
 					<view class="item-value">
-						{{carNum}}
+						
+						{{userInfo.carNum}}
 					</view>
 				</view>
 			</view>
@@ -167,6 +168,14 @@
 				卡片信息
 			</view>
 			<view class="details">
+				<view class="item">
+					<view class="item-title">
+						卡状态
+					</view>
+					<view class="item-value">
+						已激活
+					</view>
+				</view>
 				<view class="item">
 					<view class="item-title">
 						卡名
@@ -210,7 +219,7 @@
 						剩余度数
 					</view>
 					<view class="item-value">
-						{{item.chargedDegree}}度
+						{{(regUserCard.chargeDegreeLimit-regUserCard.chargedDegree).toFixed(0)}}度
 					</view>
 				</view>
 				<view class="item">
@@ -237,6 +246,7 @@
 	// import * as API from '@/apis/index.js'
 	import * as API from '@/apis/order.js'
 	import * as API_weixin from '@/apis/weixin.js'
+	import wx from 'weixin-js-sdk'
 	
 	import {
 		newDate,
@@ -270,7 +280,7 @@
 		onLoad(op) {
 			this.id = op.id
 			this.get_wx_config();
-			this.userInfo=this.carhelp.getPersonInfo()
+			//this.userInfo=this.carhelp.getPersonInfo()
 			this.projectName = process.car.ProjectName;
 			
 			var info=this.carhelp.getPersonInfo()
@@ -292,6 +302,15 @@
 
 		},
 		methods: {
+			getphone(phone){
+				var phoneget=""
+				if (phone) {
+					var phone1 = phone.slice(0, 3);
+					var phone2 = phone.slice(-4);
+					phoneget = phone1 + '****' + phone2;
+				}
+				return phoneget;
+			},
 			show2Btn(){
 				var info=this.carhelp.getPersonInfo()
 				if(info.id&&info.userType==2){
@@ -336,7 +355,7 @@
 				var _this = this
 				API_weixin.getConfig().then(response => {
 					var wxconfig = response.data.wxConfig;
-			
+						console.log(222)
 					wx.config({
 						debug: false, // 开启调试模式,
 						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
@@ -347,9 +366,10 @@
 						'updateTimelineShareData','onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareQZone'], // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
 			
 					});
+					console.log(222)
 					_this.wxShare()
 					wx.error(function(res) {
-						//('微信api配置出错');
+						console.log('微信api配置出错');
 					});
 				}).catch(error => {
 			
@@ -359,6 +379,7 @@
 			},
 			//微信分享自定义
 			wxShare() {
+				console.log(111)
 				var img =
 					"http://oss.xiaoxinda.com/charging/chargingconfigure/2022/6/6/ec228c56-487a-4ae1-ac6f-37284060fbba/hongbao.jpg"
 				// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
@@ -370,14 +391,25 @@
 				////(this.nowItem);
 				var ProjectName = process.car.ProjectName; //info.nickName+
 				var nickName = info.nickName ? info.nickName : '好友';
-				var title = nickName + "赠送您一张充电折扣卡"
+				var title = nickName + "赠送您一张"
+				if(this.item.classify==1){
+					title+="'服务费月卡'"
+				}else if(this.item.classify==2&&this.item.serviceFeeDiscountRate==60){
+					title+="'服务费6折卡'"
+				}else if(this.item.classify==2&&this.item.serviceFeeDiscountRate==50&&this.item.periodOfValidity==365){
+					title+="'充电5折卡年卡'"
+				}else if(this.item.classify==2&&this.item.serviceFeeDiscountRate==50){
+					title+="'服务费5折卡'"
+				}
 				//"["+ProjectName+"]"+'和好友一起领5元红包'
+				// <img  v-if="item.classify==1" src="@/assets/img/monthCard.png" alt="">
+				// <img v-else-if="item.classify==2&&item.serviceFeeDiscountRate==60" src="@/assets/img/0.6off.png" alt="">
+				// <img v-else-if="item.classify==2&&item.serviceFeeDiscountRate==50" src="@/assets/img/halfoff.png" alt="">
+				// <img v-else src="@/assets/img/monthCard.png" alt="">
 				var desc = ProjectName
 				let joinUrl = window.location.href.split("/team51/")[0] + "/team51/#/pages/cardBag/cardDetail?id="+this.id
 				//this.joinUrl=joinUrl;
-				if(info.id){
-					joinUrl+="&sid=" + info.id;
-				}
+			
 				var _this=this;
 				wx.ready(function() {
 					
@@ -508,9 +540,11 @@
 					uni.hideLoading();
 					this.item = res.data.monthlyRentCard;
 					this.regUserCard = res.data.regUserCard;
-					if(this.regUserCard.status==1){
-						this.regUserCarList()
-					}
+					// if(this.regUserCard.status==1){
+					// 	this.regUserCarList()
+					// }
+					this.userInfo=res.data.buyUser;
+					
 					var info=this.carhelp.getPersonInfo()
 					
 					if(info&&info.id&&info.id==this.regUserCard.regUserId){

pages/cardBag/cardDetails.vue

@@ -50,7 +50,7 @@
 					<view class="time">
 						{{thisendTime(regUserCard.endTime)}}到期 剩余{{thisdaysDistance(regUserCard.endTime)}}天
 					</view>
-					<view class="electric-quantity"  v-if="regUserCard.classify==1">
+					<view class="electric-quantity"  v-if="regUserCard.classify==2">
 						已用{{regUserCard.chargedDegree}}度 / 共{{regUserCard.chargeDegreeLimit}}度
 					</view>
 				</view>