Pre Merge pull request !94 from heyho/master

pages/commission/team.vue

@@ -1,29 +1,32 @@
 <!-- 页面 TODO 芋艿：该页面的实现代码需要优化，包括 js 和 css，以及相关的样式设计 -->
 <template>
 	<s-layout title="我的团队" :class="state.scrollTop ? 'team-wrap' : ''" navbar="inner">
+
+		<view class="header-box" :style="[
+	      {
+	        marginTop: '-' + Number(statusBarHeight + 88) + 'rpx',
+	        paddingTop: Number(statusBarHeight + 108) + 'rpx',
+	      },
+	    ]">	
+			<!-- 推广数据总览 -->
+			<view class="team-data-box ss-flex ss-col-center ss-row-between" style="width: 100%">
+				<view class="data-card" style="width: 100%">
+					<view class="total-item" style="width: 100%">
+						<view class="item-title" style="text-align: center">推广人数</view>
+						<view class="total-num" style="text-align: center">
+							{{state.summary.firstBrokerageUserCount + state.summary.secondBrokerageUserCount ||0}}
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view style="height:30rpx"></view>
+		</view>
+
+
 		<view class="promoter-list">
-      <view
+			<view style="padding: 0 20rpx">
-        class="promoterHeader bg-color"
+				<view class="nav acea-row row-around l1" style="position: relative;z-index:99">
-        style="backgroundcolor: #e93323 !important; height: 218rpx; color: #fff"
-      >
-        <view class="headerCon acea-row row-between" style="padding: 28px 29px 0 29px">
-          <view>
-            <view class="name" style="color: #fff">推广人数</view>
-            <view>
-              <text class="num" style="color: #fff">
-                {{
-                  state.summary.firstBrokerageUserCount + state.summary.secondBrokerageUserCount ||
-                  0
-                }}
-              </text>
-              人
-            </view>
-          </view>
-          <view class="iconfont icon-tuandui" />
-        </view>
-      </view>
-      <view style="padding: 0 30rpx">
-        <view class="nav acea-row row-around l1">
 					<view :class="state.level == 1 ? 'item on' : 'item'" @click="setType(1)">
 						一级({{ state.summary.firstBrokerageUserCount || 0 }})
 					</view>
@@ -31,42 +34,24 @@
 						二级({{ state.summary.secondBrokerageUserCount || 0 }})
 					</view>
 				</view>
-        <view
+				<view class="search acea-row row-between-wrapper"
-          class="search acea-row row-between-wrapper"
+					style="display: flex; height: 100rpx; align-items: center">
-          style="display: flex; height: 100rpx; align-items: center"
-        >
 					<view class="input">
-            <input
+						<input placeholder="点击搜索会员名称" v-model="state.nickname" confirm-type="search" name="search"
-              placeholder="点击搜索会员名称"
+							@confirm="submitForm" />
-              v-model="state.nickname"
-              confirm-type="search"
-              name="search"
-              @confirm="submitForm"
-            />
 					</view>
-          <image
+					<image src="/static/images/search.png" mode="" style="width: 60rpx; height: 64rpx"
-            src="/static/images/search.png"
+						@click="submitForm" />
-            mode=""
-            style="width: 60rpx; height: 64rpx"
-            @click="submitForm"
-          />
 				</view>
 				<view class="list">
 					<view class="sortNav acea-row row-middle" style="display: flex; align-items: center">
-            <view
+						<view class="sortItem" @click="setSort('userCount', 'asc')" v-if="sort === 'userCountDESC'">
-              class="sortItem"
-              @click="setSort('userCount', 'asc')"
-              v-if="sort === 'userCountDESC'"
-            >
 							团队排序
 							<!-- TODO 芋艿：看看怎么从项目里拿出去 -->
 							<image src="/static/images/sort1.png" />
 						</view>
-            <view
+						<view class="sortItem" @click="setSort('userCount', 'desc')"
-              class="sortItem"
+							v-else-if="sort === 'userCountASC'">
-              @click="setSort('userCount', 'desc')"
-              v-else-if="sort === 'userCountASC'"
-            >
 							团队排序
 							<image src="/static/images/sort3.png" />
 						</view>
@@ -78,11 +63,7 @@
 							金额排序
 							<image src="/static/images/sort1.png" />
 						</view>
-            <view
+						<view class="sortItem" @click="setSort('price', 'desc')" v-else-if="sort === 'priceASC'">
-              class="sortItem"
-              @click="setSort('price', 'desc')"
-              v-else-if="sort === 'priceASC'"
-            >
 							金额排序
 							<image src="/static/images/sort3.png" />
 						</view>
@@ -90,19 +71,12 @@
 							金额排序
 							<image src="/static/images/sort2.png" />
 						</view>
-            <view
+						<view class="sortItem" @click="setSort('orderCount', 'asc')" v-if="sort === 'orderCountDESC'">
-              class="sortItem"
-              @click="setSort('orderCount', 'asc')"
-              v-if="sort === 'orderCountDESC'"
-            >
 							订单排序
 							<image src="/static/images/sort1.png" />
 						</view>
-            <view
+						<view class="sortItem" @click="setSort('orderCount', 'desc')"
-              class="sortItem"
+							v-else-if="sort === 'orderCountASC'">
-              @click="setSort('orderCount', 'desc')"
-              v-else-if="sort === 'orderCountASC'"
-            >
 							订单排序
 							<image src="/static/images/sort3.png" />
 						</view>
@@ -113,10 +87,8 @@
 					</view>
 					<block v-for="(item, index) in state.pagination.list" :key="index">
 						<view class="item acea-row row-between-wrapper" style="display: flex">
-              <view
+							<view class="picTxt acea-row row-between-wrapper"
-                class="picTxt acea-row row-between-wrapper"
+								style="display: flex; align-items: center">
-                style="display: flex; align-items: center"
-              >
 								<view class="pictrue">
 									<image :src="item.avatar" />
 								</view>
@@ -128,30 +100,26 @@
 									</view>
 								</view>
 							</view>
-              <view
+							<view class="right" style="
-                class="right"
-                style="
                   justify-content: center;
                   flex-direction: column;
                   display: flex;
                   margin-left: auto;
-                "
+                ">
-              >
 								<view>
 									<text class="num font-color">{{ item.brokerageUserCount || 0 }} </text>人
 								</view>
 								<view>
-                  <text class="num">{{ item.orderCount || 0 }}</text
+									<text class="num">{{ item.orderCount || 0 }}</text>单
-                  >单</view
+								</view>
-                >
 								<view>
-                  <text class="num">{{ item.brokeragePrice || 0 }}</text
+									<text class="num">{{ item.brokeragePrice || 0 }}</text>元
-                  >元
 								</view>
 							</view>
 						</view>
 					</block>
 					<block v-if="state.pagination.list.length === 0">
+						<view style="margin-top: 30rpx;"></view>
 						<view style="text-align: center">暂无推广人数</view>
 					</block>
 				</view>
@@ -233,10 +201,19 @@
 
 <script setup>
 	import sheep from '@/sheep';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+	import {
-  import { computed, reactive, ref } from 'vue';
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import {
+		computed,
+		reactive,
+		ref
+	} from 'vue';
 	import _ from 'lodash-es';
-  import { onPageScroll } from '@dcloudio/uni-app';
+	import {
+		onPageScroll
+	} from '@dcloudio/uni-app';
 	import BrokerageApi from '@/sheep/api/trade/brokerage';
 
 	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
@@ -279,7 +256,10 @@
 
 	async function getTeamList() {
 		state.loadStatus = 'loading';
-    let { code, data } = await BrokerageApi.getBrokerageUserChildSummaryPage({
+		let {
+			code,
+			data
+		} = await BrokerageApi.getBrokerageUserChildSummaryPage({
 			pageNo: state.pagination.pageNo,
 			pageSize: state.pagination.pageSize,
 			level: state.level,
@@ -312,7 +292,9 @@
 	onLoad(async () => {
 		await getTeamList();
 		// 概要数据
-    let { data } = await BrokerageApi.getBrokerageUserSummary();
+		let {
+			data
+		} = await BrokerageApi.getBrokerageUserSummary();
 		state.summary = data;
 	});
 

static/img/shop/goods/score1.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1662015751652" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1383" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M1021.44 514.048c0-56.832-10.24-111.616-28.672-162.304-2.56-7.168-5.632-14.336-8.192-21.504-17.92-42.496-41.984-81.408-70.656-116.224-9.728-11.776-19.968-23.04-30.208-33.28-31.744-31.744-68.608-59.392-108.544-81.408-6.656-3.584-13.312-7.168-20.48-10.24-13.824-6.656-27.648-12.8-42.496-17.92-28.672-10.752-58.88-18.432-90.112-23.04-15.36-2.56-31.232-4.096-47.616-4.608-8.192-0.512-15.872-0.512-24.064-0.512-97.792 0-188.416 29.696-263.68 80.384-25.088 16.896-48.64 36.352-69.632 57.344-15.872 15.872-30.72 33.28-44.544 51.2-22.528 30.208-41.472 63.488-56.832 98.304-3.072 7.168-5.632 14.336-8.192 21.504-18.432 50.688-28.672 104.96-28.672 162.304 0 5.12 0 10.24 0.512 15.36 8.192 253.44 215.552 456.192 471.04 456.192s462.848-202.752 471.04-456.192v-15.36z" fill="#FB6F31" p-id="1384"></path><path d="M139.16672 847.54944a471.51104 471.51104 0 0 0 513.8944 102.21568 471.59808 471.59808 0 0 0 255.2064-255.2064 471.6288 471.6288 0 0 0-0.01024-360.91904 471.53664 471.53664 0 0 0-255.21152-255.20128A471.552 471.552 0 0 0 139.16672 847.54944z" fill="#FBB03B" p-id="1385"></path><path d="M210.4832 776.22784a370.64704 370.64704 0 0 0 262.12352 108.5696 370.64704 370.64704 0 0 0 262.11328-108.57984 370.71872 370.71872 0 0 0 108.56448-262.1184 370.72384 370.72384 0 0 0-108.57472-262.11328A370.688 370.688 0 0 0 210.48832 776.22784z" fill="#FBEFA0" p-id="1386"></path><path d="M472.576 42.496C212.48 42.496 1.024 253.44 1.024 514.048c0 5.12 0 10.24 0.512 15.36h942.08c0-5.12 0.512-10.24 0.512-15.36 0-260.096-210.944-471.552-471.552-471.552z" fill="#FBC93B" p-id="1387"></path><path d="M236.19072 750.52544a334.40256 334.40256 0 0 0 364.35968 72.46848 334.40256 334.40256 0 0 0 180.9408-180.94592 334.3872 334.3872 0 0 0-0.01024-255.89248 334.32576 334.32576 0 0 0-617.77408 0.01024 334.336 334.336 0 0 0 72.48384 364.35968z" fill="#E25931" p-id="1388"></path><path d="M184.832 514.048c0 88.53504 32.7936 173.44512 91.17184 236.05248C334.3872 812.70272 413.568 847.872 496.128 847.872c82.56 0 161.73568-35.16928 220.11904-97.77152 58.37824-62.60736 91.17696-147.51744 91.17696-236.05248 0-43.83744-8.05376-87.2448-23.70048-127.744-15.6416-40.50432-38.56896-77.30688-67.47648-108.30336C657.86368 215.3984 578.688 180.224 496.128 180.224c-82.56512 0-161.7408 35.1744-220.12416 97.77664C217.6256 340.60288 184.832 425.51296 184.832 514.048z" fill="#FB6F31" p-id="1389"></path><path d="M184.832 514.048c0 88.53504 32.7936 173.44512 91.17184 236.05248C334.3872 812.70272 413.568 847.872 496.128 847.872c82.56 0 161.73568-35.16928 220.11904-97.77152 58.37824-62.60736 91.17696-147.51744 91.17696-236.05248 0-43.83744-8.05376-87.2448-23.70048-127.744-15.6416-40.50432-38.56896-77.30688-67.47648-108.30336C657.86368 215.3984 578.688 180.224 496.128 180.224c-82.56512 0-161.7408 35.1744-220.12416 97.77664C217.6256 340.60288 184.832 425.51296 184.832 514.048z" fill="#FB6F31" p-id="1390"></path><path d="M723.456 292.864l-449.024 449.024c56.32 59.904 134.144 99.84 221.184 105.472 174.08-11.776 311.296-156.672 311.296-333.824 0-84.48-31.232-161.792-83.456-220.672z" fill="#FB8E31" p-id="1391"></path><path d="M495.616 328.192l63.488 128 141.312 20.992-92.16 89.088 20.992 156.672-135.68-68.096-124.416 62.976 24.064-140.8-102.4-99.84 141.312-20.992 63.488-128z" fill="#FB6F31" p-id="1392"></path><path d="M482.304 306.176l62.976 128 141.824 20.48-102.4 99.84 24.064 141.312-126.464-66.56-126.976 66.56 24.576-141.312-102.4-99.84 141.312-20.48 63.488-128z" fill="#FBC93B" p-id="1393"></path></svg>

static/img/shop/tabbar/category2.png

@@ -0,0 +1,2 @@
+export default "/static/img/shop/tabbar/category2.png"
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImNhdGVnb3J5Mi5wbmc/aW1wb3J0Il0sInNvdXJjZXNDb250ZW50IjpbImV4cG9ydCBkZWZhdWx0IFwiL3N0YXRpYy9pbWcvc2hvcC90YWJiYXIvY2F0ZWdvcnkyLnBuZ1wiIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLE1BQU0sQ0FBQyxTQUFTLENBQUMsR0FBRyJ9