Merge branch 'master' of http://gitlab.frkj.cc/php/ZhiHuiJiaoWu_UniApp

pages.json

@@ -285,9 +285,25 @@
         "navigationBarBackgroundColor": "#292929",
         "navigationBarTextStyle": "white"
       }
+    },
+    {
+      "path": "pages/coach/my/set_up",
+      "style": {
+        "navigationBarTitleText": "设置",
+        "navigationStyle": "default",
+        "navigationBarBackgroundColor": "#292929",
+        "navigationBarTextStyle": "white"
+      }
+    },
+    {
+      "path": "pages/coach/my/update_pass",
+      "style": {
+        "navigationBarTitleText": "修改密码",
+        "navigationStyle": "default",
+        "navigationBarBackgroundColor": "#fff",
+        "navigationBarTextStyle": "black"
+      }
     }
-
-
   ],
   "globalStyle": {
     "navigationBarTextStyle": "white",

pages/coach/my/index.vue

@@ -64,25 +64,25 @@
          <view>xxx场馆</view>
         </view>
 
-        <view class="item">
+        <view class="item" @click="openViewDueSoon()">
-          <view @click="openViewDueSoon()">即将到期</view>
+          <view>即将到期</view>
           <view></view>
         </view>
 
-        <view class="item">
+        <view class="item" @click="openViewSchoolingStatistics()">
-          <view @click="openViewSchoolingStatistics()">授课统计</view>
+          <view>授课统计</view>
           <view></view>
         </view>
 
       </view>
 
       <view class="section_box">
-        <view class="item">
+        <view class="item" @click="openViewFeedback()">
-          <view @click="openViewFeedback()">意见反馈</view>
+          <view>意见反馈</view>
           <view></view>
         </view>
 
-        <view class="item">
+        <view class="item" @click="openViewSetUp()">
           <view>设置</view>
           <view></view>
         </view>
@@ -144,6 +144,13 @@ export default {
       uni.navigateTo({
         url: '/pages/coach/my/info'
       })
+    },
+
+    //打开设置
+    openViewSetUp(){
+      uni.navigateTo({
+        url: '/pages/coach/my/set_up'
+      })
     }
   }
 }

pages/coach/my/set_up.vue

@@ -0,0 +1,53 @@
+<!--设置页-->
+<template>
+	<view class="assemble">
+		<view style="height: 30rpx;"></view>
+		<view class="option" @click="update_pass()">修改密码</view>
+		<view class="option" @click="privacy_agreement(1)">用户协议</view>
+		<view class="option" @click="privacy_agreement(2)">隐私策略</view>
+		<view class="option">清空缓存</view>
+		
+		<view style="width:90%;margin: 60rpx auto;">
+			<fui-button background="#29d3b4">退出账号</fui-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			privacy_agreement(type){
+				uni.navigateTo({
+					url: '/pages/common/privacy_agreement?type='+type
+				})
+			},
+			update_pass(){
+				uni.navigateTo({
+					url: '/pages/coach/my/update_pass'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.assemble{
+		width: 100%;
+		height: 100vh;
+		background: #333333; 
+	}
+	.option{
+		margin-bottom: 20rpx;
+		background: #404045;
+		width: 100%;
+		font-size: 28rpx;
+		color: #fff;
+		line-height: 56rpx;
+		padding: 20rpx 0 20rpx 100rpx;
+	}
+</style>

pages/coach/my/update_pass.vue

@@ -0,0 +1,107 @@
+<!--修改密码-->
+<template>
+	<view>
+		<view class="title">
+			<view :class="{'green-text': tset_style === 1}">1.验证手机号码</view>
+			<view :class="{'green-text': tset_style === 2}">2.设置新密码</view>
+		</view>
+		<view :style="{'background-color':'#fff','width':'100%','height':'100vh' }">
+			<view style="width: 95%;height: 30rpx;"></view>
+			<view v-if="tset_style == 1">
+				<view class="describe">
+					为保障您的账号安全，修改密码前请填写原密码
+				</view>
+				<view style="width: 95%;margin:30rpx auto;">
+					<fui-input borderTop placeholder="请输入原登录密码" v-model="user" @input="input"
+						backgroundColor="#f2f2f2"></fui-input>
+				</view>
+			</view>
+			<view v-if="tset_style == 2">
+				<view style="width: 95%;margin:30rpx auto;">
+					<fui-input borderTop placeholder="请设置6-20位新的登录密码" v-model="user" @input="input"
+						backgroundColor="#f2f2f2"></fui-input>
+				</view>
+				<view style="width: 95%;margin: auto;">
+					<fui-input borderTop :padding="['20rpx','32rpx']" v-model="code" placeholder="请再次输入新的登录密码" @input="input"
+						backgroundColor="#f2f2f2">
+					</fui-input>
+				</view>
+			</view>
+			<view style="width: 95%;margin:60rpx auto;">
+				<fui-button background="#00be8c" radius="5rpx" @click="nextStep" v-if="tset_style == 1">下一步</fui-button>
+				<fui-button background="#00be8c" radius="5rpx" @click="submit" v-if="tset_style == 2">提交</fui-button>
+				<view style="width: 95%;margin:60rpx auto;">
+					<fui-button background="#fff" radius="5rpx" @click="forgot" color="#999999" v-if="tset_style == 1">忘记原密码</fui-button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				code: '',
+				user: '',
+				tset_style: 1,
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			sendCode() {
+				//延时为了效果展示
+				setTimeout(() => {
+					//发送短信
+					//...
+					//success方法：短信发送成功后将组件改为倒计时状态
+					this.$refs.fui_cdv && this.$refs.fui_cdv.success()
+				}, 800)
+			},
+			nextStep(){
+				this.tset_style = 2
+			},
+			forgot() {
+				uni.navigateTo({
+					url: '/pages/student/login/forgot'
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	page {
+		font-weight: normal;
+	}
+
+	.fui-section__title {
+		margin-left: 32rpx;
+	}
+
+	.fui-left__icon {
+		padding-right: 24rpx;
+	}
+
+	.title {
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		height: 100rpx;
+		width: 100%;
+		background-color: #fff;
+		font-size: 26rpx;
+		border: 4rpx #f5f5f5 solid;
+	}
+	
+	.green-text{
+		color: #36d6b9;
+	}
+	
+	.describe{
+		color: #999999;
+		padding-left: 30rpx;
+	}
+</style>