1

pages.json

@@ -102,6 +102,15 @@
 			}
 		},
 		{
+			"path": "pages/zhtijiao/index",
+			"style": {
+				"navigationBarTitleText": "我的",
+				"app-plus":{
+					"titleNView": false
+				}
+			}
+		},
+		{
 			"path": "pages/chuanghome/index",
 			"style": {
 				"navigationBarTitleText": "我的",

pages/login/index.vue

@@ -2,31 +2,27 @@
 	<view :style="{ minHeight: sys.windowHeight + 'px' }"
 		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
 		<tm-menubars title="" :shadow="0" :showback="false"></tm-menubars>
+		<view class="tou C1b1b1b">登录</view>
+		<view class="zhuti">
+			<tm-form>
+				<view class="tel text-size-m mt-50">手机号码</view>
+				<tm-input name="title" v-model="reqData.mobile"></tm-input>
+				<view class="mima">
+					<tm-input name="title" password v-model="reqData.password" placeholder="登录密码"></tm-input>
+					<view class="wangji text-size-s" @click="zhaohui()">忘记密码？</view>
+				</view>
+				<view class="py-10 text-size-s mt-30">
+					<tm-checkbox :size="32" color="bg-gradient-primary-accent" v-model="checked" round="rounded"></tm-checkbox>
+					<text class="text-white" @click="xieyi()" style="vertical-align: middle;">阅读并同意《用户协议》</text>
+				</view>
+				<view class="px-24">
+					<tm-button @click="tijiao()" theme="primary" :round="24" block class="mt-50 logincla">登录</tm-button>
+					<tm-button @click="zhuce()" theme="primary" :round="24" block class="mt-30">注册新用户</tm-button>
+				</view>
+			</tm-form>
+		</view>
+		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
-		<tm-sheet :shadow="24" :padding="[12,24]" :margin="[24,24]">
-			<view>
-				<tm-form>
-					<tm-input name="title" title="手机号码" v-model="reqData.mobile"></tm-input>
-					<view class="flex-between" :class="$tm.vx.state().tmVuetify.black ? 'bk' : ''">
-						<tm-input name="title" :password="! on" title="登录密码" v-model="reqData.password"></tm-input>
-						<view>
-							<tm-switch v-model="on" :text="['','...']"></tm-switch>
-						</view>
-					</view>
-					<view class="px-24">
-						<tm-button @click="tijiao()" theme="bg-gradient-blue-accent" block>登陆</tm-button>
-						<tm-row class="mt-40 mb-20">
-							<tm-col color="text-size-xs" :grid="6">
-								<view class="py-10"><text class="text-primary text-size-s text-align-center" @click="zhuce()">注册新用户</text></view>
-							</tm-col>
-							<tm-col color="text-size-xs" :grid="6">
-								<view class="py-10"><text class="text-primary text-size-s text-align-center" @click="zhaohui()">找回密码</text></view>
-							</tm-col>
-						</tm-row>
-					</view>
-				</tm-form>
-			</view>
-		</tm-sheet>
 	</view>
 </template>	
 <script>
@@ -34,7 +30,7 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
-			on:false,
+			checked:false,
 			reqData:{
 				mobile:'',
 				password:'',
@@ -48,6 +44,11 @@ export default {
 		this.sys = uni.getSystemInfoSync();
 	},
 	methods: {
+		xieyi(){
+			uni.navigateTo({
+				url: "/pages/xieyi/index",
+			})
+		},
 		tijiao(){
 			var that=this;
 			if(that.reqData.mobile==""){
@@ -56,6 +57,9 @@ export default {
 			}else if(that.reqData.password==""){
 				that.$refs.toast.show({model:'warn',label:'请输入密码'})
 				return
+			}else if(! that.checked){
+				that.$refs.toast.show({model:'warn',label:'请勾选用户协议'})
+				return
 			}
 			myRequest({
 				url: "/api/login/login",
@@ -87,11 +91,6 @@ export default {
 				url: "/pages/zhaohui/index",
 			})
 		},
-		login(){
-			uni.navigateTo({
-				url: "/pages/login/index",
-			})
-		}
 	}
 }
 </script>
@@ -100,4 +99,31 @@ export default {
 	/deep/ .tm-menubars .body{
 		background-color: #1b1b1b !important;
 	}
+	/deep/ .grey-darken-5{
+		background-color: #0d0d0d!important;
+		padding: 0px !important;
+	}
+	.tou{
+		font-size: 28px;
+		padding: 15px 30px 40px 30px;
+	}
+	.zhuti{
+		padding: 15px 30px 40px 30px;
+	}
+	.tel{
+		margin-left: 5px;
+	}
+	.mima{
+		position: relative;
+	}
+	.wangji{
+		position: absolute;
+		right: 0px;
+		top: 0px;
+		line-height: 50px;
+		text-decoration:underline;
+	}
+	/deep/ .logincla .primary{
+		background-color: #303440 !important;
+	}
 </style>

pages/registered/index.vue

@@ -2,30 +2,31 @@
 	<view :style="{ minHeight: sys.windowHeight + 'px' }"
 		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
 		<tm-menubars title="" :shadow="0" :showback="false"></tm-menubars>
-		<tm-message ref="toast"></tm-message>
-		<tm-sheet :shadow="24" :padding="[12,24]" :margin="[24,24]">
-			<view>
-				<tm-form>
-					<tm-input name="title" title="手机号" v-model="reqData.mobile"></tm-input>
-					<view class="flex-between" :class="$tm.vx.state().tmVuetify.black ? 'bk' : ''">
-						<tm-input name="title" title="验证码" v-model="reqData.sms_code"></tm-input>
-						<view>
-							<tm-button @click="sendyzm" :theme="yzmvar.colorvar" size="m">{{yzmvar.text}}</tm-button>
-						</view>
+		<view class="tou C1b1b1b">新用户注册</view>
+		<view class="zhuti">
+			<tm-form>
+				<view class="tel text-size-m mt-50">请输入注册手机号码</view>
+				<tm-input name="title" v-model="reqData.mobile"></tm-input>
+				<view class="mima">
+					<tm-input placeholder="请输入短信验证码" name="title" v-model="reqData.sms_code"></tm-input>
+					<tm-button class="wangji" @click="sendyzm" size="m">{{yzmvar.text}}</tm-button>
+				</view>
+				<tm-input name="title" placeholder="请设置6-20位登录密码" password v-model="reqData.password"></tm-input>
+				<tm-input name="title" placeholder="请再次确认登录密码" password v-model="reqData.password1"></tm-input>
+				<view class="px-24">
+					<view class="py-10 text-size-s mt-30">
+						<tm-checkbox :size="32" color="bg-gradient-primary-accent" v-model="checked" round="rounded"></tm-checkbox>
+						<text class="text-white" @click="xieyi()" style="vertical-align: middle;">阅读并同意《用户协议》</text>
 					</view>
-					<tm-input name="title" password title="密码" v-model="reqData.password"></tm-input>
-					<tm-input name="title" password title="确认密码" v-model="reqData.password1"></tm-input>
-					<view class="px-24">
-						<view class="py-10 text-size-s text-grey text-align-left">
-							<tm-checkbox :size="32" color="bg-gradient-primary-accent" v-model="checked" round="rounded"></tm-checkbox>同意<text class="text-primary" @click="xieyi()">《用户服务协议》</text></view>
-						<tm-button @click="tijiao()" theme="bg-gradient-blue-accent" block>注册</tm-button>
-						<view class="py-10 text-size-s text-grey text-align-center ma-10">
-							<text class="text-primary text-size-s text-align-center" @click="login()">已有账号，立即登录</text>
-						</view>
+					<tm-button @click="tijiao()" theme="primary" :round="24" class="mt-50" block>注册</tm-button>
+					<view class="py-10 text-size-s text-grey text-align-center mt-30">
+						<text class="text-white text-size-s text-align-center" @click="login()">已有账户，立即登录</text>
 					</view>
-				</tm-form>
-			</view>
-		</tm-sheet>
+				</view>
+			</tm-form>
+		</view>
+		<!-- 弹出层消息 -->
+		<tm-message ref="toast"></tm-message>
 	</view>
 </template>	
 <script>
@@ -41,7 +42,6 @@ export default {
 				password1:''
 			},
 			yzmvar:{
-				colorvar:'primary',
 				text:'发送验证码'
 			}
 		};
@@ -61,11 +61,11 @@ export default {
 			}else if(that.reqData.sms_code==""){
 				that.$refs.toast.show({model:'warn',label:'请输入验证码'})
 				return
-			}else if(that.reqData.password==""){
-				that.$refs.toast.show({model:'warn',label:'请输入密码'})
+			}else if(that.reqData.password=="" || that.reqData.password.length<6 ||that.reqData.password.length>20){
+				that.$refs.toast.show({model:'warn',label:'请设置6-20位登录密码'})
 				return
 			}else if(that.reqData.password1==""){
-				that.$refs.toast.show({model:'warn',label:'请输入确认密码'})
+				that.$refs.toast.show({model:'warn',label:'请再次确认登录密码'})
 				return
 			}else if(that.reqData.password != that.reqData.password1){
 				that.$refs.toast.show({model:'warn',label:'密码不一致'})
@@ -99,12 +99,10 @@ export default {
 				that.$refs.toast.show({model:'warn',label:'请输入手机号'})
 				return
 			}
-			that.yzmvar.colorvar="gray";
 			that.yzmvar.text="已发送";
 			setTimeout(function(){
-				that.yzmvar.colorvar="primary";
 				that.yzmvar.text="发送验证码";
-			},5000)
+			},15000)
 		},
 		login(){
 			uni.navigateTo({
@@ -124,4 +122,30 @@ export default {
 	/deep/ .tm-menubars .body{
 		background-color: #1b1b1b !important;
 	}
+	/deep/ .grey-darken-5{
+		background-color: #0d0d0d!important;
+		padding: 0px !important;
+	}
+	.tou{
+		font-size: 28px;
+		padding: 15px 30px 40px 30px;
+	}
+	.tel{
+		margin-left: 5px;
+	}
+	.zhuti{
+		padding: 15px 30px 40px 30px;
+	}
+	.mima{
+		position: relative;
+	}
+	.wangji{
+		position: absolute;
+		right: 0px;
+		top: 3px;
+	}
+	/deep/ .wangji .primary{
+		background-color: #303440 !important;
+	}
+	
 </style>

pages/shouye/index.vue

@@ -1,14 +1,49 @@
 <template>
 	<view :style="{ minHeight: sys.windowHeight + 'px' }" :class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
 		<tm-menubars title="" :shadow="0" :showback="false"></tm-menubars>
-		<tm-swiper :previmage="false" :noSwiping="true" width="400" :current="current" :margin="32"  :autoplay="false" :list="list"></tm-swiper>
+		<view class="C1b1b1b">
+			<tm-search v-model="soso" color="white">
+				<template #right>
+					<view class="xiangji">
+						<image src="/static/img/xiangji.png" mode="widthFix"></image>
+					</view>
+				</template>
+			</tm-search>
+			<view class="dingwei">
+				<image style="vertical-align: middle;" src="/static/img/dingwei.png" mode="widthFix"></image>
+				<text style="vertical-align: middle;" class="text-size-g">北京Beijing</text>
+			</view>
+		</view>
+		<view class="zhuti mt-20">
+			<tm-grid :grid="5" :list="list3" :icon-size="140" font-color="white"></tm-grid>
+			<tm-sheet class="lunbo">
+				<view class="py-10 text-size-g dianz">
+					<image src="/static/img/6.png" mode="widthFix"></image>
+					<text class="text-white">今日穿搭推荐</text>
+				</view>
+				<view class="mt-20 text-size-g dianz">
+					<view class="text-white">西装夹克高级感穿搭 | 彰显</view>
+					<view class="text-white">秋冬复古型男典范</view>
+				</view>
+				<view class="touxiang mt-20">
+					<image src="/static/img/7.png" mode="widthFix"></image>
+					<text class="text-white text-size-m">可樂crys</text>
+				</view>
+				<view class="shoucang mt-20">
+					<image src="/static/img/8.png" mode="widthFix" style="margin-right: 15px;"></image>
+					<image src="/static/img/9.png" mode="widthFix"></image>
+				</view>
+			</tm-sheet>
+		</view>
+		
+		<!-- <tm-swiper :previmage="false" :noSwiping="true" width="400" :current="current" :margin="32"  :autoplay="false" :list="list"></tm-swiper>
 		<tm-button theme="white" size="m" @click="shang()">下一张</tm-button>
 		<tm-button theme="white" size="m" @click="xia()">上一张</tm-button>
 		<view class="bbb">
 			<tm-swiper :notouch="true" :disable-touch="true" class="aaa" :current="current1"   :autoplay="false" dot-model="rect"  :indicator-dots="true" :list="list"></tm-swiper>
 		</view>
 		<tm-button theme="white" size="m" @click="shang()">下一张</tm-button>
-		<tm-button theme="white" size="m" @click="xia()">上一张</tm-button>
+		<tm-button theme="white" size="m" @click="xia()">上一张</tm-button> -->
 
 	
 	</view>
@@ -19,6 +54,14 @@
 	export default {
 		data() {
 			return {
+				soso:'',
+				list3:[
+					{icon:'/static/img/1.png',text:'预约家政'},
+					{icon:'/static/img/2.png',text:'预约服务'},
+					{icon:'/static/img/3.png',text:'自助录入'},
+					{icon:'/static/img/4.png',text:'鞋服洗护'},
+					{icon:'/static/img/5.png',text:'闲置交换'},
+				],
 				keyword: '',
 				top: 60,
 				sys: null,
@@ -76,4 +119,62 @@
 		height: 100px !important;
 		padding: 0 10px !important;
 	}
+	// 
+	.xiangji image{
+		width: 30px;
+		height: 22px;
+	}
+	.suosou image{
+		width: 40px;
+	}
+	/deep/ .icon-search{
+		font-size: 23px !important;
+		color: #8E8E93 !important;
+	}
+	/deep/ .tm-search{
+		width: 94%;
+		margin: 0 auto;
+		background-color: #414141 !important;
+		border-radius: 10px;
+	}
+	/deep/ .tm-search .grey-darken-5{
+		background-color: #414141 !important;
+	}
+	.dingwei{
+		width: 92%;
+		margin: 0 auto;
+		margin-top: 20px;
+		padding-bottom: 20px;
+	}
+	.dingwei image{
+		width: 20px;
+		margin-right: 10px;	
+	}
+	/deep/ .tm-col{
+		width: 20% !important;
+	}
+	.zhuti{
+		padding: 10px;
+	}
+	/deep/ .lunbo{
+		margin:0 !important;
+		padding: 8px !important;
+		margin-top: 20px !important;
+	}
+	.dianz image{
+		width: 30px;
+		vertical-align: middle;
+		margin-right: 10px;
+	}
+	/deep/ .text-size-s span,/deep/ .text-size-g{
+		font-size: 15px;
+	}
+	.touxiang image{
+		width: 35px;
+		margin-right: 10px;
+		vertical-align: middle;
+	}
+	.shoucang image{
+		width: 45px;
+	}
 </style>

pages/xieyi/index.vue

@@ -1,8 +1,9 @@
 <template>
 	<view :style="{ minHeight: sys.windowHeight + 'px' }"
 		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
-		<tm-menubars title="用户服务协议" :showback="true"></tm-menubars>
-		<tm-sheet color="text" class="zitima">
+		<tm-menubars title="" :shadow="0" :showback="true"></tm-menubars>
+		<view class="tou C1b1b1b">用户服务协议</view>
+		<view class="zhuti">
 			<view class="text-size-lg text-weight-b mb-24">
 				一、总则
 			</view>
@@ -10,33 +11,29 @@
 				1.1　用户应当同意本协议的条款并按照页面上的提示完成全部的注册程序。用户在进行注册程序过程中勾选"我已阅读并接受"模块即表示用户与产品名称达成协议，完全接受本协议项下的全部条款。
 			</view>
 			<view class="text-size-s mb-24">
-				1.2　用户应当同意本协议的条款并按照页面上的提示完成全部的注册程序。用户在进行注册程序过程中勾选"我已阅读并接受"模块即表示用户与产品名称达成协议，完全接受本协议项下的全部条款。
+				1.2　用户注册成功后，产品名称将给予每个用户一个用户帐号及相应的密码，该用户帐号和密码由用户负责保管；用户应当对以其用户帐号进行的所有活动和事件负法律责任。
 			</view>
 			<view class="text-size-s mb-24">
-				1.3　用户应当同意本协议的条款并按照页面上的提示完成全部的注册程序。用户在进行注册程序过程中勾选"我已阅读并接受"模块即表示用户与产品名称达成协议，完全接受本协议项下的全部条款。
+				1.3　用户可以使用产品名称各个频道单项服务，当用户使用产品名称各单项服务时，用户的使用行为视为其对该单项服务的服务条款以及产品名称在该单项服务中发出的各类公告的同意。
 			</view>
-			<view class="text-size-lg text-weight-b mb-24">
+			<view class="text-size-lg text-weight-b mb-24 mt-40">
 				二、注册信息和隐私保护
 			</view>
 			<view class="text-size-s mb-24">
-				1.1　用户应当同意本协议的条款并按照页面上的提示完成全部的注册程序。用户在进行注册程序过程中勾选"我已阅读并接受"模块即表示用户与产品名称达成协议，完全接受本协议项下的全部条款。
-			</view>
-			<view class="text-size-s mb-24">
-				1.2　用户应当同意本协议的条款并按照页面上的提示完成全部的注册程序。用户在进行注册程序过程中勾选"我已阅读并接受"模块即表示用户与产品名称达成协议，完全接受本协议项下的全部条款。
-			</view>
-			<view class="text-size-s mb-24">
-				1.3　用户应当同意本协议的条款并按照页面上的提示完成全部的注册程序。用户在进行注册程序过程中勾选"我已阅读并接受"模块即表示用户与产品名称达成协议，完全接受本协议项下的全部条款。
+				2.1　产品名称帐号（即产品名称用户ID）的所有权归产品名称，用户完成注册申请后，获得产品名称帐号的使用权。所有原始键入的资料将引用为注册资料。如果因注册信息不真实而引起的问题，并对问题发生所带来的后果，产品名称不负任何责任。
 			</view>
 			<view class="text-size-s mb-24">
-				1.4　用户应当同意本协议的条款并按照页面上的提示完成全部的注册程序。用户在进行注册程序过程中勾选"我已阅读并接受"模块即表示用户与产品名称达成协议，完全接受本协议项下的全部条款。
+				2.2　用户不应将其帐号、密码转让或出借予他人使用。如用户发现其帐号遭他人非法使用，应立即通知产品名称。因黑客行为或用户的保管疏忽导致帐号、密码遭他人非法使用，产品名称不承担任何责任。
 			</view>
 			<view class="text-size-s mb-24">
-				1.5　用户应当同意本协议的条款并按照页面上的提示完成全部的注册程序。用户在进行注册程序过程中勾选"我已阅读并接受"模块即表示用户与产品名称达成协议，完全接受本协议项下的全部条款。
+				2.3　产品名称不对外公开或向第三方提供单个用户的注册资料，除非：
 			</view>
-			<view class="text-size-s mb-24">
-				1.6　用户应当同意本协议的条款并按照页面上的提示完成全部的注册程序。用户在进行注册程序过程中勾选"我已阅读并接受"模块即表示用户与产品名称达成协议，完全接受本协议项下的全部条款。
-			</view>
-		</tm-sheet>
+			<view class="text-size-s mb-24">• 事先获得用户的明确授权；</view>
+			<view class="text-size-s mb-24">• 只有透露您的个人资料，才能提供您所要求的产品和服务；</view>
+			<view class="text-size-s mb-24">• 根据有关的法律法规要求；</view>
+			<view class="text-size-s mb-24">• 按照相关政府主管部门的要求；</view>
+			<view class="text-size-s mb-24">• 为维护产品名称的合法权益。</view>
+		</view>
 	</view>
 </template>	
 <script>
@@ -58,10 +55,18 @@ export default {
 </script>
 
 <style lang="scss">
-	/deep/ .zitima{
-		margin:0;
-	}
 	/deep/ .tm-menubars .body{
 		background-color: #1b1b1b !important;
 	}
+	/deep/ .grey-darken-5{
+		background-color: #0d0d0d!important;
+		padding: 0px !important;
+	}
+	.tou{
+		font-size: 28px;
+		padding: 15px 30px 40px 30px;
+	}
+	.zhuti{
+		padding: 15px 30px 40px 30px;
+	}
 </style>

pages/zhaohui/index.vue

@@ -1,35 +1,26 @@
 <template>
 	<view :style="{ minHeight: sys.windowHeight + 'px' }"
 		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
+		<tm-menubars title="" :shadow="0" :showback="true"></tm-menubars>
+		<view class="tou C1b1b1b">
+			<view>忘记密码？</view>
+			<view class="text-size-s mt-20">请输入您的注册手机号码，我们将发送短信验证码到您的手机</view>
+		</view>
+		<view class="zhuti">
+			<tm-form>
+				<view class="tel text-size-m mt-50">请输入注册手机号码</view>
+				<tm-input name="title" v-model="reqData.mobile"></tm-input>
+				<view class="mima">
+					<tm-input placeholder="请输入短信验证码" name="title" v-model="reqData.sms_code"></tm-input>
+					<tm-button class="wangji" @click="sendyzm" size="m">{{yzmvar.text}}</tm-button>
+				</view>
+				<view class="px-24">
+					<tm-button @click="xia()" theme="primary" :round="24" class="mt100" block>下一步</tm-button>
+				</view>
+			</tm-form>
+		</view>
+		<!-- 弹出层消息 -->
 		<tm-message ref="toast"></tm-message>
-		<tm-menubars title="找回密码" :showback="true"></tm-menubars>
-		<tm-sheet :shadow="24">
-			<tm-steps model="number" color="bg-gradient-blue-accent" activeFontColor="blue" line-color="bg-gradient-blue-accent" v-model="active" :list="list"></tm-steps>
-			<view v-if="active==1">
-				<tm-form>
-					<tm-input name="title" title="手机号" v-model="reqData.mobile"></tm-input>
-					<view class="flex-between" :class="$tm.vx.state().tmVuetify.black ? 'bk' : ''">
-						<tm-input name="title" title="验证码" v-model="reqData.sms_code"></tm-input>
-						<view>
-							<tm-button @click="sendyzm" :theme="yzmvar.colorvar" size="m">{{yzmvar.text}}</tm-button>
-						</view>
-					</view>
-					<view class="px-24">
-						<tm-button @click="xia()" theme="bg-gradient-blue-accent" block>下一步</tm-button>
-					</view>
-				</tm-form>
-			</view>
-			<view v-else>
-				<tm-form>
-					<tm-input name="title" password title="密码" v-model="reqData.password"></tm-input>
-					<tm-input name="title" password title="确认密码" v-model="reqData.password1"></tm-input>
-					<view class="px-24">
-						<tm-button @click="tijiao()" theme="bg-gradient-blue-accent" block>提交</tm-button>
-					</view>
-				</tm-form>
-			</view>
-		</tm-sheet>
-		
 	</view>
 </template>	
 <script>
@@ -37,16 +28,13 @@ import{myRequest} from '@/api/request.js'
 export default {
 	data() {
 		return {
-			active:1,
-			list:['1.验证手机号码','2.设置新密码'],
+			kan:1, //1没看2看
+			kan1:3, //1没看2看
 			reqData:{
 				mobile:'',
-				sms_code:'',
-				password:'',
-				password1:''
+				sms_code:''
 			},
 			yzmvar:{
-				colorvar:'primary',
 				text:'发送验证码'
 			}
 		};
@@ -58,37 +46,6 @@ export default {
 		this.sys = uni.getSystemInfoSync();
 	},
 	methods: {
-		tijiao(){
-			var that=this;
-			if(that.reqData.password==""){
-				that.$refs.toast.show({model:'warn',label:'请输入密码'})
-				return
-			}else if(that.reqData.password1==""){
-				that.$refs.toast.show({model:'warn',label:'请输入确认密码'})
-				return
-			}else if(that.reqData.password != that.reqData.password1){
-				that.$refs.toast.show({model:'warn',label:'密码不一致'})
-				return
-			}
-			myRequest({
-				url: "/api/login/retrievePassword",
-				method:'post',
-				data:that.reqData
-			}).then(res => {
-				console.log(res)
-				if (res.data.code == 200) {
-					that.$refs.toast.show({model:'success',label:res.data.msg})
-					setTimeout(function(){
-						uni.navigateTo({
-							url: "/pages/login/index",
-						})
-					},2000)
-				}else{
-					that.$refs.toast.show({model:'error',label:res.data.msg})
-				}
-			})
-			
-		},
 		xia(){
 			var that=this;
 			if(that.reqData.mobile==""){
@@ -98,7 +55,9 @@ export default {
 				that.$refs.toast.show({model:'warn',label:'请输入验证码'})
 				return
 			}
-			that.active=2
+			uni.navigateTo({
+				url: "/pages/zhtijiao/index?mobile="+that.reqData.mobile+'&sms_code='+that.reqData.sms_code,
+			})
 		},
 		sendyzm(){
 			var that=this;
@@ -106,12 +65,10 @@ export default {
 				that.$refs.toast.show({model:'warn',label:'请输入手机号'})
 				return
 			}
-			that.yzmvar.colorvar="gray";
 			that.yzmvar.text="已发送";
 			setTimeout(function(){
-				that.yzmvar.colorvar="primary";
 				that.yzmvar.text="发送验证码";
-			},5000)
+			},15000)
 		},
 	},
 }
@@ -121,4 +78,29 @@ export default {
 	/deep/ .tm-menubars .body{
 		background-color: #1b1b1b !important;
 	}
+	/deep/ .grey-darken-5{
+		background-color: #0d0d0d!important;
+		padding: 0px !important;
+	}
+	.tou{
+		font-size: 28px;
+		padding: 15px 30px 40px 30px;
+	}
+	.zhuti{
+		padding: 15px 30px 40px 30px;
+	}
+	.mima{
+		position: relative;
+	}
+	.wangji{
+		position: absolute;
+		right: 0px;
+		top: 3px;
+	}
+	/deep/ .wangji .primary{
+		background-color: #303440 !important;
+	}
+	.tel{
+		margin-left: 5px;
+	}
 </style>

pages/zhtijiao/index.vue

@@ -0,0 +1,165 @@
+<template>
+	<view :style="{ minHeight: sys.windowHeight + 'px' }"
+		:class="[$tm.vx.state().tmVuetify.black ? 'black' : ' ']">
+		<tm-menubars title="" :shadow="0" :showback="true"></tm-menubars>
+		<view class="tou C1b1b1b">
+			<view>设置新密码</view>
+			<view class="text-size-s mt-20">请输入您的新密码</view>
+		</view>
+		<view class="zhuti">
+			<tm-form>
+				<view class="tel text-size-m mt-50">请设置6~20位新的登录密码</view>
+				<view class="mima">
+					<tm-input name="title" placeholder="请输入" :password="kan==1?true:false" v-model="reqData.password"></tm-input>
+					<view class="one">
+						<image v-if="kan==1" src="/static/icon/mima4.png" class="mimaicon2" @click="kan=2"></image>
+						<image v-if="kan==2" src="/static/icon/mima3.png" class="mimaicon1" @click="kan=1"></image>
+					</view>
+				</view>
+				<view class="mima">
+					<tm-input name="title" :password="kan1==3?true:false" placeholder="请再次输入新的登录密码" v-model="reqData.password1"></tm-input>
+					<view class="one">
+						<image v-if="kan1==3" src="/static/icon/mima4.png" class="mimaicon2" @click="kan1=4"></image>
+						<image v-if="kan1==4" src="/static/icon/mima3.png" class="mimaicon1" @click="kan1=3"></image>
+					</view>
+				</view>
+				<view class="px-24">
+					<tm-button @click="tijiao()" theme="primary" :round="24" class="mt100" block>确认</tm-button>
+				</view>
+			</tm-form>
+		</view>
+		<!-- 弹出层消息 -->
+		<tm-message ref="toast"></tm-message>
+	</view>
+</template>	
+<script>
+import{myRequest} from '@/api/request.js'
+export default {
+	data() {
+		return {
+			active:1,
+			kan:1, //1没看2看
+			kan1:3, //1没看2看
+			reqData:{
+				mobile:'',
+				sms_code:'',
+				password:'',
+				password1:''
+			},
+			yzmvar:{
+				text:'发送验证码'
+			}
+		};
+	},
+	onLoad(option) {
+		console.log(option)
+		this.reqData.mobile=option.mobile;
+		this.reqData.sms_code=option.sms_code;
+	},
+	created() {
+		this.sys = uni.getSystemInfoSync();
+	},
+	methods: {
+		tijiao(){
+			var that=this;
+			if(that.reqData.password=="" || that.reqData.password.length<6 ||that.reqData.password.length>20){
+				that.$refs.toast.show({model:'warn',label:'请设置6-20位登录密码'})
+				return
+			}else if(that.reqData.password1==""){
+				that.$refs.toast.show({model:'warn',label:'请再次输入新的登录密码'})
+				return
+			}else if(that.reqData.password != that.reqData.password1){
+				that.$refs.toast.show({model:'warn',label:'密码不一致'})
+				return
+			}
+			myRequest({
+				url: "/api/login/retrievePassword",
+				method:'post',
+				data:that.reqData
+			}).then(res => {
+				console.log(res)
+				if (res.data.code == 200) {
+					that.$refs.toast.show({model:'success',label:res.data.msg})
+					setTimeout(function(){
+						uni.navigateTo({
+							url: "/pages/login/index",
+						})
+					},2000)
+				}else{
+					that.$refs.toast.show({model:'error',label:res.data.msg})
+				}
+			})
+			
+		},
+		xia(){
+			var that=this;
+			if(that.reqData.mobile==""){
+				that.$refs.toast.show({model:'warn',label:'请输入手机号'})
+				return
+			}else if(that.reqData.sms_code==""){
+				that.$refs.toast.show({model:'warn',label:'请输入验证码'})
+				return
+			}
+			that.active=2
+		},
+		sendyzm(){
+			var that=this;
+			if(that.reqData.mobile==""){
+				that.$refs.toast.show({model:'warn',label:'请输入手机号'})
+				return
+			}
+			that.yzmvar.text="已发送";
+			setTimeout(function(){
+				that.yzmvar.text="发送验证码";
+			},15000)
+		},
+	},
+}
+</script>
+
+<style lang="scss">
+	/deep/ .tm-menubars .body{
+		background-color: #1b1b1b !important;
+	}
+	/deep/ .grey-darken-5{
+		background-color: #0d0d0d!important;
+		padding: 0px !important;
+	}
+	.tou{
+		font-size: 28px;
+		padding: 15px 30px 40px 30px;
+	}
+	.zhuti{
+		padding: 15px 30px 40px 30px;
+	}
+	.mima{
+		position: relative;
+	}
+	.wangji{
+		position: absolute;
+		right: 0px;
+		top: 3px;
+	}
+	/deep/ .wangji .primary{
+		background-color: #303440 !important;
+	}
+	.tel{
+		margin-left: 5px;
+	}
+	.one{
+		position: absolute;
+		right: 15px;
+		top: 18px;
+		width: 50px;
+		text-align: center;
+	}
+	.mimaicon1{
+		width: 25px;
+		height: 25px;
+		
+	}
+	.mimaicon2{
+		width: 25px;
+		height: 25px;
+	}
+</style>

tm-vuetify/components/tm-menubars/tm-menubars.vue

@@ -19,7 +19,7 @@
 							</navigator>
 						</view>
 						<navigator v-if="!pageUrl" open-type="navigateBack" class="flex-center px-24 flex-shrink fulled-height">
-							<text class="iconfont icon-angle-left" :class="[`text-${fontColorTheme}`]" :style="{ fontSize: '28rpx' }"></text>
+							<text class="iconfont icon-angle-left" :class="[`text-${fontColorTheme}`]" :style="{ fontSize: '28rpx' }">返回</text>
 						</navigator>
 					</block>
 

tm-vuetify/components/tm-message/tm-message.vue

@@ -2,7 +2,7 @@
 	<view>
 		<view v-if="show_dev" @click.stop.prevent="maskClick" :class="[mask?'mask':'']"
 			class="tm-message fixed t-0 l-0 fulled fulled-height flex-center">
-			<view :class="[black_dev?'black bk':'',clickOverlay?'clickOverlay':'']" class="tm-message-body  round-6 pa-24 flex-center shadow-24 ">
+			<view  class="tm-message-body  round-6 pa-24 flex-center shadow-24 ">
 				<view class=" flex-center flex-col">
 					<view :class="[
 						model,

tm-vuetify/components/tm-search/tm-search.vue

@@ -150,7 +150,7 @@
 			},
 			placeholder:{
 				type:String,
-				default:"请输入关键词"
+				default:"请输入"
 			},
 			align:{
 				type:String,

tm-vuetify/scss/theme.css

@@ -24,6 +24,7 @@
 @import "./theme/yellow.css";
 @import "./theme/blue-grey.css";
 @import "./theme/gray.css";
+@import "./theme/white.css";
 /* 
 @import "./theme/deep-orange.css";
 @import "./theme/deep-purple.css";

unpackage/dist/dev/app-plus/app-config-service.js

@@ -1,8 +1,8 @@
 
 var isReady=false;var onReadyCallbacks=[];
 var isServiceReady=false;var onServiceReadyCallbacks=[];
-var __uniConfig = {"pages":["pages/index/index","pages/wardrobe/index","pages/dapei/index","pages/shop/index","pages/user/index","pages/shouye/index","pages/putstorage/index","pages/registered/index","pages/login/index","pages/xieyi/index","pages/zhaohui/index","pages/chuanghome/index"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"tabBar":{"color":"#999","selectedColor":"#82cfd5","borderStyle":"#fff","backgroundColor":"white","iconfontSrc":"static/icon/iconfont.ttf"},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"testApp","compilerVersion":"3.4.7","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
-var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true},"window":{"navigationBarTitleText":"","titleNView":false}},{"path":"/pages/wardrobe/index","meta":{},"window":{"navigationBarTitleText":"衣厨","titleNView":false}},{"path":"/pages/dapei/index","meta":{},"window":{"navigationBarTitleText":"消息","titleNView":false}},{"path":"/pages/shop/index","meta":{},"window":{"navigationBarTitleText":"商场","titleNView":false}},{"path":"/pages/user/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/shouye/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/putstorage/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/registered/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/login/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/xieyi/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/zhaohui/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/chuanghome/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}}];
+var __uniConfig = {"pages":["pages/index/index","pages/wardrobe/index","pages/dapei/index","pages/shop/index","pages/user/index","pages/shouye/index","pages/putstorage/index","pages/registered/index","pages/login/index","pages/xieyi/index","pages/zhaohui/index","pages/zhtijiao/index","pages/chuanghome/index"],"window":{"navigationBarTextStyle":"black","navigationBarTitleText":"uni-app","navigationBarBackgroundColor":"#F8F8F8","backgroundColor":"#F8F8F8"},"tabBar":{"color":"#999","selectedColor":"#82cfd5","borderStyle":"#fff","backgroundColor":"white","iconfontSrc":"static/icon/iconfont.ttf"},"nvueCompiler":"uni-app","nvueStyleCompiler":"uni-app","renderer":"auto","splashscreen":{"alwaysShowBeforeRender":true,"autoclose":false},"appname":"testApp","compilerVersion":"3.4.7","entryPagePath":"pages/index/index","networkTimeout":{"request":60000,"connectSocket":60000,"uploadFile":60000,"downloadFile":60000}};
+var __uniRoutes = [{"path":"/pages/index/index","meta":{"isQuit":true},"window":{"navigationBarTitleText":"","titleNView":false}},{"path":"/pages/wardrobe/index","meta":{},"window":{"navigationBarTitleText":"衣厨","titleNView":false}},{"path":"/pages/dapei/index","meta":{},"window":{"navigationBarTitleText":"消息","titleNView":false}},{"path":"/pages/shop/index","meta":{},"window":{"navigationBarTitleText":"商场","titleNView":false}},{"path":"/pages/user/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/shouye/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/putstorage/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/registered/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/login/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/xieyi/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/zhaohui/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/zhtijiao/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}},{"path":"/pages/chuanghome/index","meta":{},"window":{"navigationBarTitleText":"我的","titleNView":false}}];
 __uniConfig.onReady=function(callback){if(__uniConfig.ready){callback()}else{onReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"ready",{get:function(){return isReady},set:function(val){isReady=val;if(!isReady){return}const callbacks=onReadyCallbacks.slice(0);onReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 __uniConfig.onServiceReady=function(callback){if(__uniConfig.serviceReady){callback()}else{onServiceReadyCallbacks.push(callback)}};Object.defineProperty(__uniConfig,"serviceReady",{get:function(){return isServiceReady},set:function(val){isServiceReady=val;if(!isServiceReady){return}const callbacks=onServiceReadyCallbacks.slice(0);onServiceReadyCallbacks.length=0;callbacks.forEach(function(callback){callback()})}});
 service.register("uni-app-config",{create(a,b,c){if(!__uniConfig.viewport){var d=b.weex.config.env.scale,e=b.weex.config.env.deviceWidth,f=Math.ceil(e/d);Object.assign(__uniConfig,{viewport:f,defaultFontSize:Math.round(f/20)})}return{instance:{__uniConfig:__uniConfig,__uniRoutes:__uniRoutes,global:void 0,window:void 0,document:void 0,frames:void 0,self:void 0,location:void 0,navigator:void 0,localStorage:void 0,history:void 0,Caches:void 0,screen:void 0,alert:void 0,confirm:void 0,prompt:void 0,fetch:void 0,XMLHttpRequest:void 0,WebSocket:void 0,webkit:void 0,print:void 0}}}});