diff --git a/components/SearchBox.vue b/components/SearchBox.vue
index 10ffd52..a6b4fab 100644
--- a/components/SearchBox.vue
+++ b/components/SearchBox.vue
@@ -9,7 +9,7 @@
@input="handleChange($event)">
-
+
@@ -93,6 +93,30 @@
return status;
}
// #endif
+ // #ifdef APP-PLUS
+ ,
+ async checkMpaasScan () {
+ var mpaasScanModule = uni.requireNativePlugin("Mpaas-Scan-Module")
+ mpaasScanModule.mpaasScan({
+ // 扫码识别类型,参数可多选,qrCode、barCode,不设置,默认识别所有
+ 'scanType': ['qrCode','barCode'],
+ // 是否隐藏相册,默认false不隐藏
+ 'hideAlbum': false
+ },
+ (ret) => {
+ // uni.showModal({
+ // title: "弹窗标题",
+ // // 返回值中,resp_code 表示返回结果值,10:用户取消,11:其他错误,1000:成功
+ // // 返回值中,resp_message 表示返回结果信息
+ // // 返回值中,resp_result 表示扫码结果,只有成功才会有返回
+ // content: JSON.stringify(ret),
+ // showCancel: false,
+ // confirmText: "确定"
+ // })
+ this.$emit('input', ret.resp_result)
+ })
+ }
+ // #endif
}
}
diff --git a/manifest.json b/manifest.json
index 3ba8a25..b096d0f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -7,6 +7,9 @@
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
+ "compatible" : {
+ "ignoreVersion" : true //true表示忽略版本检查提示框,HBuilderX1.9.0及以上版本支持
+ },
"usingComponents" : true,
"nvueStyleCompiler" : "uni-app",
"compilerVersion" : 3,
@@ -51,8 +54,8 @@
},
"nativePlugins" : {
"Mpaas-Scan" : {
- "AppId" : "ALIPUBE2DD724280911",
- "License" : "tJsii2WmYoPlQ9dy07LPSgrDE8dK7sfZzDVgyiBVAPmsBMakYVRKoQy2rOcearXGgXWS35dtaTgxgu5zsM",
+ "AppId" : "ALIPUBE2DD724310903",
+ "License" : "V+RO1HW4tXAYwRLZ3l7IAwmEo2OX86e61Q2LudjZlV8SRgwQyKuq24NKvxrVJESMuw5znmFCO6+rdOdFCkqkt1EPkCmNYyGl+wD+fc6G0QXt/WVquJIUmyaQ39V6cguYSEdR3fuPpna80zI0x3Y8KZ4kcjPAdBr3M/FvT/J9EXLtxFyNOAdwpfjrWDa4w6wsLpQWabj9KDlRX5Ytt29mvkmLozNl2EN260CRWSX3vkG3/yoLgezjDEq+aiUfH21nHkvvBbjiQDBpn9EDZOV6aqxHgOS/uad1Ji23zPdYzWbbWZjs81LxUUajXaPMX5a3ogqThYgr3CDjImm1gI5X9w==",
"WorkspaceId" : "default",
"__plugin_info__" : {
"name" : "支付宝原生扫码插件",
diff --git a/pages.json b/pages.json
index 500800a..3c200a8 100644
--- a/pages.json
+++ b/pages.json
@@ -1,13 +1,13 @@
{
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
- "path": "pages/login/login",
+ "path": "pages/home/home",
"style": {
"navigationStyle": "custom"
}
},
{
- "path": "pages/home/home",
+ "path": "pages/login/login",
"style": {
"navigationStyle": "custom"
}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 491f6b1..4da3bbe 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -21,10 +21,11 @@
-
+
+
+
+ 升级版本
+
@@ -43,14 +44,20 @@
+ v{{version}}
+
@@ -275,4 +239,9 @@
_font(16px,24px,#D7592F,,center)
.drift
transition left .3s linear
+.version-name
+ width 100%
+ position: absolute
+ bottom: 15px
+ _font(15px, 30px, #999,,center)
diff --git a/pages/login/upgrade.vue b/pages/login/upgrade.vue
new file mode 100644
index 0000000..d15ecf6
--- /dev/null
+++ b/pages/login/upgrade.vue
@@ -0,0 +1,229 @@
+
+
+
+
+ 发现新版本
+
+
+
+
+
+
+ 海亮缓存线又有新版本了,升级到最新版本,享受更丰富、稳定、快速的功能和体验!
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/images/app_update_close.png b/static/images/app_update_close.png
new file mode 100644
index 0000000..8b2ffe6
Binary files /dev/null and b/static/images/app_update_close.png differ
diff --git a/static/images/bg_top.png b/static/images/bg_top.png
new file mode 100644
index 0000000..015f698
Binary files /dev/null and b/static/images/bg_top.png differ
diff --git a/utils/getData2.js b/utils/getData2.js
index 9e45905..c10777b 100644
--- a/utils/getData2.js
+++ b/utils/getData2.js
@@ -9,6 +9,11 @@ export const handLogin = (user, password) => request({
}
})
+// 版本更新测试
+export const pdaUpdate = () => request({
+ url:'api/pda/update'
+})
+
/** 扫码异常 */
// 1.1缓存线下拉框
export const getCacheLine = (area) => request({