diff --git a/main.js b/main.js index b107dba..5fe2818 100644 --- a/main.js +++ b/main.js @@ -28,16 +28,17 @@ Vue.use(VueI18n) // 构造i18n对象 const i18n = new VueI18n({ // 默认语言,这里的local属性,对应message中的cn、en属性 - locale: 'zh', + locale: 'zh-Hans', // 引入语言文件 messages: { // 这里的属性名是任意的,您也可以把zh设置为cn等,只是后续切换语言时 // 要标识这里的语言属性,如:this.$i18n.locale = zh|en|cn|xxx - 'zh': Chinese, + 'zh-Hans': Chinese, 'en': English, 'ru': Eyu, } }) +uni.setStorageSync('i18locale', 'zh-Hans'); App.mpType = 'app' Vue.prototype._i18n = i18n const app = new Vue({ diff --git a/manifest.json b/manifest.json index 0b84a55..ecf2519 100644 --- a/manifest.json +++ b/manifest.json @@ -1,10 +1,11 @@ { - "name" : "xyh_crm", + "name" : "领客", "appid" : "__UNI__C9A60ED", - "description" : "应用描述", + "description" : "领客", "versionName" : "1.0.0", "versionCode" : "100", "transformPx" : false, + "locale" : "zh-Hans", // 设置默认语言, "app-plus" : { "usingComponents" : true, "nvueCompiler" : "uni-app", @@ -87,7 +88,15 @@ } } }, - "orientation" : [ "portrait-primary" ] + "orientation" : [ "portrait-primary" ], + "icons" : { + "android" : { + "hdpi" : "C:/Users/30997/Downloads/logo/logo/72.png", + "xhdpi" : "C:/Users/30997/Downloads/logo/logo/96.png", + "xxhdpi" : "C:/Users/30997/Downloads/logo/logo/144.png", + "xxxhdpi" : "C:/Users/30997/Downloads/logo/logo/192.png" + } + } }, "uniStatistics" : { "enable" : true diff --git a/package-lock.json b/package-lock.json index faf6c65..713ef37 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,6 +9,7 @@ "version": "3.4.7", "license": "MIT", "dependencies": { + "@googlemaps/js-api-loader": "^1.16.8", "cordova-plugin-googlemaps": "^2.7.1", "vue-i18n": "^9.1.9" } @@ -59,6 +60,11 @@ "node": ">=6.9.0" } }, + "node_modules/@googlemaps/js-api-loader": { + "version": "1.16.8", + "resolved": "https://registry.npmjs.org/@googlemaps/js-api-loader/-/js-api-loader-1.16.8.tgz", + "integrity": "sha512-CROqqwfKotdO6EBjZO/gQGVTbeDps5V7Mt9+8+5Q+jTg5CRMi3Ii/L9PmV3USROrt2uWxtGzJHORmByxyo9pSQ==" + }, "node_modules/@intlify/core-base": { "version": "9.1.9", "resolved": "https://registry.npmjs.org/@intlify/core-base/-/core-base-9.1.9.tgz", diff --git a/package.json b/package.json index 848a0fa..76c2e0d 100644 --- a/package.json +++ b/package.json @@ -118,6 +118,7 @@ }, "main": "main.js", "dependencies": { + "@googlemaps/js-api-loader": "^1.16.8", "cordova-plugin-googlemaps": "^2.7.1", "vue-i18n": "^9.1.9" } diff --git a/pages.json b/pages.json index fafe2c0..606caba 100644 --- a/pages.json +++ b/pages.json @@ -55,9 +55,7 @@ "path" : "pages/login/agreementuser", "style" : { - "navigationBarTitleText" : "用户服务协议", - "enablePullDownRefresh": false, - "navigationStyle":"custom"// 去掉微信小程序顶部导航 + "navigationBarTitleText" : "用户服务协议" } }, { @@ -118,6 +116,15 @@ "enablePullDownRefresh": false, "navigationStyle":"custom"// 去掉微信小程序顶部导航 } + }, + { + "path" : "maph5", + "style" : + { + "navigationBarTitleText" : "地图位置", + "enablePullDownRefresh": false, + "navigationStyle":"custom"// 去掉微信小程序顶部导航 + } } ] },{