[techron][修改]:`我的`和`帮助`页面增加

pages/mine/index.vue

@@ -14,55 +14,102 @@
     background-color: #25282A;">
 			<image style="height: 3vh;width: 35vw;margin-left: 25vw;"
 				src="../../static/images/new/starts/login/backImg2.png"></image>
-			<text @click="clickRight()" style="font-size: 15px;font-weight: bold;z-index: 9999;height: 3vh;"><uni-icons v-show="!show" style="color: #ffffff;" size="30" type="more-filled"></uni-icons><uni-icons size="30" v-show="show" style="color: #57B03D;" type="more-filled"></uni-icons></text>
+			<text @click="clickRight()" style="font-size: 15px;font-weight: bold;z-index: 9999;height: 3vh;"><uni-icons
+					v-show="!show" style="color: #ffffff;" size="30" type="more-filled"></uni-icons><uni-icons size="30"
+					v-show="show" style="color: #57B03D;" type="more-filled"></uni-icons></text>
 			<!-- <view >
 				<u-popup :show="show" mode="right" customStyle="top:14vh;" :overlayOpacity="0" :closeOnClickOverlay="true" :zIndex="1" ref="showRight" :overlay="false" >
 				           
 						</u-popup>
 			</view> -->
 		</view>
-		<view style=";margin-top: 0vh;" v-if="show">
-			<view style="width: 100vw;">
-			   <scroll-view  style="background: linear-gradient(#161616, #000000);font-size: 20px;" scroll-y="true">
-			   	<view class="prop-item" @click="handleLogout()">
-			   		<!-- <view class="prop-item-image">
+		<view style=";margin-top: 0vh;position: relative;" v-if="show">
+			<view style="width: 100vw;height: 70vh;background: black;" v-if="aboutShow==false && helpShow==false">
+				<scroll-view style="background: linear-gradient(#161616, #000000);font-size: 20px;" scroll-y="true">
+					<view class="prop-item" @click="handleLogout()">
+						<!-- <view class="prop-item-image">
 			   								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
 			   							</view> -->
-			   		<view class="prop-item-right">{{i18('退出登录')}}</view>
-			   		<view class="prop-item-left">
-			   			<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
-			   		</view>
-			   	</view>
-			   	<u-divider />
-			   	<view class="prop-item" @click="skipPage(3)">
-			   		<!-- <view class="prop-item-image">
+						<view class="prop-item-right">{{i18('退出登录')}}</view>
+						<view class="prop-item-left">
+							<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
+						</view>
+					</view>
+					<u-divider />
+					<view class="prop-item" @click="skipPage(3)">
+						<!-- <view class="prop-item-image">
 			   								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
 			   							</view> -->
-			   		<view class="prop-item-right">{{i18('关于我们')}}</view>
-			   		<view class="prop-item-left">
-			   			<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
-			   		</view>
-			   	</view>
-			   	<u-divider />
-			   	<view class="prop-item" @click="skipPage(4)">
-			   		<!-- <view class="prop-item-image">
+						<view class="prop-item-right">{{i18('关于我们')}}</view>
+						<view class="prop-item-left">
+							<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
+						</view>
+					</view>
+					<u-divider />
+					<view class="prop-item" @click="skipPage(4)">
+						<!-- <view class="prop-item-image">
 			   								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
 			   							</view> -->
-			   		<view class="prop-item-right">{{i18('帮助')}}</view>
-			   		<view class="prop-item-left">
-			   			<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
-			   		</view>
-			   	</view>
-			   	<u-divider />
-			   </scroll-view>
+						<view class="prop-item-right">{{i18('帮助')}}</view>
+						<view class="prop-item-left">
+							<!-- <uni-icons type="forward" color="lightgray" size="16"></uni-icons> -->
+						</view>
+					</view>
+					<u-divider />
+				</scroll-view>
+				<view style="position: absolute;bottom: 0;left:5px;color: #b8b8bb">Version:1.10</view>
+				<view @click="handleToEditInfo" style="position: absolute;bottom: 0 ;right: 5px;color: #b8b8bb">Delete Account</view>
 			</view>
+			<view v-if="aboutShow==true && show==true && helpShow==false" style="width: 100vw;">
+				<scroll-view style="background: linear-gradient(#161616, #000000);font-size: 16px;color: aliceblue;"
+					scroll-y="true">
+					<!-- 关于我们 -->
+					<view class="textMsg">
+						
+						<view style="font-size: 20px;font-weight:bold; margin-bottom: 3vh;">About Us</view>
+						<view style="font-size: 18px;font-weight:bold">Welcome to techtron®</view>
+						<view style="color: #d8d8d8;">we combine passion, drive and intellect
+						</view><view style="color: #d8d8d8;">with market leading research and
+						</view><view style="color: #d8d8d8;;margin-bottom: 2vh;">cutting-edge technology.</view>
+						<view style="color: #d8d8d8">We innovate and deliver premium quality
+						</view><view style="color: #d8d8d8;">products that excite, inspire and challenge
+						</view><view style="color: #d8d8d8;margin-bottom: 2vh;">the sector.</view>
+						<view style="font-size: 18px;font-weight:bold;">We are focused on reducing our</view>
+						<view style="font-size: 18px;font-weight:bold;">environmental impact, whilst improving</view>
+						<view style="font-size: 18px;font-weight:bold;">the Health & Wellbeing of our</view>
+						<view style="font-size: 18px;font-weight:bold;margin-bottom: 2vh;">customers.</view>
+					
+					</view>
+				</scroll-view>
+			</view>
+			<view v-if="helpShow==true&& show==true && aboutShow==false" style="width: 100vw;">
+				<scroll-view style="background: linear-gradient(#161616, #000000);font-size: 16px;color: aliceblue;"
+					scroll-y="true">
+					<!-- 帮助 -->
+					<view class="textMsg">
+						<view style="margin-bottom: 3vh;font-size: 20px;font-weight:bold;">Help</view>
+						<view  style="color: #d8d8d8;">Visit the<span style=" font-weight: 600;color: aliceblue;margin: 0 4px;"> techtron® </span> website
+							</view><view style="color: #d8d8d8;">where you will find product user manuals,
+							informative blogs, video guides and a
+							</view><view style="color: #d8d8d8;">questions and answers section regarding
+							</view><view style="color: #d8d8d8;">the most common issues. If you cannot
+							</view><view style="color: #d8d8d8;">resolve your problem here, e-mail our
+							</view><view style="color: #d8d8d8;">customer services on the techtron® website
+							</view><view style="color: #d8d8d8;margin-bottom: 2vh;">customer contact page.</view>
+						<view style="font-size: 18px;font-weight:bold;">www.techtron.co</view>
+					</view>
+				</scroll-view>
 			</view>
+			
+		</view>
+
 		<!-- <u-divider style="margin-top: 15vh;border-width: 5px;"></u-divider> -->
 		<view style=";margin-top: 10vh;" v-else>
-		<view style=";margin-top: 10vh;justify-content: center;align-items: center;justify-content: center;display: grid;align-content: center;justify-items: center;line-height: 50px;">
-			<image   :src="avatar" class="cu-avatar xl round" mode="widthFix" style="margin-top: 5vh;">
-			 <!-- <image v-if="avatar" :src="avatar" class="cu-avatar xl round" mode="widthFix"> -->
-			<!--</image>
+			<view
+				style=";margin-top: 10vh;justify-content: center;align-items: center;justify-content: center;display: grid;align-content: center;justify-items: center;line-height: 50px;">
+				<image :src="avatar" class="cu-avatar xl round" mode="widthFix" style="margin-top: 5vh;">
+					<!-- <image v-if="avatar" :src="avatar" class="cu-avatar xl round" mode="widthFix"> -->
+					<!--</image>
 			<view >
 			 <image style="width: 40rpx;height: 40rpx;" src="../../static/images/new/starts/mine/start_light.png"></image>
 			 <image style="width: 40rpx;height: 40rpx;" src="../../static/images/new/starts/mine/start_light.png"></image>
@@ -70,47 +117,48 @@
 			 <image style="width: 40rpx;height: 40rpx;" src="../../static/images/new/starts/mine/start_light.png"></image>
 			 <image style="width: 40rpx;height: 40rpx;" src="../../static/images/new/starts/mine/start.png"></image>
 			</view> -->
-			<view style="color: #d0d0d0;font-weight: bold;font-size: 15px;">
-			  {{ name }}
+					<view style="color: #d0d0d0;font-weight: bold;font-size: 15px;">
+						{{ name }}
+					</view>
+			</view>
+			<view class="menu-list" style="width: 100vw;line-height: 40px;">
+				<u-divider style=";width: 100vw;" />
+				<view class="list-cell list-cell-arrow" @click="handleToEditInfo">
+					<view class="menu-item-box">
+						<image :src="this.imgUrl+'/mine/symbol.png'" style="width: 18px;height: 18px;"></image>
+						<view class="menu-text"> {{ i18('账户设置')}}</view>
+					</view>
+				</view>
+				<view class="list-cell list-cell-arrow" @click="handleAbout">
+					<view class="menu-item-box">
+						<image :src="this.imgUrl+'/mine/record.png'" style="width: 18px;height: 18px;"></image>
+						<view class="menu-text">{{ i18('充电记录')}}</view>
+					</view>
+				</view>
+				<view class="list-cell list-cell-arrow" @click="handleToSetting">
+					<view class="menu-item-box">
+						<image :src="this.imgUrl+'/mine/symbol (1).png'" style="width: 18px;height: 18px;"></image>
+						<view class="menu-text">{{ i18('预约记录')}}</view>
+					</view>
+				</view>
 			</view>
 		</view>
-		<view class="menu-list" style="width: 100vw;line-height: 40px;">
-			<u-divider style=";width: 100vw;"/>
-		  <view class="list-cell list-cell-arrow" @click="handleToEditInfo">
-		    <view class="menu-item-box" >
-		      <image :src="this.imgUrl+'/mine/symbol.png'" style="width: 18px;height: 18px;"></image>
-		      <view class="menu-text"> {{  i18('账户设置')}}</view>
-		    </view>
-		  </view>
-		  <view class="list-cell list-cell-arrow" @click="handleAbout">
-		    <view class="menu-item-box">
-		      <image :src="this.imgUrl+'/mine/record.png'" style="width: 18px;height: 18px;"></image>
-		      <view class="menu-text">{{  i18('充电记录')}}</view>
-		    </view>
-		  </view>
-		  <view class="list-cell list-cell-arrow" @click="handleToSetting">
-		    <view class="menu-item-box">
-		      <image :src="this.imgUrl+'/mine/symbol (1).png'" style="width: 18px;height: 18px;"></image>
-		      <view class="menu-text">{{  i18('预约记录')}}</view>
-		    </view>
-		  </view>
-		  </view>
-		  </view>
-    <view style="position:fixed;bottom:10px;display: flex;align-items: center;justify-content: center;text-align: center;left:0px;right:0px;">
+		<view
+			style="position:fixed;bottom:10px;display: flex;align-items: center;justify-content: center;text-align: center;left:0px;right:0px;">
 			<!-- <image style="height: 3vh;width: 35vw;position: absolute;bottom: 13vh;left: 32.5vw;" src="../../static/images/new/starts/login/backImg2.png"></image> -->
-      <view @click="skipPage(0)" style="margin:0px 10px;">
-        <image src="@/static/images/new/starts/tabbar/one_off.png"
-               style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
-      </view>
-      <view @click="skipPage(1)" style="margin:0px 10px;">
-        <image src="@/static/images/new/starts/tabbar/two_off.png"
-               style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
-      </view>
-      <view @click="skipPage(2)" style="margin:0px 10px;">
-        <image src="@/static/images/new/starts/tabbar/three_on.png"
-               style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
-      </view>
-    </view>
+			<view @click="skipPage(0)" style="margin:0px 10px;">
+				<image src="@/static/images/new/starts/tabbar/one_off.png"
+					style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
+			</view>
+			<view @click="skipPage(1)" style="margin:0px 10px;">
+				<image src="@/static/images/new/starts/tabbar/two_off.png"
+					style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
+			</view>
+			<view @click="skipPage(2)" style="margin:0px 10px;">
+				<image src="@/static/images/new/starts/tabbar/three_on.png"
+					style="width: 60px;height: 60px;margin: 2vh 0.2vh;"></image>
+			</view>
+		</view>
 		<!--顶部个人信息栏-->
 		<!-- <view class="header-section">
       <view class="flex padding justify-between">
@@ -187,20 +235,22 @@
 				version: getApp().globalData.config.appInfo.version,
 				imgUrl: getApp().globalData.config.imgUrl,
 				clickRightTag: 0,
-				show:false,
+				show: false,
+				aboutShow: false,
+				helpShow: false
 			}
 		},
 		computed: {
 			avatar() {
 				console.log(JSON.stringify(this.$store.state.user))
-				
-				if(this.$store.state.user.avatar==null||this.$store.state.user.avatar==''){
+
+				if (this.$store.state.user.avatar == null || this.$store.state.user.avatar == '') {
 					return getApp().globalData.config.imgUrl + "/index/user.png"
-				}else{
+				} else {
 					return this.$store.state.user.avatar
 				}
-				
-				
+
+
 			},
 			windowHeight() {
 				return uni.getSystemInfoSync().windowHeight - 50
@@ -215,36 +265,42 @@
 			// })
 		},
 		methods: {
-      skipPage(type){
-        if(type==0){
-          uni.reLaunch({
-            url:'/pages/index'
-          })
-        }else if(type==1){
-          uni.reLaunch({
-            url:'/pages/weitiandi/deviceList'
-          })
-        }else if(type==2){
-          uni.reLaunch({
-            url:'/pages/mine/index'
-          })
-        }
-      },
-      skip(){
-        this.$modal.showToast("功能开发中..");
-      },
+			skipPage(type) {
+				if (type == 0) {
+					uni.reLaunch({
+						url: '/pages/index'
+					})
+				} else if (type == 1) {
+					uni.reLaunch({
+						url: '/pages/weitiandi/deviceList'
+					})
+				} else if (type == 2) {
+					uni.reLaunch({
+						url: '/pages/mine/index'
+					})
+				} else if (type == 3) {
+					//关于我们
+					this.aboutShow = true;
+				} else if (type == 4) {
+					//帮助
+					this.helpShow = true
+				}
+			},
+			skip() {
+				this.$modal.showToast("功能开发中..");
+			},
 			handleLogout() {
-			  this.$modal.confirm('确定注销并退出系统吗？').then(() => {
-			    this.$store.dispatch('LogOut').then(() => {
-					uni.setStorageSync("loginInfo",'');
-			      this.$tab.reLaunch('/pages/index')
-			    })
-			  })
+				this.$modal.confirm('确定注销并退出系统吗？').then(() => {
+					this.$store.dispatch('LogOut').then(() => {
+						uni.setStorageSync("loginInfo", '');
+						this.$tab.reLaunch('/pages/index')
+					})
+				})
 			},
 			changeDrawer(event) {
 				if (event) {
 					// 抽屉打开时的逻辑
-					
+
 					this.clickRightTag = 1
 				} else {
 					// 抽屉关闭时的逻辑
@@ -254,7 +310,9 @@
 			//自定义头右操作函数
 			clickRight() {
 				//打开抽屉
-				this.show=!this.show
+				this.show = !this.show
+				this.aboutShow = false,
+					this.helpShow = false
 				// if (this.clickRightTag == 0) {
 				// 	this.$refs.showRight.open();
 				// 	this.clickRightTag = 1
@@ -337,7 +395,7 @@
 	.mine-container {
 		// width: 100%;
 		// height: 102vh;
-		
+
 
 		.header-section {
 			padding: 15px 15px 45px 15px;
@@ -394,7 +452,7 @@
 	.menu-list {
 		box-shadow: 0px 2px 24px 0px rgba(0, 0, 0, 0.1);
 		border-radius: 20px;
-		margin: 0 0 0 0 ;
+		margin: 0 0 0 0;
 	}
 
 	.list-cell {
@@ -442,4 +500,11 @@
 		top: 5rpx;
 		color: #BCBCBF;
 	}
+
+	.textMsg {
+		      width: 88vw;
+		      text-align: center;
+		      margin: 10vh auto;
+		      line-height: 2.5vh;
+	}
 </style>

pages/weitiandi/bluetooth/status.vue

@@ -161,7 +161,7 @@
 			</view>
 			<view >
 				<u-popup :show="show" mode="right" customStyle="top:10vh;bottom:200px" :overlayOpacity="0" :closeOnClickOverlay="true" :zIndex="100" ref="showRight" :overlay="false" >
-				            <view style="width: 100vw;height: 100vh;">
+				            <view style="width: 100vw;height: 100vh;" v-if="aboutShow==false && helpShow==false">
 				               <scroll-view  style="background: linear-gradient(#000000, #161615);font-size: 20px;height: 100vh;" scroll-y="true">
 				               	<view class="prop-item" @click="handleLogout()">
 				               		<!-- <view class="prop-item-image">
@@ -173,7 +173,7 @@
 				               		</view>
 				               	</view>
 				               	<u-divider />
-				               	<view class="prop-item" @click="skipPage(3)">
+				               	<view class="prop-item" @click="skip(3)">
 				               		<!-- <view class="prop-item-image">
 				               								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
 				               							</view> -->
@@ -183,7 +183,7 @@
 				               		</view>
 				               	</view>
 				               	<u-divider />
-				               	<view class="prop-item" @click="skipPage(4)">
+				               	<view class="prop-item" @click="skip(4)">
 				               		<!-- <view class="prop-item-image">
 				               								<image :src="imgUrl+'/logout.png'" style="width: 30%;height:100%;" />
 				               							</view> -->
@@ -195,6 +195,46 @@
 				               	<u-divider />
 				               </scroll-view>
 				            </view>
+							<view v-if="aboutShow==true && show==true && helpShow==false" style="width: 100vw;height: 100vh;">
+								<scroll-view style="background: linear-gradient(#161616, #000000);font-size: 16px;color: aliceblue;height: 100vh;"
+									scroll-y="true">
+									<!-- 关于我们 -->
+									<view class="textMsg">
+										
+										<view style="font-size: 20px;font-weight:bold; margin-bottom: 3vh;">About Us</view>
+										<view style="font-size: 18px;font-weight:bold">Welcome to techtron®</view>
+										<view style="color: #d8d8d8;">we combine passion, drive and intellect
+										</view><view style="color: #d8d8d8;">with market leading research and
+										</view><view style="color: #d8d8d8;;margin-bottom: 2vh;">cutting-edge technology.</view>
+										<view style="color: #d8d8d8">We innovate and deliver premium quality
+										</view><view style="color: #d8d8d8;">products that excite, inspire and challenge
+										</view><view style="color: #d8d8d8;margin-bottom: 2vh;">the sector.</view>
+										<view style="font-size: 18px;font-weight:bold;">We are focused on reducing our</view>
+										<view style="font-size: 18px;font-weight:bold;">environmental impact, whilst improving</view>
+										<view style="font-size: 18px;font-weight:bold;">the Health & Wellbeing of our</view>
+										<view style="font-size: 18px;font-weight:bold;margin-bottom: 2vh;">customers.</view>
+									
+									</view>
+								</scroll-view>
+							</view>
+							<view v-if="helpShow==true&& show==true && aboutShow==false" style="width: 100vw;height: 100vh;">
+								<scroll-view style="background: linear-gradient(#161616, #000000);font-size: 16px;color: aliceblue;height: 100vh;"
+									scroll-y="true">
+									<!-- 帮助 -->
+									<view class="textMsg">
+										<view style="margin-bottom: 3vh;font-size: 20px;font-weight:bold;">Help</view>
+										<view  style="color: #d8d8d8;">Visit the<span style=" font-weight: 600;color: aliceblue;margin: 0 4px;"> techtron® </span> website
+											</view><view style="color: #d8d8d8;">where you will find product user manuals,
+											informative blogs, video guides and a
+											</view><view style="color: #d8d8d8;">questions and answers section regarding
+											</view><view style="color: #d8d8d8;">the most common issues. If you cannot
+											</view><view style="color: #d8d8d8;">resolve your problem here, e-mail our
+											</view><view style="color: #d8d8d8;">customer services on the techtron® website
+											</view><view style="color: #d8d8d8;margin-bottom: 2vh;">customer contact page.</view>
+										<view style="font-size: 18px;font-weight:bold;">www.techtron.co</view>
+									</view>
+								</scroll-view>
+							</view>
 						</u-popup>
 			</view>
     <view style="    position: relative;top: 4vh;margin-top: 4vh;text-align: center;display: flex;flex-direction: row;justify-content: center;">
@@ -463,7 +503,9 @@ export default {
       refreshTimer:null,
 	  clickRightTag:0,
 	  show:false,
-	  timeFlg:true
+	  timeFlg:true,
+	  aboutShow: false,
+	  helpShow: false
     }
   },
   computed: {
@@ -626,7 +668,13 @@ export default {
 	  			uni.navigateTo({
 	  				url:'/pages/mine/index'
 	  			})
-	  			}else{
+	  			}else if (type == 3) {
+					//关于我们
+					this.aboutShow = true;
+				} else if (type == 4) {
+					//帮助
+					this.helpShow = true
+				}else{
         this.$modal.showToast("功能开发中..");
       }
 	  },
@@ -651,6 +699,8 @@ export default {
 	  clickRight() {
 	  	//打开抽屉
 		this.show=!this.show
+		this.aboutShow = false,
+			this.helpShow = false
 	  	// if (this.clickRightTag == 0) {
 	  	// 	this.$refs.showRight.open();
 	  	// 	this.clickRightTag = 1
@@ -1848,4 +1898,10 @@ export default {
   padding: 5px;
   background: #1A87FF !important;
 }
+.textMsg {
+		      width: 88vw;
+		      text-align: center;
+		      margin: 10vh auto;
+		      line-height: 2.5vh;
+	}
 </style>

pages/weitiandi/device/planrecord.vue

@@ -15,8 +15,8 @@
         <view class="item-body">
           <view style="font-size: 12px">
             {{i18('预约类型')}}:
-            <uni-tag :circle="true" type="primary" :text="i18('单次')" v-if="item.planType === 1"></uni-tag>
-            <uni-tag :circle="true" type="warning" :text="i18('重复')" v-if="item.planType === 2"></uni-tag>
+            <uni-tag :circle="true" type="primary" :text="i18('单次')" v-if="item.planType === 1" style="margin-left: 0.5vw;"></uni-tag>
+            <uni-tag :circle="true" type="warning" :text="i18('重复')" v-if="item.planType === 2" style="margin-left: 0.5vw;"></uni-tag>
           </view>
           <view style="font-size: 12px; margin: 5px 0">
             {{i18('创建时间')}}：{{ item.createTime }}

pages/weitiandi/device/status.vue

@@ -13,7 +13,7 @@
 		</view>
 		<view >
 			<u-popup :show="show" mode="right" customStyle="top:10vh;bottom:200px;" :overlayOpacity="0" :closeOnClickOverlay="true" :zIndex="100" ref="showRight" :overlay="false" >
-			            <view style="width: 100vw;height: 100vh;">
+			            <view style="width: 100vw;height: 100vh;"  v-if="aboutShow==false && helpShow==false">
 			               <scroll-view  style="background: linear-gradient(#000000, #161615);font-size: 20px;height: 100vh;" scroll-y="true">
 			               	<view class="prop-item" @click="handleLogout()">
 			               		<!-- <view class="prop-item-image">
@@ -47,6 +47,46 @@
 			               	<u-divider />
 			               </scroll-view>
 			            </view>
+						<view v-if="aboutShow==true && show==true && helpShow==false" style="width: 100vw;height: 100vh;">
+							<scroll-view style="background: linear-gradient(#161616, #000000);font-size: 16px;color: aliceblue;height: 100vh;"
+								scroll-y="true">
+								<!-- 关于我们 -->
+								<view class="textMsg">
+									
+									<view style="font-size: 20px;font-weight:bold; margin-bottom: 3vh;">About Us</view>
+									<view style="font-size: 18px;font-weight:bold">Welcome to techtron®</view>
+									<view style="color: #d8d8d8;">we combine passion, drive and intellect
+									</view><view style="color: #d8d8d8;">with market leading research and
+									</view><view style="color: #d8d8d8;;margin-bottom: 2vh;">cutting-edge technology.</view>
+									<view style="color: #d8d8d8">We innovate and deliver premium quality
+									</view><view style="color: #d8d8d8;">products that excite, inspire and challenge
+									</view><view style="color: #d8d8d8;margin-bottom: 2vh;">the sector.</view>
+									<view style="font-size: 18px;font-weight:bold;">We are focused on reducing our</view>
+									<view style="font-size: 18px;font-weight:bold;">environmental impact, whilst improving</view>
+									<view style="font-size: 18px;font-weight:bold;">the Health & Wellbeing of our</view>
+									<view style="font-size: 18px;font-weight:bold;margin-bottom: 2vh;">customers.</view>
+								
+								</view>
+							</scroll-view>
+						</view>
+						<view v-if="helpShow==true&& show==true && aboutShow==false" style="width: 100vw;height: 100vh;">
+							<scroll-view style="background: linear-gradient(#161616, #000000);font-size: 16px;color: aliceblue;height: 100vh;"
+								scroll-y="true">
+								<!-- 帮助 -->
+								<view class="textMsg">
+									<view style="margin-bottom: 3vh;font-size: 20px;font-weight:bold;">Help</view>
+									<view  style="color: #d8d8d8;">Visit the<span style=" font-weight: 600;color: aliceblue;margin: 0 4px;"> techtron® </span> website
+										</view><view style="color: #d8d8d8;">where you will find product user manuals,
+										informative blogs, video guides and a
+										</view><view style="color: #d8d8d8;">questions and answers section regarding
+										</view><view style="color: #d8d8d8;">the most common issues. If you cannot
+										</view><view style="color: #d8d8d8;">resolve your problem here, e-mail our
+										</view><view style="color: #d8d8d8;">customer services on the techtron® website
+										</view><view style="color: #d8d8d8;margin-bottom: 2vh;">customer contact page.</view>
+									<view style="font-size: 18px;font-weight:bold;">www.techtron.co</view>
+								</view>
+							</scroll-view>
+						</view>
 					</u-popup>
 		</view>
 		<view style="    position: relative;top: 4vh;margin-top: 4vh;text-align: center;display: flex;flex-direction: row;justify-content: center;">
@@ -367,7 +407,9 @@
 				days: ["", "周一", "周二", "周三", "周四", "周五", "周六", "周日"],
 				clickRightTag: 0,
 				show:false,
-				timeFlg:true
+				timeFlg:true,
+				aboutShow: false,
+				helpShow: false
 			}
 		},
 		computed: {
@@ -424,7 +466,13 @@
 						uni.navigateTo({
 							url:'/pages/mine/index'
 						})
-						}else{
+						}else if (type == 3) {
+					//关于我们
+					this.aboutShow = true;
+				} else if (type == 4) {
+					//帮助
+					this.helpShow = true
+				}else{
           this.$modal.showToast("功能开发中..");
         }
 			},
@@ -460,6 +508,9 @@
 			clickRight() {
 				//打开抽屉
 				this.show=!this.show
+				
+				this.aboutShow = false,
+					this.helpShow = false
 				// if (this.clickRightTag == 0) {
 				// 	this.show=true
 				// 	this.clickRightTag = 1
@@ -1578,5 +1629,11 @@
 		text-align: center;
 		z-index: 9999;
 	}
+	.textMsg {
+		      width: 88vw;
+		      text-align: center;
+		      margin: 10vh auto;
+		      line-height: 2.5vh;
+	}
 	
 </style>