订单新增货币

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

View File

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

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: '',

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>

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,

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>

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)',

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>

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: [],

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>

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,

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>

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>

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: '',

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>

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: '',

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>

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,

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>

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,

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>

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,

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>

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: '',

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>

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,

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>

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: '',

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>

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: '',

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">