Merge remote-tracking branch 'origin/master'

2 years ago · 718499f1af
2 changed files with 4 additions and 3 deletions
--- a/mallplusui-uniapp-app/manifest.json
+++ b/mallplusui-uniapp-app/manifest.json
@ -2,8 +2,8 @@
    "name" : "汇融云链",
    "appid" : "__UNI__FB2C9C4",
    "description" : "",
-    "versionName" : "1.0.1.4",
-    "versionCode" : 1014,
+    "versionName" : "1.0.1.5",
+    "versionCode" : 1015,
    "transformPx" : false,
    "app-plus" : {
        "usingComponents" : true,
--- a/mallplusui-uniapp-app/pages/index/index.vue
+++ b/mallplusui-uniapp-app/pages/index/index.vue
@ -339,6 +339,7 @@
 			this.loadData();
 			this.sysInfoMethod();
 		},
+		
 		filters: {
 			formatCreateTime(time) {
 				let date = new Date(time);