feat:屏蔽亲情卡及亲情卡支付

components/pay/pay.vue

@@ -7,30 +7,30 @@
 					<text class="payType">请选择支付方式</text>
 					<image class="x" src="/static/common/ox.png" @click="closePayPopup"></image>
 				</view>
-<!--				<view class="payTitle">-->
-<!--					<text>选择微信支付或余额支付</text>-->
-<!--				</view>-->
+				<view class="payTitle">
+					<text>选择微信支付或余额支付</text>
+				</view>
 
 				<view class=" payItemView">
 
-					<view v-if="lovePay && loveCard.totalBalance" class="payItem  flex-row justify-between" @click="payItem(0)">
-						<view class="flex-row">
-							<u-icon name="/static/me/familyCard_icon.png" color="#38db38" size="36"></u-icon>
-							<view class="payName flex-col justify-center">
-								<text>亲情卡支付</text>
-<!--								<text class="balance">{{loveCard.presentUserName + loveCard.presentUserNo}}赠送的亲情卡</text>-->
-<!--								<text class="balance">余额{{loveCard.totalBalance}}</text>-->
-								<view class="select">
-									<uni-data-select class="uni-data-select"  :clear="false" v-model="loveCardId" :localdata="loveCardList" @change="change"></uni-data-select>
-								</view>
-							</view>
-						</view>
-						<view class="flex-col justify-center">
-							<u-icon v-if="curServiceTab === 0" name="checkmark-circle-fill" color="#38db38"
-									size="25"></u-icon>
-							<u-icon v-else name="/static/order/ud9.png" color="green" size="25"></u-icon>
-						</view>
-					</view>
+<!--					<view v-if="lovePay && loveCard.totalBalance" class="payItem  flex-row justify-between" @click="payItem(0)">-->
+<!--						<view class="flex-row">-->
+<!--							<u-icon name="/static/me/familyCard_icon.png" color="#38db38" size="36"></u-icon>-->
+<!--							<view class="payName flex-col justify-center">-->
+<!--								<text>亲情卡支付</text>-->
+<!--&lt;!&ndash;								<text class="balance">{{loveCard.presentUserName + loveCard.presentUserNo}}赠送的亲情卡</text>&ndash;&gt;-->
+<!--&lt;!&ndash;								<text class="balance">余额{{loveCard.totalBalance}}</text>&ndash;&gt;-->
+<!--								<view class="select">-->
+<!--									<uni-data-select class="uni-data-select"  :clear="false" v-model="loveCardId" :localdata="loveCardList" @change="change"></uni-data-select>-->
+<!--								</view>-->
+<!--							</view>-->
+<!--						</view>-->
+<!--						<view class="flex-col justify-center">-->
+<!--							<u-icon v-if="curServiceTab === 0" name="checkmark-circle-fill" color="#38db38"-->
+<!--									size="25"></u-icon>-->
+<!--							<u-icon v-else name="/static/order/ud9.png" color="green" size="25"></u-icon>-->
+<!--						</view>-->
+<!--					</view>-->
 
 					<view v-if="blPay" class="payItem  flex-row justify-between" @click="payItem(1)">
 						<view class="flex-row">
@@ -169,7 +169,7 @@
 			};
 		},
 		created(){
-			this.getMyReceiveList()
+			// this.getMyReceiveList()
 		},
 		methods: {
 
@@ -187,11 +187,11 @@
 				this.$refs.popup.open()
 			},
 			payItem(num) {
-				if (this.loveCard.totalBalance*1 < this.totalAmount*1 && num == 0){
-					console.log(this.totalAmount)
-					uni.$u.toast('余额不足')
-					return
-				}
+				// if (this.loveCard.totalBalance*1 < this.totalAmount*1 && num == 0){
+				// 	console.log(this.totalAmount)
+				// 	uni.$u.toast('余额不足')
+				// 	return
+				// }
 				if (!this.selectBlPay) {
 					uni.$u.toast('余额不足')
 					return

orderPages/orderDetail/index.vue

@@ -188,24 +188,24 @@
 					<text class="payType">请选择支付方式</text>
 					<image class="x" src="/static/common/ox.png" @click="closePayPopup"></image>
 				</view>
-<!--				<view class="payTitle">-->
-<!--					<text>选择微信支付或余额支付</text>-->
-<!--				</view>-->
-				<view v-if="loveCard.totalBalance" class="payItem  flex-row justify-between" @click="payItem(0)">
-					<view class="flex-row">
-						<u-icon name="/static/me/familyCard_icon.png" color="#38db38" size="36"></u-icon>
-						<view class="payName flex-col justify-center">
-							<text>亲情卡支付</text>
-							<text class="balance">{{loveCard.presentUserName + loveCard.presentUserNo}}赠送的亲情卡</text>
-							<text class="balance">余额{{loveCard.totalBalance}}</text>
-						</view>
-					</view>
-					<view class="flex-col justify-center">
-						<u-icon v-if="curServiceTab === 0" name="checkmark-circle-fill" color="#38db38"
-								size="25"></u-icon>
-						<u-icon v-else name="/static/order/ud9.png" color="green" size="25"></u-icon>
-					</view>
+				<view class="payTitle">
+					<text>选择微信支付或余额支付</text>
 				</view>
+<!--				<view v-if="loveCard.totalBalance" class="payItem  flex-row justify-between" @click="payItem(0)">-->
+<!--					<view class="flex-row">-->
+<!--						<u-icon name="/static/me/familyCard_icon.png" color="#38db38" size="36"></u-icon>-->
+<!--						<view class="payName flex-col justify-center">-->
+<!--							<text>亲情卡支付</text>-->
+<!--							<text class="balance">{{loveCard.presentUserName + loveCard.presentUserNo}}赠送的亲情卡</text>-->
+<!--							<text class="balance">余额{{loveCard.totalBalance}}</text>-->
+<!--						</view>-->
+<!--					</view>-->
+<!--					<view class="flex-col justify-center">-->
+<!--						<u-icon v-if="curServiceTab === 0" name="checkmark-circle-fill" color="#38db38"-->
+<!--								size="25"></u-icon>-->
+<!--						<u-icon v-else name="/static/order/ud9.png" color="green" size="25"></u-icon>-->
+<!--					</view>-->
+<!--				</view>-->
 
 				<view class="payItem flex-row justify-between" @click="payItem(1)">
 					<view class="flex-row">
@@ -301,7 +301,7 @@
 		},
 		onShow(){
 			this.getOrderDetailByOrderId(this.orderId )
-			this.getMyReceiveList()
+			// this.getMyReceiveList()
 		},
 		methods: {
 

pages/my/index.vue

@@ -112,7 +112,7 @@ export default {
         {thumb: '/static/me/u826.png', title: '储值服务', rightText: '', to: '/myPages/recharge/index'},
         {thumb: '/static/me/u701.png', title: '交易记录', rightText: '', to: '/myPages/transactionRecord/index'},
         {thumb: '/static/me/u11.png', title: '会员须知', rightText: '', to: '/myPages/aboutOur/index'},
-        {thumb: '/static/me/familyCard_icon.png', title: '亲情卡', rightText: '', to: '/myPages/familyCard/index'}
+        // {thumb: '/static/me/familyCard_icon.png', title: '亲情卡', rightText: '', to: '/myPages/familyCard/index'}
       ],
       group2: [
 

pages/order/index.vue

@@ -70,28 +70,28 @@
 					<text class="payType">请选择支付方式</text>
 					<image class="x" src="/static/common/ox.png" @click="closePayPopup"></image>
 				</view>
-<!--				<view class="payTitle">-->
-<!--					<text>选择微信支付或余额支付</text>-->
-<!--				</view>-->
+				<view class="payTitle">
+					<text>选择微信支付或余额支付</text>
+				</view>
 
 
 				<view :style="{'min-height':'380rpx'}">
 
-					<view v-if="loveCard.totalBalance" class="payItem  flex-row justify-between" @click="payItem(0)">
-						<view class="flex-row">
-							<u-icon name="/static/me/familyCard_icon.png" color="#38db38" size="36"></u-icon>
-							<view class="payName flex-col justify-center">
-								<text>亲情卡支付</text>
-								<text class="balance">{{loveCard.presentUserName + loveCard.presentUserNo}}赠送的亲情卡</text>
-								<text class="balance">余额{{loveCard.totalBalance}}</text>
-							</view>
-						</view>
-						<view class="flex-col justify-center">
-							<u-icon v-if="curServiceTab === 0" name="checkmark-circle-fill" color="#38db38"
-									size="25"></u-icon>
-							<u-icon v-else name="/static/order/ud9.png" color="green" size="25"></u-icon>
-						</view>
-					</view>
+<!--					<view v-if="loveCard.totalBalance" class="payItem  flex-row justify-between" @click="payItem(0)">-->
+<!--						<view class="flex-row">-->
+<!--							<u-icon name="/static/me/familyCard_icon.png" color="#38db38" size="36"></u-icon>-->
+<!--							<view class="payName flex-col justify-center">-->
+<!--								<text>亲情卡支付</text>-->
+<!--								<text class="balance">{{loveCard.presentUserName + loveCard.presentUserNo}}赠送的亲情卡</text>-->
+<!--								<text class="balance">余额{{loveCard.totalBalance}}</text>-->
+<!--							</view>-->
+<!--						</view>-->
+<!--						<view class="flex-col justify-center">-->
+<!--							<u-icon v-if="curServiceTab === 0" name="checkmark-circle-fill" color="#38db38"-->
+<!--									size="25"></u-icon>-->
+<!--							<u-icon v-else name="/static/order/ud9.png" color="green" size="25"></u-icon>-->
+<!--						</view>-->
+<!--					</view>-->
 
 					<view class="payItem flex-row justify-between"  @click="payItem(1)">
 						<view class="flex-row">
@@ -221,7 +221,7 @@
 			uni.removeStorageSync('orderListIndex');
 
 			this.$refs.MescrollItem[this.tabIndex].downCallback()
-			this.getMyReceiveList()
+			// this.getMyReceiveList()
 		},
 
 		methods: {