修复合并异常

sheep/components/s-wallet-card/s-wallet-card.vue

@@ -1,29 +1,14 @@
 <template>
-<<<<<<< HEAD
 	<view class="ss-wallet-menu-wrap ss-flex ss-col-center">
 		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
 			@tap="sheep.$router.go('/pages/user/wallet/money')">
 			<view class="value-box ss-flex ss-col-bottom">
-				<view class="value-text ss-line-1">{{ userInfo.money }}</view>
+				<view class="value-text ss-line-1">{{ userInfo.money || '0.00' }}</view>
 				<view class="unit-text ss-m-l-6">元</view>
 			</view>
 			<view class="menu-title ss-m-t-28">账户余额</view>
 		</view>
 		<!-- <view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-=======
-  <view class="ss-wallet-menu-wrap ss-flex ss-col-center">
-    <view
-      class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-      @tap="sheep.$router.go('/pages/user/wallet/money')"
-    >
-      <view class="value-box ss-flex ss-col-bottom">
-        <view class="value-text ss-line-1">{{ userInfo.money || '0.00' }}</view>
-        <view class="unit-text ss-m-l-6">元</view>
-      </view>
-      <view class="menu-title ss-m-t-28">账户余额</view>
-    </view>
-    <!-- <view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
->>>>>>> 6251ffa9944516e995002e7f11539aef3e1d50de
 			@tap="sheep.$router.go('/pages/user/wallet/commission')">
 			<view class="value-box ss-flex ss-col-bottom">
 				<view class="value-text">{{ userInfo?.commission || '0.00' }}</view>
@@ -31,11 +16,10 @@
 			</view>
 			<view class="menu-title ss-m-t-28">佣金</view>
 		</view> -->
-<<<<<<< HEAD
 		<view class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
 			@tap="sheep.$router.go('/pages/user/wallet/score')">
 			<view class="value-box ss-flex ss-col-bottom">
-				<view class="value-text">{{ userInfo.point }}</view>
+				<view class="value-text">{{ userInfo.point || '0.00' }}</view>
 				<view class="unit-text ss-m-l-6">个</view>
 			</view>
 			<view class="menu-title ss-m-t-28">积分</view>
@@ -46,7 +30,7 @@
         })
       ">
 			<view class="value-box ss-flex ss-col-bottom">
-				<view class="value-text">{{ numData.coupons_num }}</view>
+				<view class="value-text">{{ numData.coupons_num || '0.00' }}</view>
 				<view class="unit-text ss-m-l-6">张</view>
 			</view>
 			<view class="menu-title ss-m-t-28">优惠券</view>
@@ -58,45 +42,6 @@
 			<view class="menu-title ss-m-t-30">我的钱包</view>
 		</view>
 	</view>
-=======
-    <view
-      class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-      @tap="sheep.$router.go('/pages/user/wallet/score')"
-    >
-      <view class="value-box ss-flex ss-col-bottom">
-        <view class="value-text">{{ userInfo.score || 0 }}</view>
-        <view class="unit-text ss-m-l-6">个</view>
-      </view>
-      <view class="menu-title ss-m-t-28">积分</view>
-    </view>
-    <view
-      class="menu-item ss-flex-1 ss-flex-col ss-row-center ss-col-center"
-      @tap="
-        sheep.$router.go('/pages/coupon/list', {
-          type: 'geted',
-        })
-      "
-    >
-      <view class="value-box ss-flex ss-col-bottom">
-        <view class="value-text">{{ numData.coupons_num || 0 }}</view>
-        <view class="unit-text ss-m-l-6">张</view>
-      </view>
-      <view class="menu-title ss-m-t-28">优惠券</view>
-    </view>
-    <view
-      class="menu-item ss-flex-col ss-row-center ss-col-center menu-wallet"
-      @tap="sheep.$router.go('/pages/user/wallet/money')"
-    >
-      <image
-        class="item-icon"
-        :src="sheep.$url.static('/static/img/shop/user/wallet_icon.png')"
-        mode="aspectFit"
-      >
-      </image>
-      <view class="menu-title ss-m-t-30">我的钱包</view>
-    </view>
-  </view>
->>>>>>> 6251ffa9944516e995002e7f11539aef3e1d50de
 </template>
 
 <script setup>
@@ -153,4 +98,4 @@
 			}
 		}
 	}
-</style>
+</style>