Merge branch '西昌分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 西昌分支

Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/mixins.js

@@ -673,7 +673,13 @@ export default {
 
 				return null
 			}
-
+			if(result.data.code!=200){
+				uni.showToast({
+					title: result.data.info,
+					icon: 'none'
+				})
+				return null
+			}
 			return result.data.data
 		},
 

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages.json

@@ -26,6 +26,7 @@
 
     // 登录/注册页
     { "path": "pages/login", "style": { "navigationStyle": "custom", "disableScroll": true } },
+	{ "path": "pages/weixinLogin", "style": { "navigationStyle": "custom", "disableScroll": true } },
     { "path": "pages/signup", "style": { "navigationBarTitleText": "注册账号", "disableScroll": true } },
 
     // 消息（tabBar #2）
@@ -52,6 +53,7 @@
     { "path": "pages/my/contact", "style": { "navigationBarTitleText": "我的联系方式" } },
     { "path": "pages/my/qrcode", "style": { "navigationBarTitleText": "我的二维码" } },
     { "path": "pages/my/password", "style": { "navigationBarTitleText": "更改密码" } },
+	{ "path": "pages/my/newpassword", "style": { "navigationBarTitleText": "设置密码" } },
     {
       "path": "pages/my/learun",
       "style": {

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/login.vue

@@ -32,6 +32,10 @@
         <l-icon slot="title" type="lock" />
       </l-input>
       <l-button @click="login(null)" size="lg" color="blue" class="margin-top-sm block" block>登 录</l-button>
+	  <view class="otherLogin">
+		<navigator url="/pages/weixinLogin" class="textBtn">新生首次登录</text></navigator>
+	  </view>
+	  
       <!-- <l-button v-if="enableSignUp" @click="signUp" size="lg" line="blue" class="margin-top-sm block" block>
         教师注册
       </l-button> -->
@@ -266,6 +270,15 @@ page {
       margin-top: 20rpx;
     }
   }
+  
+  .otherLogin{
+	  display: flex;
+	  justify-content: right;
+	  .textBtn{
+		  width: 100px;
+		  color: #606266;
+	  }
+  }
 
   .more {
     margin-top: 30rpx;

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/newpassword.vue

@@ -0,0 +1,74 @@
+<template>
+  <view class="page">
+    <l-title>设置密码</l-title>
+    <!-- <l-input v-model="oldPwd" title="旧密码" placeholder="请输入旧密码" password></l-input> -->
+    <l-input v-model="newPwd" title="新的密码" placeholder="请输入新密码" password></l-input>
+    <l-input v-model="confirmPwd" title="确认输入" placeholder="请再次输入新密码" password></l-input>
+	<view class="passwordDes">
+		<text>新密码必须8-20位同时包含1.[大小写字母]、2.[数字]、3.[特殊符号!@#$%^&*]</text>
+	</view>
+    <view class="padding">
+      <l-button @click="submit" size="lg" color="blue" class="block" block>确认修改</l-button>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      oldPwd: '',
+      newPwd: '',
+      confirmPwd: ''
+    }
+  },
+
+  methods: {
+    // 提交修改
+    async submit() {
+      const { auth, oldPwd, newPwd, confirmPwd } = this
+      // if (oldPwd.length < 6) {
+      //   this.CONFIRM('操作失败', '旧密码输入不正确，请重新确认')
+      //   return
+      // }
+      // if (newPwd.length < 6 || newPwd.length > 16) {
+      //   this.CONFIRM('操作失败', '新密码不符合要求，请修改后重试')
+      //   return
+      // }
+	  var reg = /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/;
+	  if( !reg.test(newPwd) ){
+	  	this.CONFIRM('操作失败', '新密码不符合要求，请修改后重试')
+	  	return 
+	  }
+      if (newPwd !== confirmPwd) {
+        this.CONFIRM('操作失败', '新密码和确认密码输入不一致，请修改')
+        return
+      }
+
+      const success = await this.HTTP_POST(
+        '/user/modifypw',
+        {
+          newpassword: this.MD5(newPwd),
+          // oldpassword: this.MD5(oldPwd)
+        },
+        '未能成功修改密码'
+      )
+	  console.log(success)
+      if (!success) {
+        return
+      }
+
+      this.NAV_BACK()
+      this.TOAST('密码修改成功')
+    }
+  }
+}
+</script>
+<style lang="scss">
+.passwordDes{
+	color: #606266;
+	font-size: 14px;
+	padding: 8px;
+	text-indent:2em;
+}
+</style>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/my/password.vue

@@ -4,7 +4,9 @@
     <l-input v-model="oldPwd" title="旧密码" placeholder="请输入旧密码" password></l-input>
     <l-input v-model="newPwd" title="新的密码" placeholder="请输入新密码" password></l-input>
     <l-input v-model="confirmPwd" title="确认输入" placeholder="请再次输入新密码" password></l-input>
-
+	<view class="passwordDes">
+		<text>新密码必须8-20位同时包含1.[大小写字母]、2.[数字]、3.[特殊符号!@#$%^&*]</text>
+	</view>
     <view class="padding">
       <l-button @click="submit" size="lg" color="blue" class="block" block>确认修改</l-button>
     </view>
@@ -29,10 +31,15 @@ export default {
         this.CONFIRM('操作失败', '旧密码输入不正确，请重新确认')
         return
       }
-      if (newPwd.length < 6 || newPwd.length > 16) {
-        this.CONFIRM('操作失败', '新密码不符合要求，请修改后重试')
-        return
-      }
+      // if (newPwd.length < 6 || newPwd.length > 16) {
+      //   this.CONFIRM('操作失败', '新密码不符合要求，请修改后重试')
+      //   return
+      // }
+	  var reg = /^(?=.*[0-9])(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*,\.])[0-9a-zA-Z!@#$%^&*,\.]{8,20}$/;
+	  if( !reg.test(newPwd) ){
+	  	this.CONFIRM('操作失败', '新密码不符合要求，请修改后重试')
+	  	return 
+	  }
       if (newPwd !== confirmPwd) {
         this.CONFIRM('操作失败', '新密码和确认密码输入不一致，请修改')
         return
@@ -41,12 +48,12 @@ export default {
       const success = await this.HTTP_POST(
         '/user/modifypw',
         {
-          newpassword: this.md5(newPwd),
-          oldpassword: this.md5(oldPwd)
+          newpassword: this.MD5(newPwd),
+          oldpassword: this.MD5(oldPwd)
         },
         '未能成功修改密码'
       )
-
+	  console.log(success)
       if (!success) {
         return
       }
@@ -57,3 +64,11 @@ export default {
   }
 }
 </script>
+<style lang="scss">
+.passwordDes{
+	color: #606266;
+	font-size: 14px;
+	padding: 8px;
+	text-indent:2em;
+}
+</style>

Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/weixinLogin.vue

@@ -0,0 +1,305 @@
+<template>
+  <view class="page">
+    <view class="content">
+      <view class="head-banner">
+        <!-- 标题文字 -->
+        <view class="main-title">
+          绑定微信
+          <!-- <text v-if="DEV" class="margin-left-sm text-red">(开发模式)</text> -->
+          <!-- <text class="text-gray margin-left-sm" style="font-size: 0.7em;">{{ APP_VERSION }}</text> -->
+        </view>
+
+        <!-- 首页 Logo -->
+        <view mode="aspectFit" class="logo">
+			<image src="~@/static/wx.png" mode="widthFix" class="logoImg"></image>
+		</view>
+
+        <!-- 【仅生产环境】使用账号的原因，无此项则微信审核通不过 -->
+        <!-- <view v-if="!DEV" class="intro">
+          <view class="intro">注册登录智慧校园账号后，您将可以体验力软框架产品中的所有功能与业务</view>
+          <view class="intro">OA · 进销存 · 工作流审批 · 数据可视化</view>
+          <view class="intro text-gray" style="font-size: 0.9em;">
+            如果您之前已在智慧校园 PC 端中注册过体验账号，可以直接使用原账号登录，无需另行注册
+          </view>
+        </view> -->
+      </view>
+
+      <!-- 账户密码表单 -->
+      <l-input v-if="ready" v-model="username" placeholder="手机号 / 账号" left>
+        <l-icon slot="title" type="people" />
+      </l-input>
+      <l-input v-if="ready" v-model="password" placeholder="请输入身份证后八位" password left>
+        <l-icon slot="title" type="lock" />
+      </l-input>
+      <l-button @click="login(null)" size="lg" color="blue" class="margin-top-sm block" block>确 认</l-button>
+	  <view class="otherLogin">
+	  	<navigator url="/pages/login" class="textBtn">常规登陆</text></navigator>
+	  </view>
+      <!-- <l-button v-if="enableSignUp" @click="signUp" size="lg" line="blue" class="margin-top-sm block" block>
+        教师注册
+      </l-button> -->
+
+      <!-- 【仅小程序】一键登录按钮 -->
+      <!-- #ifdef MP -->
+      <l-button v-if="MPLogin" @click="login(PLATFORM)" size="lg" line="green" class="margin-top-sm block" block>
+        {{ PLATFORM_TEXT }}一键登录
+      </l-button>
+      <!-- #endif -->
+
+      <!-- 【仅开发模式】显示，后台地址切换 -->
+      <!-- <view v-if="DEV" class="more">
+        <view @click="showApiRootSelector = true" class="morebtn">后台地址(点击切换):</view>
+        <view class="morebtn">{{ currentApiRoot }}</view>
+      </view> -->
+
+      <!-- 【仅开发模式】选择 API 地址的弹层 -->
+      <l-modal
+        v-if="DEV && ready"
+        v-model="showApiRootSelector"
+        @radioIndex="changeApiRoot"
+        :radio="currentApiRoot"
+        :range="apiRootList"
+        type="radio"
+      />
+    </view>
+    <!-- 页面底部版权文字 -->
+    <view class="footer">{{ copyRightDisplay }}</view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      username: '',
+      password: '',
+
+      ready: false,
+      showApiRootSelector: false,
+
+      currentApiRoot: '',
+      apiRootList: [],
+      devAccountList: []
+    }
+  },
+
+  async onLoad() {
+    await this.init()
+  },
+
+  methods: {
+    // 页面初始化
+    async init() {
+      const index = this.DEV ? this.CONFIG('devApiHostIndex') : this.CONFIG('prodApiHostIndex')
+      this.apiRootList = this.CONFIG('apiHost')
+      this.currentApiRoot = this.apiRootList[index]
+
+      // 如果是开发模式，填入测试账号密码
+      if (this.DEV) {
+        this.devAccountList = this.CONFIG('devAccount')
+        const account = this.devAccountList[index] || { username: '', password: '' }
+        this.username = account.username
+        this.password = account.password
+      }
+      this.ready = true
+    },
+
+    // 点击新用户注册
+    signUp() {
+      this.NAV_TO('/pages/signup')
+    },
+
+    // 切换后台地址
+    changeApiRoot(newIndex) {
+      const newApiRoot = this.apiRootList[newIndex]
+      this.currentApiRoot = newApiRoot
+      this.SET_GLOBAL('apiRoot', newApiRoot)
+
+      // 如果是开发模式，填入测试账号密码
+      if (this.DEV && this.devAccountList && this.devAccountList[newIndex]) {
+        const account = this.devAccountList[newIndex] || { username: '', password: '' }
+        this.username = account.username
+        this.password = account.password
+      }
+    },
+
+    // 发起登录
+    // type=null 时表示使用账号密码登录
+    // type='weixin'/'alipay'/'dingtalk' 时表示使用小程序一键登录
+    async login(type) {
+      const { username, password, check } = this
+
+      // 账号密码登录时，验证输入，输入有误则返回
+      if (!type && !check()) {
+        return
+      }
+      this.LOADING('登录中…')
+
+      // 根据不同的登录方式，调用 API
+      let loginResult = null
+
+      // 不是小程序，则提交用户名、密码登录
+      // 是小程序，则申请授权码登录
+      if (!type) {
+        let postResult = await this.POST('/user/login', { username, password: this.MD5(password) })
+        if(postResult[1].data.code=='200'){
+          loginResult=postResult[1].data.data;
+        }else{
+          this.TOAST(postResult[1].data.info);
+        }
+      } else {
+        const [codeErr, { code } = {}] = await uni.login({ provider: type })
+        if (codeErr || !code) {
+          this.HIDE_LOADING()
+          this.CONFIRM('登录失败', '无法获取小程序登录授权码')
+          return
+        }
+
+        loginResult = await this.HTTP_POST('/user/openid_login', { code, type }, '登录时发生错误')
+      }
+
+      if (!loginResult) {
+        return
+      }
+
+      // loginUser 中合并 role、post 两个字段
+      const { baseinfo, mpinfo, post, role } = loginResult
+      const user = { ...baseinfo, post, role }
+      const token = baseinfo.token
+
+      // 返回的用户信息中，有 mpinfo 字段表示是否是小程序
+      if (mpinfo && Array.isArray(mpinfo) && mpinfo.includes(type)) {
+        user.miniProgram = true
+      }
+
+      this.SET_GLOBAL('token', token)
+      this.SET_GLOBAL('loginUser', user)
+
+      this.SET_STORAGE('token', token)
+
+      this.HIDE_LOADING()
+      // this.TAB_TO('/pages/home')
+	  this.NAV_TO('/pages/my/newpassword')
+    },
+
+    // 验证用户输入
+    check() {
+      const { username, password } = this
+      if (username.length <= 0 || password.length <= 0) {
+        this.CONFIRM('输入错误', '账号或密码不能为空，请重新输入')
+        return false
+      }
+      return true
+    }
+  },
+
+  computed: {
+    // 页面底部公司名、版权信息
+    copyRightDisplay() {
+      const year = new Date().getFullYear()
+      const company = this.CONFIG('company')
+
+      return `Copyright © ${year} ${company}`
+    },
+
+    // 是否显示小程序登录按键
+    MPLogin() {
+      return this.CONFIG(`miniProgramAccount.${this.PLATFORM}`).includes('login')
+    },
+
+    // 是否展示注册按钮
+    enableSignUp() {
+      return this.CONFIG('enableSignUp')
+    }
+  }
+}
+</script>
+
+<style lang="less">
+page {
+  height: 100%;
+}
+
+/* #ifdef MP-ALIPAY */
+.page {
+  height: 100%;
+  position: absolute;
+}
+/* #endif */
+</style>
+
+<style lang="less" scoped>
+.page {
+  height: 100%;
+  width: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+
+  .content {
+    text-align: center;
+    width: 100%;
+    padding: 0 38rpx;
+  }
+
+  .head-banner {
+    margin-bottom: 40rpx;
+
+    .logo {
+      // background-image: url('~@/static/logo.png');
+      background-size: contain;
+      height: 120rpx;
+      width: 120rpx;
+      text-align: center;
+      display: inline-block;
+      border-radius: 5px;
+    }
+	.logoImg {
+		width: 100%;
+	}
+    .main-title {
+      display: block;
+      margin: 20rpx 0;
+      color: #555;
+      font-size: 1.4em;
+      margin-bottom: 30rpx;
+    }
+
+    .intro {
+      margin-top: 20rpx;
+    }
+  }
+  
+  .otherLogin{
+  	  display: flex;
+  	  justify-content: right;
+  	  .textBtn{
+  		  width: 100px;
+  		  color: #606266;
+  	  }
+  }
+
+  .more {
+    margin-top: 30rpx;
+
+    .morebtn {
+      color: #555;
+    }
+  }
+
+  .footer {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 10px;
+    bottom: calc(10px + env(safe-area-inset-bottom));
+    text-align: center;
+    font-size: 14px;
+    color: #555;
+
+    /* #ifdef MP-ALIPAY */
+    bottom: 10px;
+    /* #endif */
+  }
+}
+</style>