1

components/coupon/cashCard.vue

@@ -61,8 +61,7 @@
 			this.currentChosen = this.current;
 			this.ts = this.list
 			this.ts.forEach(x => {
-				x.start_time = x.start_time.split(' ')[0].replace(/-/g, '.')
-				x.end_time = x.end_time.split(' ')[0].replace(/-/g, '.')
+				x.EndTime = x.EndTime.split(' ')[0].replace(/-/g, '.')
 			})
 		},
 		methods: {

pages.json

@@ -214,6 +214,11 @@
 				},
 				{
 					"path":"cards/carddetailed"//卡片明细
+				},{
+					"path":"cards/cardsreceive",//储蓄卡的领取
+					"style": {
+					    "navigationStyle": "custom"
+					}
 				},
 				{
 					"path":"cards/purchase",//购买储蓄卡

pages/order-submit/order-submit.vue

@@ -126,7 +126,7 @@
 					<u-icon name="ellipsis" size="36" v-if="couponList.length > 0" @click="showCouponHandler"></u-icon>
 				</view>
 			</view>
-			<view class="filed">
+			<view class="filed" v-if="IsDeposit==1">
 				<view class="left">储蓄卡</view>
 				<view class="right">
 					<text class="content" v-if="mchs[0].deposit.use_deposit_id == 0 && cashCardList.length>0" @click="showcashcardbtn">选择储蓄卡</text>
@@ -164,7 +164,7 @@
 					<text class="price" :style="{ color: mc }">-￥{{ couponPrice.toFixed(2) }}</text>
 				</view>
 			</view>
-			<view class="filed">
+			<view class="filed"  v-if="IsDeposit==1">
 				<view class="left">储值卡扣除</view>
 				<view class="right">
 					<text class="price" :style="{ color: mc }">-￥{{ cashPrice.toFixed(2) }}</text>
@@ -334,7 +334,7 @@
 				cashCardList:[],
 				showcashcard:false,
 				onecoupon:true,//第一次进页面的时候选最优的优惠券
-				
+				IsDeposit:0,//是否开启储蓄卡功能
 			};
 		},
 		onLoad(option) {
@@ -353,6 +353,7 @@
 				this.ShoppingCartIdList = JSON.parse(option.ShoppingCartIdList);
 			}
 			this.payInfo.OpenId = uni.getStorageSync('mall_UserInfo').OpenId;
+			this.IsDeposit = uni.getStorageSync('basedata')?uni.getStorageSync('basedata').mall.setting.IsDeposit:0
 			this.initPage();
 			this.mc = this.$uiConfig.mainColor;
 			this.secondary = this.$uiConfig.secondary;
@@ -426,7 +427,12 @@
 							form.DepositFreightMoney  = that.expressPrice;//储值卡抵扣运费
 							form.CouponMoney = that.couponPrice;
 							form.FreightMoney = that.expressPrice;
-							form.Income = that.ds.total_price;
+							if(that.formdata.Use_Deposit_Id == 0){//2021-4-9处理 如果是使用了储值卡 就吧价格复制为储值卡抵用的金额
+								form.Income = that.ds.total_price;
+							}else{
+								form.Income = that.cashPrice;
+							}
+							
 							form.IsFormShoppingCart = that.IsFormShoppingCart;
 							form.Use_Integral = that.formdata.Use_Integral;
 							form.ShoppingCartIdList = that.ShoppingCartIdList;