diff --git a/assets/image/add_desktop.png b/assets/image/add_desktop.png new file mode 100644 index 0000000..6f0b7c8 Binary files /dev/null and b/assets/image/add_desktop.png differ diff --git a/components/add-tips/index.js b/components/add-tips/index.js index f6c4f23..c044222 100644 --- a/components/add-tips/index.js +++ b/components/add-tips/index.js @@ -13,7 +13,11 @@ Component({ delay: { type: Number, value: 2 - }, + }, + ios: { + type: Boolean, + value: true + }, logo: { type: String, value: '/assets/image/add-tips.png' diff --git a/components/add-tips/index.wxml b/components/add-tips/index.wxml index f78a720..db52ebf 100644 --- a/components/add-tips/index.wxml +++ b/components/add-tips/index.wxml @@ -1,7 +1,7 @@ - - 将“{{name}}”添加到手机桌面,下次访问更便捷 + + 将“{{name}}”添加到{{ios ? '我的小程序' : '手机桌面'}},下次访问更便捷 \ No newline at end of file diff --git a/pages/index/index.js b/pages/index/index.js index 4328906..628f0a8 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -14,6 +14,7 @@ Scene({ data: { safeBottom: app.globalData.safeBottom, fragment: app.globalData.safeFragmentHeight, + ios: app.globalData.isIos, userInfo: null, tabList: [ { index: 0, value: 'process', badge: 0, name: '采购', blue: '/assets/tabbar/process-blue.png', gray: '/assets/tabbar/process-gray.png' }, @@ -86,7 +87,8 @@ Scene({ factoryName: app.userInfo.factoryName, arrow: this.data.arrow, customBar: app.globalData.CustomBar || (app.globalData.isIos ? 64 : 60), - fragment: app.globalData.safeFragmentHeight, + fragment: app.globalData.safeFragmentHeight, + ios: app.globalData.isIos, safeBottom: app.globalData.safeBottom }) event.on('EventMessage', this, this.onEvent) diff --git a/pages/index/index.wxml b/pages/index/index.wxml index dd45a7d..add39c7 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -5,7 +5,7 @@ - +