Merge branch 'clientDemo' of http://gogs.chelvc.com/Tim_Walker/chelvc-custom into clientDemo

src/pageMerchant/components/orderDetail.vue

@@ -12,7 +12,7 @@
 						<view class="allnumb-left">
 							<image class="img" :src="list.avatar || '@/tatic/logo.png' "
 								style="width: 50rpx; height: 50rpx" />
-							<span style="margin-left:20rpx">{{list.memberUsername}}</span>
+							<span style="margin-left:20rpx">{{list.memberUsername|| '--'}}</span>
 						</view>
 						<view class="allnumb-right">
 							<u-icon name="phone" color="#2979ff" size="24" @click="handlerMakePhone(list.mobile)" />
@@ -27,11 +27,11 @@
 						</view>
 						<view class="center-right">
 							<view class="r-l">
-								<view class="right-name"> {{ itm.goodsName }} </view>
+								<view class="right-name"> {{ itm.goodsName || '--'}} </view>
 								<view class="right-descript"> 测试商品描述111 </view>
 								<view class="l-box">
-									<view class="right-price"> ￥{{ itm.goodsPrice }} </view>
-									<view class="right-numb"> ×{{ itm.goodsQuantity }} </view>
+									<view class="right-price"> ￥{{ itm.goodsPrice || '--'}} </view>
+									<view class="right-numb"> ×{{ itm.goodsQuantity || '--'}} </view>
 								</view>
 							</view>
 						</view>
@@ -40,7 +40,7 @@
 					<view class="item-allnumb-box">
 						<view class="allnumb-left"></view>
 						<view class="allnumb-right">
-							<span class="r-text">实付款</span>￥{{ list.payAmount }}
+							<span class="r-text">实付款</span>￥{{ list.payAmount || '--'}}
 						</view>
 					</view>
 
@@ -56,7 +56,7 @@
 					<view class="top-right"></view>
 				</view>
 				<view class="item-top">
-					<view class="top-left gray-color">下单时间 : {{ formatTime1(list.createTime)  }}</view>
+					<view class="top-left gray-color">下单时间 : {{ formatTime1(list.createTime) || '--' }}</view>
 					<view class="top-right"></view>
 				</view>
 				<view class="item-top">
@@ -72,7 +72,7 @@
 					<!-- <view class="top-right">{{ type_name }}</view> -->
 				</view>
 				<view class="item-top">
-					<view class="top-left gray-color">核销编号 : {{list.orderSn }}</view>
+					<view class="top-left gray-color">核销编号 : {{list.orderSn|| '--' }}</view>
 					<view class="top-right"></view>
 				</view>
 				<view class="item-top">

src/pageMerchant/components/orderList.vue

@@ -8,10 +8,10 @@
 						<view class="allnumb-left">
 							<image class="img" :src="item.avatar || '@/tatic/logo.png' "
 								style="width: 50rpx; height: 50rpx" />
-							<span style="margin-left:20rpx">{{item.memberUsername}}</span>
+							<span style="margin-left:20rpx">{{item.memberUsername || '--'}}</span>
 						</view>
 						<view class="allnumb-right" :style="{color: getStatusColor(item.status)}">
-							{{ getStatusText(item.status) }}
+							{{ getStatusText(item.status)  }}
 						</view>
 					</view>
 
@@ -23,11 +23,11 @@
 						</view>
 						<view class="center-right">
 							<view class="r-l">
-								<view class="right-name"> {{ itm.goodsName }} </view>
+								<view class="right-name"> {{ itm.goodsName || '--'}} </view>
 								<!-- <view class="right-descript"> 测试商品描述111 </view> -->
 								<view class="l-box">
-									<view class="right-price"> ￥{{ itm.goodsPrice }} </view>
-									<view class="right-numb"> ×{{ itm.goodsQuantity }} </view>
+									<view class="right-price"> ￥{{ itm.goodsPrice || '--' }} </view>
+									<view class="right-numb"> ×{{ itm.goodsQuantity || '--' }} </view>
 								</view>
 							</view>
 						</view>
@@ -36,26 +36,26 @@
 					<view class="item-allnumb-box">
 						<view class="allnumb-left"></view>
 						<view class="allnumb-right">
-							<span class="r-text">实付款</span>￥{{ item.payAmount }}
+							<span class="r-text">实付款</span>￥{{ item.payAmount || '--' }}
 						</view>
 					</view>
 
 					<u-line margin="20rpx 0" dashed="true"></u-line>
 
 					<view class="item-top">
-						<view class="top-left gray-color">订单编号 : {{ item.id }}</view>
+						<view class="top-left gray-color">订单编号 : {{ item.id || '--' }}</view>
 						<view class="top-right">{{ type_name }}</view>
 					</view>
 					<view class="item-top">
-						<view class="top-left gray-color">下单时间 : {{ formatTime1(item.createTime)  }}</view>
+						<view class="top-left gray-color">下单时间 : {{ formatTime1(item.createTime) || '--' }}</view>
 						<view class="top-right"></view>
 					</view>
 					<view class="item-top">
 						<view v-if="item.status == 2" class="top-left gray-color">核销时间:
-							{{ formatTime1(item.receive_time) }}
+							{{ formatTime1(item.receiveTime) || '--' }}
 						</view>
 						<view v-if="item.status == 3" class="top-left gray-color">退款时间:
-							{{ formatTime1(item.updateTime) }}
+							{{ formatTime1(item.updateTime) || '--' }}
 						</view>
 						<!-- <view v-if="item.status == 4" class="top-left gray-color">过期时间:
 							{{ formatTime1(item.createTime) }}</view> -->

src/pageMerchant/components/toBeVerified.vue

@@ -49,13 +49,13 @@
 		<view class="order-item">
 			<view style="font-size: 48rpx;margin-bottom: 10rpx;">服务信息</view>
 			<view class="item-top">
-				<view class="top-left gray-color">订单编号 : {{ list.id }}</view>
+				<view class="top-left gray-color">订单编号 : {{ list.id || '--'  }}</view>
 				<view class="top-right">
 					<u-button type="primary" text="复制" size="mini" :plain="true" @click="ClipboardData"></u-button>
 				</view>
 			</view>
 			<view class="item-top">
-				<view class="top-left gray-color">下单时间 : {{ formatTime1(list.createTime)  }}</view>
+				<view class="top-left gray-color">下单时间 : {{ formatTime1(list.createTime) || '--'   }}</view>
 				<view class="top-right"></view>
 			</view>
 			<view class="item-top">

src/pageMerchant/mineModule/certification/qualificationInformation.vue

@@ -143,7 +143,7 @@
 				},
 				merchantInfo: {},
 				storeInfo: {},
-			};x
+			};
 		},
 		onReady() {
 			//如果需要兼容微信小程序，并且校验规则中含有方法等，只能通过setRules方法设置规则。

src/pageMerchant/mineModule/myPurse/purse.vue

@@ -6,7 +6,7 @@
 					<text class="username">{{ userName }}的钱包</text>
 					<text>
 						<text>我的资产（</text>
-						<text v-if="isAssetVisible" class="asset">{{ purse.asset }}</text>
+						<text v-if="isAssetVisible" class="asset">{{ purse.walletDTO.asset  || '0.00'  }}</text>
 						<text v-else class="asset">**</text>
 						<text>元）</text>
 						<text @click="toggleAssetVisibility" class="eye-icon">👁️</text>
@@ -20,19 +20,19 @@
 			<view class="wallet-summary">
 				<view class="summary-item">
 					<view>总收益</view>
-					<view>{{ totalIncome }}</view>
+					<view>{{ purse.walletDTO.totalEarnings || '0' }}</view>
 				</view>
 				<view class="summary-item">
 					<view>今日收益</view>
-					<view>{{ todayIncome }}</view>
+					<view>{{ purse.walletDTO.todayEarnings  || '0'}}</view>
 				</view>
 				<view class="summary-item">
 					<view>昨日收益</view>
-					<view>{{ yesterdayIncome }}</view>
+					<view>{{ purse.walletDTO.yesterdayEarnings  || '0' }}</view>
 				</view>
 				<view class="summary-item">
 					<view>可提现</view>
-					<view>{{ withdrawable }}</view>
+					<view>{{purse.walletDTO.withdraw || '0' }}</view>
 				</view>
 			</view>
 			<view class="withdraw-button">
@@ -57,27 +57,27 @@
 				<view class="column">
 					<view class="row">
 						<view class="label">已确认订单数（笔）</view>
-						<view class="value">100</view>
+						<view class="value">{{ purse.orderDTO.verifyNum  || '0'}}</view>
 					</view>
 					<view class="row">
 						<view class="label">待确认订单数（笔）</view>
-						<view class="value">80</view>
+						<view class="value">{{ purse.orderDTO.awaitNum  || '0'}}</view>
 					</view>
 				</view>
 				<view class="separator"></view>
 				<view class="column">
 					<view class="row">
 						<view class="label">已确认收益（元）</view>
-						<view class="value">20</view>
+						<view class="value">{{ purse.orderDTO.verifyAmount  || '0'}}</view>
 					</view>
 					<view class="row">
 						<view class="label">待确认收益（元）</view>
-						<view class="value">5</view>
+						<view class="value">{{ purse.orderDTO.awaitAmount  || '0'}}</view>
 					</view>
 				</view>
 			</view>
 		</view>
-		
+
 		<!-- 我的团队 -->
 		<view class="container">
 			<view class="title">
@@ -88,22 +88,22 @@
 				<view class="column">
 					<view class="row">
 						<view class="label">已推广订单数（笔）</view>
-						<view class="value">100</view>
+						<view class="value">{{ purse.merchantTeamDTO.popularizeNum  || '0'}}</view>
 					</view>
 					<view class="row">
 						<view class="label">待确认订单数（笔）</view>
-						<view class="value">80</view>
+						<view class="value">{{ purse.merchantTeamDTO.awaitNum  || '0'}}</view>
 					</view>
 				</view>
 				<view class="separator"></view>
 				<view class="column">
 					<view class="row">
 						<view class="label">已确认收益（元）</view>
-						<view class="value">20</view>
+						<view class="value">{{ purse.merchantTeamDTO.popularizeAmount  || '0'}}</view>
 					</view>
 					<view class="row">
 						<view class="label">待确认收益（元）</view>
-						<view class="value">5</view>
+						<view class="value">{{ purse.merchantTeamDTO.awaitAmount || '0'}}</view>
 					</view>
 				</view>
 			</view>
@@ -113,42 +113,37 @@
 </template>
 
 <script>
-	
 	import {
 		getMerchantPures
 	} from '@/api/merchant/merchantAuth';
-	
-	
+
+
 	export default {
 		data() {
 			return {
-				userName: 'User123',
+				userName: '',
 				isAssetVisible: true,
-				asset: '1000',
-				totalIncome: '5000',
-				todayIncome: '100',
-				yesterdayIncome: '200',
-				withdrawable: '3000',
-				purse:{}
+				purse: {}
 			};
 		},
-		onShow(){
-			console.log(this.$store.state.data.merchantInfo,"this.$store.state.data")
+		onShow() {
+			console.log(this.$store.state.data.merchantInfo.legalRepresentativeName, "this.$store.state.data")
+			this.userName = this.$store.state.data.merchantInfo.legalRepresentativeName
 			this.request()
 		},
 		methods: {
 			toggleAssetVisibility() {
 				this.isAssetVisible = !this.isAssetVisible;
 			},
-			toDetail(){
+			toDetail() {
 				uni.navigateTo({
-					url:'/pageMerchant/mineModule/myPurse/detail'
+					url: '/pageMerchant/mineModule/myPurse/detail'
 				})
 			},
-			async request(){
-			const res =	await getMerchantPures(this.$store.state.data.merchantInfo.merchant.id)
-			this.purse = resd.data
-			console.log(res)
+			async request() {
+				const res = await getMerchantPures(this.$store.state.data.merchantInfo.merchant.id)
+				this.purse = resd.data
+				console.log(res)
 			}
 		}
 	}

src/pageMerchant/storeModule/appointList.vue

@@ -43,9 +43,8 @@
 
 					<view class="item-allnumb-box">
 						<view class="allnumb-left">
-							<image class="img" :src="item.avatar  "
-								style="width: 50rpx; height: 50rpx" />
-							<span style="margin-left:20rpx">{{item.memberUsername}}</span>
+							<image class="img" :src="item.avatar  " style="width: 50rpx; height: 50rpx" />
+							<span style="margin-left:20rpx">{{item.memberUsername || '--'}}</span>
 						</view>
 						<view class="allnumb-right" :style="{color: getStatusColor(item.status)}">
 							{{ getStatusText(item.status) }}
@@ -60,11 +59,11 @@
 						</view>
 						<view class="center-right">
 							<view class="r-l">
-								<view class="right-name"> {{ itm.goodsName }} </view>
+								<view class="right-name"> {{ itm.goodsName || '--' }} </view>
 								<!-- <view class="right-descript"> 测试商品描述111 </view> -->
 								<view class="l-box">
-									<view class="right-price"> ￥{{ itm.goodsPrice }} </view>
-									<view class="right-numb"> ×{{ itm.goodsQuantity }} </view>
+									<view class="right-price"> ￥{{ itm.goodsPrice || '--'}} </view>
+									<view class="right-numb"> ×{{ itm.goodsQuantity || '--'}} </view>
 								</view>
 							</view>
 						</view>
@@ -73,22 +72,22 @@
 					<view class="item-allnumb-box">
 						<view class="allnumb-left"></view>
 						<view class="allnumb-right">
-							<span class="r-text">实付款</span>￥{{ item.payAmount }}
+							<span class="r-text">实付款</span>￥{{ item.payAmount || '--'}}
 						</view>
 					</view>
 
 					<u-line margin="20rpx 0" dashed="true"></u-line>
 
 					<view class="item-top">
-						<view class="top-left gray-color">订单编号 : {{ item.orderId }}</view>
-						<view class="top-right">{{ type_name }}</view>
+						<view class="top-left gray-color">订单编号 : {{ item.orderId || '--'}}</view>
+						<view class="top-right">{{ type_name|| '--' }}</view>
 					</view>
 					<view class="item-top">
-						<view class="top-left gray-color">下单时间 : {{formatTime1(item.createTime)  }}</view>
+						<view class="top-left gray-color">下单时间 : {{formatTime1(item.createTime) || '--'}}</view>
 						<view class="top-right"></view>
 					</view>
 					<view class="item-top">
-						<view class="top-left gray-color">预约时间: {{ formatTime1(item.appointTime) }}</view>
+						<view class="top-left gray-color">预约时间: {{ formatTime1(item.appointTime) || '--'}}</view>
 
 					</view>
 				</view>
@@ -149,9 +148,9 @@
 			this.curDate = today;
 			this.markDays.push(today);
 			console.log(this.curDate)
-			
+
 			this.getMerchantList();
-			
+
 		},
 		methods: {
 			onDayClick(data) {
@@ -198,7 +197,7 @@
 				}
 			},
 			formatTime1(timestamp) {
-				const date = new Date(timestamp ); // 转换为毫秒
+				const date = new Date(timestamp); // 转换为毫秒
 				const year = date.getFullYear();
 				const month = ('0' + (date.getMonth() + 1)).slice(-2);
 				const day = ('0' + date.getDate()).slice(-2);

src/pageMerchant/tabbar/mine.vue

@@ -83,13 +83,14 @@
 		<u-modal :show="showAut" :title="title" :content="content" :confirmText="'开始认证'" :cancelText="'返回用户端'"
 			:showCancelButton="true" @confirm="confirmSwitch" @cancel="showAut = false"></u-modal>
 
-		<!-- <tabbar currentTab="merchantMine" /> -->
+		<tabbar currentTab="merchantMine" />
 	</view>
 </template>
 
 <script>
 	import {
-		getMerchantAuthData
+		getMerchantAuthData,
+		getMerchantPures
 	} from '@/api/merchant/merchantAuth';
 	import {
 		updateBusinessStatus
@@ -98,6 +99,7 @@
 		phoneEncryption
 	} from '@/utils/tools';
 
+
 	export default {
 		data() {
 			return {
@@ -108,17 +110,18 @@
 				title: '商家认证',
 				content: '进入商家端前，我们需要一定的认证',
 				merchantInfo: {},
+				// purse:{}, // 钱包信息
 				incomeList: [{
 						num: '0.00',
 						title: '总收益',
 					},
 					{
 						num: '0.00',
-						title: '本月收益',
+						title: '今日收益',
 					},
 					{
 						num: '0.00',
-						title: '本周收益',
+						title: '昨日收益',
 					},
 					{
 						num: '0.00',
@@ -171,6 +174,7 @@
 
 		created() {
 			this.getMerchantAuth();
+			this.request()
 		},
 
 		mounted() {
@@ -197,6 +201,20 @@
 					this.$store.commit('SET_MERCHANTINFO', res.data);
 				}
 			},
+			// 获取钱包信息
+			async request() {
+				const res = await getMerchantPures(this.$store.state.data.merchantInfo.merchant.id)
+				this.purse = res.data
+				if (res.data) {
+					this.incomeList[0].num = res.data.walletDTO.totalEarnings ? res.data.walletDTO.totalEarnings :
+						'0.00'
+					this.incomeList[1].num = res.data.walletDTO.todayEarnings ? res.data.walletDTO.todayEarnings :
+						'0.00'
+					this.incomeList[2].num = res.data.walletDTO.yesterdayEarnings ? res.data.walletDTO
+						.yesterdayEarnings : '0.00'
+					this.incomeList[3].num = res.data.walletDTO.withdraw ? res.data.walletDTO.withdraw : '0.00'
+				}
+			},
 
 			/*===========================================================*/
 			// 开始认证