首页

pagesHouse/home/index.vue

@@ -7,8 +7,8 @@
 				<u-icon name="arrow-down" size="28" :bold="true" color="#fff"></u-icon>
 			</view>
 		</u-navbar>
-		<u-picker :show="shShow" :columns="nameList" @close="shShow=false" @cancel="shShow=false"
-			@confirm="confirm" :immediateChange="true" itemHeight="88"></u-picker>
+		<u-picker :show="shShow" :columns="nameList" @close="shShow=false" @cancel="shShow=false" @confirm="confirm"
+			:immediateChange="true" itemHeight="88"></u-picker>
 		<view class="bg" :style="{'padding-top':(mt+10)+'px'}">
 			<view class="dataBox">
 				<view class="item">
@@ -16,26 +16,22 @@
 					<view>￥<text>{{info.todayOrderAmount||0}}</text></view>
 					<view>昨日¥{{info.yesterdayOrderAmount||0}}</view>
 				</view>
-				<view class="item">
-					<view>成交订单数</view>
-					<view>￥<text>{{info.todayOrders||0}}</text></view>
-					<view>昨日{{info.yesterdayOrders||0}}</view>
-				</view>
 				<view class="item">
 					<view>退款金额</view>
 					<view>￥<text>{{info.todayRefundAmount||0}}</text></view>
 					<view>昨日¥{{info.yesterdayRefundAmount||0}}</view>
 				</view>
+				<view class="item">
+					<view>成交订单数</view>
+					<view>￥<text>{{info.todayOrders||0}}</text></view>
+					<view>昨日{{info.yesterdayOrders||0}}</view>
+				</view>
 				<view class="item">
 					<view>退款订单数</view>
 					<view>￥<text>{{info.todayRefundOrders||0}}</text></view>
 					<view>昨日{{info.yesterdayRefundOrders||0}}</view>
 				</view>
-				<view class="item">
-					<view>已购商品数量</view>
-					<view>￥<text>{{info.todayPurchasedNums||0}}</text></view>
-					<view>昨日{{info.yesterdayPurchasedNums||0}}</view>
-				</view>
+
 			</view>
 			<view class="numberData">
 				<view @click="toHref('/pagesHouse/Mine/ordersList/index?type=0')">
@@ -60,16 +56,20 @@
 				</view>
 			</view>
 			<view class="menus">
-				<view @click="toHref('/pagesHouse/home/bill')">
+				<view @click="toHref('/pagesHouse/home/bill?merchantType='+merchantType)">
 					<image :src="icons[0]"></image>
+					<text>商品管理</text>
+				</view>
+				<view @click="toHref('/pagesHouse/home/bill')">
+					<image :src="icons[1]"></image>
 					<text>交易账单</text>
 				</view>
 				<view @click="toHref('/pagesHouse/home/moneyBill')">
-					<image :src="icons[1]"></image>
+					<image :src="icons[2]"></image>
 					<text>资金账单</text>
 				</view>
 				<view @click="toHref('/pagesHouse/home/tj')">
-					<image :src="icons[2]"></image>
+					<image :src="icons[3]"></image>
 					<text>数据统计</text>
 				</view>
 			</view>
@@ -107,7 +107,8 @@
 			return {
 				merchantName: uni.getStorageSync('merchantName'),
 				emg: 'https://i.ringzle.com/file/20240224/91173dde1cb44b139129e12ad4971f1d.png',
-				icons: ['https://i.ringzle.com/file/20240224/70ab9f9d1a144c95927dedc6e84bcce7.png',
+				icons: ['https://i.ringzle.com/file/20240316/cb736aa1ebea42b68f73a0532bac1875.png',
+					'https://i.ringzle.com/file/20240224/70ab9f9d1a144c95927dedc6e84bcce7.png',
 					'https://i.ringzle.com/file/20240224/3f990c250f444ac9a5d9f334f322c98e.png',
 					'https://i.ringzle.com/file/20240224/7ca1bfa6e348438e83edc5af0589f847.png'
 				],
@@ -116,13 +117,15 @@
 				nameList: [],
 				shShow: false,
 				shList: [],
-				name: ''
+				name: '',
+				merchantType:4,
 			}
 		},
 		onLoad(opt) {
 			// if(opt.merchantName ){
 			// 	this.merchantName =opt.merchantName ;
 			// }
+			this.merchantType=opt.merchantType:4;
 			this.getData();
 			this.getList();
 			this.getType()
@@ -348,18 +351,17 @@
 			}
 
 			.dataBox {
-				padding: ;
 				display: grid;
 				/* 宽度平均分成4份 */
-				grid-template-columns: repeat(3, 1fr);
+				grid-template-columns: repeat(2, 1fr);
 				/* 高度平均分成3份 */
 				grid-template-rows: repeat(2, 1fr);
-				gap: 12rpx;
+				gap: 14rpx;
 
 				.item {
-					width: 230rpx;
+					width: 340rpx;
 					height: 180rpx;
-					padding: 24rpx 0 0 18rpx;
+					padding: 24rpx 0 0 26rpx;
 					border-radius: 16rpx;
 					background-color: rgba(255, 255, 255, .48);
 					color: #777;