提交 e1a3c993 编写于 作者: D devil

价格符号统一配置

上级 04a2f8c8
......@@ -154,6 +154,9 @@ class Common extends Controller
$this->assign('controller_name', $controller_name);
$this->assign('action_name', $action_name);
// 价格符号
$this->assign('price_symbol', config('shopxo.price_symbol'));
// 控制器静态文件状态css,js
$module_css = $module_name.DS.$default_theme.DS.'css'.DS.$controller_name;
$module_css .= file_exists(ROOT_PATH.'static'.DS.$module_css.'.'.$action_name.'.css') ? '.'.$action_name.'.css' : '.css';
......
......@@ -42,7 +42,7 @@ class Theme extends Common
$this->IsPower();
// 小导航
$this->view_type = input('view_type', 'home');
$this->view_type = input('view_type', 'index');
}
/**
......@@ -57,7 +57,10 @@ class Theme extends Common
// 导航参数
$this->assign('view_type', $this->view_type);
if($this->view_type == 'home')
// 应用商店
$this->assign('store_theme_url', StoreService::StoreThemeUrl());
if($this->view_type == 'index')
{
// 模板列表
$this->assign('data_list', ThemeService::ThemeList());
......@@ -65,14 +68,8 @@ class Theme extends Common
// 默认主题
$theme = MyC('common_default_theme', 'default', true);
$this->assign('theme', empty($theme) ? 'default' : $theme);
// 应用商店
$this->assign('store_theme_url', StoreService::StoreThemeUrl());
return $this->fetch('index');
} else {
return $this->fetch('upload');
}
return $this->fetch($this->view_type);
}
/**
......
......@@ -144,7 +144,7 @@
</a>
<a class="am-text-top" href="{{$v.goods.goods_url}}" target="_blank">{{$v.goods.title}}</a>
</div>
<p>{{$v.goods.price}}</p>
<p>{{$price_symbol}}{{$v.goods.price}}</p>
{{else /}}
商品信息异常
{{/if}}
......@@ -215,7 +215,7 @@
</a>
<a class="am-text-top" href="{{$v.goods.goods_url}}" target="_blank">{{$v.goods.title}}</a>
</div>
<p>{{$v.goods.price}}</p>
<p>{{$price_symbol}}{{$v.goods.price}}</p>
{{else /}}
商品信息异常
{{/if}}
......
......@@ -18,7 +18,7 @@
</a>
<a class="am-text-top" href="{{$data.goods.goods_url}}" target="_blank">{{$data.goods.title}}</a>
</div>
<p>{{$data.goods.price}}</p>
<p>{{$price_symbol}}{{$data.goods.price}}</p>
{{else /}}
商品信息异常
{{/if}}
......
......@@ -131,9 +131,9 @@
</div>
</div>
{{if $v.order_data.items.original_price gt 0}}
<p class="original-price">{{$v.order_data.items.original_price}}</p>
<p class="original-price">{{$price_symbol}}{{$v.order_data.items.original_price}}</p>
{{/if}}
<p class="line-price">{{$v.order_data.items.price}} x {{$v.order_data.items.buy_number}}</p>
<p class="line-price">{{$price_symbol}}{{$v.order_data.items.price}} x {{$v.order_data.items.buy_number}}</p>
</td>
<td class="user-info am-hide-md-down">
{{if !empty($v['user'])}}
......@@ -152,7 +152,7 @@
类型:{{$v.type_text}}<br />
原因:{{$v.reason}}<br />
数量:{{$v.number}}<br />
金额:<span class="am-text-danger">{{$v.price}}</span><br />
金额:<span class="am-text-danger">{{$price_symbol}}{{$v.price}}</span><br />
说明:{{$v.msg}}<br />
时间:{{$v.apply_time_time}}
</td>
......@@ -216,9 +216,9 @@
</div>
</div>
{{if $v.order_data.items.original_price gt 0}}
<p class="original-price">{{$v.order_data.items.original_price}}</p>
<p class="original-price">{{$price_symbol}}{{$v.order_data.items.original_price}}</p>
{{/if}}
<p class="line-price">{{$v.order_data.items.price}} x {{$v.order_data.items.buy_number}}</p>
<p class="line-price">{{$price_symbol}}{{$v.order_data.items.price}} x {{$v.order_data.items.buy_number}}</p>
</dd>
<dt>用户信息</dt>
......@@ -241,7 +241,7 @@
类型:{{$v.type_text}}<br />
原因:{{$v.reason}}<br />
数量:{{$v.number}}<br />
金额:<span class="am-text-danger">{{$v.price}}</span><br />
金额:<span class="am-text-danger">{{$price_symbol}}{{$v.price}}</span><br />
说明:{{$v.msg}}<br />
时间:{{$v.apply_time_time}}
</dd>
......
......@@ -138,10 +138,10 @@
{{if empty($v['buyer_user'])}}<span class="cr-ddd">未填写</span>{{else /}}{{$v.buyer_user}}{{/if}}
</td>
<td>
{{if empty($v['pay_price'])}}<span class="cr-ddd">未填写</span>{{else /}}<span class="am-text-danger">{{$v.pay_price}}</span>{{/if}}
{{if empty($v['pay_price'])}}<span class="cr-ddd">未填写</span>{{else /}}<span class="am-text-danger">{{$price_symbol}}{{$v.pay_price}}</span>{{/if}}
</td>
<td>
{{if empty($v['total_price'])}}<span class="cr-ddd">未填写</span>{{else /}}{{$v.total_price}}{{/if}}
{{if empty($v['total_price'])}}<span class="cr-ddd">未填写</span>{{else /}}{{$price_symbol}}{{$v.total_price}}{{/if}}
</td>
<td class="am-hide-sm-only">
{{if empty($v['subject'])}}<span class="cr-ddd">未填写</span>{{else /}}{{$v.subject}}{{/if}}
......
......@@ -6,6 +6,6 @@
<a href="{{:MyUrl('admin/pluginsadmin/index', ['view_type'=>'upload'])}}">上传应用</a>
</li>
<li class="fr">
<a class="am-margin-left-sm" href="{{$store_url}}" target="_blank">更多支付插件下载 <i class="am-icon-external-link"></i></a>
<a class="am-margin-left-sm" href="{{$store_url}}" target="_blank">更多插件下载 <i class="am-icon-external-link"></i></a>
</li>
</ul>
\ No newline at end of file
......@@ -45,6 +45,7 @@
</head>
<script type="text/javascript">
var __attachment_host__ = '{{$attachment_host}}';
var __price_symbol__ = '{{$price_symbol}}';
</script>
<body>
<!-- 公共顶部钩子 -->
......
......@@ -139,13 +139,13 @@
{{if empty($v['buyer_user'])}}<span class="cr-ddd">未填写</span>{{else /}}{{$v.buyer_user}}{{/if}}
</td>
<td>
{{if empty($v['refundment_text'])}}<span class="cr-ddd">未填写</span>{{else /}}<span class="am-text-success">{{$v.refundment_text}}</span>{{/if}}
{{if empty($v['refundment_text'])}}<span class="cr-ddd">未填写</span>{{else /}}<span class="am-text-success">{{$price_symbol}}{{$v.refundment_text}}</span>{{/if}}
</td>
<td>
{{if empty($v['refund_price'])}}<span class="cr-ddd">未填写</span>{{else /}}<span class="am-text-danger">{{$v.refund_price}}</span>{{/if}}
{{if empty($v['refund_price'])}}<span class="cr-ddd">未填写</span>{{else /}}<span class="am-text-danger">{{$price_symbol}}{{$v.refund_price}}</span>{{/if}}
</td>
<td>
{{if empty($v['pay_price'])}}<span class="cr-ddd">未填写</span>{{else /}}{{$v.pay_price}}{{/if}}
{{if empty($v['pay_price'])}}<span class="cr-ddd">未填写</span>{{else /}}{{$price_symbol}}{{$v.pay_price}}{{/if}}
</td>
<td class="am-hide-sm-only">
{{if empty($v['msg'])}}<span class="cr-ddd">未填写</span>{{else /}}{{$v.msg}}{{/if}}
......
<ul class="am-nav am-nav-pills table-nav">
<li {{if $view_type eq 'home'}}class="am-active"{{/if}}>
<a href="{{:MyUrl('admin/theme/index', ['view_type'=>'home'])}}">当前主题</a>
<li {{if $view_type eq 'index'}}class="am-active"{{/if}}>
<a href="{{:MyUrl('admin/theme/index', ['view_type'=>'index'])}}">当前主题</a>
</li>
<li {{if $view_type eq 'upload'}}class="am-active"{{/if}}>
<a href="{{:MyUrl('admin/theme/index', ['view_type'=>'upload'])}}">主题安装</a>
</li>
<li class="fr">
<a class="am-margin-left-sm" href="{{$store_theme_url}}" target="_blank">更多支付插件下载 <i class="am-icon-external-link"></i></a>
<a class="am-margin-left-sm" href="{{$store_theme_url}}" target="_blank">更多主题下载 <i class="am-icon-external-link"></i></a>
</li>
</ul>
\ No newline at end of file
......@@ -213,6 +213,9 @@ class Common extends Controller
// 公共参数
$this->assign('params', $this->params);
// 价格符号
$this->assign('price_symbol', config('shopxo.price_symbol'));
// 站点类型
$this->assign('common_site_type', MyC('common_site_type', 0, true));
......
......@@ -294,23 +294,23 @@
</div>
<div class="wap-base am-show-sm-only">
{{if $goods['original_price'] gt 0}}
<span class="original-price">{{$goods.original_price}}</span>
<span class="original-price">{{$price_symbol}}{{$goods.original_price}}</span>
{{/if}}
<strong class="total-price-content">{{$goods.price}}</strong>
<strong class="total-price-content">{{$price_symbol}}{{$goods.price}}</strong>
<span class="wap-number">x{{$goods.stock}}</span>
</div>
</td>
<td class="price am-hide-sm-only">
{{if $goods['original_price'] gt 0}}
<p class="original-price">{{$goods.original_price}}</p>
<p class="original-price">{{$price_symbol}}{{$goods.original_price}}</p>
{{/if}}
<p class="line-price">{{$goods.price}}</p>
<p class="line-price">{{$price_symbol}}{{$goods.price}}</p>
</td>
<td class="number am-hide-sm-only">
{{$goods.stock}} {{$goods.inventory_unit}}
</td>
<td class="total-price am-hide-sm-only">
<strong class="total-price-content">{{$goods.total_price}}</strong>
<strong class="total-price-content">{{$price_symbol}}{{$goods.total_price}}</strong>
</td>
</tr>
{{/foreach}}
......@@ -320,7 +320,7 @@
<!-- 含运费小计 -->
<div class="buy-point-discharge">
<p>
合计 <span></span><em class="pay-sum">{{$base.total_price}}</em>
合计 <span>{{$price_symbol}}</span><em class="pay-sum">{{$base.total_price}}</em>
</p>
</div>
{{else /}}
......@@ -401,7 +401,7 @@
<div class="base-real-pay">
<em>实付款:</em>
<span class="price">
<span></span>
<span>{{$price_symbol}}</span>
<em class="nav-total-price">{{$base.actual_price}}</em>
</span>
</div>
......
......@@ -54,17 +54,17 @@
</div>
<div class="wap-base am-show-sm-only">
{{if $goods['original_price'] gt 0}}
<span class="original-price">{{$goods.original_price}}</span>
<span class="original-price">{{$price_symbol}}{{$goods.original_price}}</span>
{{/if}}
<strong class="total-price-content">{{$goods.price}}</strong>
<strong class="total-price-content">{{$price_symbol}}{{$goods.price}}</strong>
<span class="wap-number">x{{$goods.stock}}</span>
</div>
</td>
<td class="price am-hide-sm-only">
{{if $goods['original_price'] gt 0}}
<p class="original-price">{{$goods.original_price}}</p>
<p class="original-price">{{$price_symbol}}{{$goods.original_price}}</p>
{{/if}}
<p class="line-price">{{$goods.price}}</p>
<p class="line-price">{{$price_symbol}}{{$goods.price}}</p>
</td>
<td class="number">
<div class="am-input-group am-input-group-sm stock-tag" data-inventory="{{$goods.inventory}}" data-price="{{$goods.price}}" data-ajax-url="{{:MyUrl('index/cart/Stock')}}">
......@@ -77,7 +77,7 @@
{{/if}}
</td>
<td class="total-price am-hide-sm-only">
<strong class="total-price-content">{{$goods.total_price}}</strong>
<strong class="total-price-content">{{$price_symbol}}{{$goods.total_price}}</strong>
</td>
<td class="operation">
<a href="javascript:;" class="submit-delete" data-url="{{:MyUrl('index/cart/delete')}}" data-id="{{$goods.id}}" data-view="fun" data-value="ViewDeleteBack">删除</a>
......@@ -100,7 +100,7 @@
<form action="{{:MyUrl('index/buy/index')}}" method="post">
<span class="selected-tips am-fl">已选商品 <strong>0</strong></span>
<span class="total-price-tips am-fl">合计:</span>
<strong class="nav-total-price am-fl">0.00</strong>
<strong class="nav-total-price am-fl">{{$price_symbol}}0.00</strong>
<input type="hidden" name="ids" value="0" />
<input type="hidden" name="buy_type" value="cart" />
<button type="submit" class="am-btn am-btn-primary separate-submit">结算</button>
......
......@@ -177,7 +177,7 @@
<div class="items price">
<dt>{{$goods.show_field_original_price_text|raw}}</dt>
<dd>
<b class="goods-original-price original-price-value" data-original-price="{{$goods.original_price}}">{{$goods.original_price}}</b>
<b class="goods-original-price original-price-value" data-original-price="{{$goods.original_price}}">{{$price_symbol}}{{$goods.original_price}}</b>
</dd>
</div>
{{/if}}
......@@ -200,7 +200,7 @@
<div class="items price iteminfo_mktprice">
<dt>{{if empty($goods['show_field_price_text'])}}销售价{{else /}}{{$goods.show_field_price_text|raw}}{{/if}}</dt>
<dd>
<em></em>
<em>{{$price_symbol}}</em>
<b class="goods-price" data-original-price="{{$goods.price}}">{{$goods.price}}</b>
</dd>
</div>
......@@ -300,7 +300,7 @@
<img src="{{$goods.images}}" />
</div>
<div class="text-info">
<span class="price-now" data-original-price="{{$goods.price}}">{{$goods.price}}</span>
<span class="price-now" data-original-price="{{$goods.price}}">{{$price_symbol}}{{$goods.price}}</span>
</div>
</div>
</form>
......@@ -443,7 +443,7 @@
<div class="p-name am-text-truncate-2 am-margin-vertical-xs ">
<a href="{{:$v['goods_url']}}" {{if !empty($v.title_color)}}style="color:{{$v.title_color}};"{{/if}}>{{$v.title}}</a>
</div>
<div class="p-price"><strong>{{$v.price}}</strong></div>
<div class="p-price"><strong>{{$price_symbol}}{{$v.price}}</strong></div>
</li>
{{/foreach}}
{{/if}}
......@@ -584,7 +584,7 @@
<p class="am-text-truncate-2 am-margin-bottom-xs" {{if !empty($v.title_color)}}style="color:{{$v.title_color}};"{{/if}}>{{$v.title}}</p>
</a>
<p class="price fl">
<strong>{{$v.price}}</strong>
<strong>{{$price_symbol}}{{$v.price}}</strong>
</p>
</div>
</li>
......
......@@ -140,7 +140,7 @@
{{if isset($floor['is_home_recommended']) and $floor['is_home_recommended'] eq 1}}
<div id="floor{{$key+1}}">
<div class="am-container">
<div class="items-nav-title">
<div class="items-nav-title" {{if !empty($floor['bg_color'])}}style="border-bottom: 2px solid {{$floor.bg_color}};"{{/if}}>
<p class="floor-title">{{$floor.name}}</p>
<p class="floor-desc">{{$floor.vice_name}}</p>
<div class="today-brands ">
......@@ -278,7 +278,7 @@
}
}
{{/php}}
<p class="price am-text-truncate">{{$goods.price}}</p>
<p class="price am-text-truncate">{{$price_symbol}}{{$goods.price}}</p>
</div>
<!-- 首页楼层商品内部底部钩子 -->
......
......@@ -56,17 +56,17 @@
</div>
<div class="wap-base am-show-sm-only">
{{if $goods['original_price'] gt 0}}
<span class="original-price">{{$goods.original_price}}</span>
<span class="original-price">{{$price_symbol}}{{$goods.original_price}}</span>
{{/if}}
<strong class="total-price-content">{{$goods.price}}</strong>
<strong class="total-price-content">{{$price_symbol}}{{$goods.price}}</strong>
<span class="wap-number">x{{$goods.buy_number}}</span>
</div>
</td>
<td class="price am-hide-sm-only">
{{if $goods['original_price'] gt 0}}
<p class="original-price">{{$goods.original_price}}</p>
<p class="original-price">{{$price_symbol}}{{$goods.original_price}}</p>
{{/if}}
<p class="line-price">{{$goods.price}} x {{$goods.buy_number}}</p>
<p class="line-price">{{$price_symbol}}{{$goods.price}} x {{$goods.buy_number}}</p>
</td>
<td>
<div class="rating-items">
......
......@@ -376,9 +376,9 @@
</div>
<div class="wap-base am-show-sm-only">
{{if $goods['original_price'] gt 0}}
<span class="original-price">{{$goods.original_price}}</span>
<span class="original-price">{{$price_symbol}}{{$goods.original_price}}</span>
{{/if}}
<strong class="total-price-content">{{$goods.price}}</strong>
<strong class="total-price-content">{{$price_symbol}}{{$goods.price}}</strong>
<span class="wap-number">x{{$goods.buy_number}}</span>
{{if isset($goods['returned_quantity']) and $goods['returned_quantity'] gt 0}}
<span class="am-badge am-round am-badge-warning">已退 {{$goods.returned_quantity}}</span>
......@@ -387,9 +387,9 @@
</td>
<td class="price am-hide-sm-only">
{{if $goods['original_price'] gt 0}}
<p class="original-price">{{$goods.original_price}}</p>
<p class="original-price">{{$price_symbol}}{{$goods.original_price}}</p>
{{/if}}
<p class="line-price">{{$goods.price}}</p>
<p class="line-price">{{$price_symbol}}{{$goods.price}}</p>
</td>
<td class="number am-hide-sm-only">
<span>x{{$goods.buy_number}}</span>
......@@ -398,7 +398,7 @@
{{/if}}
</td>
<td class="total-price am-hide-sm-only">
<strong class="total-price-content">{{$goods.total_price}}</strong>
<strong class="total-price-content">{{$price_symbol}}{{$goods.total_price}}</strong>
{{if isset($goods['refund_price']) and $goods['refund_price'] gt 0}}
<br /><span class="am-badge am-round am-badge-warning">已退 {{$goods.refund_price}}</span>
{{/if}}
......@@ -424,40 +424,40 @@
{{if !empty($data.price)}}
<div class="items am-cf">
<div class="items-title am-fl">商品总价:</div>
<div class="items-detail am-fl">{{$data.price}}</div>
<div class="items-detail am-fl">{{$price_symbol}}{{$data.price}}</div>
</div>
{{/if}}
{{if !empty($data.increase_price)}}
<div class="items am-cf">
<div class="items-title am-fl">增加金额:</div>
<div class="items-detail am-fl">+{{$data.increase_price}}</div>
<div class="items-detail am-fl">+{{$price_symbol}}{{$data.increase_price}}</div>
</div>
{{/if}}
{{if !empty($data.preferential_price)}}
<div class="items am-cf">
<div class="items-title am-fl">优惠金额:</div>
<div class="items-detail am-fl">-{{$data.preferential_price}}</div>
<div class="items-detail am-fl">-{{$price_symbol}}{{$data.preferential_price}}</div>
</div>
{{/if}}
{{if !empty($data.refund_price)}}
<div class="items am-cf">
<div class="items-title am-fl">退款金额:</div>
<div class="items-detail am-fl">
<span class="am-text-danger">-{{$data.refund_price}}</span>
<span class="am-text-danger">-{{$price_symbol}}{{$data.refund_price}}</span>
</div>
</div>
{{/if}}
{{if !empty($data.total_price)}}
<div class="items am-cf">
<div class="items-title am-fl">订单总价:</div>
<div class="items-detail am-fl line-price">{{$data.total_price}}</div>
<div class="items-detail am-fl line-price">{{$price_symbol}}{{$data.total_price}}</div>
</div>
{{/if}}
{{if !empty($data.pay_price)}}
<div class="items am-cf">
<div class="items-title am-fl">支付金额:</div>
<div class="items-detail am-fl">
<strong class="total-price-content">{{$data.pay_price}}</strong>
<strong class="total-price-content">{{$price_symbol}}{{$data.pay_price}}</strong>
</div>
</div>
{{/if}}
......
......@@ -170,9 +170,9 @@
</div>
<div class="wap-base am-show-sm-only">
{{if $goods['original_price'] gt 0}}
<span class="original-price">{{$goods.original_price}}</span>
<span class="original-price">{{$price_symbol}}{{$goods.original_price}}</span>
{{/if}}
<strong class="line-price">{{$goods.price}}</strong>
<strong class="line-price">{{$price_symbol}}{{$goods.price}}</strong>
<span class="wap-number">x{{$goods.buy_number}}</span>
{{if isset($goods['returned_quantity']) and $goods['returned_quantity'] gt 0}}
<span class="am-badge am-round am-badge-warning">已退 {{$goods.returned_quantity}}</span>
......@@ -181,9 +181,9 @@
</td>
<td class="row-price am-hide-sm-only">
{{if $goods['original_price'] gt 0}}
<p class="original-price">{{$goods.original_price}}</p>
<p class="original-price">{{$price_symbol}}{{$goods.original_price}}</p>
{{/if}}
<p class="line-price">{{$goods.price}}</p>
<p class="line-price">{{$price_symbol}}{{$goods.price}}</p>
</td>
<td class="row-number am-hide-sm-only">
<span>x{{$goods.buy_number}}</span>
......@@ -204,7 +204,7 @@
</td>
{{if $keys eq 0}}
<td class="row-total-price am-hide-sm-only" rowspan="{{$order.items_count}}">
<strong class="total-price-content">{{$order.total_price}}</strong>
<strong class="total-price-content">{{$price_symbol}}{{$order.total_price}}</strong>
{{if isset($order['refund_price']) and $order['refund_price'] gt 0}}
<br /><span class="am-badge am-round am-badge-warning">已退 {{$order.refund_price}}</span>
{{/if}}
......
......@@ -54,9 +54,9 @@
</td>
<td>
{{if $goods['original_price'] gt 0}}
<p class="original-price">{{$goods.original_price}}</p>
<p class="original-price">{{$price_symbol}}{{$goods.original_price}}</p>
{{/if}}
<p class="line-price">{{$goods.price}} x {{$goods.buy_number}}</p>
<p class="line-price">{{$price_symbol}}{{$goods.price}} x {{$goods.buy_number}}</p>
</td>
</tr>
</tbody>
......@@ -66,40 +66,40 @@
{{if !empty($order.price)}}
<div class="items am-cf">
<div class="items-title am-fl">商品总价:</div>
<div class="items-detail am-fl">{{$order.price}}</div>
<div class="items-detail am-fl">{{$price_symbol}}{{$order.price}}</div>
</div>
{{/if}}
{{if !empty($order.increase_price)}}
<div class="items am-cf">
<div class="items-title am-fl">增加金额:</div>
<div class="items-detail am-fl">+{{$order.increase_price}}</div>
<div class="items-detail am-fl">+{{$price_symbol}}{{$order.increase_price}}</div>
</div>
{{/if}}
{{if !empty($order.preferential_price)}}
<div class="items am-cf">
<div class="items-title am-fl">优惠金额:</div>
<div class="items-detail am-fl">-{{$order.preferential_price}}</div>
<div class="items-detail am-fl">-{{$price_symbol}}{{$order.preferential_price}}</div>
</div>
{{/if}}
{{if !empty($order.refund_price)}}
<div class="items am-cf">
<div class="items-title am-fl">退款金额:</div>
<div class="items-detail am-fl">
<span class="am-text-danger">-{{$order.refund_price}}</span>
<span class="am-text-danger">-{{$price_symbol}}{{$order.refund_price}}</span>
</div>
</div>
{{/if}}
{{if !empty($order.total_price)}}
<div class="items am-cf">
<div class="items-title am-fl">订单总价:</div>
<div class="items-detail am-fl line-price">{{$order.total_price}}</div>
<div class="items-detail am-fl line-price">{{$price_symbol}}{{$order.total_price}}</div>
</div>
{{/if}}
{{if !empty($order.pay_price)}}
<div class="items am-cf">
<div class="items-title am-fl">支付金额:</div>
<div class="items-detail am-fl">
<strong class="total-price-content">{{$order.pay_price}}</strong>
<strong class="total-price-content">{{$price_symbol}}{{$order.pay_price}}</strong>
</div>
</div>
{{/if}}
......@@ -197,7 +197,7 @@
</div>
<div class="am-cf am-padding-vertical-xs">
<span>退款金额:</span>
<span class="am-text-danger">{{$new_aftersale_data.price}}</span>
<span class="am-text-danger">{{$price_symbol}}{{$new_aftersale_data.price}}</span>
</div>
<div class="am-cf am-padding-vertical-xs">
<span>退款说明:</span>
......
......@@ -124,15 +124,15 @@
</div>
</div>
{{if $v.order_data.items.original_price gt 0}}
<p class="original-price">{{$v.order_data.items.original_price}}</p>
<p class="original-price">{{$price_symbol}}{{$v.order_data.items.original_price}}</p>
{{/if}}
<p class="line-price">{{$v.order_data.items.price}} x {{$v.order_data.items.buy_number}}</p>
<p class="line-price">{{$price_symbol}}{{$v.order_data.items.price}} x {{$v.order_data.items.buy_number}}</p>
</td>
<td>
类型:{{$v.type_text}}<br />
原因:{{$v.reason}}<br />
数量:{{$v.number}}<br />
金额:<span class="am-text-danger">{{$v.price}}</span><br />
金额:<span class="am-text-danger">{{$price_symbol}}{{$v.price}}</span><br />
说明:{{$v.msg}}<br />
时间:{{$v.apply_time_time}}
</td>
......
......@@ -56,6 +56,7 @@
var __attachment_host__ = '{{$attachment_host}}';
var __seo_url_suffix__ = '{{:MyC("home_seo_url_html_suffix", "html", true)}}';
var __user_id__ = {{if empty($user['id'])}}0{{else /}}{{$user.id}}{{/if}};
var __price_symbol__ = '{{$price_symbol}}';
</script>
<!-- 公共header内钩子 -->
......
......@@ -31,7 +31,7 @@
</a>
<p class="am-padding-horizontal-xs am-cf">
{{if isset($v['original_price']) and $v['original_price'] gt 0}}
<span class="am-fl original-price">{{$v.original_price}}</span>
<span class="am-fl original-price">{{$price_symbol}}{{$v.original_price}}</span>
{{/if}}
<span class="am-fr sales-count">销量 {{$v.sales_count}}</span>
</p>
......@@ -58,7 +58,7 @@
{{/php}}
<p class="price am-padding-horizontal-xs am-text-truncate">
<strong>{{$v.price}}</strong>
<strong>{{$price_symbol}}{{$v.price}}</strong>
</p>
<!-- 搜索页面商品信息底部钩子 -->
......
......@@ -195,7 +195,7 @@
<ul>
<li>
<span>{{$order.add_time_time}}</span>
<span class="line-price">{{$order.price}}</span>
<span class="line-price">{{$price_symbol}}{{$order.price}}</span>
</li>
<li>
<span>{{$order.status_name}}</span>
......@@ -253,7 +253,7 @@
<a href="{{:MyUrl('index/goods/index', ['id'=>$goods['goods_id']])}}" target="_blank" class="goods-title am-text-truncate">{{$goods.title}}</a>
<ul>
<li>
<span class="line-price">{{$goods.price}}</span>
<span class="line-price">{{$price_symbol}}{{$goods.price}}</span>
<span>x{{$goods.stock}}</span>
</li>
</ul>
......@@ -293,7 +293,7 @@
<a href="{{:MyUrl('index/goods/index', ['id'=>$goods['goods_id']])}}" target="_blank">
<img src="{{$goods.images}}" alt="{{$goods.title}}" class="am-img-thumbnail am-radius" />
<h3 class="am-gallery-title">{{$goods.title}}</h3>
<div class="am-gallery-desc line-price">{{$goods.min_price}}</div>
<div class="am-gallery-desc line-price">{{$price_symbol}}{{$goods.min_price}}</div>
</a>
</div>
</li>
......@@ -332,7 +332,7 @@
<img src="{{$goods.images}}" alt="{{$goods.title}}" class="am-img-thumbnail am-circle" />
<h3 class="am-gallery-title">{{$goods.title}}</h3>
</a>
<div class="am-gallery-desc line-price">{{$goods.min_price}}</div>
<div class="am-gallery-desc line-price">{{$price_symbol}}{{$goods.min_price}}</div>
</div>
</li>
{{/foreach}}
......
......@@ -59,9 +59,9 @@
</td>
<td>
{{if $v['original_price'] gt 0}}
<p class="original-price">{{$v.original_price}}</p>
<p class="original-price">{{$price_symbol}}{{$v.original_price}}</p>
{{/if}}
<p class="line-price">{{$v.price}}</p>
<p class="line-price">{{$price_symbol}}{{$v.price}}</p>
</td>
<td>
<button type="button" class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block am-icon-paint-brush submit-ajax" data-url="{{:MyUrl('index/userfavor/cancel')}}" data-id="{{$v.goods_id}}" data-view="delete"> 取消</button>
......
......@@ -59,9 +59,9 @@
</td>
<td>
{{if $v['original_price'] gt 0}}
<p class="original-price">{{$v.original_price}}</p>
<p class="original-price">{{$price_symbol}}{{$v.original_price}}</p>
{{/if}}
<p class="line-price">{{$v.price}}</p>
<p class="line-price">{{$price_symbol}}{{$v.price}}</p>
</td>
<td>
<button type="button" class="am-btn am-btn-danger am-btn-xs am-radius am-btn-block am-icon-trash-o submit-delete" data-url="{{:MyUrl('index/usergoodsbrowse/delete')}}" data-id="{{$v.id}}" data-view="delete"> 删除</button>
......
......@@ -146,7 +146,19 @@ class AppMiniService
// 替换内容
// app.js
$status = file_put_contents($new_dir.DS.'app.js', str_replace(['{{request_url}}', '{{application_title}}', '{{application_describe}}'], [__MY_URL__, $params['app_mini_title'], $params['app_mini_describe']], file_get_contents($new_dir.DS.'app.js')));
$search = [
'{{request_url}}',
'{{application_title}}',
'{{application_describe}}',
'{{price_symbol}}',
];
$replace = [
__MY_URL__,
$params['app_mini_title'],
$params['app_mini_describe'],
config('shopxo.price_symbol'),
];
$status = file_put_contents($new_dir.DS.'app.js', str_replace($search, $replace, file_get_contents($new_dir.DS.'app.js')));
if($status === false)
{
return DataReturn('基础配置替换失败', -4);
......
......@@ -865,7 +865,7 @@ class OrderService
$v['excel_export_items'] = $excel_export_items;
// 描述
$v['describe'] = '共'.$v['buy_number_count'].'件 合计:¥'.$v['total_price'].'元';
$v['describe'] = '共'.$v['buy_number_count'].'件 合计:'.config('shopxo.price_symbol').$v['total_price'].'元';
}
// 订单处理后钩子
......
......@@ -78,5 +78,8 @@ return [
// 坐标需要转换的平台
'coordinate_transformation' => ['alipay', 'weixin', 'toutiao', 'baidu'],
// 价格符号
'price_symbol' => '¥',
];
?>
\ No newline at end of file
因为 它太大了无法显示 source diff 。你可以改为 查看blob
......@@ -73,6 +73,9 @@ App({
// 基础信息
application_title: "{{application_title}}",
application_describe: "{{application_describe}}",
// 价格符号
price_symbol: "{{price_symbol}}"
},
/**
......
......@@ -45,9 +45,9 @@
</block>
</view>
<view class="oh goods-price">
<text class="sales-price">{{item.price}}
<text class="sales-price">{{price_symbol}}{{item.price}}
</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{item.original_price}}
<text a:if="{{item.original_price > 0}}" class="original-price">{{price_symbol}}{{item.original_price}}
</text>
<text class="buy-number cr-888">x{{item.stock}}
</text>
......@@ -91,7 +91,7 @@
<view class="buy-nav oh wh-auto">
<view class="nav-base bg-white fl single-text">
<text>合计:</text>
<text class="sales-price">{{total_price}}</text>
<text class="sales-price">{{price_symbol}}{{total_price}}</text>
</view>
<view class="fr nav-submit">
<button class="bg-main wh-auto" type="default" onTap="buy_submit_event" disabled="{{buy_submit_disabled_status}}" hover-class="none">提交订单</button>
......@@ -120,7 +120,7 @@
<view class="item spacing-mt bg-white" style="border:1px solid {{item.coupon.bg_color_value}};">
<view class="v-left fl">
<view class="base single-text" style="color:{{item.coupon.bg_color_value}};">
<text class="symbol"></text>
<text class="symbol">{{price_symbol}}</text>
<text class="price">{{item.coupon.discount_value}}</text>
<text class="unit">{{item.coupon.type_unit}}</text>
<text a:if="{{(item.coupon.desc || null) != null}}" class="desc cr-888">{{item.coupon.desc}}</text>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list_loding_status: 1,
buy_submit_disabled_status: false,
data_list_loding_msg: '',
......
......@@ -28,8 +28,8 @@
<!-- 价格 -->
<view class="oh goods-price">
<text class="sales-price">{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{item.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{price_symbol}}{{item.original_price}}</text>
<text class="buy-number cr-888">x{{item.stock}}</text>
<!-- 错误 -->
......@@ -58,7 +58,7 @@
<text>全选</text>
</view>
<view class="fr price">
<view class="sales-price single-text fr">{{total_price}}</view>
<view class="sales-price single-text fr">{{price_symbol}}{{total_price}}</view>
<view class="fr">合计:</view>
</view>
</view>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list_loding_status: 1,
data_list_loding_msg: '购物车空空如也',
data_bottom_line_status: false,
......
......@@ -45,8 +45,8 @@
</button>
</view>
<text a:if="{{(show_field_price_text || null) != null}}" class="price-icon">{{show_field_price_text}}</text>
<text class="sales-price">{{goods.price}}</text>
<view a:if="{{(goods.original_price || null) != null && goods.original_price != '0.00'}}" class="original-price">{{goods.original_price}}</view>
<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="fl tl">
......@@ -73,7 +73,7 @@
<view class="item bg-white {{item.is_operable == 0 ? 'item-disabled' : ''}}" style="border:1px solid {{item.bg_color_value}};">
<view class="v-left fl">
<view class="base single-text" style="color:{{item.bg_color_value}};">
<text class="symbol"></text>
<text class="symbol">{{price_symbol}}</text>
<text class="price">{{item.discount_value}}</text>
<text class="unit">{{item.type_unit}}</text>
</view>
......@@ -164,8 +164,8 @@
<image src="{{goods_spec_base_images}}" mode="scaleToFill" class="br" />
<view class="goods-popup-base-content">
<view class="goods-price">
<view class="sales-price">{{goods_spec_base_price}}</view>
<view a:if="{{(goods_spec_base_original_price || null) != null && goods_spec_base_original_price > 0}}" class="original-price">{{goods_spec_base_original_price}}</view>
<view class="sales-price">{{price_symbol}}{{goods_spec_base_price}}</view>
<view a:if="{{(goods_spec_base_original_price || null) != null && goods_spec_base_original_price > 0}}" class="original-price">{{price_symbol}}{{goods_spec_base_original_price}}</view>
</view>
<view class="inventory">
<text class="cr-888">库存</text>
......
......@@ -2,6 +2,8 @@ const app = getApp();
import parse from 'mini-html-parser2';
Page({
data: {
price_symbol: app.data.price_symbol,
indicator_dots: false,
indicator_color: 'rgba(0, 0, 0, .3)',
indicator_active_color: '#e31c55',
......
......@@ -20,7 +20,7 @@
<view class="base">
<view class="single-text">{{item.title}}</view>
<view class="price">
<text class="sales-price">{{item.min_price}}</text>
<text class="sales-price">{{price_symbol}}{{item.min_price}}</text>
</view>
</view>
</navigator>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list_loding_status: 1,
data_bottom_line_status: false,
data_list: [],
......
......@@ -21,7 +21,7 @@
<!-- 限时秒杀 -->
<view a:if="{{common_app_is_limitedtimediscount == 1}}">
<import src="/pages/lib/limitedtimediscount/home.axml" />
<template is="limitedtimediscount" data="{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_timer_title: plugins_limitedtimediscount_timer_title}}"></template>
<template is="limitedtimediscount" data="{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_timer_title: plugins_limitedtimediscount_timer_title, price_symbol: price_symbol}}"></template>
</view>
<!-- 楼层数据 -->
......@@ -51,7 +51,7 @@
<image src="{{goods.home_recommended_images}}" mode="aspectFit" />
<view class="goods-base">
<view class="goods-title single-text">{{goods.title}}</view>
<view class="sales-price">{{goods.min_price}}</view>
<view class="sales-price">{{price_symbol}}{{goods.min_price}}</view>
</view>
</navigator>
</view>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
load_status: 0,
data_list_loding_status: 1,
data_bottom_line_status: false,
......
......@@ -21,8 +21,8 @@
<image class="dis-block" src="{{item.images}}" mode="aspectFit"></image>
<view class="goods-base">
<view class="goods-title single-text">{{item.title}}</view>
<view class="goods-price single-text">{{item.price}}</view>
<view a:if="{{(item.original_price || null) != null}}" class="goods-original-price single-text">{{item.original_price}}</view>
<view class="goods-price single-text">{{price_symbol}}{{item.price}}</view>
<view a:if="{{(item.original_price || null) != null}}" class="goods-original-price single-text">{{price_symbol}}{{item.original_price}}</view>
<button size="mini">抢购</button>
</view>
</navigator>
......
......@@ -3,7 +3,7 @@
<image class="pay-icon" a:else mode="widthFix" src="{{default_round_error_icon}}" />
<text class="dis-block">{{params.msg}}</text>
<view a:if="{{params.code == '9000'}}" class="price-box">
<text class="sales-price">{{params.total_price}}</text>
<text class="sales-price">{{price_symbol}}{{params.total_price}}</text>
<text class="price-unit cr-888">元</text>
</view>
</view>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
params: {},
default_round_success_icon: app.data.default_round_success_icon,
default_round_error_icon: app.data.default_round_error_icon,
......
......@@ -6,7 +6,7 @@
<view class="item spacing-mt bg-white {{item.is_operable == 0 ? 'item-disabled' : ''}}" style="border:1px solid {{item.bg_color_value}};">
<view class="v-left fl">
<view class="base single-text" style="color:{{item.bg_color_value}};">
<text class="symbol"></text>
<text class="symbol">{{price_symbol}}</text>
<text class="price">{{item.discount_value}}</text>
<text class="unit">{{item.type_unit}}</text>
<text a:if="{{(item.desc || null) != null}}" class="desc cr-888">{{item.desc}}</text>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
......
......@@ -14,7 +14,7 @@
<view class="item spacing-mt bg-white" style="border:1px solid {{item.coupon.bg_color_value}};">
<view class="v-left fl">
<view class="base single-text" style="color:{{item.coupon.bg_color_value}};">
<text class="symbol"></text>
<text class="symbol">{{price_symbol}}</text>
<text class="price">{{item.coupon.discount_value}}</text>
<text class="unit">{{item.coupon.type_unit}}</text>
<text a:if="{{(item.coupon.desc || null) != null}}" class="desc cr-888">{{item.coupon.desc}}</text>
......@@ -38,7 +38,7 @@
<view class="item spacing-mt bg-white item-disabled">
<view class="v-left fl">
<view class="base single-text">
<text class="symbol"></text>
<text class="symbol">{{price_symbol}}</text>
<text class="price">{{item.coupon.discount_value}}</text>
<text class="unit">{{item.type_unit}}</text>
<text a:if="{{(item.coupon.desc || null) != null}}" class="desc cr-888">{{item.coupon.desc}}</text>
......@@ -60,7 +60,7 @@
<view class="item spacing-mt bg-white item-disabled">
<view class="v-left fl">
<view class="base single-text">
<text class="symbol"></text>
<text class="symbol">{{price_symbol}}</text>
<text class="price">{{item.coupon.discount_value}}</text>
<text class="unit">{{item.type_unit}}</text>
<text a:if="{{(item.coupon.desc || null) != null}}" class="desc cr-888">{{item.coupon.desc}}</text>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
......
......@@ -26,25 +26,25 @@
<view class="item fl">
<view class="name cr-666">返佣总额</view>
<view class="value single-text">
<text class="golden">{{user_profit_total_price || '0.00'}}</text>
<text class="golden">{{price_symbol}}{{user_profit_total_price || '0.00'}}</text>
</view>
</view>
<view class="item fl">
<view class="name cr-666">待生效</view>
<view class="value single-text">
<text class="yellow">{{user_profit_stay_price || '0.00'}}</text>
<text class="yellow">{{price_symbol}}{{user_profit_stay_price || '0.00'}}</text>
</view>
</view>
<view class="item fl">
<view class="name cr-666">待结算</view>
<view class="value single-text">
<text class="blue">{{user_profit_vaild_price || '0.00'}}</text>
<text class="blue">{{price_symbol}}{{user_profit_vaild_price || '0.00'}}</text>
</view>
</view>
<view class="item fl">
<view class="name cr-666">已结算</view>
<view class="value single-text">
<text class="green">{{user_profit_already_price || '0.00'}}</text>
<text class="green">{{price_symbol}}{{user_profit_already_price || '0.00'}}</text>
</view>
</view>
</view>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list_loding_status: 1,
data_list_loding_msg: '加载中...',
data_bottom_line_status: false,
......
......@@ -26,19 +26,19 @@
<view class="item fl">
<view class="name cr-666">返佣总金额</view>
<view class="value single-text">
<text class="golden">{{user_profit_total_price || '0.00'}}</text>
<text class="golden">{{price_symbol}}{{user_profit_total_price || '0.00'}}</text>
</view>
</view>
<view class="item fl">
<view class="name cr-666">待结算金额</view>
<view class="value single-text">
<text class="yellow">{{user_profit_stay_price || '0.00'}}</text>
<text class="yellow">{{price_symbol}}{{user_profit_stay_price || '0.00'}}</text>
</view>
</view>
<view class="item fl">
<view class="name cr-666">已结算金额</view>
<view class="value single-text">
<text class="green">{{user_profit_already_price || '0.00'}}</text>
<text class="green">{{price_symbol}}{{user_profit_already_price || '0.00'}}</text>
</view>
</view>
</view>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list_loding_status: 1,
data_list_loding_msg: '加载中...',
data_bottom_line_status: false,
......
......@@ -6,8 +6,8 @@
<view class="goods-base">
<view class="goods-title multi-text">{{item.title}}</view>
<view class="oh goods-price">
<text class="sales-price">{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{item.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{price_symbol}}{{item.original_price}}</text>
</view>
</view>
</navigator>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list: [],
data_page_total: 0,
data_page: 1,
......
......@@ -6,8 +6,8 @@
<view class="goods-base">
<view class="goods-title multi-text">{{item.title}}</view>
<view class="oh goods-price">
<text class="sales-price">{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{item.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{price_symbol}}{{item.original_price}}</text>
</view>
</view>
</navigator>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list: [],
data_page_total: 0,
data_page: 1,
......
......@@ -29,8 +29,8 @@
</block>
</view>
<view class="oh goods-price">
<text class="sales-price">{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{item.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{price_symbol}}{{item.original_price}}</text>
<text class="buy-number">x{{item.buy_number}}</text>
</view>
</navigator>
......
......@@ -2,6 +2,7 @@ const app = getApp();
import parse from 'mini-html-parser2';
Page({
data: {
price_symbol: app.data.price_symbol,
params: null,
data_list_loding_status: 1,
data_list_loding_msg: '',
......
......@@ -27,8 +27,8 @@
<view class="orderaftersale-btn-text" catchTap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{detail.id}}">{{detail.orderaftersale_btn_text}}</view>
</view>
<view class="oh goods-price">
<text class="sales-price">{{detail.price}}</text>
<text a:if="{{detail.original_price > 0}}" class="original-price">{{detail.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{detail.price}}</text>
<text a:if="{{detail.original_price > 0}}" class="original-price">{{price_symbol}}{{detail.original_price}}</text>
<text class="buy-number">x{{detail.buy_number}}</text>
</view>
</navigator>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list: [],
data_page_total: 0,
data_page: 1,
......
......@@ -13,8 +13,8 @@
</block>
</view>
<view class="oh goods-price">
<text class="sales-price">{{order_data.items.price}}</text>
<text a:if="{{order_data.items.original_price > 0}}" class="original-price">{{order_data.items.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{order_data.items.price}}</text>
<text a:if="{{order_data.items.original_price > 0}}" class="original-price">{{price_symbol}}{{order_data.items.original_price}}</text>
<text class="buy-number">x{{order_data.items.buy_number}}</text>
</view>
</navigator>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
params: null,
data_list_loding_status: 1,
data_list_loding_msg: '',
......
......@@ -27,8 +27,8 @@
<view class="orderaftersale-btn-text" catchTap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{item.order_data.items.id}}">{{item.order_data.items.orderaftersale_btn_text}}</view>
</view>
<view class="oh goods-price">
<text class="sales-price">{{item.order_data.items.price}}</text>
<text a:if="{{item.order_data.items.original_price > 0}}" class="original-price">{{item.order_data.items.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{item.order_data.items.price}}</text>
<text a:if="{{item.order_data.items.original_price > 0}}" class="original-price">{{price_symbol}}{{item.order_data.items.original_price}}</text>
<text class="buy-number">x{{item.order_data.items.buy_number}}</text>
</view>
</navigator>
......@@ -38,7 +38,7 @@
<text class="cr-ccc ds">/</text>
<text class="cr-666">{{item.reason}}</text>
<text a:if="{{item.price > 0}}" class="cr-ccc ds">/</text>
<text a:if="{{item.price > 0}}" class="sales-price">{{item.price}}</text>
<text a:if="{{item.price > 0}}" class="sales-price">{{price_symbol}}{{item.price}}</text>
<text a:if="{{item.number > 0}}" class="cr-main"> x{{item.number}}</text>
</view>
<view a:if="{{item.status <= 2 || item.status == 4}}" class="item-operation tr br-t">
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
params: null,
data_list_loding_status: 1,
data_list_loding_msg: '',
......
......@@ -72,7 +72,10 @@ App({
// 基础信息
application_title: "{{application_title}}",
application_describe: "{{application_describe}}"
application_describe: "{{application_describe}}",
// 价格符号
price_symbol: "{{price_symbol}}"
},
/**
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list_loding_status: 1,
buy_submit_disabled_status: false,
data_list_loding_msg: '',
......
......@@ -44,9 +44,9 @@
</block>
</view>
<view class="oh goods-price">
<text class="sales-price">{{item.price}}
<text class="sales-price">{{price_symbol}}{{item.price}}
</text>
<text s-if="item.original_price > 0" class="original-price">{{item.original_price}}
<text s-if="item.original_price > 0" class="original-price">{{price_symbol}}{{item.original_price}}
</text>
<text class="buy-number cr-888">x{{item.stock}}
</text>
......@@ -90,7 +90,7 @@
<view class="buy-nav oh wh-auto">
<view class="nav-base bg-white fl single-text">
<text>合计:</text>
<text class="sales-price">{{total_price}}</text>
<text class="sales-price">{{price_symbol}}{{total_price}}</text>
</view>
<view class="fr nav-submit">
<button class="bg-main wh-auto" type="default" bindtap="buy_submit_event" disabled="{{buy_submit_disabled_status}}" hover-class="none">提交订单</button>
......@@ -119,7 +119,7 @@
<view class="item spacing-mt bg-white" style="border:1px solid {{item.coupon.bg_color_value}};">
<view class="v-left fl">
<view class="base single-text" style="color:{{item.coupon.bg_color_value}};">
<text class="symbol"></text>
<text class="symbol">{{price_symbol}}</text>
<text class="price">{{item.coupon.discount_value}}</text>
<text class="unit">{{item.coupon.type_unit}}</text>
<text s-if="(item.coupon.desc || null) != null" class="desc cr-888">{{item.coupon.desc}}</text>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list_loding_status: 1,
data_list_loding_msg: '',
data_bottom_line_status: false,
......
......@@ -28,8 +28,8 @@
<!-- 价格 -->
<view class="oh goods-price">
<text class="sales-price">{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{item.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{price_symbol}}{{item.original_price}}</text>
<text class="buy-number cr-888">x{{item.stock}}</text>
<!-- 错误 -->
......@@ -60,7 +60,7 @@
<text>全选</text>
</view>
<view class="fr price">
<view class="sales-price single-text fr">{{total_price}}</view>
<view class="sales-price single-text fr">{{price_symbol}}{{total_price}}</view>
<view class="fr">合计:</view>
</view>
</view>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
indicator_dots: false,
indicator_color: 'rgba(0, 0, 0, .3)',
indicator_active_color: '#e31c55',
......
......@@ -38,8 +38,8 @@
<view class="cr-888">分享</view>
</view>
<text s-if="(show_field_price_text || null) != null" class="price-icon">{{show_field_price_text}}</text>
<text class="sales-price">{{goods.price}}</text>
<view s-if="(goods.original_price || null) != null && goods.original_price != '0.00'" class="original-price">{{goods.original_price}}</view>
<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="fl tl">
......@@ -66,7 +66,7 @@
<view class="item bg-white {{item.is_operable == 0 ? 'item-disabled' : ''}}" style="border:1px solid {{item.bg_color_value}};">
<view class="v-left fl">
<view class="base single-text" style="color:{{item.bg_color_value}};">
<text class="symbol"></text>
<text class="symbol">{{price_symbol}}</text>
<text class="price">{{item.discount_value}}</text>
<text class="unit">{{item.type_unit}}</text>
</view>
......@@ -157,8 +157,8 @@
<image src="{{goods_spec_base_images}}" mode="scaleToFill" class="br" />
<view class="goods-popup-base-content">
<view class="goods-price">
<view class="sales-price">{{goods_spec_base_price}}</view>
<view s-if="(goods_spec_base_original_price || null) != null && goods_spec_base_original_price > 0" class="original-price">{{goods_spec_base_original_price}}</view>
<view class="sales-price">{{price_symbol}}{{goods_spec_base_price}}</view>
<view s-if="(goods_spec_base_original_price || null) != null && goods_spec_base_original_price > 0" class="original-price">{{price_symbol}}{{goods_spec_base_original_price}}</view>
</view>
<view class="inventory">
<text class="cr-888">库存</text>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list_loding_status: 1,
data_bottom_line_status: false,
data_list: [],
......
......@@ -20,7 +20,7 @@
<view class="base">
<view class="single-text">{{item.title}}</view>
<view class="price">
<text class="sales-price">{{item.min_price}}</text>
<text class="sales-price">{{price_symbol}}{{item.min_price}}</text>
</view>
</view>
</navigator>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
load_status: 0,
data_list_loding_status: 1,
data_bottom_line_status: false,
......
......@@ -21,7 +21,7 @@
<!-- 限时秒杀 -->
<view s-if="common_app_is_limitedtimediscount == 1">
<import src="/pages/lib/limitedtimediscount/home.swan" />
<template is="limitedtimediscount" data="{{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_timer_title: plugins_limitedtimediscount_timer_title}}}"></template>
<template is="limitedtimediscount" data="{{{plugins_limitedtimediscount_data: plugins_limitedtimediscount_data, plugins_limitedtimediscount_is_show_time: plugins_limitedtimediscount_is_show_time, plugins_limitedtimediscount_timer_title: plugins_limitedtimediscount_timer_title, price_symbol: price_symbol}}}"></template>
</view>
<!-- 楼层数据 -->
......@@ -51,7 +51,7 @@
<image src="{{goods.home_recommended_images}}" mode="aspectFit" />
<view class="goods-base">
<view class="goods-title single-text">{{goods.title}}</view>
<view class="sales-price">{{goods.min_price}}</view>
<view class="sales-price">{{price_symbol}}{{goods.min_price}}</view>
</view>
</navigator>
</view>
......
......@@ -21,8 +21,8 @@
<image class="dis-block" src="{{item.images}}" mode="aspectFit"></image>
<view class="goods-base">
<view class="goods-title single-text">{{item.title}}</view>
<view class="goods-price single-text">{{item.price}}</view>
<view s-if="(item.original_price || null) != null" class="goods-original-price single-text">{{item.original_price}}</view>
<view class="goods-price single-text">{{price_symbol}}{{item.price}}</view>
<view s-if="(item.original_price || null) != null" class="goods-original-price single-text">{{price_symbol}}{{item.original_price}}</view>
<button size="mini">抢购</button>
</view>
</navigator>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
params: {},
default_round_success_icon: app.data.default_round_success_icon,
default_round_error_icon: app.data.default_round_error_icon
......
......@@ -3,7 +3,7 @@
<image class="pay-icon" s-else mode="widthFix" src="{{default_round_error_icon}}" />
<text class="dis-block">{{params.msg}}</text>
<view s-if="params.code == '9000'" class="price-box">
<text class="sales-price">{{params.total_price}}</text>
<text class="sales-price">{{price_symbol}}{{params.total_price}}</text>
<text class="price-unit cr-888">元</text>
</view>
</view>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
......
......@@ -6,7 +6,7 @@
<view class="item spacing-mt bg-white {{item.is_operable == 0 ? 'item-disabled' : ''}}" style="border:1px solid {{item.bg_color_value}};">
<view class="v-left fl">
<view class="base single-text" style="color:{{item.bg_color_value}};">
<text class="symbol"></text>
<text class="symbol">{{price_symbol}}</text>
<text class="price">{{item.discount_value}}</text>
<text class="unit">{{item.type_unit}}</text>
<text s-if="(item.desc || null) != null" class="desc cr-888">{{item.desc}}</text>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',
......
......@@ -14,7 +14,7 @@
<view class="item spacing-mt bg-white" style="border:1px solid {{item.coupon.bg_color_value}};">
<view class="v-left fl">
<view class="base single-text" style="color:{{item.coupon.bg_color_value}};">
<text class="symbol"></text>
<text class="symbol">{{price_symbol}}</text>
<text class="price">{{item.coupon.discount_value}}</text>
<text class="unit">{{item.coupon.type_unit}}</text>
<text s-if="(item.coupon.desc || null) != null" class="desc cr-888">{{item.coupon.desc}}</text>
......@@ -38,7 +38,7 @@
<view class="item spacing-mt bg-white item-disabled">
<view class="v-left fl">
<view class="base single-text">
<text class="symbol"></text>
<text class="symbol">{{price_symbol}}</text>
<text class="price">{{item.coupon.discount_value}}</text>
<text class="unit">{{item.coupon.type_unit}}</text>
<text s-if="(item.coupon.desc || null) != null" class="desc cr-888">{{item.coupon.desc}}</text>
......@@ -60,7 +60,7 @@
<view class="item spacing-mt bg-white item-disabled">
<view class="v-left fl">
<view class="base single-text">
<text class="symbol"></text>
<text class="symbol">{{price_symbol}}</text>
<text class="price">{{item.coupon.discount_value}}</text>
<text class="unit">{{item.coupon.type_unit}}</text>
<text s-if="(item.coupon.desc || null) != null" class="desc cr-888">{{item.coupon.desc}}</text>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list_loding_status: 1,
data_list_loding_msg: '加载中...',
data_bottom_line_status: false,
......
......@@ -26,25 +26,25 @@
<view class="item fl">
<view class="name cr-666">返佣总额</view>
<view class="value single-text">
<text class="golden">{{user_profit_total_price || '0.00'}}</text>
<text class="golden">{{price_symbol}}{{user_profit_total_price || '0.00'}}</text>
</view>
</view>
<view class="item fl">
<view class="name cr-666">待生效</view>
<view class="value single-text">
<text class="yellow">{{user_profit_stay_price || '0.00'}}</text>
<text class="yellow">{{price_symbol}}{{user_profit_stay_price || '0.00'}}</text>
</view>
</view>
<view class="item fl">
<view class="name cr-666">待结算</view>
<view class="value single-text">
<text class="blue">{{user_profit_vaild_price || '0.00'}}</text>
<text class="blue">{{price_symbol}}{{user_profit_vaild_price || '0.00'}}</text>
</view>
</view>
<view class="item fl">
<view class="name cr-666">已结算</view>
<view class="value single-text">
<text class="green">{{user_profit_already_price || '0.00'}}</text>
<text class="green">{{price_symbol}}{{user_profit_already_price || '0.00'}}</text>
</view>
</view>
</view>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list: [],
data_page_total: 0,
data_page: 1,
......
......@@ -6,8 +6,8 @@
<view class="goods-base">
<view class="goods-title multi-text">{{item.title}}</view>
<view class="oh goods-price">
<text class="sales-price">{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{item.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{price_symbol}}{{item.original_price}}</text>
</view>
</view>
</navigator>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list: [],
data_page_total: 0,
data_page: 1,
......
......@@ -6,8 +6,8 @@
<view class="goods-base">
<view class="goods-title multi-text">{{item.title}}</view>
<view class="oh goods-price">
<text class="sales-price">{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{item.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{price_symbol}}{{item.original_price}}</text>
</view>
</view>
</navigator>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
params: null,
data_list_loding_status: 1,
data_list_loding_msg: '',
......
......@@ -29,8 +29,8 @@
</block>
</view>
<view class="oh goods-price">
<text class="sales-price">{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{item.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{price_symbol}}{{item.original_price}}</text>
<text class="buy-number">x{{item.buy_number}}</text>
</view>
</navigator>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list: [],
data_page_total: 0,
data_page: 1,
......
......@@ -27,8 +27,8 @@
<view class="orderaftersale-btn-text" catchtap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{detail.id}}">{{detail.orderaftersale_btn_text}}</view>
</view>
<view class="oh goods-price">
<text class="sales-price">{{detail.price}}</text>
<text s-if="detail.original_price > 0" class="original-price">{{detail.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{detail.price}}</text>
<text s-if="detail.original_price > 0" class="original-price">{{price_symbol}}{{detail.original_price}}</text>
<text class="buy-number">x{{detail.buy_number}}</text>
</view>
</navigator>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
params: null,
data_list_loding_status: 1,
data_list_loding_msg: '',
......
......@@ -13,8 +13,8 @@
</block>
</view>
<view class="oh goods-price">
<text class="sales-price">{{order_data.items.price}}</text>
<text s-if="order_data.items.original_price > 0" class="original-price">{{order_data.items.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{order_data.items.price}}</text>
<text s-if="order_data.items.original_price > 0" class="original-price">{{price_symbol}}{{order_data.items.original_price}}</text>
<text class="buy-number">x{{order_data.items.buy_number}}</text>
</view>
</navigator>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
params: null,
data_list_loding_status: 1,
data_list_loding_msg: '',
......
......@@ -27,8 +27,8 @@
<view class="orderaftersale-btn-text" catchtap="orderaftersale_event" data-oid="{{item.id}}" data-did="{{item.order_data.items.id}}">{{item.order_data.items.orderaftersale_btn_text}}</view>
</view>
<view class="oh goods-price">
<text class="sales-price">{{item.order_data.items.price}}</text>
<text s-if="item.order_data.items.original_price > 0" class="original-price">{{item.order_data.items.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{item.order_data.items.price}}</text>
<text s-if="item.order_data.items.original_price > 0" class="original-price">{{price_symbol}}{{item.order_data.items.original_price}}</text>
<text class="buy-number">x{{item.order_data.items.buy_number}}</text>
</view>
</navigator>
......@@ -38,7 +38,7 @@
<text class="cr-ccc ds">/</text>
<text class="cr-666">{{item.reason}}</text>
<text s-if="item.price > 0" class="cr-ccc ds">/</text>
<text s-if="item.price > 0" class="sales-price">{{item.price}}</text>
<text s-if="item.price > 0" class="sales-price">{{price_symbol}}{{item.price}}</text>
<text s-if="item.number > 0" class="cr-main"> x{{item.number}}</text>
</view>
<view s-if="item.status <= 2 || item.status == 4" class="item-operation tr br-t">
......
......@@ -73,6 +73,9 @@ App({
// 基础信息
application_title: "{{application_title}}",
application_describe: "{{application_describe}}",
// 价格符号
price_symbol: "{{price_symbol}}"
},
/**
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list_loding_status: 1,
buy_submit_disabled_status: false,
data_list_loding_msg: '',
......
......@@ -44,9 +44,9 @@
</block>
</view>
<view class="oh goods-price">
<text class="sales-price">{{item.price}}
<text class="sales-price">{{price_symbol}}{{item.price}}
</text>
<text qq:if="{{item.original_price > 0}}" class="original-price">{{item.original_price}}
<text qq:if="{{item.original_price > 0}}" class="original-price">{{price_symbol}}{{item.original_price}}
</text>
<text class="buy-number cr-888">x{{item.stock}}
</text>
......@@ -90,7 +90,7 @@
<view class="buy-nav oh wh-auto">
<view class="nav-base bg-white fl single-text">
<text>合计</text>
<text class="sales-price">{{total_price}}</text>
<text class="sales-price">{{price_symbol}}{{total_price}}</text>
</view>
<view class="fr nav-submit">
<button class="bg-main wh-auto" type="default" bindtap="buy_submit_event" disabled="{{buy_submit_disabled_status}}" hover-class="none">提交订单</button>
......@@ -119,7 +119,7 @@
<view class="item spacing-mt bg-white" style="border:1px solid {{item.coupon.bg_color_value}};">
<view class="v-left fl">
<view class="base single-text" style="color:{{item.coupon.bg_color_value}};">
<text class="symbol"></text>
<text class="symbol">{{price_symbol}}</text>
<text class="price">{{item.coupon.discount_value}}</text>
<text class="unit">{{item.coupon.type_unit}}</text>
<text qq:if="{{(item.coupon.desc || null) != null}}" class="desc cr-888">{{item.coupon.desc}}</text>
......
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
data_list_loding_status: 1,
data_list_loding_msg: '',
data_bottom_line_status: false,
......
......@@ -28,8 +28,8 @@
<!-- 价格 -->
<view class="oh goods-price">
<text class="sales-price">{{item.price}}</text>
<text qq:if="{{item.original_price > 0}}" class="original-price">{{item.original_price}}</text>
<text class="sales-price">{{price_symbol}}{{item.price}}</text>
<text qq:if="{{item.original_price > 0}}" class="original-price">{{price_symbol}}{{item.original_price}}</text>
<text class="buy-number cr-888">x{{item.stock}}</text>
<!-- 错误 -->
......@@ -58,7 +58,7 @@
<text>全选</text>
</view>
<view class="fr price">
<view class="sales-price single-text fr">{{total_price}}</view>
<view class="sales-price single-text fr">{{price_symbol}}{{total_price}}</view>
<view class="fr">合计</view>
</view>
</view>
......
此差异已折叠。
此差异已折叠。
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册