diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/scanCodeFun.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/scanCodeFun.js
index e2a9127f1..98895eade 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/scanCodeFun.js
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/common/js/scanCodeFun.js
@@ -1,4 +1,3 @@
-import { conforms } from 'lodash';
import wx from './weixin-js-sdk.js';
export default {
scanCodeFun() {
@@ -24,9 +23,9 @@ export default {
var result = res.resultStr; // 当 needResult 为 1 时,扫码返回的结果
var resultArr = result.split(','); // 扫描结果以逗号分割数组
var codeContent = resultArr[resultArr.length - 1]; // 获取数组最后一个元素,也就是最终的内容
- resolve(result)
+ resolve({result:codeContent})
},
- fail: error => {
+ fail: function (res) {
this.TOAST("调用扫码失败")
resolve(false)
}
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/scanCode.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/scanCode.vue
new file mode 100644
index 000000000..1df50df26
--- /dev/null
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/components/scanCode.vue
@@ -0,0 +1,67 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json
index 2a1860b43..bff0c2bc1 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/manifest.json
@@ -1,6 +1,6 @@
{
"name" : "智慧校园",
- "appid" : "__UNI__3039520",
+ "appid" : "__UNI__0CE0195",
"description" : "智慧校园移动端",
"versionName" : "2.1.0",
"versionCode" : 20100,
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue
index 8270211e9..61d930811 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/PersonnelManagement/MeetingSignInScan/list.vue
@@ -1,50 +1,46 @@
- 扫码
+ 扫码签到
+