Merge branch 'master' of http://47.92.161.104:10080/zkx/JP-ChargeTeam51

.env.dev.js

@@ -16,7 +16,7 @@ const UNI_APP = {
 	openId:"zkxtest",//zkx
 	
 	openId:"oK9Wr54VbEh3xvWYmD_zT5NbH4AY",//zkx
-	openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
+	//openId:"oK9Wr59rru-i3bm7dtTtxnkR-i4s",//杨所
 	//openId:"oK9Wr56vX9nP_B56_Pyigg5n5Ce8",//
 	//openId:"oK9Wr5_2USr1yP4MRew9KbJA0-ng",//老板
 	//openId:"oK9Wr5-ViXQMUP2cjiW3bGIABj1Q",

apis/order.js

@@ -1,5 +1,6 @@
 
 import request from '../utils/request.js';
+import requestWhite from '../utils/requestWhite.js';
 
 
 export function buyCardList(data) {
@@ -16,9 +17,27 @@ export function buyCardList(data) {
 
 export function buyCardDetail(data) {
 	 
-	return request({
+	return requestWhite({
 		method: 'post',
 		data:data ,
 		url: '/mobile/regUserCard/buyCardDetail'
 	})
 }
+
+export function activateCard(data) {
+	 
+	return request({
+		method: 'post',
+		data:data ,
+		url: '/mobile/regUserCard/activateCard'
+	})
+}
+
+
+export function regUserCarList () {
+	 
+	return request({
+		method: 'get',
+		url: '/mobile/regUser/regUserCarList'
+	})
+}

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,10 +844,46 @@
         	"path" : "pages/user/sharePicc",
         	"style" : 
         	{
-        		"navigationBarTitleText" : "",
+        		
         		"enablePullDownRefresh" : false
         	}
         }
+        ,{
+            "path" : "pages/cardBag/cardBagNew",
+            "style" :                                                                                    
+            {
+                
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/cardBag/cardDetail",
+            "style" :                                                                                    
+            {
+              
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/cardBag/nonactivatedCard",
+            "style" :                                                                                    
+            {
+                
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/cardBag/getCard",
+            "style" :                                                                                    
+            {
+                
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationStyle": "custom", // 隐藏系统导航栏

pages/article/newsNotice.vue

@@ -2,10 +2,8 @@
 	<view style="background-color: #fff;" >
 		<ujp-navbar title="活动公告"></ujp-navbar>
 		
-		<view class="options">
-			<view class="options-item">
-				<u-tabs :font-size="elderStatus ? 36 : 30" :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#333" inactive-color="#c4c0c0"></u-tabs>
-			</view>
+		<view class="options-item">
+			<u-tabs :font-size="elderStatus ? 36 : 30" :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#333" inactive-color="#c4c0c0"></u-tabs>
 		</view>
 		
 		<view class="swiper-box" 
@@ -218,5 +216,6 @@
 		}
 	}
 	
-
+	
+	
 </style>

pages/cardBag/cardBag.vue

@@ -1,282 +1,361 @@
-<template>
-	<view>
-		<ujp-navbar title="我的卡包"></ujp-navbar>
-		<view class="tabs">
-			<u-tabs bar-width="80" active-color="#333333" inactive-color="#999999" :list="list" :is-scroll="false"
-				:current="current" @change="change"></u-tabs>
-		</view>
-		<view class="main">
-			
-			
-			<view class="mcorporate-member" v-if="current==0"  v-for="(item,i) in  businessVipList"
-			  @click="gotoUrl('pages/user/company-vip?id='+item.vipUser.platform)"  :key="i"  >
-			 
-			  <view class="icon">
-			  	<img src="../../assets/img/corporateMember.png" alt="">
-			  </view>
-			  <view class="infos">
-			  	<view class="name">
-			  		企业会员
-			  	</view>
-				<view class="company">
-					{{item.vipUser.platformN}}
-				</view>
-				<view class="balance" v-if="item.vipUser.entAccountEnabled&&item.enterpriseAccount!=null">
-					企业账户余额：{{item.enterpriseAccount.totalAmount?item.enterpriseAccount.totalAmount.toFixed(2):'0.00'}}元
-					
-				</view>
-			  </view>
-			</view>
-			<template v-for="(item,i) in showList">
-				<view class="monthly-payment"  @click="gotoUrl('pages/monthlyCardActivity/monthlyCardBuy')"
-				
-				:key="i+'a'" v-if="item.classify==1" >
-				  <view class="icon">
-				  	<img src="../../assets/img/monthlyPayment.png" alt="">
-				  </view>
-				  <view class="infos">
-				  	<view class="name">
-				  		服务费包月会员
-				  	</view>
-					<view class="date">
-						{{item.endTime.substring(0,10)}}到期
-					</view>
-				  </view>
-				</view>
-				
-				<view class="discount-card"    @click="gotocardDetails(item)"
-				:key="i+'b'" v-if="item.classify==2">
-					<view class="name">
-						{{item.cardName}}
-					</view>
-					<view class="progress">
-						<view class="time">
-							{{thisendTime(item.endTime)}}到期 剩余{{thisdaysDistance(item.endTime)}}天
-						</view>
-						<view class="electric-quantity">
-							已用{{item.chargedDegree?item.chargedDegree.toFixed(0):0.00}}度 / 共{{item.chargeDegreeLimit}}度
-						</view>
-					</view>
-					<ujp-line-progress active-color="#2979ff" :percent="thispercent(item)"></ujp-line-progress>
-				</view>
-			
-			</template>
-			
-			
-			<view class="carNone" v-if="current==0&&businessVipList.length==0&&showList.length==0">
-				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无数据</p>
-			</view>
-			<view class="carNone" v-if="current==1&&expireUserCardList.length==0">
-				<img src="static/img/暂无数据-缺省页.png" alt="">
-				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无数据</p>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/index.js'
-	import {
-		newDate,daysDistance
-		
-	} from '@/utils'
-	export default {
-		data() {
-			return {
-				list: [{
-					name: '生效中'
-				}, {
-					name: '已过期'
-				}],
-				expireUserCardList:[],
-				cardList:[],
-				pageIndex: 1,
-				recordsTotal: 0,
-				current: 0,
-				businessVipList:[],
-				userCard:null,
-			}
-		},
-		computed:{
-			showList(){
-				if(this.current==0 ){
-					
-					return  this.cardList
-				}
-				if(this.current==1){
-					
-					return  this.expireUserCardList
-				}
-				return []
-			},
-			userCardBool(){
-				if(this.userCard){
-					var date=new Date().getTime()
-					//var reg=new RegExp('-','gi')
-					var str=this.userCard.endTime;
-					//console.log(str.replace(reg,'/'))
-					var date2=newDate(str).getTime();
-					
-					if(date<date2){
-						
-						return true;
-					}
-				}
-				return false
-			}
-		},
-		onReady() {
-			
-			
+<template>
+	<view>
+		<ujp-navbar title="我的卡包"></ujp-navbar>
+		<view class="tabs">
+			<u-tabs bar-width="80" active-color="#333333" inactive-color="#999999" :list="list" :is-scroll="false"
+				:current="current" @change="change"></u-tabs>
+		</view>
+		<view class="main" :class="{
+			opacityClass:show
+		}">
+
+			<view class="discount-card" v-if="current==0" v-for="(item,i) in  businessVipList"
+				@click="gotoUrl('pages/user/company-vip?id='+item.vipUser.platform)" :key="i">
+				<view class="name">
+
+					<img src="../../assets/img/corporateMember.png" alt="">
+
+				</view>
+
+				<view class="progress">
+					<view class="time">
+						{{item.vipUser.platformN}}
+					</view>
+					<view class="electric-quantity" v-if="item.vipUser.entAccountEnabled&&item.enterpriseAccount" >
+						企业账户余额：{{item.enterpriseAccount.totalAmount?item.enterpriseAccount.totalAmount.toFixed(2):'0.00'}}元
+
+					</view>
+
+				</view>
+
+			</view>
+
+
+			<template v-for="(item,i) in showList">
+
+
+				<view class="discount-card" @click="gotocardDetails(item)" :key="i+'b'">
+					<view class="name" v-if="item.classify==1">
+
+						<img src="@/assets/img/monthCard.png" alt="">
+
+					</view>
+					<view class="name" v-if="item.classify==2">
+
+						<img v-if="item.serviceFeeDiscountRate==60" src="@/assets/img/0.6off.png" alt="">
+						<img v-else-if="item.serviceFeeDiscountRate==50" src="@/assets/img/halfoff.png" alt="">
+						<img v-else src="@/assets/img/monthCard.png" alt="">
+					</view>
+					<view class="progress">
+						<template v-if="current==2">
+							<view class="time">
+								<span v-if="item.classify==1">服务费全免</span>
+								<span
+									v-if="item.classify==2">可用{{item.chargeDegreeLimit}}度</span>（有效期{{item.periodOfValidity}}天）
+							</view>
+							<view class="electric-quantity">
+								发卡日期：{{item.createTime.substring(0,10)}}
+							</view>
+						</template>
+						<template v-else>
+
+							<view class="time">
+								{{thisendTime(item.endTime)}}到期 剩余{{thisdaysDistance(item.endTime)}}天
+							</view>
+							<view class="electric-quantity" v-if="item.classify==2">
+								已用{{item.chargedDegree?item.chargedDegree.toFixed(0):0.00}}度 /
+								共{{item.chargeDegreeLimit}}度
+							</view>
+						</template>
+
+					</view>
+					<ujp-line-progress v-if="current!=2" active-color="#2979ff"
+						:percent="thispercent(item)"></ujp-line-progress>
+					<img class="corner-mark" v-if="current==2" src="@/assets/img/nonactivated.png" alt="">
+
+				</view>
+
+			</template>
+
+
+			<view class="carNone" v-if="current==0&&businessVipList.length==0&&showList.length==0">
+				<img src="static/img/暂无数据-缺省页.png" alt="">
+				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无数据</p>
+			</view>
+			<view class="carNone" v-if="current==1&&expireUserCardList.length==0">
+				<img src="static/img/暂无数据-缺省页.png" alt="">
+				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无数据</p>
+			</view>
+			<view class="carNone" v-if="current==2&&notActiveCardList.length==0">
+				<img src="static/img/暂无数据-缺省页.png" alt="">
+				<p class="oldTextjp2" oldstyle="font-size: 18px;">暂无数据</p>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/index.js'
+	import {
+		newDate,
+		daysDistance
+
+	} from '@/utils'
+	export default {
+		data() {
+			return {
+				list: [{
+					name: '生效中'
+				}, {
+					name: '已过期'
+				}, {
+					name: '未激活',
+					count: 0
+				}],
+				expireUserCardList: [],
+				cardList: [],
+				pageIndex: 1,
+				recordsTotal: 0,
+				current: 0,
+				businessVipList: [],
+				userCard: null,
+				notActiveCardList: [],
+			}
+		},
+		computed: {
+			showList() {
+				if (this.current == 0) {
+
+					return this.cardList
+				}
+				if (this.current == 1) {
+
+					return this.expireUserCardList
+				}
+				if (this.current == 2) {
+					return this.notActiveCardList
+				}
+				return []
+			},
+			userCardBool() {
+				if (this.userCard) {
+					var date = new Date().getTime()
+					//var reg=new RegExp('-','gi')
+					var str = this.userCard.endTime;
+					//console.log(str.replace(reg,'/'))
+					var date2 = newDate(str).getTime();
+
+					if (date < date2) {
+
+						return true;
+					}
+				}
+				return false
+			}
+		},
+		onReady() {
+
+
+			
+
+		},onShow() {
 			this.getChargeList();
-			
-		},
-		 
-		methods: {
-			gotocardDetails(item){
-				this.carhelp.set("cardDetails-info",item)
-				uni.navigateTo({
-					url:'/pages/cardBag/cardDetails?id='+item.id
-				})
+		},
+
+		methods: {
+			gotocardDetails(item) {
+
+				this.carhelp.set("cardDetails-info", item)
+				uni.navigateTo({
+					url: '/pages/cardBag/cardDetail?id=' + item.id
+				})
+
+			},
+			thisdaysDistance(endTime) {
+
+				var date = new Date()
+				var date2 = newDate(endTime);
+				return daysDistance(date, date2)
+
 			},
-			 thisdaysDistance(endTime){
-			
-				 var date=new Date()
-				 var date2=newDate(endTime);
-				 return daysDistance(date,date2)
-				 
-			 },
-			getChargeList() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				
-				API.personCardList({
-				
-				}).then((res) => {
-					uni.hideLoading();
-					this.cardList = res.data.cardList;
-					
-					this.expireUserCardList = res.data.expireUserCardList;
-					//this.recordsTotal = res.data.recordsTotal;
-					this.businessVipList=res.data.memberCardList;
-					
-					
+			
+			getChargeList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+
+				API.personCardList({
+
+				}).then((res) => {
+					uni.hideLoading();
+					this.cardList = res.data.cardList;
+					this.notActiveCardList = res.data.notActiveCardList;
+					this.list[2].count = this.notActiveCardList.length;
+					this.expireUserCardList = res.data.expireUserCardList;
+					//this.recordsTotal = res.data.recordsTotal;
+					this.businessVipList = res.data.memberCardList;
+
+
+
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			thisendTime(endTime) {
+				if (endTime) {
+					var reg = new RegExp('-', 'gi')
+					var str = endTime.substring(0, 10).replace(reg, '.')
+					return str
+				}
+				return ''
+			},
+			thispercent(userCard) {
+				if(userCard.classify==1){
+					var k1=daysDistance(userCard.startTime, userCard.endTime)
+					var k2=this.thisdaysDistance(userCard.endTime)
+					var p=(k1-k2)/k2* 100
+					if (p > 100) {
+						p = 100
+					}
+					return p.toFixed(0)
+				}else if(userCard.classify==2){
+					var p = 0
 					
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			thisendTime(endTime){
-				if(endTime){
-					var reg=new RegExp('-','gi')
-					var str=endTime.substring(0,10).replace(reg,'.')
-					return str
-				}
-				return ''
-			},
-			thispercent(userCard){
-				var p=0
-				
-				if(userCard&&userCard.chargeDegreeLimit){
-					p=userCard.chargedDegree/userCard.chargeDegreeLimit*100
-				}
-				if(p>100){
-					p=100
-				}
-				return p.toFixed(0)
-			},
-			 
-			change(index) {
-				this.current = index;
-				
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.carNone{
-		display: flex;
-		flex-direction: column;
-		justify-content: center;
-		align-items: center;
-		img{
-			width: 100%;
-			height: 100%;
-		}
-		p{
-			margin-top: -60px;
-		}
-	}
-	/deep/.u-tab-bar {
-		background-color: #00B962 !important;
-	}
-
-	.main {
-		padding: 0 32rpx;
-		.monthly-payment,.mcorporate-member{
-			height: 160rpx;
-			border-radius: 8px;
-			background-color: rgba(55, 59, 80, 1);
-			padding-left: 24rpx;
-			margin-top: 24rpx;
-			display: flex;
-			align-items: center;
-			.icon{
-				width: 80rpx;
-				height: 80rpx;
-				img{
-					width: 100%;
-				}
-			}
-			.infos{
-				margin-left: 16rpx;
-				.name{
-					color: rgba(225, 192, 130, 1);
-					font-size: 32rpx;
-				}
-				.date{
-					color: rgba(211, 185, 134, 1);
-					font-size: 24rpx;
-				}
-				.company{
-					color: rgba(204, 204, 204, 1);
-					font-size: 24rpx;
-				}
-				.balance{
-					color: rgba(219, 219, 219, 1);
-					font-size: 24rpx;
-
-				}
-			}
-		}
-		.discount-card{
-			
-			border-radius: 8px;
-			background-color: rgba(55, 59, 80, 1);
-			padding: 24rpx;
-			margin-top: 24rpx;
-			
-			.name{
-				color: rgba(255, 255, 255, 1);
-				font-size: 32rpx;
-			}
-			.progress{
-				display: flex;
-				justify-content: space-between;
-				color: rgba(219, 219, 219, 1);
-				font-size: 24rpx;
-				margin-bottom: 16rpx;
-			}
-			/deep/.u-active{
-				background: linear-gradient(84.49deg, rgba(59,182,254,1) 4.25%,rgba(0,185,98,1) 95.02%);
-			}
-		}
-	}
+					if (userCard && userCard.chargeDegreeLimit) {
+						p = userCard.chargedDegree / userCard.chargeDegreeLimit * 100
+					}
+					if (p > 100) {
+						p = 100
+					}
+					return p.toFixed(0)
+				}else{
+					return 0
+				}
+				
+			},
+
+			change(index) {
+				this.current = index;
+
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.opacityClass {
+		opacity: 0.2;
+	}
+
+	.carNone {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+
+		img {
+			width: 100%;
+			height: 100%;
+		}
+
+		p {
+			margin-top: -60px;
+		}
+	}
+
+	/deep/.u-tab-bar {
+		background-color: #00B962 !important;
+	}
+
+	.main {
+		padding: 0 32rpx;
+
+		.monthly-payment,
+		.mcorporate-member {
+			height: 160rpx;
+			border-radius: 8px;
+			background-color: rgba(55, 59, 80, 1);
+			padding-left: 24rpx;
+			margin-top: 24rpx;
+			display: flex;
+			align-items: center;
+
+			.icon {
+				width: 80rpx;
+				height: 80rpx;
+
+				img {
+					width: 100%;
+				}
+			}
+
+			.infos {
+				margin-left: 16rpx;
+
+				.name {
+					color: rgba(225, 192, 130, 1);
+					font-size: 32rpx;
+				}
+
+				.date {
+					color: rgba(211, 185, 134, 1);
+					font-size: 24rpx;
+				}
+
+				.company {
+					color: rgba(204, 204, 204, 1);
+					font-size: 24rpx;
+				}
+
+				.balance {
+					color: rgba(219, 219, 219, 1);
+					font-size: 24rpx;
+
+				}
+			}
+		}
+
+		.discount-card {
+			position: relative;
+
+			.corner-mark {
+				width: 112rpx;
+				height: 112rpx;
+				position: absolute;
+				top: 0;
+				right: 0;
+			}
+
+			border-radius: 8px;
+			background-color: rgba(55, 59, 80, 1);
+			padding: 24rpx;
+			margin-top: 24rpx;
+
+			.name {
+				color: rgba(255, 255, 255, 1);
+				font-size: 32rpx;
+
+				img {
+					width: 262rpx;
+					height: 56rpx;
+				}
+			}
+
+			.progress {
+				display: flex;
+				justify-content: space-between;
+				color: rgba(219, 219, 219, 1);
+				font-size: 24rpx;
+				margin-bottom: 16rpx;
+			}
+
+			/deep/.u-active {
+				background: linear-gradient(84.49deg, rgba(59, 182, 254, 1) 4.25%, rgba(0, 185, 98, 1) 95.02%);
+			}
+		}
+	}
 </style>

pages/cardBag/cardBagNew.vue

@@ -0,0 +1,273 @@
+<template>
+	<view>
+		<ujp-navbar title="我的卡包"></ujp-navbar>
+		<view class="tabs">
+			<view class="tag">
+				1
+			</view>
+			<u-tabs bar-width="80" active-color="#333333" inactive-color="#999999" :list="list" :is-scroll="false"
+				:current="current" @change="change"></u-tabs>
+		</view>
+
+		<!-- 未激活 -->
+		<view class="nonactivated" v-if="current==0">
+			<view class="card-box">
+				<img src="@/assets/img/halfoff.png" alt="">
+				<view class="text">
+					可用4500度（有效期365天）
+				</view>
+				<img class="corner-mark" src="@/assets/img/nonactivated.png" alt="">
+			</view>
+		</view>
+		<!-- 生效中 -->
+		<view class="active" v-if="current==1">
+			<!-- 企业会员 -->
+			<view class="corporate-member">
+				<view class="icon">
+					<img src="@/assets/img/corporateMember.png" alt="">
+				</view>
+				<view class="member-details">
+					<view class="member-name">
+						企业会员
+					</view>
+					<view class="company-name">
+						湖北荆鹏软件开发有限公司
+					</view>
+					<view class="balance">
+						企业账户余额：4001.92元
+					</view>
+				</view>
+			</view>
+			<!-- 六折卡 -->
+			<view class="card-box">
+				<img src="@/assets/img/0.6off.png" alt="">
+				<view class="progress">
+					<view class="time">
+						2023.09.16到期 | 剩余29天
+					</view>
+					<view class="electric-quantity">
+						已用119度 / 共338度
+					</view>
+				</view>
+				<ujp-line-progress active-color="#2979ff" :percent="60"></ujp-line-progress>
+			</view>
+
+			<view class="card-box">
+				<img src="@/assets/img/halfoff.png" alt="">
+				<view class="progress">
+					<view class="time">
+						2023.09.16到期 | 剩余29天
+					</view>
+					<view class="electric-quantity">
+						已用119度 / 共338度
+					</view>
+				</view>
+				<ujp-line-progress active-color="#2979ff" :percent="60"></ujp-line-progress>
+			</view>
+			
+			 <view class="card-box">
+						 	<img src="@/assets/img/monthCard.png" alt="">
+							<view class="progress">
+								<view class="time">
+									2023.09.16到期 | 剩余29天
+								</view>
+								
+							</view>
+							<ujp-line-progress active-color="#2979ff" :percent="60"></ujp-line-progress>
+						 </view>
+		</view>
+<!-- 已过期 -->
+ <view class="have-expired" v-if="current==2">
+ 	<view class="card-box">
+ 		<img src="@/assets/img/haveExpired.png" alt="">
+ 		<view class="progress">
+ 			<view class="time">
+ 				2023.09.16到期 | 剩余29天
+ 			</view>
+ 			<view class="electric-quantity">
+ 				已用119度 / 共338度
+ 			</view>
+ 		</view>
+ 		<ujp-line-progress active-color="#2979ff" :percent="0"></ujp-line-progress>
+ 	</view>
+ </view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+						name: '未激活'
+					},
+					{
+						name: '生效中'
+					}, {
+						name: '已过期'
+					}
+				],
+				current: 0,
+
+			}
+		},
+		methods: {
+			change(index) {
+				this.current = index;
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.tabs{
+		position: relative !important;
+		
+		.tag{
+			width: 32rpx;
+			height: 32rpx;
+			line-height: 32rpx;
+			background-color: rgba(238, 49, 56, 1);
+			color: rgba(255, 255, 255, 1);
+			font-size: 24rpx;
+			text-align: center;
+			border-radius: 999px;
+			position: absolute;
+			top: 24rpx;
+			left:190rpx;
+		}
+	}
+	// 未激活
+	.nonactivated {
+		padding: 0 32rpx;
+
+		.card-box {
+			border-radius: 12px;
+			background-color: rgba(55, 59, 80, 1);
+			margin-top: 24rpx;
+			padding: 32rpx;
+			position: relative;
+
+			img {
+				width: 262rpx;
+				height: 56rpx;
+			}
+
+			.text {
+				font-size: 24rpx;
+				color: rgba(219, 219, 219, 1);
+			}
+
+			.corner-mark {
+				width: 112rpx;
+				height: 112rpx;
+				position: absolute;
+				top: 0;
+				right: 0;
+			}
+		}
+
+
+	}
+
+	// 生效中
+	.active {
+		padding: 0 32rpx;
+
+		// 企业会员
+		.corporate-member {
+			border-radius: 12px;
+			background-color: rgba(55, 59, 80, 1);
+			margin-top: 24rpx;
+			padding: 32rpx;
+			display: flex;
+
+			.icon {
+				width: 80rpx;
+				height: 80rpx;
+
+				img {
+					width: 100%;
+				}
+			}
+
+			.member-details {
+				margin-left: 16rpx;
+
+				.member-name {
+					color: rgba(255, 255, 255, 1);
+					font-size: 32rpx;
+				}
+
+				.company-name {
+					color: rgba(204, 204, 204, 1);
+					font-size: 24rpx;
+					margin-top: 8rpx;
+				}
+
+				.balance {
+					color: rgba(219, 219, 219, 1);
+					font-size: 24rpx;
+					margin-top: 14rpx;
+				}
+
+			}
+		}
+
+		// 六折卡
+		.card-box {
+			border-radius: 12px;
+			background-color: rgba(55, 59, 80, 1);
+			padding: 20rpx 24rpx;
+			margin-top: 24rpx;
+
+			img {
+				width: 262rpx;
+				height: 56rpx;
+			}
+
+			.progress {
+				display: flex;
+				justify-content: space-between;
+				color: rgba(219, 219, 219, 1);
+				font-size: 24rpx;
+				margin-bottom: 16rpx;
+			}
+			
+			/deep/.u-active {
+				background: linear-gradient(84.49deg, rgba(59, 182, 254, 1) 4.25%, rgba(0, 185, 98, 1) 95.02%);
+			}
+		}
+	}
+	
+	// 已过期
+	.have-expired{
+		padding: 0 32rpx;
+		.card-box {
+			border-radius: 12px;
+			background-color: rgba(156, 157, 161, 1);
+			padding: 20rpx 24rpx;
+			margin-top: 24rpx;
+		
+			img {
+				width: 262rpx;
+				height: 56rpx;
+			}
+		
+			.progress {
+				display: flex;
+				justify-content: space-between;
+				color: #fff;
+				font-size: 24rpx;
+				margin-bottom: 16rpx;
+			}
+			
+		
+			/deep/.u-active {
+				background: linear-gradient(84.49deg, rgba(59, 182, 254, 1) 4.25%, rgba(0, 185, 98, 1) 95.02%);
+			}
+		}
+	}
+</style>

pages/cardBag/cardDetail.vue

@@ -0,0 +1,906 @@
+<template>
+	<view>
+		<ujp-navbar title="会员卡详情" :isBack="isMe" >
+			<view slot="right" style="margin-right: 10px;">
+
+				<view class="iconfont qr-code"  @click="openModalBl=true">
+					&#xe60d;
+				</view>
+			</view>
+		</ujp-navbar>
+		<u-mask :show="show" @click="show = false">
+			<u-image width="100%"  :mode="'widthFix'" src="/static/img/guide_point2.png"></u-image>
+
+		</u-mask>
+		<u-modal v-model="show2" :content="content2" @confirm="confirmShow2" :show-cancel-button="true" confirm-color="#00b962"></u-modal>
+		<u-modal v-model="show3" :content="content3" @confirm="confirmShow3" :show-cancel-button="true" confirm-color="#00b962"></u-modal>
+		
+		
+		<u-modal v-model="openModalBl" @confirm="confirmPhone" confirm-text="拨打电话" confirm-color="#606266"
+			:show-cancel-button="true" ref="uModal" :asyncClose="true" title="客服电话" :content="content"
+			:content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
+		<!-- 头部 -->
+		<view :class="{
+			header:regUserCard.status==1,
+			header2:regUserCard.status==2
+		}">
+			<view class="discount-card">
+				
+				<img  v-if="regUserCard.status==2" class="corner-mark" src="@/assets/img/nonactivated.png" alt="">
+				<view class="top" v-if="regUserCard.status==2">
+					<view class="right-corner">
+						<img class="rightCorner" src="..../../assets/img/rightCorner.png" alt="">
+						
+						<img class="icon"  v-if="item.type==3" src="@/assets/img/mb-times@3x.png" alt="">
+						
+						<img class="picc" v-if="item.type==3" src="..../../assets/img/picc.png" alt="">
+					</view>
+				</view>
+				
+				<view class="img">
+					<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="">
+				</view>
+				<view class="card-number" v-if="regUserCard.status==2">
+					卡号：{{regUserCard.cardNo}}
+				</view>
+				<view class="progress" v-if="regUserCard.status==1">
+					<view class="time">
+						{{thisendTime(regUserCard.endTime)}}到期 剩余{{thisdaysDistance(regUserCard.endTime)}}天
+					</view>
+					<view class="electric-quantity"  v-if="regUserCard.classify==2">
+						已用{{regUserCard.chargedDegree}}度 / 共{{regUserCard.chargeDegreeLimit}}度
+					</view>
+				</view>
+				<ujp-line-progress v-if="regUserCard.status==1" active-color="#2979ff" :percent="thispercent(regUserCard)"></ujp-line-progress>
+				<view class="bottom" v-if="regUserCard.status==1">
+					<view class="right-corner">
+						<img class="rightCorner" src="..../../assets/img/rightCorner.png" alt="">
+
+						<img  v-if="item.type==3"  class="icon" src="@/assets/img/mb-times@3x.png" alt="">
+
+						<img  v-if="item.type==3"  class="picc" src="..../../assets/img/picc.png" alt="">
+					</view>
+				</view>
+			</view>
+			<img class="cardCover" src="@/assets/img/cardCover.png" alt="">
+		</view>
+		
+		<!-- 卡片信息 -->
+		<view class="main"  v-if="regUserCard.status==2">
+			
+			<view class="details">
+				<view class="headline">
+					<view class="title">
+						卡片信息
+					</view>
+					<view class="show" v-if="!this.showHide" @click="showHide=true">
+						显示<u-icon name="eye"></u-icon>
+					</view>
+					<view class="hide" v-if="this.showHide" @click="showHide=false">
+						隐藏<u-icon name="eye-off"></u-icon>
+					</view>
+				</view>
+				<view class="content" v-if="this.showHide">
+					<view class="item">
+						<view class="item-title">
+							卡名
+						</view>
+						<view class="item-value">
+							{{item.name}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="item-title">
+							折扣率
+						</view>
+						<view class="item-value">
+							{{regUserCard.classify==1?"服务费全免":""}}
+							{{regUserCard.classify==2?"服务费"+(item.serviceFeeDiscountRate/10)+"折":""}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="item-title">
+							规格
+						</view>
+						<view class="item-value" v-if="regUserCard.classify==1">
+							服务费全免 （有效期{{item.periodOfValidity}}天）
+						</view>
+						<view class="item-value" v-if="regUserCard.classify==2">
+							可用{{item.chargeDegreeLimit}}度（有效期{{item.periodOfValidity}}天）
+						</view>
+					</view>
+					
+					
+				</view>
+				
+				
+				
+				
+			</view>
+			<!-- 按钮 -->
+			<view class="btn" v-if="isMe">
+				<button class="share" @click="show=true">转赠分享<img class="icon" src="@/assets/img/riLine-gift-2-line@3x.png" alt=""></button>
+				<button class="activate" @click="show2Btn">立即激活</button>
+			</view>
+			<view class="btn2" v-else>
+			
+				<button class="get" @click="show2Btn">领用会员卡</button>
+				
+			</view>
+		</view>
+		
+		<!-- 卡片信息 -->
+		<view class="main" v-if="regUserCard.status==1">
+			<view class="title">
+				会员信息
+			</view>
+			<view class="details">
+				<view class="item">
+					<view class="item-title">
+						会员昵称
+					</view>
+					<view class="item-value">
+						{{userInfo.nickName}}
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-title">
+						绑定账号
+					</view>
+					<view class="item-value">
+						{{getphone(userInfo.phone)}}
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-title">
+						绑定车辆
+					</view>
+					<view class="item-value">
+						
+						{{userInfo.carNum}}
+					</view>
+				</view>
+			</view>
+			<view class="title">
+				卡片信息
+			</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">
+						卡名
+					</view>
+					<view class="item-value">
+						{{item.name}}
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-title">
+						折扣率
+					</view>
+					<view class="item-value" v-if="item.classify==1">
+						服务费全免
+					</view>
+					<view class="item-value"  v-if="item.classify==2">
+						{{item.serviceFeeDiscountRate/10}}折
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-title">
+						规格
+					</view>
+					<view class="item-value" v-if="regUserCard.classify==1">
+						服务费全免 （有效期{{item.periodOfValidity}}天）
+					</view>
+					<view class="item-value" v-if="regUserCard.classify==2">
+						可用{{item.chargeDegreeLimit}}度（有效期{{item.periodOfValidity}}天）
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-title">
+						有效期
+					</view>
+					<view class="item-value">
+						{{regUserCard.startTime.substring(0,10)}}至{{regUserCard.endTime.substring(0,10)}}
+					</view>
+				</view>
+				<view class="item"  v-if="regUserCard.classify==2">
+					<view class="item-title">
+						剩余度数
+					</view>
+					<view class="item-value">
+						{{(regUserCard.chargeDegreeLimit-regUserCard.chargedDegree).toFixed(0)}}度
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-title">
+						卡号
+					</view>
+					<view class="item-value">
+						{{regUserCard.cardNo}}
+					</view>
+				</view>
+			</view>
+			<!-- 按钮 -->
+			<button class="check"  @click="gotoUrl('pages/article/details?code=FWF6ZK')" >查看使用规则</button>
+		</view>
+	
+	</view>
+
+
+
+</template>
+
+
+<script>
+	// 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,
+		daysDistance
+
+	} from '@/utils'
+	export default {
+		data() {
+			return {
+				id: "",
+				item: {},
+				regUserCard:{},
+				orderInfo:{},
+			
+				content: "400-8899-619",
+				openModalBl: false,
+				expireUserCardList: [],
+				showHide:false,
+				show2: false,
+				show:false,
+				content2: '确认激活此会员卡吗？',
+				content3: '领用会员卡需要注册成为会员，点击前往',
+				show3: false,
+				//userCard: {},
+				isMe:false,
+				projectName: "",
+				userInfo:{},
+				carNum:""
+			}
+		},
+		onLoad(op) {
+			this.id = op.id
+			this.get_wx_config();
+			//this.userInfo=this.carhelp.getPersonInfo()
+			this.projectName = process.car.ProjectName;
+			
+			var info=this.carhelp.getPersonInfo()
+			if(info.id&&info.userType==2){
+				
+			}else{
+					this.show3=true
+			}
+			
+			this.getChargeList();
+		},
+		onReady() {
+
+			var consumerPhone = "400-8899-619"
+			// img="https://yktwechat.xiaoxinda.com/config/xxd2021.jpg"		
+			if (consumerPhone) {
+				this.content = consumerPhone
+			}
+
+		},
+		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){
+					this.show2=true
+				}else{
+						this.show3=true
+				}
+			},
+			confirmShow3(){
+				uni.navigateTo({
+					url:"/pages/login/login?jpcode2=card&codeId="+this.id
+				})
+			},
+			confirmShow2(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.activateCard({
+					id:this.id
+				}).then((res) => {
+					uni.hideLoading();
+					uni.showToast({
+						title:"领取成功"
+					})
+					this.getChargeList();
+						
+					//console.log(obj)
+				
+					//this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			//获取微信jssdk配置信息
+			get_wx_config() {
+				//("get_wx_configget_wx_configget_wx_configget_wx_config")
+				var _this = this
+				API_weixin.getConfig().then(response => {
+					var wxconfig = response.data.wxConfig;
+						console.log(222)
+					wx.config({
+						debug: false, // 开启调试模式,
+						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
+						timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
+						nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
+						signature: wxconfig.signature, // 必填，签名，见附录1
+						jsApiList: ['updateAppMessageShareData',
+						'updateTimelineShareData','onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareQZone'], // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+			
+					});
+					console.log(222)
+					_this.wxShare()
+					wx.error(function(res) {
+						console.log('微信api配置出错');
+					});
+				}).catch(error => {
+			
+					//(error);
+				})
+			
+			},
+			//微信分享自定义
+			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"		
+				// if (indexLogo) {
+				// 	this.indexLogo = indexLogo;
+				// }
+				var info = this.carhelp.getPersonInfo()
+				//var img=require("@/static/img/aboutus.png")
+				////(this.nowItem);
+				var ProjectName = process.car.ProjectName; //info.nickName+
+				var nickName = info.nickName ? info.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;
+			
+				var _this=this;
+				wx.ready(function() {
+					
+					wx.onMenuShareAppMessage({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
+					})
+					wx.onMenuShareTimeline({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
+					})
+					wx.updateAppMessageShareData({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							//("updateAppMessageShareData")
+							// 设置成功
+							_this.$emit("wxShare", null);
+						}
+					})
+					wx.updateTimelineShareData({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							//("updateTimelineShareData")
+							// 设置成功
+							_this.$emit("wxShare", null);
+						}
+					})
+					console.log("readyreadyreadyreadyready")
+				});
+			},
+			
+			thisendTime(endTime){
+				if(endTime){
+					var reg=new RegExp('-','gi')
+					var str=endTime.substring(0,10).replace(reg,'.')
+					return str
+				}
+				return ''
+			},
+			thispercent(userCard) {
+				if(userCard.classify==1){
+					var k1=daysDistance(userCard.startTime, userCard.endTime)
+					var k2=this.thisdaysDistance(userCard.endTime)
+					var p=(k1-k2)/k2* 100
+					if (p > 100) {
+						p = 100
+					}
+					return p.toFixed(0)
+				}else if(userCard.classify==2){
+					var p = 0
+					
+					if (userCard && userCard.chargeDegreeLimit) {
+						p = userCard.chargedDegree / userCard.chargeDegreeLimit * 100
+					}
+					if (p > 100) {
+						p = 100
+					}
+					return p.toFixed(0)
+				}else{
+					return 0
+				}
+				
+			},
+			thisdaysDistance(endTime){
+						
+							 var date=new Date()
+							 var date2=newDate(endTime);
+							 return daysDistance(date,date2)
+							 
+			},
+			thisdaysDistance2(){
+						if(this.item.endTime){
+							var date=newDate(this.item.startTime)
+							var date2=newDate(this.item.endTime);
+							return daysDistance(date,date2)
+						}
+							return 0
+							 
+			},
+			regUserCarList(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.regUserCarList({
+					id:this.id
+				}).then((res) => {
+					uni.hideLoading();
+					if(res.data&&res.data.length){
+						this.carNum=res.data[0].carNum
+					}
+					//this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			getChargeList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+
+				API.buyCardDetail({
+					id:this.id
+				}).then((res) => {
+					uni.hideLoading();
+					this.item = res.data.monthlyRentCard;
+					this.regUserCard = res.data.regUserCard;
+					// 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){
+							this.isMe=true
+					}
+					this.orderInfo = res.data.orderInfo;
+					//console.log(obj)
+
+					//this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			confirmPhone() {
+				this.openModalBl = false;
+				uni.makePhoneCall({
+					phoneNumber: this.content //仅为示例
+				});
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #fff;
+	}
+	
+	// 头部
+	.header {
+		padding: 24rpx 32rpx 0;
+		opacity: 0.9;
+		background: linear-gradient(30deg, rgba(59, 182, 254, 1) 13.4%, rgba(0, 185, 98, 1) 85.87%);
+		position: relative;
+
+		.discount-card {
+			background: url(@/assets/img/cardDetail.png);
+			background-size: 686rpx 400rpx;
+			border-radius: 8px 8px 0 0;
+			background-color: #1D1F2A;
+
+			padding: 24rpx;
+			margin-top: 24rpx;
+			height: 400rpx;
+			position: relative;
+			.corner-mark{
+				width: 128rpx;
+				height: 128rpx;
+				position: absolute;
+				top: 0;
+				right: 0;
+			}
+			.img {
+				width: 262rpx;
+				height: 56rpx;
+
+				img {
+					width: 100%;
+				}
+			}
+
+			.u-progress {
+				height: 20rpx !important;
+			}
+
+			.progress {
+				display: flex;
+				justify-content: space-between;
+				color: rgba(219, 219, 219, 1);
+				font-size: 24rpx;
+				margin-bottom: 16rpx;
+				margin-top: 24rpx;
+			}
+
+			/deep/.u-active {
+				background: linear-gradient(84.49deg, rgba(59, 182, 254, 1) 4.25%, rgba(0, 185, 98, 1) 95.02%);
+			}
+			.top {
+				
+				
+			
+				.right-corner {
+			
+					
+					display: flex;
+					align-items: center;
+					height: 36rpx;
+			
+					.rightCorner {
+						width: 148rpx;
+						margin-left: 8rpx;
+			
+					}
+			
+					.icon {
+						width: 24rpx;
+					    height: 24rpx;
+						margin-left: 8rpx;
+						
+					
+					}
+			
+					.picc {
+						width: 124rpx;
+						height: 32rpx;
+						margin-left: 8rpx;
+					}
+				}
+			}
+			// 右下角角标
+			.bottom {
+				position: absolute;
+				bottom: 48rpx;
+				right: 40rpx;
+			
+
+				.right-corner {
+
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+					height: 32rpx;
+
+					.rightCorner {
+						width: 148rpx;
+
+					}
+
+					.icon {
+						width: 24rpx;
+                        height: 24rpx;
+						margin-left: 8rpx;
+						
+
+					}
+
+					.picc {
+						width: 124rpx;
+						
+						margin-left: 8rpx;
+					}
+				}
+			}
+		}
+
+		.cardCover {
+
+			width: 100%;
+			height: 70rpx;
+			position: absolute;
+			left: 0;
+			right: 0;
+			bottom: 0rpx;
+			z-index: 999;
+		}
+	}
+.header2 {
+		padding: 24rpx 32rpx 0;
+		opacity: 0.9;
+		background: linear-gradient(30deg, rgba(59,182,254,1) 13.4%,rgba(0,185,98,1) 85.87%);
+		position: relative;
+
+		.discount-card {
+			background: url(@/assets/img/cardDetail.png);
+			background-size: 686rpx 400rpx;
+			border-radius: 8px 8px 0 0;
+			background-color: #1D1F2A;
+
+			padding: 24rpx;
+			margin-top: 24rpx;
+			height: 400rpx;
+			position: relative;
+.corner-mark{
+	width: 128rpx;
+	height: 128rpx;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+			.img {
+				margin:82rpx auto 0;
+				width: 486rpx;
+				height: 104rpx;
+				
+
+				img {
+					width: 100%;
+				}
+			}
+
+			
+			
+
+			
+			.top {
+				
+				
+
+				.right-corner {
+
+					
+					display: flex;
+					align-items: center;
+					height: 36rpx;
+
+					.rightCorner {
+						width: 148rpx;
+						margin-left: 8rpx;
+
+					}
+
+					.icon {
+						width: 24rpx;
+					    height: 24rpx;
+						margin-left: 8rpx;
+						
+					
+					}
+
+					.picc {
+						width: 124rpx;
+						height: 32rpx;
+						margin-left: 8rpx;
+					}
+				}
+			}
+		}
+
+		.cardCover {
+
+			width: 100%;
+			height: 70rpx;
+			position: absolute;
+			left: 0;
+			right: 0;
+			bottom: 0rpx;
+			z-index: 999;
+		}
+		.card-number{
+			color: rgba(209, 178, 121, 1);
+			text-align: center;
+			margin-top: 8rpx;
+		}
+	}
+	// 卡片信息
+	.main {
+		background-color: #fff;
+		padding: 32rpx;
+		padding-bottom: 60px;
+		.headline{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 32rpx;
+			.title{
+				color: rgba(16, 16, 16, 1);
+				
+			}
+			.show,.hide{
+				color: rgba(119, 119, 119, 1);
+				
+				
+		
+			}
+		}
+		.title {
+			color: rgba(16, 16, 16, 1);
+			font-size: 32rpx;
+		}
+
+		.details {
+			margin-top: 16rpx;
+			border-radius: 12px;
+			padding: 32rpx 24rpx;
+			background-color: rgba(255, 255, 255, 1);
+			text-align: center;
+			border: 1px solid rgba(226, 226, 226, 1);
+			margin-bottom: 40rpx;
+
+			.item {
+				display: flex;
+				margin-top: 24rpx;
+
+				.item-title {
+					width: 128rpx;
+					color: #777777;
+					text-align: left;
+				}
+
+				.item-value {
+					margin-left: 16rpx;
+					color: #101010;
+				}
+			}
+		}
+		
+		.btn2{
+				margin-top: 32rpx;
+			.get{
+				border-radius: 50px;
+				background: linear-gradient(90deg, rgba(0,171,91,1) 0%,rgba(0,209,66,1) 100%);
+				color: rgba(255, 255, 255, 1);
+				font-size: 16px;
+				text-align: center;
+			}
+		}
+		//按钮
+		.btn{
+			margin-top: 32rpx;
+			display: flex;
+			justify-content: space-between;
+			.share{
+				width: 328rpx;
+				height: 88rpx;
+				line-height: 88rpx;
+				border-radius: 50px;
+				background-color: rgba(255, 255, 255, 1);
+				text-align: center;
+				border: 1px solid rgba(255, 150, 0, 1);
+				color: rgba(255, 150, 0, 1);
+				font-size: 32rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				.icon{
+					
+					width: 36rpx;
+					height: 36rpx;
+					
+				}
+			}
+			.activate{
+				width: 328rpx;
+				height: 88rpx;
+				line-height: 88rpx;
+				border-radius: 50px;
+				background: linear-gradient(90deg, rgba(0,171,91,1) 0%,rgba(0,209,66,1) 100%);
+				color: rgba(255, 255, 255, 1);
+				font-size: 32rpx
+			}
+		}
+	}
+
+	// 查看
+	.check {
+		position: fixed;
+		bottom: 32rpx;
+		left: 32rpx;
+		right: 32rpx;
+		font-size: 32rpx;
+		border-radius: 50px;
+		background-color: rgba(255, 255, 255, 1);
+		color: rgba(0, 185, 98, 1);
+		border: 1px solid rgba(0, 185, 98, 1);
+	}
+</style>

pages/cardBag/cardDetails.vue

@@ -1,116 +1,240 @@
-<template>
-	<view>
-		<ujp-navbar title="会员卡详情">
-			<view slot="right" style="margin-right: 10px;">
-
-				<view @click="openModalBl=true" class="iconfont qr-code">
-					&#xe60d;
-				</view>
-			</view>
-		</ujp-navbar>
-
-		<view class="header" v-if="item.id" >
-			<view class="discount-card">
-				<view class="name">
-					{{item.cardName}}
-				</view>
-				<view class="progress">
-					<view class="time">
-						{{thisendTime(item.endTime)}}到期 | 剩余{{thisdaysDistance(item.endTime)}}天
-					</view>
-					<view class="electric-quantity">
-						已用{{item.chargedDegree?item.chargedDegree.toFixed(0):0.00}}度 / 共{{item.chargeDegreeLimit}}度
-					</view>
-				</view>
-				<ujp-line-progress active-color="#2979ff" :percent="thispercent(item)"></ujp-line-progress>
-			</view>
-		</view>
-		<!-- 卡片信息 -->
-		<view class="card-infos" v-if="item.id">
-			<view class="item">
-				<view class="title">
-					卡类型
-				</view>
-				<view class="value">
-					服务费折扣卡
-				</view>
-			</view>
-			<view class="item" v-if="false">
-				<view class="title">
-					折扣率
-				</view>
-				<view class="value">
-					6折
-				</view>
-			</view>
-			<view class="item">
-				<view class="title">
-					规格
-				</view>
-				<view class="value">
-					可用{{item.chargeDegreeLimit}}度（有效期{{thisdaysDistance2()}}天）
-				</view>
-			</view>
-			<view class="item">
-				<view class="title">
-					有效期
-				</view>
-				<view class="value">
-					{{thisendTime(item.startTime)}}-{{thisendTime(item.endTime)}}
-				</view>
-			</view>
-			<view class="item">
-				<view class="title">
-					剩余度数
-				</view>
-				<view class="value">
-					{{item.chargedDegree>item.chargeDegreeLimit?0:(item.chargeDegreeLimit-item.chargedDegree).toFixed(0)}}度
-				</view>
-			</view>
-			<view class="item" v-if="false">
-				<view class="title">
-					绑定账号
-				</view>
-				<view class="value">
-					15500001111
-				</view>
-			</view>
-			<view class="item">
-				<view class="title">
-					卡号
-				</view>
-				<view class="value">
-					{{item.cardNo}}
-				</view>
+<template>
+	<view>
+		<ujp-navbar title="会员卡详情"  :isBack="false"  >
+			<view slot="right" style="margin-right: 10px;">
+
+				<view class="iconfont qr-code"  @click="openModalBl=true">
+					&#xe60d;
+				</view>
 			</view>
-			<view class="item">
-				<view class="title">
-					购买时间
+		</ujp-navbar>
+		<u-mask :show="show" @click="show = false">
+			<u-image width="100%"  :mode="'widthFix'" src="/static/img/guide_point2.png"></u-image>
+
+		</u-mask>
+		<u-modal v-model="show2" :content="content2" @confirm="confirmShow2" :show-cancel-button="true" confirm-color="#00b962"></u-modal>
+		<u-modal v-model="show3" :content="content3" @confirm="confirmShow3" :show-cancel-button="true" confirm-color="#00b962"></u-modal>
+		
+		
+		<u-modal v-model="openModalBl" @confirm="confirmPhone" confirm-text="拨打电话" confirm-color="#606266"
+			:show-cancel-button="true" ref="uModal" :asyncClose="true" title="客服电话" :content="content"
+			:content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
+		<!-- 头部 -->
+		<view :class="{
+			header:regUserCard.status==1,
+			header2:regUserCard.status==2
+		}">
+			<view class="discount-card">
+				
+				<img  v-if="regUserCard.status==2" class="corner-mark" src="@/assets/img/nonactivated.png" alt="">
+				<view class="top" v-if="regUserCard.status==2">
+					<view class="right-corner">
+						<img class="rightCorner" src="..../../assets/img/rightCorner.png" alt="">
+						
+						<img class="icon"  v-if="item.type==3" src="@/assets/img/mb-times@3x.png" alt="">
+						
+						<img class="picc" v-if="item.type==3" src="..../../assets/img/picc.png" alt="">
+					</view>
 				</view>
-				<view class="value">
-					{{item.createTime}}
+				
+				<view class="img">
+					<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="">
 				</view>
-			</view>
-			<view class="item">
-				<view class="title">
-					使用规则
-				</view>
-				<view class="value highlight" @click="gotoUrl('pages/article/details?code=FWF6ZK')">
-					点击查看活动详情
-				</view>
-			</view>
-		</view>
-
-		<u-modal v-model="openModalBl" @confirm="confirmPhone" confirm-text="拨打电话" confirm-color="#606266"
-			:show-cancel-button="true" ref="uModal" :asyncClose="true" title="客服电话" :content="content"
-			:content-style="{fontSize: '24px',color: '#101010'}"></u-modal>
-	</view>
-
-	</view>
-</template>
+				<view class="card-number" v-if="regUserCard.status==2">
+					卡号：{{regUserCard.cardNo}}
+				</view>
+				<view class="progress" v-if="regUserCard.status==1">
+					<view class="time">
+						{{thisendTime(regUserCard.endTime)}}到期 剩余{{thisdaysDistance(regUserCard.endTime)}}天
+					</view>
+					<view class="electric-quantity"  v-if="regUserCard.classify==2">
+						已用{{regUserCard.chargedDegree}}度 / 共{{regUserCard.chargeDegreeLimit}}度
+					</view>
+				</view>
+				<ujp-line-progress v-if="regUserCard.status==1" active-color="#2979ff" :percent="thispercent(regUserCard)" ></ujp-line-progress>
+				<view class="bottom" v-if="regUserCard.status==1">
+					<view class="right-corner">
+						<img class="rightCorner" src="..../../assets/img/rightCorner.png" alt="">
+
+						<img  v-if="item.type==3"  class="icon" src="@/assets/img/mb-times@3x.png" alt="">
+
+						<img  v-if="item.type==3"  class="picc" src="..../../assets/img/picc.png" alt="">
+					</view>
+				</view>
+			</view>
+			<img class="cardCover" src="@/assets/img/cardCover.png" alt="">
+		</view>
+		
+		<!-- 卡片信息 -->
+		<view class="main"  v-if="regUserCard.status==2">
+			
+			<view class="details">
+				<view class="headline">
+					<view class="title">
+						卡片信息
+					</view>
+					<view class="show" v-if="!this.showHide" @click="showHide=true">
+						显示<u-icon name="eye"></u-icon>
+					</view>
+					<view class="hide" v-if="this.showHide" @click="showHide=false">
+						隐藏<u-icon name="eye-off"></u-icon>
+					</view>
+				</view>
+				<view class="content" v-if="this.showHide">
+					<view class="item">
+						<view class="item-title">
+							卡名
+						</view>
+						<view class="item-value">
+							{{item.name}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="item-title">
+							折扣率
+						</view>
+						<view class="item-value">
+							{{regUserCard.classify==1?"服务费全免":""}}
+							{{regUserCard.classify==2?"服务费"+(item.serviceFeeDiscountRate/10)+"折":""}}
+						</view>
+					</view>
+					<view class="item">
+						<view class="item-title">
+							规格
+						</view>
+						<view class="item-value" v-if="regUserCard.classify==1">
+							服务费全免 （有效期{{item.periodOfValidity}}天）
+						</view>
+						<view class="item-value" v-if="regUserCard.classify==2">
+							可用{{item.chargeDegreeLimit}}度（有效期{{item.periodOfValidity}}天）
+						</view>
+					</view>
+					
+					
+				</view>
+				
+				
+				
+				
+			</view>
+			<!-- 按钮 -->
+			<view class="btn2">
+			
+				<button class="get" @click="show2Btn">领用会员卡</button>
+				
+			</view>
+			
+		</view>
+		
+		<!-- 卡片信息 -->
+		<view class="main" v-if="regUserCard.status==1">
+			<view class="title">
+				会员信息
+			</view>
+			<view class="details">
+				<view class="item">
+					<view class="item-title">
+						会员昵称
+					</view>
+					<view class="item-value">
+						{{userInfo.nickName}}
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-title">
+						绑定账号
+					</view>
+					<view class="item-value">
+						{{userInfo.phone}}
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-title">
+						绑定车辆
+					</view>
+					<view class="item-value">
+						{{carNum}}
+					</view>
+				</view>
+			</view>
+			<view class="title">
+				卡片信息
+			</view>
+			<view class="details">
+				<view class="item">
+					<view class="item-title">
+						卡名
+					</view>
+					<view class="item-value">
+						{{item.name}}
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-title">
+						折扣率
+					</view>
+					<view class="item-value" v-if="item.classify==1">
+						服务费全免
+					</view>
+					<view class="item-value"  v-if="item.classify==2">
+						{{item.serviceFeeDiscountRate/10}}折
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-title">
+						规格
+					</view>
+					<view class="item-value" v-if="regUserCard.classify==1">
+						服务费全免 （有效期{{item.periodOfValidity}}天）
+					</view>
+					<view class="item-value" v-if="regUserCard.classify==2">
+						可用{{item.chargeDegreeLimit}}度（有效期{{item.periodOfValidity}}天）
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-title">
+						有效期
+					</view>
+					<view class="item-value">
+						{{regUserCard.startTime.substring(0,10)}}至{{regUserCard.endTime.substring(0,10)}}
+					</view>
+				</view>
+				<view class="item"  v-if="regUserCard.classify==2">
+					<view class="item-title">
+						剩余度数
+					</view>
+					<view class="item-value">
+						{{item.chargedDegree}}度
+					</view>
+				</view>
+				<view class="item">
+					<view class="item-title">
+						卡号
+					</view>
+					<view class="item-value">
+						{{regUserCard.cardNo}}
+					</view>
+				</view>
+			</view>
+			<!-- 按钮 -->
+			<button class="check"  @click="gotoUrl('pages/article/details?code=FWF6ZK')" >查看使用规则</button>
+		</view>
+	
+	</view>
+
+
+
+</template>
+
 
 <script>
-	import * as API from '@/apis/index.js'
+	// import * as API from '@/apis/index.js'
+	import * as API from '@/apis/order.js'
+	import * as API_weixin from '@/apis/weixin.js'
+	
 	import {
 		newDate,
 		daysDistance
@@ -120,15 +244,36 @@
 		data() {
 			return {
 				id: "",
-				item: {},
+				item: {},
+				regUserCard:{},
+				orderInfo:{},
+			
 				content: "400-8899-619",
 				openModalBl: false,
-				expireUserCardList: [],
-				//userCard: {},
+				expireUserCardList: [],
+				showHide:false,
+				show2: false,
+				show:false,
+				content2: '确认激活此会员卡吗？',
+				content3: '领用会员卡需要注册成为会员，点击前往',
+				show3: false,
+				//userCard: {},
+				projectName: "",
+				userInfo:{},
+				carNum:""
 			}
 		},
 		onLoad(op) {
-			this.id = op.id
+			this.id = op.id
+			this.get_wx_config();
+			this.userInfo=this.carhelp.getPersonInfo()
+			this.projectName = process.car.ProjectName;
+			var info=this.carhelp.getPersonInfo()
+			if(info.id&&info.userType==2){
+				
+			}else{
+					this.show3=true
+			}
 			this.getChargeList();
 		},
 		onReady() {
@@ -141,6 +286,141 @@
 
 		},
 		methods: {
+			show2Btn(){
+				var info=this.carhelp.getPersonInfo()
+				if(info.id&&info.userType==2){
+					this.show2=true
+				}else{
+						this.show3=true
+				}
+			},
+			confirmShow3(){
+				uni.navigateTo({
+					url:"/pages/login/login?jpcode2=card&codeId="+this.id
+				})
+			},
+			confirmShow2(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.activateCard({
+					id:this.id
+				}).then((res) => {
+					uni.hideLoading();
+					uni.showToast({
+						title:"领取成功"
+					})
+					this.getChargeList();
+						
+					//console.log(obj)
+				
+					//this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			//获取微信jssdk配置信息
+			get_wx_config() {
+				//("get_wx_configget_wx_configget_wx_configget_wx_config")
+				var _this = this
+				API_weixin.getConfig().then(response => {
+					var wxconfig = response.data.wxConfig;
+			
+					wx.config({
+						debug: false, // 开启调试模式,
+						appId: wxconfig.appId, // 必填，企业号的唯一标识，此处填写企业号corpid
+						timestamp: wxconfig.timestamp, // 必填，生成签名的时间戳
+						nonceStr: wxconfig.nonceStr, // 必填，生成签名的随机串
+						signature: wxconfig.signature, // 必填，签名，见附录1
+						jsApiList: ['updateAppMessageShareData',
+						'updateTimelineShareData','onMenuShareTimeline', 'onMenuShareAppMessage', 'onMenuShareQQ', 'onMenuShareQZone'], // 必填，需要使用的JS接口列表，所有JS接口列表见附录2
+			
+					});
+					_this.wxShare()
+					wx.error(function(res) {
+						//('微信api配置出错');
+					});
+				}).catch(error => {
+			
+					//(error);
+				})
+			
+			},
+			//微信分享自定义
+			wxShare() {
+				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"		
+				// if (indexLogo) {
+				// 	this.indexLogo = indexLogo;
+				// }
+				var info = this.carhelp.getPersonInfo()
+				//var img=require("@/static/img/aboutus.png")
+				////(this.nowItem);
+				var ProjectName = process.car.ProjectName; //info.nickName+
+				var nickName = info.nickName ? info.nickName : '好友';
+				var title = nickName + "赠送您一张充电折扣卡"
+				//"["+ProjectName+"]"+'和好友一起领5元红包'
+				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() {
+					
+					wx.onMenuShareAppMessage({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
+					})
+					wx.onMenuShareTimeline({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							// 设置成功
+							_this.$emit("wxShare",null);
+						}
+					})
+					wx.updateAppMessageShareData({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							//("updateAppMessageShareData")
+							// 设置成功
+							_this.$emit("wxShare", null);
+						}
+					})
+					wx.updateTimelineShareData({
+						title: title,
+						desc: desc,
+						link: joinUrl,
+						imgUrl: img,
+						success: function() {
+							//("updateTimelineShareData")
+							// 设置成功
+							_this.$emit("wxShare", null);
+						}
+					})
+					console.log("readyreadyreadyreadyready")
+				});
+			},
+			
 			thisendTime(endTime){
 				if(endTime){
 					var reg=new RegExp('-','gi')
@@ -149,16 +429,29 @@
 				}
 				return ''
 			},
-			thispercent(userCard){
-				var p=0
-				
-				if(userCard&&userCard.chargeDegreeLimit){
-					p=userCard.chargedDegree/userCard.chargeDegreeLimit*100
+			thispercent(userCard) {
+				if(userCard.classify==1){
+					var k1=daysDistance(userCard.startTime, userCard.endTime)
+					var k2=this.thisdaysDistance(userCard.endTime)
+					var p=(k1-k2)/k2* 100
+					if (p > 100) {
+						p = 100
+					}
+					return p.toFixed(0)
+				}else if(userCard.classify==2){
+					var p = 0
+					
+					if (userCard && userCard.chargeDegreeLimit) {
+						p = userCard.chargedDegree / userCard.chargeDegreeLimit * 100
+					}
+					if (p > 100) {
+						p = 100
+					}
+					return p.toFixed(0)
+				}else{
+					return 0
 				}
-				if(p>100){
-					p=100
-				}
-				return p.toFixed(0)
+				
 			},
 			thisdaysDistance(endTime){
 						
@@ -175,6 +468,27 @@
 						}
 							return 0
 							 
+			},
+			regUserCarList(){
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				
+				API.regUserCarList({
+					id:this.id
+				}).then((res) => {
+					uni.hideLoading();
+					if(res.data&&res.data.length){
+						this.carNum=res.data[0].carNum
+					}
+					//this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
 			},
 			getChargeList() {
 				uni.showLoading({
@@ -182,20 +496,16 @@
 					mask: true,
 				})
 
-				API.personCardList({
-
+				API.buyCardDetail({
+					id:this.id
 				}).then((res) => {
 					uni.hideLoading();
-					var cardList = res.data.cardList;
-					var expireUserCardList = res.data.expireUserCardList;
-					var sz = [
-						...cardList,
-						...expireUserCardList
-					]
-					var obj = sz.find(item => {
-						return item.id == this.id
-					})
-					this.item = obj
+					this.item = res.data.monthlyRentCard;
+					this.regUserCard = res.data.regUserCard;
+					if(this.regUserCard.status==1){
+						this.regUserCarList()
+					}
+					this.orderInfo = res.data.orderInfo;
 					//console.log(obj)
 
 					//this.recordsTotal = res.data.recordsTotal;
@@ -214,71 +524,339 @@
 			},
 		}
 	}
-</script>
-<style>
-	page {
-		background-color: #fff;
-		padding-bottom: 100px;
-	}
-</style>
-<style lang="scss" scoped>
-	.header {
-		padding: 24rpx 32rpx;
-		opacity: 0.9;
-		background: linear-gradient(30deg, rgba(59, 182, 254, 1) 13.4%, rgba(0, 185, 98, 1) 85.87%);
-
-		.discount-card {
-
-			border-radius: 8px;
-			background-color: rgba(55, 59, 80, 1);
-			padding: 24rpx;
-			margin-top: 24rpx;
-
-			.name {
-				color: rgba(255, 255, 255, 1);
-				font-size: 32rpx;
-			}
-
-			.progress {
-				display: flex;
-				justify-content: space-between;
-				color: rgba(219, 219, 219, 1);
-				font-size: 24rpx;
-				margin-bottom: 16rpx;
-				margin-top: 24rpx;
-			}
-
-			/deep/.u-active {
-				background: linear-gradient(84.49deg, rgba(59, 182, 254, 1) 4.25%, rgba(0, 185, 98, 1) 95.02%);
-			}
-		}
-
-	}
-
-	// 卡片信息
-	.card-infos {
-		padding: 24rpx 32rpx;
-
-		.item {
-			display: flex;
-			align-items: center;
-			margin-bottom: 24rpx;
-
-			.title {
-				color: rgba(119, 119, 119, 1);
-				font-size: 32rpx;
-				width: 140rpx;
-			}
-
-			.value {
-				color: rgba(16, 16, 16, 1);
-				font-size: 32rpx;
-				margin-left: 24rpx;
-			}
-
-			.highlight {
-				color: rgba(0, 185, 98, 1);
-			}
-		}
-	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #fff;
+	}
+	
+	// 头部
+	.header {
+		padding: 24rpx 32rpx 0;
+		opacity: 0.9;
+		background: linear-gradient(30deg, rgba(59, 182, 254, 1) 13.4%, rgba(0, 185, 98, 1) 85.87%);
+		position: relative;
+
+		.discount-card {
+			background: url(@/assets/img/cardDetail.png);
+			background-size: 686rpx 400rpx;
+			border-radius: 8px 8px 0 0;
+			background-color: #1D1F2A;
+
+			padding: 24rpx;
+			margin-top: 24rpx;
+			height: 400rpx;
+			position: relative;
+			.corner-mark{
+				width: 128rpx;
+				height: 128rpx;
+				position: absolute;
+				top: 0;
+				right: 0;
+			}
+			.img {
+				width: 262rpx;
+				height: 56rpx;
+
+				img {
+					width: 100%;
+				}
+			}
+
+			.u-progress {
+				height: 20rpx !important;
+			}
+
+			.progress {
+				display: flex;
+				justify-content: space-between;
+				color: rgba(219, 219, 219, 1);
+				font-size: 24rpx;
+				margin-bottom: 16rpx;
+				margin-top: 24rpx;
+			}
+
+			/deep/.u-active {
+				background: linear-gradient(84.49deg, rgba(59, 182, 254, 1) 4.25%, rgba(0, 185, 98, 1) 95.02%);
+			}
+			.top {
+				
+				
+			
+				.right-corner {
+			
+					
+					display: flex;
+					align-items: center;
+					height: 36rpx;
+			
+					.rightCorner {
+						width: 148rpx;
+						margin-left: 8rpx;
+			
+					}
+			
+					.icon {
+						width: 24rpx;
+					    height: 24rpx;
+						margin-left: 8rpx;
+						
+					
+					}
+			
+					.picc {
+						width: 124rpx;
+						height: 32rpx;
+						margin-left: 8rpx;
+					}
+				}
+			}
+			// 右下角角标
+			.bottom {
+				position: absolute;
+				bottom: 48rpx;
+				right: 40rpx;
+			
+
+				.right-corner {
+
+					display: flex;
+					align-items: center;
+					justify-content: flex-end;
+					height: 32rpx;
+
+					.rightCorner {
+						width: 148rpx;
+
+					}
+
+					.icon {
+						width: 24rpx;
+                        height: 24rpx;
+						margin-left: 8rpx;
+						
+
+					}
+
+					.picc {
+						width: 124rpx;
+						
+						margin-left: 8rpx;
+					}
+				}
+			}
+		}
+
+		.cardCover {
+
+			width: 100%;
+			height: 70rpx;
+			position: absolute;
+			left: 0;
+			right: 0;
+			bottom: 0rpx;
+			z-index: 999;
+		}
+	}
+.header2 {
+		padding: 24rpx 32rpx 0;
+		opacity: 0.9;
+		background: linear-gradient(30deg, rgba(59,182,254,1) 13.4%,rgba(0,185,98,1) 85.87%);
+		position: relative;
+
+		.discount-card {
+			background: url(@/assets/img/cardDetail.png);
+			background-size: 686rpx 400rpx;
+			border-radius: 8px 8px 0 0;
+			background-color: #1D1F2A;
+
+			padding: 24rpx;
+			margin-top: 24rpx;
+			height: 400rpx;
+			position: relative;
+.corner-mark{
+	width: 128rpx;
+	height: 128rpx;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+			.img {
+				margin:82rpx auto 0;
+				width: 486rpx;
+				height: 104rpx;
+				
+
+				img {
+					width: 100%;
+				}
+			}
+
+			
+			
+
+			
+			.top {
+				
+				
+
+				.right-corner {
+
+					
+					display: flex;
+					align-items: center;
+					height: 36rpx;
+
+					.rightCorner {
+						width: 148rpx;
+						margin-left: 8rpx;
+
+					}
+
+					.icon {
+						width: 24rpx;
+					    height: 24rpx;
+						margin-left: 8rpx;
+						
+					
+					}
+
+					.picc {
+						width: 124rpx;
+						height: 32rpx;
+						margin-left: 8rpx;
+					}
+				}
+			}
+		}
+
+		.cardCover {
+
+			width: 100%;
+			height: 70rpx;
+			position: absolute;
+			left: 0;
+			right: 0;
+			bottom: 0rpx;
+			z-index: 999;
+		}
+		.card-number{
+			color: rgba(209, 178, 121, 1);
+			text-align: center;
+			margin-top: 8rpx;
+		}
+	}
+	// 卡片信息
+	.main {
+		background-color: #fff;
+		padding: 32rpx;
+		padding-bottom: 60px;
+		.headline{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 32rpx;
+			.title{
+				color: rgba(16, 16, 16, 1);
+				
+			}
+			.show,.hide{
+				color: rgba(119, 119, 119, 1);
+				
+				
+		
+			}
+		}
+		.title {
+			color: rgba(16, 16, 16, 1);
+			font-size: 32rpx;
+		}
+
+		.details {
+			margin-top: 16rpx;
+			border-radius: 12px;
+			padding: 32rpx 24rpx;
+			background-color: rgba(255, 255, 255, 1);
+			text-align: center;
+			border: 1px solid rgba(226, 226, 226, 1);
+			margin-bottom: 40rpx;
+
+			.item {
+				display: flex;
+				margin-top: 24rpx;
+
+				.item-title {
+					width: 128rpx;
+					color: #777777;
+					text-align: left;
+				}
+
+				.item-value {
+					margin-left: 16rpx;
+					color: #101010;
+				}
+			}
+		}
+		
+		.btn2{
+				margin-top: 32rpx;
+			.get{
+				border-radius: 50px;
+				background: linear-gradient(90deg, rgba(0,171,91,1) 0%,rgba(0,209,66,1) 100%);
+				color: rgba(255, 255, 255, 1);
+				font-size: 16px;
+				text-align: center;
+			}
+		}
+		//按钮
+		.btn{
+			margin-top: 32rpx;
+			display: flex;
+			justify-content: space-between;
+			
+			.share{
+				width: 328rpx;
+				height: 88rpx;
+				line-height: 88rpx;
+				border-radius: 50px;
+				background-color: rgba(255, 255, 255, 1);
+				text-align: center;
+				border: 1px solid rgba(255, 150, 0, 1);
+				color: rgba(255, 150, 0, 1);
+				font-size: 32rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				.icon{
+					
+					width: 36rpx;
+					height: 36rpx;
+					
+				}
+			}
+			.activate{
+				width: 328rpx;
+				height: 88rpx;
+				line-height: 88rpx;
+				border-radius: 50px;
+				background: linear-gradient(90deg, rgba(0,171,91,1) 0%,rgba(0,209,66,1) 100%);
+				color: rgba(255, 255, 255, 1);
+				font-size: 32rpx
+			}
+		}
+	}
+
+	// 查看
+	.check {
+		position: fixed;
+		bottom: 32rpx;
+		left: 32rpx;
+		right: 32rpx;
+
+		border-radius: 50px;
+		background-color: rgba(255, 255, 255, 1);
+		color: rgba(0, 185, 98, 1);
+		border: 1px solid rgba(0, 185, 98, 1);
+	}
 </style>

pages/cardBag/getCard.vue

@@ -0,0 +1,273 @@
+<template>
+	<view>
+		<ujp-navbar title="未领用会员卡">
+			<view slot="right" style="margin-right: 10px;">
+		
+				<view class="iconfont qr-code">
+					&#xe60d;
+				</view>
+			</view>
+		</ujp-navbar>
+		<!-- 头部 -->
+		<view class="header">
+			<view class="discount-card">
+				<img class="corner-mark" src="@/assets/img/nonactivated.png" alt="">
+				<view class="top">
+					<view class="right-corner">
+						<img class="rightCorner" src="..../../assets/img/rightCorner.png" alt="">
+						
+						<img class="icon" src="@/assets/img/mb-times@3x.png" alt="">
+						
+						<img class="picc" src="..../../assets/img/picc.png" alt="">
+					</view>
+				</view>
+				<view class="img">
+					<img src="@/assets/img/halfoff.png" alt="">
+				</view>
+				<view class="card-number">
+					卡号：T2023081611208460925
+				</view>
+				
+				
+			</view>
+			<img class="cardCover" src="@/assets/img/cardCover.png" alt="">
+		</view>
+		<!-- 卡片信息 -->
+		<view class="main">
+			
+			<view class="details">
+							<view class="headline">
+								<view class="title">
+									卡片信息
+								</view>
+								<view class="show" v-if="!this.showHide" @click="showHide=true">
+									显示<u-icon name="eye"></u-icon>
+								</view>
+								<view class="hide" v-if="this.showHide" @click="showHide=false">
+									隐藏<u-icon name="eye-off"></u-icon>
+								</view>
+							</view>
+							<view class="content" v-if="this.showHide">
+								<view class="item">
+									<view class="item-title">
+										卡类型
+									</view>
+									<view class="item-value">
+										服务费折扣卡
+									</view>
+								</view>
+								<view class="item">
+									<view class="item-title">
+										折扣率
+									</view>
+									<view class="item-value">
+										5折
+									</view>
+								</view>
+								<view class="item">
+									<view class="item-title">
+										规格
+									</view>
+									<view class="item-value">
+										可用4500度（有效期365天）
+									</view>
+								</view>
+								
+								
+							</view>
+							
+							
+							
+							
+						</view>
+			<!-- 按钮 -->
+			<view class="btn">
+				
+				<button class="get" @click="showModal">领用会员卡</button>
+			</view>
+			
+		</view>
+	
+	<!-- 弹框 -->
+	<view>
+			<u-modal v-model="show" :content="content" show-cancel-button="true" confirm-color="#00b962"></u-modal>
+			
+		</view>
+	
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				showHide:false,
+				content: '确认领用此会员卡吗？？'
+				
+			}
+		},
+		methods: {
+			showModal() {
+						this.show = true;
+					},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background-color: #fff;
+	}
+.header {
+		padding: 24rpx 32rpx 0;
+		opacity: 0.9;
+		background: linear-gradient(30deg, rgba(59,182,254,1) 13.4%,rgba(0,185,98,1) 85.87%);
+		position: relative;
+
+		.discount-card {
+			background: url(@/assets/img/cardDetail.png);
+			background-size: 686rpx 400rpx;
+			border-radius: 8px 8px 0 0;
+			background-color: #1D1F2A;
+
+			padding: 24rpx;
+			margin-top: 24rpx;
+			height: 200px;
+			position: relative;
+.corner-mark{
+	width: 128rpx;
+	height: 128rpx;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+.card-number{
+			color: rgba(209, 178, 121, 1);
+			text-align: center;
+			margin-top: 8rpx;
+		}
+			.img {
+				margin:82rpx auto 0;
+				width: 486rpx;
+				height: 104rpx;
+				
+
+				img {
+					width: 100%;
+				}
+			}
+
+			
+			
+
+			// 右下角角标
+			.top {
+				
+				display: flex;
+				align-items: center;
+				
+				height: 28rpx;
+
+				.right-corner {
+
+					display: flex;
+
+					.rightCorner {
+						width: 148rpx;
+
+					}
+
+					.icon {
+						width: 24rpx;
+
+						margin-left: 16rpx;
+
+					}
+
+					.picc {
+						width: 124rpx;
+						height: 32rpx;
+						margin-left: 16rpx;
+					}
+				}
+			}
+		}
+
+		.cardCover {
+
+			width: 100%;
+			height: 70rpx;
+			position: absolute;
+			left: 0;
+			right: 0;
+			bottom: 0rpx;
+			z-index: 999;
+		}
+	}
+
+.main {
+		background-color: #fff;
+		padding: 32rpx;
+
+		.headline{
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			font-size: 32rpx;
+			.title{
+				color: rgba(16, 16, 16, 1);
+				
+			}
+			.show,.hide{
+				color: rgba(119, 119, 119, 1);
+				
+			}}
+
+		.details {
+			margin-top: 16rpx;
+			border-radius: 12px;
+			padding: 32rpx 24rpx;
+			background-color: rgba(255, 255, 255, 1);
+			text-align: center;
+			border: 1px solid rgba(226, 226, 226, 1);
+			margin-bottom: 40rpx;
+
+			.item {
+				display: flex;
+				margin-top: 24rpx;
+
+				.item-title {
+					width: 128rpx;
+					color: #777777;
+					text-align: left;
+				}
+
+				.item-value {
+					margin-left: 16rpx;
+					color: #101010;
+				}
+			}
+		}
+	//按钮
+	.btn{
+		margin-top: 32rpx;
+		
+		
+		.get{
+			border-radius: 50px;
+			background: linear-gradient(90deg, rgba(0,171,91,1) 0%,rgba(0,209,66,1) 100%);
+			color: rgba(255, 255, 255, 1);
+			font-size: 16px;
+			text-align: center;
+		}
+	}
+	
+	
+	}
+/deep/.u-model__content__message{
+	color: #333333;
+	font-size: 32rpx
+}
+
+</style>

pages/cardBag/nonactivatedCard.vue

@@ -0,0 +1,300 @@
+<template>
+	<view>
+		<ujp-navbar title="未激活会员卡">
+			<view slot="right" style="margin-right: 10px;">
+		
+				<view class="iconfont qr-code">
+					&#xe60d;
+				</view>
+			</view>
+		</ujp-navbar>
+		<!-- 头部 -->
+		<view class="header">
+			<view class="discount-card">
+				<img class="corner-mark" src="@/assets/img/nonactivated.png" alt="">
+				<view class="top">
+					<view class="right-corner">
+						<img class="rightCorner" src="..../../assets/img/rightCorner.png" alt="">
+						
+						<img class="icon" src="@/assets/img/mb-times@3x.png" alt="">
+						
+						<img class="picc" src="..../../assets/img/picc.png" alt="">
+					</view>
+				</view>
+				<view class="img">
+					<img src="@/assets/img/halfoff.png" alt="">
+				</view>
+				<view class="card-number">
+					卡号：T2023081611208460925
+				</view>
+				
+				
+			</view>
+			<img class="cardCover" src="@/assets/img/cardCover.png" alt="">
+		</view>
+		<!-- 卡片信息 -->
+		<view class="main">
+			
+			<view class="details">
+				<view class="headline">
+					<view class="title">
+						卡片信息
+					</view>
+					<view class="show" v-if="!this.showHide" @click="showHide=true">
+						显示<u-icon name="eye"></u-icon>
+					</view>
+					<view class="hide" v-if="this.showHide" @click="showHide=false">
+						隐藏<u-icon name="eye-off"></u-icon>
+					</view>
+				</view>
+				<view class="content" v-if="this.showHide">
+					<view class="item">
+						<view class="item-title">
+							卡类型
+						</view>
+						<view class="item-value">
+							服务费折扣卡
+						</view>
+					</view>
+					<view class="item">
+						<view class="item-title">
+							折扣率
+						</view>
+						<view class="item-value">
+							5折
+						</view>
+					</view>
+					<view class="item">
+						<view class="item-title">
+							规格
+						</view>
+						<view class="item-value">
+							可用4500度（有效期365天）
+						</view>
+					</view>
+					
+					
+				</view>
+				
+				
+				
+				
+			</view>
+			<!-- 按钮 -->
+			<view class="btn">
+				<button class="share">转赠分享<img class="icon" src="@/assets/img/riLine-gift-2-line@3x.png" alt=""></button>
+				<button class="activate" @click="showModal">立即激活</button>
+			</view>
+			
+		</view>
+	
+	<!-- 弹框 -->
+	<view>
+			<u-modal v-model="show" :content="content"  confirm-color="#00b962"></u-modal>
+			
+		</view>
+	
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				show: false,
+				showHide:false,
+				content: '确认激活此会员卡吗？'
+				
+			}
+		},
+		methods: {
+			showModal() {
+						this.show = true;
+					},
+					
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		background-color: #fff;
+	}
+.header {
+		padding: 24rpx 32rpx 0;
+		opacity: 0.9;
+		background: linear-gradient(30deg, rgba(59,182,254,1) 13.4%,rgba(0,185,98,1) 85.87%);
+		position: relative;
+
+		.discount-card {
+			background: url(@/assets/img/cardDetail.png);
+			background-size: 686rpx 400rpx;
+			border-radius: 8px 8px 0 0;
+			background-color: #1D1F2A;
+
+			padding: 24rpx;
+			margin-top: 24rpx;
+			height: 200px;
+			position: relative;
+.corner-mark{
+	width: 128rpx;
+	height: 128rpx;
+	position: absolute;
+	top: 0;
+	right: 0;
+}
+			.img {
+				margin:82rpx auto 0;
+				width: 486rpx;
+				height: 104rpx;
+				
+
+				img {
+					width: 100%;
+				}
+			}
+
+			
+			
+
+			
+			.top {
+				
+				
+
+				.right-corner {
+
+					
+					display: flex;
+					align-items: center;
+					height: 36rpx;
+
+					.rightCorner {
+						width: 148rpx;
+						margin-left: 8rpx;
+
+					}
+
+					.icon {
+						width: 24rpx;
+					    height: 24rpx;
+						margin-left: 8rpx;
+						
+					
+					}
+
+					.picc {
+						width: 124rpx;
+						height: 32rpx;
+						margin-left: 8rpx;
+					}
+				}
+			}
+		}
+
+		.cardCover {
+
+			width: 100%;
+			height: 70rpx;
+			position: absolute;
+			left: 0;
+			right: 0;
+			bottom: 0rpx;
+			z-index: 999;
+		}
+		.card-number{
+			color: rgba(209, 178, 121, 1);
+			text-align: center;
+			margin-top: 8rpx;
+		}
+	}
+
+.main {
+		background-color: #fff;
+		padding: 32rpx;
+.headline{
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	font-size: 32rpx;
+	.title{
+		color: rgba(16, 16, 16, 1);
+		
+	}
+	.show,.hide{
+		color: rgba(119, 119, 119, 1);
+		
+		
+
+	}
+}
+		
+
+		.details {
+			margin-top: 16rpx;
+			border-radius: 12px;
+			padding: 32rpx 24rpx;
+			background-color: rgba(255, 255, 255, 1);
+			border: 1px solid rgba(226, 226, 226, 1);
+			margin-bottom: 40rpx;
+       
+			.item {
+				display: flex;
+				margin-top: 24rpx;
+
+				.item-title {
+					width: 128rpx;
+					color: #777777;
+					text-align: left;
+				}
+
+				.item-value {
+					margin-left: 16rpx;
+					color: #101010;
+				}
+			}
+		}
+	//按钮
+	.btn{
+		margin-top: 32rpx;
+		display: flex;
+		justify-content: space-between;
+		.share{
+			width: 328rpx;
+			height: 88rpx;
+			line-height: 88rpx;
+			border-radius: 50px;
+			background-color: rgba(255, 255, 255, 1);
+			text-align: center;
+			border: 1px solid rgba(255, 150, 0, 1);
+			color: rgba(255, 150, 0, 1);
+			font-size: 32rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			.icon{
+				
+				width: 36rpx;
+				height: 36rpx;
+				
+			}
+		}
+		.activate{
+			width: 328rpx;
+			height: 88rpx;
+			line-height: 88rpx;
+			border-radius: 50px;
+			background: linear-gradient(90deg, rgba(0,171,91,1) 0%,rgba(0,209,66,1) 100%);
+			color: rgba(255, 255, 255, 1);
+			font-size: 32rpx
+		}
+	}
+	
+	
+	}
+/deep/.u-model__content__message{
+	color: #333333;
+	font-size: 32rpx
+}
+
+</style>

pages/index/activity.vue

@@ -1,7 +1,10 @@
 <template>
-	<view>
-			<ujp-navbar title="优惠活动" :is-back="false" ></ujp-navbar>
-			<view class="background">
+	<view style="background-color: #fff;">
+			<ujp-navbar title="优惠活动" :is-back="false"  v-if="false" ></ujp-navbar>
+			<view class="options-item">
+				<u-tabs  :list="tabList" :current="current" @change="change" :show-bar="false" active-color="#00B962 " inactive-color="#c4c0c0"></u-tabs>
+			</view>
+			<view class="background" v-show="current==0">
 				<view class="banner" v-for="(item,i) in bannerList"
 				
 				 :key="i">
@@ -17,6 +20,19 @@
 				</view>
 				<u-divider  bg-color="#F2F4F4" >已经到底了</u-divider>
 				
+			</view>
+			<view class="news"  v-show="current==1">
+				<view class="news-content" v-for="(item,index) in newsList" :key="item.id" @click="gotoUrl('pages/article/articleDetails?id=' + item.id)">
+					<view class="content-text">
+						<view class="content-title oldTextjp2" oldstyle="font-size: 18px;">{{item.title}}</view>
+						<view class="news-time">{{item.createTime ? item.createTime.slice(5,16) : ''}}</view>
+					</view>
+					<view class="content-img">
+						<img :src="item.pic ? item.pic : 'static/img/image_default.png'" alt="">
+					</view>
+				</view>
+				<u-divider v-if="newsList.length!=0&&newsList.length ==recordsTotal">已经到底了</u-divider>
+				
 			</view>
 			
 			<Tabbar :current="1" ref="tabbarMain" ></Tabbar>
@@ -31,7 +47,18 @@
 	export default {
 		data() {
 			return {
-					bannerList: [],
+				tabList: [
+					
+					{name: '优惠活动',type: 'YHHD'},
+					{name: '通知公告',type: 'TZGG'},
+				
+				],
+				current: 0,
+				newsList: [],
+				pageIndex: 1,
+				newsType: 'TZGG',
+				recordsTotal: 0,
+				bannerList: [],
 			}
 		},
 		components: {
@@ -46,8 +73,53 @@
 		},onLoad() {
 			this.getBannerInfo("HDYM");
 		},
-		
+		onReachBottom() {
+			if (this.current==1&&this.newsList.length < this.recordsTotal) {			
+				this.myLoadmore();
+			}
+		},
 		methods: {
+			change(index) {
+				this.current = index;
+				//this.newsType = this.tabList[index].type;
+				if(this.newsList.length==0){
+					this.getNewsList()
+				}
+				
+			},
+			getNewsList(bl) {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				if (bl) {
+					this.newsList = [];
+					this.pageIndex = 1;
+				}
+				
+				newsApi.newsInfoList({
+					pageIndex: this.pageIndex,
+					pageSize: 20,
+					shortName: this.newsType
+				}).then((res) => {
+					uni.hideLoading()
+					
+					this.newsList = [
+						...this.newsList,
+						...res.data.data
+					];
+					this.recordsTotal = res.data.recordsTotal		
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			myLoadmore() {
+				this.pageIndex += 1;
+				this.getNewsList()
+			},
 			getBannerInfo(code) {
 				uni.showLoading({
 					title: "加载中",
@@ -145,4 +217,59 @@
 		margin: 24rpx;
 		
 	}
+	.options-item{
+		    width: 100%;
+		    display: flex;
+		    justify-content: center;
+		    background: rgb(255, 255, 255);
+	}
+	
+	.news {
+		background-color: #fff;
+		margin: 0 16px ;
+	    border-radius: 8px;
+		.news-content {
+			display: flex;
+			justify-content: space-between;
+			margin-bottom: 24px;
+	
+			.content-text {
+				width: 56.2%;
+				height: 100%;
+				line-height: 21px;
+				color: #101010;
+				text-align: left;
+				font-size: 14px;
+			}
+	
+			.content-title {
+				width: 100%;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				-webkit-line-clamp: 3;
+			}
+	
+			.content-img {
+				width: 40.57%;
+				height: 100%;
+				border-radius: 4px;
+				overflow: hidden;
+	
+				img {
+					width: 100%;
+					height: 80%;
+				}
+			}
+	
+			.news-time {
+				margin-top: 10%;
+				color: #999999;
+				width: 100px;
+				height: 20px;
+				font-size: 14px;
+			}
+		}
+	}
 </style>

pages/index/index.vue

@@ -631,30 +631,46 @@
 		</view>
 
 		<!-- 新闻 -->
-		<view class="news-title" v-if="newsList.length > 0">
-			<view class="news-title-left oldTextjp" oldstyle="font-size:20px;">
+		<view class="news-title" v-if="newsList.length > 0" >
+			<!-- <view class="news-title-left oldTextjp" oldstyle="font-size:20px;">
 				<view class="line" style="margin-top:4px;"></view>活动公告
 			</view>
 
-			<view class="more oldTextjp2" oldstyle="font-size:16px;" @click="toNewsNotice">更多<view
+			<view class="more oldTextjp2" oldstyle="font-size:16px;" >更多<view
 					class="more-icon iconfont"> &#xe600;</view>
-			</view>
-
+			</view> -->
 
-		</view>
-		<view class="news">
+					<u-notice-bar mode="horizontal"
+					 color="#FF3D00" bg-color="#fff"
+					 :list="newsList"></u-notice-bar>
 
-			<view class="news-content" v-for="(item,index) in newsList" :key="index"
-				@click="gotoUrl('pages/article/articleDetails?id=' + item.id)">
-				<view class="content-text">
-					<view class="content-title oldTextjp2" oldstyle="font-size: 18px;">{{item.title}}</view>
-					<view class="news-time">{{item.createTime?item.createTime.slice(5,10):''}}</view>
-				</view>
-				<view class="content-img">
-					<img :src="item.pic ? item.pic : 'static/img/image_default.png'" alt="">
-				</view>
-			</view>
+		</view>
+		<view class="news-title"  >
+			 <view class="news-title-left oldTextjp" oldstyle="font-size:20px;">
+				<view class="line" style="margin-top:4px;"></view>51商城
+			</view>
+		
+			<view class="more oldTextjp2" oldstyle="font-size:16px;" >
+				备货中，敬请期待！
+			</view>
+			
+		</view>
+		<view  class="shopList" @click="bhz" >
+			<view class="shopItem" v-for="(item,i) in shopList" :key="i">
+				<view class="shopItemImg">
+					<img  src="@/assets/img/buy/shopList.png"  >
+				</view>
+				<view class="shopItemName" ><img style="width:52px; height:16px;    vertical-align: middle;" src="@/assets/img/buy/ptzy.png">家用7kW交流充电桩</view>
+				<view class="shopItemPrice" >
+					<view class="shopItemPrice1" >￥***</view>
+					<view class="shopItemPrice2">
+						
+						<u-icon name="shopping-cart"></u-icon>
+					</view>
+				</view>
+			</view>
 		</view>
+	
 		<view class="bottom">
 			<view class="bot">
 				<view class="bot-line"></view>
@@ -760,7 +776,8 @@
 				couponSelect: {},
 				pageIndex2: 1,
 				recordsTotal2: 0,
-				defaultStation:[],
+				defaultStation:[],
+				shopList:[{},{}]
 
 			}
 		},
@@ -1453,6 +1470,12 @@
 						icon: "none"
 					})
 				})
+			},
+			bhz(){
+				uni.showToast({
+					title: "备货中，敬请期待",
+					icon: "none"
+				})
 			},
 			getPointTimeOut() {
 
@@ -1502,8 +1525,12 @@
 				})
 			},
 			toNewsNotice() {
-				uni.navigateTo({
-					url: '/pages/article/newsNotice'
+				// uni.navigateTo({
+				// 	url: '/pages/article/newsNotice'
+				// })
+				
+				uni.navigateTo({
+					url: '/pages/index/activity'
 				})
 			},
 			//微信扫二维码
@@ -1715,23 +1742,20 @@
 					title: "加载中",
 					mask: true,
 				})
-				if (bl) {
-					this.newsList = [];
-					this.pageIndex = 1;
-				}
+			
 
 				newsApi.newsInfoList({
-					pageIndex: this.pageIndex,
-					pageSize: 3,
-					shortName:'TZGG',
+					pageIndex: 1,
+					pageSize: 5,
+					shortName:'GDXW',
+					//shortName:'TZGG'
 				}).then((res) => {
 					uni.hideLoading()
 
-					this.newsList = [
-						...this.newsList,
-						...res.data.data
-					];
-					this.recordsTotal = res.data.recordsTotal
+					this.newsList =   res.data.data.map(item=>{
+						return item.title
+					})
+					 
 				}).catch(error => {
 					uni.showToast({
 						title: error,
@@ -2789,18 +2813,30 @@
 			margin-top: -60px;
 		}
 	}
+	.shopItemPrice2{
+		border-radius: 25px;
+		height: 40rpx;
+		width: 40rpx;
+		display: flex;
+		    justify-content: center;
+		/* text-decoration: underline; */
 	
+			color: #fff;
+		text-align: center;
+		
+		background: linear-gradient(180deg, rgba(255,98,0,1) 0%,rgba(255,40,0,1) 100%);
+	}
 	.slogan-4 {
 		margin-top: 10px;
 		display: flex;
 		    justify-content: center;
 		/* text-decoration: underline; */
-		color: #9F9C99;
+	
 	
 		text-align: center;
 		position: fixed;
 		/* top: 40px; */
-		bottom: 120px;
+		bottom: 180px;
 		right: 20px;
 		height: 80rpx;
 		width: 80rpx;
@@ -2825,5 +2861,26 @@
 	50% { transform: rotate(0deg); }
 	75% { transform: rotate(-8deg); }
 	100% { transform: rotate(0deg); }
+	}
+	.shopList{
+		    width: 91.4%;
+		    margin: 8px auto 0;
+		    border-radius: 8px;
+		    padding: 12px 12px 12px 11px;
+		    background-color: #fff;
+			    display: flex;
+				    justify-content: space-around;
+		.shopItem{
+			width: 45%;
+			margin: 3px;
+			.shopItemPrice{
+				 display: flex;
+				 justify-content: space-between;
+				.shopItemPrice1{
+					color:#FF2800 
+				}
+			}
+			
+		}
 	}
 </style>

pages/login/login.vue

@@ -184,6 +184,9 @@
 			}
 			if (op.jpcode2) {
 				this.code = op.jpcode2;
+			}
+			if (op.codeId) {
+				this.codeId = op.codeId;
 			}
 			if (op.jpcode) {
 
@@ -401,7 +404,13 @@
 						})
 					}
 
-				} else if (this.code == 'invoice') {
+				}else if(this.code == 'card'){
+					
+					uni.redirectTo({
+						url: '/pages/cardBag/cardDetail?id='+ this.codeId
+					})
+					
+				}else if (this.code == 'invoice') {
 					uni.redirectTo({
 						url: '/pages/MyInvoice/invoiceManagement'
 					})

pages/searchPile/chargeProcess/charge.vue

@@ -206,7 +206,7 @@
 
 			</view>
 			<view v-if="cardList.length" class="cardListView">
-				<view  class="cardListItemTitle">点击切换其他卡</view>
+				<view  class="cardListItemTitle" v-if="cardList.length>1" >点击切换其他卡</view>
 				<view  class="cardListItem" v-for="(item,i) in cardList" 
 				 :key="i"  :class="{
 					 select:userCard.id==item.id

pages/user/company-vip.vue

@@ -18,6 +18,10 @@
 					<view class="sign">
 						{{platformN}}
 					</view>
+					<view class="sign2">
+						{{cardNo}}
+					</view>
+					
 				</view>
 				
 			</view>
@@ -122,6 +126,7 @@
 				list: [],
 				electricQuantity:0,
 				recordsTotal: 0,
+				cardNo:"",
 			}
 		},
 		onReachBottom() {
@@ -138,6 +143,7 @@
 				for(var i in list){
 					if(list[i].platform==this.platform){
 						this.platformN=list[i].platformN
+						this.cardNo=list[i].cardNo
 					}
 				}
 			}
@@ -349,16 +355,22 @@
 			.user-name{
 				margin-left: 12px;
 				.name{
-					line-height: 24px;
+					line-height: 40rpx;
 					color: rgba(33, 41, 48, 100);
-					font-size: 24px;
+					font-size: 40rpx;
 					font-weight: 550;
 				}
 				.sign{
 					color: rgba(76, 89, 111, 100);
-					font-size: 16px;
-					line-height: 16px;
-					margin-top: 8px;
+					font-size: 28rpx;
+					line-height: 28rpx;
+					margin-top: 16rpx;
+				}
+				.sign2{
+					color: #6C6F73 ;
+					font-size: 24rpx;
+					line-height: 24rpx;
+					margin-top: 16rpx;
 				}
 			}
 		}