diff --git a/sourcecode/alipay/pages/goods-detail/goods-detail.axml b/sourcecode/alipay/pages/goods-detail/goods-detail.axml index 7dd69c801..be262691b 100644 --- a/sourcecode/alipay/pages/goods-detail/goods-detail.axml +++ b/sourcecode/alipay/pages/goods-detail/goods-detail.axml @@ -129,11 +129,11 @@ - + 首页 - + {{goods_favor_text}} diff --git a/sourcecode/baidu/pages/goods-detail/goods-detail.swan b/sourcecode/baidu/pages/goods-detail/goods-detail.swan index e553f0b0f..78a1ae331 100755 --- a/sourcecode/baidu/pages/goods-detail/goods-detail.swan +++ b/sourcecode/baidu/pages/goods-detail/goods-detail.swan @@ -122,11 +122,11 @@ - + 首页 - + {{goods_favor_text}} diff --git a/sourcecode/qq/pages/goods-detail/goods-detail.qml b/sourcecode/qq/pages/goods-detail/goods-detail.qml index e5521e384..b05dbe298 100755 --- a/sourcecode/qq/pages/goods-detail/goods-detail.qml +++ b/sourcecode/qq/pages/goods-detail/goods-detail.qml @@ -129,11 +129,11 @@ - + 首页 - + {{goods_favor_text}} diff --git a/sourcecode/toutiao/pages/goods-detail/goods-detail.ttml b/sourcecode/toutiao/pages/goods-detail/goods-detail.ttml index e04840a4f..863bc570e 100755 --- a/sourcecode/toutiao/pages/goods-detail/goods-detail.ttml +++ b/sourcecode/toutiao/pages/goods-detail/goods-detail.ttml @@ -129,11 +129,11 @@ - + 首页 - + {{goods_favor_text}} diff --git a/sourcecode/weixin/app.js b/sourcecode/weixin/app.js index 71ef2c3ad..5bf04cf5d 100755 --- a/sourcecode/weixin/app.js +++ b/sourcecode/weixin/app.js @@ -68,7 +68,7 @@ App({ // 请求地址 request_url: "{{request_url}}", request_url: 'http://shopxo.com/', - // request_url: 'https://dev.shopxo.net/', + request_url: 'https://dev.shopxo.net/', // 基础信息 application_title: "{{application_title}}", diff --git a/sourcecode/weixin/pages/goods-category/goods-category.json b/sourcecode/weixin/pages/goods-category/goods-category.json index b55b5a254..1e3ffd8f1 100755 --- a/sourcecode/weixin/pages/goods-category/goods-category.json +++ b/sourcecode/weixin/pages/goods-category/goods-category.json @@ -1,4 +1,5 @@ { + "enablePullDownRefresh": true, "usingComponents": { } } \ No newline at end of file diff --git a/sourcecode/weixin/pages/goods-category/goods-category.wxml b/sourcecode/weixin/pages/goods-category/goods-category.wxml index afbb935d5..51c23e162 100755 --- a/sourcecode/weixin/pages/goods-category/goods-category.wxml +++ b/sourcecode/weixin/pages/goods-category/goods-category.wxml @@ -1,11 +1,13 @@ - + - - - {{v.name}} + + + + {{v.name}} + @@ -30,11 +32,13 @@ - + - - {{v.name}} + + + {{v.name}} + @@ -47,8 +51,10 @@ - - {{vs.name}} + + + {{vs.name}} + diff --git a/sourcecode/weixin/pages/goods-category/goods-category.wxss b/sourcecode/weixin/pages/goods-category/goods-category.wxss index 77e3f5ac0..fcdc037b2 100755 --- a/sourcecode/weixin/pages/goods-category/goods-category.wxss +++ b/sourcecode/weixin/pages/goods-category/goods-category.wxss @@ -26,10 +26,9 @@ background: #f5f5f5; border-left: 3px solid #e23f36 !important; border-right: 3px solid #f5f5f5 !important; - color: #e23f36; + color: #e23f36 !important; } - /** * 右侧内容 */ @@ -43,9 +42,14 @@ right: 0; background: #f5f5f5; } -.right-content, .one-content { +.right-content { + padding: 0 20rpx 20rpx 20rpx; +} +.one-content { padding: 20rpx; - margin-bottom: 20rpx; +} +.one-content, .two-content { + margin-top: 20rpx; } .one-vice-name { font-size: 30rpx; @@ -62,11 +66,15 @@ padding: 20rpx 10rpx; } .content-item { - float: left; + display: -webkit-inline-box; width: calc(33.33% - 20rpx); - padding: 25rpx 10rpx; + padding: 10rpx; text-align: center; } +.content-item .content { + margin: 0 auto; + padding: 15rpx 0; +} .content-item .text { font-size: 28rpx; line-height: 46rpx; @@ -75,8 +83,8 @@ width: 100%; height: 120rpx; } -.model-one .content-item { - width: calc(33.33% - 21.1rpx); +.model-one { + padding: 10rpx; } .model-one .content-item:nth-child(3n) { border-right: 0; diff --git a/sourcecode/weixin/pages/goods-detail/goods-detail.wxml b/sourcecode/weixin/pages/goods-detail/goods-detail.wxml index 674f3dd4d..1cc6393a7 100755 --- a/sourcecode/weixin/pages/goods-detail/goods-detail.wxml +++ b/sourcecode/weixin/pages/goods-detail/goods-detail.wxml @@ -127,11 +127,11 @@ - + 首页 - + {{goods_favor_text}} diff --git a/sourcecode/weixin/pages/plugins/coupon/index/index.wxml b/sourcecode/weixin/pages/plugins/coupon/index/index.wxml index 7b0c08335..85d7a9218 100644 --- a/sourcecode/weixin/pages/plugins/coupon/index/index.wxml +++ b/sourcecode/weixin/pages/plugins/coupon/index/index.wxml @@ -6,7 +6,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.discount_value}} {{item.type_unit}} {{item.desc}} diff --git a/sourcecode/weixin/pages/plugins/coupon/user/user.wxml b/sourcecode/weixin/pages/plugins/coupon/user/user.wxml index bc104774c..0f3bcea0f 100644 --- a/sourcecode/weixin/pages/plugins/coupon/user/user.wxml +++ b/sourcecode/weixin/pages/plugins/coupon/user/user.wxml @@ -14,7 +14,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.coupon.type_unit}} {{item.coupon.desc}} @@ -38,7 +38,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.coupon.type_unit}} {{item.coupon.desc}} @@ -60,7 +60,7 @@ - {{price_symbol}} + {{price_symbol}} {{item.coupon.discount_value}} {{item.coupon.type_unit}} {{item.coupon.desc}}