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 @@
-
-
-
+
+
+
{{goods.name}}
- {{goods.price}}
- {{goods.originCost}}
+ {{goods.rsSon.Min_Price}}
+
+ {{Math.round(goods.rsSon.Min_Price / goods.rsSon.discount * 100)}}
+
+
- {{goods.slogan}}
-
-
-
+ {{goods.trade_num}}
+
+
+
-
+ }
+ }
+
+
+ }
+
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 @@
-
-
+
+
姓名
@@ -25,39 +25,39 @@
- 保存并使用
-
-
-
+ 保存并使用
+
+
+
-
+ }
+ }
+ }
+
+
+ }
+
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 @@
-
-
-
-
- 关闭
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{loadingText}}
-
-
-
-
-
+
+
+
+
+
+ 关闭
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{loadingText}}
+
+
+
+