Merge remote-tracking branch 'origin/master-vue3' into master-vue3

App.vue

@@ -1,46 +1,39 @@
 <script setup>
-	import {
-		onLaunch,
-		onShow,
-		onError
-	} from '@dcloudio/uni-app';
-	import {
-		ShoproInit
-	} from './sheep';
-
-	onLaunch(() => {
-		// 隐藏原生导航栏 使用自定义底部导航
-		uni.hideTabBar();
-
-		// 加载Shopro底层依赖
-		ShoproInit();
-	});
-
-	onError((err) => {
-		console.log('AppOnError:', err);
-	});
-
-	onShow((options) => {
-		// #ifdef APP-PLUS 
-		// 获取urlSchemes参数
-		const args = plus.runtime.arguments;
-		if (args) {}
-
-		// 获取剪贴板 
-		uni.getClipboardData({
-			success: (res) => {},
-		});
-		// #endif
-
-		// #ifdef MP-WEIXIN
-		// 确认收货回调结果 
-		console.log(options, 'options');
-		// #endif
-
-
-	});
+  import { onLaunch, onShow, onError } from '@dcloudio/uni-app';
+  import { ShoproInit } from './sheep';
+
+  onLaunch(() => {
+    // 隐藏原生导航栏 使用自定义底部导航
+    uni.hideTabBar();
+
+    // 加载Shopro底层依赖
+    ShoproInit();
+  });
+
+  onError((err) => {
+    console.log('AppOnError:', err);
+  });
+
+  onShow((options) => {
+    // #ifdef APP-PLUS
+    // 获取urlSchemes参数
+    const args = plus.runtime.arguments;
+    if (args) {
+    }
+
+    // 获取剪贴板
+    uni.getClipboardData({
+      success: (res) => { },
+    });
+    // #endif
+
+    // #ifdef MP-WEIXIN
+    // 确认收货回调结果
+    console.log(options,'options');
+    // #endif
+  });
 </script>
 
 <style lang="scss">
-	@import '@/sheep/scss/index.scss';
-</style>
+  @import '@/sheep/scss/index.scss';
+</style>

pages/commission/components/account-info.vue

@@ -1,108 +1,117 @@
 <!-- 账户  -->
 <template>
-  <view class="account-card">
-    <view class="account-card-box">
-      <view class="ss-flex ss-row-between card-box-header">
-        <view class="ss-flex">
-          <view class="header-title ss-m-r-16">账户信息</view>
-          <button
-            class="ss-reset-button look-btn ss-flex"
-            @tap="state.showMoney = !state.showMoney"
-          >
-            <uni-icons
-              :type="state.showMoney ? 'eye-filled' : 'eye-slash-filled'"
-              color="#A57A55"
-              size="20"
-            ></uni-icons>
-          </button>
-        </view>
-        <view class="ss-flex" @tap="sheep.$router.go('/pages/user/wallet/commission')">
-          <view class="header-title ss-m-r-4">查看明细</view>
-          <text class="cicon-play-arrow"></text>
-        </view>
-      </view>
-      <!-- 收益 -->
-      <view class="card-content ss-flex">
-        <view class="ss-flex-1 ss-flex-col ss-col-center">
-          <view class="item-title">总收益(元)</view>
-          <view class="item-detail">
-            {{ state.showMoney ? agentInfo.total_income || '0.00' : '***' }}
-          </view>
-        </view>
-        <view class="ss-flex-1 ss-flex-col ss-col-center">
-          <view class="item-title">我的佣金(元)</view>
-          <view class="item-detail">
-            {{ state.showMoney ? userInfo.commission || '0.00' : '***' }}
-          </view>
-        </view>
-        <view class="ss-flex-1 ss-flex-col ss-col-center">
-          <view class="item-title">我的消费(元)</view>
-          <view class="item-detail">
-            {{ state.showMoney ? userInfo.total_consume || '0.00' : '***' }}
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+	<view class="account-card">
+		<view class="account-card-box">
+			<view class="ss-flex ss-row-between card-box-header">
+				<view class="ss-flex">
+					<view class="header-title ss-m-r-16">账户信息</view>
+					<button class="ss-reset-button look-btn ss-flex" @tap="state.showMoney = !state.showMoney">
+						<uni-icons :type="state.showMoney ? 'eye-filled' : 'eye-slash-filled'" color="#A57A55"
+							size="20"></uni-icons>
+					</button>
+				</view>
+				<view class="ss-flex" @tap="sheep.$router.go('/pages/user/wallet/commission')">
+					<view class="header-title ss-m-r-4">查看明细</view>
+					<text class="cicon-play-arrow"></text>
+				</view>
+			</view>
+			<!-- 收益 -->
+			<view class="card-content ss-flex">
+				<view class="ss-flex-1 ss-flex-col ss-col-center">
+					<view class="item-title">当前佣金(元)</view>
+					<view class="item-detail">
+						{{ state.showMoney ? userInfo.brokeragePrice || '0.00' : '***' }}
+					</view>
+				</view>
+				<view class="ss-flex-1 ss-flex-col ss-col-center">
+					<view class="item-title">昨天的佣金(元)</view>
+					<view class="item-detail">
+						{{ state.showMoney ? userInfo.yesterdayPrice || '0.00' : '***' }}
+					</view>
+				</view>
+				<view class="ss-flex-1 ss-flex-col ss-col-center">
+					<view class="item-title">累计已提(元)</view>
+					<view class="item-detail">
+						{{ state.showMoney ? userInfo.withdrawPrice || '0.00' : '***' }}
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
-  import sheep from '@/sheep';
-  import { computed, reactive } from 'vue';
+	import sheep from '@/sheep';
+	import {
+		computed,
+		reactive,
+		onMounted
+	} from 'vue';
 
-  const userInfo = computed(() => sheep.$store('user').userInfo);
-  const agentInfo = computed(() => sheep.$store('user').agentInfo);
+	const userInfo = computed(() => sheep.$store('user').userInfo);
+	const agentInfo = computed(() => sheep.$store('user').agentInfo);
 
-  const state = reactive({
-    showMoney: false,
-  });
+	const state = reactive({
+		showMoney: false,
+	});
+	onMounted(async () => {
+		let res = await sheep.$api.commission.getSummary();
+		userInfo = res.data;
+	})
 </script>
 
 <style lang="scss" scoped>
-  .account-card {
-    width: 694rpx;
-    margin: 0 auto;
-    padding: 2rpx;
-    background: linear-gradient(180deg, #ffffff 0.88%, #fff9ec 100%);
-    border-radius: 12rpx;
-    z-index: 3;
-    position: relative;
-    .account-card-box {
-      background: #ffefd6;
-      .card-box-header {
-        padding: 0 30rpx;
-        height: 72rpx;
-        box-shadow: 0px 2px 6px #f2debe;
-        .header-title {
-          font-size: 24rpx;
-          font-weight: 500;
-          color: #a17545;
-          line-height: 30rpx;
-        }
-        .cicon-play-arrow {
-          color: #a17545;
-          font-size: 24rpx;
-          line-height: 30rpx;
-        }
-      }
-      .card-content {
-        height: 190rpx;
-        background: #fdfae9;
-        .item-title {
-          font-size: 24rpx;
-          font-weight: 500;
-          color: #cba67e;
-          line-height: 30rpx;
-          margin-bottom: 24rpx;
-        }
-        .item-detail {
-          font-size: 36rpx;
-          font-family: OPPOSANS;
-          font-weight: bold;
-          color: #692e04;
-          line-height: 30rpx;
-        }
-      }
-    }
-  }
-</style>
+	.account-card {
+		width: 694rpx;
+		margin: 0 auto;
+		padding: 2rpx;
+		background: linear-gradient(180deg, #ffffff 0.88%, #fff9ec 100%);
+		border-radius: 12rpx;
+		z-index: 3;
+		position: relative;
+
+		.account-card-box {
+			background: #ffefd6;
+
+			.card-box-header {
+				padding: 0 30rpx;
+				height: 72rpx;
+				box-shadow: 0px 2px 6px #f2debe;
+
+				.header-title {
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #a17545;
+					line-height: 30rpx;
+				}
+
+				.cicon-play-arrow {
+					color: #a17545;
+					font-size: 24rpx;
+					line-height: 30rpx;
+				}
+			}
+
+			.card-content {
+				height: 190rpx;
+				background: #fdfae9;
+
+				.item-title {
+					font-size: 24rpx;
+					font-weight: 500;
+					color: #cba67e;
+					line-height: 30rpx;
+					margin-bottom: 24rpx;
+				}
+
+				.item-detail {
+					font-size: 36rpx;
+					font-family: OPPOSANS;
+					font-weight: bold;
+					color: #692e04;
+					line-height: 30rpx;
+				}
+			}
+		}
+	}
+</style>

pages/commission/components/commission-info.vue

@@ -1,126 +1,126 @@
 <!-- 分销商信息  -->
 <template>
-  <!-- 用户资料 -->
-  <view class="user-card ss-flex ss-col-bottom">
-    <view class="card-top ss-flex ss-row-between">
-      <view class="ss-flex">
-        <view class="head-img-box">
-          <image class="head-img" :src="sheep.$url.cdn(userInfo.avatar)" mode="aspectFill"></image>
-        </view>
-        <view class="ss-flex-col">
-          <view class="user-name">{{ userInfo.nickname }}</view>
-          <view class="user-info-box ss-flex">
-            <view class="tag-box ss-flex" v-if="agentInfo.level_info">
-              <image
-                v-if="agentInfo.level_info?.image"
-                class="tag-img"
-                :src="sheep.$url.cdn(agentInfo.level_info?.image)"
-                mode="aspectFill"
-              >
-              </image>
-              <text class="tag-title">{{ agentInfo.level_info?.name }}</text>
-            </view>
-            <view class="ss-iconfont uicon-arrow-right" style="color: #fff; font-size: 28rpx">
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
+	<!-- 用户资料 -->
+	<view class="user-card ss-flex ss-col-bottom">
+		<view class="card-top ss-flex ss-row-between">
+			<view class="ss-flex">
+				<view class="head-img-box">
+					<image class="head-img" :src="sheep.$url.cdn(userInfo.avatar)" mode="aspectFill"></image>
+				</view>
+				<view class="ss-flex-col">
+					<view class="user-name">{{ userInfo.nickname }}</view>
+					<view class="user-info-box ss-flex">
+						<view class="tag-box ss-flex" v-if="agentInfo.level_info">
+							<image v-if="agentInfo.level_info?.image" class="tag-img"
+								:src="sheep.$url.cdn(agentInfo.level_info?.image)" mode="aspectFill">
+							</image>
+							<text class="tag-title">{{ agentInfo.level_info?.name }}</text>
+						</view>
+						<view class="ss-iconfont uicon-arrow-right" style="color: #fff; font-size: 28rpx">
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
-  import sheep from '@/sheep';
-  import { computed, reactive } from 'vue';
+	import sheep from '@/sheep';
+	import {
+		computed,
+		reactive
+	} from 'vue';
 
-  const userInfo = computed(() => sheep.$store('user').userInfo);
-  const agentInfo = computed(() => sheep.$store('user').agentInfo);
-  const headerBg = sheep.$url.css('/static/img/shop/commission/background.png');
-
-  const state = reactive({
-    showMoney: false,
-  });
+	const userInfo = computed(() => sheep.$store('user').userInfo);
+	const agentInfo = computed(() => sheep.$store('user').agentInfo);
+	const headerBg = sheep.$url.css('/static/img/shop/commission/background.png');
+	console.log(userInfo);
+	const state = reactive({
+		showMoney: false,
+	});
 </script>
 
 <style lang="scss" scoped>
-  // 用户资料卡片
-  .user-card {
-    width: 690rpx;
-    height: 192rpx;
-    margin: -88rpx 20rpx 0 20rpx;
-    padding-top: 88rpx;
-    background: v-bind(headerBg) no-repeat;
-    background-size: 100% 100%;
+	// 用户资料卡片
+	.user-card {
+		width: 690rpx;
+		height: 192rpx;
+		margin: -88rpx 20rpx 0 20rpx;
+		padding-top: 88rpx;
+		background: v-bind(headerBg) no-repeat;
+		background-size: 100% 100%;
+
+		.head-img-box {
+			margin-right: 20rpx;
+			width: 100rpx;
+			height: 100rpx;
+			border-radius: 50%;
+			position: relative;
+			background: #fce0ad;
 
-    .head-img-box {
-      margin-right: 20rpx;
-      width: 100rpx;
-      height: 100rpx;
-      border-radius: 50%;
-      position: relative;
-      background: #fce0ad;
+			.head-img {
+				width: 92rpx;
+				height: 92rpx;
+				border-radius: 50%;
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+			}
+		}
 
-      .head-img {
-        width: 92rpx;
-        height: 92rpx;
-        border-radius: 50%;
-        position: absolute;
-        top: 50%;
-        left: 50%;
-        transform: translate(-50%, -50%);
-      }
-    }
+		.card-top {
+			box-sizing: border-box;
+			padding-bottom: 34rpx;
 
-    .card-top {
-      box-sizing: border-box;
-      padding-bottom: 34rpx;
-      .user-name {
-        font-size: 32rpx;
-        font-weight: bold;
-        color: #692e04;
-        line-height: 30rpx;
-        margin-bottom: 20rpx;
-      }
+			.user-name {
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #692e04;
+				line-height: 30rpx;
+				margin-bottom: 20rpx;
+			}
 
-      .log-btn {
-        width: 84rpx;
-        height: 42rpx;
-        border: 2rpx solid rgba(#ffffff, 0.33);
-        border-radius: 21rpx;
-        font-size: 22rpx;
-        font-weight: 400;
-        color: #ffffff;
-        margin-bottom: 20rpx;
-      }
+			.log-btn {
+				width: 84rpx;
+				height: 42rpx;
+				border: 2rpx solid rgba(#ffffff, 0.33);
+				border-radius: 21rpx;
+				font-size: 22rpx;
+				font-weight: 400;
+				color: #ffffff;
+				margin-bottom: 20rpx;
+			}
 
-      .look-btn {
-        color: #fff;
-        width: 40rpx;
-        height: 40rpx;
-      }
-    }
+			.look-btn {
+				color: #fff;
+				width: 40rpx;
+				height: 40rpx;
+			}
+		}
 
-    .user-info-box {
-      .tag-box {
-        background: #ff6000;
-        border-radius: 18rpx;
-        line-height: 36rpx;
+		.user-info-box {
+			.tag-box {
+				background: #ff6000;
+				border-radius: 18rpx;
+				line-height: 36rpx;
 
-        .tag-img {
-          width: 36rpx;
-          height: 36rpx;
-          border-radius: 50%;
-          margin-left: -2rpx;
-        }
+				.tag-img {
+					width: 36rpx;
+					height: 36rpx;
+					border-radius: 50%;
+					margin-left: -2rpx;
+				}
 
-        .tag-title {
-          font-size: 24rpx;
-          padding: 0 10rpx;
-          font-weight: 500;
-          line-height: 36rpx;
-          color: #fff;
-        }
-      }
-    }
-  }
-</style>
+				.tag-title {
+					font-size: 24rpx;
+					padding: 0 10rpx;
+					font-weight: 500;
+					line-height: 36rpx;
+					color: #fff;
+				}
+			}
+		}
+	}
+</style>

pages/commission/goods.vue

@@ -1,137 +1,123 @@
 <!-- 页面  -->
 <template>
-  <s-layout title="推广商品" :onShareAppMessage="state.shareInfo">
-    <view class="goods-item ss-m-20" v-for="item in state.pagination.data" :key="item.id">
-      <s-goods-item
-        size="lg"
-        :img="item.image"
-        :title="item.title"
-        :subTitle="item.subtitle"
-        :price="item.price[0]"
-        :originPrice="item.original_price"
-        priceColor="#333"
-        @tap="sheep.$router.go('/pages/goods/index', { id: item.id })"
-      >
-        <template #rightBottom>
-          <view class="ss-flex ss-row-between">
-            <view class="commission-num">预计佣金：￥{{ item.commission }}</view>
-            <button
-              class="ss-reset-button share-btn ui-BG-Main-Gradient"
-              @tap.stop="onShareGoods(item)"
-            >
-              分享赚
-            </button>
-          </view>
-        </template>
-      </s-goods-item>
-    </view>
-    <s-empty
-      v-if="state.pagination.total === 0"
-      icon="/static/goods-empty.png"
-      text="暂无推广商品"
-    ></s-empty>
-    <!-- 加载更多 -->
-    <uni-load-more
-      v-if="state.pagination.total > 0"
-      :status="state.loadStatus"
-      :content-text="{
+	<s-layout title="推广商品" :onShareAppMessage="state.shareInfo">
+		<view class="goods-item ss-m-20" v-for="item in state.pagination.data" :key="item.id">
+			<s-goods-item size="lg" :img="item.picUrl" :title="item.name" :subTitle="item.subtitle" :price="item.price"
+				:originPrice="item.original_price" priceColor="#333"
+				@tap="sheep.$router.go('/pages/goods/index', { id: item.id })">
+				<template #rightBottom>
+					<view class="ss-flex ss-row-between">
+						<view class="commission-num">预计佣金：￥{{ item.commission }}</view>
+						<button class="ss-reset-button share-btn ui-BG-Main-Gradient" @tap.stop="onShareGoods(item)">
+							分享赚
+						</button>
+					</view>
+				</template>
+			</s-goods-item>
+		</view>
+		<s-empty v-if="state.pagination.total === 0" icon="/static/goods-empty.png" text="暂无推广商品"></s-empty>
+		<!-- 加载更多 -->
+		<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
         contentdown: '上拉加载更多',
-      }"
-      @tap="loadmore"
-    />
-  </s-layout>
+      }" @tap="loadmore" />
+	</s-layout>
 </template>
 
 <script setup>
-  import sheep from '@/sheep';
-  import $share from '@/sheep/platform/share';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-  import { computed, reactive } from 'vue';
-  import _ from 'lodash';
-  import { showShareModal } from '@/sheep/hooks/useModal';
+	import sheep from '@/sheep';
+	import $share from '@/sheep/platform/share';
+	import {
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import {
+		computed,
+		reactive
+	} from 'vue';
+	import _ from 'lodash';
+	import {
+		showShareModal
+	} from '@/sheep/hooks/useModal';
 
-  const state = reactive({
-    pagination: {
-      data: [],
-      current_page: 1,
-      total: 1,
-      last_page: 1,
-    },
-    loadStatus: '',
-    shareInfo: {},
-  });
+	const state = reactive({
+		pagination: {
+			data: [],
+			current_page: 1,
+			total: 1,
+			last_page: 1,
+		},
+		loadStatus: '',
+		shareInfo: {},
+	});
 
-  function onShareGoods(goodsInfo) {
-    state.shareInfo = $share.getShareInfo(
-      {
-        title: goodsInfo.title,
-        image: sheep.$url.cdn(goodsInfo.image),
-        desc: goodsInfo.subtitle,
-        params: {
-          page: '2',
-          query: goodsInfo.id,
-        },
-      },
-      {
-        type: 'goods', // 商品海报
-        title: goodsInfo.title, // 商品标题
-        image: sheep.$url.cdn(goodsInfo.image), // 商品主图
-        price: goodsInfo.price[0], // 商品价格
-        original_price: goodsInfo.original_price, // 商品原价
-      },
-    );
-    showShareModal();
-  }
+	function onShareGoods(goodsInfo) {
+		state.shareInfo = $share.getShareInfo({
+			title: goodsInfo.title,
+			image: sheep.$url.cdn(goodsInfo.image),
+			desc: goodsInfo.subtitle,
+			params: {
+				page: '2',
+				query: goodsInfo.id,
+			},
+		}, {
+			type: 'goods', // 商品海报
+			title: goodsInfo.title, // 商品标题
+			image: sheep.$url.cdn(goodsInfo.image), // 商品主图
+			price: goodsInfo.price[0], // 商品价格
+			original_price: goodsInfo.original_price, // 商品原价
+		}, );
+		showShareModal();
+	}
+	async function getGoodsList(page = 1, list_rows = 8) {
+		state.pagination.current_page = page;
+		state.loadStatus = 'loading';
+		let res = await sheep.$api.commission.goods({
+			pageSize: list_rows,
+			pageNo: page,
+		});
+		if (res.code === 0) {
+			let orderList = _.concat(state.pagination.data, res.data.list);
+			state.pagination = {
+				...res.data,
+				data: orderList,
+			};
+			if (state.pagination.data.length < state.pagination.total) {
+				state.loadStatus = 'more';
+			} else {
+				state.loadStatus = 'noMore';
+			}
+		}
+	}
 
-  async function getGoodsList(page = 1, list_rows = 8) {
-    state.loadStatus = 'loading';
-    let res = await sheep.$api.commission.goods({
-      list_rows,
-      page,
-    });
-    if (res.error === 0) {
-      let orderList = _.concat(state.pagination.data, res.data.data);
-      state.pagination = {
-        ...res.data,
-        data: orderList,
-      };
-      if (state.pagination.current_page < state.pagination.last_page) {
-        state.loadStatus = 'more';
-      } else {
-        state.loadStatus = 'noMore';
-      }
-    }
-  }
+	onLoad(async () => {
+		getGoodsList();
+	});
 
-  onLoad(async () => {
-    getGoodsList();
-  });
+	// 加载更多
+	function loadmore() {
+		if (state.loadStatus !== 'noMore') {
+			getGoodsList(state.pagination.current_page + 1);
+		}
+	}
 
-  // 加载更多
-  function loadmore() {
-    if (state.loadStatus !== 'noMore') {
-      getGoodsList(state.pagination.current_page + 1);
-    }
-  }
-
-  // 上拉加载更多
-  onReachBottom(() => {
-    loadmore();
-  });
+	// 上拉加载更多
+	onReachBottom(() => {
+		loadmore();
+	});
 </script>
 
 <style lang="scss" scoped>
-  .goods-item {
-    .commission-num {
-      font-size: 24rpx;
-      font-weight: 500;
-      color: $red;
-    }
+	.goods-item {
+		.commission-num {
+			font-size: 24rpx;
+			font-weight: 500;
+			color: $red;
+		}
 
-    .share-btn {
-      width: 120rpx;
-      height: 50rpx;
-      border-radius: 25rpx;
-    }
-  }
-</style>
+		.share-btn {
+			width: 120rpx;
+			height: 50rpx;
+			border-radius: 25rpx;
+		}
+	}
+</style>

pages/commission/order.vue

@@ -1,417 +1,411 @@
 <!-- 分销订单  -->
 <template>
-  <s-layout title="分销订单" :class="state.scrollTop ? 'order-warp' : ''" navbar="inner">
-    <view
-      class="header-box"
-      :style="[
+	<s-layout title="分销订单" :class="state.scrollTop ? 'order-warp' : ''" 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">
-        <view class="data-card">
-          <view class="total-item">
-            <view class="item-title">团队订单数量（单）</view>
-            <view class="total-num">
-              {{ state.agentInfo.child_order_count_all || 0 }}
-            </view>
-          </view>
-          <view class="category-item ss-flex">
-            <view class="ss-flex-1">
-              <view class="item-title">一级订单</view>
-              <view class="category-num">
-                {{ state.agentInfo.child_order_count_1 || 0 }}
-              </view>
-            </view>
-            <view class="ss-flex-1">
-              <view class="item-title">二级订单</view>
-              <view class="category-num">
-                {{ state.agentInfo.child_order_count_2 || 0 }}
-              </view>
-            </view>
-          </view>
-        </view>
-        <view class="data-card">
-          <view class="total-item">
-            <view class="item-title">团队订单金额（元）</view>
-            <view class="total-num">
-              {{ state.agentInfo.child_order_money_all || '0.00' }}
-            </view>
-          </view>
-          <view class="category-item ss-flex">
-            <view class="ss-flex-1">
-              <view class="item-title">一级订单</view>
-              <view class="category-num">
-                {{ state.agentInfo.child_order_money_1 || '0.00' }}
-              </view>
-            </view>
-            <view class="ss-flex-1">
-              <view class="item-title">二级订单</view>
-              <view class="category-num">
-                {{ state.agentInfo.child_order_money_2 || '0.00' }}
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-      <!-- 自购 -->
-      <view class="direct-box ss-flex ss-row-between">
-        <view class="direct-item">
-          <view class="item-title">自购分销订单数量（单）</view>
-          <view class="item-value">
-            {{ state.agentInfo.child_order_count_0 || 0 }}
-          </view>
-        </view>
-        <view class="direct-item">
-          <view class="item-title">自购分销订单金额（元）</view>
-          <view class="item-value">
-            {{ state.agentInfo.child_order_money_0 || '0.00' }}
-          </view>
-        </view>
-      </view>
-    </view>
-
-    <!-- tab -->
-    <su-sticky bgColor="#fff">
-      <su-tabs
-        :list="tabMaps"
-        :scrollable="false"
-        :current="state.currentTab"
-        @change="onTabsChange"
-      >
-      </su-tabs>
-    </su-sticky>
-
-    <!-- 订单 -->
-    <view class="order-box">
-      <view class="order-item" v-for="item in state.pagination.data" :key="item">
-        <view class="order-header">
-          <view class="no-box ss-flex ss-col-center ss-row-between">
-            <text class="order-code">订单编号：{{ item.order.order_sn }}</text>
-            <text class="order-state">{{ item.order_item.status_text }}</text>
-          </view>
-          <view class="order-from ss-flex ss-col-center ss-row-between">
-            <view class="from-user ss-flex ss-col-center">
-              <text>下单人：</text>
-              <image class="user-avatar" :src="sheep.$url.cdn(item.buyer.avatar)" mode="aspectFill">
-              </image>
-              <text class="user-name">{{ item.buyer.nickname }}</text>
-            </view>
-            <view class="order-time">{{ item.create_time }}</view>
-          </view>
-        </view>
-        <s-goods-item
-          class="border-bottom"
-          :img="item.order_item.goods_image"
-          :title="item.order_item.goods_title"
-          :skuText="item.order_item.goods_sku_text"
-          :price="item.order_item.goods_price"
-          :num="item.order_item.goods_num"
-        >
-          <template #rightBottom>
-            <view class="ss-flex commission-box ss-row-between ss-m-t-10">
-              <view class="ss-flex">
-                <text class="name">佣金：</text>
-                <text class="commission-num">{{ item.rewards[0]?.commission }}</text>
-              </view>
-              <view class="order-status">
-                {{ item.commission_order_status_text }}
-              </view>
-            </view>
-          </template>
-        </s-goods-item>
-      </view>
-      <!-- 数据为空 -->
-      <s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单">
-      </s-empty>
-      <!-- 加载更多 -->
-      <uni-load-more
-        v-if="state.pagination.total > 0"
-        :status="state.loadStatus"
-        :content-text="{
+      ]">
+			<!-- 团队数据总览 -->
+			<view class="team-data-box ss-flex ss-col-center ss-row-between">
+				<view class="data-card">
+					<view class="total-item">
+						<view class="item-title">团队订单数量（单）</view>
+						<view class="total-num">
+							{{ state.agentInfo.child_order_count_all || 0 }}
+						</view>
+					</view>
+					<view class="category-item ss-flex">
+						<view class="ss-flex-1">
+							<view class="item-title">一级订单</view>
+							<view class="category-num">
+								{{ state.agentInfo.child_order_count_1 || 0 }}
+							</view>
+						</view>
+						<view class="ss-flex-1">
+							<view class="item-title">二级订单</view>
+							<view class="category-num">
+								{{ state.agentInfo.child_order_count_2 || 0 }}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="data-card">
+					<view class="total-item">
+						<view class="item-title">团队订单金额（元）</view>
+						<view class="total-num">
+							{{ state.agentInfo.child_order_money_all || '0.00' }}
+						</view>
+					</view>
+					<view class="category-item ss-flex">
+						<view class="ss-flex-1">
+							<view class="item-title">一级订单</view>
+							<view class="category-num">
+								{{ state.agentInfo.child_order_money_1 || '0.00' }}
+							</view>
+						</view>
+						<view class="ss-flex-1">
+							<view class="item-title">二级订单</view>
+							<view class="category-num">
+								{{ state.agentInfo.child_order_money_2 || '0.00' }}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 自购 -->
+			<view class="direct-box ss-flex ss-row-between">
+				<view class="direct-item">
+					<view class="item-title">自购分销订单数量（单）</view>
+					<view class="item-value">
+						{{ state.agentInfo.child_order_count_0 || 0 }}
+					</view>
+				</view>
+				<view class="direct-item">
+					<view class="item-title">自购分销订单金额（元）</view>
+					<view class="item-value">
+						{{ state.agentInfo.child_order_money_0 || '0.00' }}
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- tab -->
+		<su-sticky bgColor="#fff">
+			<su-tabs :list="tabMaps" :scrollable="false" :current="state.currentTab" @change="onTabsChange">
+			</su-tabs>
+		</su-sticky>
+
+		<!-- 订单 -->
+		<view class="order-box">
+			<view class="order-item" v-for="item in state.pagination.data" :key="item">
+				<view class="order-header">
+					<view class="no-box ss-flex ss-col-center ss-row-between">
+						<text class="order-code">订单编号：{{ item.order.order_sn }}</text>
+						<text class="order-state">{{ item.order_item.status_text }}</text>
+					</view>
+					<view class="order-from ss-flex ss-col-center ss-row-between">
+						<view class="from-user ss-flex ss-col-center">
+							<text>下单人：</text>
+							<image class="user-avatar" :src="sheep.$url.cdn(item.buyer.avatar)" mode="aspectFill">
+							</image>
+							<text class="user-name">{{ item.buyer.nickname }}</text>
+						</view>
+						<view class="order-time">{{ item.create_time }}</view>
+					</view>
+				</view>
+				<s-goods-item class="border-bottom" :img="item.order_item.goods_image"
+					:title="item.order_item.goods_title" :skuText="item.order_item.goods_sku_text"
+					:price="item.order_item.goods_price" :num="item.order_item.goods_num">
+					<template #rightBottom>
+						<view class="ss-flex commission-box ss-row-between ss-m-t-10">
+							<view class="ss-flex">
+								<text class="name">佣金：</text>
+								<text class="commission-num">{{ item.rewards[0]?.commission }}</text>
+							</view>
+							<view class="order-status">
+								{{ item.commission_order_status_text }}
+							</view>
+						</view>
+					</template>
+				</s-goods-item>
+			</view>
+			<!-- 数据为空 -->
+			<s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单">
+			</s-empty>
+			<!-- 加载更多 -->
+			<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
           contentdown: '上拉加载更多',
-        }"
-        @tap="loadmore"
-      />
-    </view>
-    <!-- </view> -->
-  </s-layout>
+        }" @tap="loadmore" />
+		</view>
+		<!-- </view> -->
+	</s-layout>
 </template>
 
 <script setup>
-  import sheep from '@/sheep';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-  import { computed, reactive } from 'vue';
-  import _ from 'lodash';
-  import { onPageScroll } from '@dcloudio/uni-app';
-
-  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
-  const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
-  onPageScroll((e) => {
-    if (e.scrollTop > 100) {
-      state.scrollTop = false;
-    } else {
-      state.scrollTop = true;
-    }
-  });
-
-  const state = reactive({
-    pagination: {
-      data: [],
-      current_page: 1,
-      total: 1,
-      last_page: 1,
-    },
-    loadStatus: '',
-    currentTab: 0,
-    agentInfo: {},
-    scrollTop: false,
-  });
-
-  const tabMaps = [
-    {
-      name: '全部',
-      value: 'all',
-    },
-    // {
-    // 	name: '不计入',
-    // 	value: 'no'
-    // },
-    {
-      name: '已计入',
-      value: 'yes',
-    },
-    {
-      name: '已扣除',
-      value: 'back',
-    },
-    {
-      name: '已取消',
-      value: 'cancel',
-    },
-  ];
-  // 切换选项卡
-  function onTabsChange(e) {
-    state.pagination = {
-      data: [],
-      current_page: 1,
-      total: 1,
-      last_page: 1,
-    };
-    state.currentTab = e.index;
-    getOrderList();
-  }
-
-  // 获取订单列表
-  async function getOrderList(page = 1, list_rows = 5) {
-    state.loadStatus = 'loading';
-    let res = await sheep.$api.commission.order({
-      type: tabMaps[state.currentTab].value,
-      list_rows,
-      page,
-    });
-    if (res.error === 0) {
-      let orderList = _.concat(state.pagination.data, res.data.data);
-      state.pagination = {
-        ...res.data,
-        data: orderList,
-      };
-      if (state.pagination.current_page < state.pagination.last_page) {
-        state.loadStatus = 'more';
-      } else {
-        state.loadStatus = 'noMore';
-      }
-    }
-  }
-
-  async function getAgentInfo() {
-    const { error, data, msg } = await sheep.$api.commission.agent();
-    if (error === 0) {
-      state.agentInfo = data;
-    }
-  }
-
-  onLoad(() => {
-    getAgentInfo();
-    getOrderList();
-  });
-
-  // 加载更多
-  function loadmore() {
-    if (state.loadStatus !== 'noMore') {
-      getOrderList(state.pagination.current_page + 1);
-    }
-  }
-
-  // 上拉加载更多
-  onReachBottom(() => {
-    loadmore();
-  });
+	import sheep from '@/sheep';
+	import {
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import {
+		computed,
+		reactive
+	} from 'vue';
+	import _ from 'lodash';
+	import {
+		onPageScroll
+	} from '@dcloudio/uni-app';
+
+	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+	const headerBg = sheep.$url.css('/static/img/shop/user/withdraw_bg.png');
+	onPageScroll((e) => {
+		if (e.scrollTop > 100) {
+			state.scrollTop = false;
+		} else {
+			state.scrollTop = true;
+		}
+	});
+
+	const state = reactive({
+		pagination: {
+			data: [],
+			current_page: 1,
+			total: 1,
+			last_page: 1,
+		},
+		loadStatus: '',
+		currentTab: 0,
+		agentInfo: {},
+		scrollTop: false,
+	});
+
+	const tabMaps = [{
+			name: '全部',
+			value: 'all',
+		},
+		// {
+		// 	name: '不计入',
+		// 	value: 'no'
+		// },
+		{
+			name: '已计入',
+			value: 'yes',
+		},
+		{
+			name: '已扣除',
+			value: 'back',
+		},
+		{
+			name: '已取消',
+			value: 'cancel',
+		},
+	];
+	// 切换选项卡
+	function onTabsChange(e) {
+		state.pagination = {
+			data: [],
+			current_page: 1,
+			total: 1,
+			last_page: 1,
+		};
+		state.currentTab = e.index;
+		getOrderList();
+	}
+
+	// 获取订单列表
+	async function getOrderList(page = 1, list_rows = 5) {
+		state.loadStatus = 'loading';
+		let res = await sheep.$api.commission.order({
+			type: tabMaps[state.currentTab].value,
+			list_rows,
+			page,
+		});
+		if (res.error === 0) {
+			let orderList = _.concat(state.pagination.data, res.data.data);
+			state.pagination = {
+				...res.data,
+				data: orderList,
+			};
+			if (state.pagination.current_page < state.pagination.last_page) {
+				state.loadStatus = 'more';
+			} else {
+				state.loadStatus = 'noMore';
+			}
+		}
+	}
+
+	async function getAgentInfo() {
+		const {
+			error,
+			data,
+			msg
+		} = await sheep.$api.commission.agent();
+		if (error === 0) {
+			state.agentInfo = data;
+		}
+	}
+
+	onLoad(() => {
+		getAgentInfo();
+		getOrderList();
+	});
+
+	// 加载更多
+	function loadmore() {
+		if (state.loadStatus !== 'noMore') {
+			getOrderList(state.pagination.current_page + 1);
+		}
+	}
+
+	// 上拉加载更多
+	onReachBottom(() => {
+		loadmore();
+	});
 </script>
 
 <style lang="scss" scoped>
-  .header-box {
-    box-sizing: border-box;
-    padding: 0 20rpx 20rpx 20rpx;
-    width: 750rpx;
-    background: v-bind(headerBg) no-repeat,
-      linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
-    background-size: 750rpx 100%;
-    // 团队信息总览
-    .team-data-box {
-      .data-card {
-        width: 305rpx;
-        background: #ffffff;
-        border-radius: 20rpx;
-        padding: 20rpx;
-
-        .total-item {
-          margin-bottom: 30rpx;
-
-          .item-title {
-            font-size: 24rpx;
-            font-weight: 500;
-            color: #999999;
-            line-height: normal;
-            margin-bottom: 20rpx;
-          }
-
-          .total-num {
-            font-size: 38rpx;
-            font-weight: 500;
-            color: #333333;
-            font-family: OPPOSANS;
-          }
-        }
-
-        .category-num {
-          font-size: 26rpx;
-          font-weight: 500;
-          color: #333333;
-          font-family: OPPOSANS;
-        }
-      }
-    }
-
-    // 直推
-    .direct-box {
-      margin-top: 20rpx;
-
-      .direct-item {
-        width: 340rpx;
-        background: #ffffff;
-        border-radius: 20rpx;
-        padding: 20rpx;
-        box-sizing: border-box;
-
-        .item-title {
-          font-size: 22rpx;
-          font-weight: 500;
-          color: #999999;
-          margin-bottom: 6rpx;
-        }
-
-        .item-value {
-          font-size: 38rpx;
-          font-weight: 500;
-          color: #333333;
-          font-family: OPPOSANS;
-        }
-      }
-    }
-  }
-
-  // 订单
-  .order-box {
-    .order-item {
-      background: #ffffff;
-      border-radius: 10rpx;
-      margin: 20rpx;
-
-      .order-footer {
-        padding: 20rpx;
-        font-size: 24rpx;
-        color: #999;
-      }
-
-      .order-header {
-        .no-box {
-          padding: 20rpx;
-
-          .order-code {
-            font-size: 26rpx;
-            font-weight: 500;
-            color: #333333;
-          }
-
-          .order-state {
-            font-size: 26rpx;
-            font-weight: 500;
-            color: var(--ui-BG-Main);
-          }
-        }
-
-        .order-from {
-          padding: 20rpx;
-
-          .from-user {
-            font-size: 24rpx;
-            font-weight: 400;
-            color: #666666;
-
-            .user-avatar {
-              width: 26rpx;
-              height: 26rpx;
-              border-radius: 50%;
-              margin-right: 8rpx;
-            }
-
-            .user-name {
-              font-size: 24rpx;
-              font-weight: 400;
-              color: #999999;
-            }
-          }
-
-          .order-time {
-            font-size: 24rpx;
-            font-weight: 400;
-            color: #999999;
-          }
-        }
-      }
-
-      .commission-box {
-        .name {
-          font-size: 24rpx;
-          font-weight: 400;
-          color: #999999;
-        }
-      }
-
-      .commission-num {
-        font-size: 30rpx;
-        font-weight: 500;
-        color: $red;
-        font-family: OPPOSANS;
-
-        &::before {
-          content: '￥';
-          font-size: 22rpx;
-        }
-      }
-
-      .order-status {
-        line-height: 30rpx;
-        padding: 0 10rpx;
-        border-radius: 30rpx;
-        margin-left: 20rpx;
-        font-size: 24rpx;
-        color: var(--ui-BG-Main);
-      }
-    }
-  }
-</style>
+	.header-box {
+		box-sizing: border-box;
+		padding: 0 20rpx 20rpx 20rpx;
+		width: 750rpx;
+		background: v-bind(headerBg) no-repeat,
+			linear-gradient(90deg, var(--ui-BG-Main), var(--ui-BG-Main-gradient));
+		background-size: 750rpx 100%;
+
+		// 团队信息总览
+		.team-data-box {
+			.data-card {
+				width: 305rpx;
+				background: #ffffff;
+				border-radius: 20rpx;
+				padding: 20rpx;
+
+				.total-item {
+					margin-bottom: 30rpx;
+
+					.item-title {
+						font-size: 24rpx;
+						font-weight: 500;
+						color: #999999;
+						line-height: normal;
+						margin-bottom: 20rpx;
+					}
+
+					.total-num {
+						font-size: 38rpx;
+						font-weight: 500;
+						color: #333333;
+						font-family: OPPOSANS;
+					}
+				}
+
+				.category-num {
+					font-size: 26rpx;
+					font-weight: 500;
+					color: #333333;
+					font-family: OPPOSANS;
+				}
+			}
+		}
+
+		// 直推
+		.direct-box {
+			margin-top: 20rpx;
+
+			.direct-item {
+				width: 340rpx;
+				background: #ffffff;
+				border-radius: 20rpx;
+				padding: 20rpx;
+				box-sizing: border-box;
+
+				.item-title {
+					font-size: 22rpx;
+					font-weight: 500;
+					color: #999999;
+					margin-bottom: 6rpx;
+				}
+
+				.item-value {
+					font-size: 38rpx;
+					font-weight: 500;
+					color: #333333;
+					font-family: OPPOSANS;
+				}
+			}
+		}
+	}
+
+	// 订单
+	.order-box {
+		.order-item {
+			background: #ffffff;
+			border-radius: 10rpx;
+			margin: 20rpx;
+
+			.order-footer {
+				padding: 20rpx;
+				font-size: 24rpx;
+				color: #999;
+			}
+
+			.order-header {
+				.no-box {
+					padding: 20rpx;
+
+					.order-code {
+						font-size: 26rpx;
+						font-weight: 500;
+						color: #333333;
+					}
+
+					.order-state {
+						font-size: 26rpx;
+						font-weight: 500;
+						color: var(--ui-BG-Main);
+					}
+				}
+
+				.order-from {
+					padding: 20rpx;
+
+					.from-user {
+						font-size: 24rpx;
+						font-weight: 400;
+						color: #666666;
+
+						.user-avatar {
+							width: 26rpx;
+							height: 26rpx;
+							border-radius: 50%;
+							margin-right: 8rpx;
+						}
+
+						.user-name {
+							font-size: 24rpx;
+							font-weight: 400;
+							color: #999999;
+						}
+					}
+
+					.order-time {
+						font-size: 24rpx;
+						font-weight: 400;
+						color: #999999;
+					}
+				}
+			}
+
+			.commission-box {
+				.name {
+					font-size: 24rpx;
+					font-weight: 400;
+					color: #999999;
+				}
+			}
+
+			.commission-num {
+				font-size: 30rpx;
+				font-weight: 500;
+				color: $red;
+				font-family: OPPOSANS;
+
+				&::before {
+					content: '￥';
+					font-size: 22rpx;
+				}
+			}
+
+			.order-status {
+				line-height: 30rpx;
+				padding: 0 10rpx;
+				border-radius: 30rpx;
+				margin-left: 20rpx;
+				font-size: 24rpx;
+				color: var(--ui-BG-Main);
+			}
+		}
+	}
+</style>

pages/index/index.vue

@@ -1,3 +1,4 @@
+<!-- 首页，支持店铺装修 -->
 <template>
 	<view v-if="template">
 		<s-layout title="首页" navbar="custom" tabbar="/pages/index/index" :bgStyle="template.page"
@@ -20,7 +21,6 @@
 	} from '@dcloudio/uni-app';
 	import sheep from '@/sheep';
 	import $share from '@/sheep/platform/share';
-  import index2Api from '@/sheep/api/index2';
 	// 隐藏原生tabBar
 	uni.hideTabBar();
 

pages/index/page.vue

@@ -1,3 +1,4 @@
+<!-- 自定义页面：支持装修 -->
 <template>
   <s-layout
     :title="page.name"
@@ -38,6 +39,7 @@
     }
     // #endif
 
+    // TODO @疯狂：貌似这里还没接上哈
     const { error, data } = await sheep.$api.app.page(id);
     if (error === 0) {
       page.name = data.name;

pages/index/user.vue

@@ -1,3 +1,4 @@
+<!-- 个人中心：支持装修 -->
 <template>
   <s-layout
     title="我的"

pages/pay/recharge.vue

@@ -85,7 +85,7 @@
     // #endif
     sheep.$router.go('/pages/pay/index', {
       id: data.payOrderId,
-      type: 'recharge'
+      orderType: 'recharge'
     });
 	}
 

pages/user/wallet/score.vue

@@ -8,12 +8,11 @@
         },
       ]">
 			<view class="header-bg">
-				<view class="bg"></view>
+				<view class="bg" />
 			</view>
 			<view class="score-box ss-flex-col ss-row-center ss-col-center">
 				<view class="ss-m-b-30">
 					<text class="all-title ss-m-r-8">当前积分</text>
-					<!-- <text class="cicon-help-o"></text> -->
 				</view>
 				<text class="all-num">{{ userInfo.point || 0 }}</text>
 			</view>
@@ -100,7 +99,6 @@
 			name: '全部',
 			value: 'all',
 		},
-
 		// {
 		// 	name: '收入',
 		// 	value: 'income',
@@ -147,6 +145,7 @@
 			// }
 		}
 	}
+
 	onLoad(async (options) => {
 		state.today = dayjs().format('YYYY-MM-DD');
 		state.date = [state.today, state.today];
@@ -166,10 +165,6 @@
 		getLogList();
 	}
 
-	function appendTimeHMS(arr) {
-		return [arr[0] + ' 00:00:00', arr[1] + ' 23:59:59'];
-	}
-
 	function onLoadMore() {
 		// if (state.loadStatus !== 'noMore') {
 		getLogList(pagination.current_page + 1);

sheep/api/app.js

@@ -13,19 +13,6 @@ export default {
         showLoading: false,
       },
     }),
-  // 同步客户端页面到后端
-  pageSync: (pages) =>
-    request({
-      url: 'pageSync',
-      method: 'POST',
-      data: {
-        pages,
-      },
-      custom: {
-        showError: false,
-        showLoading: false,
-      },
-    }),
   // 自定义页面
   page: (id) =>
     request({

sheep/api/commission.js

@@ -1,65 +1,71 @@
 import request from '@/sheep/request';
 
 export default {
-  // 分销商详情
-  agent: () =>
-    request({
-      url: 'commission/agent',
-      method: 'GET',
-      custom: {
-        showLoading: false,
-        showError: false,
-      },
-    }),
-  // 分销表单
-  form: () =>
-    request({
-      url: 'commission/agent/form',
-      method: 'GET',
-    }),
-  // 申请分销商
-  apply: (data) =>
-    request({
-      url: 'commission/agent/apply',
-      method: 'POST',
-      data,
-      custom: {
-        showSuccess: true,
-      },
-    }),
-  // 分销动态
-  log: (params) =>
-    request({
-      url: 'commission/log',
-      method: 'GET',
-      params,
-    }),
-  // 分销订单
-  order: (params) =>
-    request({
-      url: 'commission/order',
-      method: 'GET',
-      params,
-    }),
-  // 分销商品
-  goods: (params) =>
-    request({
-      url: 'commission/goods',
-      method: 'GET',
-      params,
-    }),
-  // 我的团队
-  team: (params) =>
-    request({
-      url: 'commission/agent/team',
-      method: 'GET',
-      params,
-    }),
-  // 佣金转余额
-  transfer: (data) =>
-    request({
-      url: 'commission/agent/transfer',
-      method: 'POST',
-      data,
-    }),
-};
+	// 分销商详情
+	agent: () =>
+		request({
+			url: 'commission/agent',
+			method: 'GET',
+			custom: {
+				showLoading: false,
+				showError: false,
+			},
+		}),
+	// 分销表单
+	form: () =>
+		request({
+			url: 'commission/agent/form',
+			method: 'GET',
+		}),
+	// 申请分销商
+	apply: (data) =>
+		request({
+			url: 'commission/agent/apply',
+			method: 'POST',
+			data,
+			custom: {
+				showSuccess: true,
+			},
+		}),
+	// 分销动态
+	log: (params) =>
+		request({
+			url: 'commission/log',
+			method: 'GET',
+			params,
+		}),
+	// 分销订单
+	order: (params) =>
+		request({
+			url: 'commission/order',
+			method: 'GET',
+			params,
+		}),
+
+	// 分销商品
+	goods: (params) =>
+		request({
+			url: '/app-api/product/spu/page',
+			method: 'GET',
+			params,
+		}),
+	// 我的团队
+	team: (params) =>
+		request({
+			url: 'commission/agent/team',
+			method: 'GET',
+			params,
+		}),
+	// 佣金转余额
+	transfer: (data) =>
+		request({
+			url: 'commission/agent/transfer',
+			method: 'POST',
+			data,
+		}),
+	getSummary: (data) =>
+		request({
+			url: '/app-api/trade/brokerage-user/get-summary',
+			method: 'GET',
+		}),
+};

sheep/api/member/auth.js

@@ -37,6 +37,20 @@ const AuthUtil = {
       method: 'POST',
     });
   },
+  // 创建微信 JS SDK 初始化所需的签名
+  createWeixinMpJsapiSignature: (url) => {
+    return request({
+      url: '/app-api/member/auth/create-weixin-jsapi-signature',
+      method: 'POST',
+      params: {
+        url
+      },
+      custom: {
+        showError: false,
+        showLoading: false,
+      },
+    })
+  },
 };
 
 export default AuthUtil;

sheep/api/third.js

@@ -75,18 +75,6 @@ export default {
         },
       }),
 
-    // 网页jssdk
-    jssdk: (data) =>
-      request({
-        url: 'third/wechat/jssdk',
-        method: 'GET',
-        data,
-        custom: {
-          showError: false,
-          showLoading: false,
-        },
-      }),
-
     // 小程序订阅消息
     subscribeTemplate: (params) =>
       request({

sheep/components/s-auth-modal/s-auth-modal.vue

@@ -51,7 +51,7 @@
           <image
             class="auto-login-img"
             :src="sheep.$url.static('/static/img/shop/platform/wechat.png')"
-          ></image>
+          />
         </button>
 
         <!-- iOS登录 -->

sheep/components/s-block/s-block.vue

@@ -1,3 +1,4 @@
+<!-- 装修组件容器 -->
 <template>
   <view :style="[elStyles, elBackground]"><slot /></view>
 </template>

sheep/components/s-coupon-block/s-coupon-block.vue

@@ -1,4 +1,4 @@
-<!-- 优惠券组  -->
+<!-- 装修营销组件：优惠券  -->
 <template>
   <scroll-view class="scroll-box" scroll-x scroll-anchoring>
     <view class="coupon-box ss-flex">

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

@@ -1,3 +1,4 @@
+<!-- 装修用户组件：用户卡券 -->
 <template>
 	<view class="ss-coupon-menu-wrap ss-flex ss-col-center">
 		<view class="menu-item ss-flex-col ss-row-center ss-col-center" v-for="item in props.list" :key="item.title"
@@ -41,13 +42,13 @@
 						path: '/pages/coupon/list',
 						type: 'expired',
 					},
-					// {
-					//   title: '领券中心',
-					//   value: '0',
-					//   icon: '/static/img/shop/order/all_coupon.png',
-					//   path: '/pages/coupon/list',
-					//   type: 'all',
-					// },
+					{
+					  title: '领券中心',
+					  value: '0',
+					  icon: '/static/img/shop/order/all_coupon.png',
+					  path: '/pages/coupon/list',
+					  type: 'all',
+					},
 				];
 			},
 		},

sheep/components/s-custom-navbar/s-custom-navbar.vue

@@ -1,3 +1,4 @@
+<!-- 顶部导航栏 -->
 <template>
   <navbar
     :alway="isAlway"

sheep/components/s-float-menu/s-float-menu.vue

@@ -1,3 +1,4 @@
+<!-- 装修基础组件：悬浮按钮 -->
 <template>
   <!-- 模态背景：展开时显示，点击后折叠 -->
   <view class="modal-bg" v-if="fabRef?.isShow" @click="handleCollapseFab"></view>

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

@@ -1,3 +1,4 @@
+<!-- 装修商品组件：商品卡片 -->
 <template>
   <!-- 商品卡片 -->
   <view>

sheep/components/s-goods-shelves/s-goods-shelves.vue

@@ -1,3 +1,4 @@
+<!-- 装修商品组件：商品栏 -->
 <template>
   <view>
     <!-- 布局1. 两列商品，图片左文案右 -->
@@ -27,7 +28,7 @@
           :bottomRadius="data.borderRadiusBottom"
           :titleWidth="(454 - marginRight * 2 - data.space * 2 - marginLeft * 2) / 2"
           @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
-        ></s-goods-column>
+        />
       </view>
     </view>
     <!-- 布局. 三列商品：图片上文案下 -->
@@ -56,7 +57,7 @@
           :topRadius="data.borderRadiusTop"
           :bottomRadius="data.borderRadiusBottom"
           @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
-        ></s-goods-column>
+        />
       </view>
     </view>
 
@@ -79,7 +80,7 @@
               :titleColor="data.fields.name?.color"
               :titleWidth="(750 - marginRight * 2 - data.space * 4 - marginLeft * 2) / 3"
               @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
-            ></s-goods-column>
+            />
           </view>
         </view>
       </scroll-view>

sheep/components/s-hotzone-block/s-hotzone-block.vue

@@ -1,3 +1,4 @@
+<!-- 装修图文组件：热区 -->
 <template>
   <view class="hotzone-wrap">
     <image :src="sheep.$url.cdn(data.imgUrl)" style="width: 100%" mode="widthFix"></image>

sheep/components/s-image-banner/s-image-banner.vue

@@ -1,3 +1,4 @@
+<!-- 装修图文组件：图片轮播 -->
 <template>
   <su-swiper
     :list="imgList"

sheep/components/s-image-block/s-image-block.vue

@@ -1,6 +1,7 @@
+<!-- 装修图文组件：图片展示 -->
 <template>
   <view @tap="sheep.$router.go(data?.url)">
-    <su-image :src="sheep.$url.cdn(data.imgUrl)" mode="widthFix"></su-image>
+    <su-image :src="sheep.$url.cdn(data.imgUrl)" mode="widthFix" />
   </view>
 </template>
 

sheep/components/s-image-cube/s-image-cube.vue

@@ -1,3 +1,4 @@
+<!-- 装修图文组件：广告魔方 -->
 <template>
   <view class="ss-cube-wrap" :style="[parseAdWrap]">
     <view v-for="(item, index) in data.list" :key="index">

sheep/components/s-line-block/s-line-block.vue

@@ -1,3 +1,4 @@
+<!-- 装修基础组件：分割线 -->
 <template>
   <su-subline v-bind="data"></su-subline>
 </template>

sheep/components/s-menu-button/s-menu-button.vue

@@ -1,3 +1,4 @@
+<!-- 装修基础组件：菜单导航（金刚区） -->
 <template>
   <!-- 包裹层 -->
   <view

sheep/components/s-menu-grid/s-menu-grid.vue

@@ -1,3 +1,4 @@
+<!-- 装修基础组件：宫格导航 -->
 <template>
   <uni-grid :showBorder="Boolean(data.border)" :column="data.column">
     <uni-grid-item

sheep/components/s-menu-list/s-menu-list.vue

@@ -1,3 +1,4 @@
+<!-- 装修基础组件：列表导航 -->
 <template>
   <view class="menu-list-wrap">
     <uni-list :border="true">

sheep/components/s-notice-block/s-notice-block.vue

@@ -11,7 +11,7 @@
       :speed="50"
       :color="data.textColor"
       @tap="sheep.$router.go(data.contents[0].url)"
-    ></su-notice-bar>
+    />
   </view>
 </template>
 

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

@@ -1,3 +1,4 @@
+<!-- 装修用户组件：用户订单 -->
 <template>
   <view class="ss-order-menu-wrap ss-flex ss-col-center">
     <view

sheep/components/s-richtext-block/s-richtext-block.vue

@@ -1,3 +1,4 @@
+<!-- 装修营销组件：营销文章 -->
 <template>
   <view
     :style="[
@@ -16,6 +17,7 @@
 <script setup>
   import { reactive, onMounted } from 'vue';
   import ArticleApi from '@/sheep/api/promotion/article';
+
   const props = defineProps({
     data: {
       type: Object,
@@ -26,9 +28,11 @@
       default() {},
     },
   });
+
   const state = reactive({
     content: '',
   });
+
   onMounted(async () => {
     const { data } = await ArticleApi.getArticle(props.data.id);
     state.content = data.content;

sheep/components/s-title-block/s-title-block.vue

@@ -1,4 +1,4 @@
-<!-- 页面 -->
+<!-- 装修商品组件：标题栏 -->
 <template>
   <view
     class="ss-title-wrap ss-flex ss-col-center"

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

@@ -1,4 +1,4 @@
-<!-- 页面 -->
+<!-- 装修用户组件：用户卡片 -->
 <template>
 	<view class="ss-user-info-wrap ss-p-t-50">
 		<view class="ss-flex ss-col-center ss-row-between ss-m-b-20">
@@ -23,7 +23,7 @@
 			</view>
 		</view>
 
-
+    <!-- TODO @芋艿：用户接入 -->
 		<!-- 提示绑定手机号 先隐藏 yudao 需要再修改 -->
 		<!--    <view
       class="bind-mobile-box ss-flex ss-row-between ss-col-center"

sheep/components/s-video-block/s-video-block.vue

@@ -1,4 +1,4 @@
-<!--  -->
+<!-- 装修图文组件：视频播放 -->
 <template>
   <su-video
     class="sss"

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

@@ -1,3 +1,4 @@
+<!-- 装修用户组件：用户资产 -->
 <template>
   <!-- TODO @惠智造：代码合并有问题，可以看看 -->
 	<view class="ss-wallet-menu-wrap ss-flex ss-col-center">

sheep/index.js

@@ -46,8 +46,9 @@ function ShoproDebug() {
   // });
   // #endif
 
+  // TODO 芋艿：可以打印路由
   // 同步前端页面到后端
-  $api.app.pageSync(ROUTES);
+  // console.log(ROUTES)
 }
 
 export default sheep;

sheep/libs/sdk-h5-weixin.js

@@ -3,70 +3,67 @@
  * 更多微信网页开发sdk方法,详见:https://developers.weixin.qq.com/doc/offiaccount/OA_Web_Apps/JS-SDK.html
  */
 
-import jweixin from 'weixin-js-sdk';
+import jweixin, { ready } from 'weixin-js-sdk';
 import $helper from '@/sheep/helper';
 import third from '@/sheep/api/third';
+import AuthUtil from '@/sheep/api/member/auth';
 
 let configSuccess = false;
 
 export default {
-  //判断是否在微信中
+  // 判断是否在微信中
   isWechat() {
     const ua = window.navigator.userAgent.toLowerCase();
-    if (ua.match(/micromessenger/i) == 'micromessenger') {
-      return true;
-    } else {
-      return false;
-    }
+    // noinspection EqualityComparisonWithCoercionJS
+    return ua.match(/micromessenger/i) == 'micromessenger';
   },
 
   isReady(api) {
     jweixin.ready(api);
   },
 
-  // 初始化JSSDK
+  // 初始化 JSSDK
   async init(callback) {
     if (!this.isWechat()) {
       $helper.toast('请使用微信网页浏览器打开');
       return;
     }
 
+    // 调用后端接口，获得 JSSDK 初始化所需的签名
     const url = location.href.split('#')[0];
-
-    const { error, data } = await third.wechat.jssdk({
-      platform: 'officialAccount',
-      payload: encodeURIComponent(
-        JSON.stringify({
-          url,
-        }),
-      ),
-    });
-
-    if (error === 0) {
+    const { code, data } = await AuthUtil.createWeixinMpJsapiSignature(url);
+    if (code === 0) {
       jweixin.config({
         debug: false,
         appId: data.appId,
         timestamp: data.timestamp,
         nonceStr: data.nonceStr,
         signature: data.signature,
-        jsApiList: data.jsApiList,
-        openTagList: data.openTagList,
+        jsApiList: ['chooseWXPay'], // TODO 芋艿：后续可以设置更多权限；
+        openTagList: data.openTagList
       });
     }
 
+    // 监听结果
     configSuccess = true;
-
     jweixin.error((err) => {
       configSuccess = false;
+      console.error('微信 JSSDK 初始化失败', err);
       // $helper.toast('微信JSSDK:' + err.errMsg);
     });
+    jweixin.ready(() => {
+      if (configSuccess) {
+        console.log('微信 JSSDK 初始化成功');
+      }
+    })
 
+    // 回调
     if (callback) {
       callback(data);
     }
   },
 
-  //在需要定位页面调用
+  //在需要定位页面调用 TODO 芋艿：未测试
   getLocation(callback) {
     this.isReady(() => {
       jweixin.getLocation({
@@ -81,7 +78,7 @@ export default {
     });
   },
 
-  //获取微信收货地址
+  //获取微信收货地址 TODO 芋艿：未测试
   openAddress(callback) {
     this.isReady(() => {
       jweixin.openAddress({
@@ -97,7 +94,7 @@ export default {
     });
   },
 
-  // 微信扫码
+  // 微信扫码 TODO 芋艿：未测试
   scanQRCode(callback) {
     this.isReady(() => {
       jweixin.scanQRCode({
@@ -113,7 +110,7 @@ export default {
     });
   },
 
-  // 更新微信分享信息
+  // 更新微信分享信息 TODO 芋艿：未测试
   updateShareInfo(data, callback = null) {
     this.isReady(() => {
       const shareData = {
@@ -137,7 +134,7 @@ export default {
     });
   },
 
-  // 打开坐标位置
+  // 打开坐标位置 TODO 芋艿：未测试
   openLocation(data, callback) {
     this.isReady(() => {
       jweixin.openLocation({
@@ -148,7 +145,7 @@ export default {
     });
   },
 
-  // 选择图片
+  // 选择图片 TODO 芋艿：未测试
   chooseImage(callback) {
     this.isReady(() => {
       jweixin.chooseImage({
@@ -162,7 +159,7 @@ export default {
     });
   },
 
-  //微信支付
+  //微信支付 TODO 芋艿：未测试
   wxpay(data, callback) {
     this.isReady(() => {
       jweixin.chooseWXPay({

sheep/platform/pay.js

@@ -8,7 +8,7 @@ import PayOrderApi from '@/sheep/api/pay/order';
 /**
  * 支付
  *
- * @param {String} payment = ['wechat','alipay','wallet','offline']  	- 支付方式
+ * @param {String} payment = ['wechat','alipay','wallet','mock']  	- 支付方式
  * @param {String} orderType = ['goods','recharge','groupon']  	- 订单类型
  * @param {String} id					- 订单号
  */
@@ -33,8 +33,8 @@ export default class SheepPay {
         wallet: () => {
           this.walletPay();
         },
-        offline: () => {
-          this.offlinePay();
+        mock: () => {
+          this.mockPay();
         }
       },
       WechatMiniProgram: {
@@ -47,8 +47,8 @@ export default class SheepPay {
         wallet: () => {
           this.walletPay();
         },
-        offline: () => {
-          this.offlinePay();
+        mock: () => {
+          this.mockPay();
         }
       },
       App: {
@@ -61,8 +61,8 @@ export default class SheepPay {
         wallet: () => {
           this.walletPay();
         },
-        offline: () => {
-          this.offlinePay();
+        mock: () => {
+          this.mockPay();
         }
       },
       H5: {
@@ -75,8 +75,8 @@ export default class SheepPay {
         wallet: () => {
           this.walletPay();
         },
-        offline: () => {
-          this.offlinePay();
+        mock: () => {
+          this.mockPay();
         }
       },
     };
@@ -182,10 +182,10 @@ export default class SheepPay {
     code === 0 && this.payResult('success');
   }
 
-  // 货到付款  TODO 芋艿：待接入
-  async offlinePay() {
-    const { error } = await this.prepay();
-    error === 0 && this.payResult('success');
+  // 模拟支付
+  async mockPay() {
+    const { code } = await this.prepay('mock');
+    code === 0 && this.payResult('success');
   }
 
   // 支付宝复制链接支付  TODO 芋艿：待接入

sheep/platform/provider/wechat/officialAccount.js

@@ -20,6 +20,7 @@ async function load() {
 // 微信公众号登陆
 async function login(code = '') {
   // 获取登陆地址
+  debugger
   if (!code) {
     const loginResult = await getLoginUrl();
     if (loginResult.error === 0 && loginResult.data.login_url) {
@@ -38,6 +39,7 @@ async function login(code = '') {
 
 // 微信公众号绑定
 async function bind(code = '') {
+  debugger
   // 获取绑定地址
   if (code === '') {
     const loginResult = await getLoginUrl('bind');
@@ -57,6 +59,7 @@ async function bind(code = '') {
 
 // 微信公众号解除绑定
 async function unbind() {
+  debugger
   const { error } = await third.wechat.unbind({
     platform: 'officialAccount',
   });
@@ -65,6 +68,7 @@ async function unbind() {
 
 // 获取公众号登陆地址
 function getLoginUrl(event = 'login') {
+  debugger
   let page = getRootUrl() + 'pages/index/login';
 
   return third.wechat.oauthLogin({
@@ -80,6 +84,7 @@ function getLoginUrl(event = 'login') {
 
 // 此处使用前端发送code在后端解密，防止用户在后端过长时间停留
 function loginByCode(code) {
+  debugger
   return third.wechat.login({
     platform: 'officialAccount',
     shareInfo: uni.getStorageSync('shareLog') || {},
@@ -93,6 +98,7 @@ function loginByCode(code) {
 
 // 此处使用前端发送code在后端解密，防止用户在后端过长时间停留
 function bindByCode(code) {
+  debugger
   return third.wechat.bind({
     platform: 'officialAccount',
     payload: encodeURIComponent(

sheep/platform/provider/wechat/openPlatform.js

@@ -1,5 +1,4 @@
 // 登录
-import { isEmpty } from 'lodash';
 import third from '@/sheep/api/third';
 
 const load = async () => {};
@@ -11,6 +10,7 @@ const login = () => {
       provider: 'weixin',
       onlyAuthorize: true,
     });
+    debugger
     if (loginRes.errMsg == 'login:ok') {
       const res = await third.wechat.login({
         platform: 'openPlatform',

sheep/request2/index.js

@@ -95,8 +95,8 @@ http.interceptors.request.use(
 		if (config.url.indexOf('/app-api/') !== -1) {
 			config.header['Accept'] = '*/*'
 			config.header['tenant-id'] = '1';
-      config.header['terminal'] = '20';
-      config.header['Authorization'] = 'Bearer test247';
+			config.header['terminal'] = '20';
+			config.header['Authorization'] = 'Bearer test247';
 		}
 		return config;
 	},

sheep/store/app.js

@@ -61,18 +61,21 @@ const app = defineStore({
         $router.error('NetworkError');
       }
 
+      // 加载装修配置
       await adaptTemplate(this.template, templateId)
       const res = await appApi.init(templateId);
       if (res.error === 0) {
         this.info = res.data.app;
         this.platform = res.data.platform;
 
+        // TODO 芋艿：未接入
         // this.template = res.data.template;
-        this.has_wechat_trade_managed = res.data.has_wechat_trade_managed;
+        // this.has_wechat_trade_managed = res.data.has_wechat_trade_managed;
         // if (!res.data.template) {
         //   $router.error('TemplateError');
         // }
-        this.chat = res.data.chat;
+        // TODO 芋艿：未接入
+        // this.chat = res.data.chat;
 
         // 加载主题
         const sysStore = sys();

sheep/ui/su-navbar/su-navbar.vue

@@ -1,3 +1,4 @@
+<!-- 自定义导航栏 -->
 <template>
   <view class="uni-navbar" :class="{ 'uni-dark': dark }">
     <view

sheep/ui/su-notice-bar/su-notice-bar.vue

@@ -1,3 +1,4 @@
+<!-- 公告栏组件 -->
 <template>
   <view
     v-if="show"

sheep/ui/su-status-bar/su-status-bar.vue

@@ -1,10 +1,10 @@
+<!-- 自定义状态栏 -->
 <template>
   <view :style="{ height: statusBarHeight }" class="uni-status-bar"><slot /></view>
 </template>
 
 <script setup>
   import sheep from '@/sheep';
-  import { computed } from 'vue';
 
   const statusBarHeight = sheep.$platform.device.statusBarHeight + 'px';
 </script>

sheep/ui/su-tabbar-item/su-tabbar-item.vue

@@ -1,3 +1,4 @@
+<!-- 自定义底部导航项 -->
 <template>
   <view class="u-tabbar-item" :style="[addStyle(customStyle)]">
     <view v-if="isCenter" class="tabbar-center-item">

sheep/ui/su-tabbar/su-tabbar.vue

@@ -1,3 +1,4 @@
+<!-- 底部导航栏 -->
 <template>
   <view class="u-tabbar">
     <view