Browse Source

去除关联学员身份页面

xuqiaoying 2 years ago
parent
commit
a1ec4fc83e
4 changed files with 9 additions and 216 deletions
  1. 8 8
      common/request.js
  2. 1 1
      manifest.json
  3. 0 11
      pages.json
  4. 0 196
      pages2/register/bind.vue

+ 8 - 8
common/request.js

@@ -5,24 +5,24 @@ import method from '@/common/methodTool.js'
 import api from './api.js'
 import api from './api.js'
 var num = 1
 var num = 1
 //接口api   
 //接口api   
-// export const BASE_URL = 'https://api.xyyxt.net'   //release
+export const BASE_URL = 'https://api.xyyxt.net'   //release
 // export const BASE_URL = 'https://test.xyyxt.net'   //预发布
 // export const BASE_URL = 'https://test.xyyxt.net'   //预发布
-export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
+// export const BASE_URL = 'http://120.79.166.78:19012' // 测试环境
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test(后端本地)
 // export const BASE_URL = 'http://42.192.164.187:19005'    //test(后端本地)
 // export const BASE_URL = 'http://192.168.1.222:5055'    //后端本地更新到222
 // export const BASE_URL = 'http://192.168.1.222:5055'    //后端本地更新到222
 // export const BASE_URL = 'http://192.168.1.24:5055'    //后端本地
 // export const BASE_URL = 'http://192.168.1.24:5055'    //后端本地
 // export const BASE_URL = 'http://192.168.1.7:5055'    //后端本地
 // export const BASE_URL = 'http://192.168.1.7:5055'    //后端本地
 
 
  //图片上传api
  //图片上传api
-// export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
-export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
+export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
+// export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
 
 
 // web_view的
 // web_view的
 // export const WEBVIEW_URL = 'https://m.xyyxt.net/'  //release-祥粤云学堂
 // export const WEBVIEW_URL = 'https://m.xyyxt.net/'  //release-祥粤云学堂
 // export const WEBVIEW_URL = 'https://cm.xyyxt.net/'  //release-祥粤学堂
 // export const WEBVIEW_URL = 'https://cm.xyyxt.net/'  //release-祥粤学堂
-// export const WEBVIEW_URL = 'https://zstcm.xyyxt.net/'  //release-中建云学堂
+export const WEBVIEW_URL = 'https://zstcm.xyyxt.net/'  //release-中建云学堂
 // export const WEBVIEW_URL = 'https://testm.xyyxt.net/'  //预发布
 // export const WEBVIEW_URL = 'https://testm.xyyxt.net/'  //预发布
-export const WEBVIEW_URL = 'http://120.79.166.78:18001/' // 测试环境-祥粤云学堂
+// export const WEBVIEW_URL = 'http://120.79.166.78:18001/' // 测试环境-祥粤云学堂
 // export const WEBVIEW_URL = 'http://120.79.166.78:18011/' // 测试环境-祥粤学堂  
 // export const WEBVIEW_URL = 'http://120.79.166.78:18011/' // 测试环境-祥粤学堂  
 // export const WEBVIEW_URL = 'http://api.xyyxt.net:6066/'  //预发布(弃用了)
 // export const WEBVIEW_URL = 'http://api.xyyxt.net:6066/'  //预发布(弃用了)
 
 
@@ -37,8 +37,8 @@ RVQplIVs5z3MxcUa9ptKPHUTgh8xMCBvl8sUJKwkmn4vYWeDfHT22EL7Hr1pTMwU
 hF6WiNlWfQTVoF1rhwIDAQAB
 hF6WiNlWfQTVoF1rhwIDAQAB
 -----END PUBLIC KEY-----`;
 -----END PUBLIC KEY-----`;
 
 
-export const version = '1.0.2' 
-export const tenantId = '867735392558919680'  // 祥粤云学堂:867735392558919680,祥粤学堂:667735392758919630, 中建云学堂-567735392758918520
+export const version = '1.0.3' 
+export const tenantId = '567735392758918520'  // 祥粤云学堂:867735392558919680,祥粤学堂:667735392758919630, 中建云学堂-567735392758918520
 export const myRequest = (options) => {
 export const myRequest = (options) => {
 	if (store.state.allowLoading && !options.noLoading) {
 	if (store.state.allowLoading && !options.noLoading) {
 		uni.showLoading({
 		uni.showLoading({

+ 1 - 1
manifest.json

@@ -75,7 +75,7 @@
     "quickapp" : {},
     "quickapp" : {},
     /* 小程序特有相关 */
     /* 小程序特有相关 */
     "mp-weixin" : {
     "mp-weixin" : {
-        "appid" : "wxd3c8ae80cf43a305", // 祥粤云学堂:wxd3c8ae80cf43a305, 祥粤学堂-wx871153afc95f55f4
+        "appid" : "wx47d33eb64f9f2a0d", // 祥粤云学堂:wxd3c8ae80cf43a305, 祥粤学堂-wx871153afc95f55f4
         "setting" : {
         "setting" : {
             "urlCheck" : false,
             "urlCheck" : false,
             "postcss" : true,
             "postcss" : true,

+ 0 - 11
pages.json

@@ -126,17 +126,6 @@
 						"bounce": "none"
 						"bounce": "none"
 					}
 					}
 				}
 				}
-			}, {
-				"path": "register/bind",
-				"style": {
-					"navigationBarTitleText": "关联学员身份",
-					"navigationBarBackgroundColor": "#0386FD",
-					"navigationStyle": "custom", // 隐藏系统导航栏
-					"app-plus": {
-						"titleNView": false, //禁用原生导航栏 
-						"bounce": "none"
-					}
-				}
 			},
 			},
 			{
 			{
 				"path": "wd/class", //暂时不用
 				"path": "wd/class", //暂时不用

+ 0 - 196
pages2/register/bind.vue

@@ -1,196 +0,0 @@
-<template>
-	<view style="height: 100%;">
-		<image mode="widthFix" src="/pages2/static/login_bg.jpg" class="full_img"></image>
-		<u-navbar title="关联学员身份" :border-bottom="false" background="{ background: '#ffffff',opacity:0.4; }" title-color="#ffffff" back-icon-color="#ffffff"></u-navbar>
-		<view style="padding: 30rpx;">
-			<view class="login_box">
-				<u-form :model="form" ref="uForm" >
-					<u-form-item ><u-input  v-model="form.realname" placeholder="学员姓名"/></u-form-item>
-					<u-form-item ><u-input v-model="form.idCard" maxlength="18" type="idcard"  placeholder="学员身份证号"/></u-form-item>
-				</u-form>
-			</view>	
-			<button :disabled="isUse" class="loginBtn" @click="jumpBind">
-				确定
-			</button>
-		</view>
-	</view>
-</template>
-
-<script>
-export default {
-	data() {
-		return {
-			code: '',
-			form:{
-				realname:'',
-				idCard:''
-			},
-			codeTips: '',
-			read:'',
-			scanCode: '', // 获取扫码的路径最后面的6位标识码
-		};
-	},
-	mounted() {},
-	methods: {
-		jumpBind(){
-			let that = this
-			
-			if(!this.form.realname.trim()){
-				this.$u.toast('请输入学员姓名');
-				return 
-			}
-			if(!this.form.idCard.trim()){
-				this.$u.toast('请输入身份证卡号');
-				return 
-			}
-			
-			let IDRe18 = /^([1-6][1-9]|50)\d{4}(18|19|20)\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$/
-			let IDre15 =  /^([1-6][1-9]|50)\d{4}\d{2}((0[1-9])|10|11|12)(([0-2][1-9])|10|20|30|31)\d{3}$/
-			
-			if( !IDRe18.test( this.form.idCard ) && !IDre15.test( this.form.idCard )  ) {
-				this.$u.toast('请输入格式正确的身份证卡号');
-				console.log(' 验证未通过 ')
-				return 
-			}
-			
-			
-			this.$set(this.form,'realname',this.form.realname.trim()) //去除姓名两头空格
-			
-			that.isUse = true
-			// 绑定身份证号信息 /app/user/bind_idcard
-			that.$api.bindId(this.form).then(
-				res => {
-					that.isUse = false
-					if (res.data.code == 200) {
-						uni.setStorageSync('user_account',uni.getStorageSync('user_account_temp'));
-						uni.setStorageSync('token',uni.getStorageSync('token_temp'));
-						uni.removeStorageSync('user_account_temp') //移除临时账号
-						uni.removeStorageSync('token_temp') //移除临时token
-						if (this.scanCode) { // pc扫码注册成功后提交/跳转
-							this.$api.scanLoginCheck({
-								scanCode: this.scanCode
-							}).then((res) => {
-								if (res.data.code == 200) {
-									uni.navigateTo({
-										url: '/pages4/login/pcLoginSuccess'
-									})
-								} else {
-									this.$u.toast(res.data.msg)
-								}
-							})
-						} else { // 跳转到首页是原来的逻辑
-							uni.reLaunch({
-								url:'/pages/index/index'
-							})
-						}
-						
-						this.$method.setUuid(new Date().valueOf() + "")
-						that.$api.getInfo({ fromPlat: 1 }).then(resdata => {
-							if(resdata.data.code == 200){
-								that.$store.state.userInfo = resdata.data.data;
-							}
-							
-						});
-					} else {
-						that.$u.toast(res.data.msg);
-					}
-				},
-				err => {
-					that.isUse = false
-				}
-			);
-			
-		},
-	},
-	onLoad(option) {
-		console.log('注册:', option.scanCode)
-		let that = this;
-		option.scanCode && (this.scanCode = option.scanCode)
-		uni.removeStorageSync('user_account') //移除临时账号
-		uni.removeStorageSync('token')
-		uni.login({
-			provider: 'weixin',
-			success: function(loginRes) {
-				that.code = loginRes.code;
-			}
-		});
-	}
-};
-</script>
-
-<style scoped>
-	.wxBtn{
-		position: fixed;
-		bottom: 10%;
-		width: 100%;
-		left: 0;
-	}
-	/deep/ .wxBtn button::after{
-	    border: none; 
-	}
-	.loginBtn{
-		width: 526rpx;
-		height: 80rpx;
-		background: linear-gradient(90deg, #015EEA, #00C0FA);
-		box-shadow: 0rpx 10rpx 16rpx 4rpx rgba(1, 99, 235, 0.04);
-		opacity: 0.6;
-		border-radius: 40rpx;
-		color: #FFFFFF;
-		text-align: center;
-		line-height: 80rpx;
-		margin: 40rpx auto;
-	}
-	
-	
-	.wxloginBtn{
-		background: url("/static/loginBtn.png") no-repeat;
-		background-size:100% 100%;
-		border:none;
-		width: 100rpx;
-		height: 100rpx;
-	}
-	
-	/deep/page {
-		background-color: #FFFFFF;
-		height: 100%;
-		width: 100%;
-	}
-	.login_box{
-		width: 100%;
-		height: 360rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx 0rpx 16rpx 4rpx rgba(1, 99, 235, 0.1);
-		border-radius: 24rpx;
-		margin-top: 30rpx;
-		padding:40rpx 35rpx;
-	}
-	/deep/ .u-item-bg{
-		border-radius: 32px !important;
-	}
-	/deep/ .u-subsection{
-		border-radius: 32px !important;
-	}
-.full_img {
-	position: absolute;
-	left: 0;
-	display: block;
-	width: 100%;
-	z-index: -999;
-	top: 0;
-}
-
-.head {
-	height: 96rpx;
-	width: 100%;
-	line-height: 96rpx;
-	margin-top: 40rpx;
-	text-align: center;
-	display: flex;
-	position: relative;
-	justify-content: center;
-}
-.icon {
-	position: absolute;
-	left: 30rpx;
-}
-</style>