shish 3 жил өмнө
parent
commit
58856b8dea

+ 5 - 8
ghsPad/src/mixins/autoUpdate.js

@@ -34,11 +34,11 @@ export default {
                     if(version <= that.version){
                         return false
                     }
+                    let updateText = res.data.updateText ? res.data.updateText : '现在更新?'
                     if(plus.networkinfo.getCurrentType()!=3){
-
                         uni.showModal({
-                            title: '提示',
-                            content: '有新的版本可以更新',
+                            title: '有新版本可更新',
+                            content: updateText,
                             cancelText: "稍后",
                             confirmText: "使用流量更新",
                             success: (res) => {
@@ -47,12 +47,10 @@ export default {
                                 }
                             } 
                         })
-
                     }else{
-
                         uni.showModal({
-                            title: '提示',
-                            content: '有新的版本可以更新',
+                            title: '有新版本可更新',
+                            content: updateText,
                             cancelText: "稍后",
                             confirmText: "确认",
                             success: (res) => {
@@ -61,7 +59,6 @@ export default {
                                 }
                             } 
                         })
-
                     }
                 }
             })            

+ 3 - 2
hdApp/src/mixins/autoUpdate.js

@@ -28,6 +28,7 @@ export default {
                 if(res.code == 1){
                     let version = res.data.version
                     let mustUpdate = res.data.mustUpdate
+                    let updateText = res.data.updateText ? res.data.updateText : '现在更新?'
                     let singer = mustUpdate == 1 ? true : false
                     if(version <= this.version){
                         return false
@@ -35,12 +36,12 @@ export default {
 
                     if(plus.networkinfo.getCurrentType()!=3){
                         let that = this
-                        that.$util.confirmModal({content:'新版本更新',cancelText:'稍后',okText:'用流量更新'},() => {
+                        that.$util.confirmModal({content:updateText,cancelText:'稍后',title:'有新版本可更新',okText:'用流量更新'},() => {
                           this.install(version)
                         })
                     }else{
                         let that = this
-                        that.$util.confirmModal({content:'新版本更新',singer:singer},() => {
+                        that.$util.confirmModal({content:updateText,singer:singer,title:'有新版本可更新'},() => {
                           this.install(version)
                         })
                     }

+ 5 - 4
hdPad/src/mixins/autoUpdate.js

@@ -34,11 +34,12 @@ export default {
                     if(version <= that.version){
                         return false
                     }
+                    let updateText = res.data.updateText ? res.data.updateText : '现在更新?'
                     if(plus.networkinfo.getCurrentType()!=3){
 
                         uni.showModal({
-                            title: '提示',
-                            content: '有新的版本可以更新',
+                            title: '有新版本可更新',
+                            content: updateText,
                             cancelText: "稍后",
                             confirmText: "使用流量更新",
                             success: (res) => {
@@ -51,8 +52,8 @@ export default {
                     }else{
 
                         uni.showModal({
-                            title: '提示',
-                            content: '有新的版本可以更新',
+                            title: '有新版本可更新',
+                            content: updateText,
                             cancelText: "稍后",
                             confirmText: "确认",
                             success: (res) => {