所有H5端去掉 元、rmb、¥

crmeb_src/mer_java/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/FinanceServiceImpl.java

@@ -481,7 +481,6 @@ public class FinanceServiceImpl implements FinanceService {
             PlatformStatementResponse response = new PlatformStatementResponse();
             response.setId(statement.getId());
             response.setOrderRealIncome(statement.getOrderPayAmount());
-            response.setOrderRealIncomeSl(statement.getOrderPayAmountSl());
             response.setOrderReceivable(statement.getOrderPayAmount().add(statement.getPlatCouponPrice().add(statement.getIntegralPrice())));
             response.setPlatCouponPrice(statement.getPlatCouponPrice());
             response.setIntegralPrice(statement.getIntegralPrice());
@@ -538,7 +537,6 @@ public class FinanceServiceImpl implements FinanceService {
             PlatformStatementResponse response = new PlatformStatementResponse();
             response.setId(statement.getId());
             response.setOrderRealIncome(statement.getOrderPayAmount());
-            response.setOrderRealIncomeSl(statement.getOrderPayAmountSl());
             response.setOrderReceivable(statement.getOrderPayAmount().add(statement.getPlatCouponPrice().add(statement.getIntegralPrice())));
             response.setPlatCouponPrice(statement.getPlatCouponPrice());
             response.setIntegralPrice(statement.getIntegralPrice());

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/bill/PlatformDailyStatement.java

@@ -36,9 +36,6 @@ public class PlatformDailyStatement implements Serializable {
     @ApiModelProperty(value = "订单支付总金额")
     private BigDecimal orderPayAmount;
 
-    @ApiModelProperty(value = "订单支付总金额SL")
-    private BigDecimal orderPayAmountSl;
-
     @ApiModelProperty(value = "订单支付笔数")
     private Integer totalOrderNum;
 

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/bill/PlatformMonthStatement.java

@@ -36,9 +36,6 @@ public class PlatformMonthStatement implements Serializable {
     @ApiModelProperty(value = "订单支付总金额")
     private BigDecimal orderPayAmount;
 
-    @ApiModelProperty(value = "订单支付总金额SL")
-    private BigDecimal orderPayAmountSl;
-
     @ApiModelProperty(value = "订单支付笔数")
     private Integer totalOrderNum;
 

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/order/Order.java

@@ -163,15 +163,4 @@ public class Order implements Serializable {
     @ApiModelProperty(value = "预约订单取消预约小时数")
     private Integer cancelServiceOrderHour;
 
-    @ApiModelProperty(value = "汇率(RmbToSl)")
-    private BigDecimal rate;
-
-    @ApiModelProperty(value = "汇率差（total_price_reat-pay_fee_sl）")
-    private BigDecimal rateDiff;
-
-    @ApiModelProperty(value = "SL订单金额")
-    private BigDecimal totalPriceReat;
-
-    @ApiModelProperty(value = "rmb算出来的订单金额/汇率")
-    private BigDecimal payFeeSl;
 }

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/PlatformHomeRateResponse.java

@@ -35,12 +35,6 @@ public class PlatformHomeRateResponse implements Serializable {
     @ApiModelProperty(value = "昨日销售额")
     private BigDecimal yesterdaySales = BigDecimal.ZERO;
 
-    @ApiModelProperty(value = "今日销售额SL")
-    private BigDecimal salesReat = BigDecimal.ZERO;
-
-    @ApiModelProperty(value = "昨日销售额SL")
-    private BigDecimal yesterdaySalesReat = BigDecimal.ZERO;
-
     @ApiModelProperty(value = "今日访问量")
     private Integer pageviews = 0;
 

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/PlatformOrderAdminDetailResponse.java

@@ -200,17 +200,4 @@ public class PlatformOrderAdminDetailResponse implements Serializable {
     private Date verifyTime;
 
 
-
-    @ApiModelProperty(value = "汇率(RmbToSl)")
-    private BigDecimal rate;
-
-    @ApiModelProperty(value = "汇率差（total_price_reat-pay_fee_sl）")
-    private BigDecimal rateDiff;
-
-    @ApiModelProperty(value = "SL订单金额")
-    private BigDecimal totalPriceReat;
-
-    @ApiModelProperty(value = "rmb算出来的订单金额/汇率")
-    private BigDecimal payFeeSl;
-
 }

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/PlatformOrderPageResponse.java

@@ -87,15 +87,4 @@ public class PlatformOrderPageResponse implements Serializable {
     @ApiModelProperty(value = "订单商品已退款总数")
     private Integer refundNum = 0;
 
-    @ApiModelProperty(value = "汇率(RmbToSl)")
-    private BigDecimal rate;
-
-    @ApiModelProperty(value = "汇率差（total_price_reat-pay_fee_sl）")
-    private BigDecimal rateDiff;
-
-    @ApiModelProperty(value = "SL订单金额")
-    private BigDecimal totalPriceReat;
-
-    @ApiModelProperty(value = "rmb算出来的订单金额/汇率")
-    private BigDecimal payFeeSl;
 }

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/PlatformStatementResponse.java

@@ -30,9 +30,6 @@ public class PlatformStatementResponse {
     @ApiModelProperty(value = "订单实收")
     private BigDecimal orderRealIncome;
 
-    @ApiModelProperty(value = "订单实收Sl")
-    private BigDecimal orderRealIncomeSl;
-
     @ApiModelProperty(value = "订单应收")
     private BigDecimal orderReceivable;
 

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/OrderService.java

@@ -195,7 +195,7 @@ public interface OrderService extends IService<Order> {
      * @param date 日期，yyyy-MM-dd格式
      * @return BigDecimal
      */
-    HashMap<String, BigDecimal> getPayOrderAmountByDate(Integer merId, String date);
+    BigDecimal getPayOrderAmountByDate(Integer merId, String date);
 
     /**
      * 订单细节详情列表

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/HomeServiceImpl.java

@@ -69,12 +69,8 @@ public class HomeServiceImpl implements HomeService {
         String today = DateUtil.date().toString(DateConstants.DATE_FORMAT_DATE);
         String yesterday = DateUtil.yesterday().toString(DateConstants.DATE_FORMAT_DATE);
         HomeRateResponse response = new HomeRateResponse();
-        HashMap<String, BigDecimal> sales = orderService.getPayOrderAmountByDate(systemAdmin.getMerId(), today);
-        response.setSales(sales.get("payPrice"));
-        response.setSalesReat(sales.get("totalPriceReat"));
-        HashMap<String,BigDecimal> yesterdaySales = orderService.getPayOrderAmountByDate(systemAdmin.getMerId(), yesterday);
-        response.setYesterdaySales(yesterdaySales.get("payPrice"));
-        response.setYesterdaySalesReat(yesterdaySales.get("totalPriceReat"));
+        response.setSales(orderService.getPayOrderAmountByDate(systemAdmin.getMerId(), today));
+        response.setYesterdaySales(orderService.getPayOrderAmountByDate(systemAdmin.getMerId(), yesterday));
         response.setOrderNum(orderService.getOrderNumByDate(systemAdmin.getMerId(), today));
         response.setYesterdayOrderNum(orderService.getOrderNumByDate(systemAdmin.getMerId(), yesterday));
         response.setFollowNum(userMerchantCollectService.getCountByMerId(systemAdmin.getMerId()));
@@ -115,12 +111,8 @@ public class HomeServiceImpl implements HomeService {
         response.setYesterdayNewMerchantNum(merchantService.getNewNumByDate(yesterday));
         response.setOrderNum(orderService.getOrderNumByDate(0, today));
         response.setYesterdayOrderNum(orderService.getOrderNumByDate(0, yesterday));
-        HashMap<String,BigDecimal> sales = orderService.getPayOrderAmountByDate(0, today);
-        HashMap<String,BigDecimal> yesterdaySales = orderService.getPayOrderAmountByDate(0, yesterday);
-        response.setSales(sales.get("payPrice"));
-        response.setYesterdaySales(yesterdaySales.get("payPrice"));
-        response.setSalesReat(sales.get("totalPriceReat"));
-        response.setYesterdaySalesReat(yesterdaySales.get("totalPriceReat"));
+        response.setSales(orderService.getPayOrderAmountByDate(0, today));
+        response.setYesterdaySales(orderService.getPayOrderAmountByDate(0, yesterday));
         response.setUserNum(userService.getTotalNum());
         response.setMerchantNum(merchantService.getAllCount());
         return response;

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/OrderServiceImpl.java

@@ -1230,9 +1230,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
      * @return BigDecimal
      */
     @Override
-    public HashMap<String, BigDecimal> getPayOrderAmountByDate(Integer merId, String date) {
+    public BigDecimal getPayOrderAmountByDate(Integer merId, String date) {
         QueryWrapper<Order> wrapper = new QueryWrapper<>();
-        wrapper.select("pay_price,total_price_reat");
+        wrapper.select("pay_price");
         wrapper.eq("paid", 1);
         if (merId > 0) {
             wrapper.eq("mer_id", merId);
@@ -1241,16 +1241,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         wrapper.apply("date_format(create_time, '%Y-%m-%d') = {0}", date);
         List<Order> orderList = dao.selectList(wrapper);
 
-        HashMap<String, BigDecimal> map = new HashMap<>();
-        map.put("payPrice", new BigDecimal("0"));
-        map.put("totalPriceReat", new BigDecimal("0"));
-
         if (CollUtil.isEmpty(orderList)) {
-            return map;
+            return new BigDecimal("0");
         }
-        map.put("payPrice", orderList.stream().map(Order::getPayPrice).reduce(BigDecimal.ZERO, BigDecimal::add));
-        map.put("totalPriceReat", orderList.stream().map(Order::getTotalPriceReat).reduce(BigDecimal.ZERO, BigDecimal::add));
-        return map;
+
+        return orderList.stream().map(Order::getPayPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
     }
 
     /**

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/StatisticsTaskServiceImpl.java

@@ -195,11 +195,7 @@ public class StatisticsTaskServiceImpl implements StatisticsTaskService {
         // 订单支付数量
         Integer payOrderNum = orderService.getPayOrderNumByDate(yesterdayStr);
 
-        HashMap<String,BigDecimal> sales = orderService.getPayOrderAmountByDate(0, yesterdayStr);
-        // 订单支付金额
-        BigDecimal payOrderAmount = sales.get("payPrice");
-        // 订单支付金额SL
-        BigDecimal payOrderAmountSl = sales.get("totalPriceReat");
+        BigDecimal sales = orderService.getPayOrderAmountByDate(0, yesterdayStr);
 
         // 订单退款数量
         Integer refundOrderNum = refundOrderService.getRefundOrderNumByDate(yesterdayStr);
@@ -211,7 +207,7 @@ public class StatisticsTaskServiceImpl implements StatisticsTaskService {
         tradingDayRecord.setDate(yesterdayStr);
         tradingDayRecord.setProductOrderNum(orderNum);
         tradingDayRecord.setProductOrderPayNum(payOrderNum);
-        tradingDayRecord.setProductOrderPayFee(payOrderAmount);
+        tradingDayRecord.setProductOrderPayFee(sales);
         tradingDayRecord.setProductOrderRefundNum(refundOrderNum);
         tradingDayRecord.setProductOrderRefundFee(refundOrderAmount);
 
@@ -555,7 +551,6 @@ public class StatisticsTaskServiceImpl implements StatisticsTaskService {
             return;
         }
         BigDecimal orderPayAmount = dailyStatementList.stream().map(PlatformDailyStatement::getOrderPayAmount).reduce(BigDecimal.ZERO, BigDecimal::add);
-        BigDecimal orderPayAmountSl = dailyStatementList.stream().map(PlatformDailyStatement::getOrderPayAmountSl).reduce(BigDecimal.ZERO, BigDecimal::add);
 
         int totalOrderNum = dailyStatementList.stream().mapToInt(PlatformDailyStatement::getTotalOrderNum).sum();
         BigDecimal handlingFee = dailyStatementList.stream().map(PlatformDailyStatement::getHandlingFee).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -586,7 +581,6 @@ public class StatisticsTaskServiceImpl implements StatisticsTaskService {
 
 
         platformMonthStatement.setOrderPayAmount(orderPayAmount);
-        platformMonthStatement.setOrderPayAmountSl(orderPayAmountSl);
         platformMonthStatement.setTotalOrderNum(totalOrderNum);
         platformMonthStatement.setHandlingFee(handlingFee);
         platformMonthStatement.setMerchantTransferAmount(merchantTransferAmount);
@@ -632,13 +626,11 @@ public class StatisticsTaskServiceImpl implements StatisticsTaskService {
             myRecord.set("status", 0);
             return myRecord;
         }
-        HashMap<String,BigDecimal> sales = orderService.getPayOrderAmountByDate(0, yesterday);
         List<OrderProfitSharing> sharingList = orderProfitSharingService.findByDate(0, yesterday);
         List<RefundOrder> refundOrderList = refundOrderService.findByDate(0, yesterday);
         List<RechargeOrder> rechargeOrderList = rechargeOrderService.findByDate(yesterday);
         // 平台记录写入
         platformDataWrite(platformDailyStatement, sharingList, refundOrderList, rechargeOrderList);
-        platformDailyStatement.setOrderPayAmountSl(sales.get("totalPriceReat"));
         myRecord.set("status", 1);
         myRecord.set("platformDailyStatement", platformDailyStatement);
         // 商户记录写入

crmeb_src/mer_java/crmeb-service/src/main/resources/mapper/order/OrderMapper.xml

@@ -55,8 +55,7 @@
                o.status, o.refund_status as refundStatus, o.is_user_del as isUserDel, o.is_merchant_del as isMerchantDel,
                o.cancel_status as cancelStatus, o.level, o.type, o.create_time as createTime,o.second_type as secondType, o.group_buy_record_status as groupBuyRecordStatus,
                o.total_num as totalNum,
-               u.nickname,u.is_logoff,
-               o.rate,o.rate_diff,o.total_price_reat,o.pay_fee_sl
+               u.nickname,u.is_logoff
         from eb_order o
         left join eb_user as u on o.uid = u.id
         where o.is_del = 0 and o.second_type in (0,2,5,6,7)

crmeb_src/mer_plat_admin/src/components/OrderDetail/index.vue

@@ -29,12 +29,8 @@
               </div>
             </li>
             <li class="item">
-              <div class="title">实际支付RMB</div>
-              <div>¥ {{ orderDatalist.payPrice || '0.0' }} |  sL{{ orderDatalist.totalPriceReat || '0.0' }}</div>
-            </li>
-            <li class="item">
-              <div class="title">支付汇率</div>
-              <div>{{ orderDatalist.rate}}</div>
+              <div class="title">实际支付</div>
+              <div>¥ {{ orderDatalist.payPrice || '0.0' }}</div>
             </li>
             <li class="item">
               <div class="title">支付方式</div>

crmeb_src/mer_plat_admin/src/views/dashboard/components/baseInfo.vue

@@ -102,12 +102,11 @@
             <el-tag type="primary">今日</el-tag>
           </div>
           <div class="content">
-            <span class="content-number spBlock my15"><span style="margin-right: 50px;">{{ viewData.sales || 0 }} 元</span><span>{{ viewData.salesReat || 0 }} sL</span></span>
+            <span class="content-number spBlock my15">{{ viewData.sales || 0 }} 元</span>
             <el-divider></el-divider>
             <div class="acea-row row-between-wrapper">
               <span class="content-time">昨日数据</span>
               <span class="content-time">{{ viewData.yesterdaySales || 0 }} 元</span>
-              <span class="content-time">{{ viewData.yesterdaySalesReat || 0 }} sL</span>
             </div>
           </div>
         </el-card>

crmeb_src/mer_plat_admin/src/views/finance/statement/index.vue

@@ -70,8 +70,7 @@
         />
         <el-table-column prop="brokerage" label="佣金" min-width="100" />
         <el-table-column prop="orderReceivable" label="订单应收金额" min-width="100" />
-        <el-table-column prop="orderRealIncome" label="订单实收金额(RMB)" min-width="120" />
-        <el-table-column prop="orderRealIncomeSl" label="订单实收金额(SL)" min-width="120" />
+        <el-table-column prop="orderRealIncome" label="订单实收金额" min-width="120" />
         <el-table-column prop="payNum" label="订单应收笔数" min-width="100" />
         <el-table-column prop="orderRefundable" label="订单应退金额" min-width="120" />
         <el-table-column prop="refundNum" label="订单应退笔数" min-width="120" />
@@ -134,7 +133,7 @@
                 >
                   <div slot="header" class="acea-row row-between-wrapper">
                     <span class="header_title">订单实收</span>
-                    <div class="card_title"><span style="margin-right: 20px;">￥{{ accountDetails.orderRealIncome }}</span> <span>sL{{ accountDetails.orderRealIncomeSl }}</span></div>
+                    <div class="card_title">￥{{ accountDetails.orderRealIncome }}</div>
                   </div>
                   <div class="text item">
                     <el-row class="item mb20">

crmeb_src/mer_plat_admin/src/views/order/index.vue

@@ -120,8 +120,7 @@
             <span v-if="scope.row.isLogoff == true" class="colorPrompt">(已注销)</span>
           </template>
         </el-table-column>
-        <el-table-column prop="payPrice" label="实际支付RMB" min-width="80" v-if="checkedCities.includes('实际支付')" />
-        <el-table-column prop="totalPriceReat" label="实际支付SL" min-width="80"  />
+        <el-table-column prop="payPrice" label="实际支付" min-width="80" v-if="checkedCities.includes('实际支付')" />
         <el-table-column prop="rate" label="支付汇率" min-width="80"  />
         <el-table-column label="支付方式" min-width="80" v-if="checkedCities.includes('支付方式')">
           <template slot-scope="scope">

crmeb_src/mer_uniapp/components/PointsPrice.vue

@@ -10,7 +10,7 @@
 		<view class="acea-row row-middle" v-if="parseFloat(pointsPrice.price) || parseFloat(pointsPrice.payFee)">
 			<text class="icon-color semiBold ml-4"
 				:style="[priceStyle, priceColor]">{{ pointsPrice.price || pointsPrice.payFee }}</text>
-			<text :style="[unitStyle]" class="ml-4">元</text>
+			<text :style="[unitStyle]" class="ml-4">{{$store.getters.priceUnit}}</text>
 		</view>
 	</view>
 </template>

crmeb_src/mer_uniapp/components/homeIndex/coupon.vue

@@ -14,7 +14,7 @@
 											class="price"
 											:class="item.money.length>6?'sizePrice':''">{{item.money}}</text></view>
 									<view :style="[...priceColorStyle]" class="title" :class="item.minPrice.length>6?'sizeTitle':''">
-                    {{ !item.minPrice ? '无门槛' : `满${item.minPrice}元可用`}}
+                    {{ !item.minPrice ? '无门槛' : `满${item.minPrice}${$store.getters.priceUnit}可用`}}
 										</view>
 								</view>
 								<view class="right" @click="getCoupon(item)">
@@ -34,7 +34,7 @@
 								<view class="money" :style="[...priceColorStyle]">
 									<view :class="item.money.length>=6?'sizePrice-two':''" class="line-heightOne"><text
 											class="lable"
-											:class="item.money.length>=6?'sizeLable-two':''">¥</text>{{item.money}}
+											:class="item.money.length>=6?'sizeLable-two':''">{{$store.getters.priceUnit}}</text>{{item.money}}
 									</view>
 									<view class="tips">满{{item.minPrice}}可用</view>
 								</view>
@@ -59,7 +59,7 @@
 											class="price"
 											:class="item.money.length>=6?'sizePrice':''">{{item.money}}</text></view>
 									<view class="title " :class="item.minPrice.toString().length>5?'sizeTitle':''">
-										满{{item.minPrice}}元可用</view>
+										满{{item.minPrice}}{{$store.getters.priceUnit}}可用</view>
 								</view>
 								<view class="right" @click="getCoupon(item)" v-if="!item.isUse">
 									立即领取
@@ -81,7 +81,7 @@
 								<view class="left">
 									<view :class="item.money.length>=6?'sizePrice-four':''"
 										:style="[...priceColorStyle]" class="money"><text
-											class="label">¥</text>{{item.money}}
+											class="label">{{$store.getters.priceUnit}}</text>{{item.money}}
 									</view>
 									<view class="tips">满{{item.minPrice}}可用</view>
 								</view>

crmeb_src/mer_uniapp/components/homeIndex/couponDialog.vue

@@ -10,7 +10,7 @@
 				<view class="_item acea-row row-middle" v-for="item in couponList" :key="item.id"
 					:style="{'background-image': `url(${urlDomain}crmebimage/presets/coupon_item_bg.png)`}">
 					<view class="_price_box">
-						<view class="_price">¥{{item.money}}</view>
+						<view class="_price">{{$store.getters.priceUnit}}{{item.money}}</view>
 						<view class="_man">满{{item.minPrice}}可用</view>
 					</view>
 					<view class="flex-1 _desc">

crmeb_src/mer_uniapp/components/homeIndex/seckill.vue

@@ -29,7 +29,7 @@
 							<view v-show="nameShow" :style="[nameColor]" class="name line1 skeleton-rect">{{item.name}}
 							</view>
 							<view v-show="priceShow" :style="[priceColor]" class="x_money semiBold line1 skeleton-rect">
-								¥<text class="num semiBold">{{item.seckillPrice}}</text>
+								{{$store.getters.priceUnit}}<text class="num semiBold">{{item.seckillPrice}}</text>
 							</view>
 						</view>
 					</view>

crmeb_src/mer_uniapp/pages/activity/components/SeckillList.vue

@@ -15,13 +15,13 @@
 					<view class="acea-row row-column row-center row-middle pb-30">
 						<text class="f-s-24 reduce_color title">直降</text>
 						<text
-							class="f-s-24 reduce_color">¥{{(Number(item.price)-Number(item.seckillPrice)).toFixed(2)}}</text>
+							class="f-s-24 reduce_color">{{$store.getters.priceUnit}}{{(Number(item.price)-Number(item.seckillPrice)).toFixed(2)}}</text>
 					</view>
 					<view class="zhekou_price f-s-20 futura text-right">即将恢复</view>
 				</view>
 				<view v-else class="acea-row row-between">
 					<text
-						class="f-s-24 reduce_color mts">商品直降¥{{(Number(item.price)-Number(item.seckillPrice)).toFixed(2)}}</text>
+						class="f-s-24 reduce_color mts">商品直降{{$store.getters.priceUnit}}{{(Number(item.price)-Number(item.seckillPrice)).toFixed(2)}}</text>
 				</view>
 				<!--  抢购中按钮-->
 				<view class="seckill_btn seckill_btn_bg1 acea-row row-middle" v-if="seckillStatus == 1">

crmeb_src/mer_uniapp/pages/activity/components/listStyle.vue

@@ -50,7 +50,7 @@
 								<text class="fs-22 lh-30rpx text-primary pr-8">秒杀价:</text>
 								<baseMoney :money="item.seckillPrice" symbolSize="24" integerSize="40" decimalSize="24"
 									incolor="E93323" weight></baseMoney>
-								<text class="fs-22 lh-30rpx text--w111-999 pl-16 text-line regular">¥{{item.price}}</text>
+								<text class="fs-22 lh-30rpx text--w111-999 pl-16 text-line regular">{{$store.getters.priceUnit}}{{item.price}}</text>
 							</view>
 							<view class="w-full progress-box flex-between-center" v-if="seckillStatus == 1">
 								<view class="flex-y-center">

crmeb_src/mer_uniapp/pages/activity/couponList/index.vue

@@ -47,7 +47,7 @@
 									<view v-show="items.stock===0" class="sellOut">已售罄</view>
 									<image :src="items.image" mode=""></image>
 								</view>
-								<view class="money">¥ {{items.price}}</view>
+								<view class="money">{{$store.getters.priceUnit}} {{items.price}}</view>
 							</view>
 						</view>
 					</view>
@@ -69,12 +69,12 @@
 							:class="item.lastTotal === 0 && item.isLimited?'text--w111-ccc':'font-color'">
 							<view>
 								<p>
-									<text class='font1'>¥</text>
+									<text class='font1'>{{$store.getters.priceUnit}}</text>
 									<text class='font2'>{{parsePrice(item.money)}}</text>
 								</p>
 								<p>
 									<text class='font3' v-if="item.minPrice == 0">无使用门槛</text>
-									<text class='font3' v-else>满{{parsePrice(item.minPrice)}}元可用</text>
+									<text class='font3' v-else>满{{parsePrice(item.minPrice)}}{{$store.getters.priceUnit}}可用</text>
 								</p>
 							</view>
 							<!-- isLimited是true限量，false不限量-->

crmeb_src/mer_uniapp/pages/activity/liveBroadcast/index.vue

@@ -45,7 +45,7 @@
 										v-for="(itm, idx) in JSON.parse(item.goodsJson)" :key="idx">
 										<view class="pro-img" v-if="idx < 3">
 											<image :src="itm.coverImg"></image>
-											<view class="price" v-if="idx < 2">¥{{itm.price}}</view>
+											<view class="price" v-if="idx < 2">{{$store.getters.priceUnit}}{{itm.price}}</view>
 											<view v-else class="more">+{{ JSON.parse(item.goodsJson).length - 2 }}
 											</view>
 										</view>

crmeb_src/mer_uniapp/pages/activity/reservation/reservation_info/index.vue

@@ -35,7 +35,7 @@
 								<view class="price acea-row row-bottom">
 									<priceFormat :price="itm.productAttr.price" weight intSize="28" floatSize="20" labelSize="20"></priceFormat>
 									<view v-if="itm.productAttr.show_svip_price" class="acea-row row-middle vip-price">
-										<text class="vip-money regular">¥{{itm.productAttr.product.svip_price}}</text>
+										<text class="vip-money regular">{{$store.getters.priceUnit}}{{itm.productAttr.product.svip_price}}</text>
 										<image class="vip-image" :src="`${domain}/static/images/svip.png`"></image>
 									</view>
 								</view>

crmeb_src/mer_uniapp/pages/activity/status/index.vue

@@ -36,7 +36,7 @@
 									<priceStyle :price="allData.recordForShare.activePrice"></priceStyle>
 								</view>
 								<view class="text-line text--w111-999 fs-22 lh-30rpx mt-12">
-									¥{{allData.productDetailResponse.productInfo.price}}</view>
+									{{$store.getters.priceUnit}}{{allData.productDetailResponse.productInfo.price}}</view>
 							</view>
 						</view>
 					</view>
@@ -163,7 +163,7 @@
 									<text class="fs-22 lh-30rpx font-red fw-500">拼团价:</text>
 									<priceStyle :price="item.activePrice"></priceStyle>
 								</view>
-								<view class="text-line text--w111-999 fs-22 lh-30rpx mt-12">¥{{item.price}}</view>
+								<view class="text-line text--w111-999 fs-22 lh-30rpx mt-12">{{$store.getters.priceUnit}}{{item.price}}</view>
 							</view>
 							<view class="groupBtn">参与拼团</view>
 						</view>

crmeb_src/mer_uniapp/pages/activity/vip_paid/index.vue

@@ -94,13 +94,13 @@
 					</view>
 					<view v-show="svip.giftBalance!=0" class="isFirstChargeGive f-s-24"
 						:style="{'background-image': `url(${urlDomain}crmebimage/presets/juxing.png)`}">
-						{{svip.isFirstChargeGive?'首次开通':'现在购买'}}立送{{svip.giftBalance}}元余额
+						{{svip.isFirstChargeGive?'首次开通':'现在购买'}}立送{{svip.giftBalance}}{{$store.getters.priceUnit}}余额
 					</view>
 					<view class="acea-row">
 						<view class="text acea-row row-middle">
-							<view><text class="symbol">¥ </text> <text class="number semiBold ml-4">
+							<view><text class="symbol">{{$store.getters.priceUnit}} </text> <text class="number semiBold ml-4">
 									{{ svip.price }}</text><text
-									class="original regular">原价¥{{ parseFloat(svip.originalPrice) }}</text></view>
+									class="original regular">原价{{$store.getters.priceUnit}}{{ parseFloat(svip.originalPrice) }}</text></view>
 						</view>
 						<view class="buy acea-row row-center-wrapper" @tap="subOrder">立即开通</view>
 					</view>

crmeb_src/mer_uniapp/pages/admin/components/PriceChange/index.vue

@@ -14,13 +14,13 @@
 					<view class="item acea-row row-between-wrapper" v-if="orderInfo.refundStatus === 0">
 						<view>商品原价</view>
 						<view class="money">
-							¥{{ orderInfo.totalPrice }}
+							{{$store.getters.priceUnit}}{{ orderInfo.totalPrice }}
 						</view>
 					</view>
 					<view class="item acea-row row-between-wrapper" v-if="orderInfo.refundStatus === 0">
 						<view>商品邮费</view>
 						<view class="money">
-							¥{{ orderInfo.totalPostage }}
+							{{$store.getters.priceUnit}}{{ orderInfo.totalPostage }}
 						</view>
 					</view>
 					<view class="item acea-row row-between-wrapper" v-if="orderInfo.refundStatus === 0">
@@ -35,13 +35,13 @@
 				<!-- 立即退款 -->
 				<!-- <view class="listChange" v-if="status == 2">
 					<view v-if="isRefund" class="item acea-row row-between-wrapper">
-						<view>实际支付(¥)</view>
+						<view>实际支付({{$store.getters.priceUnit}})</view>
 						<view class="money">
 							{{ orderInfo.pay_price }}<span class="iconfont icon-suozi"></span>
 						</view>
 					</view>
 					<view v-if="isRefund" class="item acea-row row-between-wrapper">
-						<view>退款金额(¥)</view>
+						<view>退款金额({{$store.getters.priceUnit}})</view>
 						<view class="money">
 							<input type="text" v-model="refund_price" :class="focus === true ? 'on' : ''" @focus="priceChange" />
 						</view>

crmeb_src/mer_uniapp/pages/admin/components/qiun-data-charts/js_sdk/u-charts/config-echarts.js

@@ -42,11 +42,11 @@ const cfe = {
       		value = res[i].data
       	}
       	// #ifdef H5
-      	result += '\n' + res[i].seriesName + '：' + value + ' 万元'
+      	result += '\n' + res[i].seriesName + '：' + value + ' 万'
       	// #endif
       	
       	// #ifdef APP-PLUS
-      	result += '<br/>' + res[i].marker + res[i].seriesName + '：' + value + ' 万元'
+      	result += '<br/>' + res[i].marker + res[i].seriesName + '：' + value + ' 万'
       	// #endif
       }
       return result;
@@ -55,10 +55,10 @@ const cfe = {
       return "自定义图例+"+name;
     },
     yAxisFormatDemo:function (value, index) {
-      return value + '元';
+      return value ;
     },
     seriesFormatDemo:function(res){
-      return res.name + '年' + res.value + '元';
+      return res.name + '年' + res.value ;
     }
   },
   //这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在eopts参数，会将demotype与eopts中option合并后渲染图表。

crmeb_src/mer_uniapp/pages/admin/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js

@@ -54,11 +54,11 @@ const cfu = {
   "option":{},
   //下面是自定义format配置，因除H5端外的其他端无法通过props传递函数，只能通过此属性对应下标的方式来替换
   "formatter":{
-    "yAxisDemo1":function(val, index, opts){return val+'元'},
+    "yAxisDemo1":function(val, index, opts){return val},
     "yAxisDemo2":function(val, index, opts){return val.toFixed(2)},
     "xAxisDemo1":function(val, index, opts){return val+'年';},
     "xAxisDemo2":function(val, index, opts){return formatDateTime(val,'h:m')},
-    "seriesDemo1":function(val, index, series, opts){return val+'元'},
+    "seriesDemo1":function(val, index, series, opts){return val},
     "tooltipDemo1":function(item, category, index, opts){
       if(index==0){
       	return '随便用'+item.data+'年'
@@ -68,7 +68,7 @@ const cfu = {
     },
     "pieDemo":function(val, index, series, opts){
       if(index !== undefined){
-        return series[index].name+'：'+series[index].data+'元'
+        return series[index].name+'：'+series[index].data
       }
     },
   },

crmeb_src/mer_uniapp/pages/admin/refundOrderDetail/index.vue

@@ -28,11 +28,11 @@
 				</view>
 				<view class='item acea-row row-between'>
 					<view>退款金额</view>
-					<view class='conter'>¥{{refundInfo.refundPrice}}</view>
+					<view class='conter'>{{$store.getters.priceUnit}}{{refundInfo.refundPrice}}</view>
 				</view>
 				<view class='item acea-row row-between'>
 					<view>退回运费</view>
-					<view class='conter'>¥{{refundInfo.refundFreightFee}}</view>
+					<view class='conter'>{{$store.getters.priceUnit}}{{refundInfo.refundFreightFee}}</view>
 				</view>
 				<view class='item acea-row row-between'>
 					<view>退回抵扣积分</view>

crmeb_src/mer_uniapp/pages/admin/splitOrder/index.vue

@@ -28,7 +28,7 @@
 							<view class='infor line1'>
 								属性：{{item.cart_info.productInfo.attrInfo.suk || '默认'}}</view>
 							<view class="acea-row row-middle money-section">
-								实付款：<view class='money'>¥{{item.cart_info.sum_true_price}}</view>
+								实付款：<view class='money'>{{$store.getters.priceUnit}}{{item.cart_info.sum_true_price}}</view>
 							</view>
 						</view>
 						<view class='carnum acea-row row-center-wrapper'>

crmeb_src/mer_uniapp/pages/admin/statistics/index.vue

@@ -10,7 +10,7 @@
 		</view>
 		<view class="order-index" ref="container">
 			<view class="header">
-				<view class="">销售额(元)</view>
+				<view class="">销售额</view>
 				<view class="money">{{ after_price }}</view>
 				<view class="info">
 					环比增长：{{ increase_time_status == 1 ? '' : '-' }}{{ growth_rate }}%
@@ -51,8 +51,8 @@
 				<view class="nav acea-row row-between-wrapper">
 					<view class="data">日期</view>
 					<view class="browse">订单数</view>
-					<view class="turnover">销售额(元)</view>
-					<view class="visit">退款(元)</view>
+					<view class="turnover">销售额</view>
+					<view class="visit">退款</view>
 				</view>
 				<view class="conter">
 					<view class="item acea-row row-between-wrapper" v-for="(item, index) in 3" :key="index">

crmeb_src/mer_uniapp/pages/admin/work/index.vue

@@ -44,14 +44,14 @@
 			<view class="today" v-if="selectMerchantRole.split(',').includes('6')">
 				<view class="title-box">
 					<navigator class="link"  hover-class="none">
-						今日销售额(元)
+						今日销售额
 					</navigator>
 					<view class="money semiBold">{{homeData.sales?homeData.sales:0}}</view>
 				</view>
 				<view class="acea-row">
 					<view class="item">
 						<view class="num semiBold">{{homeData.yesterdaySales?homeData.yesterdaySales:0}} </view>
-						<view class="">昨日销售额(元)</view>
+						<view class="">昨日销售额</view>
 					</view>
 					<view class="item semiBold">
 						<view class="num">{{ homeData.orderNum?homeData.orderNum:0 }}</view>

crmeb_src/mer_uniapp/pages/discover/components/videoContent.vue

@@ -29,7 +29,7 @@
                 <view v-show="goods.isPay===1" class="buy">作者买过</view>
               </view>
               <view class="product-price">
-                <view class="price">¥<text>{{goods.price}}</text></view>
+                <view class="price">{{$store.getters.priceUnit}}<text>{{goods.price}}</text></view>
                 <view class="buy-btn"><view class="line-heightOne">购买</view></view>
               </view>
             </view>

crmeb_src/mer_uniapp/pages/discover/discover_video/appVideo/index.nvue

@@ -144,7 +144,7 @@
 													<text class="names line1 line-heightOne">{{goods.productName}}</text>
 													<text v-if="goods.isPay===1" class="buy">作者买过</text>
 													<view class="product-price">
-														<view class="price"><text class="sm">¥</text><text
+														<view class="price"><text class="sm">{{$store.getters.priceUnit}}</text><text
 																class="money">{{goods.price}}</text></view>
 														<text class="buy-btn">购买</text>
 													</view>

crmeb_src/mer_uniapp/pages/goods/components/couponListWindow/index.vue

@@ -10,7 +10,7 @@
 							:key='index'>
 							<view class='money acea-row row-column row-center-wrapper' :class='!item.isChoose&&!item.isChecked?"moneyGray":"main_bg"'>
 								<view>￥<text class='num'>{{item.money?Number(item.money):''}}</text></view>
-								<view class="pic-num">满{{item.minPrice}}元可用</view>
+								<view class="pic-num">满{{item.minPrice}}{{$store.getters.priceUnit}}可用</view>
 							</view>
 							<view class='text'>
 								<view class='acea-row condition'>

crmeb_src/mer_uniapp/pages/goods/components/getCoponWindow/index.vue

@@ -11,7 +11,7 @@
 						@click="getCouponUser(index,item.id)" :key='index'>
 						<view class='money acea-row row-column row-center-wrapper main_bg'>
 							<view>￥<text class='num'>{{item.money?Number(item.money):''}}</text></view>
-							<view class="pic-num">满{{item.minPrice}}元可用</view>
+							<view class="pic-num">满{{item.minPrice}}{{$store.getters.priceUnit}}可用</view>
 						</view>
 						<view class='text'>
 							<view class='acea-row condition'>

crmeb_src/mer_uniapp/pages/goods/components/jyf-parser/libs/MpHtmlParser.js

@@ -39,7 +39,7 @@ var entities = {
 	divide: '÷',
 	cent: '￠',
 	pound: '£',
-	yen: '¥',
+	yen: 'sl',
 	euro: '€',
 	sect: '§'
 };

crmeb_src/mer_uniapp/pages/goods/coupon_goods_list/index.vue

@@ -19,10 +19,10 @@
 				<view class='titleBox acea-row row-middle skeleton-rect'>
 					<view class="acea-row row-middle flex-1">
 						<view>
-							<text class='font1'>¥</text>
+							<text class='font1'>{{$store.getters.priceUnit}}</text>
 							<text class='font2'>{{money}}</text>
 						</view>
-						<text class='font3'>满{{minPrice}}元可用</text>
+						<text class='font3'>满{{minPrice}}{{$store.getters.priceUnit}}可用</text>
 					</view>
 					<view v-show="type==='1'" class="_right" @click="receiveCoupon">
 						<view class="_btn acea-row row-center row-middle">{{isUserReceive ? '已领取' : '领取'}}</view>

crmeb_src/mer_uniapp/pages/goods/goods_details/index.vue

@@ -84,7 +84,7 @@
 												+
 												<span class="semiBold ml-4 fs-40">{{
                           productPrice.price
-                        }}</span><span class="f-s-36 font-color-red ml-4">元</span>
+                        }}</span><span class="f-s-36 font-color-red ml-4">{{$store.getters.priceUnit}}</span>
 											</view>
 										</view>
 										<!-- 其他商品价格 -->

crmeb_src/mer_uniapp/pages/goods/order_details/index.vue

@@ -584,9 +584,6 @@
 					});
 				});
 			},
-			orderRmbToSl: function(rmb,rate){
-				return (Math.ceil((rmb / rate) * 100) / 100).toFixed(2);
-			},
 			/**
 			 * 获取订单详细信息
 			 *

crmeb_src/mer_uniapp/pages/goods/order_list/index.vue

@@ -306,9 +306,6 @@
 			if (options.secondType) this.secondType = options.secondType
 		},
 		methods: {
-			orderRmbToSl: function(rmb,rate){
-				return (Math.ceil((rmb / rate) * 100) / 100).toFixed(2);
-			},
 			/**
 			 * 分享打开
 			 *

crmeb_src/mer_uniapp/pages/users/components/jyf-parser/libs/MpHtmlParser.js

@@ -39,7 +39,7 @@ var entities = {
 	divide: '÷',
 	cent: '￠',
 	pound: '£',
-	yen: '¥',
+	yen: 'sl',
 	euro: '€',
 	sect: '§'
 };

crmeb_src/mer_uniapp/pages/users/promoter-list/index.vue

@@ -74,7 +74,7 @@
 								<view><text class='num font-color'>{{item.childCount ? item.childCount : 0}}</text>人
 								</view>
 								<view><text class="num">{{item.orderCount ? item.orderCount : 0}}</text>单</view>
-								<view><text class="num">{{item.amountCount ? item.amountCount : 0}}</text>元</view>
+								<view><text class="num">{{item.amountCount ? item.amountCount : 0}}</text>{{$store.getters.priceUnit}}</view>
 							</view>
 						</view>
 					</view>

crmeb_src/mer_uniapp/pages/users/user_coupon/index.vue

@@ -19,7 +19,7 @@
 					<view class='money'
 						:class="item.validStr==='unusable'||item.validStr==='overdue' ? 'moneyGray' : 'main_bg'">
 						<view class="logo">￥<text class='num'>{{item.money?Number(item.money):''}}</text></view>
-						<view class="pic-num">满{{ Number(item.minPrice) }}元可用</view>
+						<view class="pic-num">满{{ Number(item.minPrice) }}{{$store.getters.priceUnit}}可用</view>
 					</view>
 					<view class='text'>
 						<view class='condition acea-row'>