diff --git a/package.json b/package.json
index 38bd551..e794994 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
"less": "^4.2.0",
"vue": "^3.2.45",
"vue-i18n": "^9.1.9",
+ "vue-touch-keyboard": "^0.3.2",
"vuex": "^4.1.0"
},
"devDependencies": {
diff --git a/src/App.vue b/src/App.vue
index 9128a34..e204d47 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,7 +18,7 @@
// plus.screen.lockOrientation('landscape-primary');
// // app 强制竖屏
// plus.screen.lockOrientation('portrait-primary');
- appUpdate();
+ appUpdate(false);
// #endif
},
diff --git a/src/api/request2.js b/src/api/request2.js
index 44c4338..8c19194 100644
--- a/src/api/request2.js
+++ b/src/api/request2.js
@@ -191,7 +191,7 @@ export function getMainMessage() {
*/
export function appCheckUpdate() {
return uni.request({
- url: "http://192.168.0.119:9527/appUpdate.json",
+ url: "http://192.168.0.105:9527/appUpdate.json",
method: "GET",
data: {}
})
diff --git a/src/common/appUpdate.js b/src/common/appUpdate.js
index 03af4c3..4a420d6 100644
--- a/src/common/appUpdate.js
+++ b/src/common/appUpdate.js
@@ -1,7 +1,7 @@
import {
appCheckUpdate
} from '../api/request2.js';
-export function appUpdate() {
+export function appUpdate(isShowHint) {
let curversion = 0;
plus.runtime.getProperty(plus.runtime.appid, function(widgetInfo) {
const data = {
@@ -35,9 +35,11 @@ export function appUpdate() {
}
})
} else {
- uni.showToast({
- title:"当前是最新版本"
- })
+ if(isShowHint){
+ uni.showToast({
+ title:"当前是最新版本"
+ })
+ }
console.log("没有新版本")
}
}
diff --git a/src/common/basic.js b/src/common/basic.js
index d770a26..432e301 100644
--- a/src/common/basic.js
+++ b/src/common/basic.js
@@ -902,7 +902,7 @@ export function setRootFontSize(fontSize) {
export function scanErrorAudio() {
var music = null;
music = uni.createInnerAudioContext(); //创建播放器对象
- music.src = "../../static/video/error.wav";
+ // music.src = "../../static/video/error.wav";
music.volume = 1;
music.play(); //执行播放
music.onEnded(() => {
@@ -915,7 +915,7 @@ export function scanErrorAudio() {
export function newMessageAudio() {
var music = null;
music = uni.createInnerAudioContext(); //创建播放器对象
- music.src = "../../static/video/error.wav";
+ // music.src = "../../static/video/error.wav";
music.volume = 1;
music.play(); //执行播放
music.onEnded(() => {
diff --git a/src/common/utils.js b/src/common/utils.js
index 8e74f52..f30fa7d 100644
--- a/src/common/utils.js
+++ b/src/common/utils.js
@@ -1,13 +1,11 @@
//提示是否消息
-export function showConfirmMsg(title, content, callback) {
+export function showConfirmMsg(title, content,showCancel, callback) {
uni.showModal({
title: title,
cancelText: '否',
confirmText: '是',
+ showCancel:showCancel,
content: content,
- customStyle: {
- content: 'color: red;' // 这里设置对话框内容的颜色为红色
- },
success: function(res) {
if (res.confirm) {
callback(true);
diff --git a/src/manifest.json b/src/manifest.json
index be23fe5..6e4361c 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -56,6 +56,14 @@
/* SDK配置 */
"sdkConfigs" : {
"ad" : {}
+ },
+ "icons" : {
+ "android" : {
+ "hdpi" : "src/static/app/72.png",
+ "xhdpi" : "src/static/app/96.png",
+ "xxhdpi" : "src/static/app/144.png",
+ "xxxhdpi" : "src/static/app/192.png"
+ }
}
}
},
diff --git a/src/mycomponents/form/customerFrom.vue b/src/mycomponents/form/customerFrom.vue
index e7ab561..45e11ab 100644
--- a/src/mycomponents/form/customerFrom.vue
+++ b/src/mycomponents/form/customerFrom.vue
@@ -117,7 +117,7 @@
-
+
{{radio.name}}
@@ -266,16 +266,20 @@
console.log("radioGroupChange", item)
},
inputMain(item) {
- if (item.putMachine[0].SelectName.length > 0) {
- item.SelectName = ""
- }
+ // if (item.putMachine[0].SelectName.length > 0) {
+ // item.SelectName = ""
+ // }
+ item.SelectName = ""
+ item.SelectValue=""
this.reload3()
},
inputMinor(item) {
- if (item.putMachine[1].SelectName.length > 0) {
- item.SelectName = ""
- }
+ // if (item.putMachine[1].SelectName.length > 0) {
+ // item.SelectName = ""
+ // }
+ item.SelectName = ""
+ item.SelectValue=""
this.reload3()
},
@@ -285,6 +289,13 @@
// }
this.reload2()
},
+
+ radioChangeType3(item,radio){
+ if(radio.value==4){
+ item.putMachine[0].SelectName=""
+ item.putMachine[1].SelectName=""
+ }
+ },
submit(callBack) {
@@ -380,7 +391,7 @@
}
if(hintResult.length>0){
- showConfirmMsg("是否提交?",hintResult,callback=>{
+ showConfirmMsg("是否提交?",hintResult,true,callback=>{
if(callback){
this.formData.forEach(res => {
if(res.SelectName){
@@ -434,9 +445,6 @@
},
-
-
-
isWithinInterval(num, lower, upper) {
var num = Number(num);
var lower = Number(lower);
@@ -454,12 +462,8 @@
return true;
},
showHint(title, hint) {
- // uni.showModal({
- // title: title,
- // Content: hint
- // })
// this.$refs.comMessage.showMessage("提示", hint)
- showConfirmMsg("提示",hint,callback=>{
+ showConfirmMsg("提示",hint,false,callback=>{
})
@@ -497,9 +501,11 @@
reload() {
this.isRefresh = false
+ this.isRefreshType2 = false
this.isRefreshType3 = false
this.$nextTick(() => {
this.isRefresh = true
+ this.isRefreshType2 = true
this.isRefreshType3 = true
})
this.$forceUpdate()
diff --git a/src/mycomponents/popup/selectClickList.vue b/src/mycomponents/popup/selectClickList.vue
new file mode 100644
index 0000000..fcdd33e
--- /dev/null
+++ b/src/mycomponents/popup/selectClickList.vue
@@ -0,0 +1,69 @@
+
+
+
+
+
+ {{title}}
+
+
+
+
+
+
+
+ {{index+1}}. {{item.label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/pages/common/foucs.js b/src/pages/common/foucs.js
new file mode 100644
index 0000000..1c3240b
--- /dev/null
+++ b/src/pages/common/foucs.js
@@ -0,0 +1,45 @@
+//focus.js
+
+/**
+ * @description 用于各个功能中,光标聚焦到指定input上
+ * 用法如下:
+ *
+ * 调用 $toFoucs(1) 光标即可聚焦到该input上
+ * @author bing
+ * @date 2023-08-04 15:58
+ */
+export default {
+ data() {
+ return {
+ foucsIndex: 0,
+ }
+ },
+ methods: {
+ /**
+ * @description 定位光标到指定input框
+ * @author bing
+ * @date 2023-08-04 17:16
+ * @param {Number} to 要定位到的input,
+ * @param {Function} callback 定位之后的回调
+ * @param {boolean} hideKeyboard 是否关闭软键盘,默认关闭
+ */
+ $toFoucs(to, hideKeyboard = true, callback, ) {
+ this.foucsIndex = 9999;
+ this.$nextTick(() => {
+ this.foucsIndex = to;
+ hideKeyboard ? this.$hideKeyboard() : ""
+ callback ? callback() : ''
+ })
+ },
+ // 关闭软键盘,防冻
+ $hideKeyboard() {
+ var interval = setInterval(function() {
+ uni.hideKeyboard(); //隐藏软键盘
+ }, 10);
+ setTimeout(() => {
+ clearInterval(interval);
+ }, 1000);
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/src/pages/common/plan.vue b/src/pages/common/plan.vue
index 6011dff..380b028 100644
--- a/src/pages/common/plan.vue
+++ b/src/pages/common/plan.vue
@@ -1,29 +1,39 @@
-
-
-
+
+
+
+
+
+
+
+
diff --git a/src/pages/foam/check.vue b/src/pages/foam/check.vue
index fe33e68..32ab365 100644
--- a/src/pages/foam/check.vue
+++ b/src/pages/foam/check.vue
@@ -233,9 +233,6 @@
mounted() {
this.$refs.inputDevice.focused = true
},
- onReady() {
- // this.openScanPopup();
- },
methods: {
getScanResult(result) {
uni.showLoading({
@@ -325,7 +322,7 @@
this.deviceCheckCode=""
},
showMessage(hint){
- showConfirmMsg("提示", hint,callBack=>{
+ showConfirmMsg("提示", hint,false,callBack=>{
} )
},
diff --git a/src/pages/foam/input.vue b/src/pages/foam/input.vue
index 04fcb5e..88d5ccb 100644
--- a/src/pages/foam/input.vue
+++ b/src/pages/foam/input.vue
@@ -15,7 +15,6 @@
-
@@ -27,10 +26,11 @@
-
-
+
+
-
+
@@ -41,13 +41,14 @@
-
-
+
+
-
+
-
+
@@ -79,12 +80,9 @@
-
-
-
-
-
+
+
@@ -100,11 +98,6 @@
}