bingyi/shopxo
1
0
Fork 0
mirror of https://gitee.com/zongzhige/shopxo.git synced 2026-06-06 03:56:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

订单新增货币

Browse Source
This commit is contained in:
devil
2020-09-17 22:22:37 +08:00
parent 3f89ec4ef4
commit 26c6bb021b
193 changed files with 554 additions and 592 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controller/Common.php
View File

@ -233,8 +233,8 @@ class Common extends Controller
$this->assign('page', $this->page);
$this->assign('page_size', $this->page_size);
// 价格符号
$this->assign('price_symbol', ResourcesService::CurrencyPriceSymbol());
// 货币符号
$this->assign('currency_symbol', ResourcesService::CurrencyDataSymbol());
// 控制器静态文件状态css,js
$module_css = $this->module_name.DS.$default_theme.DS.'css'.DS.$this->controller_name;

2
application/admin/view/default/goodscomments/module/goods.html
View File

@ -7,7 +7,7 @@
</a>
<a class="am-text-top am-nowrap-initial" href="{{$module_data.goods.goods_url}}" target="_blank">{{$module_data.goods.title}}</a>
</div>
<p>{{$price_symbol}}{{$module_data.goods.price}}</p>
<p>{{$currency_symbol}}{{$module_data.goods.price}}</p>
{{else /}}
商品信息异常
{{/if}}

2
application/admin/view/default/goodscomments/save_info.html
View File

@ -18,7 +18,7 @@
</a>
<a class="am-text-top" href="{{$data.goods.goods_url}}" target="_blank">{{$data.goods.title}}</a>
</div>
<p>{{$price_symbol}}{{$data.goods.price}}</p>
<p>{{$currency_symbol}}{{$data.goods.price}}</p>
{{else /}}
商品信息异常
{{/if}}

4
application/admin/view/default/order/module/goods.html
View File

@ -30,10 +30,10 @@
{{/if}}
</span>
<div class="am-nbfc am-margin-top-xs">
<span>{{$price_symbol}}{{$item.price}}x{{$item.buy_number}}</span>
<span>{{$module_data.currency_data.currency_symbol}}{{$item.price}}x{{$item.buy_number}}</span>
<div class="am-fr">
{{if $item['returned_quantity'] gt 0 or $item['refund_price'] gt 0}}
<span class="am-text-danger am-margin-left-lg">已退 {{$item.returned_quantity}} / {{$price_symbol}}{{$item.refund_price}}</span>
<span class="am-text-danger am-margin-left-lg">已退 {{$item.returned_quantity}} / {{$module_data.currency_data.currency_symbol}}{{$item.refund_price}}</span>
{{/if}}
</div>
</div>

4
application/admin/view/default/orderaftersale/module/goods.html
View File

@ -21,8 +21,8 @@
</div>
<div class="am-text-right">
{{if $module_data.order_data.items.original_price gt 0}}
<span class="original-price am-margin-right-xs">{{$price_symbol}}{{$module_data.order_data.items.original_price}}</span>
<span class="original-price am-margin-right-xs">{{$module_data.order_data.currency_data.currency_symbol}}{{$module_data.order_data.items.original_price}}</span>
{{/if}}
<span>{{$price_symbol}}{{$module_data.order_data.items.price}}x{{$module_data.order_data.items.buy_number}}</span>
<span>{{$module_data.order_data.currency_data.currency_symbol}}{{$module_data.order_data.items.price}}x{{$module_data.order_data.items.buy_number}}</span>
</div>
{{/if}}

2
application/admin/view/default/public/header.html
View File

@ -56,7 +56,7 @@
var __my_url__ = '{{$my_url}}';
var __public__ = '{{$public_host}}';
var __attachment_host__ = '{{$attachment_host}}';
var __price_symbol__ = '{{$price_symbol}}';
var __currency_symbol__ = '{{$currency_symbol}}';
</script>
<body>
{{if $module_name.$controller_name.$action_name neq 'adminindexindex'}}

4
application/admin/view/default/warehousegoods/goods_spec.html
View File

@ -1,8 +1,8 @@
{{if !empty($goods)}}
<div class="am-margin-bottom-sm" data-old-price="{{$goods.price}}">
<strong class="am-text-danger am-text-lg goods-price">{{$price_symbol}}{{$goods.price}}</strong>
<strong class="am-text-danger am-text-lg goods-price">{{$currency_symbol}}{{$goods.price}}</strong>
{{if !empty($goods['original_price']) and $goods['original_price'] gt 0}}
<span class="am-margin-left-xs goods-original-price" data-old-price="{{$goods.original_price}}">{{$price_symbol}}{{$goods.original_price}}</span>
<span class="am-margin-left-xs goods-original-price" data-old-price="{{$goods.original_price}}">{{$currency_symbol}}{{$goods.original_price}}</span>
{{/if}}
</div>
<div class="goods-spec am-margin-top-sm" data-id="{{$goods.id}}">

2
application/admin/view/default/warehousegoods/module/goods.html
View File

@ -7,7 +7,7 @@
</a>
<a class="am-text-top am-nowrap-initial" href="{{$module_data.goods.goods_url}}" target="_blank">{{$module_data.goods.title}}</a>
</div>
<p>{{$price_symbol}}{{$module_data.goods.price}}</p>
<p>{{$currency_symbol}}{{$module_data.goods.price}}</p>
{{else /}}
商品信息异常
{{/if}}

4
application/index/controller/Common.php
View File

@ -277,8 +277,8 @@ class Common extends Controller
// 公共参数
$this->assign('params', $this->data_request);
// 价格符号
$this->assign('price_symbol', ResourcesService::CurrencyPriceSymbol());
// 货币符号
$this->assign('currency_symbol', ResourcesService::CurrencyDataSymbol());
// 站点类型
$this->assign('common_site_type', MyC('common_site_type', 0, true));

16
application/index/view/default/buy/index.html
View File

@ -326,23 +326,23 @@
</div>
<div class="wap-base am-show-sm-only">
{{if $goods['original_price'] gt 0}}
<span class="original-price">{{$price_symbol}}{{$goods.original_price}}</span>
<span class="original-price">{{$currency_symbol}}{{$goods.original_price}}</span>
{{/if}}
<strong class="total-price-content">{{$price_symbol}}{{$goods.price}}</strong>
<strong class="total-price-content">{{$currency_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">{{$price_symbol}}{{$goods.original_price}}</p>
<p class="original-price">{{$currency_symbol}}{{$goods.original_price}}</p>
{{/if}}
<p class="line-price">{{$price_symbol}}{{$goods.price}}</p>
<p class="line-price">{{$currency_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">
<span>{{$price_symbol}}</span><strong class="total-price-content">{{$goods.total_price}}</strong>
<span>{{$currency_symbol}}</span><strong class="total-price-content">{{$goods.total_price}}</strong>
</td>
</tr>
{{/foreach}}
@ -391,10 +391,10 @@
<!-- 含运费小计 -->
<div class="buy-point-discharge am-text-right">
{{if $v['order_base']['total_price'] neq $v['order_base']['actual_price']}}
<span class="original-price am-margin-right-xs">{{$price_symbol}}{{$v.order_base.total_price}}</span>
<span class="original-price am-margin-right-xs">{{$currency_symbol}}{{$v.order_base.total_price}}</span>
{{/if}}
<span>
合计 <span class="price"><span>{{$price_symbol}}</span><strong class="total-price-content line-price am-text-sm">{{$v.order_base.actual_price}}</strong></span>
合计 <span class="price"><span>{{$currency_symbol}}</span><strong class="total-price-content line-price am-text-sm">{{$v.order_base.actual_price}}</strong></span>
</span>
</div>
</div>
@ -463,7 +463,7 @@
<div class="base-real-pay">
<em>实付款 :</em>
<span class="price">
<span>{{$price_symbol}}</span><strong class="nav-total-price">{{$base.actual_price}}</strong>
<span>{{$currency_symbol}}</span><strong class="nav-total-price">{{$base.actual_price}}</strong>
</span>
</div>

12
application/index/view/default/cart/index.html
View File

@ -54,17 +54,17 @@
</div>
<div class="wap-base am-show-sm-only">
{{if $goods['original_price'] gt 0}}
<span class="original-price">{{$price_symbol}}{{$goods.original_price}}</span>
<span class="original-price">{{$currency_symbol}}{{$goods.original_price}}</span>
{{/if}}
<strong class="total-price-content">{{$price_symbol}}{{$goods.price}}</strong>
<strong class="total-price-content">{{$currency_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">{{$price_symbol}}{{$goods.original_price}}</p>
<p class="original-price">{{$currency_symbol}}{{$goods.original_price}}</p>
{{/if}}
<p class="line-price">{{$price_symbol}}{{$goods.price}}</p>
<p class="line-price">{{$currency_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">{{$price_symbol}}{{$goods.total_price}}</strong>
<strong class="total-price-content">{{$currency_symbol}}{{$goods.total_price}}</strong>
</td>
<td class="operation">
<a href="javascript:;" class="am-text-danger 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"><span>已选商品</span> <strong>0</strong> <span>件</span></span>
<span class="total-price-tips am-fl">合计：</span>
<strong class="nav-total-price am-fl">{{$price_symbol}}0.00</strong>
<strong class="nav-total-price am-fl">{{$currency_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>

10
application/index/view/default/goods/index.html
View File

@ -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}}">{{$price_symbol}}{{$goods.original_price}}</b>
<b class="goods-original-price original-price-value" data-original-price="{{$goods.original_price}}">{{$currency_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>{{$price_symbol}}</em>
<em>{{$currency_symbol}}</em>
<b class="goods-price" data-original-price="{{$goods.price}}">{{$goods.price}}</b>
</dd>
</div>
@ -312,7 +312,7 @@
<img src="{{$goods.images}}" />
</div>
<div class="text-info">
<span class="price-now" data-original-price="{{$goods.price}}">{{$price_symbol}}{{$goods.price}}</span>
<span class="price-now" data-original-price="{{$goods.price}}">{{$currency_symbol}}{{$goods.price}}</span>
</div>
</div>
</form>
@ -459,7 +459,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>{{$price_symbol}}{{$v.price}}</strong></div>
<div class="p-price"><strong>{{$currency_symbol}}{{$v.price}}</strong></div>
</li>
{{/foreach}}
{{/if}}
@ -594,7 +594,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>{{$price_symbol}}{{$v.price}}</strong>
<strong>{{$currency_symbol}}{{$v.price}}</strong>
</p>
</div>
</li>

2
application/index/view/default/index/index.html
View File

@ -293,7 +293,7 @@
}
}
{{/php}}
<p class="price am-text-truncate">{{$price_symbol}}{{$goods.price}}</p>
<p class="price am-text-truncate">{{$currency_symbol}}{{$goods.price}}</p>
</div>
<!-- 首页楼层商品内部底部钩子 -->

8
application/index/view/default/order/comments.html
View File

@ -56,17 +56,17 @@
</div>
<div class="wap-base am-show-sm-only">
{{if $goods['original_price'] gt 0}}
<span class="original-price">{{$price_symbol}}{{$goods.original_price}}</span>
<span class="original-price">{{$currency_symbol}}{{$goods.original_price}}</span>
{{/if}}
<strong class="total-price-content">{{$price_symbol}}{{$goods.price}}</strong>
<strong class="total-price-content">{{$currency_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">{{$price_symbol}}{{$goods.original_price}}</p>
<p class="original-price">{{$currency_symbol}}{{$goods.original_price}}</p>
{{/if}}
<p class="line-price">{{$price_symbol}}{{$goods.price}} x {{$goods.buy_number}}</p>
<p class="line-price">{{$currency_symbol}}{{$goods.price}} x {{$goods.buy_number}}</p>
</td>
<td>
<div class="rating-items">

22
application/index/view/default/order/detail.html
View File

@ -400,10 +400,10 @@
</div>
<div class="wap-base am-show-sm-only">
{{if $goods['original_price'] gt 0}}
<span class="original-price">{{$price_symbol}}{{$goods.original_price}}</span>
<span class="original-price">{{$data.currency_data.currency_symbol}}{{$goods.original_price}}</span>
{{/if}}
<span class="price">
<strong>{{$price_symbol}}{{$goods.price}}</strong>
<strong>{{$data.currency_data.currency_symbol}}{{$goods.price}}</strong>
</span>
<span class="wap-number">x{{$goods.buy_number}}</span>
{{if isset($goods['returned_quantity']) and $goods['returned_quantity'] gt 0}}
@ -413,9 +413,9 @@
</td>
<td class="price am-hide-sm-only">
{{if $goods['original_price'] gt 0}}
<p class="original-price">{{$price_symbol}}{{$goods.original_price}}</p>
<p class="original-price">{{$data.currency_data.currency_symbol}}{{$goods.original_price}}</p>
{{/if}}
<p class="line-price">{{$price_symbol}}{{$goods.price}}</p>
<p class="line-price">{{$data.currency_data.currency_symbol}}{{$goods.price}}</p>
</td>
<td class="number am-hide-sm-only">
<span>x{{$goods.buy_number}}</span>
@ -424,7 +424,7 @@
{{/if}}
</td>
<td class="price am-hide-sm-only">
<strong class="total-price-content">{{$price_symbol}}{{$goods.total_price}}</strong>
<strong class="total-price-content">{{$data.currency_data.currency_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-plain">已退 {{$goods.refund_price}}</span>
{{/if}}
@ -450,40 +450,40 @@
{{if !empty($data.price)}}
<div class="items am-cf">
<div class="items-title am-fl">商品总价：</div>
<div class="items-detail am-fl">{{$price_symbol}}{{$data.price}}</div>
<div class="items-detail am-fl">{{$data.currency_data.currency_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">+{{$price_symbol}}{{$data.increase_price}}</div>
<div class="items-detail am-fl">+{{$data.currency_data.currency_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">-{{$price_symbol}}{{$data.preferential_price}}</div>
<div class="items-detail am-fl">-{{$data.currency_data.currency_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">-{{$price_symbol}}{{$data.refund_price}}</span>
<span class="am-text-danger">-{{$data.currency_data.currency_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">{{$price_symbol}}{{$data.total_price}}</div>
<div class="items-detail am-fl line-price">{{$data.currency_data.currency_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">{{$price_symbol}}{{$data.pay_price}}</strong>
<strong class="total-price-content">{{$data.currency_data.currency_symbol}}{{$data.pay_price}}</strong>
</div>
</div>
{{/if}}

6
application/index/view/default/order/module/goods.html
View File

@ -25,11 +25,11 @@
</div>
<div class="am-nbfc am-margin-top-xs">
{{if $item.original_price gt 0}}
<span class="original-price am-margin-right-xs">{{$price_symbol}}{{$item.original_price}}</span>
<span class="original-price am-margin-right-xs">{{$module_data.currency_data.currency_symbol}}{{$item.original_price}}</span>
{{/if}}
<span>{{$price_symbol}}{{$item.price}}x{{$item.buy_number}}</span>
<span>{{$module_data.currency_data.currency_symbol}}{{$item.price}}x{{$item.buy_number}}</span>
{{if $item['returned_quantity'] gt 0 or $item['refund_price'] gt 0}}
<span class="am-text-danger am-margin-left-lg">已退 {{$item.returned_quantity}} / {{$price_symbol}}{{$item.refund_price}}</span>
<span class="am-text-danger am-margin-left-lg">已退 {{$item.returned_quantity}} / {{$module_data.currency_data.currency_symbol}}{{$item.refund_price}}</span>
{{/if}}
<div class="am-fr">

2
application/index/view/default/orderaftersale/create.html
View File

@ -31,7 +31,7 @@
<div class="plug-file-upload-submit" data-view-tag="ul.goods-images-view">+上传图片</div>
</div>
<div class="am-form-group am-form-group-refreshing">
<div class="am-form-group am-form-group-refreshing am-margin-top-sm am-padding-left-0">
<input type="hidden" name="order_id" value="{{$params.oid}}" />
<input type="hidden" name="order_detail_id" value="{{$params.did}}" />
<input type="hidden" name="type" value="" />

18
application/index/view/default/orderaftersale/detail.html
View File

@ -54,9 +54,9 @@
</td>
<td>
{{if $goods['original_price'] gt 0}}
<p class="original-price">{{$price_symbol}}{{$goods.original_price}}</p>
<p class="original-price">{{$order.currency_data.currency_symbol}}{{$goods.original_price}}</p>
{{/if}}
<p class="line-price">{{$price_symbol}}{{$goods.price}} x {{$goods.buy_number}}</p>
<p class="line-price">{{$order.currency_data.currency_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">{{$price_symbol}}{{$order.price}}</div>
<div class="items-detail am-fl">{{$order.currency_data.currency_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">+{{$price_symbol}}{{$order.increase_price}}</div>
<div class="items-detail am-fl">+{{$order.currency_data.currency_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">-{{$price_symbol}}{{$order.preferential_price}}</div>
<div class="items-detail am-fl">-{{$order.currency_data.currency_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">-{{$price_symbol}}{{$order.refund_price}}</span>
<span class="am-text-danger">-{{$order.currency_data.currency_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">{{$price_symbol}}{{$order.total_price}}</div>
<div class="items-detail am-fl line-price">{{$order.currency_data.currency_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">{{$price_symbol}}{{$order.pay_price}}</strong>
<strong class="total-price-content">{{$order.currency_data.currency_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">{{$price_symbol}}{{$new_aftersale_data.price}}</span>
<span class="am-text-danger">{{$order.currency_data.currency_symbol}}{{$new_aftersale_data.price}}</span>
</div>
<div class="am-cf am-padding-vertical-xs">
<span>退款说明：</span>

4
application/index/view/default/orderaftersale/module/goods.html
View File

@ -21,8 +21,8 @@
</div>
<div class="am-text-right">
{{if $module_data.order_data.items.original_price gt 0}}
<span class="original-price am-margin-right-xs">{{$price_symbol}}{{$module_data.order_data.items.original_price}}</span>
<span class="original-price am-margin-right-xs">{{$module_data.order_data.currency_data.currency_symbol}}{{$module_data.order_data.items.original_price}}</span>
{{/if}}
<span>{{$price_symbol}}{{$module_data.order_data.items.price}} x {{$module_data.order_data.items.buy_number}}</span>
<span>{{$module_data.order_data.currency_data.currency_symbol}}{{$module_data.order_data.items.price}} x {{$module_data.order_data.items.buy_number}}</span>
</div>
{{/if}}

2
application/index/view/default/public/header.html
View File

@ -64,7 +64,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}}';
var __currency_symbol__ = '{{$currency_symbol}}';
</script>
<!-- 公共header内钩子 -->

4
application/index/view/default/search/content.html
View File

@ -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">{{$price_symbol}}{{$v.original_price}}</span>
<span class="am-fl original-price">{{$currency_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>{{$price_symbol}}{{$v.price}}</strong>
<strong>{{$currency_symbol}}{{$v.price}}</strong>
</p>
<!-- 搜索页面商品信息底部钩子 -->

8
application/index/view/default/user/index.html
View File

@ -195,7 +195,7 @@
<ul>
<li>
<span>{{$order.add_time_time}}</span>
<span class="line-price">{{$price_symbol}}{{$order.price}}</span>
<span class="line-price">{{$currency_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">{{$price_symbol}}{{$goods.price}}</span>
<span class="line-price">{{$currency_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">{{$price_symbol}}{{$goods.min_price}}</div>
<div class="am-gallery-desc line-price">{{$currency_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">{{$price_symbol}}{{$goods.min_price}}</div>
<div class="am-gallery-desc line-price">{{$currency_symbol}}{{$goods.min_price}}</div>
</div>
</li>
{{/foreach}}

4
application/service/AppMiniService.php
View File

@ -153,13 +153,13 @@ class AppMiniService
'{{request_url}}',
'{{application_title}}',
'{{application_describe}}',
'{{price_symbol}}',
'{{currency_symbol}}',
];
$replace = [
__MY_URL__,
$params['app_mini_title'],
$params['app_mini_describe'],
config('shopxo.price_symbol'),
config('shopxo.currency_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)

10
application/service/BaseService.php
View File

@ -77,16 +77,16 @@ class BaseService
// 数据集合
$data = [
// 全局状态值(1接口执行成功,用于前端校验接口请求完成状态,以后再加入其它状态)
'status' => 1,
'status' => 1,
// 配置信息
'config' => $config,
'config' => $config,
// 价格符号
'price_symbol' => ResourcesService::CurrencyPriceSymbol(),
// 货币符号
'currency_symbol' => ResourcesService::CurrencyDataSymbol(),
// 快捷入口信息
'quick_nav' => QuickNavService::QuickNav(),
'quick_nav' => QuickNavService::QuickNav(),
];
// 公共配置信息钩子

9
application/service/BuyService.php
View File

@ -19,6 +19,7 @@ use app\service\PaymentService;
use app\service\ConfigService;
use app\service\OrderSplitService;
use app\service\WarehouseGoodsService;
use app\service\OrderCurrencyService;
/**
* 购买服务层
@ -1159,6 +1160,14 @@ class BuyService
}
}
}
// 订单货币
$ret = OrderCurrencyService::OrderCurrencyInsert($order_id, $params['user']['id']);
if($ret['code'] != 0)
{
Db::rollback();
return $ret;
}
} else {
Db::rollback();
return DataReturn('订单添加失败', -1);

78
application/service/OrderCurrencyService.php Normal file
View File

@ -0,0 +1,78 @@
<?php
// +----------------------------------------------------------------------
// | ShopXO 国内领先企业级B2C免费开源电商系统
// +----------------------------------------------------------------------
// | Copyright (c) 2011~2019 http://shopxo.net All rights reserved.
// +----------------------------------------------------------------------
// | Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
// +----------------------------------------------------------------------
// | Author: Devil
// +----------------------------------------------------------------------
namespace app\service;
use think\Db;
use app\service\ResourcesService;
/**
* 订单货币服务层
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2020-09-17
* @desc description
*/
class OrderCurrencyService
{
/**
* 订单货币添加
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2020-09-17
* @desc description
* @param [int] $order_id [订单id]
* @param [int] $user_id [用户id]
*/
public static function OrderCurrencyInsert($order_id, $user_id)
{
$currency = ResourcesService::CurrencyData();
$data = [
'order_id' => $order_id,
'user_id' => $user_id,
'currency_name' => $currency['currency_name'],
'currency_code' => $currency['currency_code'],
'currency_symbol' => $currency['currency_symbol'],
'currency_rate' => $currency['currency_rate'],
'add_time' => time(),
];
if(Db::name('OrderCurrency')->insertGetId($data) > 0)
{
return DataReturn('订单货币新增成功', 0);
}
return DataReturn('订单货币新增失败', -1);
}
/**
* 订单货币组列表、以订单id为索引
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2020-09-17
* @desc description
* @param [array|int] $order_ids [订单id]
*/
public static function OrderCurrencyGroupList($order_ids)
{
$data = Db::name('OrderCurrency')->where(['order_id'=>$order_ids])->select();
$result = [];
if(!empty($data))
{
foreach($data as $v)
{
$result[$v['order_id']] = $v;
}
}
return $result;
}
}
?>

12
application/service/OrderService.php
View File

@ -22,6 +22,7 @@ use app\service\PayLogService;
use app\service\UserService;
use app\service\GoodsService;
use app\service\OrderAftersaleService;
use app\service\OrderCurrencyService;
/**
* 订单服务层
@ -1024,6 +1025,12 @@ class OrderService
$warehouse = Db::name('Warehouse')->where(['id'=>$we_ids])->column('name', 'id');
}
// 默认货币
$currency_default = ResourcesService::CurrencyData();
// 订单货币
$currency_data = OrderCurrencyService::OrderCurrencyGroupList(array_column($data, 'id'));
// 循环处理数据
foreach($data as &$v)
{
@ -1041,6 +1048,9 @@ class OrderService
return $ret;
}
// 订单货币
$v['currency_data'] = array_key_exists($v['id'], $currency_data) ? $currency_data[$v['id']] : $currency_default;
// 订单所属仓库
if(isset($v['warehouse_id']))
{
@ -1144,7 +1154,7 @@ class OrderService
$v['items_count'] = count($items);
// 描述
$v['describe'] = '共'.$v['buy_number_count'].'件 合计:'.config('shopxo.price_symbol').$v['total_price'].'元';
$v['describe'] = '共'.$v['buy_number_count'].'件 合计:'.$v['currency_data']['currency_symbol'].'元';
}
// 管理员读取

29
application/service/ResourcesService.php
View File

@ -586,20 +586,25 @@ class ResourcesService
}
/**
* 货币价格符号
* 货币信息
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2020-09-10
* @desc description
*/
public static function CurrencyPriceSymbol()
public static function CurrencyData()
{
// 默认从配置文件读取货币符号
$data = config('shopxo.price_symbol');
// 默认从配置文件读取货币信息
$data = [
'currency_symbol' => config('shopxo.currency_symbol'),
'currency_code' => config('shopxo.currency_code'),
'currency_rate' => config('shopxo.currency_rate'),
'currency_name' => config('shopxo.currency_name'),
];
// 货币符号钩子
$hook_name = 'plugins_service_currency_price_symbol';
$hook_name = 'plugins_service_currency_data';
Hook::listen($hook_name, [
'hook_name' => $hook_name,
'is_backend' => true,
@ -608,5 +613,19 @@ class ResourcesService
return $data;
}
/**
* 货币信息-符号
* @author Devil
* @blog http://gong.gg/
* @version 1.0.0
* @date 2020-09-10
* @desc description
*/
public static function CurrencyDataSymbol()
{
$res = self::CurrencyData();
return empty($res['currency_symbol']) ? config('shopxo.currency_symbol') : $res['currency_symbol'];
}
}
?>

5
application/tags.php
View File

@ -82,6 +82,7 @@ return array (
'plugins_service_buy_order_insert_end' =>
array (
0 => 'app\\plugins\\distribution\\Hook',
1 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_service_goods_spec_extends_handle' =>
array (
@ -127,19 +128,17 @@ return array (
array (
0 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_service_currency_price_symbol' =>
'plugins_service_currency_data' =>
array (
0 => 'app\\plugins\\exchangerate\\Hook',
),
'plugins_service_goods_handle_end' =>
array (
0 => 'app\\plugins\\exchangerate\\Hook',
1 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook',
),
'plugins_service_goods_spec_base' =>
array (
0 => 'app\\plugins\\exchangerate\\Hook',
1 => 'app\\plugins\\usernotloginhidegoodsprice\\Hook',
),
'plugins_service_order_pay_launch_handle' =>
array (

11
config/shopxo.php
View File

@ -107,8 +107,15 @@ return [
// 坐标需要转换的平台
'coordinate_transformation' => ['alipay', 'weixin', 'toutiao', 'baidu'],
// 价格符号
'price_symbol' => '￥',
// 货币配置信息
// 符号（默认 ￥）
// 代码（默认 0.0000）
// 汇率（默认 RMB）
// 名称（默认 人民币）
'currency_symbol' => '￥',
'currency_code' => 'RMB',
'currency_rate' => 0.0000,
'currency_name' => '人民币',
// 验证码最大验证次数,防止暴力破解
'security_prevent_violence_max' => 6,

2
public/static/admin/default/js/goodscomments.js
View File

@ -18,7 +18,7 @@ $(function()
$popup.find('.goods-info .base a').attr('href', json.goods.goods_url || 'javascript:;');
$popup.find('.goods-info .base img').attr('src', json.goods.images || $popup.find('.goods-info .base img').attr('src'));
$popup.find('.goods-info .title').html(json.goods.title);
$popup.find('.goods-info .price').html(__price_symbol__+json.goods.price);
$popup.find('.goods-info .price').html(__currency_symbol__+json.goods.price);
$popup.find('.content').html(json.content || '<span class="cr-ddd">没有评论内容</span>');
});

2
public/static/admin/default/js/orderaftersale.js
View File

@ -19,7 +19,7 @@ $(function()
$popup.find('.apply-info .type span').html(data.type_text || '<span class="cr-ddd">未填写</span>');
$popup.find('.apply-info .reason span').html(data.reason || '<span class="cr-ddd">未填写</span>');
$popup.find('.apply-info .number span').html(data.number || '<span class="cr-ddd">未填写</span>');
$popup.find('.apply-info .price span').html(__price_symbol__+data.price || '<span class="cr-ddd">未填写</span>');
$popup.find('.apply-info .price span').html(__currency_symbol__+data.price || '<span class="cr-ddd">未填写</span>');
$popup.find('.apply-info .msg span').html(data.msg || '<span class="cr-ddd">未填写</span>');
$popup.modal();

4
public/static/index/default/js/cart.js
View File

@ -26,7 +26,7 @@ $(function()
});
ids = ids.toString() || 0;
$('.cart-nav .selected-tips strong').text(total_stock);
$('.cart-nav .nav-total-price').text(__price_symbol__+FomatFloat(total_price));
$('.cart-nav .nav-total-price').text(__currency_symbol__+FomatFloat(total_price));
$('.cart-nav input[name="ids"]').val(ids.toString() || 0);
$('.cart-nav .nav-delete-submit').attr('data-id', ids);
}
@ -74,7 +74,7 @@ $(function()
if(result.code == 0)
{
self.parents('.stock-tag').find('input').val(stock);
self.parents('tr').find('.total-price-content').text(__price_symbol__+FomatFloat(stock*price, 2));
self.parents('tr').find('.total-price-content').text(__currency_symbol__+FomatFloat(stock*price, 2));
Prompt(result.msg, 'success');

8
public/static/index/default/js/goods.js
View File

@ -222,13 +222,13 @@ function GoodsSpecDetail()
$.AMUI.progress.done();
if(result.code == 0)
{
$('.text-info .price-now').text(__price_symbol__+result.data.spec_base.price);
$('.text-info .price-now').text(__currency_symbol__+result.data.spec_base.price);
$('.goods-price').text(result.data.spec_base.price);
$('.number-tag input[type="number"]').attr('max', result.data.spec_base.inventory);
$('.stock-tips .stock').text(result.data.spec_base.inventory);
if(result.data.spec_base.original_price > 0)
{
$('.goods-original-price').text(__price_symbol__+result.data.spec_base.original_price);
$('.goods-original-price').text(__currency_symbol__+result.data.spec_base.original_price);
$('.goods-original-price').parents('.items').show();
} else {
$('.goods-original-price').parents('.items').hide();
@ -349,7 +349,7 @@ function GoodsSpecType()
*/
function GoodsBaseRestore()
{
$('.text-info .price-now').text(__price_symbol__+$('.text-info .price-now').data('original-price'));
$('.text-info .price-now').text(__currency_symbol__+$('.text-info .price-now').data('original-price'));
$('.goods-price').text($('.goods-price').data('original-price'));
$('.number-tag input[type="number"]').attr('max', $('.number-tag input[type="number"]').data('original-max'));
$('.stock-tips .stock').text($('.stock-tips .stock').data('original-stock'));
@ -362,7 +362,7 @@ function GoodsBaseRestore()
var price = $(this).data('original-price');
if(price !== undefined)
{
$(this).text(__price_symbol__+price);
$(this).text(__currency_symbol__+price);
}
});
}

12
sourcecode/alipay/app.js
View File

@ -77,8 +77,8 @@ App({
application_title: "{{application_title}}",
application_describe: "{{application_describe}}",
// 价格符号
price_symbol: "{{price_symbol}}"
// 货币价格符号
currency_symbol: "{{currency_symbol}}"
},
/**
@ -577,13 +577,7 @@ App({
this.showToast('事件值格式有误');
return false;
}
my.openLocation({
name: values[0],
address: values[1],
longitude: parseFloat(values[2]),
latitude: parseFloat(values[3])
});
this.open_location(values[2], values[3], values[0], values[1]);
break;
// 拨打电话

3
sourcecode/alipay/mini.project.json Normal file
View File

@ -0,0 +1,3 @@
{
"component2": true
}

12
sourcecode/alipay/pages/buy/buy.axml
View File

@ -55,9 +55,9 @@
</block>
</view>
<view class="oh goods-price">
<text class="sales-price">{{price_symbol}}{{item.price}}
<text class="sales-price">{{currency_symbol}}{{item.price}}
</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{price_symbol}}{{item.original_price}}
<text a:if="{{item.original_price > 0}}" class="original-price">{{currency_symbol}}{{item.original_price}}
</text>
<text class="buy-number cr-888">x{{item.stock}}
</text>
@ -79,8 +79,8 @@
</view>
<!-- 小计 -->
<view class="oh tr goods-group-footer spacing-mt spacing-mb">
<text a:if="{{group.order_base.total_price != group.order_base.actual_price}}" class="original-price">{{price_symbol}}{{group.order_base.total_price}}</text>
<text class="sales-price">{{price_symbol}}{{group.order_base.actual_price}}</text>
<text a:if="{{group.order_base.total_price != group.order_base.actual_price}}" class="original-price">{{currency_symbol}}{{group.order_base.total_price}}</text>
<text class="sales-price">{{currency_symbol}}{{group.order_base.actual_price}}</text>
</view>
</view>
@ -104,7 +104,7 @@
<view class="buy-nav oh wh-auto">
<view class="nav-base bg-white fl br-t single-text">
<text>合计：</text>
<text class="sales-price">{{price_symbol}}{{total_price}}</text>
<text class="sales-price">{{currency_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>
@ -133,7 +133,7 @@
<view class="item spacing-mt bg-white {{plugins_use_coupon_ids.indexOf(item.id) != -1 ? 'item-disabled' : ''}}" 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 a:if="{{item.coupon.type == 0}}" class="symbol">{{price_symbol}}</text>
<text a:if="{{item.coupon.type == 0}}" class="symbol">{{currency_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>

17
sourcecode/alipay/pages/buy/buy.js
View File

@ -24,7 +24,7 @@ Page({
],
// 基础配置
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
common_order_is_booking: 0,
// 优惠劵
@ -69,7 +69,7 @@ Page({
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
currency_symbol: app.get_config('currency_symbol'),
common_order_is_booking: app.get_config('config.common_order_is_booking'),
});
} else {
@ -391,14 +391,9 @@ Page({
return false;
}
var lng = parseFloat(data.lng || 0);
var lat = parseFloat(data.lat || 0);
my.openLocation({
latitude: lat,
longitude: lng,
scale: 18,
name: data.alias || '',
address: (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || ''),
});
// 打开地图
var name = data.name || data.alias || '';
var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
app.open_location(data.lng, data.lat, name, address);
},
});

6
sourcecode/alipay/pages/cart/cart.axml
View File

@ -28,8 +28,8 @@
<!-- 价格 -->
<view class="oh goods-price">
<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="sales-price">{{currency_symbol}}{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{currency_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">{{price_symbol}}{{total_price}}</view>
<view class="sales-price single-text fr">{{currency_symbol}}{{total_price}}</view>
<view class="fr">合计：</view>
</view>
</view>

4
sourcecode/alipay/pages/cart/cart.js
View File

@ -11,7 +11,7 @@ Page({
buy_submit_disabled_status: true,
// 基础配置
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
common_site_type: 0,
common_is_exhibition_mode_btn_text: null,
common_app_customer_service_tel: null,
@ -31,7 +31,7 @@ Page({
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
currency_symbol: app.get_config('currency_symbol'),
common_site_type: app.get_config('config.common_site_type'),
common_is_exhibition_mode_btn_text: app.get_config('config.common_is_exhibition_mode_btn_text', '立即咨询'),
common_app_customer_service_tel: app.get_config('config.common_app_customer_service_tel'),

17
sourcecode/alipay/pages/extraction-address/extraction-address.js
View File

@ -107,22 +107,17 @@ Page({
// 地图查看
address_map_event(e) {
var index = e.currentTarget.dataset.index || 0;
var ads = this.data.data_list[index] || null;
if (ads == null)
var data = this.data.data_list[index] || null;
if (data == null)
{
app.showToast("地址有误");
return false;
}
var lng = parseFloat(ads.lng || 0);
var lat = parseFloat(ads.lat || 0);
my.openLocation({
latitude: lat,
longitude: lng,
scale: 18,
name: ads.alias || '',
address: (ads.province_name || '') + (ads.city_name || '') + (ads.county_name || '') + (ads.address || ''),
});
// 打开地图
var name = data.alias || '';
var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
app.open_location(data.lng, data.lat, name, address);
},
// 地址内容事件

10
sourcecode/alipay/pages/goods-detail/goods-detail.axml
View File

@ -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">{{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>
<text class="sales-price">{{currency_symbol}}{{goods.price}}</text>
<view a:if="{{(goods.original_price || null) != null && goods.original_price != '0.00'}}" class="original-price">{{currency_symbol}}{{goods.original_price}}</view>
</view>
<view class="base-grid br-t-dashed oh">
<view class="fl tl">
@ -85,7 +85,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 a:if="{{item.type == 0}}" class="symbol">{{price_symbol}}</text>
<text a:if="{{item.type == 0}}" class="symbol">{{currency_symbol}}</text>
<text class="price">{{item.discount_value}}</text>
<text class="unit">{{item.type_unit}}</text>
</view>
@ -194,8 +194,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">{{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 class="sales-price">{{currency_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">{{currency_symbol}}{{goods_spec_base_original_price}}</view>
</view>
<view class="inventory">
<text class="cr-888">库存</text>

4
sourcecode/alipay/pages/goods-detail/goods-detail.js
View File

@ -37,7 +37,7 @@ Page({
quick_nav_cart_count: 0,
// 基础配置
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
common_app_is_poster_share: 0,
common_app_is_good_thing : 0,
common_app_is_online_service: 0,
@ -84,7 +84,7 @@ Page({
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
currency_symbol: app.get_config('currency_symbol'),
common_app_is_use_mobile_detail: app.get_config('config.common_app_is_use_mobile_detail'),
common_is_goods_detail_show_photo: app.get_config('config.common_is_goods_detail_show_photo'),
common_app_is_online_service: app.get_config('config.common_app_is_online_service'),

2
sourcecode/alipay/pages/goods-search/goods-search.axml
View File

@ -20,7 +20,7 @@
<view class="base">
<view class="single-text">{{item.title}}</view>
<view class="price">
<text class="sales-price">{{price_symbol}}{{item.min_price}}</text>
<text class="sales-price">{{currency_symbol}}{{item.min_price}}</text>
</view>
</view>
</navigator>

4
sourcecode/alipay/pages/goods-search/goods-search.js
View File

@ -19,7 +19,7 @@ Page({
],
// 基础配置
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
},
onLoad(params) {
@ -49,7 +49,7 @@ Page({
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
currency_symbol: app.get_config('currency_symbol'),
});
} else {
app.is_config(this, 'init_config');

4
sourcecode/alipay/pages/index/index.axml
View File

@ -21,7 +21,7 @@
<!-- 限时秒杀 -->
<view a:if="{{plugins_limitedtimediscount_is_valid == 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, price_symbol: price_symbol}}"></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, currency_symbol: currency_symbol}}"></template>
</view>
<!-- 楼层数据 -->
@ -51,7 +51,7 @@
<image src="{{goods.images}}" mode="aspectFit" />
<view class="goods-base">
<view class="goods-title single-text">{{goods.title}}</view>
<view class="sales-price">{{price_symbol}}{{goods.min_price}}</view>
<view class="sales-price">{{currency_symbol}}{{goods.min_price}}</view>
</view>
</navigator>
</view>

4
sourcecode/alipay/pages/index/index.js
View File

@ -9,7 +9,7 @@ Page({
navigation: [],
// 基础配置
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
common_shop_notice: null,
common_app_is_enable_search: 0,
common_app_is_enable_answer: 0,
@ -42,7 +42,7 @@ Page({
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
currency_symbol: app.get_config('currency_symbol'),
common_shop_notice: app.get_config('config.common_shop_notice'),
common_app_is_enable_search: app.get_config('config.common_app_is_enable_search'),
common_app_is_enable_answer: app.get_config('config.common_app_is_enable_answer'),

4
sourcecode/alipay/pages/lib/limitedtimediscount/home.axml
View File

@ -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">{{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>
<view class="goods-price single-text">{{currency_symbol}}{{item.price}}</view>
<view a:if="{{(item.original_price || null) != null}}" class="goods-original-price single-text">{{currency_symbol}}{{item.original_price}}</view>
<button size="mini">抢购</button>
</view>
</navigator>

2
sourcecode/alipay/pages/plugins/coupon/index/index.axml
View File

@ -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 a:if="{{item.type == 0}}" class="symbol">{{price_symbol}}</text>
<text a:if="{{item.type == 0}}" class="symbol">{{currency_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>

4
sourcecode/alipay/pages/plugins/coupon/index/index.js
View File

@ -12,7 +12,7 @@ Page({
temp_coupon_receive_value: null,
// 基础配置
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
},
onShow() {
@ -27,7 +27,7 @@ Page({
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
currency_symbol: app.get_config('currency_symbol'),
});
} else {
app.is_config(this, 'init_config');

6
sourcecode/alipay/pages/plugins/coupon/user/user.axml
View File

@ -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 a:if="{{item.coupon.type == 0}}" class="symbol">{{price_symbol}}</text>
<text a:if="{{item.coupon.type == 0}}" class="symbol">{{currency_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 a:if="{{item.coupon.type == 0}}" class="symbol">{{price_symbol}}</text>
<text a:if="{{item.coupon.type == 0}}" class="symbol">{{currency_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 a:if="{{item.coupon.type == 0}}" class="symbol">{{price_symbol}}</text>
<text a:if="{{item.coupon.type == 0}}" class="symbol">{{currency_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>

4
sourcecode/alipay/pages/plugins/coupon/user/user.js
View File

@ -14,7 +14,7 @@ Page({
nav_tabs_value: 'not_use',
// 基础配置
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
},
onShow() {
@ -29,7 +29,7 @@ Page({
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
currency_symbol: app.get_config('currency_symbol'),
});
} else {
app.is_config(this, 'init_config');

15
sourcecode/alipay/pages/plugins/distribution/extraction/extraction.js
View File

@ -92,17 +92,12 @@ Page({
if ((this.data.extraction || null) == null) {
return false;
}
var data = this.data.extraction;
var ads = this.data.extraction;
var lng = parseFloat(ads.lng || 0);
var lat = parseFloat(ads.lat || 0);
my.openLocation({
latitude: lat,
longitude: lng,
scale: 18,
name: ads.alias || '',
address: (ads.province_name || '') + (ads.city_name || '') + (ads.county_name || '') + (ads.address || ''),
});
// 打开地图
var name = data.alias || '';
var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
app.open_location(data.lng, data.lat, name, address);
},
// 进入取货订单管理

8
sourcecode/alipay/pages/plugins/distribution/statistics/statistics.axml
View File

@ -26,25 +26,25 @@
<view class="item fl">
<view class="name cr-666">返佣总额</view>
<view class="value single-text">
<text class="golden">{{price_symbol}}{{user_profit_total_price || '0.00'}}</text>
<text class="golden">{{currency_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">{{price_symbol}}{{user_profit_stay_price || '0.00'}}</text>
<text class="yellow">{{currency_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">{{price_symbol}}{{user_profit_vaild_price || '0.00'}}</text>
<text class="blue">{{currency_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">{{price_symbol}}{{user_profit_already_price || '0.00'}}</text>
<text class="green">{{currency_symbol}}{{user_profit_already_price || '0.00'}}</text>
</view>
</view>
</view>

4
sourcecode/alipay/pages/plugins/distribution/statistics/statistics.js
View File

@ -14,7 +14,7 @@ Page({
profit_data: null,
// 基础配置
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
},
onShow() {
@ -31,7 +31,7 @@ Page({
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
currency_symbol: app.get_config('currency_symbol'),
});
} else {
app.is_config(this, 'init_config');

6
sourcecode/alipay/pages/plugins/membershiplevelvip/statistics/statistics.axml
View File

@ -26,19 +26,19 @@
<view class="item fl">
<view class="name cr-666">返佣总金额</view>
<view class="value single-text">
<text class="golden">{{price_symbol}}{{user_profit_total_price || '0.00'}}</text>
<text class="golden">{{currency_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">{{price_symbol}}{{user_profit_stay_price || '0.00'}}</text>
<text class="yellow">{{currency_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">{{price_symbol}}{{user_profit_already_price || '0.00'}}</text>
<text class="green">{{currency_symbol}}{{user_profit_already_price || '0.00'}}</text>
</view>
</view>
</view>

4
sourcecode/alipay/pages/plugins/membershiplevelvip/statistics/statistics.js
View File

@ -13,7 +13,7 @@ Page({
profit_data: null,
// 基础配置
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
},
onShow() {
@ -30,7 +30,7 @@ Page({
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
currency_symbol: app.get_config('currency_symbol'),
});
} else {
app.is_config(this, 'init_config');

4
sourcecode/alipay/pages/user-faovr/user-faovr.axml
View File

@ -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">{{price_symbol}}{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{price_symbol}}{{item.original_price}}</text>
<text class="sales-price">{{currency_symbol}}{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{currency_symbol}}{{item.original_price}}</text>
</view>
</view>
</navigator>

4
sourcecode/alipay/pages/user-faovr/user-faovr.js
View File

@ -8,7 +8,7 @@ Page({
data_bottom_line_status: false,
// 基础配置
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
},
onShow() {
@ -25,7 +25,7 @@ Page({
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
currency_symbol: app.get_config('currency_symbol'),
});
} else {
app.is_config(this, 'init_config');

4
sourcecode/alipay/pages/user-goods-browse/user-goods-browse.axml
View File

@ -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">{{price_symbol}}{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{price_symbol}}{{item.original_price}}</text>
<text class="sales-price">{{currency_symbol}}{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{currency_symbol}}{{item.original_price}}</text>
</view>
</view>
</navigator>

4
sourcecode/alipay/pages/user-goods-browse/user-goods-browse.js
View File

@ -8,7 +8,7 @@ Page({
data_bottom_line_status: false,
// 基础配置
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
},
onShow() {
@ -25,7 +25,7 @@ Page({
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
currency_symbol: app.get_config('currency_symbol'),
});
} else {
app.is_config(this, 'init_config');

8
sourcecode/alipay/pages/user-order-detail/user-order-detail.axml
View File

@ -29,8 +29,8 @@
</block>
</view>
<view class="oh goods-price">
<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="sales-price">{{detail.currency_data.currency_symbol}}{{item.price}}</text>
<text a:if="{{item.original_price > 0}}" class="original-price">{{detail.currency_data.currency_symbol}}{{item.original_price}}</text>
<text class="buy-number">x{{item.buy_number}}</text>
</view>
</navigator>
@ -75,7 +75,7 @@
<view class="panel-content bg-white">
<view a:for="{{detail_list}}" class="item br-b oh">
<view class="title fl">{{item.name}}</view>
<view class="content cr-888 fl br-l">{{item.value}}</view>
<view class="content fl br-l">{{item.value}}</view>
</view>
</view>
</view>
@ -86,7 +86,7 @@
<view class="panel-content bg-white">
<view a:for="{{extension_data}}" a:key="item" class="item br-b oh">
<text class="title">{{item.name}}</text>
<text class="content cr-888 br-l">{{item.tips}}</text>
<text class="content br-l">{{item.tips}}</text>
</view>
</view>
</view>

32
sourcecode/alipay/pages/user-order-detail/user-order-detail.js
View File

@ -11,9 +11,6 @@ Page({
detail_list: [],
extension_data: [],
site_fictitious: null,
// 基础配置
price_symbol: app.data.price_symbol,
},
onLoad(params) {
@ -26,20 +23,6 @@ Page({
// 数据加载
this.init();
// 初始化配置
this.init_config();
},
// 初始化配置
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
});
} else {
app.is_config(this, 'init_config');
}
},
// 获取数据
@ -159,17 +142,12 @@ Page({
app.showToast("地址有误");
return false;
}
var data = this.data.detail.address_data;
var ads = this.data.detail.address_data;
var lng = parseFloat(ads.lng || 0);
var lat = parseFloat(ads.lat || 0);
my.openLocation({
latitude: lat,
longitude: lng,
scale: 18,
name: ads.alias || '',
address: (ads.province_name || '') + (ads.city_name || '') + (ads.county_name || '') + (ads.address || ''),
});
// 打开地图
var name = data.alias || '';
var address = (data.province_name || '') + (data.city_name || '') + (data.county_name || '') + (data.address || '');
app.open_location(data.lng, data.lat, name, address);
},
// 下拉刷新

4
sourcecode/alipay/pages/user-order/user-order.axml
View File

@ -32,8 +32,8 @@
<view a:if="{{(item.is_can_launch_aftersale == 1 || (detail.orderaftersale || null) != null) && (detail.orderaftersale_btn_text || null) != null}}" 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">{{price_symbol}}{{detail.price}}</text>
<text a:if="{{detail.original_price > 0}}" class="original-price">{{price_symbol}}{{detail.original_price}}</text>
<text class="sales-price">{{item.currency_data.currency_symbol}}{{detail.price}}</text>
<text a:if="{{detail.original_price > 0}}" class="original-price">{{item.currency_data.currency_symbol}}{{detail.original_price}}</text>
<text class="buy-number">x{{detail.buy_number}}</text>
</view>
</navigator>

17
sourcecode/alipay/pages/user-order/user-order.js
View File

@ -23,9 +23,6 @@ Page({
],
nav_status_index: 0,
order_select_ids: [],
// 基础配置
price_symbol: app.data.price_symbol,
},
onLoad(params) {
@ -51,20 +48,6 @@ Page({
// 数据加载
this.init();
// 初始化配置
this.init_config();
},
// 初始化配置
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
});
} else {
app.is_config(this, 'init_config');
}
},
// 获取数据

8
sourcecode/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.axml
View File

@ -13,8 +13,8 @@
</block>
</view>
<view class="oh goods-price">
<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="sales-price">{{order_data.currency_data.currency_symbol}}{{order_data.items.price}}</text>
<text a:if="{{order_data.items.original_price > 0}}" class="original-price">{{order_data.currency_data.currency_symbol}}{{order_data.items.original_price}}</text>
<text class="buy-number">x{{order_data.items.buy_number}}</text>
</view>
</navigator>
@ -54,7 +54,7 @@
<view class="panel-content">
<view a:for="{{panel_base_data_list}}" class="item br-b oh">
<view class="title fl">{{item.name}}</view>
<view class="content cr-888 fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
<view class="content fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
</view>
</view>
</view>
@ -65,7 +65,7 @@
<view class="panel-content">
<view a:for="{{panel_express_data_list}}" class="item br-b oh">
<view class="title fl">{{item.name}}</view>
<view class="content cr-888 fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
<view class="content fl br-l">{{new_aftersale_data[item.field] || ''}}</view>
</view>
</view>
</view>

17
sourcecode/alipay/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
View File

@ -109,9 +109,6 @@ Page({
form_images_list: [],
form_express_name: '',
form_express_number: '',
// 基础配置
price_symbol: app.data.price_symbol,
},
onLoad(params) {
@ -126,20 +123,6 @@ Page({
// 数据加载
this.init();
// 初始化配置
this.init_config();
},
// 初始化配置
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
});
} else {
app.is_config(this, 'init_config');
}
},
// 获取数据

6
sourcecode/alipay/pages/user-orderaftersale/user-orderaftersale.axml
View File

@ -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">{{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="sales-price">{{order_data.currency_data.currency_symbol}}{{item.order_data.items.price}}</text>
<text a:if="{{item.order_data.items.original_price > 0}}" class="original-price">{{order_data.currency_data.currency_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">{{price_symbol}}{{item.price}}</text>
<text a:if="{{item.price > 0}}" class="sales-price">{{order_data.currency_data.currency_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">

17
sourcecode/alipay/pages/user-orderaftersale/user-orderaftersale.js
View File

@ -24,9 +24,6 @@ Page({
{ name: "已取消", value: "5" },
],
nav_status_index: 0,
// 基础配置
price_symbol: app.data.price_symbol,
},
onLoad(params) {
@ -53,20 +50,6 @@ Page({
// 数据加载
this.init();
// 初始化配置
this.init_config();
},
// 初始化配置
init_config(status) {
if((status || false) == true) {
this.setData({
price_symbol: app.get_config('price_symbol'),
});
} else {
app.is_config(this, 'init_config');
}
},
// 获取数据

4
sourcecode/baidu/app.js
View File

@ -77,8 +77,8 @@ App({
application_title: "{{application_title}}",
application_describe: "{{application_describe}}",
// 价格符号
price_symbol: "{{price_symbol}}"
// 货币价格符号
currency_symbol: "{{currency_symbol}}"
},
/**

2
sourcecode/baidu/pages/buy/buy.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
data_list_loding_status: 1,
buy_submit_disabled_status: false,
data_list_loding_msg: '',

12
sourcecode/baidu/pages/buy/buy.swan
View File

@ -55,9 +55,9 @@
</block>
</view>
<view class="oh goods-price">
<text class="sales-price">{{price_symbol}}{{item.price}}
<text class="sales-price">{{currency_symbol}}{{item.price}}
</text>
<text s-if="item.original_price > 0" class="original-price">{{price_symbol}}{{item.original_price}}
<text s-if="item.original_price > 0" class="original-price">{{currency_symbol}}{{item.original_price}}
</text>
<text class="buy-number cr-888">x{{item.stock}}
</text>
@ -79,8 +79,8 @@
</view>
<!-- 小计 -->
<view class="oh tr goods-group-footer spacing-mt spacing-mb">
<text s-if="group.order_base.total_price != group.order_base.actual_price" class="original-price">{{price_symbol}}{{group.order_base.total_price}}</text>
<text class="sales-price">{{price_symbol}}{{group.order_base.actual_price}}</text>
<text s-if="group.order_base.total_price != group.order_base.actual_price" class="original-price">{{currency_symbol}}{{group.order_base.total_price}}</text>
<text class="sales-price">{{currency_symbol}}{{group.order_base.actual_price}}</text>
</view>
</view>
@ -107,7 +107,7 @@
<view class="buy-nav oh wh-auto">
<view class="nav-base bg-white fl br-t single-text">
<text>合计：</text>
<text class="sales-price">{{price_symbol}}{{total_price}}</text>
<text class="sales-price">{{currency_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>
@ -137,7 +137,7 @@
<view class="item spacing-mt bg-white {{tools.indexOf(plugins_use_coupon_ids, item.id) ? 'item-disabled' : ''}}" 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 s-if="item.coupon.type == 0" class="symbol">{{price_symbol}}</text>
<text s-if="item.coupon.type == 0" class="symbol">{{currency_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>

2
sourcecode/baidu/pages/cart/cart.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
data_list_loding_status: 1,
data_list_loding_msg: '',
data_bottom_line_status: false,

6
sourcecode/baidu/pages/cart/cart.swan
View File

@ -28,8 +28,8 @@
<!-- 价格 -->
<view class="oh goods-price">
<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="sales-price">{{currency_symbol}}{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{currency_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">{{price_symbol}}{{total_price}}</view>
<view class="sales-price single-text fr">{{currency_symbol}}{{total_price}}</view>
<view class="fr">合计：</view>
</view>
</view>

2
sourcecode/baidu/pages/goods-detail/goods-detail.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
indicator_dots: false,
indicator_color: 'rgba(0, 0, 0, .3)',

10
sourcecode/baidu/pages/goods-detail/goods-detail.swan
View File

@ -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">{{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>
<text class="sales-price">{{currency_symbol}}{{goods.price}}</text>
<view s-if="(goods.original_price || null) != null && goods.original_price != '0.00'" class="original-price">{{currency_symbol}}{{goods.original_price}}</view>
</view>
<view class="base-grid br-t-dashed oh">
<view class="fl tl">
@ -78,7 +78,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 s-if="item.type == 0" class="symbol">{{price_symbol}}</text>
<text s-if="item.type == 0" class="symbol">{{currency_symbol}}</text>
<text class="price">{{item.discount_value}}</text>
<text class="unit">{{item.type_unit}}</text>
</view>
@ -180,8 +180,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">{{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 class="sales-price">{{currency_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">{{currency_symbol}}{{goods_spec_base_original_price}}</view>
</view>
<view class="inventory">
<text class="cr-888">库存</text>

2
sourcecode/baidu/pages/goods-search/goods-search.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
data_list_loding_status: 1,
data_bottom_line_status: false,
data_list: [],

2
sourcecode/baidu/pages/goods-search/goods-search.swan
View File

@ -20,7 +20,7 @@
<view class="base">
<view class="single-text">{{item.title}}</view>
<view class="price">
<text class="sales-price">{{price_symbol}}{{item.min_price}}</text>
<text class="sales-price">{{currency_symbol}}{{item.min_price}}</text>
</view>
</view>
</navigator>

2
sourcecode/baidu/pages/index/index.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
load_status: 0,
data_list_loding_status: 1,
data_bottom_line_status: false,

4
sourcecode/baidu/pages/index/index.swan
View File

@ -21,7 +21,7 @@
<!-- 限时秒杀 -->
<view s-if="plugins_limitedtimediscount_is_valid == 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, price_symbol: price_symbol}}}"></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, currency_symbol: currency_symbol}}}"></template>
</view>
<!-- 楼层数据 -->
@ -51,7 +51,7 @@
<image src="{{goods.images}}" mode="aspectFit" />
<view class="goods-base">
<view class="goods-title single-text">{{goods.title}}</view>
<view class="sales-price">{{price_symbol}}{{goods.min_price}}</view>
<view class="sales-price">{{currency_symbol}}{{goods.min_price}}</view>
</view>
</navigator>
</view>

4
sourcecode/baidu/pages/lib/limitedtimediscount/home.swan
View File

@ -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">{{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>
<view class="goods-price single-text">{{currency_symbol}}{{item.price}}</view>
<view s-if="(item.original_price || null) != null" class="goods-original-price single-text">{{currency_symbol}}{{item.original_price}}</view>
<button size="mini">抢购</button>
</view>
</navigator>

2
sourcecode/baidu/pages/plugins/coupon/index/index.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',

2
sourcecode/baidu/pages/plugins/coupon/index/index.swan
View File

@ -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 s-if="item.type == 0" class="symbol">{{price_symbol}}</text>
<text s-if="item.type == 0" class="symbol">{{currency_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>

2
sourcecode/baidu/pages/plugins/coupon/user/user.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
data_bottom_line_status: false,
data_list_loding_status: 1,
data_list_loding_msg: '',

6
sourcecode/baidu/pages/plugins/coupon/user/user.swan
View File

@ -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 s-if="item.coupon.type == 0" class="symbol">{{price_symbol}}</text>
<text s-if="item.coupon.type == 0" class="symbol">{{currency_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 s-if="item.coupon.type == 0" class="symbol">{{price_symbol}}</text>
<text s-if="item.coupon.type == 0" class="symbol">{{currency_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 s-if="item.coupon.type == 0" class="symbol">{{price_symbol}}</text>
<text s-if="item.coupon.type == 0" class="symbol">{{currency_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>

2
sourcecode/baidu/pages/plugins/distribution/statistics/statistics.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
data_list_loding_status: 1,
data_list_loding_msg: '加载中...',
data_bottom_line_status: false,

8
sourcecode/baidu/pages/plugins/distribution/statistics/statistics.swan
View File

@ -26,25 +26,25 @@
<view class="item fl">
<view class="name cr-666">返佣总额</view>
<view class="value single-text">
<text class="golden">{{price_symbol}}{{user_profit_total_price || '0.00'}}</text>
<text class="golden">{{currency_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">{{price_symbol}}{{user_profit_stay_price || '0.00'}}</text>
<text class="yellow">{{currency_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">{{price_symbol}}{{user_profit_vaild_price || '0.00'}}</text>
<text class="blue">{{currency_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">{{price_symbol}}{{user_profit_already_price || '0.00'}}</text>
<text class="green">{{currency_symbol}}{{user_profit_already_price || '0.00'}}</text>
</view>
</view>
</view>

2
sourcecode/baidu/pages/user-faovr/user-faovr.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
data_list: [],
data_page_total: 0,
data_page: 1,

4
sourcecode/baidu/pages/user-faovr/user-faovr.swan
View File

@ -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">{{price_symbol}}{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{price_symbol}}{{item.original_price}}</text>
<text class="sales-price">{{currency_symbol}}{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{currency_symbol}}{{item.original_price}}</text>
</view>
</view>
</navigator>

2
sourcecode/baidu/pages/user-goods-browse/user-goods-browse.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
data_list: [],
data_page_total: 0,
data_page: 1,

4
sourcecode/baidu/pages/user-goods-browse/user-goods-browse.swan
View File

@ -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">{{price_symbol}}{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{price_symbol}}{{item.original_price}}</text>
<text class="sales-price">{{currency_symbol}}{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{currency_symbol}}{{item.original_price}}</text>
</view>
</view>
</navigator>

2
sourcecode/baidu/pages/user-order-detail/user-order-detail.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
params: null,
data_list_loding_status: 1,
data_list_loding_msg: '',

4
sourcecode/baidu/pages/user-order-detail/user-order-detail.swan
View File

@ -29,8 +29,8 @@
</block>
</view>
<view class="oh goods-price">
<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="sales-price">{{currency_symbol}}{{item.price}}</text>
<text s-if="item.original_price > 0" class="original-price">{{currency_symbol}}{{item.original_price}}</text>
<text class="buy-number">x{{item.buy_number}}</text>
</view>
</navigator>

2
sourcecode/baidu/pages/user-order/user-order.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
data_list: [],
data_page_total: 0,
data_page: 1,

4
sourcecode/baidu/pages/user-order/user-order.swan
View File

@ -33,8 +33,8 @@
<view s-if="(item.is_can_launch_aftersale == 1 || (detail.orderaftersale || null) != null) && (detail.orderaftersale_btn_text || null) != null" 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">{{price_symbol}}{{detail.price}}</text>
<text s-if="detail.original_price > 0" class="original-price">{{price_symbol}}{{detail.original_price}}</text>
<text class="sales-price">{{currency_symbol}}{{detail.price}}</text>
<text s-if="detail.original_price > 0" class="original-price">{{currency_symbol}}{{detail.original_price}}</text>
<text class="buy-number">x{{detail.buy_number}}</text>
</view>
</navigator>

2
sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
params: null,
data_list_loding_status: 1,
data_list_loding_msg: '',

4
sourcecode/baidu/pages/user-orderaftersale-detail/user-orderaftersale-detail.swan
View File

@ -13,8 +13,8 @@
</block>
</view>
<view class="oh goods-price">
<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="sales-price">{{currency_symbol}}{{order_data.items.price}}</text>
<text s-if="order_data.items.original_price > 0" class="original-price">{{currency_symbol}}{{order_data.items.original_price}}</text>
<text class="buy-number">x{{order_data.items.buy_number}}</text>
</view>
</navigator>

2
sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.js
View File

@ -1,7 +1,7 @@
const app = getApp();
Page({
data: {
price_symbol: app.data.price_symbol,
currency_symbol: app.data.currency_symbol,
params: null,
data_list_loding_status: 1,
data_list_loding_msg: '',

6
sourcecode/baidu/pages/user-orderaftersale/user-orderaftersale.swan
View File

@ -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">{{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="sales-price">{{currency_symbol}}{{item.order_data.items.price}}</text>
<text s-if="item.order_data.items.original_price > 0" class="original-price">{{currency_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">{{price_symbol}}{{item.price}}</text>
<text s-if="item.price > 0" class="sales-price">{{currency_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">

4
sourcecode/qq/app.js
View File

@ -79,8 +79,8 @@ App({
application_title: "{{application_title}}",
application_describe: "{{application_describe}}",
// 价格符号
price_symbol: "{{price_symbol}}"
// 货币价格符号
currency_symbol: "{{currency_symbol}}"
},
/**

Some files were not shown because too many files have changed in this diff Show More