zhengkaixin 1 year ago
parent
commit
97b1b8fd7f

+ 2 - 4
pages/discountCard/productDetails.vue

@@ -573,7 +573,7 @@
 				   detail: {},
 				   ispay: false,
 				   show3: false,
-				   show2: false,
+				   show2: true,
 				   show1: false,
 				   infoSet: true,
 				   infoSet1: false,
@@ -625,7 +625,7 @@
 		},
 		onShow() {
 			
-			this.checkSubscribe();
+			//this.checkSubscribe();
 		
 		},
 		computed: {
@@ -651,8 +651,6 @@
 					text="关注公众号"
 				}else if(!this.infoSet){
 					text="完善个人信息"
-				}else if(this.detail.memberLevel&&this.detail.memberLevel>memberLevel){
-					text=this.detail.memberLevelStr+"以上可购买"
 				}
 				
 				return text

+ 14 - 14
pages/index/index.vue

@@ -14,7 +14,7 @@
 
 
 			<!-- 选项列表 -->
-			<view class="option-list">
+			<view class="option-list" v-if="false">
 
 				<view class="list-item" @click="getScanCode">
 					<view class="icon iconfont" style="background: linear-gradient(45deg,#00B962,#5FE4A6);">
@@ -1242,17 +1242,17 @@
 
 					console.log("--------------")
 					if (res.data && res.data.regUser) {
-						if (res.data.regUser.fontMode == null) {
-							this.show = true;
-						} else {
-							this.show = false;
-							this.fontMode = res.data.regUser.fontMode;
-							if (this.fontMode == '1') {
-								this.carhelp.set("getElderModeClass", "长辈模式");
-							} else {
-								this.carhelp.set("getElderModeClass", "标准模式");
-							}
-						}
+						// if (res.data.regUser.fontMode == null) {
+						// 	this.show = true;
+						// } else {
+						// 	this.show = false;
+						// 	this.fontMode = res.data.regUser.fontMode;
+						// 	if (this.fontMode == '1') {
+						// 		this.carhelp.set("getElderModeClass", "长辈模式");
+						// 	} else {
+						// 		this.carhelp.set("getElderModeClass", "标准模式");
+						// 	}
+						// }
 
 						this.userId = res.data.regUser.id;
 						this.getFindChargeData();
@@ -1973,7 +1973,7 @@
 	}
 
 	.background {
-		background: linear-gradient(#D6EEDC, #FFFFFF);
+		background: linear-gradient(#D6EEDC, #F3F4F4);
 		padding-top: 16px;
 	}
 
@@ -2448,7 +2448,7 @@
 		.card-box {
 			display: flex;
 			justify-content: space-between;
-			padding: 0 0 16px 0;
+			//padding: 0 0 16px 0;
 
 			.card {
 				width: 48.3%;

+ 31 - 15
pages/login/login.vue

@@ -1,14 +1,17 @@
 <template>
 	<view class="wrap">
-		<ujp-navbar :isBack="false" title="">
-
-			<view slot="right" v-if="!personInfo&&!member" @click="show3=true"
-				style=" margin-right: 10px;color:#00B962"> 游客模式</view>
+		<ujp-navbar :isBack="false" title="" v-if="false">
+		
+			<view slot="right" v-if="!personInfo&&!member" @click="show3=true"
+				style=" margin-right: 10px;color:#00B962">游客模式 </view>
 		</ujp-navbar>
 
 		<view class="login">
-			<view class="login-title">
-				<h3>手机号登录/注册</h3>
+			<view class="login-title">
+				
+				<h3>手机号登录/注册
+				<span class="login-title-span"  v-if="!personInfo&&!member"  @click="show3=true" >游客模式</span>
+				</h3>
 				<p>欢迎来到{{projectName}}</p>
 				<p v-if="activityInfo"><span style="color: red;">*</span>正在参加活动<span style="color: #3fbd70;">
 						<邀请有礼>
@@ -237,7 +240,7 @@
 				this.theme('standard')
 		},
 		onShow() {
-			this.checkSubscribe()
+			//this.checkSubscribe()
 		},
 		methods: {
 			touristConfirm() {
@@ -485,6 +488,11 @@
 	}
 </style>
 <style lang="scss" scoped>
+	.login-title-span{
+		    font-size: 36rpx;
+		    float: right;
+			color:#00B962
+	}
 	.classtable{
 		margin: 0rpx 40rpx;
 		
@@ -545,18 +553,22 @@
 		font-size: themed('font-size2');
 	}
 
-	.wrap {
+	.wrap {
+		//background: linear-gradient(#D6EEDC, #F3F4F4);
 		@include themeify {
 			font-size: themed('font-size2');
 		}
 
 		/*	font-size: 28rpx;*/
 		.login {
-			width: 600rpx;
-			padding-top: 80rpx;
-			margin: 0 auto;
-
-			.login-title {
+			//width: 600rpx;
+		
+			//
+
+			.login-title {
+				padding: 0 50rpx 0 50rpx;
+					padding-top: 80rpx;
+				background: linear-gradient(#D6EEDC, #fff);
 				text-align: left;
 
 				h3 {
@@ -574,7 +586,9 @@
 				}
 			}
 
-			.login-form-item {
+			.login-form-item {
+				margin: 0 auto;
+				width: 600rpx;
 				margin-top: 40px;
 
 				.title {
@@ -614,7 +628,9 @@
 				}
 			}
 
-			.login-btn {
+			.login-btn {
+				width: 600rpx;
+				margin: 0 auto;
 				margin-top: 40px;
 				background-color: #a7dbc2;
 

+ 4 - 5
pages/monthlyCardActivity/monthlyCardBuy.vue

@@ -317,8 +317,7 @@
 			<button class="btn " v-else-if="userInfo.userType=='1'">游客无法购买月卡
 			</button>
 			
-			<button class="btn " v-else-if="detail.memberLevel&&detail.memberLevel!=(userInfo.memberLevel?userInfo.memberLevel:1)" >{{detail.memberLevelStr}}可购买
-			</button>
+		
 			
 			<button class="btn " v-else-if="!isReady">加载中
 			</button>
@@ -414,7 +413,7 @@
 				detail: {},
 				ispay: false,
 				show3: false,
-				show2: false,
+				show2: true,
 				show1: false,
 				infoSet: false,
 				infoSet1: false,
@@ -443,7 +442,7 @@
 
 			this.ykgz = this.carhelp.getConfig().ykgz
 			//this.checkSubscribe()
-
+			this.getCardList();
 		},
 		onShow() {
 			if (this.carhelp.get("getElderModeClass") == "长辈模式") {
@@ -455,7 +454,7 @@
 				this.$refs.tabbarMain.setcount(1);
 			}
 
-			this.checkSubscribe();
+			//this.checkSubscribe();
 
 			// this.getCardList();
 			// this.show2 = true;

+ 1 - 1
pages/searchPile/chargeProcess/dcCharging.vue

@@ -1052,7 +1052,7 @@
 					if (this.chargingRecord.status == 1) {
 						if (this.carhelp.getGzDate() && !this.show2) {
 
-							this.checkSubscribe()
+							//this.checkSubscribe()
 
 						}
 					}

+ 2 - 2
pages/searchPile/searchPile.vue

@@ -298,8 +298,8 @@
 
 					</view>
 
-					<u-divider margin-top="20" bg-color="#F2F4F4"
-						v-if="stationslist.length &&stationslist.length == recordsTotal">已经到底了</u-divider>
+					<u-divider margin-top="20" style="margin-bottom: 20px;" bg-color="#F2F4F4"
+						 >已经到底了</u-divider>
 
 				</view>
 

+ 1 - 1
pages/user/InviteFriends.vue

@@ -179,7 +179,7 @@
 				}
 				this.onShowmethods()
 			
-				this.checkSubscribe()
+				//this.checkSubscribe()
 				
 		},
 		methods: {

+ 1 - 1
pages/user/finance/recharge.vue

@@ -445,7 +445,7 @@
 			}
 		},
 		onShow() {
-			this.checkSubscribe()
+			//this.checkSubscribe()
 			if (this.isReady) {
 				this.init1()
 			}

+ 187 - 2
pages/user/index.vue

@@ -22,7 +22,7 @@
 					</view>
 					
 					<view class="username" v-else >
-						<view class="name" :style="elderStatus ? 'font-size: 28px;' : ''">
+						<view class="name" >
 							{{userId ? nickName : '登录 / 注册'}}
 						</view>
 						<view class="change" :style="elderStatus ? 'font-size: 16px;' : ''">
@@ -283,6 +283,28 @@
 					我要加盟
 				</view>
 			</view>
+			
+			<view class="item"  @click="Subscribe">
+					<view class="item-icon" style="line-height: 52rpx;">
+						
+						<u-icon name="weixin-circle-fill" size="24px" ></u-icon>
+			
+					</view>
+					<view class="item-name " oldstyle="font-size: 16px;">
+						公众号
+					</view>
+			</view>
+			<view class="item"  @click="setOld">
+					<view class="item-icon" style="line-height: 52rpx;">
+						
+						<u-icon name="man-add" size="24px" ></u-icon>
+			
+					</view>
+					<view class="item-name " oldstyle="font-size: 16px;">
+						长者模式
+					</view>
+			</view>
+				
 			<view class="item"  @click="setUp">
 					<view class="item-icon" style="line-height: 52rpx;">
 						
@@ -302,6 +324,41 @@
 				</view>
 			</view> -->
 		</view>
+		<u-modal v-model="show1" @confirm="gotoGz" cancel-text="暂不关注" confirm-text="前往关注" confirm-color="#53b56b"
+			:show-cancel-button="true" ref="uModal2" :asyncClose="true">
+			<view style="padding: 15px;    text-align: center; ">前往关注<span style=" color:  #53b56b;">{{projectName}}</span>公众号</view>
+		
+		
+		</u-modal>
+		<u-mask :show="show2">
+		
+			<view class="wrap">
+		
+		
+				<view class="shema" @tap.stop>
+					<view class="title">
+						设置浏览模式
+					</view>
+					<view class="">
+						<u-radio-group v-model="value">
+							<u-radio v-for="(item, index) in list" :key="index" :name="item.name"
+								:disabled="item.disabled" active-color="#00B962">
+								{{item.name}}
+								<p v-if="item.name == '长辈模式'">字体更大 看的清楚</p>
+								<p v-if="item.name == '标准模式'">信息丰富 功能全面</p>
+							</u-radio>
+		
+						</u-radio-group>
+					</view>
+					<view class="hint">可在 {{""}}我的-设置 {{""}}页面中切换</view>
+					<view class="btn-box">
+						<u-button class="choice-btn" type="success" shape="circle"
+							@click="elderClick">我选好了</u-button>
+					</view>
+				</view>
+			</view>
+		</u-mask>
+		
 		<Tabbar :current="3" ref="tabbarMain" :elderStatus="elderStatus"></Tabbar>
 	</view>
 </template>
@@ -325,6 +382,7 @@
 		},
 		data() {
 			return {
+				projectName: "",
 				userCard:null,
 				recordsTotal: 0,
 				myCouponList: [],
@@ -341,6 +399,21 @@
 				confirmText: '拨打电话',
 				bannerList:[],
 				businessVipList:[],
+				
+				list: [{
+						name: '长辈模式',
+						disabled: false
+					},
+					{
+						name: '标准模式',
+						disabled: false
+					},
+				],
+				// u-radio-group的v-model绑定的值如果设置为某个radio的name,就会被默认选中
+				value: '长辈模式',
+				
+				show1: false,
+				show2: false,
 				background:{
 					background: 'none'
 				},
@@ -402,9 +475,44 @@
 			if(consumerPhone){
 				this.content=consumerPhone
  			}
-			
+			this.value=this.carhelp.get("getElderModeClass");
 		},
 		methods: {
+			elderClick() {
+				if (this.value == "长辈模式") {
+					this.elderStatus = true;
+					this.carhelp.set("getElderModeClass", "长辈模式");
+					this.fontMode = '1';
+				} else {
+					this.elderStatus = false;
+					this.carhelp.set("getElderModeClass", "标准模式");
+					this.fontMode = '0';
+				}
+			
+				API.changeFont({
+					fontMode: this.fontMode
+				}).then((res) => {
+					this.show2 = false;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			gotoGz() {
+				this.carhelp.setGzDate()
+				var url = "https://mp.weixin.qq.com/s/mCHz1nNvg0xAICiBeIyKRQ";
+				window.location.href = url
+			
+			},
+			Subscribe(){
+				this.projectName = process.car.ProjectName;
+				this.show1 = true
+			},
+			setOld(){
+				this.show2 = true;
+			},
 			
 			personalCenter(){
 				API.personalCenter().then((res2) => {
@@ -1142,4 +1250,81 @@
 			}
 		}
 	}
+	
+	
+	.shema {
+		width: 70%;
+		padding-bottom: 20px;
+		border-radius: 16px;
+		background-color: #fff;
+		position: fixed;
+		top: 100px;
+		left: 0;
+		right: 0;
+		margin: 0 auto;
+		z-index: 9999;
+	
+		.title {
+			height: 33px;
+			color: rgba(16, 16, 16, 100);
+			font-size: 24px;
+			text-align: center;
+			padding: 16px 0;
+		}
+	
+		.u-radio-group {
+			margin: 16px 5vw;
+		}
+	
+		/deep/.u-radio {
+			width: 60vw !important;
+	
+			padding: 24px 24px 40px;
+			line-height: 20px;
+			border-radius: 16px;
+			text-align: center;
+			border: #101010 1px solid;
+			margin-top: 12px;
+	
+		}
+	
+		/deep/ .u-radio__label {
+			text-align: left;
+			height: 24px;
+			// color: rgba(0, 185, 98, 100);
+			font-size: 24px;
+	
+		}
+	
+		p {
+	
+			height: 22px;
+			color: rgba(102, 102, 102, 100);
+			font-size: 14px;
+			margin-top: 12px;
+			white-space: nowrap
+		}
+	
+		.hint {
+			text-align: center;
+	
+		}
+	
+		.btn-box {
+			margin-top: 20px;
+	
+			.choice-btn {
+				width: 80%;
+			}
+		}
+	}
+	
+	.wrap {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		height: 100%;
+	
+	}
+	
 </style>