登录页 注册申请 申请入驻

src/api/newLogin.js

@@ -0,0 +1,33 @@
+import request from "@/utils/request.js";
+//获取验证码
+export function sendMsg(data) {
+    return request({
+        method: 'get',
+        url: '/technician/technician/sendMsg',
+        data
+    });
+}
+
+
+// 商户登录
+export function clientLogin(data) {
+    return request({
+        method: 'post',
+        url: '/technician/technician/clientLogin',
+        data,
+        // header: {
+        //     'content-type': 'multipart/form-data'
+        // }
+    });
+}
+// 商户忘记密码
+export function resetPassword(data) {
+    return request({
+        method: 'post',
+        url: '/technician/technician/resetPassword',
+        data,
+        // header: {
+        //     'content-type': 'multipart/form-data'
+        // }
+    });
+}

src/pages.json

@@ -414,6 +414,38 @@
 				"navigationStyle": "default"
 			}
 		},
+		{
+			"path": "pages/join/applyJoin",
+			"style": {
+				"navigationBarTitleText": "申请入驻",
+				"navigationStyle": "default"
+			}
+		},
+		{
+			"path": "pages/join/introduceYourselfEdit",
+			"style": {
+				"navigationBarTitleText": "简介",
+				"navigationStyle": "default"
+			}
+		},{
+			"path": "pages/join/lifePhotosEdit",
+			"style": {
+				"navigationBarTitleText": "生活照",
+				"navigationStyle": "default"
+			}
+		},{
+			"path": "pages/join/idCardEdit", 
+			"style": {
+				"navigationBarTitleText": "身份证",
+				"navigationStyle": "default"
+			}
+		},{
+			"path": "pages/join/commitDocumentEdit", 
+			"style": {
+				"navigationBarTitleText": "承诺文件",
+				"navigationStyle": "default"
+			}
+		},
 		//编辑资料
 		{
 			"path": "pages/my/indent",
@@ -517,7 +549,31 @@
 				{
 					"path": "myNew/phone",
 					"style": {
-						"navigationBarTitleText": "绑定手机号",
+						"navigationBarTitleText": "手机号登录",
+						"navigationBarBackgroundColor": "#2cb8d4",
+						"navigationBarTextStyle": "white",
+						"app-plus": {
+							"softinputNavBar": "none",
+							"titleNView": false
+						}
+					}
+				},
+				{ 
+					"path": "myNew/useCodeLogin",  
+					"style": {
+						"navigationBarTitleText": "验证码",
+						"navigationBarBackgroundColor": "#2cb8d4",
+						"navigationBarTextStyle": "white",
+						"app-plus": {
+							"softinputNavBar": "none",
+							"titleNView": false
+						}
+					}
+				},
+				{ 
+					"path": "myNew/forgetPassword", 
+					"style": {
+						"navigationBarTitleText": "修改密码",
 						"navigationBarBackgroundColor": "#2cb8d4",
 						"navigationBarTextStyle": "white",
 						"app-plus": {

src/pages/join/applyJoin.vue

@@ -0,0 +1,187 @@
+<template>
+    <view class="applyJoin">
+        <view>
+            <view> 基本信息</view>
+            <uni-list>
+                <uni-list-item title="姓名" :rightText="baseInfo.name" />
+                <uni-list-item title="性别" :rightText="baseInfo.name" />
+                <uni-list-item title="手机号" :rightText="baseInfo.name" />
+                <uni-list-item title="昵称" :rightText="baseInfo.name" />
+                <uni-list-item title="入驻城市" :rightText="baseInfo.name" />
+                <uni-list-item showArrow title="简介" clickable @click="introduceYourselfEdit(baseInfo.introduceYourself)"
+                    :rightText="baseInfo.introduceYourself ? baseInfo.introduceYourself : '简单的介绍您自己~'" />
+            </uni-list>
+        </view>
+        <view>
+            <view> 入驻资料</view>
+            <uni-list>
+
+                <uni-list-item title="形象照" showArrow clickable @click="portraitPhotoFun">
+                    <template v-slot:footer>
+                        <image class="slot-image" :src="baseInfo.portraitPhoto?baseInfo.portraitPhoto:'/static/logo.png'" mode="widthFix"></image>
+                    </template>
+                </uni-list-item>
+                <uni-list-item showArrow title="生活照" :rightText="baseInfo.cImgList.length > 0 ? '已上传' : '去上传'" clickable
+                    @click="pictureUpLoad('cImgList', '生活照', 9)" />
+                <uni-list-item showArrow title="宣传视频" :rightText="baseInfo.promotionalVideo.length > 0 ? '已上传' : '去上传'"
+                    clickable @click="pictureUpLoad('promotionalVideo', '宣传视频')" />
+
+                <uni-list-item showArrow title="身份证" :rightText="baseInfo.idCard.length > 2 ? '已上传' : '去上传'" clickable
+                    @click="idCardEditFun('idCard')" />
+
+                <uni-list-item showArrow title="健康证" :rightText="baseInfo.healthCertificate.length > 0 ? '已上传' : '去上传'"
+                    clickable @click="pictureUpLoad('healthCertificate', '健康证', 3)" />
+                <uni-list-item showArrow title="从业资格证" :rightText="baseInfo.certification.length > 0 ? '已上传' : '去上传'"
+                    clickable @click="pictureUpLoad('certification', '从业资格证', 3)" />
+                <uni-list-item showArrow title="无犯罪证明" :rightText="baseInfo.noCrime.length > 0 ? '已上传' : '去上传'"
+                    clickable @click="pictureUpLoad('noCrime', '无犯罪证明', 9)" />
+
+                <uni-list-item showArrow title="承诺文件" :rightText="baseInfo.commitDocment[0].length > 0 && baseInfo.commitDocment[1].length > 0 && baseInfo.commitDocment[2].length > 0
+                ? '已上传' : '去上传'" clickable @click="commitDocmentEditFun('commitDocment')" />
+
+            </uni-list>
+        </view>
+
+
+
+
+        <!-- 提交按钮 pages/join/introduceYourselfEdit-->
+        <view class="submit-box">
+            <u-button type="primary" disabled block @click="submitForm">提交</u-button>
+        </view>
+
+    </view>
+</template>
+
+<script>
+export default {
+
+    data() {
+        return {
+            // 任务数据
+            tasks: [
+                { taskName: '222' }
+            ],
+            baseInfo: {
+                portraitPhoto:'',
+                name: '萧然然',
+                gender: '女',
+                phone: '18366668888',
+                nickName: '苒苒',
+                city: '朝阳区',
+                intro: '',
+                avatar: '',
+                lifeImg: [],
+                idCard: '',
+                introduceYourself: '',
+                cImgList: [],
+                healthCertificate: [],
+                certification: [],
+                noCrime: [],
+                promotionalVideo: [],
+                idCard: [],
+                commitDocment: [[],[],[]],
+            }
+
+        }
+    },
+    onLoad() {
+    },
+    onShow() {
+    },
+    methods: {
+        commitDocmentEditFun(value) {
+            let str = uni.$u.queryParams({
+                fieldName: value,
+                fieldVal: JSON.stringify(this.baseInfo[value])
+            })
+            uni.navigateTo({ url: `/pages/join/commitDocumentEdit${str}` })
+        },
+        idCardEditFun(value) {
+            let str = uni.$u.queryParams({
+                fieldName: value,
+                fieldVal: JSON.stringify(this.baseInfo[value])
+            })
+            uni.navigateTo({ url: `/pages/join/idCardEdit${str}` })
+        },
+        pictureUpLoad(value, title, maxlength) {
+            let str = uni.$u.queryParams({
+                fieldName: value,
+                fieldVal: JSON.stringify(this.baseInfo[value]),
+                title: title,
+                maxlength: maxlength
+            })
+            console.log(str)
+            uni.navigateTo({ url: `/pages/join/lifePhotosEdit${str}` })
+
+        },
+        //简介
+        introduceYourselfEdit() {
+            uni.navigateTo({ url: '/pages/join/introduceYourselfEdit?introduceYourself=' + this.baseInfo.introduceYourself })
+        },
+        portraitPhotoFun() {
+            // const perResult = requestAndroidPermission('android.permission.CAMERA', {
+            //     title: '相册/相机权限申请说明',
+            //     content: '为了修改个人头像和订单评价发布信息图片视频等, 我们需要申请您设备的相机和存储权限',
+            // }, true);
+            console.log('8888888')
+            uni.chooseImage({
+                count: 1,
+                sizeType: ['original', 'compressed'],
+                sourceType: ['album'],
+                success: (res) => {
+                    if (res) {
+                        this.baseInfo.portraitPhoto=res.tempFilePaths[0]
+                    }
+                }
+            });
+        },
+
+        // 提交表单
+        submitForm() {
+            // 接口请求提交入驻资料
+            console.log('提交入驻', this.form)
+        }
+    },
+    mounted() {
+
+
+    }
+}
+</script>
+
+<style lang="scss" scoped>
+.applyJoin {
+    background-color: #f5f5f5;
+    min-height: 100vh;
+    padding: 20rpx 0;
+
+    .slot-box {
+        /* #ifndef APP-NVUE */
+        display: flex;
+        /* #endif */
+        flex-direction: row;
+        align-items: center;
+    }
+
+    .slot-image {
+        /* #ifndef APP-NVUE */
+        display: block;
+        /* #endif */
+        margin-right: 10px;
+        width: 30px;
+        height: 30px;
+    }
+
+    .slot-text {
+        flex: 1;
+        font-size: 14px;
+        color: #4cd964;
+        margin-right: 10px;
+    }
+
+    .submit-box {
+        padding: 30rpx;
+    }
+}
+</style>

src/pages/join/commitDocumentEdit.vue

@@ -0,0 +1,130 @@
+<template>
+    <view>
+        <view class="images">
+            <view>承诺书
+                <view>请上传 大小不超过 10MB 格式为 pdf/jpg/jpeg/png 的文件</view>
+                <Upload accept="file" :maxSize="10240" :maxCount="2" @fileList="onUpload($event, 'commitment')" :fileList="commitment"/>
+            </view>
+            <view>承诺录音
+                <view>请上传 大小不超过 10MB 格式为 mp3/wav/wma 的文件</view>
+                <Upload accept="file" :maxSize="10240" :maxCount="2" @fileList="onUpload($event, 'recording')" :fileList="recording"/>
+            </view>
+            <view>承诺录像
+                <view>请上传 大小不超过 50MB 格式为 mp4/mov/mkv/wmv 的文件</view>
+                <Upload accept="file" :maxSize="51200" :maxCount="2" @fileList="onUpload($event, 'videoRecording')"  :fileList="videoRecording"/>
+            </view>
+
+            <view class="footer-bar">
+                <u-button shape="circle" :customStyle="{
+                    color: '#fff',
+                    background: 'var(--theme-color-gradient)'
+                }" @click="onSubmit">确认修改</u-button>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+
+import Upload from '@/components/upload/index.vue';
+
+export default {
+    components: { Upload },
+    data() {
+        return {
+            fieldName: '',
+            commitment: [],
+            recording: [],
+            videoRecording: [],
+        }
+    },
+
+    onLoad(query) {
+        console.log(query)
+        if (query.fieldName) this.fieldName = query.fieldName
+        if (query.fieldVal) {
+            let fieldVal = JSON.parse(query.fieldVal)
+            console.log(fieldVal,'fieldVal')
+            this.commitment = fieldVal[0] ? fieldVal[0] : []
+            this.recording = fieldVal[1] ? fieldVal[1] : []
+            this.videoRecording = fieldVal[2] ? fieldVal[2] : []
+        }
+
+        console.log(this.commitment, 'query')
+        console.log(this.recording, 'query')
+        console.log(this.videoRecording, 'query')
+        // console.log(this.title, 'query')
+    },
+    onReady() {
+
+    },
+    onShow() {
+    },
+    methods: {
+
+        // upload事件
+        onUpload(e, t) {
+            this[t] = e;
+            console.log(this[t])
+        },
+        goBack() {
+            uni.navigateBack()
+        },
+        onSubmit() {
+            // 获取页面栈
+            const pages = getCurrentPages()
+            // 上一页实例
+            const prevPage = pages[pages.length - 2]
+            // 直接修改上一页data里的字段
+            prevPage.$data.baseInfo[this.fieldName] = [this.commitment, this.recording, this.videoRecording]
+            uni.navigateBack()
+        }
+
+    }
+}
+</script>
+
+<style scoped lang="scss">
+/* 身份证上传样式 */
+.id-upload-row {
+    gap: 10rpx;
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 20rpx;
+}
+
+.upload-block {
+    // width: 100%;
+    height: 220rpx;
+    background-color: #f9f9f9;
+    border-radius: 12rpx;
+    border: 1rpx dashed #eee;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+
+    &.full-width {
+        width: 100%;
+        height: 240rpx;
+    }
+
+    .icon-bg {
+        width: 60rpx;
+        height: 60rpx;
+        background-color: #00cba3;
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-bottom: 16rpx;
+    }
+
+    .up-text {
+        font-size: 24rpx;
+        color: #666;
+    }
+}
+</style>

src/pages/join/idCardEdit.vue

@@ -0,0 +1,141 @@
+<template>
+    <view>
+        <view class="images">
+            <view class="id-upload-row">
+                <Upload name="idCardFront" width="187rpx" height="220rpx" :maxCount="1"
+                    @fileList="onUpload($event, 'idCardFront')" :fileList="idCardFront">
+                    <view class="upload-block" slot="content">
+                        <view class="icon-bg"><u-icon name="camera-fill" color="#fff" size="20"></u-icon></view>
+                        <text class="up-text">身份证人像面</text>
+                    </view>
+                </Upload>
+                <Upload name="idCardBack" width="187rpx" height="220rpx" :maxCount="1"
+                    @fileList="onUpload($event, 'idCardBack')" :fileList="idCardBack">
+                    <view class="upload-block" slot="content">
+                        <view class="icon-bg"><u-icon name="camera-fill" color="#fff" size="20"></u-icon></view>
+                        <text class="up-text">身份证国徽面</text>
+                    </view>
+                </Upload>
+            </view>
+
+            <Upload name="idCardHand" width="187rpx" height="220rpx" :maxCount="1"
+                @fileList="onUpload($event, 'idCardHand')" :fileList="idCardHand">
+                <view class="upload-block full-width" slot="content">
+                    <view class="icon-bg"><u-icon name="camera-fill" color="#fff" size="20"></u-icon></view>
+                    <text class="up-text">手持身份证照片</text>
+                </view>
+            </Upload>
+
+            <view class="footer-bar">
+                <u-button shape="circle" :customStyle="{
+                    color: '#fff',
+                    background: 'var(--theme-color-gradient)'
+                }" @click="onSubmit">确认修改</u-button>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+
+import Upload from '@/components/upload/index.vue';
+
+export default {
+    components: { Upload },
+    data() {
+        return {
+            fieldName: '',
+            idCardFront: [],
+            idCardBack: [],
+            idCardHand: [],
+        }
+    },
+
+    onLoad(query) {
+        console.log(query)
+        if (query.fieldName) this.fieldName = query.fieldName
+        if (query.fieldVal) {
+            let fieldVal = JSON.parse(query.fieldVal)
+            this.idCardFront=fieldVal[0]?[fieldVal[0]]:[]
+            this.idCardBack=fieldVal[1]?[fieldVal[1]]:[]
+            this.idCardHand=fieldVal[2]?[fieldVal[2]]:[]
+        }
+
+        // console.log(this.fileList, 'query')
+        // console.log(this.fileList, 'query')
+        // console.log(this.maxlength, 'query')
+        // console.log(this.title, 'query')
+    },
+    onReady() {
+
+    },
+    onShow() {
+    },
+    methods: {
+
+        // upload事件
+        onUpload(e, t) {
+            this[t] = e;
+            console.log(this[t])
+        },
+        goBack() {
+            uni.navigateBack()
+        },
+        onSubmit() {
+            // 获取页面栈
+            const pages = getCurrentPages()
+            // 上一页实例
+            const prevPage = pages[pages.length - 2]
+            // 直接修改上一页data里的字段
+            prevPage.$data.baseInfo[this.fieldName] = [...this.idCardFront,...this.idCardBack,...this.idCardHand]
+            uni.navigateBack()
+        }
+
+    }
+}
+</script>
+
+<style scoped lang="scss">
+/* 身份证上传样式 */
+.id-upload-row {
+    gap: 10rpx;
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 20rpx;
+}
+
+.upload-block {
+    // width: 100%;
+    height: 220rpx;
+    background-color: #f9f9f9;
+    border-radius: 12rpx;
+    border: 1rpx dashed #eee;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    justify-content: center;
+    position: relative;
+    overflow: hidden;
+
+    &.full-width {
+        width: 100%;
+        height: 240rpx;
+    }
+
+    .icon-bg {
+        width: 60rpx;
+        height: 60rpx;
+        background-color: #00cba3;
+        border-radius: 50%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-bottom: 16rpx;
+    }
+
+    .up-text {
+        font-size: 24rpx;
+        color: #666;
+    }
+}
+</style>

src/pages/join/introduceYourselfEdit.vue

@@ -0,0 +1,54 @@
+<template>
+    <view>
+        <view class="u-cell-group">
+            <u--textarea :height="300" v-model="value" autoHeight placeholder="简单的介绍您自己~"></u--textarea>
+        </view>
+        <view class="footer-bar">
+            <u-button shape="circle" :customStyle="{
+                color: '#fff',
+                background: 'var(--theme-color-gradient)'
+            }" @click="onSubmit">确认修改</u-button>
+        </view>
+    </view>
+</template>
+
+<script>
+import { onShow } from '@dcloudio/uni-app';
+
+export default {
+    data() {
+        return {
+            value: '',
+        }
+    },
+    onLoad() {
+    },
+    onLoad(query) {
+        console.log(query,'query')
+		this.value = (query.introduceYourself === undefined || query.introduceYourself === 'undefined') ? '' : decodeURIComponent(query.introduceYourself)
+	},
+    onShow() {
+    },
+    methods: {
+        goBack() {
+            uni.navigateBack()
+        },
+        onSubmit() {
+            // 获取页面栈
+            const pages = getCurrentPages()
+            // 上一页实例
+            const prevPage = pages[pages.length - 2]
+            // 直接修改上一页data里的字段
+            prevPage.$data.baseInfo.introduceYourself = this.value
+            uni.navigateBack()
+        }
+
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.u-cell-group {
+    padding: 30rpx;
+}
+</style>

src/pages/join/lifePhotosEdit.vue

@@ -0,0 +1,85 @@
+<template>
+    <view>
+        <view class="images">
+            <!-- <Upload :maxCount="1" @fileList="onUpload($event, 'cImgList')" /> -->
+            <Upload  :accept="title == '宣传视频'?'file':'image'" :maxSize="title == '宣传视频'?51200:10240"  :maxCount="maxCount" :customImg="true" :width="'70'" :height="'70'"
+                :src="'/static/points/picture2.png'" @fileList="onUpload" :fileList="fileList" />
+            <view class="tagText" v-if="title == '生活照'">简单介绍自己的生活照，可以说说自己的基本信息，工作场景，等等;
+                或者上传自己清晰露脸半身照/全身照/工作照。最多上传{{ maxCount }}张</view>
+            <view class="tagText" v-if="title == '宣传视频'">请上传 大小不超过 50MB 格式为 mp4/mov/mkv/wmv 的文件</view>
+            <view class="tagText" v-if="title == '健康证' || title =='从业资格证' || title =='无犯罪证明'">请上传小于10MB的{{ title }}图片，最多上传{{ maxCount }}张
+            </view>
+
+
+            <view class="footer-bar">
+                <u-button shape="circle" :customStyle="{
+                    color: '#fff',
+                    background: 'var(--theme-color-gradient)'
+                }" @click="onSubmit">确认修改</u-button>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+
+import Upload from '@/components/upload/index.vue';
+
+export default {
+    components: { Upload },
+    data() {
+        return {
+            fileList: [],
+            fieldName: '',
+            maxCount: 9,
+            title: '',
+        }
+    },
+
+    onLoad(query) {
+        console.log(query)
+        if (query.fieldName) this.fieldName = query.fieldName
+        if (query.fieldVal) this.fileList = JSON.parse(query.fieldVal)
+        if (query.maxlength) this.maxlength = Number(query.maxlength)
+        if (query.title) this.title = query.title
+        // console.log(this.fileList, 'query')
+        // console.log(this.fileList, 'query')
+        // console.log(this.maxlength, 'query')
+        // console.log(this.title, 'query')
+    },
+    onReady() {
+        // 页面渲染完成后再设置标题
+        uni.setNavigationBarTitle({
+            title: this.title
+        })
+    },
+    onShow() {
+    },
+    methods: {
+
+        // upload事件
+        onUpload(e) {
+            this.fileList = e
+        },
+        goBack() {
+            uni.navigateBack()
+        },
+        onSubmit() {
+            // 获取页面栈
+            const pages = getCurrentPages()
+            // 上一页实例
+            const prevPage = pages[pages.length - 2]
+            // 直接修改上一页data里的字段
+            prevPage.$data.baseInfo[this.fieldName] = this.fileList
+            uni.navigateBack()
+        }
+
+    }
+}
+</script>
+
+<style scoped lang="scss">
+.u-cell-group {
+    padding: 30rpx;
+}
+</style>

src/pages/join/staff.vue

@@ -28,8 +28,22 @@
 						<u-input v-model="form.cPhone" placeholder="请输入手机号" maxlength='11' />
 					</view>
 				</view>
+				<view class="input-box">
+					<u-input
+						v-model="code"
+						type="number"
+						maxlength="6"
+						placeholder="请输入手机验证码"
+						placeholder-style="color: #999"
+						class="input-item code-input"
+					></u-input>
+					<view class="code-btn" :class="{ disabled: !canGetCode }" @click="getCode">
+						<text v-if="countdown === 60">获取验证码</text>
+						<text v-else>{{ countdown }}s 后重新获取</text>
+					</view>
+				</view>
 				<view class="page-section">
-					<view class="name">入驻城市</view>
+					<view class="name">合作意向城市</view>
 					<view class="inp select" @click="show = true">
 						<text>{{form.city}}</text>
 						<img src="/static/identify/down.png" alt="" />
@@ -53,6 +67,15 @@
 						@cancel="show = false" @confirm="onSelect"
 					></u-picker>
 				</view>
+				<view class="page-section">
+					<view class="name">开通服务</view>
+					<u-radio-group v-model="form.serveType">
+						<u-radio v-for="(item, index) in serveArr" :key="index" 
+							:name="item.value" :label="item.label" 
+							:customStyle="{ margin: '0 12rpx' }"
+						/>
+					</u-radio-group>
+				</view>
 				<!-- <view class="page-section">
 					<view class="name">您所在的位置:</view>
 					<view class="weui-cells weui-cells_after-title location" @click="getAddress">
@@ -62,23 +85,25 @@
 				</view> -->
 				<view class="updata" style="border:0;">
 					<view class="name">工作形象照</view>
-					<view class="title">
-						请上传本人近期照片，图片大小不超过10M (建议清晰正脸照)
-					</view>
+					
 					<view class="images">
 						<Upload
 							:maxCount="2"
 							@fileList="onUpload($event, 'cImgList')"
 						/>
 					</view>
+					<view class="title">
+						请上传本人近期照片，图片大小不超过10M (建议清晰正脸照)
+					</view>
 				</view>
 			</view>
 
 			<view class="submits">
-				<text>平台不会通过任何渠道泄漏你的个人信息，请放心输入</text>
+				
 				<view class="btn" @click="submit">
-					申请成为商户
+					提交
 				</view>
+				<text>平台不会通过任何渠道泄漏你的个人信息，请放心输入</text>
 			</view>
 		</view>
 	</view>
@@ -99,6 +124,7 @@ export default {
 	},
 	data() {
 		return {
+			countdown: 60,
 			cityList: [],
 			show: false,
 			isLogin: false,
@@ -114,6 +140,16 @@ export default {
 					label: '女'
 				}
 			],
+			serveArr: [
+				{
+					value: 1,
+					label: '上门按摩'
+				},
+				{
+					value: 0,
+					label: '同城陪玩'
+				}
+			],
 			form: {
 				id: '',
 				cName: '',
@@ -122,6 +158,7 @@ export default {
 				cPhone: '',
 				cJianjie: '',
 				nSex: 0,
+				serveType:0,
 				cSfzImg: [],
 				cImgList: [],
 				latitude: '',
@@ -346,7 +383,35 @@ export default {
 						height: 24rpx;
 					}
 				}
-			}
+				
+				
+			}.code-box {
+
+					.code-btn {
+						width: 200rpx;
+						text-align: right;
+						font-size: 28rpx;
+						color: #2DB1A8;
+						line-height: 88rpx;
+
+						&.disabled {
+						color: #2DB1A8;
+						}
+					}
+				}
+			.input-box {
+					width:100%;
+					height: 92rpx;
+					background: #FFFFFF;
+					border-radius: 24rpx;
+					margin: 46rpx auto;
+					display: flex;
+					align-items: center;
+
+					.input-item {
+						width: 100rpx;
+					}
+				}
 
 			.updata {
 				margin-top: 20rpx;

src/setting/myNew/forgetPassword.vue

@@ -0,0 +1,286 @@
+<script>
+import { resetPassword, sendMsg } from '@/api/newLogin.js'
+export default {
+  data() {
+    return {
+      phone: '', code: '',
+      countdown: 60,
+      // 整体8-20位，只能大小写+数字
+      regPwd: /^[A-Za-z0-9]{8,20}$/,
+      isPwdHide: true,
+      isBinding: false,
+      password: '',
+    }
+  },
+  computed: {
+    canGetCode() {
+      return !this.isSendingCode && this.countdown === 60
+    },
+    canBind() {
+      return this.code && this.code.length === 6 && !this.isBinding
+    }
+  },
+  onLoad(options) {
+    if (options.phone) {
+      this.phone = options.phone;
+
+    }
+
+  },
+  watch: {
+    password(val) {
+      // 只保留字母+数字，其余全部删除
+      let filterStr = val.replace(/[^A-Za-z0-9]/g, '')
+      filterStr = filterStr.slice(0, 20)
+      // 不一致就强制覆盖，删掉#
+      if (filterStr !== val) {
+        //this.$set(this.password,filterStr)
+        this.$nextTick(() => {
+          this.password = filterStr
+        });
+        
+      }
+    }
+  },
+  methods: {
+    validatePhone(phone) {
+      const reg = /^1[3-9]\d{9}$/
+      return reg.test(phone)
+    },
+    getCode() {
+      if (this.isSendingCode || this.countdown < 60) return
+
+      this.isSendingCode = true
+      sendMsg({ phone: this.phone }).then(res => {
+        console.log(res)
+
+        uni.showToast({
+          title: '验证码已发送',
+          icon: 'success'
+        })
+
+        this.startCountdown()
+        this.isSendingCode = false
+
+      })
+
+
+    },
+    startCountdown() {
+      this.countdown = 60
+      this.timer = setInterval(() => {
+        this.countdown--
+        if (this.countdown <= 0) {
+          clearInterval(this.timer)
+          this.countdown = 60
+          this.timer = null
+        }
+      }, 1000)
+    },
+    // handleInputFilter(val) {
+    //   // 过滤掉非字母、数字字符
+    //   const filterStr = val.replace(/[^A-Za-z0-9]/g, "");
+    //   // 限制最大20位
+    //   this.password = filterStr.slice(0, 20);
+
+    // },
+    submitFun() {
+      if (!this.code) {
+        uni.showToast({
+          title: '请输入验证码',
+          icon: 'none'
+        })
+        return
+      }
+      if (!this.password) {
+        uni.showToast({
+          title: '请输入新密码',
+          icon: 'none'
+        })
+        return
+      }
+      // 2.位数+格式校验：8~20位字母数字
+      if (!this.regPwd.test(this.password) || this.password.length < 8) {
+        uni.showToast({ title: "请输入8-20位数字/字母组合", icon: "none" });
+        return;
+      }
+      uni.showToast({
+        title: '验证成功',
+        icon: 'none'
+      })
+
+      resetPassword({
+        //openId: uni.getStorageSync('wx_copenid'),
+        userType: '2',
+        phone: this.phone,
+        codeSwitch: 'false',//是否开启验证码登录 true-是 false-否
+        phoneMsg: this.code,
+        passWord:this.password
+      }).then(res => {
+        if (res.data.code == 200) {
+          // uni.showToast({
+          //   title: '登录成功',
+          //   icon: 'success'
+          // })
+          this.back()
+        }
+      })
+
+    },
+    back() {
+      let pages = getCurrentPages();
+      if (pages.length >= 2) {
+        let prevPage = pages[pages.length - 2];
+        let prevRoute = prevPage.route;
+        if (prevRoute && prevRoute !== 'pages/index/index') {
+          if (prevRoute.startsWith('pages/')) {
+            uni.switchTab({
+              url: '/' + prevRoute
+            })
+          } else {
+            uni.navigateBack({
+              delta: 1,
+              fail: () => {
+                uni.switchTab({
+                  url: '/pages/index/index'
+                })
+              }
+            })
+          }
+        } else {
+          uni.switchTab({
+            url: '/pages/index/index'
+          })
+        }
+      } else {
+        uni.switchTab({
+          url: '/pages/index/index'
+        })
+      }
+    },
+  },
+  beforeDestroy() {
+    if (this.timer) {
+      clearInterval(this.timer)
+      this.timer = null
+    }
+  }
+}
+</script>
+
+<template>
+  <view class="sett-box">
+    <input type="text" name="username" style="position:absolute;opacity:0;width:0;height:0;z-index:-99;" />
+    <input type="password" name="password" style="position:absolute;opacity:0;width:0;height:0;z-index:-99;" />
+
+    <view class="input-box">
+      <u-input v-model="phone" :disabled="true" border="none" placeholder="" placeholder-style="color: #999"
+        class="input-item">
+        <template slot="prefix">
+          <view class="label">
+            <text>手机号</text>
+            <text style="margin-left: 30rpx;">+86</text>
+          </view>
+        </template>
+      </u-input>
+    </view>
+
+
+    <view class="input-box code-box">
+      <u-input v-model="code" type="number" border="none" maxlength="6" placeholder="" placeholder-style="color: #999"
+        class="input-item code-input">
+        <template slot="prefix">
+          <view class="label">
+            <text>验证码</text>
+          </view>
+        </template>
+      </u-input>
+      <view class="code-btn" :class="{ disabled: !canGetCode }" @click="getCode">
+        <text v-if="countdown === 60">获取验证码</text>
+        <text v-else>{{ countdown }}s 后重新获取</text>
+      </view>
+    </view>
+    <view class="input-box">
+      <u-input v-model="password" autocomplete="off" border="none" :password="isPwdHide" maxlength="20"
+        placeholder="8-20位数字/字母组合" placeholder-style="color: #999" class="input-item" >
+        <template slot="prefix">
+          <view class="label">
+            <text>新密码</text>
+          </view>
+        </template>
+        <template #suffix>
+          <u-icon :name="isPwdHide ? 'eye-off' : 'eye'" @click="isPwdHide = !isPwdHide" size="32rpx" color="#999" />
+        </template>
+      </u-input>
+    </view>
+    <view class="bind-btn">
+      <u-button :loading="isBinding" type="primary" @click="submitFun">确定</u-button>
+    </view>
+
+
+  </view>
+</template>
+
+<style scoped lang="scss">
+.sett-box {
+  width: 750rpx;
+  height: 100vh;
+  background: #F5F8F8;
+  padding: 36rpx 40rpx;
+}
+
+.input-box {
+  width: 678rpx;
+  height: 92rpx;
+  background: #FFFFFF;
+  border-radius: 24rpx;
+  margin-bottom: 36rpx;
+  display: flex;
+  align-items: center;
+  padding: 0 30rpx;
+
+  .label {
+    display: flex;
+  }
+
+  .input-item {
+    flex: 1;
+  }
+}
+
+.code-box {
+  .code-input {
+    flex: 1;
+  }
+
+  .code-btn {
+    width: 200rpx;
+    text-align: right;
+    font-size: 28rpx;
+    color: #2DB1A8;
+    line-height: 88rpx;
+
+    &.disabled {
+      color: #2DB1A8;
+    }
+  }
+}
+
+.bind-btn {
+  margin-top: 120rpx;
+
+  ::v-deep .u-button {
+    width: 678rpx;
+    height: 84rpx;
+    border-radius: 60rpx;
+    font-size: 28rpx;
+    background: linear-gradient(90deg, #2DB1A8 0%, #33BCB0 100%);
+    border: none;
+  }
+
+  ::v-deep .u-button--disabled {
+    background: #E0E0E0 !important;
+    color: #999 !important;
+  }
+}
+</style>

src/setting/myNew/phone.vue

@@ -1,14 +1,23 @@
 <script>
-import {bindPhone} from '@/api/index.js'
+import { clientLogin,sendMsg } from '@/api/newLogin.js'
 export default {
   data() {
     return {
       phone: '',
+      password: '',
       code: '',
       countdown: 60,
       timer: null,
       isSendingCode: false,
-      isBinding: false
+      isBinding: false,
+      isPwdHide: true,
+      isPasswordLogin:true,
+      useCodeLogin:false,
+
+      showCaptcha:false, // 弹窗显隐
+      imgCode:'',        // 用户填写的图形验证码
+      captchaImg:'',     // 图形验证码图片地址
+      captchaKey:''      // 后端返回验证码标识
     }
   },
   computed: {
@@ -18,16 +27,18 @@ export default {
     canBind() {
       return this.phone && this.validatePhone(this.phone) && this.code && this.code.length === 6 && !this.isBinding
     }
+
+  },
+  onShow() {
+    this.password = ''
   },
   methods: {
     validatePhone(phone) {
       const reg = /^1[3-9]\d{9}$/
       return reg.test(phone)
     },
-    getCode() {
-      if (this.isSendingCode || this.countdown < 60) return
-
-      if (!this.phone) {
+    nextStep(){
+       if (!this.phone) {
         uni.showToast({
           title: '请输入手机号',
           icon: 'none'
@@ -42,29 +53,13 @@ export default {
         })
         return
       }
+      if(!this.isPasswordLogin){
+        this.showCaptcha=true
+      }
 
-      this.isSendingCode = true
-
-      uni.showToast({
-        title: '验证码已发送',
-        icon: 'success'
-      })
-
-      this.startCountdown()
-      this.isSendingCode = false
-    },
-    startCountdown() {
-      this.countdown = 60
-      this.timer = setInterval(() => {
-        this.countdown--
-        if (this.countdown <= 0) {
-          clearInterval(this.timer)
-          this.countdown = 60
-          this.timer = null
-        }
-      }, 1000)
     },
-    bindPhone() {
+    //登录
+    loginPhoneFun() {
       var _this = this;
       if (this.isBinding) return
 
@@ -84,31 +79,91 @@ export default {
         return
       }
 
-      if (!this.code || this.code.length !== 6) {
+      if (!this.password && this.isPasswordLogin) {
         uni.showToast({
-          title: '请输入6位验证码',
+          title: '请输入密码',
           icon: 'none'
         })
         return
       }
 
       this.isBinding = true
-      bindPhone({
-        openId:uni.getStorageSync('wx_copenid'),
-        phone:_this.phone,
-        code:_this.code
-      }).then(res =>{
+      clientLogin({
+        //openId: uni.getStorageSync('wx_copenid'),
+        userType:'2',
+        phone: _this.phone,
+        codeSwitch:'false',//是否开启验证码登录 true-是 false-否
+        passWord: this.passWord
+      }).then(res => {
         if (res.data.code == 200) {
           uni.showToast({
-            title: '绑定成功',
+            title: '登录成功',
             icon: 'success'
           })
           uni.setStorageSync('wx_phone', _this.phone)
-          uni.navigateBack()
           _this.isBinding = false;
+          _this.back();
         }
       })
+    },
+    back() {
+      let pages = getCurrentPages();
+      if (pages.length >= 2) {
+        let prevPage = pages[pages.length - 2];
+        let prevRoute = prevPage.route;
+        if (prevRoute && prevRoute !== 'pages/index/index') {
+          if (prevRoute.startsWith('pages/')) {
+            uni.switchTab({
+              url: '/' + prevRoute
+            })
+          } else {
+            uni.navigateBack({
+              delta: 1,
+              fail: () => {
+                uni.switchTab({
+                  url: '/pages/index/index'
+                })
+              }
+            })
+          }
+        } else {
+          uni.switchTab({
+            url: '/pages/index/index'
+          })
+        }
+      } else {
+        uni.switchTab({
+          url: '/pages/index/index'
+        })
+      }
+    },
+    //图形验证码提交
+    submitImgCode(){
+      if(!this.imgCode){
+         uni.showToast({
+          title: '请输入验证码',
+          icon: 'none'
+        })
+        return
+      }
+      sendMsg({phone :this.phone }).then(res=>{
+        console.log(res)
+        uni.navigateTo({
+          url: `/setting/myNew/useCodeLogin?phone=`+this.phone
+        })
+
+      })
+      
+    },
+    //忘记密码
+    forgetPassword(){
+       uni.navigateTo({
+          url: `/setting/myNew/forgetPassword?phone=`+this.phone
+       })
+
     }
+
+
   },
   beforeDestroy() {
     if (this.timer) {
@@ -121,50 +176,107 @@ export default {
 
 <template>
   <view class="sett-box">
-    <view class="input-box">
-      <u-input
-        v-model="phone"
-        type="number"
-        border="none"
-        maxlength="11"
-        placeholder="请输入手机号"
-        placeholder-style="color: #999"
-        class="input-item"
-      ></u-input>
-    </view>
+    <!-- 放在页面最顶部，拦截自动填充核心代码 -->
+    <input type="text" name="username" style="position:absolute;opacity:0;width:0;height:0;z-index:-99;" />
+    <input type="password" name="password" style="position:absolute;opacity:0;width:0;height:0;z-index:-99;" />
 
-    <view class="input-box code-box">
-      <u-input
-        v-model="code"
-        type="number"
-        border="none"
-        maxlength="6"
-        placeholder="请输入手机验证码"
-        placeholder-style="color: #999"
-        class="input-item code-input"
-      ></u-input>
-      <view class="code-btn" :class="{ disabled: !canGetCode }" @click="getCode">
-        <text v-if="countdown === 60">获取验证码</text>
-        <text v-else>{{ countdown }}s 后重新获取</text>
+
+    <view class="greeting-area">
+      <view class="bubble-box">
+        <view class="bubble-text">您好，欢迎使用广誉源！</view>
       </view>
+
     </view>
+    <view class="input-box" style="margin-top: 180rpx;">
+      <u-input v-model="phone" type="number" border="none" maxlength="11" placeholder="请输入手机号"
+        placeholder-style="color: #999" class="input-item">
+        <template slot="prefix">
+          <view class="label">
+            <text>+86</text>
+            <u-line length="38rpx" color="#ccc" margin="0 12rpx 0 20rpx" direction="col"></u-line>
+          </view>
+        </template>
+      </u-input>
+    </view>
+
+    <view class="input-box" v-if="isPasswordLogin">
+      <u-input v-model="password" autocomplete="off" border="none" :password="isPwdHide" maxlength="20"
+        placeholder="请输入密码" placeholder-style="color: #999" class="input-item">
+        <template #suffix>
+          <u-icon :name="isPwdHide ? 'eye-off' : 'eye'" @click="isPwdHide = !isPwdHide" size="32rpx" color="#999" />
+        </template>
+      </u-input>
+    </view>
+
 
     <view class="bind-btn">
-      <u-button
-        :disabled="!canBind"
-        :loading="isBinding"
-        type="primary"
-        @click="bindPhone">绑定</u-button>
+      <u-button v-if="isPasswordLogin || useCodeLogin"  :loading="isBinding" type="primary" @click="loginPhoneFun">登录</u-button>
+      <u-button v-if="!isPasswordLogin"  :loading="isBinding" type="primary" @click="nextStep">下一步</u-button>
+    </view>
+    <view style="display: flex;justify-content: space-between;margin-top: 30rpx;font-size: 28rpx;">
+      <view v-if="isPasswordLogin" @click="isPasswordLogin=false">验证码登录</view>
+      <view v-if="!isPasswordLogin" @click="isPasswordLogin=true">密码登录</view>
+      <view v-if="isPasswordLogin" @click="forgetPassword">忘记密码</view>
+    </view>
+
+
+
+
+
+
+    <!-- //myNew/forgetPassword -->
+
+    <!-- 图形验证码弹窗 -->
+  <u-popup :show="showCaptcha" mode="center" border-radius="12">
+    <view class="captcha-box">
+      <view class="captcha-title">
+        <text>请输入下方图形验证码</text>
+        <u-icon name="close" @click="showCaptcha=false"></u-icon>
+      </view>
+      <!-- 图形验证码图片，点击刷新 -->
+      <image :src="captchaImg" @click="refreshCaptcha" class="captcha-img"></image>
+      <!-- 验证码输入框，唤起全字符键盘 -->
+      <u-input 
+        v-model="imgCode" 
+        placeholder="请输入图形验证码"
+        :focus="showCaptcha"
+        type="text"
+        maxlength="4"
+        border="none"
+      ></u-input>
+      <u-button @click="submitImgCode" block custom-style="margin-top:20rpx;">确定</u-button>
     </view>
+  </u-popup>
+
+
+
   </view>
 </template>
 
 <style scoped lang="scss">
-.sett-box{
+
+.captcha-box{
+  width:600rpx;
+  padding:30rpx;
+}
+.captcha-title{
+  display:flex;
+  justify-content:space-between;
+  align-items:center;
+  font-size:32rpx;
+  margin-bottom:30rpx;
+}
+.captcha-img{
+  width:100%;
+  height:120rpx;
+  margin-bottom:20rpx;
+}
+
+.sett-box {
   width: 750rpx;
   height: 100vh;
   background: #F5F8F8;
-  padding:36rpx 40rpx;
+  padding: 36rpx 40rpx;
 }
 
 .input-box {
@@ -177,6 +289,10 @@ export default {
   align-items: center;
   padding: 0 30rpx;
 
+  .label {
+    display: flex;
+  }
+
   .input-item {
     flex: 1;
   }
@@ -201,7 +317,6 @@ export default {
 }
 
 .bind-btn {
-  margin-top: 120rpx;
 
   ::v-deep .u-button {
     width: 678rpx;

src/setting/myNew/useCodeLogin.vue

@@ -0,0 +1,211 @@
+<script>
+import { loginPhone, sendMsg } from '@/api/newLogin.js'
+export default {
+  data() {
+    return {
+      phone: '', code: '',
+      countdown: 60,
+    }
+  },
+  computed: {
+    canGetCode() {
+      return !this.isSendingCode && this.countdown === 60
+    },
+    canBind() {
+      return this.code && this.code.length === 6 && !this.isBinding
+    }
+  },
+  onLoad(options) {
+    if (options.phone) {
+      this.phone = options.phone;
+      clearInterval(this.timer)
+      this.timer = null
+      this.startCountdown()
+    }
+
+  },
+  methods: {
+    validatePhone(phone) {
+      const reg = /^1[3-9]\d{9}$/
+      return reg.test(phone)
+    },
+    getCode() {
+      if (this.isSendingCode || this.countdown < 60) return
+
+      this.isSendingCode = true
+      sendMsg({ phone: this.phone }).then(res => {
+        console.log(res)
+
+        uni.showToast({
+          title: '验证码已发送',
+          icon: 'success'
+        })
+
+        this.startCountdown()
+        this.isSendingCode = false
+
+      })
+
+
+    },
+    startCountdown() {
+      this.countdown = 60
+      this.timer = setInterval(() => {
+        this.countdown--
+        if (this.countdown <= 0) {
+          clearInterval(this.timer)
+          this.countdown = 60
+          this.timer = null
+        }
+      }, 1000)
+    },
+    // 满6位自动校验
+    autoCheckCode(val) {
+      // 输入刚好6位时自动提交
+      if (val.length === 6) {
+
+        loginPhone({
+          //openId: uni.getStorageSync('wx_copenid'),
+          userType: '2',
+          phone: this.phone,
+          codeSwitch: 'true',//是否开启验证码登录 true-是 false-否
+          phoneMsg: this.code
+        }).then(res => {
+          if (res.data.code == 200) {
+            // uni.showToast({
+            //   title: '登录成功',
+            //   icon: 'success'
+            // })
+            uni.setStorageSync('wx_phone', this.phone)
+            this.back()
+          }
+        })
+      }
+
+    },
+    back() {
+      let pages = getCurrentPages();
+      if (pages.length >= 2) {
+        let prevPage = pages[pages.length - 3];
+        let prevRoute = prevPage.route;
+        if (prevRoute && prevRoute !== 'pages/index/index') {
+          if (prevRoute.startsWith('pages/')) {
+            uni.switchTab({
+              url: '/' + prevRoute
+            })
+          } else {
+            uni.navigateBack({
+              delta: 1,
+              fail: () => {
+                uni.switchTab({
+                  url: '/pages/index/index'
+                })
+              }
+            })
+          }
+        } else {
+          uni.switchTab({
+            url: '/pages/index/index'
+          })
+        }
+      } else {
+        uni.switchTab({
+          url: '/pages/index/index'
+        })
+      }
+    },
+  },
+  beforeDestroy() {
+    if (this.timer) {
+      clearInterval(this.timer)
+      this.timer = null
+    }
+  }
+}
+</script>
+
+<template>
+  <view class="sett-box">
+    <view class="greeting-area">
+      <view class="bubble-box">
+        <view class="bubble-text">请输入验证码</view>
+      </view>
+
+    </view>
+    <view>验证码已发送至：+86 {{ phone }}</view>
+
+
+
+
+    <view class="input-box code-box">
+      <u-input v-model="code" type="number" border="none" maxlength="6" placeholder="请输入手机验证码"
+        placeholder-style="color: #999" class="input-item code-input" @input="autoCheckCode"></u-input>
+      <view class="code-btn" :class="{ disabled: !canGetCode }" @click="getCode">
+        <text v-if="countdown === 60">获取验证码</text>
+        <text v-else>{{ countdown }}s 后重新获取</text>
+      </view>
+    </view>
+
+
+  </view>
+</template>
+
+<style scoped lang="scss">
+.sett-box {
+  width: 750rpx;
+  height: 100vh;
+  background: #F5F8F8;
+  padding: 36rpx 40rpx;
+}
+
+.input-box {
+  width: 678rpx;
+  height: 92rpx;
+  background: #FFFFFF;
+  border-radius: 24rpx;
+  margin-bottom: 36rpx;
+  display: flex;
+  align-items: center;
+  padding: 0 30rpx;
+
+  .input-item {
+    flex: 1;
+  }
+}
+
+.code-box {
+  .code-input {
+    flex: 1;
+  }
+
+  .code-btn {
+    width: 200rpx;
+    text-align: right;
+    font-size: 28rpx;
+    color: #2DB1A8;
+    line-height: 88rpx;
+
+    &.disabled {
+      color: #2DB1A8;
+    }
+  }
+}
+
+.bind-btn {
+  margin-top: 120rpx;
+
+  ::v-deep .u-button {
+    width: 678rpx;
+    height: 84rpx;
+    border-radius: 60rpx;
+    font-size: 28rpx;
+    background: linear-gradient(90deg, #2DB1A8 0%, #33BCB0 100%);
+    border: none;
+  }
+
+  ::v-deep .u-button--disabled {
+    background: #E0E0E0 !important;
+    color: #999 !important;
+  }
+}
+</style>

src/utils/index.js

@@ -85,20 +85,31 @@ const formatUtil = {
 
 // 其他工具方法
 const otherUtil = {
+	getQueryStr(name) {
+		let search = window.location.search;
+		const hash = window.location.hash;
+		if (hash.includes('?')) search = hash.split('?')[1]
+		const params = new URLSearchParams(search);
+		const val = params.get(name);
+		return val === null ? null : decodeURIComponent(val)
+	},
 	// 以token判断是否登录
 	checkLogin(options = {}) {
 		const {
 			type,
 			modalText = '请登录账号后再操作',
 		} = options;
-
-		const token = uni.getStorageSync('access-token') || '';
+		
+		//const token = uni.getStorageSync('access-token') || '';
+		const token = (uni.getStorageSync('wx_phone') && uni.getStorageSync('access-token')) || '';
 		const isLogin = !!token;
 
 		// 后退参数
 		let str = uni.$u.queryParams({ isBack: 1 });
 		// 跳转路由
-		let path = `/pages/login/wxLogin${str}`;
+		
+		let path = `/pages/myNew/phone${str}`;
+		//let path = `/pages/login/wxLogin${str}`;
 		// 未登录时，根据 type 执行对应操作
 		if (!isLogin) {
 			switch (type) {