Merge branch 'master' of http://gitlab.oytour.com/viitto/mallapp

56c6dd5a · Mac · 1cfdacfa · ab173902 · 56c6dd5a · 56c6dd5a
Commit 56c6dd5a authored Aug 24, 2020 by Mac
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 462 additions and 0 deletions

pages.json pages.json +6 -0

index.vue pages/quick_share/index.vue +456 -0

qrDialog.png static/images/qrDialog.png +0 -0

No files found.
--- a/pages.json
+++ b/pages.json
@@ -291,6 +291,12 @@
 			    
 			]
 			
+		},
+		{
+			"root":"pages/quick_share",
+			"pages":[{
+				"path": "index"
+			 }]
 		}
    ],
    "globalStyle": {

--- a/pages/quick_share/index.vue
+++ b/pages/quick_share/index.vue
--- a/static/images/qrDialog.png
+++ b/static/images/qrDialog.png