diff --git a/pages/activity/index.vue b/pages/activity/index.vue index 1f71fce..b3369d6 100644 --- a/pages/activity/index.vue +++ b/pages/activity/index.vue @@ -3,7 +3,7 @@ - + diff --git a/pages/index/shopIndex.vue b/pages/index/shopIndex.vue index 1562970..fd46dcf 100644 --- a/pages/index/shopIndex.vue +++ b/pages/index/shopIndex.vue @@ -33,7 +33,7 @@ 报名数量 - 111 + {{baoMingCount}} @@ -42,15 +42,15 @@ 提交任务数 - 111 + 0 审核通过订单 - 111 + {{shenHeCount}} 返利金额 - 111 + {{fanLiMoney}} @@ -96,17 +96,17 @@ --> - 店铺管理 - - - - - {{item.merchantName}} - - - {{item.merchantAddress}} - + + + 店铺管理 + + + + + {{item.merchantName}} + + + {{item.merchantAddress}} @@ -127,6 +127,10 @@ return { colors: '#FF4701', merchantLogo: 'https://download.cyjyyjy.com/fq-logo.jpg', + baoMingCount: 0, //报名数量 + shenHeCount: 0, //审核通过数量 + fanLiMoney: 0, //返利金额 + merchantId: 0, startDate: 0, endDate: 0, @@ -395,6 +399,10 @@ this.zhangdanData[0].num = res.dayMoney ? res.dayMoney : 0; this.zhangdanData[1].num = res.yiMoney ? res.yiMoney : 0; this.zhangdanData[2].num = res.weiMoney ? res.weiMoney : 0; + + this.baoMingCount = res.baoMingCount + this.fanLiMoney = res.fanLiMoney + this.shenHeCount = res.shenHeCount } }); }, @@ -738,39 +746,56 @@ } } } + } + } - .shopList { - .shopManagement { - background: #FFF6F2; - border-radius: 15rpx; - padding: 20rpx; - - .shopLoge { - width: 120rpx; - height: 120rpx; - float: left; - margin-right: 15rpx; - } - - .shop_r { - height: 120rpx; - - .shop_name { - padding-left: 20rpx; - font-size: 30rpx; - color: #333333; - font-weight: 600; - line-height: 60rpx; - } - - .shuoDz { - font-size: 28rpx; - color: #999999; - - } - } + .shop-list-box{ + width: 686rpx; + border-radius: 16rpx; + background: #fff; + margin: 0 auto; + .title{ + width: 100%; + height: 96rpx; + display: flex; + align-items: center; + padding: 0 32rpx; + image{ + width: 32rpx; + height: 32rpx; + margin-right: 8rpx; + } + } + .shop-item{ + width: 100%; + padding: 32rpx; + display: flex; + border-top: 2rpx solid #E8E8E8;; + image{ + width: 112rpx; + height: 112rpx; + margin-right: 32rpx; + border-radius: 16rpx; + } + .shop_r{ + width: calc(100% - 160rpx); + font-size: 22rpx; + color: #333; + .shop_name{ + width: 100%; + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap; + font-size: 28rpx; + font-weight: 500; + margin-bottom: 20rpx; } } + .dizhiIcon{ + width: 16rpx; + height: 19rpx; + margin-right: 10rpx; + } } } diff --git a/static/img/home/title-logo.png b/static/img/home/title-logo.png new file mode 100644 index 0000000..d34d21b Binary files /dev/null and b/static/img/home/title-logo.png differ