diff --git a/application/admin/view/default/public/footer.html b/application/admin/view/default/public/footer.html index 173bb9599..9d3c74161 100755 --- a/application/admin/view/default/public/footer.html +++ b/application/admin/view/default/public/footer.html @@ -87,8 +87,8 @@ {{if !empty($plugins_admin_js_data) and is_array($plugins_admin_js_data)}} {{foreach $plugins_admin_js_data as $hook}} {{if is_string($hook)}} - {{if substr($hook_js, 0, 4) eq 'http'}} - + {{if substr($hook, 0, 4) eq 'http'}} + {{else /}} {{/if}} diff --git a/application/admin/view/default/public/header.html b/application/admin/view/default/public/header.html index b38a8ed06..2aa04ea68 100755 --- a/application/admin/view/default/public/header.html +++ b/application/admin/view/default/public/header.html @@ -23,7 +23,7 @@ {{if !empty($plugins_admin_css_data) and is_array($plugins_admin_css_data)}} {{foreach $plugins_admin_css_data as $hook}} {{if is_string($hook)}} - {{if substr($hook_css, 0, 4) eq 'http'}} + {{if substr($hook, 0, 4) eq 'http'}} {{else /}} diff --git a/application/index/view/default/public/footer.html b/application/index/view/default/public/footer.html index 980404280..3d4d04417 100755 --- a/application/index/view/default/public/footer.html +++ b/application/index/view/default/public/footer.html @@ -103,8 +103,8 @@ {{if !empty($plugins_js_data) and is_array($plugins_js_data)}} {{foreach $plugins_js_data as $hook}} {{if !empty($hook) and is_string($hook)}} - {{if substr($hook_js, 0, 4) eq 'http'}} - + {{if substr($hook, 0, 4) eq 'http'}} + {{else /}} {{/if}} diff --git a/application/index/view/default/public/header.html b/application/index/view/default/public/header.html index 3b2127ed4..f635ea1ae 100755 --- a/application/index/view/default/public/header.html +++ b/application/index/view/default/public/header.html @@ -36,7 +36,7 @@ {{if !empty($plugins_css_data) and is_array($plugins_css_data)}} {{foreach $plugins_css_data as $hook}} {{if !empty($hook) and is_string($hook)}} - {{if substr($hook_css, 0, 4) eq 'http'}} + {{if substr($hook, 0, 4) eq 'http'}} {{else /}} diff --git a/sourcecode/alipay/app.acss b/sourcecode/alipay/app.acss index ad11d72ca..e05d21a91 100644 --- a/sourcecode/alipay/app.acss +++ b/sourcecode/alipay/app.acss @@ -30,7 +30,7 @@ textarea { } .spacing-nav-title .line { display: inline-block; - width: 50%; + width: 80%; height: 1px; background: #d2364c; position: absolute; diff --git a/sourcecode/alipay/pages/goods-detail/goods-detail.acss b/sourcecode/alipay/pages/goods-detail/goods-detail.acss index 0ef34d7bd..1764c7686 100644 --- a/sourcecode/alipay/pages/goods-detail/goods-detail.acss +++ b/sourcecode/alipay/pages/goods-detail/goods-detail.acss @@ -160,7 +160,7 @@ font-size: 32rpx; line-height: 44rpx; font-weight: 500; - padding: 15rpx 10rpx; + padding: 8rpx 10rpx; } .goods-base { padding: 15rpx 10rpx; @@ -337,4 +337,30 @@ */ .goods-buy-nav .buy-nav-submit-full button { width: 100%; +} + +/* + * 商品参数 + */ +.parameters-base { + padding-top: 10rpx; +} +.parameters-base .content-item .item { + color: #666; +} +.goods-parameters .content-item { + padding-bottom: 10rpx; + } +.goods-parameters .content-item .item { + padding: 8rpx 10rpx; + width: calc(50% - 20rpx); +} +.goods-parameters .content-item .item .name { + margin-right: 5rpx; +} +.goods-parameters .content-item .item:nth-child(2n-1) { + float: left; +} +.goods-parameters .content-item .item:nth-child(2n) { + float: right; } \ No newline at end of file diff --git a/sourcecode/alipay/pages/goods-detail/goods-detail.axml b/sourcecode/alipay/pages/goods-detail/goods-detail.axml index f771fffdc..28fb25735 100644 --- a/sourcecode/alipay/pages/goods-detail/goods-detail.axml +++ b/sourcecode/alipay/pages/goods-detail/goods-detail.axml @@ -48,7 +48,7 @@ {{price_symbol}}{{goods.price}} {{price_symbol}}{{goods.original_price}} - + 累计销量 {{goods.sales_count}} @@ -66,6 +66,18 @@ + + + + + + {{item.name}}: + {{item.value}} + + + + + @@ -89,6 +101,22 @@ + + + + + 商品参数 + + + + + {{item.name}}: + {{item.value}} + + + + + - + 商品详情 - - - - - - - - - - - - - + + + + - - {{items}} - + + + + + - + + + + + + {{items}} + + + + diff --git a/sourcecode/baidu/app.css b/sourcecode/baidu/app.css index 67212db12..501c9cc76 100755 --- a/sourcecode/baidu/app.css +++ b/sourcecode/baidu/app.css @@ -37,7 +37,7 @@ textarea { } .spacing-nav-title .line { display: inline-block; - width: 50%; + width: 80%; height: 1px; background: #d2364c; position: absolute; diff --git a/sourcecode/baidu/pages/goods-detail/goods-detail.css b/sourcecode/baidu/pages/goods-detail/goods-detail.css index 060c97114..971813056 100755 --- a/sourcecode/baidu/pages/goods-detail/goods-detail.css +++ b/sourcecode/baidu/pages/goods-detail/goods-detail.css @@ -166,7 +166,7 @@ font-size: 32rpx; line-height: 44rpx; font-weight: 500; - padding: 15rpx 10rpx; + padding: 8rpx 10rpx; } .goods-base { padding: 15rpx 10rpx; @@ -342,4 +342,30 @@ */ .goods-buy-nav .buy-nav-submit-full button { width: 100%; +} + +/* + * 商品参数 + */ +.parameters-base { + padding-top: 10rpx; +} +.parameters-base .content-item .item { + color: #666; +} +.goods-parameters .content-item { + padding-bottom: 10rpx; + } +.goods-parameters .content-item .item { + padding: 8rpx 10rpx; + width: calc(50% - 20rpx); +} +.goods-parameters .content-item .item .name { + margin-right: 5rpx; +} +.goods-parameters .content-item .item:nth-child(2n-1) { + float: left; +} +.goods-parameters .content-item .item:nth-child(2n) { + float: right; } \ No newline at end of file diff --git a/sourcecode/baidu/pages/goods-detail/goods-detail.swan b/sourcecode/baidu/pages/goods-detail/goods-detail.swan index dcb27539c..58755c6a4 100755 --- a/sourcecode/baidu/pages/goods-detail/goods-detail.swan +++ b/sourcecode/baidu/pages/goods-detail/goods-detail.swan @@ -41,7 +41,7 @@ {{price_symbol}}{{goods.price}} {{price_symbol}}{{goods.original_price}} - + 累计销量 {{goods.sales_count}} @@ -59,6 +59,18 @@ + + + + + + {{item.name}}: + {{item.value}} + + + + + @@ -82,38 +94,49 @@ - - + + + + 商品参数 - --> + + + + {{item.name}}: + {{item.value}} + + + + - + 商品详情 - - - - - - - - - - - - - + + + + - - {{items}} - + + + + + - + + + + + + {{items}} + + + + diff --git a/sourcecode/qq/app.qss b/sourcecode/qq/app.qss index 98b6bda01..675181f78 100755 --- a/sourcecode/qq/app.qss +++ b/sourcecode/qq/app.qss @@ -37,7 +37,7 @@ textarea { } .spacing-nav-title .line { display: inline-block; - width: 50%; + width: 80%; height: 1px; background: #d2364c; position: absolute; diff --git a/sourcecode/qq/pages/goods-detail/goods-detail.qml b/sourcecode/qq/pages/goods-detail/goods-detail.qml index 43677430a..55b57459a 100755 --- a/sourcecode/qq/pages/goods-detail/goods-detail.qml +++ b/sourcecode/qq/pages/goods-detail/goods-detail.qml @@ -35,7 +35,7 @@ - + @@ -48,7 +48,7 @@ {{price_symbol}}{{goods.price}} {{price_symbol}}{{goods.original_price}} - + 累计销量 {{goods.sales_count}} @@ -66,6 +66,18 @@ + + + + + + {{item.name}}: + {{item.value}} + + + + + @@ -89,38 +101,49 @@ - - + + + + 商品参数 - --> + + + + {{item.name}}: + {{item.value}} + + + + - + 商品详情 - - - - - - - - - - - - - + + + + - - {{items}} - + + + + + - + + + + + + {{items}} + + + + diff --git a/sourcecode/qq/pages/goods-detail/goods-detail.qss b/sourcecode/qq/pages/goods-detail/goods-detail.qss index 5ecda57a1..c107937df 100755 --- a/sourcecode/qq/pages/goods-detail/goods-detail.qss +++ b/sourcecode/qq/pages/goods-detail/goods-detail.qss @@ -166,7 +166,7 @@ font-size: 32rpx; line-height: 44rpx; font-weight: 500; - padding: 15rpx 10rpx; + padding: 8rpx 10rpx; } .goods-base { padding: 15rpx 10rpx; @@ -338,4 +338,30 @@ */ .goods-buy-nav .buy-nav-submit-full button { width: 100%; +} + +/* + * 商品参数 + */ +.parameters-base { + padding-top: 10rpx; +} +.parameters-base .content-item .item { + color: #666; +} +.goods-parameters .content-item { + padding-bottom: 10rpx; + } +.goods-parameters .content-item .item { + padding: 8rpx 10rpx; + width: calc(50% - 20rpx); +} +.goods-parameters .content-item .item .name { + margin-right: 5rpx; +} +.goods-parameters .content-item .item:nth-child(2n-1) { + float: left; +} +.goods-parameters .content-item .item:nth-child(2n) { + float: right; } \ No newline at end of file diff --git a/sourcecode/toutiao/app.ttss b/sourcecode/toutiao/app.ttss index 7933b1242..b0009cdaa 100755 --- a/sourcecode/toutiao/app.ttss +++ b/sourcecode/toutiao/app.ttss @@ -37,7 +37,7 @@ textarea { } .spacing-nav-title .line { display: inline-block; - width: 50%; + width: 80%; height: 1px; background: #d2364c; position: absolute; diff --git a/sourcecode/toutiao/pages/goods-detail/goods-detail.ttml b/sourcecode/toutiao/pages/goods-detail/goods-detail.ttml index a7ab3880b..96566784d 100755 --- a/sourcecode/toutiao/pages/goods-detail/goods-detail.ttml +++ b/sourcecode/toutiao/pages/goods-detail/goods-detail.ttml @@ -35,7 +35,7 @@ - + @@ -48,7 +48,7 @@ {{price_symbol}}{{goods.price}} {{price_symbol}}{{goods.original_price}} - + 累计销量 {{goods.sales_count}} @@ -66,6 +66,18 @@ + + + + + + {{item.name}}: + {{item.value}} + + + + + @@ -89,38 +101,49 @@ - - + + + + 商品参数 - --> + + + + {{item.name}}: + {{item.value}} + + + + - + 商品详情 - - - - - - - - - - - - - + + + + - - {{items}} - + + + + + - + + + + + + {{items}} + + + + diff --git a/sourcecode/toutiao/pages/goods-detail/goods-detail.ttss b/sourcecode/toutiao/pages/goods-detail/goods-detail.ttss index 5ecda57a1..c107937df 100755 --- a/sourcecode/toutiao/pages/goods-detail/goods-detail.ttss +++ b/sourcecode/toutiao/pages/goods-detail/goods-detail.ttss @@ -166,7 +166,7 @@ font-size: 32rpx; line-height: 44rpx; font-weight: 500; - padding: 15rpx 10rpx; + padding: 8rpx 10rpx; } .goods-base { padding: 15rpx 10rpx; @@ -338,4 +338,30 @@ */ .goods-buy-nav .buy-nav-submit-full button { width: 100%; +} + +/* + * 商品参数 + */ +.parameters-base { + padding-top: 10rpx; +} +.parameters-base .content-item .item { + color: #666; +} +.goods-parameters .content-item { + padding-bottom: 10rpx; + } +.goods-parameters .content-item .item { + padding: 8rpx 10rpx; + width: calc(50% - 20rpx); +} +.goods-parameters .content-item .item .name { + margin-right: 5rpx; +} +.goods-parameters .content-item .item:nth-child(2n-1) { + float: left; +} +.goods-parameters .content-item .item:nth-child(2n) { + float: right; } \ No newline at end of file diff --git a/sourcecode/weixin/app.wxss b/sourcecode/weixin/app.wxss index 98b6bda01..675181f78 100755 --- a/sourcecode/weixin/app.wxss +++ b/sourcecode/weixin/app.wxss @@ -37,7 +37,7 @@ textarea { } .spacing-nav-title .line { display: inline-block; - width: 50%; + width: 80%; height: 1px; background: #d2364c; position: absolute; diff --git a/sourcecode/weixin/pages/goods-detail/goods-detail.js b/sourcecode/weixin/pages/goods-detail/goods-detail.js index 1e97a372b..7a4b87f57 100755 --- a/sourcecode/weixin/pages/goods-detail/goods-detail.js +++ b/sourcecode/weixin/pages/goods-detail/goods-detail.js @@ -84,7 +84,7 @@ Page({ params = app.launch_params_handle(params); // 参数赋值,初始化 - params['goods_id']=12; + //params['goods_id']=12; this.setData({params: params}); this.init(); diff --git a/sourcecode/weixin/pages/goods-detail/goods-detail.wxml b/sourcecode/weixin/pages/goods-detail/goods-detail.wxml index 550761ddc..52ed1b384 100755 --- a/sourcecode/weixin/pages/goods-detail/goods-detail.wxml +++ b/sourcecode/weixin/pages/goods-detail/goods-detail.wxml @@ -35,7 +35,7 @@ - + @@ -46,7 +46,7 @@ {{price_symbol}}{{goods.price}} {{price_symbol}}{{goods.original_price}} - + 累计销量 {{goods.sales_count}} @@ -65,7 +65,7 @@ - + @@ -100,7 +100,7 @@ - + 商品参数 @@ -116,30 +116,32 @@ - + 商品详情 - - - - - - - - - - - - - + + + + - - {{items}} - + + + + + - + + + + + + {{items}} + + + + diff --git a/sourcecode/weixin/pages/goods-detail/goods-detail.wxss b/sourcecode/weixin/pages/goods-detail/goods-detail.wxss index e542e87ec..c3478c547 100755 --- a/sourcecode/weixin/pages/goods-detail/goods-detail.wxss +++ b/sourcecode/weixin/pages/goods-detail/goods-detail.wxss @@ -166,7 +166,7 @@ font-size: 32rpx; line-height: 44rpx; font-weight: 500; - padding: 15rpx 10rpx; + padding: 8rpx 10rpx; } .goods-base { padding: 15rpx 10rpx; @@ -342,6 +342,9 @@ /* * 商品参数 */ +.parameters-base { + padding-top: 10rpx; +} .parameters-base .content-item .item { color: #666; } @@ -349,7 +352,7 @@ padding-bottom: 10rpx; } .goods-parameters .content-item .item { - padding: 5rpx 10rpx; + padding: 8rpx 10rpx; width: calc(50% - 20rpx); } .goods-parameters .content-item .item .name {