From 1003c53e8e20e3b9c9160a2b32e3884c881f6c26 Mon Sep 17 00:00:00 2001 From: "Adam.Gong" Date: Wed, 6 May 2020 21:07:19 +0800 Subject: [PATCH] go --- src/components/Card/Card.vue | 53 ++-- src/manifest.json | 77 +++-- src/pages.json | 14 +- src/pages/addArddess/addArddess.vue | 64 ++-- src/pages/index/index.vue | 575 ++++++++++++++++++++---------------- 5 files changed, 435 insertions(+), 348 deletions(-) diff --git a/src/components/Card/Card.vue b/src/components/Card/Card.vue index 1f77e69..39b0b55 100644 --- a/src/components/Card/Card.vue +++ b/src/components/Card/Card.vue @@ -1,16 +1,19 @@ - - + } + } + + + } + diff --git a/src/manifest.json b/src/manifest.json index daa1a2b..97e2aee 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,19 +1,38 @@ { - "name" : "gulu-vue", - "appid" : "", - "description" : "", - "versionName" : "1.0.0", - "versionCode" : "100", - "transformPx" : false, - "app-plus" : { + "name": "gulu-vue", + "appid": "", + "description": "", + "versionName": "1.0.0", + "versionCode": "100", + "transformPx": false, + "h5": { + "devServer": { + "port": 8080, + "disableHostCheck": true, + "proxy": { + "/": { + "pathRewrite": { + "/": "/" + }, + "target": "https://api.glass.xiuyetang.com/", + "changeOrigin": true, + "serure": false + } + } + }, + "router" : { + "mode" : "history" + } + }, + "app-plus": { /* 5+App特有相关 */ - "modules" : {}, + "modules": {}, /* 模块配置 */ - "distribute" : { + "distribute": { /* 应用发布信息 */ - "android" : { + "android": { /* android打包配置 */ - "permissions" : [ + "permissions": [ "", "", "", @@ -38,33 +57,33 @@ "" ] }, - "ios" : {}, + "ios": {}, /* ios打包配置 */ - "sdkConfigs" : {} + "sdkConfigs": {} }, /* SDK配置 */ - "usingComponents" : true + "usingComponents": true }, - "quickapp" : {}, + "quickapp": {}, /* 快应用特有相关 */ - "mp-weixin" : { + "mp-weixin": { /* 小程序特有相关 */ - "usingComponents" : true, - "appid" : "wx115b25aa396d27ac", - "setting" : { - "urlCheck" : true + "usingComponents": true, + "appid": "wx115b25aa396d27ac", + "setting": { + "urlCheck": true } }, - "mp-alipay" : { - "usingComponents" : true + "mp-alipay": { + "usingComponents": true }, - "mp-baidu" : { - "usingComponents" : true + "mp-baidu": { + "usingComponents": true }, - "mp-toutiao" : { - "usingComponents" : true + "mp-toutiao": { + "usingComponents": true }, - "mp-qq" : { - "usingComponents" : true + "mp-qq": { + "usingComponents": true } -} +} \ No newline at end of file diff --git a/src/pages.json b/src/pages.json index 950342a..c931f32 100644 --- a/src/pages.json +++ b/src/pages.json @@ -1,18 +1,20 @@ { "pages": [ { - "path" : "pages/refundProgress/refundProgress", - "style": { - "navigationBarTitleText": "申请退款" - } - }, - { "path": "pages/index/index", "style": { "navigationBarTitleText": "商城一览" // "enablePullDownRefresh":true } }, + + { + "path" : "pages/refundProgress/refundProgress", + "style": { + "navigationBarTitleText": "申请退款" + } + }, + { "path" : "pages/myOrder/myOrder", "style" : { diff --git a/src/pages/addArddess/addArddess.vue b/src/pages/addArddess/addArddess.vue index 1cb04c0..565c241 100644 --- a/src/pages/addArddess/addArddess.vue +++ b/src/pages/addArddess/addArddess.vue @@ -1,5 +1,5 @@ - + - + } + } + } + + + } + diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index a716465..afa4e8b 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -1,265 +1,328 @@ -- 2.0.0