Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
alading2018
ShopXO
提交
5141582c
ShopXO
项目概览
alading2018
/
ShopXO
与 Fork 源项目一致
Fork自
纵之格 / ShopXO
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
ShopXO
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5141582c
编写于
9月 03, 2020
作者:
D
devil
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
小程序商品参数
上级
e89e815b
变更
77
隐藏空白更改
内联
并排
Showing
77 changed file
with
188 addition
and
528 deletion
+188
-528
application/api/controller/Goods.php
application/api/controller/Goods.php
+4
-3
application/common.php
application/common.php
+22
-11
application/service/WarehouseGoodsService.php
application/service/WarehouseGoodsService.php
+14
-2
sourcecode/alipay/app.js
sourcecode/alipay/app.js
+0
-1
sourcecode/alipay/app.json
sourcecode/alipay/app.json
+0
-1
sourcecode/alipay/pages/cart/cart.acss
sourcecode/alipay/pages/cart/cart.acss
+1
-1
sourcecode/alipay/pages/cart/cart.axml
sourcecode/alipay/pages/cart/cart.axml
+1
-1
sourcecode/alipay/pages/goods-attribute/goods-attribute.acss
sourcecode/alipay/pages/goods-attribute/goods-attribute.acss
+0
-16
sourcecode/alipay/pages/goods-attribute/goods-attribute.axml
sourcecode/alipay/pages/goods-attribute/goods-attribute.axml
+0
-17
sourcecode/alipay/pages/goods-attribute/goods-attribute.js
sourcecode/alipay/pages/goods-attribute/goods-attribute.js
+0
-25
sourcecode/alipay/pages/goods-attribute/goods-attribute.json
sourcecode/alipay/pages/goods-attribute/goods-attribute.json
+0
-3
sourcecode/alipay/pages/goods-detail/goods-detail.acss
sourcecode/alipay/pages/goods-detail/goods-detail.acss
+4
-11
sourcecode/alipay/pages/goods-detail/goods-detail.axml
sourcecode/alipay/pages/goods-detail/goods-detail.axml
+10
-10
sourcecode/alipay/pages/goods-detail/goods-detail.js
sourcecode/alipay/pages/goods-detail/goods-detail.js
+0
-12
sourcecode/alipay/pages/user-order-detail/user-order-detail.acss
...ode/alipay/pages/user-order-detail/user-order-detail.acss
+1
-1
sourcecode/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.acss
...ser-orderaftersale-detail/user-orderaftersale-detail.acss
+1
-1
sourcecode/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml
...ser-orderaftersale-detail/user-orderaftersale-detail.axml
+1
-1
sourcecode/baidu/app.js
sourcecode/baidu/app.js
+0
-1
sourcecode/baidu/app.json
sourcecode/baidu/app.json
+0
-1
sourcecode/baidu/pages/cart/cart.css
sourcecode/baidu/pages/cart/cart.css
+1
-1
sourcecode/baidu/pages/cart/cart.swan
sourcecode/baidu/pages/cart/cart.swan
+1
-1
sourcecode/baidu/pages/goods-attribute/goods-attribute.css
sourcecode/baidu/pages/goods-attribute/goods-attribute.css
+0
-16
sourcecode/baidu/pages/goods-attribute/goods-attribute.js
sourcecode/baidu/pages/goods-attribute/goods-attribute.js
+0
-24
sourcecode/baidu/pages/goods-attribute/goods-attribute.json
sourcecode/baidu/pages/goods-attribute/goods-attribute.json
+0
-3
sourcecode/baidu/pages/goods-attribute/goods-attribute.swan
sourcecode/baidu/pages/goods-attribute/goods-attribute.swan
+0
-17
sourcecode/baidu/pages/goods-detail/goods-detail.css
sourcecode/baidu/pages/goods-detail/goods-detail.css
+4
-11
sourcecode/baidu/pages/goods-detail/goods-detail.js
sourcecode/baidu/pages/goods-detail/goods-detail.js
+0
-12
sourcecode/baidu/pages/goods-detail/goods-detail.swan
sourcecode/baidu/pages/goods-detail/goods-detail.swan
+9
-9
sourcecode/baidu/pages/user-order-detail/user-order-detail.css
...ecode/baidu/pages/user-order-detail/user-order-detail.css
+1
-1
sourcecode/baidu/pages/user-order-detail/user-order-detail.swan
...code/baidu/pages/user-order-detail/user-order-detail.swan
+1
-1
sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.css
...user-orderaftersale-detail/user-orderaftersale-detail.css
+1
-1
sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
...ser-orderaftersale-detail/user-orderaftersale-detail.swan
+1
-1
sourcecode/qq/app.js
sourcecode/qq/app.js
+0
-1
sourcecode/qq/app.json
sourcecode/qq/app.json
+0
-1
sourcecode/qq/pages/cart/cart.qml
sourcecode/qq/pages/cart/cart.qml
+1
-1
sourcecode/qq/pages/cart/cart.qss
sourcecode/qq/pages/cart/cart.qss
+1
-1
sourcecode/qq/pages/goods-attribute/goods-attribute.js
sourcecode/qq/pages/goods-attribute/goods-attribute.js
+0
-25
sourcecode/qq/pages/goods-attribute/goods-attribute.json
sourcecode/qq/pages/goods-attribute/goods-attribute.json
+0
-3
sourcecode/qq/pages/goods-attribute/goods-attribute.qml
sourcecode/qq/pages/goods-attribute/goods-attribute.qml
+0
-17
sourcecode/qq/pages/goods-attribute/goods-attribute.qss
sourcecode/qq/pages/goods-attribute/goods-attribute.qss
+0
-16
sourcecode/qq/pages/goods-detail/goods-detail.js
sourcecode/qq/pages/goods-detail/goods-detail.js
+0
-12
sourcecode/qq/pages/goods-detail/goods-detail.qml
sourcecode/qq/pages/goods-detail/goods-detail.qml
+9
-9
sourcecode/qq/pages/goods-detail/goods-detail.qss
sourcecode/qq/pages/goods-detail/goods-detail.qss
+4
-11
sourcecode/qq/pages/user-order-detail/user-order-detail.qml
sourcecode/qq/pages/user-order-detail/user-order-detail.qml
+1
-1
sourcecode/qq/pages/user-order-detail/user-order-detail.qss
sourcecode/qq/pages/user-order-detail/user-order-detail.qss
+1
-1
sourcecode/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml
...user-orderaftersale-detail/user-orderaftersale-detail.qml
+1
-1
sourcecode/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.qss
...user-orderaftersale-detail/user-orderaftersale-detail.qss
+1
-1
sourcecode/toutiao/app.js
sourcecode/toutiao/app.js
+0
-1
sourcecode/toutiao/app.json
sourcecode/toutiao/app.json
+0
-1
sourcecode/toutiao/pages/cart/cart.ttml
sourcecode/toutiao/pages/cart/cart.ttml
+1
-1
sourcecode/toutiao/pages/cart/cart.ttss
sourcecode/toutiao/pages/cart/cart.ttss
+1
-1
sourcecode/toutiao/pages/goods-attribute/goods-attribute.js
sourcecode/toutiao/pages/goods-attribute/goods-attribute.js
+0
-25
sourcecode/toutiao/pages/goods-attribute/goods-attribute.json
...cecode/toutiao/pages/goods-attribute/goods-attribute.json
+0
-3
sourcecode/toutiao/pages/goods-attribute/goods-attribute.ttml
...cecode/toutiao/pages/goods-attribute/goods-attribute.ttml
+0
-17
sourcecode/toutiao/pages/goods-attribute/goods-attribute.ttss
...cecode/toutiao/pages/goods-attribute/goods-attribute.ttss
+0
-16
sourcecode/toutiao/pages/goods-detail/goods-detail.js
sourcecode/toutiao/pages/goods-detail/goods-detail.js
+0
-12
sourcecode/toutiao/pages/goods-detail/goods-detail.ttml
sourcecode/toutiao/pages/goods-detail/goods-detail.ttml
+9
-9
sourcecode/toutiao/pages/goods-detail/goods-detail.ttss
sourcecode/toutiao/pages/goods-detail/goods-detail.ttss
+4
-11
sourcecode/toutiao/pages/user-order-detail/user-order-detail.ttml
...de/toutiao/pages/user-order-detail/user-order-detail.ttml
+1
-1
sourcecode/toutiao/pages/user-order-detail/user-order-detail.ttss
...de/toutiao/pages/user-order-detail/user-order-detail.ttss
+1
-1
sourcecode/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml
...ser-orderaftersale-detail/user-orderaftersale-detail.ttml
+1
-1
sourcecode/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttss
...ser-orderaftersale-detail/user-orderaftersale-detail.ttss
+1
-1
sourcecode/weixin/app.js
sourcecode/weixin/app.js
+4
-4
sourcecode/weixin/app.json
sourcecode/weixin/app.json
+0
-1
sourcecode/weixin/pages/cart/cart.wxml
sourcecode/weixin/pages/cart/cart.wxml
+1
-1
sourcecode/weixin/pages/cart/cart.wxss
sourcecode/weixin/pages/cart/cart.wxss
+1
-1
sourcecode/weixin/pages/goods-attribute/goods-attribute.js
sourcecode/weixin/pages/goods-attribute/goods-attribute.js
+0
-25
sourcecode/weixin/pages/goods-attribute/goods-attribute.json
sourcecode/weixin/pages/goods-attribute/goods-attribute.json
+0
-3
sourcecode/weixin/pages/goods-attribute/goods-attribute.wxml
sourcecode/weixin/pages/goods-attribute/goods-attribute.wxml
+0
-17
sourcecode/weixin/pages/goods-attribute/goods-attribute.wxss
sourcecode/weixin/pages/goods-attribute/goods-attribute.wxss
+0
-16
sourcecode/weixin/pages/goods-detail/goods-detail.js
sourcecode/weixin/pages/goods-detail/goods-detail.js
+1
-13
sourcecode/weixin/pages/goods-detail/goods-detail.wxml
sourcecode/weixin/pages/goods-detail/goods-detail.wxml
+34
-13
sourcecode/weixin/pages/goods-detail/goods-detail.wxss
sourcecode/weixin/pages/goods-detail/goods-detail.wxss
+27
-11
sourcecode/weixin/pages/user-order-detail/user-order-detail.wxml
...ode/weixin/pages/user-order-detail/user-order-detail.wxml
+1
-1
sourcecode/weixin/pages/user-order-detail/user-order-detail.wxss
...ode/weixin/pages/user-order-detail/user-order-detail.wxss
+1
-1
sourcecode/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
...ser-orderaftersale-detail/user-orderaftersale-detail.wxml
+1
-1
sourcecode/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxss
...ser-orderaftersale-detail/user-orderaftersale-detail.wxss
+1
-1
未找到文件。
application/api/controller/Goods.php
浏览文件 @
5141582c
...
...
@@ -66,9 +66,10 @@ class Goods extends Common
'id'
=>
$goods_id
,
'is_delete_time'
=>
0
,
],
'is_photo'
=>
true
,
'is_spec'
=>
true
,
'is_content_app'
=>
(
$is_use_mobile_detail
==
1
),
'is_photo'
=>
true
,
'is_spec'
=>
true
,
'is_params'
=>
true
,
'is_content_app'
=>
(
$is_use_mobile_detail
==
1
),
];
$ret
=
GoodsService
::
GoodsList
(
$params
);
if
(
empty
(
$ret
[
'data'
][
0
])
||
$ret
[
'data'
][
0
][
'is_delete_time'
]
!=
0
)
...
...
application/common.php
浏览文件 @
5141582c
...
...
@@ -1413,15 +1413,16 @@ function RequestGet($value)
*/
function
CurlGet
(
$url
)
{
$curl
=
curl_init
();
curl_setopt
(
$curl
,
CURLOPT_RETURNTRANSFER
,
true
);
curl_setopt
(
$curl
,
CURLOPT_TIMEOUT
,
500
);
curl_setopt
(
$curl
,
CURLOPT_SSL_VERIFYPEER
,
false
);
curl_setopt
(
$curl
,
CURLOPT_SSL_VERIFYHOST
,
false
);
curl_setopt
(
$curl
,
CURLOPT_URL
,
$url
);
$result
=
curl_exec
(
$curl
);
curl_close
(
$curl
);
$ch
=
curl_init
();
curl_setopt
(
$ch
,
CURLOPT_RETURNTRANSFER
,
true
);
curl_setopt
(
$ch
,
CURLOPT_TIMEOUT
,
500
);
curl_setopt
(
$ch
,
CURLOPT_IPRESOLVE
,
CURL_IPRESOLVE_V4
);
curl_setopt
(
$ch
,
CURLOPT_SSL_VERIFYPEER
,
false
);
curl_setopt
(
$ch
,
CURLOPT_SSL_VERIFYHOST
,
false
);
curl_setopt
(
$ch
,
CURLOPT_URL
,
$url
);
$result
=
curl_exec
(
$ch
);
curl_close
(
$ch
);
return
$result
;
}
...
...
@@ -1443,6 +1444,8 @@ function CurlPost($url, $post, $is_json = false)
curl_setopt
(
$ch
,
CURLOPT_POST
,
true
);
curl_setopt
(
$ch
,
CURLOPT_HEADER
,
false
);
curl_setopt
(
$ch
,
CURLOPT_IPRESOLVE
,
CURL_IPRESOLVE_V4
);
curl_setopt
(
$ch
,
CURLOPT_SSL_VERIFYPEER
,
false
);
curl_setopt
(
$ch
,
CURLOPT_SSL_VERIFYHOST
,
false
);
curl_setopt
(
$ch
,
CURLOPT_URL
,
$url
);
// 是否 json
...
...
@@ -1464,9 +1467,17 @@ function CurlPost($url, $post, $is_json = false)
);
}
// 返回结果
$result
=
curl_exec
(
$ch
);
curl_close
(
$ch
);
return
$result
;
if
(
$result
!==
false
)
{
curl_close
(
$ch
);
return
$result
;
}
else
{
$error
=
curl_errno
(
$ch
);
curl_close
(
$ch
);
return
"curl出错,错误码:
$error
"
;
}
}
/**
...
...
application/service/WarehouseGoodsService.php
浏览文件 @
5141582c
...
...
@@ -845,13 +845,25 @@ class WarehouseGoodsService
$md5_key
=
md5
(
$md5_key
);
// 扣除仓库商品规格库存
if
(
!
Db
::
name
(
'WarehouseGoodsSpec'
)
->
where
([
'warehouse_id'
=>
$warehouse_id
,
'goods_id'
=>
$goods_id
,
'md5_key'
=>
$md5_key
])
->
setDec
(
'inventory'
,
$buy_number
))
$where
=
[
'warehouse_id'
=>
$warehouse_id
,
'goods_id'
=>
$goods_id
,
'md5_key'
=>
$md5_key
];
$inventory
=
Db
::
name
(
'WarehouseGoodsSpec'
)
->
where
(
$where
)
->
value
(
'inventory'
);
if
(
$inventory
<
$buy_number
)
{
return
DataReturn
(
'仓库商品规格库存不足['
.
$warehouse_id
.
'-'
.
$goods_id
.
'('
.
$inventory
.
'<'
.
$buy_number
.
')]'
,
-
11
);
}
if
(
!
Db
::
name
(
'WarehouseGoodsSpec'
)
->
where
(
$where
)
->
setDec
(
'inventory'
,
$buy_number
))
{
return
DataReturn
(
'仓库商品规格库存扣减失败['
.
$warehouse_id
.
'-'
.
$goods_id
.
'('
.
$buy_number
.
')]'
,
-
11
);
}
// 扣除仓库商品库存
if
(
!
Db
::
name
(
'WarehouseGoods'
)
->
where
([
'warehouse_id'
=>
$warehouse_id
,
'goods_id'
=>
$goods_id
])
->
setDec
(
'inventory'
,
$buy_number
))
$where
=
[
'warehouse_id'
=>
$warehouse_id
,
'goods_id'
=>
$goods_id
];
$inventory
=
Db
::
name
(
'WarehouseGoods'
)
->
where
(
$where
)
->
value
(
'inventory'
);
if
(
$inventory
<
$buy_number
)
{
return
DataReturn
(
'仓库商品库存不足['
.
$warehouse_id
.
'-'
.
$goods_id
.
'('
.
$inventory
.
'<'
.
$buy_number
.
')]'
,
-
11
);
}
if
(
!
Db
::
name
(
'WarehouseGoods'
)
->
where
(
$where
)
->
setDec
(
'inventory'
,
$buy_number
))
{
return
DataReturn
(
'仓库商品库存扣减失败['
.
$warehouse_id
.
'-'
.
$goods_id
.
'('
.
$buy_number
.
')]'
,
-
12
);
}
...
...
sourcecode/alipay/app.js
浏览文件 @
5141582c
...
...
@@ -39,7 +39,6 @@ App({
common_pages_title
:
{
"
goods_search
"
:
"
商品搜索
"
,
"
goods_detail
"
:
"
商品详情
"
,
"
goods_attribute
"
:
"
属性
"
,
"
user_address
"
:
"
我的地址
"
,
"
user_address_save_add
"
:
"
新增地址
"
,
"
user_address_save_edit
"
:
"
编辑地址
"
,
...
...
sourcecode/alipay/app.json
浏览文件 @
5141582c
...
...
@@ -10,7 +10,6 @@
"pages/goods-search/goods-search"
,
"pages/goods-detail/goods-detail"
,
"pages/goods-comment/goods-comment"
,
"pages/goods-attribute/goods-attribute"
,
"pages/buy/buy"
,
"pages/user-address/user-address"
,
"pages/user-address-save/user-address-save"
,
...
...
sourcecode/alipay/pages/cart/cart.acss
浏览文件 @
5141582c
...
...
@@ -14,7 +14,7 @@
.goods-item:not(:last-child) {
border-bottom: 1px solid #eee;
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
}
.goods-image {
...
...
sourcecode/alipay/pages/cart/cart.axml
浏览文件 @
5141582c
...
...
@@ -16,7 +16,7 @@
<view class="goods-title multi-text">{{item.title}}
</view>
<block a:if="{{item.spec != null}}">
<view class="goods-
attribute
cr-888" a:for="{{item.spec}}" a:for-item="spec">{{spec.type}}:{{spec.value}}</view>
<view class="goods-
spec
cr-888" a:for="{{item.spec}}" a:for-item="spec">{{spec.type}}:{{spec.value}}</view>
</block>
</view>
<!-- 数量 -->
...
...
sourcecode/alipay/pages/goods-attribute/goods-attribute.acss
已删除
100755 → 0
浏览文件 @
e89e815b
.goods-attribute {
padding: 0 10rpx;
}
.goods-attribute .item {
padding: 20rpx 0;
}
.goods-attribute .item .title {
width: 25%;
}
.goods-attribute .item .content {
width: calc(75% - 30rpx);
margin-left: 20rpx;
}
.goods-attribute .item view {
line-height: 46rpx;
}
\ No newline at end of file
sourcecode/alipay/pages/goods-attribute/goods-attribute.axml
已删除
100755 → 0
浏览文件 @
e89e815b
<view a:if="{{goods_attribute.length > 0}}" class="goods-attribute bg-white">
<view a:for="{{goods_attribute}}" class="item br-b oh">
<view class="title fl br-r">{{item.name}}</view>
<view class="content cr-888 fl">
<text a:for="{{item.find}}" a:for-index="keys" a:for-item="items">
<text>{{items.name}}</text>
<text a:if="{{keys < item.find.length-1}}"> , </text>
</text>
</view>
</view>
</view>
<view class="nav-back tc wh-auto">
<navigator open-type="navigateBack" hover-class="none">
<button type="default" size="mini" class="cr-888" hover-class="none">返回</button>
</navigator>
</view>
sourcecode/alipay/pages/goods-attribute/goods-attribute.js
已删除
100755 → 0
浏览文件 @
e89e815b
const
app
=
getApp
();
Page
({
data
:
{
goods_attribute
:
[],
},
onLoad
(
params
)
{
if
((
params
.
data
||
null
)
==
null
)
{
my
.
alert
({
title
:
'
温馨提示
'
,
content
:
'
属性数据有误
'
,
buttonText
:
'
返回
'
,
success
:
()
=>
{
my
.
navigateBack
();
}
});
}
else
{
this
.
setData
({
goods_attribute
:
JSON
.
parse
(
params
.
data
)});
}
},
onShow
()
{
my
.
setNavigationBar
({
title
:
app
.
data
.
common_pages_title
.
goods_attribute
});
},
});
sourcecode/alipay/pages/goods-attribute/goods-attribute.json
已删除
100755 → 0
浏览文件 @
e89e815b
{
"pullRefresh"
:
false
}
\ No newline at end of file
sourcecode/alipay/pages/goods-detail/goods-detail.acss
浏览文件 @
5141582c
...
...
@@ -2,12 +2,6 @@
height: 55vh !important;
display: block;
}
.goods-attr-show-title {
height: 80rpx;
line-height: 80rpx;
padding: 0 10rpx;
}
.goods-popup {
padding: 20rpx 10rpx;
position: relative;
...
...
@@ -43,14 +37,14 @@
overflow-x: hidden;
margin-top: 20rpx;
}
.goods-
attr
-choose .item {
.goods-
spec
-choose .item {
margin-bottom: 30rpx;
padding-bottom: 30rpx;
}
.goods-popup-content .title {
font-size: 36rpx;
}
.goods-
attr-choose .item .attribute
button {
.goods-
spec-choose .item .spec
button {
margin-top: 20rpx;
margin-right: 25rpx;
padding: 0 30rpx;
...
...
@@ -60,7 +54,7 @@
height: 27px;
border: 1px solid #d5d5d5;
}
.goods-
attr-choose .item .attribute
button image {
.goods-
spec-choose .item .spec
button image {
width: 20px;
height: 20px;
vertical-align: middle;
...
...
@@ -87,7 +81,7 @@
.spec-items-disabled image {
opacity: 0.3;
}
.goods-
attr-choose .item .attribute
button,
.goods-
spec-choose .item .spec
button,
.goods-popup-submit
{
border-radius: 50rpx;
...
...
@@ -207,7 +201,6 @@
.goods-base .base-grid {
margin-top: 15rpx;
padding-top: 15rpx;
border-top: 1px solid #f5f5f5;
}
.goods-base .base-grid view {
width: calc(33.33% - 1px);
...
...
sourcecode/alipay/pages/goods-detail/goods-detail.axml
浏览文件 @
5141582c
...
...
@@ -48,7 +48,7 @@
<text class="sales-price">{{price_symbol}}{{goods.price}}</text>
<view a:if="{{(goods.original_price || null) != null && goods.original_price != '0.00'}}" class="original-price">{{price_symbol}}{{goods.original_price}}</view>
</view>
<view class="base-grid oh">
<view class="base-grid
br-t
oh">
<view class="fl tl">
<text class="cr-888">累计销量</text>
<text class="cr-main">{{goods.sales_count}}</text>
...
...
@@ -91,30 +91,30 @@
<!-- 属性导航 -->
<!-- <view a:if="{{false}}" class="spacing">
<view class="goods-
attr-show-title bg-white arrow-right cr-666" onTap="good_attribute
_nav_event">
<view class="goods-
spec-show-title bg-white arrow-right cr-666" onTap="good_spec
_nav_event">
属性
</view>
</view> -->
<!-- 商品详情 -->
<view class="goods-detail spacing">
<view class="goods-detail spacing
-mt spacing bg-white
">
<view class="spacing-nav-title">
<text class="line"></text>
<text class="text-wrapper">详情</text>
<text class="text-wrapper">
商品
详情</text>
</view>
<!-- 是否详情展示相册 -->
<block a:if="{{common_is_goods_detail_show_photo == 1 && goods_photo.length > 0}}">
<view a:for="{{goods_photo}}" a:key="key" class="goods-detail-photo
bg-white
">
<view a:for="{{goods_photo}}" a:key="key" class="goods-detail-photo">
<image a:if="{{(item.images || null) != null}}" onTap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
</view>
</block>
<!-- web详情 -->
<view a:if="{{common_app_is_use_mobile_detail == 0}}"
class="bg-white"
>
<view a:if="{{common_app_is_use_mobile_detail == 0}}">
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
</view>
<!-- 手机独立详情 -->
<block a:if="{{common_app_is_use_mobile_detail == 1 && goods_content_app.length > 0}}">
<view a:for="{{goods_content_app}}" class="goods-detail-app
bg-white
">
<view a:for="{{goods_content_app}}" class="goods-detail-app">
<image a:if="{{(item.images || null) != null}}" onTap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
<view a:if="{{(item.content || null) != null}}" class="content-items">
<view a:for="{{item.content}}" a:for-item="items">{{items}}</view>
...
...
@@ -176,11 +176,11 @@
</view>
<view class="goods-popup-content">
<!-- 商品
属性
-->
<view a:if="{{goods_specifications_choose.length > 0}}" class="goods-
attr
-choose">
<!-- 商品
规格
-->
<view a:if="{{goods_specifications_choose.length > 0}}" class="goods-
spec
-choose">
<view a:for="{{goods_specifications_choose}}" a:for-index="key" class="item br-b">
<view class="title">{{item.name}}</view>
<view a:if="{{item.value.length > 0}}" class="
attribute
">
<view a:if="{{item.value.length > 0}}" class="
spec
">
<block a:for="{{item.value}}" a:for-index="keys" a:for-item="items">
<button catchTap="goods_specifications_event" data-key="{{key}}" data-keys="{{keys}}" type="default" size="mini" hover-class="none" class="{{items.is_active}} {{items.is_dont}} {{items.is_disabled}}">
<image a:if="{{(items.images || null) != null}}" src="{{items.images}}" mode="scaleToFill" />
...
...
sourcecode/alipay/pages/goods-detail/goods-detail.js
浏览文件 @
5141582c
...
...
@@ -80,11 +80,6 @@ Page({
// 获取数据列表
init
()
{
// 数据初始化
this
.
setData
({
temp_attribute_active
:
{}
});
// 参数校验
if
((
this
.
data
.
params
.
goods_id
||
null
)
==
null
)
{
...
...
@@ -262,13 +257,6 @@ Page({
this
.
init
();
},
// 进入商品属性事件
good_attribute_nav_event
(
e
)
{
my
.
navigateTo
({
url
:
"
/pages/goods-attribute/goods-attribute?data=
"
+
JSON
.
stringify
(
this
.
data
.
goods_attribute_show
)
});
},
// 弹层关闭
popup_close_event
(
e
)
{
this
.
setData
({
popup_status
:
false
});
...
...
sourcecode/alipay/pages/user-order-detail/user-order-detail.acss
浏览文件 @
5141582c
...
...
@@ -47,7 +47,7 @@
.goods-item {
padding: 20rpx 10rpx;
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
}
.goods-image {
...
...
sourcecode/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.acss
浏览文件 @
5141582c
...
...
@@ -11,7 +11,7 @@
.goods-item {
padding: 20rpx 10rpx;
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
}
.goods-image {
...
...
sourcecode/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml
浏览文件 @
5141582c
...
...
@@ -7,7 +7,7 @@
<view class="goods-base">
<view class="goods-title multi-text">{{order_data.items.title}}</view>
<block a:if="{{order_data.items.spec != null}}">
<view class="goods-
attribute
cr-888" a:for="{{order_data.items.spec}}" a:for-item="spec" a:key="spec">
<view class="goods-
spec
cr-888" a:for="{{order_data.items.spec}}" a:for-item="spec" a:key="spec">
{{spec.type}}:{{spec.value}}
</view>
</block>
...
...
sourcecode/baidu/app.js
浏览文件 @
5141582c
...
...
@@ -39,7 +39,6 @@ App({
common_pages_title
:
{
"
goods_search
"
:
"
商品搜索
"
,
"
goods_detail
"
:
"
商品详情
"
,
"
goods_attribute
"
:
"
属性
"
,
"
user_address
"
:
"
我的地址
"
,
"
user_address_save_add
"
:
"
新增地址
"
,
"
user_address_save_edit
"
:
"
编辑地址
"
,
...
...
sourcecode/baidu/app.json
浏览文件 @
5141582c
...
...
@@ -10,7 +10,6 @@
"pages/goods-search/goods-search"
,
"pages/goods-detail/goods-detail"
,
"pages/goods-comment/goods-comment"
,
"pages/goods-attribute/goods-attribute"
,
"pages/buy/buy"
,
"pages/user-address/user-address"
,
"pages/user-address-save/user-address-save"
,
...
...
sourcecode/baidu/pages/cart/cart.css
浏览文件 @
5141582c
...
...
@@ -14,7 +14,7 @@
.goods-item
:not
(
:last-child
)
{
border-bottom
:
1px
solid
#eee
;
}
.goods-title
,
.goods-
attribute
{
.goods-title
,
.goods-
spec
{
margin-bottom
:
10
rpx
;
}
.goods-image
{
...
...
sourcecode/baidu/pages/cart/cart.swan
浏览文件 @
5141582c
...
...
@@ -16,7 +16,7 @@
<view class="goods-title multi-text">{{item.title}}
</view>
<block s-if="item.spec != null">
<view class="goods-
attribute
cr-888" s-for="spec, index in item.spec" s-key="key">{{spec.type}}:{{spec.value}}</view>
<view class="goods-
spec
cr-888" s-for="spec, index in item.spec" s-key="key">{{spec.type}}:{{spec.value}}</view>
</block>
</view>
<!-- 数量 -->
...
...
sourcecode/baidu/pages/goods-attribute/goods-attribute.css
已删除
100755 → 0
浏览文件 @
e89e815b
.goods-attribute
{
padding
:
0
10
rpx
;
}
.goods-attribute
.item
{
padding
:
20
rpx
0
;
}
.goods-attribute
.item
.title
{
width
:
25%
;
}
.goods-attribute
.item
.content
{
width
:
calc
(
75%
-
30
rpx
);
margin-left
:
20
rpx
;
}
.goods-attribute
.item
view
{
line-height
:
46
rpx
;
}
\ No newline at end of file
sourcecode/baidu/pages/goods-attribute/goods-attribute.js
已删除
100755 → 0
浏览文件 @
e89e815b
const
app
=
getApp
();
Page
({
data
:
{
goods_attribute
:
[]
},
onLoad
(
params
)
{
if
((
params
.
data
||
null
)
==
null
)
{
swan
.
alert
({
title
:
'
温馨提示
'
,
content
:
'
属性数据有误
'
,
buttonText
:
'
返回
'
,
success
:
()
=>
{
swan
.
navigateBack
();
}
});
}
else
{
this
.
setData
({
goods_attribute
:
JSON
.
parse
(
params
.
data
)
});
}
},
onShow
()
{
swan
.
setNavigationBarTitle
({
title
:
app
.
data
.
common_pages_title
.
goods_attribute
});
}
});
\ No newline at end of file
sourcecode/baidu/pages/goods-attribute/goods-attribute.json
已删除
100755 → 0
浏览文件 @
e89e815b
{
"enablePullDownRefresh"
:
false
}
\ No newline at end of file
sourcecode/baidu/pages/goods-attribute/goods-attribute.swan
已删除
100755 → 0
浏览文件 @
e89e815b
<view s-if="goods_attribute.length > 0" class="goods-attribute bg-white">
<view s-for="item, index in goods_attribute" class="item br-b oh">
<view class="title fl br-r">{{item.name}}</view>
<view class="content cr-888 fl">
<text s-for="items, keys in item.find">
<text>{{items.name}}</text>
<text s-if="keys < item.find.length-1"> , </text>
</text>
</view>
</view>
</view>
<view class="nav-back tc wh-auto">
<navigator open-type="navigateBack" hover-class="none">
<button type="default" size="mini" class="cr-888" hover-class="none">返回</button>
</navigator>
</view>
sourcecode/baidu/pages/goods-detail/goods-detail.css
浏览文件 @
5141582c
...
...
@@ -2,12 +2,6 @@
height
:
55vh
!important
;
display
:
block
;
}
.goods-attr-show-title
{
height
:
80
rpx
;
line-height
:
80
rpx
;
padding
:
0
10
rpx
;
}
.goods-popup
{
padding
:
20
rpx
10
rpx
;
position
:
relative
;
...
...
@@ -43,14 +37,14 @@
overflow-x
:
hidden
;
margin-top
:
20
rpx
;
}
.goods-
attr
-choose
.item
{
.goods-
spec
-choose
.item
{
margin-bottom
:
30
rpx
;
padding-bottom
:
30
rpx
;
}
.goods-popup-content
.title
{
font-size
:
36
rpx
;
}
.goods-
attr
-choose
.item
.spec
button
{
.goods-
spec
-choose
.item
.spec
button
{
margin-top
:
20
rpx
;
margin-right
:
25
rpx
;
padding
:
0
30
rpx
;
...
...
@@ -60,7 +54,7 @@
height
:
27px
;
border
:
1px
solid
#d5d5d5
;
}
.goods-
attr
-choose
.item
.spec
button
image
{
.goods-
spec
-choose
.item
.spec
button
image
{
width
:
20px
;
height
:
20px
;
vertical-align
:
middle
;
...
...
@@ -87,7 +81,7 @@
.spec-items-disabled
image
{
opacity
:
0.3
;
}
.goods-
attr
-choose
.item
.spec
button
,
.goods-
spec
-choose
.item
.spec
button
,
.goods-popup-submit
{
border-radius
:
50
rpx
;
...
...
@@ -205,7 +199,6 @@
.goods-base
.base-grid
{
margin-top
:
15
rpx
;
padding-top
:
15
rpx
;
border-top
:
1px
solid
#f5f5f5
;
}
.goods-base
.base-grid
view
{
width
:
calc
(
33.33%
-
1px
);
...
...
sourcecode/baidu/pages/goods-detail/goods-detail.js
浏览文件 @
5141582c
...
...
@@ -75,11 +75,6 @@ Page({
// 获取数据列表
init
()
{
// 数据初始化
this
.
setData
({
temp_attribute_active
:
{}
});
// 参数校验
if
((
this
.
data
.
params
.
goods_id
||
null
)
==
null
)
{
swan
.
stopPullDownRefresh
();
...
...
@@ -232,13 +227,6 @@ Page({
this
.
init
();
},
// 进入商品属性事件
good_attribute_nav_event
(
e
)
{
swan
.
navigateTo
({
url
:
"
/pages/goods-attribute/goods-attribute?data=
"
+
JSON
.
stringify
(
this
.
data
.
goods_attribute_show
)
});
},
// 购买弹层关闭
popup_close_event
(
e
)
{
this
.
setData
({
popup_status
:
false
});
...
...
sourcecode/baidu/pages/goods-detail/goods-detail.swan
浏览文件 @
5141582c
...
...
@@ -41,7 +41,7 @@
<text class="sales-price">{{price_symbol}}{{goods.price}}</text>
<view s-if="(goods.original_price || null) != null && goods.original_price != '0.00'" class="original-price">{{price_symbol}}{{goods.original_price}}</view>
</view>
<view class="base-grid oh">
<view class="base-grid
br-t
oh">
<view class="fl tl">
<text class="cr-888">累计销量</text>
<text class="cr-main">{{goods.sales_count}}</text>
...
...
@@ -84,30 +84,30 @@
<!-- 属性导航 -->
<!-- <view wx:if="{{false}}" class="spacing">
<view class="goods-
attr
-show-title bg-white arrow-right cr-666" bindtap="good_attribute_nav_event">
<view class="goods-
spec
-show-title bg-white arrow-right cr-666" bindtap="good_attribute_nav_event">
属性
</view>
</view> -->
<!-- 商品详情 -->
<view class="goods-detail spacing">
<view class="goods-detail spacing
-mt spacing bg-white
">
<view class="spacing-nav-title">
<text class="line"></text>
<text class="text-wrapper">详情</text>
<text class="text-wrapper">
商品
详情</text>
</view>
<!-- 是否详情展示相册 -->
<block s-if="common_is_goods_detail_show_photo == 1 && goods_photo.length > 0">
<view s-for="item, index in goods_photo" s-key="key" class="goods-detail-photo
bg-white
">
<view s-for="item, index in goods_photo" s-key="key" class="goods-detail-photo">
<image s-if="(item.images || null) != null" bindtap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
</view>
</block>
<!-- web详情 -->
<view s-if="common_app_is_use_mobile_detail == 0"
class="bg-white"
>
<view s-if="common_app_is_use_mobile_detail == 0">
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
</view>
<!-- 手机独立详情 -->
<block s-if="common_app_is_use_mobile_detail == 1 && goods_content_app.length > 0">
<view s-for="item, index in goods_content_app" s-key="key" class="goods-detail-app
bg-white
">
<view s-for="item, index in goods_content_app" s-key="key" class="goods-detail-app">
<image s-if="(item.images || null) != null" bindtap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
<view s-if="(item.content || null) != null" class="content-items">
<view s-for="items, index in item.content">{{items}}</view>
...
...
@@ -169,8 +169,8 @@
</view>
<view class="goods-popup-content">
<!-- 商品
属性
-->
<view s-if="goods_specifications_choose.length > 0" class="goods-
attr
-choose">
<!-- 商品
规格
-->
<view s-if="goods_specifications_choose.length > 0" class="goods-
spec
-choose">
<view s-for="item, key in goods_specifications_choose" s-key="key" class="item br-b">
<view class="title">{{item.name}}</view>
<view s-if="item.value.length > 0" class="spec">
...
...
sourcecode/baidu/pages/user-order-detail/user-order-detail.css
浏览文件 @
5141582c
...
...
@@ -47,7 +47,7 @@
.goods-item
{
padding
:
20
rpx
10
rpx
;
}
.goods-title
,
.goods-
attribute
{
.goods-title
,
.goods-
spec
{
margin-bottom
:
10
rpx
;
}
.goods-image
{
...
...
sourcecode/baidu/pages/user-order-detail/user-order-detail.swan
浏览文件 @
5141582c
...
...
@@ -23,7 +23,7 @@
<view class="goods-base">
<view class="goods-title multi-text">{{item.title}}</view>
<block s-if="item.spec != null">
<view class="goods-
attribute
cr-888" s-for="spec, index in item.spec" s-key="spec">
<view class="goods-
spec
cr-888" s-for="spec, index in item.spec" s-key="spec">
{{spec.type}}:{{spec.value}}
</view>
</block>
...
...
sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.css
浏览文件 @
5141582c
...
...
@@ -11,7 +11,7 @@
.goods-item
{
padding
:
20
rpx
10
rpx
;
}
.goods-title
,
.goods-
attribute
{
.goods-title
,
.goods-
spec
{
margin-bottom
:
10
rpx
;
}
.goods-image
{
...
...
sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
浏览文件 @
5141582c
...
...
@@ -7,7 +7,7 @@
<view class="goods-base">
<view class="goods-title multi-text">{{order_data.items.title}}</view>
<block s-if="order_data.items.spec != null">
<view class="goods-
attribute
cr-888" s-for="spec, index in order_data.items.spec" s-key="spec">
<view class="goods-
spec
cr-888" s-for="spec, index in order_data.items.spec" s-key="spec">
{{spec.type}}:{{spec.value}}
</view>
</block>
...
...
sourcecode/qq/app.js
浏览文件 @
5141582c
...
...
@@ -39,7 +39,6 @@ App({
common_pages_title
:
{
"
goods_search
"
:
"
商品搜索
"
,
"
goods_detail
"
:
"
商品详情
"
,
"
goods_attribute
"
:
"
属性
"
,
"
user_address
"
:
"
我的地址
"
,
"
user_address_save_add
"
:
"
新增地址
"
,
"
user_address_save_edit
"
:
"
编辑地址
"
,
...
...
sourcecode/qq/app.json
浏览文件 @
5141582c
...
...
@@ -10,7 +10,6 @@
"pages/goods-search/goods-search"
,
"pages/goods-detail/goods-detail"
,
"pages/goods-comment/goods-comment"
,
"pages/goods-attribute/goods-attribute"
,
"pages/buy/buy"
,
"pages/user-address/user-address"
,
"pages/user-address-save/user-address-save"
,
...
...
sourcecode/qq/pages/cart/cart.qml
浏览文件 @
5141582c
...
...
@@ -16,7 +16,7 @@
<
view
class
=
"
goods-title multi-text
"
>
{{
item
.
title
}}
<
/view
>
<
block
qq
:
if
=
"
{{item.spec != null}}
"
>
<
view
class
=
"
goods-
attribute
cr-888
"
qq
:
for
=
"
{{item.spec}}
"
qq
:
key
=
"
key
"
qq
:
for
-
item
=
"
spec
"
>
{{
spec
.
type
}}:{{
spec
.
value
}}
<
/view
>
<
view
class
=
"
goods-
spec
cr-888
"
qq
:
for
=
"
{{item.spec}}
"
qq
:
key
=
"
key
"
qq
:
for
-
item
=
"
spec
"
>
{{
spec
.
type
}}:{{
spec
.
value
}}
<
/view
>
<
/block
>
<
/view
>
<!--
数量
-->
...
...
sourcecode/qq/pages/cart/cart.qss
浏览文件 @
5141582c
...
...
@@ -14,7 +14,7 @@
.goods-item:not(:last-child) {
border-bottom: 1px solid #eee;
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
}
.goods-image {
...
...
sourcecode/qq/pages/goods-attribute/goods-attribute.js
已删除
100755 → 0
浏览文件 @
e89e815b
const
app
=
getApp
();
Page
({
data
:
{
goods_attribute
:
[],
},
onLoad
(
params
)
{
if
((
params
.
data
||
null
)
==
null
)
{
qq
.
alert
({
title
:
'
温馨提示
'
,
content
:
'
属性数据有误
'
,
buttonText
:
'
返回
'
,
success
:
()
=>
{
qq
.
navigateBack
();
}
});
}
else
{
this
.
setData
({
goods_attribute
:
JSON
.
parse
(
params
.
data
)});
}
},
onShow
()
{
qq
.
setNavigationBarTitle
({
title
:
app
.
data
.
common_pages_title
.
goods_attribute
});
},
});
sourcecode/qq/pages/goods-attribute/goods-attribute.json
已删除
100755 → 0
浏览文件 @
e89e815b
{
"enablePullDownRefresh"
:
false
}
\ No newline at end of file
sourcecode/qq/pages/goods-attribute/goods-attribute.qml
已删除
100755 → 0
浏览文件 @
e89e815b
<
view
qq
:
if
=
"
{{goods_attribute.length > 0}}
"
class
=
"
goods-attribute bg-white
"
>
<
view
qq
:
for
=
"
{{goods_attribute}}
"
class
=
"
item br-b oh
"
>
<
view
class
=
"
title fl br-r
"
>
{{
item
.
name
}}
<
/view
>
<
view
class
=
"
content cr-888 fl
"
>
<
text
qq
:
for
=
"
{{item.find}}
"
qq
:
for
-
index
=
"
keys
"
qq
:
for
-
item
=
"
items
"
>
<
text
>
{{
items
.
name
}}
<
/text
>
<
text
qq
:
if
=
"
{{keys < item.find.length-1}}
"
>
,
<
/text
>
<
/text
>
<
/view
>
<
/view
>
<
/view
>
<
view
class
=
"
nav-back tc wh-auto
"
>
<
navigator
open
-
type
=
"
navigateBack
"
hover
-
class
=
"
none
"
>
<
button
type
=
"
default
"
size
=
"
mini
"
class
=
"
cr-888
"
hover
-
class
=
"
none
"
>
返回
<
/button
>
<
/navigator
>
<
/view
>
sourcecode/qq/pages/goods-attribute/goods-attribute.qss
已删除
100755 → 0
浏览文件 @
e89e815b
.goods-attribute {
padding: 0 10rpx;
}
.goods-attribute .item {
padding: 20rpx 0;
}
.goods-attribute .item .title {
width: 25%;
}
.goods-attribute .item .content {
width: calc(75% - 30rpx);
margin-left: 20rpx;
}
.goods-attribute .item view {
line-height: 46rpx;
}
\ No newline at end of file
sourcecode/qq/pages/goods-detail/goods-detail.js
浏览文件 @
5141582c
...
...
@@ -94,11 +94,6 @@ Page({
// 获取数据列表
init
()
{
// 数据初始化
this
.
setData
({
temp_attribute_active
:
{}
});
// 参数校验
if
((
this
.
data
.
params
.
goods_id
||
null
)
==
null
)
{
...
...
@@ -264,13 +259,6 @@ Page({
this
.
init
();
},
// 进入商品属性事件
good_attribute_nav_event
(
e
)
{
qq
.
navigateTo
({
url
:
"
/pages/goods-attribute/goods-attribute?data=
"
+
JSON
.
stringify
(
this
.
data
.
goods_attribute_show
)
});
},
// 购买弹层关闭
popup_close_event
(
e
)
{
this
.
setData
({
popup_status
:
false
});
...
...
sourcecode/qq/pages/goods-detail/goods-detail.qml
浏览文件 @
5141582c
...
...
@@ -48,7 +48,7 @@
<
text
class
=
"
sales-price
"
>
{{
price_symbol
}}{{
goods
.
price
}}
<
/text
>
<
view
qq
:
if
=
"
{{(goods.original_price || null) != null && goods.original_price != '0.00'}}
"
class
=
"
original-price
"
>
{{
price_symbol
}}{{
goods
.
original_price
}}
<
/view
>
<
/view
>
<
view
class
=
"
base-grid oh
"
>
<
view
class
=
"
base-grid
br-t
oh
"
>
<
view
class
=
"
fl tl
"
>
<
text
class
=
"
cr-888
"
>
累计销量
<
/text
>
<
text
class
=
"
cr-main
"
>
{{
goods
.
sales_count
}}
<
/text
>
...
...
@@ -91,30 +91,30 @@
<!--
属性导航
-->
<!--
<
view
qq
:
if
=
"
{{false}}
"
class
=
"
spacing
"
>
<
view
class
=
"
goods-
attr
-show-title bg-white arrow-right cr-666
"
bindtap
=
"
good_attribute_nav_event
"
>
<
view
class
=
"
goods-
spec
-show-title bg-white arrow-right cr-666
"
bindtap
=
"
good_attribute_nav_event
"
>
属性
<
/view
>
<
/view> --
>
<!--
商品详情
-->
<
view
class
=
"
goods-detail spacing
"
>
<
view
class
=
"
goods-detail spacing
-mt spacing bg-white
"
>
<
view
class
=
"
spacing-nav-title
"
>
<
text
class
=
"
line
"
><
/text
>
<
text
class
=
"
text-wrapper
"
>
详情
<
/text
>
<
text
class
=
"
text-wrapper
"
>
商品
详情
<
/text
>
<
/view
>
<!--
是否详情展示相册
-->
<
block
qq
:
if
=
"
{{common_is_goods_detail_show_photo == 1 && goods_photo.length > 0}}
"
>
<
view
qq
:
for
=
"
{{goods_photo}}
"
qq
:
key
=
"
key
"
class
=
"
goods-detail-photo
bg-white
"
>
<
view
qq
:
for
=
"
{{goods_photo}}
"
qq
:
key
=
"
key
"
class
=
"
goods-detail-photo
"
>
<
image
qq
:
if
=
"
{{(item.images || null) != null}}
"
bindtap
=
"
goods_detail_images_view_event
"
data
-
value
=
"
{{item.images}}
"
class
=
"
wh-auto dis-block
"
src
=
"
{{item.images}}
"
mode
=
"
widthFix
"
/>
<
/view
>
<
/block
>
<!--
web详情
-->
<
view
qq
:
if
=
"
{{common_app_is_use_mobile_detail == 0}}
"
class
=
"
bg-white
"
>
<
view
qq
:
if
=
"
{{common_app_is_use_mobile_detail == 0}}
"
>
<
rich
-
text
nodes
=
"
{{goods.content_web || ''}}
"
><
/rich-text
>
<
/view
>
<!--
手机独立详情
-->
<
block
qq
:
if
=
"
{{common_app_is_use_mobile_detail == 1 && goods_content_app.length > 0}}
"
>
<
view
qq
:
for
=
"
{{goods_content_app}}
"
qq
:
key
=
"
key
"
class
=
"
goods-detail-app
bg-white
"
>
<
view
qq
:
for
=
"
{{goods_content_app}}
"
qq
:
key
=
"
key
"
class
=
"
goods-detail-app
"
>
<
image
qq
:
if
=
"
{{(item.images || null) != null}}
"
bindtap
=
"
goods_detail_images_view_event
"
data
-
value
=
"
{{item.images}}
"
class
=
"
wh-auto dis-block
"
src
=
"
{{item.images}}
"
mode
=
"
widthFix
"
/>
<
view
qq
:
if
=
"
{{(item.content || null) != null}}
"
class
=
"
content-items
"
>
<
view
qq
:
for
=
"
{{item.content}}
"
qq
:
for
-
item
=
"
items
"
>
{{
items
}}
<
/view
>
...
...
@@ -176,8 +176,8 @@
<
/view
>
<
view
class
=
"
goods-popup-content
"
>
<!--
商品
属性
-->
<
view
qq
:
if
=
"
{{goods_specifications_choose.length > 0}}
"
class
=
"
goods-
attr
-choose
"
>
<!--
商品
规格
-->
<
view
qq
:
if
=
"
{{goods_specifications_choose.length > 0}}
"
class
=
"
goods-
spec
-choose
"
>
<
view
qq
:
for
=
"
{{goods_specifications_choose}}
"
qq
:
key
=
"
key
"
qq
:
for
-
index
=
"
key
"
class
=
"
item br-b
"
>
<
view
class
=
"
title
"
>
{{
item
.
name
}}
<
/view
>
<
view
qq
:
if
=
"
{{item.value.length > 0}}
"
class
=
"
spec
"
>
...
...
sourcecode/qq/pages/goods-detail/goods-detail.qss
浏览文件 @
5141582c
...
...
@@ -2,12 +2,6 @@
height: 55vh !important;
display: block;
}
.goods-attr-show-title {
height: 80rpx;
line-height: 80rpx;
padding: 0 10rpx;
}
.goods-popup {
padding: 20rpx 10rpx;
position: relative;
...
...
@@ -43,14 +37,14 @@
overflow-x: hidden;
margin-top: 20rpx;
}
.goods-
attr
-choose .item {
.goods-
spec
-choose .item {
margin-bottom: 30rpx;
padding-bottom: 30rpx;
}
.goods-popup-content .title {
font-size: 36rpx;
}
.goods-
attr
-choose .item .spec button {
.goods-
spec
-choose .item .spec button {
margin-top: 20rpx;
margin-right: 25rpx;
padding: 0 30rpx;
...
...
@@ -60,7 +54,7 @@
height: 27px;
border: 1px solid #d5d5d5;
}
.goods-
attr
-choose .item .spec button image {
.goods-
spec
-choose .item .spec button image {
width: 20px;
height: 20px;
vertical-align: middle;
...
...
@@ -87,7 +81,7 @@
.spec-items-disabled image {
opacity: 0.3;
}
.goods-
attr
-choose .item .spec button,
.goods-
spec
-choose .item .spec button,
.goods-popup-submit
{
border-radius: 50rpx;
...
...
@@ -206,7 +200,6 @@
.goods-base .base-grid {
margin-top: 15rpx;
padding-top: 15rpx;
border-top: 1px solid #f5f5f5;
}
.goods-base .base-grid view {
width: calc(33.33% - 1px);
...
...
sourcecode/qq/pages/user-order-detail/user-order-detail.qml
浏览文件 @
5141582c
...
...
@@ -23,7 +23,7 @@
<
view
class
=
"
goods-base
"
>
<
view
class
=
"
goods-title multi-text
"
>
{{
item
.
title
}}
<
/view
>
<
block
qq
:
if
=
"
{{item.spec != null}}
"
>
<
view
class
=
"
goods-
attribute
cr-888
"
qq
:
for
=
"
{{item.spec}}
"
qq
:
key
=
"
spec
"
qq
:
for
-
item
=
"
spec
"
>
<
view
class
=
"
goods-
spec
cr-888
"
qq
:
for
=
"
{{item.spec}}
"
qq
:
key
=
"
spec
"
qq
:
for
-
item
=
"
spec
"
>
{{
spec
.
type
}}:{{
spec
.
value
}}
<
/view
>
<
/block
>
...
...
sourcecode/qq/pages/user-order-detail/user-order-detail.qss
浏览文件 @
5141582c
...
...
@@ -47,7 +47,7 @@
.goods-item {
padding: 20rpx 10rpx;
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
}
.goods-image {
...
...
sourcecode/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.qml
浏览文件 @
5141582c
...
...
@@ -7,7 +7,7 @@
<
view
class
=
"
goods-base
"
>
<
view
class
=
"
goods-title multi-text
"
>
{{
order_data
.
items
.
title
}}
<
/view
>
<
block
qq
:
if
=
"
{{order_data.items.spec != null}}
"
>
<
view
class
=
"
goods-
attribute
cr-888
"
qq
:
for
=
"
{{order_data.items.spec}}
"
qq
:
for
-
item
=
"
spec
"
qq
:
key
=
"
spec
"
>
<
view
class
=
"
goods-
spec
cr-888
"
qq
:
for
=
"
{{order_data.items.spec}}
"
qq
:
for
-
item
=
"
spec
"
qq
:
key
=
"
spec
"
>
{{
spec
.
type
}}:{{
spec
.
value
}}
<
/view
>
<
/block
>
...
...
sourcecode/qq/pages/user-orderaftersale-detail/user-orderaftersale-detail.qss
浏览文件 @
5141582c
...
...
@@ -11,7 +11,7 @@
.goods-item {
padding: 20rpx 10rpx;
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
}
.goods-image {
...
...
sourcecode/toutiao/app.js
浏览文件 @
5141582c
...
...
@@ -39,7 +39,6 @@ App({
common_pages_title
:
{
"
goods_search
"
:
"
商品搜索
"
,
"
goods_detail
"
:
"
商品详情
"
,
"
goods_attribute
"
:
"
属性
"
,
"
user_address
"
:
"
我的地址
"
,
"
user_address_save_add
"
:
"
新增地址
"
,
"
user_address_save_edit
"
:
"
编辑地址
"
,
...
...
sourcecode/toutiao/app.json
浏览文件 @
5141582c
...
...
@@ -11,7 +11,6 @@
"pages/goods-search/goods-search"
,
"pages/goods-detail/goods-detail"
,
"pages/goods-comment/goods-comment"
,
"pages/goods-attribute/goods-attribute"
,
"pages/user-address/user-address"
,
"pages/user-address-save/user-address-save"
,
"pages/user-order/user-order"
,
...
...
sourcecode/toutiao/pages/cart/cart.ttml
浏览文件 @
5141582c
...
...
@@ -16,7 +16,7 @@
<view class="goods-title multi-text">{{item.title}}
</view>
<block tt:if="{{item.spec != null}}">
<view class="goods-
attribute
cr-888" tt:for="{{item.spec}}" tt:key="key" tt:for-item="spec">{{spec.type}}:{{spec.value}}</view>
<view class="goods-
spec
cr-888" tt:for="{{item.spec}}" tt:key="key" tt:for-item="spec">{{spec.type}}:{{spec.value}}</view>
</block>
</view>
<!-- 数量 -->
...
...
sourcecode/toutiao/pages/cart/cart.ttss
浏览文件 @
5141582c
...
...
@@ -14,7 +14,7 @@
.goods-item:not(:last-child) {
border-bottom: 1px solid #eee;
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
}
.goods-image {
...
...
sourcecode/toutiao/pages/goods-attribute/goods-attribute.js
已删除
100755 → 0
浏览文件 @
e89e815b
const
app
=
getApp
();
Page
({
data
:
{
goods_attribute
:
[],
},
onLoad
(
params
)
{
if
((
params
.
data
||
null
)
==
null
)
{
tt
.
alert
({
title
:
'
温馨提示
'
,
content
:
'
属性数据有误
'
,
buttonText
:
'
返回
'
,
success
:
()
=>
{
tt
.
navigateBack
();
}
});
}
else
{
this
.
setData
({
goods_attribute
:
JSON
.
parse
(
params
.
data
)});
}
},
onShow
()
{
tt
.
setNavigationBarTitle
({
title
:
app
.
data
.
common_pages_title
.
goods_attribute
});
},
});
sourcecode/toutiao/pages/goods-attribute/goods-attribute.json
已删除
100755 → 0
浏览文件 @
e89e815b
{
"enablePullDownRefresh"
:
false
}
\ No newline at end of file
sourcecode/toutiao/pages/goods-attribute/goods-attribute.ttml
已删除
100755 → 0
浏览文件 @
e89e815b
<view tt:if="{{goods_attribute.length > 0}}" class="goods-attribute bg-white">
<view tt:for="{{goods_attribute}}" class="item br-b oh">
<view class="title fl br-r">{{item.name}}</view>
<view class="content cr-888 fl">
<text tt:for="{{item.find}}" tt:for-index="keys" tt:for-item="items">
<text>{{items.name}}</text>
<text tt:if="{{keys < item.find.length-1}}"> , </text>
</text>
</view>
</view>
</view>
<view class="nav-back tc wh-auto">
<navigator open-type="navigateBack" hover-class="none">
<button type="default" size="mini" class="cr-888" hover-class="none">返回</button>
</navigator>
</view>
sourcecode/toutiao/pages/goods-attribute/goods-attribute.ttss
已删除
100755 → 0
浏览文件 @
e89e815b
.goods-attribute {
padding: 0 10rpx;
}
.goods-attribute .item {
padding: 20rpx 0;
}
.goods-attribute .item .title {
width: 25%;
}
.goods-attribute .item .content {
width: calc(75% - 30rpx);
margin-left: 20rpx;
}
.goods-attribute .item view {
line-height: 46rpx;
}
\ No newline at end of file
sourcecode/toutiao/pages/goods-detail/goods-detail.js
浏览文件 @
5141582c
...
...
@@ -94,11 +94,6 @@ Page({
// 获取数据列表
init
()
{
// 数据初始化
this
.
setData
({
temp_attribute_active
:
{}
});
// 参数校验
if
((
this
.
data
.
params
.
goods_id
||
null
)
==
null
)
{
...
...
@@ -264,13 +259,6 @@ Page({
this
.
init
();
},
// 进入商品属性事件
good_attribute_nav_event
(
e
)
{
tt
.
navigateTo
({
url
:
"
/pages/goods-attribute/goods-attribute?data=
"
+
JSON
.
stringify
(
this
.
data
.
goods_attribute_show
)
});
},
// 购买弹层关闭
popup_close_event
(
e
)
{
this
.
setData
({
popup_status
:
false
});
...
...
sourcecode/toutiao/pages/goods-detail/goods-detail.ttml
浏览文件 @
5141582c
...
...
@@ -48,7 +48,7 @@
<text class="sales-price">{{price_symbol}}{{goods.price}}</text>
<view tt:if="{{(goods.original_price || null) != null && goods.original_price != '0.00'}}" class="original-price">{{price_symbol}}{{goods.original_price}}</view>
</view>
<view class="base-grid oh">
<view class="base-grid
br-t
oh">
<view class="fl tl">
<text class="cr-888">累计销量</text>
<text class="cr-main">{{goods.sales_count}}</text>
...
...
@@ -91,30 +91,30 @@
<!-- 属性导航 -->
<!-- <view tt:if="{{false}}" class="spacing">
<view class="goods-
attr
-show-title bg-white arrow-right cr-666" bindtap="good_attribute_nav_event">
<view class="goods-
spec
-show-title bg-white arrow-right cr-666" bindtap="good_attribute_nav_event">
属性
</view>
</view> -->
<!-- 商品详情 -->
<view class="goods-detail spacing">
<view class="goods-detail spacing
-mt spacing bg-white
">
<view class="spacing-nav-title">
<text class="line"></text>
<text class="text-wrapper">详情</text>
<text class="text-wrapper">
商品
详情</text>
</view>
<!-- 是否详情展示相册 -->
<block tt:if="{{common_is_goods_detail_show_photo == 1 && goods_photo.length > 0}}">
<view tt:for="{{goods_photo}}" tt:key="key" class="goods-detail-photo
bg-white
">
<view tt:for="{{goods_photo}}" tt:key="key" class="goods-detail-photo">
<image tt:if="{{(item.images || null) != null}}" bindtap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
</view>
</block>
<!-- web详情 -->
<view tt:if="{{common_app_is_use_mobile_detail == 0}}"
class="bg-white"
>
<view tt:if="{{common_app_is_use_mobile_detail == 0}}">
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
</view>
<!-- 手机独立详情 -->
<block tt:if="{{common_app_is_use_mobile_detail == 1 && goods_content_app.length > 0}}">
<view tt:for="{{goods_content_app}}" tt:key="key" class="goods-detail-app
bg-white
">
<view tt:for="{{goods_content_app}}" tt:key="key" class="goods-detail-app">
<image tt:if="{{(item.images || null) != null}}" bindtap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
<view tt:if="{{(item.content || null) != null}}" class="content-items">
<view tt:for="{{item.content}}" tt:for-item="items">{{items}}</view>
...
...
@@ -176,8 +176,8 @@
</view>
<view class="goods-popup-content">
<!-- 商品
属性
-->
<view tt:if="{{goods_specifications_choose.length > 0}}" class="goods-
attr
-choose">
<!-- 商品
规格
-->
<view tt:if="{{goods_specifications_choose.length > 0}}" class="goods-
spec
-choose">
<view tt:for="{{goods_specifications_choose}}" tt:key="key" tt:for-index="key" class="item br-b">
<view class="title">{{item.name}}</view>
<view tt:if="{{item.value.length > 0}}" class="spec">
...
...
sourcecode/toutiao/pages/goods-detail/goods-detail.ttss
浏览文件 @
5141582c
...
...
@@ -2,12 +2,6 @@
height: 55vh !important;
display: block;
}
.goods-attr-show-title {
height: 80rpx;
line-height: 80rpx;
padding: 0 10rpx;
}
.goods-popup {
padding: 20rpx 10rpx;
position: relative;
...
...
@@ -43,14 +37,14 @@
overflow-x: hidden;
margin-top: 20rpx;
}
.goods-
attr
-choose .item {
.goods-
spec
-choose .item {
margin-bottom: 30rpx;
padding-bottom: 30rpx;
}
.goods-popup-content .title {
font-size: 36rpx;
}
.goods-
attr
-choose .item .spec button {
.goods-
spec
-choose .item .spec button {
margin-top: 20rpx;
margin-right: 25rpx;
padding: 0 30rpx;
...
...
@@ -60,7 +54,7 @@
height: 27px;
border: 1px solid #d5d5d5;
}
.goods-
attr
-choose .item .spec button image {
.goods-
spec
-choose .item .spec button image {
width: 20px;
height: 20px;
vertical-align: middle;
...
...
@@ -87,7 +81,7 @@
.spec-items-disabled image {
opacity: 0.3;
}
.goods-
attr
-choose .item .spec button,
.goods-
spec
-choose .item .spec button,
.goods-popup-submit
{
border-radius: 50rpx;
...
...
@@ -206,7 +200,6 @@
.goods-base .base-grid {
margin-top: 15rpx;
padding-top: 15rpx;
border-top: 1px solid #f5f5f5;
}
.goods-base .base-grid view {
width: calc(33.33% - 1px);
...
...
sourcecode/toutiao/pages/user-order-detail/user-order-detail.ttml
浏览文件 @
5141582c
...
...
@@ -23,7 +23,7 @@
<view class="goods-base">
<view class="goods-title multi-text">{{item.title}}</view>
<block tt:if="{{item.spec != null}}">
<view class="goods-
attribute
cr-888" tt:for="{{item.spec}}" tt:key="spec" tt:for-item="spec">
<view class="goods-
spec
cr-888" tt:for="{{item.spec}}" tt:key="spec" tt:for-item="spec">
{{spec.type}}:{{spec.value}}
</view>
</block>
...
...
sourcecode/toutiao/pages/user-order-detail/user-order-detail.ttss
浏览文件 @
5141582c
...
...
@@ -47,7 +47,7 @@
.goods-item {
padding: 20rpx 10rpx;
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
}
.goods-image {
...
...
sourcecode/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttml
浏览文件 @
5141582c
...
...
@@ -7,7 +7,7 @@
<view class="goods-base">
<view class="goods-title multi-text">{{order_data.items.title}}</view>
<block tt:if="{{order_data.items.spec != null}}">
<view class="goods-
attribute
cr-888" tt:for="{{order_data.items.spec}}" tt:for-item="spec" tt:key="spec">
<view class="goods-
spec
cr-888" tt:for="{{order_data.items.spec}}" tt:for-item="spec" tt:key="spec">
{{spec.type}}:{{spec.value}}
</view>
</block>
...
...
sourcecode/toutiao/pages/user-orderaftersale-detail/user-orderaftersale-detail.ttss
浏览文件 @
5141582c
...
...
@@ -11,7 +11,7 @@
.goods-item {
padding: 20rpx 10rpx;
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
}
.goods-image {
...
...
sourcecode/weixin/app.js
浏览文件 @
5141582c
...
...
@@ -39,7 +39,6 @@ App({
common_pages_title
:
{
"
goods_search
"
:
"
商品搜索
"
,
"
goods_detail
"
:
"
商品详情
"
,
"
goods_attribute
"
:
"
属性
"
,
"
user_address
"
:
"
我的地址
"
,
"
user_address_save_add
"
:
"
新增地址
"
,
"
user_address_save_edit
"
:
"
编辑地址
"
,
...
...
@@ -67,15 +66,16 @@ App({
// 请求地址
request_url
:
"
{{request_url}}
"
,
//
request_url: 'http://shopxo.com/',
//
request_url: 'https://dev.shopxo.net/',
request_url
:
'
http://shopxo.com/
'
,
request_url
:
'
https://dev.shopxo.net/
'
,
// 基础信息
application_title
:
"
{{application_title}}
"
,
application_describe
:
"
{{application_describe}}
"
,
// 价格符号
price_symbol
:
"
{{price_symbol}}
"
price_symbol
:
"
{{price_symbol}}
"
,
price_symbol
:
"
¥
"
},
/**
...
...
sourcecode/weixin/app.json
浏览文件 @
5141582c
...
...
@@ -11,7 +11,6 @@
"pages/goods-search/goods-search"
,
"pages/goods-detail/goods-detail"
,
"pages/goods-comment/goods-comment"
,
"pages/goods-attribute/goods-attribute"
,
"pages/user-address/user-address"
,
"pages/user-address-save/user-address-save"
,
"pages/user-order/user-order"
,
...
...
sourcecode/weixin/pages/cart/cart.wxml
浏览文件 @
5141582c
...
...
@@ -16,7 +16,7 @@
<view class="goods-title multi-text">{{item.title}}
</view>
<block wx:if="{{item.spec != null}}">
<view class="goods-
attribute
cr-888" wx:for="{{item.spec}}" wx:key="key" wx:for-item="spec">{{spec.type}}:{{spec.value}}</view>
<view class="goods-
spec
cr-888" wx:for="{{item.spec}}" wx:key="key" wx:for-item="spec">{{spec.type}}:{{spec.value}}</view>
</block>
</view>
<!-- 数量 -->
...
...
sourcecode/weixin/pages/cart/cart.wxss
浏览文件 @
5141582c
...
...
@@ -14,7 +14,7 @@
.goods-item:not(:last-child) {
border-bottom: 1px solid #eee;
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
}
.goods-image {
...
...
sourcecode/weixin/pages/goods-attribute/goods-attribute.js
已删除
100755 → 0
浏览文件 @
e89e815b
const
app
=
getApp
();
Page
({
data
:
{
goods_attribute
:
[],
},
onLoad
(
params
)
{
if
((
params
.
data
||
null
)
==
null
)
{
wx
.
alert
({
title
:
'
温馨提示
'
,
content
:
'
属性数据有误
'
,
buttonText
:
'
返回
'
,
success
:
()
=>
{
wx
.
navigateBack
();
}
});
}
else
{
this
.
setData
({
goods_attribute
:
JSON
.
parse
(
params
.
data
)});
}
},
onShow
()
{
wx
.
setNavigationBarTitle
({
title
:
app
.
data
.
common_pages_title
.
goods_attribute
});
},
});
sourcecode/weixin/pages/goods-attribute/goods-attribute.json
已删除
100755 → 0
浏览文件 @
e89e815b
{
"enablePullDownRefresh"
:
false
}
\ No newline at end of file
sourcecode/weixin/pages/goods-attribute/goods-attribute.wxml
已删除
100755 → 0
浏览文件 @
e89e815b
<view wx:if="{{goods_attribute.length > 0}}" class="goods-attribute bg-white">
<view wx:for="{{goods_attribute}}" class="item br-b oh">
<view class="title fl br-r">{{item.name}}</view>
<view class="content cr-888 fl">
<text wx:for="{{item.find}}" wx:for-index="keys" wx:for-item="items">
<text>{{items.name}}</text>
<text wx:if="{{keys < item.find.length-1}}"> , </text>
</text>
</view>
</view>
</view>
<view class="nav-back tc wh-auto">
<navigator open-type="navigateBack" hover-class="none">
<button type="default" size="mini" class="cr-888" hover-class="none">返回</button>
</navigator>
</view>
sourcecode/weixin/pages/goods-attribute/goods-attribute.wxss
已删除
100755 → 0
浏览文件 @
e89e815b
.goods-attribute {
padding: 0 10rpx;
}
.goods-attribute .item {
padding: 20rpx 0;
}
.goods-attribute .item .title {
width: 25%;
}
.goods-attribute .item .content {
width: calc(75% - 30rpx);
margin-left: 20rpx;
}
.goods-attribute .item view {
line-height: 46rpx;
}
\ No newline at end of file
sourcecode/weixin/pages/goods-detail/goods-detail.js
浏览文件 @
5141582c
...
...
@@ -84,7 +84,7 @@ Page({
params
=
app
.
launch_params_handle
(
params
);
// 参数赋值,初始化
//params['goods_id']=
2;
params
[
'
goods_id
'
]
=
1
2
;
this
.
setData
({
params
:
params
});
this
.
init
();
...
...
@@ -98,11 +98,6 @@ Page({
// 获取数据列表
init
()
{
// 数据初始化
this
.
setData
({
temp_attribute_active
:
{}
});
// 参数校验
if
((
this
.
data
.
params
.
goods_id
||
null
)
==
null
)
{
...
...
@@ -269,13 +264,6 @@ Page({
this
.
init
();
},
// 进入商品属性事件
good_attribute_nav_event
(
e
)
{
wx
.
navigateTo
({
url
:
"
/pages/goods-attribute/goods-attribute?data=
"
+
JSON
.
stringify
(
this
.
data
.
goods_attribute_show
)
});
},
// 购买弹层关闭
popup_close_event
(
e
)
{
this
.
setData
({
popup_status
:
false
});
...
...
sourcecode/weixin/pages/goods-detail/goods-detail.wxml
浏览文件 @
5141582c
...
...
@@ -46,7 +46,7 @@
<text class="sales-price">{{price_symbol}}{{goods.price}}</text>
<view wx:if="{{(goods.original_price || null) != null && goods.original_price != '0.00'}}" class="original-price">{{price_symbol}}{{goods.original_price}}</view>
</view>
<view class="base-grid oh">
<view class="base-grid
br-t
oh">
<view class="fl tl">
<text class="cr-888">累计销量</text>
<text class="cr-main">{{goods.sales_count}}</text>
...
...
@@ -64,6 +64,18 @@
</view>
</view>
<!-- 商品基础参数 -->
<view wx:if="{{(goods.parameters || null) != null && (goods.parameters.base || null) != null}}" class="goods-parameters parameters-base br-t bg-white spacing">
<view class="content-item oh">
<block wx:for="{{goods.parameters.base}}" wx:key="item">
<view class="item single-text">
<text class="name">{{item.name}}:</text>
<text class="value">{{item.value}}</text>
</view>
</block>
</view>
</view>
<!-- 优惠劵 -->
<view wx:if="{{(plugins_coupon_data || null) != null && plugins_coupon_data.data.length > 0}}" class="coupon-container wh-auto spacing-mt bg-white">
<scroll-view scroll-x="true">
...
...
@@ -87,32 +99,41 @@
</scroll-view>
</view>
<!-- 属性导航 -->
<!-- <view wx:if="{{false}}" class="spacing">
<view class="goods-attr-show-title bg-white arrow-right cr-666" bindtap="good_attribute_nav_event">
属性
<!-- 商品详情参数 -->
<view wx:if="{{(goods.parameters || null) != null && (goods.parameters.detail || null) != null}}" class="goods-parameters spacing-mt bg-white">
<view class="spacing-nav-title">
<text class="line"></text>
<text class="text-wrapper">商品参数</text>
</view>
</view> -->
<view class="content-item oh">
<block wx:for="{{goods.parameters.detail}}" wx:key="item">
<view class="item single-text">
<text class="name">{{item.name}}:</text>
<text class="value">{{item.value}}</text>
</view>
</block>
</view>
</view>
<!-- 商品详情 -->
<view class="goods-detail spacing">
<view class="goods-detail spacing
-mt spacing bg-white
">
<view class="spacing-nav-title">
<text class="line"></text>
<text class="text-wrapper">详情</text>
<text class="text-wrapper">
商品
详情</text>
</view>
<!-- 是否详情展示相册 -->
<block wx:if="{{common_is_goods_detail_show_photo == 1 && goods_photo.length > 0}}">
<view wx:for="{{goods_photo}}" wx:key="key" class="goods-detail-photo
bg-white
">
<view wx:for="{{goods_photo}}" wx:key="key" class="goods-detail-photo">
<image wx:if="{{(item.images || null) != null}}" bindtap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
</view>
</block>
<!-- web详情 -->
<view wx:if="{{common_app_is_use_mobile_detail == 0}}"
class="bg-white"
>
<view wx:if="{{common_app_is_use_mobile_detail == 0}}">
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
</view>
<!-- 手机独立详情 -->
<block wx:if="{{common_app_is_use_mobile_detail == 1 && goods_content_app.length > 0}}">
<view wx:for="{{goods_content_app}}" wx:key="key" class="goods-detail-app
bg-white
">
<view wx:for="{{goods_content_app}}" wx:key="key" class="goods-detail-app">
<image wx:if="{{(item.images || null) != null}}" bindtap="goods_detail_images_view_event" data-value="{{item.images}}" class="wh-auto dis-block" src="{{item.images}}" mode="widthFix" />
<view wx:if="{{(item.content || null) != null}}" class="content-items">
<view wx:for="{{item.content}}" wx:for-item="items">{{items}}</view>
...
...
@@ -174,8 +195,8 @@
</view>
<view class="goods-popup-content">
<!-- 商品
属性
-->
<view wx:if="{{goods_specifications_choose.length > 0}}" class="goods-
attr
-choose">
<!-- 商品
规格
-->
<view wx:if="{{goods_specifications_choose.length > 0}}" class="goods-
spec
-choose">
<view wx:for="{{goods_specifications_choose}}" wx:key="key" wx:for-index="key" class="item br-b">
<view class="title">{{item.name}}</view>
<view wx:if="{{item.value.length > 0}}" class="spec">
...
...
sourcecode/weixin/pages/goods-detail/goods-detail.wxss
浏览文件 @
5141582c
...
...
@@ -2,12 +2,6 @@
height: 55vh !important;
display: block;
}
.goods-attr-show-title {
height: 80rpx;
line-height: 80rpx;
padding: 0 10rpx;
}
.goods-popup {
padding: 20rpx 10rpx;
position: relative;
...
...
@@ -43,14 +37,14 @@
overflow-x: hidden;
margin-top: 20rpx;
}
.goods-
attr
-choose .item {
.goods-
spec
-choose .item {
margin-bottom: 30rpx;
padding-bottom: 30rpx;
}
.goods-popup-content .title {
font-size: 36rpx;
}
.goods-
attr
-choose .item .spec button {
.goods-
spec
-choose .item .spec button {
margin-top: 20rpx;
margin-right: 25rpx;
padding: 0 30rpx;
...
...
@@ -60,7 +54,7 @@
height: 27px;
border: 1px solid #d5d5d5;
}
.goods-
attr
-choose .item .spec button image {
.goods-
spec
-choose .item .spec button image {
width: 20px;
height: 20px;
vertical-align: middle;
...
...
@@ -87,7 +81,7 @@
.spec-items-disabled image {
opacity: 0.3;
}
.goods-
attr
-choose .item .spec button,
.goods-
spec
-choose .item .spec button,
.goods-popup-submit
{
border-radius: 50rpx;
...
...
@@ -205,7 +199,6 @@
.goods-base .base-grid {
margin-top: 15rpx;
padding-top: 15rpx;
border-top: 1px solid #f5f5f5;
}
.goods-base .base-grid view {
width: calc(33.33% - 1px);
...
...
@@ -344,4 +337,27 @@
*/
.goods-buy-nav .buy-nav-submit-full button {
width: 100%;
}
/*
* 商品参数
*/
.parameters-base .content-item .item {
color: #666;
}
.goods-parameters .content-item {
padding-bottom: 10rpx;
}
.goods-parameters .content-item .item {
padding: 5rpx 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
sourcecode/weixin/pages/user-order-detail/user-order-detail.wxml
浏览文件 @
5141582c
...
...
@@ -23,7 +23,7 @@
<view class="goods-base">
<view class="goods-title multi-text">{{item.title}}</view>
<block wx:if="{{item.spec != null}}">
<view class="goods-
attribute
cr-888" wx:for="{{item.spec}}" wx:key="spec" wx:for-item="spec">
<view class="goods-
spec
cr-888" wx:for="{{item.spec}}" wx:key="spec" wx:for-item="spec">
{{spec.type}}:{{spec.value}}
</view>
</block>
...
...
sourcecode/weixin/pages/user-order-detail/user-order-detail.wxss
浏览文件 @
5141582c
...
...
@@ -47,7 +47,7 @@
.goods-item {
padding: 20rpx 10rpx;
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
}
.goods-image {
...
...
sourcecode/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxml
浏览文件 @
5141582c
...
...
@@ -7,7 +7,7 @@
<view class="goods-base">
<view class="goods-title multi-text">{{order_data.items.title}}</view>
<block wx:if="{{order_data.items.spec != null}}">
<view class="goods-
attribute
cr-888" wx:for="{{order_data.items.spec}}" wx:for-item="spec" wx:key="spec">
<view class="goods-
spec
cr-888" wx:for="{{order_data.items.spec}}" wx:for-item="spec" wx:key="spec">
{{spec.type}}:{{spec.value}}
</view>
</block>
...
...
sourcecode/weixin/pages/user-orderaftersale-detail/user-orderaftersale-detail.wxss
浏览文件 @
5141582c
...
...
@@ -11,7 +11,7 @@
.goods-item {
padding: 20rpx 10rpx;
}
.goods-title, .goods-
attribute
{
.goods-title, .goods-
spec
{
margin-bottom: 10rpx;
}
.goods-image {
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录