Parcourir la source

h5端去掉通过汇率计算售价:
1.订单相关
2.产品相关
3.产品详情
4.购物车
5.订单结算
6.订单列表
7.消费记录
8.提现记录
9.提现

13147038669 il y a 5 mois
Parent
commit
61dba6d59a
21 fichiers modifiés avec 67 ajouts et 280 suppressions
  1. 0 2
      crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/CreateOrderRequest.java
  2. 0 2
      crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/OrderPayRequest.java
  3. 0 12
      crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/OrderFrontDetailResponse.java
  4. 0 2
      crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/OrderPayResultResponse.java
  5. 0 5
      crmeb_src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java
  6. 10 12
      crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/PayServiceImpl.java
  7. 2 6
      crmeb_src/mer_uniapp/components/merchantList/index.vue
  8. 1 5
      crmeb_src/mer_uniapp/components/orderGoods/index.vue
  9. 4 7
      crmeb_src/mer_uniapp/components/svipPrice.vue
  10. 2 2
      crmeb_src/mer_uniapp/config/app.js
  11. 2 4
      crmeb_src/mer_uniapp/mixins/OrderPay.js
  12. 2 6
      crmeb_src/mer_uniapp/pages/goods/goods_details/index.vue
  13. 17 69
      crmeb_src/mer_uniapp/pages/goods/order_confirm/index.vue
  14. 13 34
      crmeb_src/mer_uniapp/pages/goods/order_details/index.vue
  15. 2 3
      crmeb_src/mer_uniapp/pages/goods/order_list/index.vue
  16. 1 1
      crmeb_src/mer_uniapp/pages/goods/order_pay_status/index.vue
  17. 3 6
      crmeb_src/mer_uniapp/pages/goods/order_payment/index.vue
  18. 7 25
      crmeb_src/mer_uniapp/pages/order_addcart/order_addcart.vue
  19. 0 41
      crmeb_src/mer_uniapp/pages/users/user_money/index.vue
  20. 1 19
      crmeb_src/mer_uniapp/pages/users/user_withd_slgns/index.vue
  21. 0 17
      crmeb_src/mer_uniapp/utils/index.js

+ 0 - 2
crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/CreateOrderRequest.java

@@ -67,6 +67,4 @@ public class CreateOrderRequest implements Serializable {
     @ApiModelProperty(value = "预约联系电话")
     private String reservationPhone;
 
-    @ApiModelProperty(value = "其他附加参数")
-    private HashMap<String, Object> orderInfoVo;
 }

+ 0 - 2
crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/OrderPayRequest.java

@@ -48,6 +48,4 @@ public class OrderPayRequest {
     @ApiModelProperty(value = "下单时小程序的场景值")
     private Integer scene;
 
-    @ApiModelProperty(value = "支付总金额Sl")
-    private BigDecimal totalPriceReat;
 }

+ 0 - 12
crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/OrderFrontDetailResponse.java

@@ -132,16 +132,4 @@ public class OrderFrontDetailResponse implements Serializable {
 
     @ApiModelProperty(value = "预约订单取消预约标识")
     private Boolean isCancelServiceOrder = false;
-
-    @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;
 }

+ 0 - 2
crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/OrderPayResultResponse.java

@@ -56,6 +56,4 @@ public class OrderPayResultResponse {
 
     private String money;
 
-    @ApiModelProperty(value = "支付总金额Sl")
-    private BigDecimal totalPriceReat;
 }

+ 0 - 5
crmeb_src/mer_java/crmeb-front/src/main/java/com/zbkj/front/service/impl/FrontOrderServiceImpl.java

@@ -1240,14 +1240,9 @@ public class FrontOrderServiceImpl implements FrontOrderService {
         }
         List<PreMerchantOrderVo> merchantOrderVoList = orderInfoVo.getMerchantOrderVoList();
 
-        HashMap<String, Object> OrderInfoData = orderRequest.getOrderInfoVo();
         // 平台订单
         Order order = new Order();
         String orderNo = CrmebUtil.getOrderNo(OrderConstants.ORDER_PREFIX_PLATFORM);
-        order.setRate(new BigDecimal(OrderInfoData.get("rate").toString()));
-        order.setRateDiff(new BigDecimal(OrderInfoData.get("reatDiff").toString()));
-        order.setTotalPriceReat(new BigDecimal(OrderInfoData.get("totalPriceReat").toString()));
-        order.setPayFeeSl(new BigDecimal(OrderInfoData.get("payFeeSl").toString()));
         order.setOrderNo(orderNo);
         order.setMerId(0);
         order.setUid(user.getId());

+ 10 - 12
crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/PayServiceImpl.java

@@ -228,7 +228,7 @@ public class PayServiceImpl implements PayService {
 
         // 余额支付
         if (orderPayRequest.getPayType().equals(PayConstants.PAY_TYPE_YUE)) {
-            if (user.getNowMoney().compareTo(order.getTotalPriceReat()) < 0) {
+            if (user.getNowMoney().compareTo(order.getPayPrice()) < 0) {
                 throw new CrmebException(UserResultCode.USER_BALANCE_INSUFFICIENT);
             }
         }
@@ -237,17 +237,16 @@ public class PayServiceImpl implements PayService {
         response.setOrderNo(order.getOrderNo());
         response.setPayType(order.getPayType());
         response.setPayChannel(order.getPayChannel());
-        response.setTotalPriceReat(order.getTotalPriceReat());
         if (!order.getSecondType().equals(OrderConstants.ORDER_SECOND_TYPE_INTEGRAL)) {
-            if (order.getTotalPriceReat().compareTo(BigDecimal.ZERO) <= 0) {
+            if (order.getPayPrice().compareTo(BigDecimal.ZERO) <= 0) {
                 throw new CrmebException(CommonResultCode.VALIDATE_FAILED, "支付金额不能低于等于0");
             }
         }
 
 
         // 余额支付
-        if (order.getPayType().equals(PayConstants.PAY_TYPE_YUE) || order.getTotalPriceReat().compareTo(BigDecimal.ZERO) <= 0) {
-            Boolean yueBoolean = yuePay(order, user, orderPayRequest);
+        if (order.getPayType().equals(PayConstants.PAY_TYPE_YUE) || order.getPayPrice().compareTo(BigDecimal.ZERO) <= 0) {
+            Boolean yueBoolean = yuePay(order, user);
             response.setStatus(yueBoolean);
             return response;
         }
@@ -1555,7 +1554,7 @@ public class PayServiceImpl implements PayService {
      * @param order 订单
      * @return Boolean Boolean
      */
-    private Boolean yuePay(Order order, User user, OrderPayRequest orderPayRequest) {
+    private Boolean yuePay(Order order, User user) {
         // 用户余额扣除
         Boolean execute = transactionTemplate.execute(e -> {
             Boolean update = Boolean.TRUE;
@@ -1568,8 +1567,8 @@ public class PayServiceImpl implements PayService {
             order.setUpdateTime(DateUtil.date());
             orderService.updateById(order);
             // 这里只扣除金额,账单记录在task中处理
-            if (order.getTotalPriceReat().compareTo(BigDecimal.ZERO) > 0) {
-                update = userService.updateNowMoney(order.getUid(), order.getTotalPriceReat(), Constants.OPERATION_TYPE_SUBTRACT);
+            if (order.getPayPrice().compareTo(BigDecimal.ZERO) > 0) {
+                update = userService.updateNowMoney(order.getUid(), order.getPayPrice(), Constants.OPERATION_TYPE_SUBTRACT);
                 if (!update) {
                     logger.error("余额支付,扣除用户余额失败,orderNo = {}", order.getOrderNo());
                     e.setRollbackOnly();
@@ -1579,12 +1578,11 @@ public class PayServiceImpl implements PayService {
                 UserBalanceRecord userBalanceRecord = new UserBalanceRecord();
                 userBalanceRecord.setUid(user.getId());
                 userBalanceRecord.setLinkId(order.getOrderNo());
-                userBalanceRecord.setRate(order.getRate());
                 userBalanceRecord.setLinkType(BalanceRecordConstants.BALANCE_RECORD_LINK_TYPE_ORDER);
                 userBalanceRecord.setType(BalanceRecordConstants.BALANCE_RECORD_TYPE_SUB);
-                userBalanceRecord.setAmount(order.getTotalPriceReat());
-                userBalanceRecord.setBalance(user.getNowMoney().subtract(order.getTotalPriceReat()));
-                userBalanceRecord.setRemark(StrUtil.format(BalanceRecordConstants.BALANCE_RECORD_REMARK_ORDER, order.getTotalPriceReat()));
+                userBalanceRecord.setAmount(order.getPayPrice());
+                userBalanceRecord.setBalance(user.getNowMoney().subtract(order.getPayPrice()));
+                userBalanceRecord.setRemark(StrUtil.format(BalanceRecordConstants.BALANCE_RECORD_REMARK_ORDER, order.getPayPrice()));
                 userBalanceRecordService.save(userBalanceRecord);
             }
             return update;

+ 2 - 6
crmeb_src/mer_uniapp/components/merchantList/index.vue

@@ -50,12 +50,12 @@
 								<image :src="goods.image" mode="aspectFill"></image>
 								<!-- <easy-loadimage :image-src="goods.image"></easy-loadimage> -->
 								<view v-if="!isStreet" class="price" :style="[isHome?merchantStyle.priceColor:'']">
-									<text>{{$store.getters.priceUnit}}</text>{{rmbToLgnsHandle(goods.price)}}
+									<text>{{$store.getters.priceUnit}}</text>{{goods.price}}
 								</view>
 							</view>
 							<view class="pic-name line2" v-if="isStreet">{{goods.name}}</view>
 							<view v-if="isStreet" class="street-price semiBold line-heightOne" :style="[isHome?merchantStyle.priceColor:'']">
-								<text>{{$store.getters.priceUnit}}</text>{{rmbToLgnsHandle(goods.price)}}
+								<text>{{$store.getters.priceUnit}}</text>{{goods.price}}
 							</view>
 						</view>
 					</view>
@@ -82,7 +82,6 @@
 		mapGetters
 	} from "vuex";
 	import easyLoadimage from '@/components/base/easy-loadimage.vue';
-	import { rmbToLgns } from '@/utils';
 	export default {
 		data() {
 			return {
@@ -130,9 +129,6 @@
 			this.moren = this.urlDomain + 'crmebimage/presets/mermoren.png';
 		},
 		methods: {
-			rmbToLgnsHandle(rmb){
-				return rmbToLgns(rmb)
-			},
 			godDetail(item) {
 				goProductDetail(item.id, 0, '')
 			},

+ 1 - 5
crmeb_src/mer_uniapp/components/orderGoods/index.vue

@@ -37,7 +37,7 @@
 						<!-- 其他价格 -->
 						<view v-else class='acea-row justify-between' style="align-items: baseline;">
 							<view v-show="item.price || item.productPrice" class="acea-row">
-								<view class='money line-heightOne regular'>{{$store.getters.priceUnit}}{{item.priceSl || item.productPriceSl}}</view>
+								<view class='money line-heightOne regular'>{{$store.getters.priceUnit}}{{item.price || item.productPrice}}</view>
 							</view>
 							<view
 								v-if="(item.deliveryMethod == 1 || !orderInfo.takeTheirSwitch) && !jump && Number(item.productType)==0"
@@ -82,7 +82,6 @@
 	} from "@/enums/productEnums";
 	import PointsPrice from '@/components/PointsPrice.vue';
   import {handleSetClipboard} from "../../libs/order";
-  import { rmbToLgns } from "@/utils";
 
   /**
 	 * 积分商品推荐样式
@@ -170,9 +169,6 @@
 			}
 		},
 		methods: {
-      rmbToLgnsHandle(rmb){
-        return rmbToLgns(rmb)
-      },
       handleSetClipboard,
 			// 普通商品、虚拟(开启可申请退款开关)、视频号可申请退款
 			isRefund(item) {

+ 4 - 7
crmeb_src/mer_uniapp/components/svipPrice.vue

@@ -3,7 +3,7 @@
 		<view :class="priceColor.color?'':'x-money'" class="mr-12 acea-row items-baseline relative" :style="svipPriceStyle.topStyle?[svipPriceStyle.topStyle,priceColor]:[priceColor]">
 			<view class="f-s-26">{{$store.getters.priceUnit}}</view>
 			<view v-if="productPrice.groupPrice" class='tui-skeleton-rect semiBold' :style="[svipIconStyle.price]">{{productPrice.groupPrice}}</view>
-			<view v-else class='tui-skeleton-rect semiBold' :style="[svipIconStyle.price]">{{rmbToLgnsHandle(userIsPaidMember && productPrice.isPaidMember?productPrice.vipPrice:productPrice.price)}}</view>
+			<view v-else class='tui-skeleton-rect semiBold' :style="[svipIconStyle.price]">{{userIsPaidMember && productPrice.isPaidMember?productPrice.vipPrice:productPrice.price}}</view>
 		</view>
 		<view v-if="userIsPaidMember && productPrice.isPaidMember" class="svip-icon acea-row row-middle" :style="[svipIconStyle.svipBox]">
 			<view :style="[svipIconStyle.svipPrice]">SVIP会员价</view>
@@ -11,14 +11,13 @@
 		
 		<view v-if="!userIsPaidMember && paidMemberPriceDisplay==='all' && productPrice.isPaidMember&&!productPrice.groupPrice" class="svip-price acea-row row-middle" :style="[svipPriceStyle.svipBox]">
 			<view class="icon pl-10 acea-row row-middle" :style="[svipPriceStyle.icon]">SVIP</view>
-			<view class="price ml-6 semiBold" :style="[svipPriceStyle.svipPrice]">{{$store.getters.priceUnit}}{{rmbToLgnsHandle(productPrice.vipPrice)}}</view>
+			<view class="price ml-6 semiBold" :style="[svipPriceStyle.svipPrice]">{{$store.getters.priceUnit}}{{productPrice.vipPrice}}</view>
 		</view>
 	</view>
 </template>
 
 <script>
-	import {configMap, rmbToLgns} from "../utils";
-
+  import {configMap} from "../utils";
   export default {
 		computed: configMap(['userIsPaidMember','paidMemberPriceDisplay']),
 		props: {
@@ -46,9 +45,7 @@
 			}
 		},
 		methods: {
-			rmbToLgnsHandle(rmb){
-				return rmbToLgns(rmb)
-			}
+
 		}
 	}
 </script>

+ 2 - 2
crmeb_src/mer_uniapp/config/app.js

@@ -8,8 +8,8 @@
 // | Author: CRMEB Team <admin@crmeb.com>
 // +----------------------------------------------------------------------
 //移动端商城API 网络接口修改此配置,小程序域名要求https 例如:https://xxx
-// let domain = 'http://127.0.0.1:20810'
-let domain = 'https://play.nanodreamtech.com'
+let domain = 'http://127.0.0.1:20810'
+// let domain = 'https://play.nanodreamtech.com'
 
 module.exports = {
 	// 请求域名 格式: https://您的域名

+ 2 - 4
crmeb_src/mer_uniapp/mixins/OrderPay.js

@@ -307,7 +307,7 @@ export default {
 		 * @param {data} res 订单对象
 		 */
 		getToPayment(secondType,data) {
-			let url = `/pages/goods/order_payment/index?orderNo=${data.orderNo}&payPrice=${data.payPrice}&totalPriceReat=${data.totalPriceReat}`
+			let url = `/pages/goods/order_payment/index?orderNo=${data.orderNo}&payPrice=${data.payPrice}`
 			uni.redirectTo({
 				url: url
 			});
@@ -322,14 +322,12 @@ export default {
 		 * @param {Object} fromType  页面来源
 		 * @param {Object} payPrice  支付金额
 		 */
-		changeOrderPay(orderNo, payChannel, payType ,productType, fromType, payPrice,totalPriceReat) {
+		changeOrderPay(orderNo, payChannel, payType ,productType, fromType, payPrice) {
 			orderPayApi({
-				totalPriceReat: totalPriceReat,
 				orderNo: orderNo,
 				payChannel: payChannel,
 				payType: payType,
 				scene: productType === 'normal' ? 0 : 1177
-			
 			}).then(res => {
 				this.handleOrderPay(res, orderNo, productType, fromType, payType, payPrice)
 			}).catch(err => {

+ 2 - 6
crmeb_src/mer_uniapp/pages/goods/goods_details/index.vue

@@ -317,7 +317,7 @@
 												height="204rpx"></easy-loadimage>
 										</view>
 										<view class="name line2 mt-20 h-74 lh-38rpx">{{ val.name }}</view>
-										<view class="money theme_price regular">{{$store.getters.priceUnit}}{{ rmbToLgnsHandle(val.price) }}</view>
+										<view class="money theme_price regular">{{$store.getters.priceUnit}}{{ val.price }}</view>
 									</view>
 								</view>
 							</view>
@@ -668,8 +668,7 @@
 	import merHome from "@/components/merHome/index.vue";
 	import mpHtml from "@/uni_modules/mp-html/components/mp-html/mp-html.vue";
 	import {
-		silenceBindingSpread,
-		rmbToLgns
+		silenceBindingSpread
 	} from "@/utils";
 	import parser from "../components/jyf-parser/jyf-parser";
 	import tuiDrawer from "@/components/tui-drawer/tui-drawer.vue";
@@ -1083,9 +1082,6 @@
 		},
 		// #endif
 		methods: {
-			rmbToLgnsHandle(rmb){
-				return rmbToLgns(rmb)
-			},
 			// 保障协议弹出框
 			handleToGgle(type) {
 				if (type) {

+ 17 - 69
crmeb_src/mer_uniapp/pages/goods/order_confirm/index.vue

@@ -124,13 +124,13 @@
 					<view v-show="item.shippingType === 1 && Number(orderInfoVo.secondType)===0"
 						class='item acea-row row-between-wrapper'>
 						<view>快递费用</view>
-						<view v-if='!item.freightFeeSl || item.freightFeeSl == 0' class="noCoupon">免运费</view>
-						<view v-else class='money'>sL{{item.freightFeeSl || 0}}</view>
+						<view v-if='!item.freightFee || item.freightFee == 0' class="noCoupon">免运费</view>
+						<view v-else class='money'>{{$store.getters.priceUnit}}{{item.freightFee || 0}}</view>
 					</view>
-					<view v-show="item.svipDiscountPriceSl != 0&&orderInfoVo.type!=2"
+					<view v-show="item.svipDiscountPrice != 0&&orderInfoVo.type!=2"
 						class='item acea-row row-between-wrapper'>
 						<view>会员优惠</view>
-						<view class='money'>-{{$store.getters.priceUnit}}{{item.svipDiscountPriceSl || 0}}</view>
+						<view class='money'>-{{$store.getters.priceUnit}}{{item.svipDiscountPrice || 0}}</view>
 					</view>
 					<view v-if="isProductType" class='item acea-row row-between-wrapper'>
 						<view>店铺优惠</view>
@@ -138,7 +138,7 @@
 							@tap='couponTap(item.merCouponUserList,item.merId, index)'>
 							<view class='discount acea-row row-between-wrapper'>
 								<text
-									class="couponTitle line1">{{item.couponFeeSl==0?`有${item.merCouponUserList.length}张优惠券可选`:`-${$store.getters.priceUnit}${item.couponFeeSl}`}}</text>
+									class="couponTitle line1">{{item.couponFee==0?`有${item.merCouponUserList.length}张优惠券可选`:`-${$store.getters.priceUnit}${item.couponFee}`}}</text>
 								<text class='iconfont text-bbb icon-ic_rightarrow ml-4'></text>
 							</view>
 						</view>
@@ -159,20 +159,20 @@
         <view v-show="secondType !== ProductTypeEnum.Integral" class='moneyList borRadius14'>
           <view class='item acea-row row-between-wrapper'>
             <view>商品总价</view>
-            <view class='money'>{{$store.getters.priceUnit}}{{orderInfoVo.proTotalFeeSl || 0}}</view>
+            <view class='money'>{{$store.getters.priceUnit}}{{orderInfoVo.proTotalFee || 0}}</view>
           </view>
-          <view class='item acea-row row-between-wrapper' v-if="parseInt(orderInfoVo.freightFeeSl) > 0">
+          <view class='item acea-row row-between-wrapper' v-if="parseInt(orderInfoVo.freightFee) > 0">
             <view>运费:</view>
-            <view class='money'>+{{$store.getters.priceUnit}}{{orderInfoVo.freightFeeSl || 0}}</view>
+            <view class='money'>+{{$store.getters.priceUnit}}{{orderInfoVo.freightFee || 0}}</view>
           </view>
-          <view v-show="orderInfoVo.svipDiscountPriceSl != 0 &&orderInfoVo.type!=2"
+          <view v-show="orderInfoVo.svipDiscountPrice != 0 &&orderInfoVo.type!=2"
                 class='item acea-row row-between-wrapper'>
             <view>会员优惠</view>
-            <view class='money'>-{{$store.getters.priceUnit}}{{orderInfoVo.svipDiscountPriceSl || 0}}</view>
+            <view class='money'>-{{$store.getters.priceUnit}}{{orderInfoVo.svipDiscountPrice || 0}}</view>
           </view>
-          <view class='item acea-row row-between-wrapper' v-if="parseInt(merCouponFeeSl) > 0 && isProductType">
+          <view class='item acea-row row-between-wrapper' v-if="parseInt(merCouponFee) > 0 && isProductType">
             <view>店铺优惠</view>
-            <view class='money'>-{{$store.getters.priceUnit}}{{merCouponFeeSl}}</view>
+            <view class='money'>-{{$store.getters.priceUnit}}{{merCouponFee}}</view>
           </view>
           <view v-if="isProductType" class='item acea-row row-between-wrapper'>
             <view>平台优惠</view>
@@ -180,7 +180,7 @@
                   class='discount acea-row row-between-wrapper'
                   @tap='couponTap(orderInfoVo.platCouponUserList,0)'>
               <text
-                  class="couponTitle line1">{{platCouponFeeSl==0?`有${orderInfoVo.platCouponUserList.length}张优惠券可选`:`-${$store.getters.priceUnit}${platCouponFeeSl}`}}</text>
+                  class="couponTitle line1">{{platCouponFee==0?`有${orderInfoVo.platCouponUserList.length}张优惠券可选`:`-${$store.getters.priceUnit}${platCouponFee}`}}</text>
               <text class='text-bbb iconfont icon-ic_rightarrow ml-4'></text>
             </view>
             <view v-else class="noCoupon">暂无优惠券</view>
@@ -200,9 +200,9 @@
             </view>
           </view>
 
-          <view class='item acea-row row-between-wrapper' v-if="Number(orderInfoVo.deductionPriceSl) > 0">
+          <view class='item acea-row row-between-wrapper' v-if="Number(orderInfoVo.deductionPrice) > 0">
             <view>抵扣金额</view>
-            <view class='money'>-{{$store.getters.priceUnit}} {{orderInfoVo.deductionPriceSl || 0}}</view>
+            <view class='money'>-{{$store.getters.priceUnit}} {{orderInfoVo.deductionPrice || 0}}</view>
           </view>
 
         </view>
@@ -214,7 +214,7 @@
 					<PointsPrice v-if="orderInfoVo.secondType === ProductTypeEnum.Integral" :pointsPrice="orderInfoVo"
 						:pointsGoodsStyle="hotPointsStyle"></PointsPrice>
 					<!-- 其他价格 -->
-					<text v-else class='price_color f-s-38 regular line-heightOne'>{{$store.getters.priceUnit}}{{orderInfoVo.totalPriceReat || 0}}</text>
+					<text v-else class='price_color f-s-38 regular line-heightOne'>{{$store.getters.priceUnit}}{{orderInfoVo.payFee || 0}}</text>
 				</view>
 				<view class='settlement' style='z-index:100' @tap="SubOrder">
 					{{secondType === ProductTypeEnum.Integral?"确认兑换":"立即下单"}}
@@ -284,7 +284,6 @@
 		ProductMarketingTypeEnum
 	} from "../../../enums/productEnums";
 	import orderPay from "@/mixins/OrderPay.js";
-	import {rmbToLgns,getRmbToLgnsRate} from "@/utils";
 	let app = getApp();
 	/**
 	 * 积分商品推荐样式
@@ -359,7 +358,6 @@
 				merchantOrderVoList: [],
 				priceGroup: {},
 				animated: false,
-				totalPrice: 0,
 				integralRatio: "0",
 				orderKey: "",
 				// usableCoupon: {},
@@ -386,8 +384,6 @@
 				platUserCouponId: 0, //平台优惠券id
 				platCouponFee: '', //平台优惠券金额
 				merCouponFee: '', //店铺优惠券总金额
-				platCouponFeeSl: '', //平台优惠券金额
-				merCouponFeeSl: '', //店铺优惠券总金额
 				surplusFee: 0, //商品总金额-商户优惠券金额=平台端可使用优惠券的门槛
 				merUserCouponId: 0, //店铺使用优惠券的id
 				tempCouponObj: {}, //临时优惠券数据
@@ -517,7 +513,6 @@
 			getloadPreOrder: function() {
 				loadPreOrderApi(this.orderNo).then(res => {
 					let orderInfoVo = res.data;
-					orderInfoVo.proTotalFeeSl = 0
 					if(orderInfoVo.merchantInfoList[0].orderInfoList[0].groupBuyActivityId){
 						this.groupActivityId=orderInfoVo.merchantInfoList[0].orderInfoList[0].groupBuyActivityId
 						this.productId=orderInfoVo.merchantInfoList[0].orderInfoList[0].productId
@@ -528,11 +523,6 @@
           			this.reservationInfo =  uni.getStorageSync('reservationInfo') || {} //缓存的预约信息,地址id,配送类型
 					
 					orderInfoVo.merchantInfoList.map(item => {
-						item.couponFeeSl = rmbToLgns(item.couponFee)
-						item.merCouponFeeSl = rmbToLgns(item.merCouponFee)
-						item.freightFeeSl = rmbToLgns(item.freightFee)
-						item.svipDiscountPriceSl = rmbToLgns(item.svipDiscountPrice)
-						
 						if (item.shippingType === 2) this.getTakeTheir(item.merId)
 						this.orderMerchantRequestList.push({
 							shippingType: orderInfoVo.secondType === this.ProductTypeEnum.Reservation ? this.reservationInfo.shippingType : item.shippingType,
@@ -540,21 +530,6 @@
 							remark: '',
 							userCouponId: item.userCouponId
 						})
-						item.orderInfoList.map(list => {
-							list.priceSl = rmbToLgns(list.price)
-							list.vipPriceSl = rmbToLgns(list.vipPrice)
-							list.payPriceSl = rmbToLgns(list.payPrice)
-							list.merCouponPriceSl = rmbToLgns(list.merCouponPrice)
-							if(list.vipPriceSl != 0){
-								orderInfoVo.proTotalFeeSl = parseFloat(
-									(parseFloat(orderInfoVo.proTotalFeeSl) + parseFloat((list.vipPriceSl * list.payNum))).toFixed(2)
-								);
-							}else{
-								orderInfoVo.proTotalFeeSl = parseFloat(
-									(parseFloat(orderInfoVo.proTotalFeeSl) + parseFloat((list.payPriceSl * list.payNum))).toFixed(2)
-								);
-							}
-						})
 						item.addressDetail = this.merchangtInfo.addressDetail;
 						item.phone = this.merchangtInfo.phone;
 						item.latitude = this.merchangtInfo.latitude;
@@ -566,21 +541,6 @@
 					this.platCouponFee = orderInfoVo.platCouponFee; //平台优惠券总金额
 					this.merCouponFee = orderInfoVo.merCouponFee; //店铺优惠券总金额
 					
-					this.platCouponFeeSl = rmbToLgns(orderInfoVo.platCouponFee); //平台优惠券总金额
-					this.merCouponFeeSl = rmbToLgns(orderInfoVo.merCouponFee); //店铺优惠券总金额
-					orderInfoVo.freightFeeSl = rmbToLgns(orderInfoVo.freightFee);
-					orderInfoVo.svipDiscountPriceSl = rmbToLgns(orderInfoVo.svipDiscountPrice);
-					orderInfoVo.deductionPriceSl = rmbToLgns(orderInfoVo.deductionPrice);
-					orderInfoVo.payFeeSl = rmbToLgns(orderInfoVo.payFee);
-					orderInfoVo.totalPriceReat = parseFloat(
-						(parseFloat(orderInfoVo.proTotalFeeSl) - parseFloat(this.platCouponFeeSl) - parseFloat(this.merCouponFeeSl)).toFixed(2)
-					);
-					// 这是汇率差
-					orderInfoVo.reatDiff = parseFloat(
-					  (parseFloat(orderInfoVo.totalPriceReat) - parseFloat(orderInfoVo.payFeeSl)).toFixed(2)
-					);
-					// 这个是下单时的汇率
-					orderInfoVo.rate = getRmbToLgnsRate()
 					this.orderInfoVo = {
 						...orderInfoVo,
 						systemFormValue: orderInfoVo.systemFormValue ? this.$util.objToArr(JSON.parse(
@@ -752,7 +712,6 @@
 						this.changeOrderPay(res.data.orderNo, 'yue', 'yue', 'integral', 'integral', '0')
 					} else {
 						// 其他商品走正常流程,去支付收银台页面
-						res.data.totalPriceReat = data.orderInfoVo.totalPriceReat
 						this.getToPayment(this.secondType, res.data)
 					}
 
@@ -796,19 +755,8 @@
 					orderExtend: systemFormData.length ? JSON.stringify(systemFormData) : '',
 					reservationName: this.reservationInfo.reservationName,
 					reservationPhone: this.reservationInfo.reservationPhone,
-					reservationPhone: this.reservationInfo.reservationPhone,
-					orderInfoVo: {
-						// 这是 totalPriceReat - payFeeSl 所谓的汇差
-						reatDiff: this.orderInfoVo.reatDiff,
-						// 这是订单下单时候的汇率
-						rate: this.orderInfoVo.rate,
-						// 这是通过产品价格/汇率*数量累计扣掉优惠后的总价(当前使用的是totalPriceReat来结算)
-						totalPriceReat: this.orderInfoVo.totalPriceReat,
-						// 这是rmb直接/汇率后扣掉优惠的总价
-						payFeeSl: this.orderInfoVo.payFeeSl
-					}
+					reservationPhone: this.reservationInfo.reservationPhone
 				};
-				console.log(data)
 				uni.showLoading({
 					title: '订单提交中'
 				});

+ 13 - 34
crmeb_src/mer_uniapp/pages/goods/order_details/index.vue

@@ -243,30 +243,30 @@
 						<PointsPrice v-if="secondType === ProductTypeEnum.Integral" :pointsPrice="pointsPrice"
 							:pointsGoodsStyle="hotPointsStyle"></PointsPrice>
 						<!-- 其他价格 -->
-						<view v-else class='conter'>{{$store.getters.priceUnit}}{{orderInfo.proTotalPriceSl || 0}}</view>
+						<view v-else class='conter'>{{$store.getters.priceUnit}}{{orderInfo.proTotalPrice || 0}}</view>
 					</view>
-					<view class='item acea-row row-between' v-if="orderInfo.payPostageSl > 0">
+					<view class='item acea-row row-between' v-if="orderInfo.payPostage > 0">
 						<view>运费:</view>
-						<view class='conter'>{{$store.getters.priceUnit}}{{orderInfo.payPostageSl || 0}}</view>
+						<view class='conter'>{{$store.getters.priceUnit}}{{orderInfo.payPostage || 0}}</view>
 					</view>
-					<view class='item acea-row row-between' v-if='orderInfo.svipDiscountPriceSl > 0'>
+					<view class='item acea-row row-between' v-if='orderInfo.svipDiscountPrice > 0'>
 						<view>会员优惠:</view>
-						<view class='conter'>-{{$store.getters.priceUnit}}{{orderInfo.svipDiscountPriceSl || 0}}</view>
+						<view class='conter'>-{{$store.getters.priceUnit}}{{orderInfo.svipDiscountPrice || 0}}</view>
 					</view>
-					<view class='item acea-row row-between' v-if='orderInfo.merCouponPriceSl > 0'>
+					<view class='item acea-row row-between' v-if='orderInfo.merCouponPrice > 0'>
 						<view>店铺优惠:</view>
-						<view class='conter'>-{{$store.getters.priceUnit}}{{orderInfo.merCouponPriceSl || 0}}</view>
+						<view class='conter'>-{{$store.getters.priceUnit}}{{orderInfo.merCouponPrice || 0}}</view>
 					</view>
-					<view class='item acea-row row-between' v-if='orderInfo.platCouponPriceSl > 0'>
+					<view class='item acea-row row-between' v-if='orderInfo.platCouponPrice > 0'>
 						<view>平台优惠:</view>
-						<view class='conter'>-{{$store.getters.priceUnit}}{{orderInfo.platCouponPriceSl || 0}}</view>
+						<view class='conter'>-{{$store.getters.priceUnit}}{{orderInfo.platCouponPrice || 0}}</view>
 					</view>
-					<view class='item acea-row row-between' v-if="orderInfo.integralPriceSl > 0">
+					<view class='item acea-row row-between' v-if="orderInfo.integralPrice > 0">
 						<view>积分抵扣:</view>
-						<view class='conter'>-{{$store.getters.priceUnit}}{{orderInfo.integralPriceSl || 0}}</view>
+						<view class='conter'>-{{$store.getters.priceUnit}}{{orderInfo.integralPrice || 0}}</view>
 					</view>
 					<view v-show="secondType !== ProductTypeEnum.Integral" class='actualPay acea-row row-right'>
-						实付款<span style="color:#FF448F;">{{$store.getters.priceUnit}} <span style="font-weight: bold;">{{orderInfo.totalPriceReat || 0}}</span></span>
+						实付款<span style="color:#FF448F;">{{$store.getters.priceUnit}} <span style="font-weight: bold;">{{orderInfo.payPrice || 0}}</span></span>
 					</view>
 				</view>
 				<view style='height:200rpx;'></view>
@@ -343,7 +343,6 @@
 	import {
 		onDelOrder
 	} from "../../../libs/order";
-  import { rmbToLgns } from "@/utils";
   import DeliveryMethod from "../../../components/DeliveryMethod";
 	import {
 		cancelReservationApi
@@ -471,9 +470,6 @@
 
 		},
 		methods: {
-      rmbToLgnsHandle(rmb) {
-        return rmbToLgns(rmb);
-      },
 			//发货记录
 			godeliverRecord() {
 				uni.showLoading({
@@ -520,7 +516,7 @@
 				});
 
 				uni.navigateTo({
-					url: `/pages/goods/order_payment/index?orderNo=${item.orderNo}&payPrice=${item.payPrice}&totalPriceReat=${item.totalPriceReat}`
+					url: `/pages/goods/order_payment/index?orderNo=${item.orderNo}&payPrice=${item.payPrice}`
 				});
 			}),
 			/**
@@ -603,23 +599,6 @@
 				getOrderDetail(that.orderNo).then(res => {
 					uni.hideLoading();
 					let data = res.data;
-					let rate = data.rate
-		 
-					data.integralPriceSl = that.orderRmbToSl(data.integralPrice,rate)
-					data.platCouponPriceSl = that.orderRmbToSl(data.platCouponPrice,rate)
-					data.merCouponPriceSl = that.orderRmbToSl(data.merCouponPrice,rate)
-					data.svipDiscountPriceSl = that.orderRmbToSl(data.svipDiscountPrice,rate)
-					data.payPostageSl = that.orderRmbToSl(data.payPostage,rate)
-					
-					data.proTotalPriceSl = 0
-					data.merchantOrderList.map(item=>{
-						item.orderInfoList.map(items=>{
-							items.priceSl = that.orderRmbToSl(items.price,rate)
-							items.productPriceSl = that.orderRmbToSl(items.price,rate)
-							data.proTotalPriceSl += items.productPriceSl * items.payNum
-						})
-					})
-				 
 					that.$set(that, 'orderInfo', data);
 					that.merchantOrderList = data.merchantOrderList[0] // 商户信息
 					that.$set(that, 'id', data.id);

+ 2 - 3
crmeb_src/mer_uniapp/pages/goods/order_list/index.vue

@@ -81,7 +81,7 @@
 									</view>
 								</view>
 								<view class='money'>
-									<baseMoney :money="orderRmbToSl(items.price,item.rate)" symbolSize="20" integerSize="32" decimalSize="20"
+									<baseMoney :money="items.price" symbolSize="20" integerSize="32" decimalSize="20"
 										incolor="282828" weight></baseMoney>
 									<view class="fs-24 text--w111-999 lh-34rpx text-right">x {{items.payNum}} 件</view>
 								</view>
@@ -96,7 +96,7 @@
 					<view class='totalPrice flex justify-end items-end' :class="item.status===0?'no-border':''">
 						{{item.totalNum}}
 						件商品,总金额
-						<baseMoney :money="item.totalPriceReat" symbolSize="20" integerSize="40" decimalSize="20" weight>
+						<baseMoney :money="item.totalPrice" symbolSize="20" integerSize="40" decimalSize="20" weight>
 						</baseMoney>
 					</view>
 					<view v-if="item.status===0 && item.expirationTime" class="mx-20 flex">
@@ -237,7 +237,6 @@
 	import {
 		onDelOrder
 	} from "../../../libs/order";
-  import { rmbToLgns } from "@/utils";
 
   const app = getApp();
 	export default {

+ 1 - 1
crmeb_src/mer_uniapp/pages/goods/order_pay_status/index.vue

@@ -23,7 +23,7 @@
 				</view>
 				<view class='item acea-row row-between-wrapper'>
 					<view>支付金额</view>
-					<view class='itemCom'><span style="color:#FF448F;">sL <span style="font-weight: bold;">{{order_pay_info.totalPriceReat}}</span></span></view>
+					<view class='itemCom'><span style="color:#FF448F;">{{$store.getters.priceUnit}} <span style="font-weight: bold;">{{order_pay_info.payPrice}}</span></span></view>
 				</view>
 				<view v-show="order_pay_info.secondType === ProductTypeEnum.Integral" class='item acea-row row-between-wrapper'>
 					<view>消耗积分</view>

+ 3 - 6
crmeb_src/mer_uniapp/pages/goods/order_payment/index.vue

@@ -3,7 +3,7 @@
 		<view class='wrapper'>
 			<view class='item borRadius14'>
 				<view class="title text-center">
-          <baseMoney :money="totalPriceReat" symbolSize="48" integerSize="64" decimalSize="48"
+          <baseMoney :money="payPrice" symbolSize="48" integerSize="64" decimalSize="48"
                      incolor="333333" weight></baseMoney>
         </view>
 				<view class='list'>
@@ -58,7 +58,6 @@
 	import {
 		svipOrderCreateApi
 	} from '@/api/activity.js';
-	import {rmbToLgns,getRmbToLgnsRate} from "@/utils";
 	import {
 		Debounce
 	} from '@/utils/validate.js'
@@ -83,7 +82,6 @@
 				payChannel: '',
 				formContent: '',
 				isShow: false,
-				totalPriceReat: '',
 				userBalance: '', //余额
 				fromType: '' ,//页面来源,svip支付,购买商品
 				isBuy: false //是否可以点击购买
@@ -96,7 +94,6 @@
 			this.payPrice = options.payPrice;
 			this.orderNo = options.orderNo;
 			this.fromType = options.fromType || ''
-			this.totalPriceReat = options.totalPriceReat
 		},
 		mounted() {
 			this.payConfig();
@@ -171,7 +168,7 @@
 			//立即支付
 			getOrderPay: Debounce(function() {
 				this.getPayCheck();
-				if (Number(this.totalPriceReat)>Number(this.userBalance) && this.payType === 'yue') return this.$util.Tips({
+				if (Number(this.totalPrice)>Number(this.userBalance) && this.payType === 'yue') return this.$util.Tips({
 					title: '余额的金额不够,请切换支付方式'
 				});
 				uni.showLoading({
@@ -195,7 +192,7 @@
 					});
 				} else {
 					// 订单支付
-					this.changeOrderPay(this.orderNo, this.payChannel, this.payType ,this.productType, this.fromType, this.payPrice,this.totalPriceReat,this.userBalance)
+					this.changeOrderPay(this.orderNo, this.payChannel, this.payType ,this.productType, this.fromType, this.payPrice)
 				}
 			})
 		},

+ 7 - 25
crmeb_src/mer_uniapp/pages/order_addcart/order_addcart.vue

@@ -170,13 +170,13 @@
 						<text class='price-color'>
 							<text class="symbol">{{$store.getters.priceUnit}}</text>
 							<text
-								class="all_money semiBold">{{calculatePriceData.totlePriceRate?calculatePriceData.totlePriceRate:0}}</text>
+								class="all_money semiBold">{{calculatePriceData.totalPrice?calculatePriceData.totalPrice:0}}</text>
 						</text>
 					</view>
 					<view class="acea-row row-middle" @click="popupChange()"
 						v-show="calculatePriceData.totalCouponPrice>0">
 						<text
-							class="youhui">优惠:{{$store.getters.priceUnit}}{{rmbToLgnsHandle(calculatePriceData.totalCouponPrice?calculatePriceData.totalCouponPrice:0)}}</text>
+							class="youhui">优惠:{{$store.getters.priceUnit}}{{calculatePriceData.totalCouponPrice?calculatePriceData.totalCouponPrice:0}}</text>
 						<text class="mingxi price-color">优惠明细</text>
 						<text class="iconfont icon-ic_downarrow f-s-24"></text>
 						<!-- <text class="iconfont icon-ic_uparrow"></text> -->
@@ -231,23 +231,23 @@
 					<block v-if="calculatePriceData.proTotalPrice>0 && calculatePriceData.totalCouponPrice!=0">
 						<view class="_cell acea-row row-between-wrapper">
 							<text class="_label">商品总价:</text>
-							<text class="_count">{{$store.getters.priceUnit}}{{calculatePriceData.productTotal}}</text>
+							<text class="_count">{{$store.getters.priceUnit}}{{calculatePriceData.proTotalPrice}}</text>
 						</view>
 						<view class="_cell acea-row row-between-wrapper">
 							<text class="_label">会员优惠:</text>
-							<text class="_count">-{{$store.getters.priceUnit}}{{rmbToLgnsHandle(calculatePriceData.svipDiscountPrice)}}</text>
+							<text class="_count">-{{$store.getters.priceUnit}}{{calculatePriceData.svipDiscountPrice}}</text>
 						</view>
 						<view class="_cell acea-row row-between-wrapper">
 							<text class="_label">店铺优惠:</text>
-							<text class="_count">-{{$store.getters.priceUnit}}{{rmbToLgnsHandle(calculatePriceData.merCouponPrice)}}</text>
+							<text class="_count">-{{$store.getters.priceUnit}}{{calculatePriceData.merCouponPrice}}</text>
 						</view>
 						<view class="_cell acea-row row-between-wrapper">
 							<text class="_label">平台优惠:</text>
-							<text class="_count">-{{$store.getters.priceUnit}}{{rmbToLgnsHandle(calculatePriceData.platCouponPrice)}}</text>
+							<text class="_count">-{{$store.getters.priceUnit}}{{calculatePriceData.platCouponPrice}}</text>
 						</view>
 						<view class="_cell_all acea-row row-between-wrapper">
 							<text class="_label">共优惠:</text>
-							<text class="_count">-{{$store.getters.priceUnit}}{{rmbToLgnsHandle(calculatePriceData.totalCouponPrice)}}</text>
+							<text class="_count">-{{$store.getters.priceUnit}}{{calculatePriceData.totalCouponPrice}}</text>
 						</view>
 					</block>
 					<!-- #ifdef MP-->
@@ -309,9 +309,6 @@
 	import {
 		Debounce
 	} from '@/utils/validate.js'
-	import {
-		rmbToLgns
-	} from '@/utils/index.js'
 	let app = getApp();
 	export default {
 		mixins: [productAttr],
@@ -440,9 +437,6 @@
 			uni.$emit('scroll');
 		},
 		methods: {
-			rmbToLgnsHandle(rmb){
-				return rmbToLgns(rmb)
-			},
 			//首次进入加载的接口
 			getIndex() {
 				this.hotPage = 1;
@@ -1191,22 +1185,10 @@
 					ids: ids
 				}).then(res => {
 					this.calculatePriceData = res.data;
-					this.calculatePriceData.productTotal = 0
-					this.calculatePriceData.details.map(item => {
-						if(item.is_vip) {
-							this.calculatePriceData.productTotal += rmbToLgns(item.vip_price) * item.num
-						} else {
-							this.calculatePriceData.productTotal += rmbToLgns(item.price) * item.num
-						}
-					})
-					this.calculatePriceData.totlePriceRate = parseFloat(
-						(parseFloat(this.calculatePriceData.productTotal) - rmbToLgns(this.calculatePriceData.totalCouponPrice)).toFixed(2)
-					);
 					this.selectCountPrice = this.calculatePriceData.proTotalPrice;
 				}).catch(err => {
 					this.bayCount = 0;
 					this.selectCountPrice = 0.00;
-					this.calculatePriceData.totlePriceRate = 0.00;
 					this.calculatePriceData.productTotal = 0.00;
 					this.calculatePriceData.proTotalPrice = 0.00;
 					this.calculatePriceData.totalCouponPrice = 0.00;

+ 0 - 41
crmeb_src/mer_uniapp/pages/users/user_money/index.vue

@@ -10,44 +10,9 @@
 			<view class='wrapper borderPad'>
 				<!-- 新版头部 -->
 				<view class="new-header">
-					<!-- 顶部:实时汇率 -->
-					<!--
-					<view class="rate-card-top">
-						<view style="
-									background: linear-gradient(to top, rgb(255, 107, 159,0.3), rgb(255, 255, 255,0.25));
-									border-radius: 10px;
-									padding: 20rpx 20rpx;
-									">
-							<view class="rate-title-row">
-								<view class="title xuxian">实时汇率</view>
-								<view class="refresh-icon" @click="refreshRate">
-									<text class="iconfont icon-shuaxin1"></text>
-								</view>
-							</view>
-							<view class="rate-content">
-								<view class="rate-info">
-									<view class="rate-row">
-										<text class="label">sLGNS:</text>
-										<text class="value">¥{{globalData.daibiRateLgnsCny || '0.00'}}</text>
-									</view>
-								</view>
-								<view class="coin-img">
-									<image src="/static/tabBar/2026-01-29_145708_158.png" mode="aspectFit"></image>
-								</view>
-							</view>
-					</view>
-					</view>-->
-					
 					<!-- 底部:余额信息 -->
 					<view class="rate-card-bottom">
 						<view class="balance-main">
-							<!-- 去掉RMB显示
-							<view class="balance-item border-right">
-								<view class="label">账户余额(元)</view>
-								<view class="num">{{parseFloat((statistics.nowMoney * rate).toFixed(2)) || '0.00'}}</view>
-								<view class="btn" v-if="statistics.rechargeSwitch" @click="openSubscribe('/pages/users/user_payment/index')">充值</view>
-							</view>
-							-->
 							<view class="balance-item">
 								<view class="label">sLGNS余额</view>
 								<view class="num">{{statistics.nowMoney || 0}}</view>
@@ -129,7 +94,6 @@
 	} from '@/api/order.js';
 	import recommend from "@/components/base/recommend.vue";
   import navBar from '@/components/navBar';
-  import {rmbToLgns,getRmbToLgnsRate} from "@/utils";
 	let app = getApp();
 	export default {
 		components: {
@@ -144,7 +108,6 @@
 				hotScroll: false,
 				statistics: {},
 				hotPage: 1,
-				rate: 0,
 				hotLimit: 10,
 				withdrawNumber: {},
 				theme: app.globalData.theme,
@@ -204,9 +167,6 @@
       // #endif
 		},
 		methods: {
-			rmbToLgns(e) {
-				return rmbToLgns(e,"floor");
-			},
 			getRecommendLength(e) {
 				this.isNoCommodity = e == 0 ? true : false;
 			},
@@ -232,7 +192,6 @@
 			},
 			userDalance() {
 				getMyAccountApi().then(res => {
-					this.rate = getRmbToLgnsRate();
 					this.statistics = res.data;
 					console.log(this.statistics)
 				})

+ 1 - 19
crmeb_src/mer_uniapp/pages/users/user_withd_slgns/index.vue

@@ -11,21 +11,7 @@
 					<image src="/static/tabBar/2026-01-29_161511_590.png" mode="aspectFit"></image>
 				</view>
 			</view>
-			
-			<!-- 汇率卡片 -->
-			<!--
-			<view class="rate-card">
-				<view class="rate-title-row">
-					<view class="title">实时汇率</view>
-				</view>
-				<view class="rate-content">
-					<view class="rate-row">
-						<text class="label">SLGNS:</text>
-						<text class="val">¥{{globalData.daibiRateLgnsCny || '0.00'}}</text>
-					</view>
-				</view>
-			</view>
-			-->
+		
 		</view>
 		
 		<!-- #ifdef H5 -->
@@ -97,7 +83,6 @@
 	
 	import { mapGetters } from "vuex";
 	import { sLgnsWithdrawApi,getRechargeApi } from "@/api/user.js";
-	import { rmbToLgns, getRmbToLgnsRate } from "@/utils";
 	// #ifdef H5
 	import jsQR from "jsqr";
 	// #endif
@@ -109,7 +94,6 @@
 				theme: app.globalData.theme,
 				amount: '',
 				address: '',
-                rate: '',
 				sLGNS: 0, // 余额
 				showHistory: false,
 				historyList: [],
@@ -121,7 +105,6 @@
 		onLoad(options) {
 			if (options.lgns) {
 				this.sLGNS = options.lgns;
-				this.rate = getRmbToLgnsRate();
 			}
 			this.loadHistory();
 		},
@@ -244,7 +227,6 @@
 				sLgnsWithdrawApi({
 					amount: this.amount,
 					address: this.address,
-                    rate: this.rate
 				}).then(res => {
                     if(res.data.status){
 						this.$util.Tips({title: '提现发起成功,提现结果请在消费记录中查看'}, {tab: 5, url: '/pages/users/user_money/index'});

+ 0 - 17
crmeb_src/mer_uniapp/utils/index.js

@@ -108,22 +108,5 @@ export function getCityList() {
 	});
 }
 
-// 人民币转Ls币
-export function rmbToLgns(rmb, mathType = "ceil") {
-	let rate = Store.getters.globalData.daibiRateLgnsCny
-	if (!rate) rate = 1
-	if (mathType == "ceil") {
-		return (Math.ceil((rmb / rate) * 100) / 100).toFixed(2);
-	} else {
-		return (Math.floor((rmb / rate) * 100) / 100).toFixed(2);
-	}
-}
-
-// 获取人民币转Ls的汇率
-export function getRmbToLgnsRate() {
-	let rate = Store.getters.globalData.daibiRateLgnsCny
-	if (!rate) rate = 1
-	return rate
-}
 
 export default parseQuery;