Merge branch 'developer/yxly-teacher-genglw-20220713' into develop

+.DS_Store
+node_modules/
+unpackage/
+dist/
+
+# local env files
+.env.local
+.env.*.local
+
+# Log files
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Editor directories and files
+.project
+.idea
+.vscode
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw*

@@ -7,7 +7,8 @@
  * @LastEditTime: 2022-02-18 14:06:28
 -->
 <template>
-	<view>
+	<view>
+		<u-toast ref="uToast" />
 	</view>
 </template>
 
@@ -36,5 +37,5 @@
 <style lang="scss">
 	/* 注意要写在第一行，同时给style标签加入lang="scss"属性 */
 	@import "@/uni_modules/uview-ui/index.scss";
-	@import '@/static/common/css/icon.css';
+	@import '@/static/css/icon.css';
 </style>

 <template>
 	<view class="u-button">
-		<u-button type="primary" :shape="shape" :open-type="openType" @getphonenumber="getPhoneNumber" hover-class="none" :disabled="disabled" :custom-style="getCustomStyle"
-			@click="click">
-			{{text}}
+		<u-button :text="text" color="#0CB17A" :plain="false" :hairline="false" :disabled="disabled" :throttleTime="1500"
+			type="info" shape="circle" :open-type="openType" @getphonenumber="getPhoneNumber"
+			:custom-style="getCustomStyle" @click="click">
 		</u-button>
 	</view>
 </template>
@@ -18,14 +18,10 @@
 			type: {
 				type: String,
 				default: 'confirm'
-			},
-			openType: {
-				type: String,
-				default: ''
 			},
-			shape: {
+			openType: {
 				type: String,
-				default: 'square'
+				default: ''
 			},
 			disabled: {
 				type: Boolean,
@@ -37,53 +33,69 @@
 					return {}
 				}
 			},
+			color: {
+				type: String,
+				default: ''
+			},
+
 		},
 		data() {
 			return {}
 		},
-		computed: {
-			getCustomStyle() {
 
-				const {
-					type = ''
-				} = this;
-
-				let style = {};
-
-				switch (type) {
+		watch: {
+			buttonType: function(newVal, oldVal) {
+				switch (this.type) {
 					case 'confirm':
-						return Object.assign({}, {
-							backgroundColor: '#FF001A',
-							borderRadius: '8rpx',
-						}, this.customStyle);
-						break;
-
-					case 'cancel':
-						return Object.assign({}, {
-							backgroundColor: "rgba(0,0,0,0.15)",
-							borderRadius: '8rpx',
-						}, this.customStyle);
-						break;
-
-					case 'custom':
-						return Object.assign({}, this.customStyle);
+						this.color = "#0CB17A";
 						break;
 				}
 			}
 		},
+
+		computed: {
+			// getCustomStyle() {
+
+			// 	const {
+			// 		type = ''
+			// 	} = this;
+
+			// 	let style = {};
+
+			// 	switch (type) {
+			// 		case 'confirm':
+			// 			return Object.assign({}, {
+			// 				backgroundColor: '#FF001A',
+			// 				borderRadius: '8rpx',
+			// 			}, this.customStyle);
+			// 			break;
+
+			// 		case 'cancel':
+			// 			return Object.assign({}, {
+			// 				backgroundColor: "rgba(0,0,0,0.15)",
+			// 				borderRadius: '8rpx',
+			// 			}, this.customStyle);
+			// 			break;
+
+			// 		case 'custom':
+			// 			return Object.assign({}, this.customStyle);
+			// 			break;
+			// 	}
+			// }
+		},
 		methods: {
 			// 按钮点击
 			click(e) {
 				this.$emit('click', e);
-			},
-			
-			getPhoneNumber(e) {
-				this.$emit("getPhoneNumber", e)
+			},
+
+			getPhoneNumber(e) {
+				this.$emit("getPhoneNumber", e)
 			}
 		}
 	}
 </script>
 
-<style lang="scss">
-	
+<style lang="scss">
+
 </style>

 const http = uni.$u.http
 
-// post请求，获取菜单
-export const postMenu = (params) => http.post('/ebapi/public_api/index', params)
+// 获取token
+export const postTokenApi = (params, config = {}) => http.post('/auth/v1/login', params, config)
 
-// get请求，获取菜单，注意：get请求的配置等，都在第二个参数中，详见前面解释
-export const getMenu = (data) => http.get('/ebapi/public_api/index', data)
+// 获取用户信息
+export const getUserInfoApi = (data) => http.get('/user/v1/detail', {
+	params: data
+})
+
+// 获取短信验证码
+export const getSmsCodeApi = (data) => http.get('/basic/v1/sms_code/get', {
+	params: data
+})

@@ -5,26 +5,50 @@ module.exports = (vm) => {
 		/* config 为默认全局配置*/
 
 		// 测试环境
-		// config.baseUrl = "http://39.104.52.206:8000";
+		config.baseURL = "http://39.104.52.206:8000";
 		// 预生产环境
-		// config.baseUrl = "https://api-isxpre.workai.com.cn";
+		// config.baseURL = "https://api-isxpre.workai.com.cn";
 		// 线上环境
-		config.baseUrl = "https://api-isx.workai.com.cn";
+		// config.baseURL = "https://api-isx.workai.com.cn";
 
-		config.OSSUrl = "https://oss.workai.com.cn";
-
-		// 如果将此值设置为true，拦截回调中将会返回服务端返回的所有数据response，而不是response.data
-		// 设置为true后，就需要在this.$u.http.interceptor.response进行多一次的判断，请打印查看具体值
-
-		config.loadingText = '努力加载中~';
-		config.loadingTime = 800;
-		config.originalData = true;
-		// 设置自定义头部content-type
 		config.header = {
 			// 'content-type': 'xxx'
 			'Authorization': 'Basic d29ya2FpOjEyMzQ1Ng=='
 		};
 
+		// 设置自定义头部content-type
+		config.dataType = 'json';
+		// #ifndef MP-ALIPAY
+		config.responseType = 'text';
+		// #endif
+		// 注：如果局部custom与全局custom有同名属性，则后面的属性会覆盖前面的属性，相当于Object.assign(全局，局部)
+		config.custom = {}; // 全局自定义参数默认值
+		// #ifdef H5 || APP-PLUS || MP-ALIPAY || MP-WEIXIN
+		config.timeout = 60000;
+		// #endif
+		// #ifdef APP-PLUS
+		config.sslVerify = true;
+		// #endif
+		// #ifdef H5
+		// 跨域请求时是否携带凭证（cookies）仅H5支持（HBuilderX 2.6.15+）
+		config.withCredentials = false;
+		// #endif
+		// #ifdef APP-PLUS
+		config.firstIpv4 = false; // DNS解析时优先使用ipv4 仅 App-Android 支持 (HBuilderX 2.8.0+)
+		// #endif
+		// 局部优先级高于全局，返回当前请求的task,options。请勿在此处修改options。非必填
+		// getTask: (task, options) => {
+		// 相当于设置了请求超时时间500ms
+		//   setTimeout(() => {
+		//     task.abort()
+		//   }, 500)
+		// },
+
+		// 全局自定义验证器。参数为statusCode 且必存在，不用判断空情况。
+		config.validateStatus = (statusCode) => { // statusCode 必存在。此处示例为全局默认配置
+			return statusCode >= 200 && statusCode < 300
+		};
+
 		return config;
 	})
 

@@ -102,7 +102,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx5177bff86a427016",
+        "appid" : "wx84b71301436652ce",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

 {
 	"easycom": {
-		"^u-(.*)": "@/uview-ui/components/u-$1/u-$1.vue",
+		"^u-(.*)": "@/uni_modules/uview-ui/components/u-$1/u-$1.vue",
 		"^c-(.*)": "@/components/c-$1/c-$1.vue"
 	},
 	"condition": { //模式配置，仅开发期间生效
 		"current": 0, //当前激活的模式(list 的索引项)
 		"list": [{
 			"name": "defult", //模式名称
-			"path": "pages/main/position/positionDetail/positionDetail",
-			"query": "jobId=1544925053173403649&brokerId=1000007"
+			"path": "pages/main/my/mobileLogin/mobileLogin",
+			"query": ""
 		}]
 	},
 	"pages": [{
@@ -20,14 +20,40 @@
 			}
 		},
 		{
+			"path": "pages/tabBar/internship/internship",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
+			}
+		},
+		{
 			"path": "pages/tabBar/my/my",
 			"style": {
-				"navigationStyle": "custom"
-				// "navigationBarTitleText": "校企职通车人人推"
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
 			}
 		}
 	],
-	"subPackages": [],
+	"subPackages": [{
+		"root": "pages/main/my",
+		"pages": [{
+				"path": "login/login",
+				"style": {
+					"navigationBarTitleText": "登录",
+					"enablePullDownRefresh": false
+				}
+
+			},
+			{
+				"path": "mobileLogin/mobileLogin",
+				"style": {
+					"navigationBarTitleText": "手机登录",
+					"enablePullDownRefresh": false
+				}
+
+			}
+		]
+	}],
 
 	"preloadRule": {
 
@@ -49,15 +75,23 @@
 		"height": "100rpx",
 		"fontSize": "40rpx",
 		"list": [{
-			"pagePath": "pages/tabBar/home/home",
-			"iconPath": "/static/img/tabbar/home.png",
-			"selectedIconPath": "/static/img/tabbar/homeHL.png",
-			"text": "首页"
-		}, {
-			"pagePath": "pages/tabBar/my/my",
-			"iconPath": "/static/img/tabbar/my.png",
-			"selectedIconPath": "/static/img/tabbar/myHL.png",
-			"text": "我的"
-		}]
+				"pagePath": "pages/tabBar/home/home",
+				"iconPath": "/static/img/icon/home.png",
+				"selectedIconPath": "/static/img/icon/homeHL.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/tabBar/internship/internship",
+				"iconPath": "/static/img/icon/position.png",
+				"selectedIconPath": "/static/img/icon/positionHL.png",
+				"text": "实习"
+			},
+			{
+				"pagePath": "pages/tabBar/my/my",
+				"iconPath": "/static/img/icon/my.png",
+				"selectedIconPath": "/static/img/icon/myHL.png",
+				"text": "我的"
+			}
+		]
 	}
 }

+<template>
+	<page-meta>
+		<navigation-bar :title="nbTitle" :front-color="nbFrontColor" :background-color="nbBackgroundColor" />
+	</page-meta>
+	<view>
+		<web-view :webview-styles="webviewStyles" :src="url"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				nbTitle: '',
+				nbFrontColor: '#000000',
+				nbBackgroundColor: '#ffffff',
+				url: "",
+				webviewStyles: {
+					progress: {
+						color: '#FF3333'
+					}
+				}
+			}
+		},
+
+		onLoad(option) {
+			console.log(option);
+			this.url = option.url;
+			this.nbTitle = option.navtitle;
+		},
+
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+
+</style>

+<template>
+	<view class="login">
+		<u-image width="100%" height="100%" :src="vuex_baseImgUrl+'/logo_bg.png'" />
+
+		<view class="box">
+
+			<view class="logo">
+				<u-image width="260rpx" height="140rpx" :src="vuex_baseImgUrl+'/logo.png'" />
+			</view>
+
+			<view class="btn button_warp">
+				<c-button type="confirm" shape="circle"
+					:customStyle="{borderRadius:'48rpx',fontSize:'34rpx',color:'#fff',fontWeight:'400'}" text="微信一键登录"
+					:disabled="isDisable" openType="getPhoneNumber" @getPhoneNumber="getPhoneNumber"
+					@click="getUserProfile"></c-button>
+			</view>
+
+			<view class="changeLogin" @click="handelMobileLogin">
+				手机号码登录/注册
+			</view>
+
+			<view class="agreement">
+				<view class="check">
+					<u-checkbox-group @change="checkboxChange" v-model="checked">
+						<u-checkbox size="30" activeColor="#0CB17A" shape="circle">
+						</u-checkbox>
+					</u-checkbox-group>
+				</view>
+				<view class="text">
+					<text>您已阅读理解并同意</text>
+					<text class="span" @click="linkService">《优学乐业服务协议》、</text>
+					<text class="span" @click="linkPolicy">《优学乐业隐私政策》</text>
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex'
+
+	export default {
+		data() {
+			return {
+				isDisable: true,
+				checked: [],
+				service: "https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/agreement/%E3%80%8A%E4%BC%98%E5%AD%A6%E4%B9%90%E4%B8%9A%E7%94%A8%E6%88%B7%E6%9C%8D%E5%8A%A1%E5%8D%8F%E8%AE%AE%E3%80%8B.htm",
+				policy: "https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/agreement/%E3%80%8A%E4%BC%98%E5%AD%A6%E4%B9%90%E4%B8%9A%E9%9A%90%E7%A7%81%E5%8D%8F%E8%AE%AE%E3%80%8B.htm",
+				form: {
+					mobile: '',
+					password: '',
+				},
+			}
+		},
+
+		onLoad() {
+			const {
+				dispatch
+			} = this.$store;
+
+		},
+
+		onShow() {
+
+		},
+		
+		watch: {
+			checked: function(newVal, oldVal) {
+				this.isDisable = newVal.length != 0 ? false : true;
+				
+			}
+		},
+
+		computed: {
+			...mapState('user', {
+				// 箭头函数可使代码更简练
+				isReg: 'isReg',
+
+			}),
+		},
+
+		methods: {
+
+			linkService() {
+				console.log(this)
+				this.$u.route({
+					url: `/pages/common/webview/webview?navtitle=服务协议&url=${this.service}`,
+				})
+			},
+
+			linkPolicy() {
+				this.$u.route({
+					url: `/pages/common/webview/webview?navtitle=隐私政策&url=${this.policy}`,
+				})
+			},
+
+			checkboxChange(n) {
+				console.log(n)
+
+			},
+
+			getUserProfile() {
+				// 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认
+				// 开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
+				wx.getUserProfile({
+					desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+					success: (res) => {
+						console.log('getUserProfile...', res)
+						// this.$store.commit('setWenxinUserInfo', res);
+						this.$u.vuex('vuex_weixinUserInfo', res.userInfo);
+					}
+				})
+			},
+
+			getPhoneNumber(e) {
+				console.log(e)
+
+				wx.login({
+					success: (res) => {
+						console.log(res);
+
+						// this.getUserProfile();
+
+						this.$store.dispatch(`user/login`, {
+							way: 'wechat_code',
+							type: 'student',
+							jsCode: res.code,
+							code: e.detail.code,
+						})
+					}
+				})
+			},
+
+			phoneLogin() {
+				this.$store.dispatch(`user/login`, {
+					way: 'name',
+					type: 'student',
+					username: this.form.mobile,
+					password: this.form.password,
+				})
+			},
+
+			handelMobileLogin() {
+				this.$u.route({
+					url: "/pages/main/my/mobileLogin/mobileLogin",
+					params: {}
+				});
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.login {
+		width: 100%;
+		height: 100%;
+		position: relative;
+
+		.box {
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
+			left: 0;
+
+			.logo {
+				padding: 156rpx 0 0 0;
+				width: 260rpx;
+				margin: 0 auto;
+			}
+
+			.changeLogin {
+				width: 100%;
+				text-align: center;
+				margin: 48rpx 0 0 0;
+				font-size: 15px;
+				font-weight: 400;
+				color: rgba(0, 0, 0, 0.65);
+			}
+
+			.agreement {
+				position: fixed;
+				left: 0;
+				bottom: 34rpx;
+				display: flex;
+				flex-direction: row;
+				justify-content: flex-start;
+				font-size: 24rpx;
+				margin: 30rpx 0 32rpx 0;
+				padding: 0 50rpx;
+
+				.check {
+					width: 40rpx;
+					padding: 3rpx 0 0 0;
+					// display: inline-block;
+				}
+
+				.text {
+					// display: inline-block;
+					color: rgba(0, 0, 0, 0.45);
+
+					.span {
+						color: #0CB17A;
+					}
+				}
+			}
+
+			.form {
+				margin: 30rpx 60rpx 0px;
+			}
+
+			.btn {
+				margin-top: 200rpx;
+				padding: 0 48rpx;
+			}
+
+			.wxLogin {
+				display: flex;
+				align-items: center;
+				flex-direction: column;
+				margin-top: 180rpx;
+
+				button {
+					background-color: transparent;
+				}
+
+				button::after {
+					border: initial
+				}
+
+				image {
+					width: 96rpx;
+					height: 96rpx;
+				}
+
+				text {
+					margin-top: 0rpx;
+				}
+			}
+		}
+	}
+</style>

+<template>
+	<view class="login">
+		<view class="box">
+			<view v-if="changeLogin == '账号密码登录'" class="form">
+				<u-form :model="form" ref="uForm">
+					<u-form-item prop="mobile"
+						:leftIconStyle="{width:'40rpx',height:'40rpx', position:'relative', right:'8rpx'}"
+						left-icon="/static/img/my/login_mobile.png" borderBottom>
+						<u-input v-model="form.mobile" border="none" maxlength='11' placeholder="请输入手机号"
+							:customStyle="{fontSize:'17px'}" />
+					</u-form-item>
+					<u-form-item prop="verifyCode"
+						:leftIconStyle="{width:'40rpx',height:'40rpx', position:'relative', right:'8rpx'}"
+						left-icon="/static/img/my/login_code1.png" borderBottom>
+						<u-input v-model="form.password" border="none" placeholder="请输入验证码"
+							:customStyle="{fontSize:'17px'}" />
+						<u-button type="default" size="mini" slot="right" :hair-line="false"
+							:custom-style="{color:'#0CB17A', border:'none',fontSize:'30rpx'}" @click="getCode">
+							{{codeText}}
+						</u-button>
+						<u-code ref="uCode" @change="codeChange"></u-code>
+					</u-form-item>
+				</u-form>
+			</view>
+			<view v-else class="form">
+				<u-form :model="form" ref="uForm">
+					<u-form-item prop="mobile"
+						:left-icon-style="{width:'40rpx',height:'40rpx', position:'relative', right:'8rpx'}"
+						left-icon="/static/img/my/login_mobile.png" borderBottom>
+						<u-input v-model="form.mobile" border="none" placeholder="请输入账号"
+							:customStyle="{fontSize:'17px'}" />
+					</u-form-item>
+					<u-form-item prop="verifyCode"
+						:left-icon-style="{width:'40rpx',height:'40rpx', position:'relative', right:'8rpx'}"
+						left-icon="/static/img/my/login_code2.png" borderBottom>
+						<u-input v-model="form.password" border="none" type='password' placeholder="请输入密码"
+							:customStyle="{fontSize:'17px'}" />
+					</u-form-item>
+				</u-form>
+			</view>
+
+			<view class="btn button_warp">
+				<c-button type="confirm" shape="circle"
+					:customStyle="{borderRadius:'48rpx',fontSize:'34rpx',color:'#fff',fontWeight:'400'}" text="登录"
+					:disabled="isDisable" @click="phoneLogin"></c-button>
+			</view>
+
+			<view class="changeLogin" @click="onchangeLogin">
+				{{changeLogin}}
+			</view>
+
+			<view class="agreement">
+				<view class="check">
+					<u-checkbox-group @change="checkboxChange" v-model="checked">
+						<u-checkbox size="28" activeColor="#0CB17A" shape="circle">
+						</u-checkbox>
+					</u-checkbox-group>
+				</view>
+				<view class="text">
+					<text>您已阅读理解并同意</text>
+					<text class="span" @click="linkService">《优学乐业服务协议》、</text>
+					<text class="span" @click="linkPolicy">《优学乐业隐私政策》</text>
+				</view>
+			</view>
+		</view>
+		<view>
+			<u-toast ref="uToast" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex'
+	import {
+		getSmsCodeApi,
+	} from '@/config/api.js';
+	import md5 from '@/common/md5';
+
+	export default {
+		data() {
+			return {
+				errorType: ['toast'],
+				isDisable: true,
+				checked: [],
+				service: "https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/agreement/%E3%80%8A%E4%BC%98%E5%AD%A6%E4%B9%90%E4%B8%9A%E7%94%A8%E6%88%B7%E6%9C%8D%E5%8A%A1%E5%8D%8F%E8%AE%AE%E3%80%8B.htm",
+				policy: "https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/agreement/%E3%80%8A%E4%BC%98%E5%AD%A6%E4%B9%90%E4%B8%9A%E9%9A%90%E7%A7%81%E5%8D%8F%E8%AE%AE%E3%80%8B.htm",
+				form: {
+					mobile: '',
+					password: '',
+				},
+				changeLogin: '账号密码登录',
+				codeText: '发送验证码',
+			}
+		},
+
+		onLoad() {
+			const {
+				dispatch
+			} = this.$store;
+
+		},
+
+		onShow() {
+
+		},
+		
+		watch: {
+			checked: function(newVal, oldVal) {
+				this.isDisable = newVal.length != 0 ? false : true;
+				
+			}
+		},
+		
+
+		computed: {
+			...mapState('user', {
+				// 箭头函数可使代码更简练
+				isReg: 'isReg',
+
+			}),
+		},
+
+		methods: {
+
+			onchangeLogin() {
+				if (this.changeLogin == '验证码登录') {
+					this.changeLogin = '账号密码登录';
+				} else {
+					this.changeLogin = '验证码登录';
+				}
+			},
+
+			linkService() {
+				console.log(this)
+				this.$u.route({
+					url: `/pages/common/webview/webview?navtitle=服务协议&url=${this.service}`,
+				})
+			},
+
+			linkPolicy() {
+				this.$u.route({
+					url: `/pages/common/webview/webview?navtitle=隐私政策&url=${this.policy}`,
+				})
+			},
+
+			checkboxChange(n) {
+				// console.log(n)
+			},
+
+			getUserProfile() {
+				// 推荐使用wx.getUserProfile获取用户信息，开发者每次通过该接口获取用户个人信息均需用户确认
+				// 开发者妥善保管用户快速填写的头像昵称，避免重复弹窗
+				wx.getUserProfile({
+					desc: '用于完善会员资料', // 声明获取用户个人信息后的用途，后续会展示在弹窗中，请谨慎填写
+					success: (res) => {
+						console.log('getUserProfile...', res)
+						// this.$store.commit('setWenxinUserInfo', res);
+						this.$u.vuex('vuex_weixinUserInfo', res.userInfo);
+					}
+				})
+			},
+
+			codeChange(text) {
+				this.codeText = text;
+			},
+
+			getCode() {
+				const {
+					mobile = ''
+				} = this.form;
+
+				if (!(mobile && /^1[0-9]{10}$/.test(mobile))) {
+					this.$refs.uToast.show({
+						message: '请填写正确手机号',
+						type: 'error',
+						duration: 1500,
+					})
+
+				} else {
+					if (this.$refs.uCode.canGetCode) {
+						// 模拟向后端请求验证码
+						uni.showLoading({
+							title: '正在获取验证码'
+						})
+						setTimeout(() => {
+							uni.hideLoading();
+							// 通知验证码组件内部开始倒计时
+							this.$refs.uCode.start();
+
+							console.log(mobile)
+
+							getSmsCodeApi({
+								phone: mobile
+							})
+
+						}, 1000);
+					} else {
+						this.$u.toast('倒计时结束后再发送');
+					}
+				}
+			},
+
+			phoneLogin() {
+				// this.getUserProfile();
+				if (this.changeLogin == '账号密码登录') {
+					this.$store.dispatch(`user/login`, {
+						way: 'code',
+						type: 'student',
+						phone: this.form.mobile,
+						code: this.form.password,
+					})
+				} else {
+					console.log(md5.hex_md5(this.form.password));
+					this.$store.dispatch(`user/login`, {
+						way: 'name',
+						type: 'student',
+						username: this.form.mobile,
+						password: md5.hex_md5(this.form.password),
+					})
+				}
+			},
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.login {
+		width: 100%;
+		height: 100%;
+		position: relative;
+
+		.box {
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			top: 0;
+			left: 0;
+
+			.logo {
+				padding: 156rpx 0 0 0;
+				width: 120rpx;
+				margin: 0 auto;
+			}
+
+			.name {
+				margin: 32rpx 0 0 0;
+				text-align: center;
+				font-size: 48rpx;
+				line-height: 66rpx;
+				color: #000000;
+				font-weight: 600;
+			}
+
+			.changeLogin {
+				width: 100%;
+				text-align: center;
+				margin: 48rpx 0 0 0;
+				font-size: 15px;
+				font-weight: 400;
+				color: #0CB17A;
+			}
+
+			.agreement {
+				position: fixed;
+				left: 0;
+				bottom: 34rpx;
+				display: flex;
+				flex-direction: row;
+				justify-content: flex-start;
+				font-size: 24rpx;
+				margin: 30rpx 0 32rpx 0;
+				padding: 0 50rpx;
+
+				.check {
+					width: 40rpx;
+					padding: 5rpx 0 0 0;
+					// display: inline-block;
+				}
+
+				.text {
+					// display: inline-block;
+					color: rgba(0, 0, 0, 0.45);
+
+					.span {
+						color: #0CB17A;
+					}
+				}
+			}
+
+			.form {
+				margin: 128rpx 60rpx 0px;
+			}
+
+			.btn {
+				margin-top: 128rpx;
+				padding: 0 48rpx;
+			}
+
+			.wxLogin {
+				display: flex;
+				align-items: center;
+				flex-direction: column;
+				margin-top: 180rpx;
+
+				button {
+					background-color: transparent;
+				}
+
+				button::after {
+					border: initial
+				}
+
+				image {
+					width: 96rpx;
+					height: 96rpx;
+				}
+
+				text {
+					margin-top: 0rpx;
+				}
+			}
+		}
+	}
+</style>

@@ -5,10 +5,6 @@
 </template>
 
 <script>
-	import {
-		postMenu,
-		getMenu
-	} from '@/config/api.js';
 
 	export default {
 		data() {
@@ -18,16 +14,7 @@
 		},
 
 		onLoad() {
-			// 发出post，假设需要带上token
-			postMenu({
-				custom: {
-					auth: true
-				}
-			}).then(() => {
-
-			}).catch(() => {
-
-			})
+			
 		},
 
 		onShow() {

+<template>
+	<view class="internship">
+		
+	</view>
+</template>
+
+<script>
+
+	export default {
+		data() {
+			return {
+				
+			};
+		},
+
+		onLoad() {},
+
+		async onShow() {
+			
+		},
+
+		methods: {
+			
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+
+	
+</style>

@@ -35,7 +35,7 @@ const store = new Vuex.Store({
 		position,
 	},
 	state: {
-		vuex_appId: 'wx5177bff86a427016',
+		vuex_appId: 'wx84b71301436652ce',
 		vuex_corpId: 'ww4300c59cb9537f9e',//企业ID
 		// 如果上面从本地获取的lifeData对象下有对应的属性，就赋值给state中对应的变量
 		// 加上vuex_前缀，是防止变量名冲突，也让人一目了然
@@ -46,7 +46,7 @@ const store = new Vuex.Store({
 		// 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式
 		vuex_version: '1.0.1',
 		vuex_demo: '绛紫',
-		vuex_baseImgUrl: "https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/job-sharing",
+		vuex_baseImgUrl: "https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/yxly-teacher",
 		vuex_ossUrl: "https://yxly.oss-cn-beijing.aliyuncs.com",
 		vuex_ossUrlPubilc: "https://yxlypublic.oss-cn-beijing.aliyuncs.com",
 		vuex_customer_chatUrl:"https://work.weixin.qq.com/kfid/kfc04063cd2d1081221",//企业微信客服

-const state = () => ({
-	openid: '',
-	isReg: '',
-	id: '',
-	name: '',
-	number: '',
-	password: '',
-	phone: '',
-	status: '',
-	type: '',
-	username: '',
-	userBasicInfo: {},
-
-})
-
-// getters
-const getters = {
-	// doneOpenid: (state, getters, rootState) => {
-	// 	return state.openid
-	// },
-}
-
-// actions
-const actions = {
-
-	async login({
-		commit,
-		dispatch,
-		state
-	}, params) {
-		const login_result = await uni.$u.api.getLoginApi({
-			...params
-		});
-
-		if (login_result) {
+import {
+		postTokenApi,
+		getUserInfoApi,
+	} from '@/config/api.js';
+
+	const state = () => ({
+		openid: '',
+		isReg: '',
+		id: '',
+		name: '',
+		number: '',
+		password: '',
+		phone: '',
+		status: '',
+		type: '',
+		username: '',
+		userBasicInfo: {},
+
+	})
+
+	const getters = {
+		// doneOpenid: (state, getters, rootState) => {
+		// 	return state.openid
+		// },
+	}
+
+	// actions
+	const actions = {
+
+		async login({
+			commit,
+			dispatch,
+			state
+		}, params) {
+			const login_result = await postTokenApi({
+				...params
+			}, {
+				custom: {
+					auth: false
+				}
+			});
 			
-			let vuex_token = `Bearer ${login_result.access_token}`
-			await uni.$u.vuex('vuex_token', vuex_token);
-			await uni.$u.vuex('vuex_phone', login_result.phone);
-
-			switch (login_result.status) {
-
-				case 'not_reg': //未注册
-					// uni.$u.route({
-					// 	url: '/pages/student/my/login/login',
-					// 	type: 'reLaunch',
-					// });
-					break;
-
-				case 'annulled': //已注销
-					// uni.$u.route({
-					// 	url: '/pages/student/my/written-off/written-off',
-					// 	type: 'navigateTo',
-					// });
-					break;
-
-				case 'annulling': //注销中
-					uni.$u.route({
-						url: '/pages/common/login/login',
-						// type: 'navigateTo',
-					});
-					break;
-
-				case 'active': //已注册
-					const userInfo = await dispatch(`getUserInfo`);
-					
-					if (userInfo) {
-						uni.navigateBack({
-							delta: 1
-						});
-					}
-					
-					break;
-			}
-			
-			return login_result;
-		}
-
-
-	},
-
-	async loginOut({
-		commit,
-		dispatch,
-		state
-	}, params) {
-		console.log('loginOut')
-		await uni.$u.vuex('vuex_user', '');
-		await uni.$u.vuex('vuex_token', '');
-		await uni.setStorageSync('lifeData', {});
-
-		uni.$u.route('/pages/common/login/login');
-	},
-
-	async getUserInfo({
-		commit,
-		dispatch,
-		state
-	}, params) {
-
-		const userInfo = await uni.$u.api.getUserApi();
-		await uni.$u.vuex('vuex_user', userInfo);
-
-		return userInfo;
-	},
-}
-
-// mutations
-const mutations = {
-
-	setUserInfo(state, userInfo) {
-		state.id = userInfo.id;
-		state.name = userInfo.name;
-		state.phone = userInfo.phone;
-		state.username = userInfo.username;
-		state.userBasicInfo = userInfo.userBasicInfo;
-	},
-}
-
-export default {
-	namespaced: true,
-	state,
-	getters,
-	actions,
-	mutations
-}
+			console.log(login_result)
+
+			if (login_result) {
+
+				let vuex_token = `Bearer ${login_result.access_token}`
+				await uni.$u.vuex('vuex_token', vuex_token);
+				await uni.$u.vuex('vuex_phone', login_result.phone);
+
+				switch (login_result.status) {
+
+					case 'not_reg': //未注册
+						uni.$u.route({
+							url: '/pages/student/my/login/login',
+							type: 'reLaunch',
+						});
+						break;
+
+					case 'annulled': //已注销
+						uni.$u.route({
+							url: '/pages/student/my/written-off/written-off',
+							type: 'navigateTo',
+						});
+						break;
+
+					case 'annulling': //注销中
+						uni.$u.route({
+							url: '/pages/student/my/freezing/freezing',
+							type: 'navigateTo',
+						});
+						break;
+
+					case 'active': //已注册
+						const userInfo = await dispatch(`getUserInfo`);
+
+						// if (userInfo) {
+						// 	const {
+						// 		student = {}
+						// 	} = userInfo;
+						// 	if (student && JSON.stringify(student) != '{}' && student.status == 'verified') {
+						// 		uni.$u.route({
+						// 			url: 'pages/student/tabBar/internship/internship',
+						// 			type: 'switchTab',
+						// 			params: {
+
+						// 			}
+						// 		})
+
+						// 	} else {
+						// 		uni.$u.route({
+						// 			url: `/pages/student/my/student-status-certification/student-status-certification`,
+						// 			type: 'reLaunch',
+						// 			params: {
+
+						// 			}
+						// 		})
+						// 	}
+						// }
+
+						break;
+				}
+
+				return login_result;
+			}
+
+
+		},
+
+		async loginOut({
+			commit,
+			dispatch,
+			state
+		}, params) {
+
+			await uni.$u.vuex('vuex_user', {});
+			await uni.$u.vuex('vuex_token', {});
+			await uni.setStorageSync('lifeData', {});
+
+			uni.$u.route('/pages/student/my/login/login');
+		},
+
+		async getUserInfo({
+			commit,
+			dispatch,
+			state
+		}, params) {
+
+			const userInfo = await getUserInfoApi();
+			
+			uni.$u.vuex('vuex_user', userInfo);
+
+			return userInfo;
+		},
+	}
+
+	// mutations
+	const mutations = {
+
+		setUserInfo(state, userInfo) {
+			state.id = userInfo.id;
+			state.name = userInfo.name;
+			state.phone = userInfo.phone;
+			state.username = userInfo.username;
+			state.userBasicInfo = userInfo.userBasicInfo;
+		},
+	}
+
+	export default {
+		namespaced: true,
+		state,
+		getters,
+		actions,
+		mutations
+	}