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

App.vue

@@ -1,12 +1,6 @@
 <script setup>
-	import {
+  import { onLaunch, onShow, onError } from '@dcloudio/uni-app';
-		onLaunch,
+  import { ShoproInit } from './sheep';
-		onShow,
-		onError
-	} from '@dcloudio/uni-app';
-	import {
-		ShoproInit
-	} from './sheep';
 
   onLaunch(() => {
     // 隐藏原生导航栏 使用自定义底部导航
@@ -24,7 +18,8 @@
     // #ifdef APP-PLUS
     // 获取urlSchemes参数
     const args = plus.runtime.arguments;
-		if (args) {}
+    if (args) {
+    }
 
     // 获取剪贴板
     uni.getClipboardData({
@@ -36,8 +31,6 @@
     // 确认收货回调结果
     console.log(options,'options');
     // #endif
-
-
   });
 </script>
 

pages/commission/components/account-info.vue

@@ -5,15 +5,9 @@
 			<view class="ss-flex ss-row-between card-box-header">
 				<view class="ss-flex">
 					<view class="header-title ss-m-r-16">账户信息</view>
-          <button
+					<button class="ss-reset-button look-btn ss-flex" @tap="state.showMoney = !state.showMoney">
-            class="ss-reset-button look-btn ss-flex"
+						<uni-icons :type="state.showMoney ? 'eye-filled' : 'eye-slash-filled'" color="#A57A55"
-            @tap="state.showMoney = !state.showMoney"
+							size="20"></uni-icons>
-          >
-            <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')">
@@ -24,21 +18,21 @@
 			<!-- 收益 -->
 			<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-title">当前佣金(元)</view>
 					<view class="item-detail">
-            {{ state.showMoney ? agentInfo.total_income || '0.00' : '***' }}
+						{{ 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-title">昨天的佣金(元)</view>
 					<view class="item-detail">
-            {{ state.showMoney ? userInfo.commission || '0.00' : '***' }}
+						{{ 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-title">累计已提(元)</view>
 					<view class="item-detail">
-            {{ state.showMoney ? userInfo.total_consume || '0.00' : '***' }}
+						{{ state.showMoney ? userInfo.withdrawPrice || '0.00' : '***' }}
 					</view>
 				</view>
 			</view>
@@ -48,7 +42,11 @@
 
 <script setup>
 	import sheep from '@/sheep';
-  import { computed, reactive } from 'vue';
+	import {
+		computed,
+		reactive,
+		onMounted
+	} from 'vue';
 
 	const userInfo = computed(() => sheep.$store('user').userInfo);
 	const agentInfo = computed(() => sheep.$store('user').agentInfo);
@@ -56,6 +54,10 @@
 	const state = reactive({
 		showMoney: false,
 	});
+	onMounted(async () => {
+		let res = await sheep.$api.commission.getSummary();
+		userInfo = res.data;
+	})
 </script>
 
 <style lang="scss" scoped>
@@ -67,27 +69,33 @@
 		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;
@@ -95,6 +103,7 @@
 					line-height: 30rpx;
 					margin-bottom: 24rpx;
 				}
+
 				.item-detail {
 					font-size: 36rpx;
 					font-family: OPPOSANS;

pages/commission/components/commission-info.vue

@@ -11,12 +11,8 @@
 					<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
+							<image v-if="agentInfo.level_info?.image" class="tag-img"
-                v-if="agentInfo.level_info?.image"
+								:src="sheep.$url.cdn(agentInfo.level_info?.image)" mode="aspectFill">
-                class="tag-img"
-                :src="sheep.$url.cdn(agentInfo.level_info?.image)"
-                mode="aspectFill"
-              >
 							</image>
 							<text class="tag-title">{{ agentInfo.level_info?.name }}</text>
 						</view>
@@ -31,12 +27,15 @@
 
 <script setup>
 	import sheep from '@/sheep';
-  import { computed, reactive } from 'vue';
+	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');
-
+	console.log(userInfo);
 	const state = reactive({
 		showMoney: false,
 	});
@@ -74,6 +73,7 @@
 		.card-top {
 			box-sizing: border-box;
 			padding-bottom: 34rpx;
+
 			.user-name {
 				font-size: 32rpx;
 				font-weight: bold;

pages/commission/goods.vue

@@ -2,53 +2,42 @@
 <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
+			<s-goods-item size="lg" :img="item.picUrl" :title="item.name" :subTitle="item.subtitle" :price="item.price"
-        size="lg"
+				:originPrice="item.original_price" priceColor="#333"
-        :img="item.image"
+				@tap="sheep.$router.go('/pages/goods/index', { id: item.id })">
-        :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
+						<button class="ss-reset-button share-btn ui-BG-Main-Gradient" @tap.stop="onShareGoods(item)">
-              class="ss-reset-button share-btn ui-BG-Main-Gradient"
-              @tap.stop="onShareGoods(item)"
-            >
 							分享赚
 						</button>
 					</view>
 				</template>
 			</s-goods-item>
 		</view>
-    <s-empty
+		<s-empty v-if="state.pagination.total === 0" icon="/static/goods-empty.png" text="暂无推广商品"></s-empty>
-      v-if="state.pagination.total === 0"
-      icon="/static/goods-empty.png"
-      text="暂无推广商品"
-    ></s-empty>
 		<!-- 加载更多 -->
-    <uni-load-more
+		<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
-      v-if="state.pagination.total > 0"
-      :status="state.loadStatus"
-      :content-text="{
         contentdown: '上拉加载更多',
-      }"
+      }" @tap="loadmore" />
-      @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 {
-  import { computed, reactive } from 'vue';
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import {
+		computed,
+		reactive
+	} from 'vue';
 	import _ from 'lodash';
-  import { showShareModal } from '@/sheep/hooks/useModal';
+	import {
+		showShareModal
+	} from '@/sheep/hooks/useModal';
 
 	const state = reactive({
 		pagination: {
@@ -62,8 +51,7 @@
 	});
 
 	function onShareGoods(goodsInfo) {
-    state.shareInfo = $share.getShareInfo(
+		state.shareInfo = $share.getShareInfo({
-      {
 			title: goodsInfo.title,
 			image: sheep.$url.cdn(goodsInfo.image),
 			desc: goodsInfo.subtitle,
@@ -71,31 +59,29 @@
 				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({
-      list_rows,
+			pageSize: list_rows,
-      page,
+			pageNo: page,
 		});
-    if (res.error === 0) {
+		if (res.code === 0) {
-      let orderList = _.concat(state.pagination.data, res.data.data);
+			let orderList = _.concat(state.pagination.data, res.data.list);
 			state.pagination = {
 				...res.data,
 				data: orderList,
 			};
-      if (state.pagination.current_page < state.pagination.last_page) {
+			if (state.pagination.data.length < state.pagination.total) {
 				state.loadStatus = 'more';
 			} else {
 				state.loadStatus = 'noMore';

pages/commission/order.vue

@@ -1,15 +1,12 @@
 <!-- 分销订单  -->
 <template>
 	<s-layout title="分销订单" :class="state.scrollTop ? 'order-warp' : ''" navbar="inner">
-    <view
+		<view class="header-box" :style="[
-      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">
@@ -76,12 +73,7 @@
 
 		<!-- tab -->
 		<su-sticky bgColor="#fff">
-      <su-tabs
+			<su-tabs :list="tabMaps" :scrollable="false" :current="state.currentTab" @change="onTabsChange">
-        :list="tabMaps"
-        :scrollable="false"
-        :current="state.currentTab"
-        @change="onTabsChange"
-      >
 			</su-tabs>
 		</su-sticky>
 
@@ -103,14 +95,9 @@
 						<view class="order-time">{{ item.create_time }}</view>
 					</view>
 				</view>
-        <s-goods-item
+				<s-goods-item class="border-bottom" :img="item.order_item.goods_image"
-          class="border-bottom"
+					:title="item.order_item.goods_title" :skuText="item.order_item.goods_sku_text"
-          :img="item.order_item.goods_image"
+					:price="item.order_item.goods_price" :num="item.order_item.goods_num">
-          :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">
@@ -128,14 +115,9 @@
 			<s-empty v-if="state.pagination.total === 0" icon="/static/order-empty.png" text="暂无订单">
 			</s-empty>
 			<!-- 加载更多 -->
-      <uni-load-more
+			<uni-load-more v-if="state.pagination.total > 0" :status="state.loadStatus" :content-text="{
-        v-if="state.pagination.total > 0"
-        :status="state.loadStatus"
-        :content-text="{
           contentdown: '上拉加载更多',
-        }"
+        }" @tap="loadmore" />
-        @tap="loadmore"
-      />
 		</view>
 		<!-- </view> -->
 	</s-layout>
@@ -143,10 +125,18 @@
 
 <script setup>
 	import sheep from '@/sheep';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
+	import {
-  import { computed, reactive } from 'vue';
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import {
+		computed,
+		reactive
+	} from 'vue';
 	import _ from 'lodash';
-  import { onPageScroll } from '@dcloudio/uni-app';
+	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');
@@ -171,8 +161,7 @@
 		scrollTop: false,
 	});
 
-  const tabMaps = [
+	const tabMaps = [{
-    {
 			name: '全部',
 			value: 'all',
 		},
@@ -228,7 +217,11 @@
 	}
 
 	async function getAgentInfo() {
-    const { error, data, msg } = await sheep.$api.commission.agent();
+		const {
+			error,
+			data,
+			msg
+		} = await sheep.$api.commission.agent();
 		if (error === 0) {
 			state.agentInfo = data;
 		}
@@ -260,6 +253,7 @@
 		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 {

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

@@ -41,10 +41,11 @@ export default {
 			method: 'GET',
 			params,
 		}),
+
 	// 分销商品
 	goods: (params) =>
 		request({
-      url: 'commission/goods',
+			url: '/app-api/product/spu/page',
 			method: 'GET',
 			params,
 		}),
@@ -62,4 +63,9 @@ export default {
 			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: '领券中心',
+					  title: '领券中心',
-					//   value: '0',
+					  value: '0',
-					//   icon: '/static/img/shop/order/all_coupon.png',
+					  icon: '/static/img/shop/order/all_coupon.png',
-					//   path: '/pages/coupon/list',
+					  path: '/pages/coupon/list',
-					//   type: 'all',
+					  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,9 +3,10 @@
  * 更多微信网页开发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;
 
@@ -13,11 +14,8 @@ export default {
   // 判断是否在微信中
   isWechat() {
     const ua = window.navigator.userAgent.toLowerCase();
-    if (ua.match(/micromessenger/i) == 'micromessenger') {
+    // noinspection EqualityComparisonWithCoercionJS
-      return true;
+    return ua.match(/micromessenger/i) == 'micromessenger';
-    } else {
-      return false;
-    }
   },
 
   isReady(api) {
@@ -31,42 +29,41 @@ export default {
       return;
     }
 
+    // 调用后端接口，获得 JSSDK 初始化所需的签名
     const url = location.href.split('#')[0];
-
+    const { code, data } = await AuthUtil.createWeixinMpJsapiSignature(url);
-    const { error, data } = await third.wechat.jssdk({
+    if (code === 0) {
-      platform: 'officialAccount',
-      payload: encodeURIComponent(
-        JSON.stringify({
-          url,
-        }),
-      ),
-    });
-
-    if (error === 0) {
       jweixin.config({
         debug: false,
         appId: data.appId,
         timestamp: data.timestamp,
         nonceStr: data.nonceStr,
         signature: data.signature,
-        jsApiList: data.jsApiList,
+        jsApiList: ['chooseWXPay'], // TODO 芋艿：后续可以设置更多权限；
-        openTagList: data.openTagList,
+        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: () => {
+        mock: () => {
-          this.offlinePay();
+          this.mockPay();
         }
       },
       WechatMiniProgram: {
@@ -47,8 +47,8 @@ export default class SheepPay {
         wallet: () => {
           this.walletPay();
         },
-        offline: () => {
+        mock: () => {
-          this.offlinePay();
+          this.mockPay();
         }
       },
       App: {
@@ -61,8 +61,8 @@ export default class SheepPay {
         wallet: () => {
           this.walletPay();
         },
-        offline: () => {
+        mock: () => {
-          this.offlinePay();
+          this.mockPay();
         }
       },
       H5: {
@@ -75,8 +75,8 @@ export default class SheepPay {
         wallet: () => {
           this.walletPay();
         },
-        offline: () => {
+        mock: () => {
-          this.offlinePay();
+          this.mockPay();
         }
       },
     };
@@ -182,10 +182,10 @@ export default class SheepPay {
     code === 0 && this.payResult('success');
   }
 
-  // 货到付款  TODO 芋艿：待接入
+  // 模拟支付
-  async offlinePay() {
+  async mockPay() {
-    const { error } = await this.prepay();
+    const { code } = await this.prepay('mock');
-    error === 0 && this.payResult('success');
+    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/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