Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
jamesyang1999
ShopXO
提交
4c4c22c8
ShopXO
项目概览
jamesyang1999
/
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,发现更多精彩内容 >>
提交
4c4c22c8
编写于
12月 02, 2019
作者:
D
devil_gong
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
新增商品详情展示相册
上级
0c9ebcf3
变更
23
展开全部
显示空白变更内容
内联
并排
Showing
23 changed file
with
136 addition
and
44 deletion
+136
-44
application/admin/view/default/site/goods.html
application/admin/view/default/site/goods.html
+33
-0
application/admin/view/default/site/nav.html
application/admin/view/default/site/nav.html
+3
-0
application/api/controller/Goods.php
application/api/controller/Goods.php
+1
-0
application/index/controller/Goods.php
application/index/controller/Goods.php
+3
-0
application/index/view/default/goods/index.html
application/index/view/default/goods/index.html
+13
-1
config/shopxo.sql
config/shopxo.sql
+33
-33
public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
...c/appmini/old/alipay/pages/goods-detail/goods-detail.axml
+6
-0
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
+2
-0
public/appmini/old/baidu/pages/goods-detail/goods-detail.js
public/appmini/old/baidu/pages/goods-detail/goods-detail.js
+2
-0
public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
...ic/appmini/old/baidu/pages/goods-detail/goods-detail.swan
+6
-0
public/appmini/old/qq/pages/goods-detail/goods-detail.js
public/appmini/old/qq/pages/goods-detail/goods-detail.js
+2
-0
public/appmini/old/qq/pages/goods-detail/goods-detail.qml
public/appmini/old/qq/pages/goods-detail/goods-detail.qml
+6
-0
public/appmini/old/toutiao/pages/buy/buy.ttml
public/appmini/old/toutiao/pages/buy/buy.ttml
+1
-1
public/appmini/old/toutiao/pages/common/nodata.ttml
public/appmini/old/toutiao/pages/common/nodata.ttml
+2
-2
public/appmini/old/toutiao/pages/goods-comment/goods-comment.ttml
...ppmini/old/toutiao/pages/goods-comment/goods-comment.ttml
+1
-1
public/appmini/old/toutiao/pages/goods-detail/goods-detail.js
...ic/appmini/old/toutiao/pages/goods-detail/goods-detail.js
+2
-0
public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml
.../appmini/old/toutiao/pages/goods-detail/goods-detail.ttml
+7
-1
public/appmini/old/toutiao/pages/paytips/paytips.ttml
public/appmini/old/toutiao/pages/paytips/paytips.ttml
+1
-1
public/appmini/old/toutiao/pages/user-address/user-address.ttml
.../appmini/old/toutiao/pages/user-address/user-address.ttml
+1
-1
public/appmini/old/toutiao/pages/user-order/user-order.ttml
public/appmini/old/toutiao/pages/user-order/user-order.ttml
+2
-2
public/appmini/old/toutiao/pages/user-orderaftersale/user-orderaftersale.ttml
...outiao/pages/user-orderaftersale/user-orderaftersale.ttml
+1
-1
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
+2
-0
public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
...c/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
+6
-0
未找到文件。
application/admin/view/default/site/goods.html
0 → 100644
浏览文件 @
4c4c22c8
{{include file="public/header" /}}
<!-- right content start -->
<div
class=
"content-right"
>
<div
class=
"content"
>
<!-- table nav start -->
{{include file="site/nav" /}}
<!-- table nav end -->
<!-- form start -->
<form
class=
"am-form form-validation view-save"
action=
"{{:MyUrl('admin/site/save')}}"
method=
"POST"
request-type=
"ajax-url"
request-value=
"{{:MyUrl('admin/site/index', ['nav_type'=>'goods'])}}"
enctype=
"multipart/form-data"
>
<div
class=
"am-form-group"
>
<label>
{{$data.common_is_goods_detail_show_photo.name}}
<span
class=
"am-form-group-label-tips"
>
{{$data.common_is_goods_detail_show_photo.describe}}
</span></label>
<select
name=
"{{$data.common_is_goods_detail_show_photo.only_tag}}"
class=
"am-radius chosen-select"
data-validation-message=
"{{$data.common_is_goods_detail_show_photo.error_tips}}"
required
>
{{foreach $common_is_text_list as $v}}
<option
value=
"{{$v.id}}"
{{
if
isset
($
data
['
common_is_goods_detail_show_photo
']['
value
'])
and
$
data
['
common_is_goods_detail_show_photo
']['
value
']
eq
$
v
['
id
']}}
selected
{{/
if
}}
>
{{$v.name}}
</option>
{{/foreach}}
</select>
</div>
<div
class=
"am-form-group am-form-group-refreshing"
>
<input
type=
"hidden"
name=
"nav_type"
value=
"{{$nav_type}}"
/>
<button
type=
"submit"
class=
"am-btn am-btn-primary am-radius btn-loading-example am-btn-sm am-btn-block"
data-am-loading=
"{loadingText:'处理中...'}"
>
保存
</button>
</div>
</form>
<!-- form end -->
</div>
</div>
<!-- right content end -->
<!-- footer start -->
{{include file="public/footer" /}}
<!-- footer end -->
\ No newline at end of file
application/admin/view/default/site/nav.html
浏览文件 @
4c4c22c8
...
@@ -29,6 +29,9 @@
...
@@ -29,6 +29,9 @@
<li
{{
if
$
nav_type
eq
'
search
'}}
class=
"am-active"
{{/
if
}}
data-type=
"search"
>
<li
{{
if
$
nav_type
eq
'
search
'}}
class=
"am-active"
{{/
if
}}
data-type=
"search"
>
<a
href=
"{{:MyUrl('admin/site/index', ['nav_type'=>'search'])}}"
>
搜索
</a>
<a
href=
"{{:MyUrl('admin/site/index', ['nav_type'=>'search'])}}"
>
搜索
</a>
</li>
</li>
<li
{{
if
$
nav_type
eq
'
goods
'}}
class=
"am-active"
{{/
if
}}
data-type=
"goods"
>
<a
href=
"{{:MyUrl('admin/site/index', ['nav_type'=>'goods'])}}"
>
商品
</a>
</li>
<li
{{
if
$
nav_type
eq
'
extends
'}}
class=
"am-active"
{{/
if
}}
data-type=
"extends"
>
<li
{{
if
$
nav_type
eq
'
extends
'}}
class=
"am-active"
{{/
if
}}
data-type=
"extends"
>
<a
href=
"{{:MyUrl('admin/site/index', ['nav_type'=>'extends'])}}"
>
扩展项
</a>
<a
href=
"{{:MyUrl('admin/site/index', ['nav_type'=>'extends'])}}"
>
扩展项
</a>
</li>
</li>
...
...
application/api/controller/Goods.php
浏览文件 @
4c4c22c8
...
@@ -129,6 +129,7 @@ class Goods extends Common
...
@@ -129,6 +129,7 @@ class Goods extends Common
'common_app_is_poster_share'
=>
(
int
)
MyC
(
'common_app_is_poster_share'
),
'common_app_is_poster_share'
=>
(
int
)
MyC
(
'common_app_is_poster_share'
),
'common_cart_total'
=>
BuyService
::
UserCartTotal
([
'user'
=>
$this
->
user
]),
'common_cart_total'
=>
BuyService
::
UserCartTotal
([
'user'
=>
$this
->
user
]),
'customer_service_tel'
=>
MyC
(
'common_app_customer_service_tel'
,
null
,
true
),
'customer_service_tel'
=>
MyC
(
'common_app_customer_service_tel'
,
null
,
true
),
'common_is_goods_detail_show_photo'
=>
MyC
(
'common_is_goods_detail_show_photo'
,
0
,
true
),
// 站点模式
// 站点模式
'common_site_type'
=>
(
int
)
MyC
(
'common_site_type'
,
0
,
true
),
'common_site_type'
=>
(
int
)
MyC
(
'common_site_type'
,
0
,
true
),
...
...
application/index/controller/Goods.php
浏览文件 @
4c4c22c8
...
@@ -132,6 +132,9 @@ class Goods extends Common
...
@@ -132,6 +132,9 @@ class Goods extends Common
// 站点类型 - 展示型模式操作名称
// 站点类型 - 展示型模式操作名称
$this
->
assign
(
'common_is_exhibition_mode_btn_text'
,
MyC
(
'common_is_exhibition_mode_btn_text'
,
'立即咨询'
,
true
));
$this
->
assign
(
'common_is_exhibition_mode_btn_text'
,
MyC
(
'common_is_exhibition_mode_btn_text'
,
'立即咨询'
,
true
));
// 是否商品详情页展示相册
$this
->
assign
(
'common_is_goods_detail_show_photo'
,
MyC
(
'common_is_goods_detail_show_photo'
,
0
,
true
));
return
$this
->
fetch
();
return
$this
->
fetch
();
}
}
}
}
...
...
application/index/view/default/goods/index.html
浏览文件 @
4c4c22c8
...
@@ -485,12 +485,24 @@
...
@@ -485,12 +485,24 @@
</div>
</div>
{{/if}}
{{/if}}
<!-- 详情内容 -->
<div
class=
"details"
>
<div
class=
"details"
>
<div
class=
"spacing-nav-title"
>
<div
class=
"spacing-nav-title"
>
<span
class=
"line"
></span>
<span
class=
"line"
></span>
<span
class=
"text-wrapper"
>
商品细节
</span>
<span
class=
"text-wrapper"
>
商品细节
</span>
</div>
</div>
<div
class=
"detail-content"
>
{{$goods.content_web|raw}}
</div>
<div
class=
"detail-content"
>
{{if isset($common_is_goods_detail_show_photo) and $common_is_goods_detail_show_photo eq 1 and !empty($goods.photo)}}
<div
class=
"content-photo"
>
{{foreach $goods.photo as $photo}}
<li>
<img
src=
"{{$photo.images}}"
title=
"{{$goods.title}}"
/>
</li>
{{/foreach}}
</div>
{{/if}}
<div
class=
"content-web"
>
{{$goods.content_web|raw}}
</div>
</div>
</div>
</div>
</div>
</div>
...
...
config/shopxo.sql
浏览文件 @
4c4c22c8
此差异已折叠。
点击以展开。
public/appmini/old/alipay/pages/goods-detail/goods-detail.axml
浏览文件 @
4c4c22c8
...
@@ -102,6 +102,12 @@
...
@@ -102,6 +102,12 @@
<text class="line"></text>
<text class="line"></text>
<text class="text-wrapper">详情</text>
<text class="text-wrapper">详情</text>
</view>
</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">
<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详情 -->
<!-- web详情 -->
<view a:if="{{common_app_is_use_mobile_detail == 0}}" class="bg-white">
<view a:if="{{common_app_is_use_mobile_detail == 0}}" class="bg-white">
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
...
...
public/appmini/old/alipay/pages/goods-detail/goods-detail.js
浏览文件 @
4c4c22c8
...
@@ -34,6 +34,7 @@ Page({
...
@@ -34,6 +34,7 @@ Page({
goods_video_is_autoplay
:
false
,
goods_video_is_autoplay
:
false
,
common_app_is_use_mobile_detail
:
1
,
common_app_is_use_mobile_detail
:
1
,
common_is_goods_detail_show_photo
:
0
,
// 在线客服
// 在线客服
common_app_is_online_service
:
0
,
common_app_is_online_service
:
0
,
...
@@ -130,6 +131,7 @@ Page({
...
@@ -130,6 +131,7 @@ Page({
show_field_price_text
:
(
data
.
goods
.
show_field_price_text
==
'
销售价
'
)
?
null
:
(
data
.
goods
.
show_field_price_text
.
replace
(
/<
[^
>
]
+>/g
,
""
)
||
null
),
show_field_price_text
:
(
data
.
goods
.
show_field_price_text
==
'
销售价
'
)
?
null
:
(
data
.
goods
.
show_field_price_text
.
replace
(
/<
[^
>
]
+>/g
,
""
)
||
null
),
common_app_is_use_mobile_detail
:
data
.
common_app_is_use_mobile_detail
||
0
,
common_app_is_use_mobile_detail
:
data
.
common_app_is_use_mobile_detail
||
0
,
common_is_goods_detail_show_photo
:
data
.
common_is_goods_detail_show_photo
||
0
,
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
plugins_limitedtimediscount_data
:
data
.
plugins_limitedtimediscount_data
||
null
,
plugins_limitedtimediscount_data
:
data
.
plugins_limitedtimediscount_data
||
null
,
...
...
public/appmini/old/baidu/pages/goods-detail/goods-detail.js
浏览文件 @
4c4c22c8
...
@@ -33,6 +33,7 @@ Page({
...
@@ -33,6 +33,7 @@ Page({
goods_video_is_autoplay
:
false
,
goods_video_is_autoplay
:
false
,
common_app_is_use_mobile_detail
:
1
,
common_app_is_use_mobile_detail
:
1
,
common_is_goods_detail_show_photo
:
0
,
common_app_is_online_service
:
0
,
common_app_is_online_service
:
0
,
...
@@ -124,6 +125,7 @@ Page({
...
@@ -124,6 +125,7 @@ Page({
show_field_price_text
:
data
.
goods
.
show_field_price_text
==
'
销售价
'
?
null
:
data
.
goods
.
show_field_price_text
.
replace
(
/<
[^
>
]
+>/g
,
""
)
||
null
,
show_field_price_text
:
data
.
goods
.
show_field_price_text
==
'
销售价
'
?
null
:
data
.
goods
.
show_field_price_text
.
replace
(
/<
[^
>
]
+>/g
,
""
)
||
null
,
common_app_is_use_mobile_detail
:
data
.
common_app_is_use_mobile_detail
||
0
,
common_app_is_use_mobile_detail
:
data
.
common_app_is_use_mobile_detail
||
0
,
common_is_goods_detail_show_photo
:
data
.
common_is_goods_detail_show_photo
||
0
,
common_app_is_online_service
:
data
.
common_app_is_online_service
||
0
,
common_app_is_online_service
:
data
.
common_app_is_online_service
||
0
,
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
...
...
public/appmini/old/baidu/pages/goods-detail/goods-detail.swan
浏览文件 @
4c4c22c8
...
@@ -95,6 +95,12 @@
...
@@ -95,6 +95,12 @@
<text class="line"></text>
<text class="line"></text>
<text class="text-wrapper">详情</text>
<text class="text-wrapper">详情</text>
</view>
</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">
<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详情 -->
<!-- web详情 -->
<view s-if="common_app_is_use_mobile_detail == 0" class="bg-white">
<view s-if="common_app_is_use_mobile_detail == 0" class="bg-white">
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
...
...
public/appmini/old/qq/pages/goods-detail/goods-detail.js
浏览文件 @
4c4c22c8
...
@@ -33,6 +33,7 @@ Page({
...
@@ -33,6 +33,7 @@ Page({
goods_video_is_autoplay
:
false
,
goods_video_is_autoplay
:
false
,
common_app_is_use_mobile_detail
:
1
,
common_app_is_use_mobile_detail
:
1
,
common_is_goods_detail_show_photo
:
0
,
common_app_is_online_service
:
0
,
common_app_is_online_service
:
0
,
...
@@ -144,6 +145,7 @@ Page({
...
@@ -144,6 +145,7 @@ Page({
show_field_price_text
:
(
data
.
goods
.
show_field_price_text
==
'
销售价
'
)
?
null
:
(
data
.
goods
.
show_field_price_text
.
replace
(
/<
[^
>
]
+>/g
,
""
)
||
null
),
show_field_price_text
:
(
data
.
goods
.
show_field_price_text
==
'
销售价
'
)
?
null
:
(
data
.
goods
.
show_field_price_text
.
replace
(
/<
[^
>
]
+>/g
,
""
)
||
null
),
common_app_is_use_mobile_detail
:
data
.
common_app_is_use_mobile_detail
||
0
,
common_app_is_use_mobile_detail
:
data
.
common_app_is_use_mobile_detail
||
0
,
common_is_goods_detail_show_photo
:
data
.
common_is_goods_detail_show_photo
||
0
,
//common_app_is_online_service: data.common_app_is_online_service || 0,
//common_app_is_online_service: data.common_app_is_online_service || 0,
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
...
...
public/appmini/old/qq/pages/goods-detail/goods-detail.qml
浏览文件 @
4c4c22c8
...
@@ -102,6 +102,12 @@
...
@@ -102,6 +102,12 @@
<
text
class
=
"
line
"
><
/text
>
<
text
class
=
"
line
"
><
/text
>
<
text
class
=
"
text-wrapper
"
>
详情
<
/text
>
<
text
class
=
"
text-wrapper
"
>
详情
<
/text
>
<
/view
>
<
/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
"
>
<
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详情
-->
<!--
web详情
-->
<
view
qq
:
if
=
"
{{common_app_is_use_mobile_detail == 0}}
"
class
=
"
bg-white
"
>
<
view
qq
:
if
=
"
{{common_app_is_use_mobile_detail == 0}}
"
class
=
"
bg-white
"
>
<
rich
-
text
nodes
=
"
{{goods.content_web || ''}}
"
><
/rich-text
>
<
rich
-
text
nodes
=
"
{{goods.content_web || ''}}
"
><
/rich-text
>
...
...
public/appmini/old/toutiao/pages/buy/buy.ttml
浏览文件 @
4c4c22c8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<import src="/pages/common/nodata.ttml" />
<import src="/pages/common/nodata.ttml" />
<template is="nodata" data="{{status: 2, msg: '展示型不允许提交订单'}}"></template>
<template is="nodata" data="{{status: 2, msg: '展示型不允许提交订单'}}"></template>
</block>
</block>
<block
wx
:else>
<block
tt
:else>
<view tt:if="{{goods_list.length > 0}}" class="page">
<view tt:if="{{goods_list.length > 0}}" class="page">
<!-- 地址 -->
<!-- 地址 -->
<block tt:if="{{common_site_type == 0 || common_site_type == 2}}">
<block tt:if="{{common_site_type == 0 || common_site_type == 2}}">
...
...
public/appmini/old/toutiao/pages/common/nodata.ttml
浏览文件 @
4c4c22c8
...
@@ -5,13 +5,13 @@
...
@@ -5,13 +5,13 @@
</view>
</view>
<!-- 2 处理错误 -->
<!-- 2 处理错误 -->
<view
wx
:elif="{{status == 2}}" class="no-data-box tc">
<view
tt
:elif="{{status == 2}}" class="no-data-box tc">
<image src="/images/error.png" mode="widthFix" />
<image src="/images/error.png" mode="widthFix" />
<view class="no-data-tips">{{msg || '处理错误'}}</view>
<view class="no-data-tips">{{msg || '处理错误'}}</view>
</view>
</view>
<!-- 0 默认没有数据 -->
<!-- 0 默认没有数据 -->
<view
wx
:elif="{{status == 0}}" class="no-data-box tc">
<view
tt
:elif="{{status == 0}}" class="no-data-box tc">
<image src="/images/empty.png" mode="widthFix" />
<image src="/images/empty.png" mode="widthFix" />
<view class="no-data-tips">{{msg || '没有相关数据'}}</view>
<view class="no-data-tips">{{msg || '没有相关数据'}}</view>
</view>
</view>
...
...
public/appmini/old/toutiao/pages/goods-comment/goods-comment.ttml
浏览文件 @
4c4c22c8
...
@@ -10,7 +10,7 @@
...
@@ -10,7 +10,7 @@
<view tt:if="{{item.portion > 0}}" class="progress-bar {{progress_class[index]}}" style="width: {{item.portion}}%;">{{item.name}}</view>
<view tt:if="{{item.portion > 0}}" class="progress-bar {{progress_class[index]}}" style="width: {{item.portion}}%;">{{item.name}}</view>
</block>
</block>
</block>
</block>
<text
wx
:else class="cr-888">暂无评分</text>
<text
tt
:else class="cr-888">暂无评分</text>
</view>
</view>
</view>
</view>
...
...
public/appmini/old/toutiao/pages/goods-detail/goods-detail.js
浏览文件 @
4c4c22c8
...
@@ -33,6 +33,7 @@ Page({
...
@@ -33,6 +33,7 @@ Page({
goods_video_is_autoplay
:
false
,
goods_video_is_autoplay
:
false
,
common_app_is_use_mobile_detail
:
1
,
common_app_is_use_mobile_detail
:
1
,
common_is_goods_detail_show_photo
:
0
,
common_app_is_online_service
:
0
,
common_app_is_online_service
:
0
,
...
@@ -144,6 +145,7 @@ Page({
...
@@ -144,6 +145,7 @@ Page({
show_field_price_text
:
(
data
.
goods
.
show_field_price_text
==
'
销售价
'
)
?
null
:
(
data
.
goods
.
show_field_price_text
.
replace
(
/<
[^
>
]
+>/g
,
""
)
||
null
),
show_field_price_text
:
(
data
.
goods
.
show_field_price_text
==
'
销售价
'
)
?
null
:
(
data
.
goods
.
show_field_price_text
.
replace
(
/<
[^
>
]
+>/g
,
""
)
||
null
),
common_app_is_use_mobile_detail
:
data
.
common_app_is_use_mobile_detail
||
0
,
common_app_is_use_mobile_detail
:
data
.
common_app_is_use_mobile_detail
||
0
,
common_is_goods_detail_show_photo
:
data
.
common_is_goods_detail_show_photo
||
0
,
//common_app_is_online_service: data.common_app_is_online_service || 0,
//common_app_is_online_service: data.common_app_is_online_service || 0,
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
...
...
public/appmini/old/toutiao/pages/goods-detail/goods-detail.ttml
浏览文件 @
4c4c22c8
...
@@ -102,6 +102,12 @@
...
@@ -102,6 +102,12 @@
<text class="line"></text>
<text class="line"></text>
<text class="text-wrapper">详情</text>
<text class="text-wrapper">详情</text>
</view>
</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">
<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详情 -->
<!-- web详情 -->
<view tt:if="{{common_app_is_use_mobile_detail == 0}}" class="bg-white">
<view tt:if="{{common_app_is_use_mobile_detail == 0}}" class="bg-white">
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
...
@@ -138,7 +144,7 @@
...
@@ -138,7 +144,7 @@
</block>
</block>
<!-- 销售型,自提点,虚拟销售 -->
<!-- 销售型,自提点,虚拟销售 -->
<block
wx
:else>
<block
tt
:else>
<button class="bg-warning fl" type="default" bindtap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">加入购物车</button>
<button class="bg-warning fl" type="default" bindtap="cart_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">加入购物车</button>
<button class="bg-main fl" type="default" bindtap="buy_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">{{nav_submit_text}}</button>
<button class="bg-main fl" type="default" bindtap="buy_submit_event" hover-class="none" disabled="{{nav_submit_is_disabled}}">{{nav_submit_text}}</button>
</block>
</block>
...
...
public/appmini/old/toutiao/pages/paytips/paytips.ttml
浏览文件 @
4c4c22c8
<view class="content">
<view class="content">
<image class="pay-icon" tt:if="{{params.code == '9000'}}" mode="widthFix" src="{{default_round_success_icon}}" />
<image class="pay-icon" tt:if="{{params.code == '9000'}}" mode="widthFix" src="{{default_round_success_icon}}" />
<image class="pay-icon"
wx
:else mode="widthFix" src="{{default_round_error_icon}}" />
<image class="pay-icon"
tt
:else mode="widthFix" src="{{default_round_error_icon}}" />
<text class="dis-block">{{params.msg}}</text>
<text class="dis-block">{{params.msg}}</text>
<view tt:if="{{params.code == '9000'}}" class="price-box">
<view tt:if="{{params.code == '9000'}}" class="price-box">
<text class="sales-price">¥{{params.total_price}}</text>
<text class="sales-price">¥{{params.total_price}}</text>
...
...
public/appmini/old/toutiao/pages/user-address/user-address.ttml
浏览文件 @
4c4c22c8
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
<view class="operation br-t oh">
<view class="operation br-t oh">
<view class="default fl" bindtap="address_default_event" data-value="{{item.id}}">
<view class="default fl" bindtap="address_default_event" data-value="{{item.id}}">
<image tt:if="{{is_default == item.id}}" class="item-icon" src="/images/default-select-active-icon.png" mode="widthFix" />
<image tt:if="{{is_default == item.id}}" class="item-icon" src="/images/default-select-active-icon.png" mode="widthFix" />
<image
wx
:else class="item-icon" src="/images/default-select-icon.png" mode="widthFix" />
<image
tt
:else class="item-icon" src="/images/default-select-icon.png" mode="widthFix" />
<text>设为默认地址</text>
<text>设为默认地址</text>
</view>
</view>
<button class="fr cr-666 delete-submit br" type="default" size="mini" bindtap="address_delete_event" data-index="{{index}}" data-value="{{item.id}}" hover-class="none">删除</button>
<button class="fr cr-666 delete-submit br" type="default" size="mini" bindtap="address_delete_event" data-index="{{index}}" data-value="{{item.id}}" hover-class="none">删除</button>
...
...
public/appmini/old/toutiao/pages/user-order/user-order.ttml
浏览文件 @
4c4c22c8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<view class="nav">
<view class="nav">
<block tt:for="{{nav_status_list}}" tt:key="key">
<block tt:for="{{nav_status_list}}" tt:key="key">
<view tt:if="{{nav_status_index == index}}" class="item fl tc cr-main" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
<view tt:if="{{nav_status_index == index}}" class="item fl tc cr-main" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
<view
wx
:else class="item fl tc" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
<view
tt
:else class="item fl tc" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
</block>
</block>
</view>
</view>
...
@@ -65,5 +65,5 @@
...
@@ -65,5 +65,5 @@
</view>
</view>
</view>
</view>
</view>
</view>
<view
wx
:else class="payment-list oh bg-white tc cr-888">没有支付方式</view>
<view
tt
:else class="payment-list oh bg-white tc cr-888">没有支付方式</view>
</component-popup>
</component-popup>
\ No newline at end of file
public/appmini/old/toutiao/pages/user-orderaftersale/user-orderaftersale.ttml
浏览文件 @
4c4c22c8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
<view class="nav">
<view class="nav">
<block tt:for="{{nav_status_list}}" tt:key="key">
<block tt:for="{{nav_status_list}}" tt:key="key">
<view tt:if="{{nav_status_index == index}}" class="item fl tc cr-main" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
<view tt:if="{{nav_status_index == index}}" class="item fl tc cr-main" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
<view
wx
:else class="item fl tc" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
<view
tt
:else class="item fl tc" data-index="{{index}}" bindtap="nav_event">{{item.name}}</view>
</block>
</block>
</view>
</view>
...
...
public/appmini/old/weixin/pages/goods-detail/goods-detail.js
浏览文件 @
4c4c22c8
...
@@ -33,6 +33,7 @@ Page({
...
@@ -33,6 +33,7 @@ Page({
goods_video_is_autoplay
:
false
,
goods_video_is_autoplay
:
false
,
common_app_is_use_mobile_detail
:
1
,
common_app_is_use_mobile_detail
:
1
,
common_is_goods_detail_show_photo
:
0
,
popup_share_status
:
false
,
popup_share_status
:
false
,
common_app_is_online_service
:
0
,
common_app_is_online_service
:
0
,
...
@@ -145,6 +146,7 @@ Page({
...
@@ -145,6 +146,7 @@ Page({
show_field_price_text
:
(
data
.
goods
.
show_field_price_text
==
'
销售价
'
)
?
null
:
(
data
.
goods
.
show_field_price_text
.
replace
(
/<
[^
>
]
+>/g
,
""
)
||
null
),
show_field_price_text
:
(
data
.
goods
.
show_field_price_text
==
'
销售价
'
)
?
null
:
(
data
.
goods
.
show_field_price_text
.
replace
(
/<
[^
>
]
+>/g
,
""
)
||
null
),
common_app_is_use_mobile_detail
:
data
.
common_app_is_use_mobile_detail
||
0
,
common_app_is_use_mobile_detail
:
data
.
common_app_is_use_mobile_detail
||
0
,
common_is_goods_detail_show_photo
:
data
.
common_is_goods_detail_show_photo
||
0
,
common_app_is_online_service
:
data
.
common_app_is_online_service
||
0
,
common_app_is_online_service
:
data
.
common_app_is_online_service
||
0
,
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
common_app_is_limitedtimediscount
:
data
.
common_app_is_limitedtimediscount
||
0
,
...
...
public/appmini/old/weixin/pages/goods-detail/goods-detail.wxml
浏览文件 @
4c4c22c8
...
@@ -100,6 +100,12 @@
...
@@ -100,6 +100,12 @@
<text class="line"></text>
<text class="line"></text>
<text class="text-wrapper">详情</text>
<text class="text-wrapper">详情</text>
</view>
</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">
<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详情 -->
<!-- web详情 -->
<view wx:if="{{common_app_is_use_mobile_detail == 0}}" class="bg-white">
<view wx:if="{{common_app_is_use_mobile_detail == 0}}" class="bg-white">
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
<rich-text nodes="{{goods.content_web || ''}}"></rich-text>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录