From 51c552fb72f7f3a861826f1d6d65bee1f841705b Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Tue, 19 Dec 2023 23:10:50 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=93=96=20code=20review=EF=BC=9A=E5=BA=97?=
 =?UTF-8?q?=E9=93=BA=E8=A3=85=E4=BF=AE=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                                       | 65 +++++++++----------
 pages/pay/recharge.vue                        |  2 +-
 pages/user/wallet/score.vue                   |  9 +--
 sheep/api/app.js                              | 13 ----
 .../s-coupon-block/s-coupon-block.vue         |  2 +-
 .../s-coupon-card/s-coupon-card.vue           | 15 +++--
 .../s-custom-navbar/s-custom-navbar.vue       |  1 +
 .../components/s-float-menu/s-float-menu.vue  |  1 +
 .../components/s-goods-card/s-goods-card.vue  |  1 +
 .../s-goods-shelves/s-goods-shelves.vue       |  7 +-
 .../s-hotzone-block/s-hotzone-block.vue       |  1 +
 .../s-image-banner/s-image-banner.vue         |  1 +
 .../s-image-block/s-image-block.vue           |  3 +-
 .../components/s-image-cube/s-image-cube.vue  |  1 +
 .../components/s-line-block/s-line-block.vue  |  1 +
 .../s-menu-button/s-menu-button.vue           |  1 +
 sheep/components/s-menu-grid/s-menu-grid.vue  |  1 +
 sheep/components/s-menu-list/s-menu-list.vue  |  1 +
 .../components/s-order-card/s-order-card.vue  |  1 +
 .../s-richtext-block/s-richtext-block.vue     |  4 ++
 .../s-title-block/s-title-block.vue           |  2 +-
 sheep/components/s-user-card/s-user-card.vue  |  4 +-
 .../s-video-block/s-video-block.vue           |  2 +-
 .../s-wallet-card/s-wallet-card.vue           |  1 +
 sheep/index.js                                |  3 +-
 sheep/platform/pay.js                         | 26 ++++----
 sheep/ui/su-navbar/su-navbar.vue              |  1 +
 sheep/ui/su-notice-bar/su-notice-bar.vue      |  1 +
 sheep/ui/su-tabbar-item/su-tabbar-item.vue    |  1 +
 sheep/ui/su-tabbar/su-tabbar.vue              |  1 +
 30 files changed, 86 insertions(+), 87 deletions(-)

diff --git a/App.vue b/App.vue
index b9ecc033..9f8b1f5c 100644
--- a/App.vue
+++ b/App.vue
@@ -1,46 +1,39 @@
 <script setup>
-	import {
-		onLaunch,
-		onShow,
-		onError
-	} from '@dcloudio/uni-app';
-	import {
-		ShoproInit
-	} from './sheep';
+  import { onLaunch, onShow, onError } from '@dcloudio/uni-app';
+  import { ShoproInit } from './sheep';
 
-	onLaunch(() => {
-		// 隐藏原生导航栏 使用自定义底部导航
-		uni.hideTabBar();
+  onLaunch(() => {
+    // 隐藏原生导航栏 使用自定义底部导航
+    uni.hideTabBar();
 
-		// 加载Shopro底层依赖
-		ShoproInit();
-	});
+    // 加载Shopro底层依赖
+    ShoproInit();
+  });
 
-	onError((err) => {
-		console.log('AppOnError:', err);
-	});
+  onError((err) => {
+    console.log('AppOnError:', err);
+  });
 
-	onShow((options) => {
-		// #ifdef APP-PLUS 
-		// 获取urlSchemes参数
-		const args = plus.runtime.arguments;
-		if (args) {}
+  onShow((options) => {
+    // #ifdef APP-PLUS
+    // 获取urlSchemes参数
+    const args = plus.runtime.arguments;
+    if (args) {
+    }
 
-		// 获取剪贴板 
-		uni.getClipboardData({
-			success: (res) => {},
-		});
-		// #endif
+    // 获取剪贴板
+    uni.getClipboardData({
+      success: (res) => { },
+    });
+    // #endif
 
-		// #ifdef MP-WEIXIN
-		// 确认收货回调结果 
-		console.log(options, 'options');
-		// #endif
-
-
-	});
+    // #ifdef MP-WEIXIN
+    // 确认收货回调结果
+    console.log(options,'options');
+    // #endif
+  });
 </script>
 
 <style lang="scss">
-	@import '@/sheep/scss/index.scss';
-</style>
\ No newline at end of file
+  @import '@/sheep/scss/index.scss';
+</style>
diff --git a/pages/pay/recharge.vue b/pages/pay/recharge.vue
index 15edc233..32c27232 100644
--- a/pages/pay/recharge.vue
+++ b/pages/pay/recharge.vue
@@ -85,7 +85,7 @@
     // #endif
     sheep.$router.go('/pages/pay/index', {
       id: data.payOrderId,
-      type: 'recharge'
+      orderType: 'recharge'
     });
 	}
 
diff --git a/pages/user/wallet/score.vue b/pages/user/wallet/score.vue
index fc75d75a..335bc81a 100644
--- a/pages/user/wallet/score.vue
+++ b/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);
diff --git a/sheep/api/app.js b/sheep/api/app.js
index a456039a..05081248 100644
--- a/sheep/api/app.js
+++ b/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({
diff --git a/sheep/components/s-coupon-block/s-coupon-block.vue b/sheep/components/s-coupon-block/s-coupon-block.vue
index af29c097..22a7731f 100644
--- a/sheep/components/s-coupon-block/s-coupon-block.vue
+++ b/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">
diff --git a/sheep/components/s-coupon-card/s-coupon-card.vue b/sheep/components/s-coupon-card/s-coupon-card.vue
index 5be18c85..bd5705bb 100644
--- a/sheep/components/s-coupon-card/s-coupon-card.vue
+++ b/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',
+					},
 				];
 			},
 		},
diff --git a/sheep/components/s-custom-navbar/s-custom-navbar.vue b/sheep/components/s-custom-navbar/s-custom-navbar.vue
index 789d2d29..6b86339c 100644
--- a/sheep/components/s-custom-navbar/s-custom-navbar.vue
+++ b/sheep/components/s-custom-navbar/s-custom-navbar.vue
@@ -1,3 +1,4 @@
+<!-- 顶部导航栏 -->
 <template>
   <navbar
     :alway="isAlway"
diff --git a/sheep/components/s-float-menu/s-float-menu.vue b/sheep/components/s-float-menu/s-float-menu.vue
index ac0339ed..b53db008 100644
--- a/sheep/components/s-float-menu/s-float-menu.vue
+++ b/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>
diff --git a/sheep/components/s-goods-card/s-goods-card.vue b/sheep/components/s-goods-card/s-goods-card.vue
index b51706f7..59f2bf10 100644
--- a/sheep/components/s-goods-card/s-goods-card.vue
+++ b/sheep/components/s-goods-card/s-goods-card.vue
@@ -1,3 +1,4 @@
+<!-- 装修商品组件：商品卡片 -->
 <template>
   <!-- 商品卡片 -->
   <view>
diff --git a/sheep/components/s-goods-shelves/s-goods-shelves.vue b/sheep/components/s-goods-shelves/s-goods-shelves.vue
index 01129a33..e2ce60a9 100644
--- a/sheep/components/s-goods-shelves/s-goods-shelves.vue
+++ b/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>
diff --git a/sheep/components/s-hotzone-block/s-hotzone-block.vue b/sheep/components/s-hotzone-block/s-hotzone-block.vue
index 983ceb74..246d6d47 100644
--- a/sheep/components/s-hotzone-block/s-hotzone-block.vue
+++ b/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>
diff --git a/sheep/components/s-image-banner/s-image-banner.vue b/sheep/components/s-image-banner/s-image-banner.vue
index 64feffd4..478e7af7 100644
--- a/sheep/components/s-image-banner/s-image-banner.vue
+++ b/sheep/components/s-image-banner/s-image-banner.vue
@@ -1,3 +1,4 @@
+<!-- 装修图文组件：图片轮播 -->
 <template>
   <su-swiper
     :list="imgList"
diff --git a/sheep/components/s-image-block/s-image-block.vue b/sheep/components/s-image-block/s-image-block.vue
index ff9348ca..c898749e 100644
--- a/sheep/components/s-image-block/s-image-block.vue
+++ b/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>
 
diff --git a/sheep/components/s-image-cube/s-image-cube.vue b/sheep/components/s-image-cube/s-image-cube.vue
index a56669fa..9794d8f1 100644
--- a/sheep/components/s-image-cube/s-image-cube.vue
+++ b/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">
diff --git a/sheep/components/s-line-block/s-line-block.vue b/sheep/components/s-line-block/s-line-block.vue
index 97e14f59..c0628f97 100644
--- a/sheep/components/s-line-block/s-line-block.vue
+++ b/sheep/components/s-line-block/s-line-block.vue
@@ -1,3 +1,4 @@
+<!-- 装修基础组件：分割线 -->
 <template>
   <su-subline v-bind="data"></su-subline>
 </template>
diff --git a/sheep/components/s-menu-button/s-menu-button.vue b/sheep/components/s-menu-button/s-menu-button.vue
index 110c492f..375a5913 100644
--- a/sheep/components/s-menu-button/s-menu-button.vue
+++ b/sheep/components/s-menu-button/s-menu-button.vue
@@ -1,3 +1,4 @@
+<!-- 装修基础组件：菜单导航（金刚区） -->
 <template>
   <!-- 包裹层 -->
   <view
diff --git a/sheep/components/s-menu-grid/s-menu-grid.vue b/sheep/components/s-menu-grid/s-menu-grid.vue
index 3cf62485..518d6edf 100644
--- a/sheep/components/s-menu-grid/s-menu-grid.vue
+++ b/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
diff --git a/sheep/components/s-menu-list/s-menu-list.vue b/sheep/components/s-menu-list/s-menu-list.vue
index 652df903..ecbb396f 100644
--- a/sheep/components/s-menu-list/s-menu-list.vue
+++ b/sheep/components/s-menu-list/s-menu-list.vue
@@ -1,3 +1,4 @@
+<!-- 装修基础组件：列表导航 -->
 <template>
   <view class="menu-list-wrap">
     <uni-list :border="true">
diff --git a/sheep/components/s-order-card/s-order-card.vue b/sheep/components/s-order-card/s-order-card.vue
index 8ed36473..a5f0eb08 100644
--- a/sheep/components/s-order-card/s-order-card.vue
+++ b/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
diff --git a/sheep/components/s-richtext-block/s-richtext-block.vue b/sheep/components/s-richtext-block/s-richtext-block.vue
index 86f801db..4daa2647 100644
--- a/sheep/components/s-richtext-block/s-richtext-block.vue
+++ b/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;
diff --git a/sheep/components/s-title-block/s-title-block.vue b/sheep/components/s-title-block/s-title-block.vue
index 09b0bcd7..513a3cc0 100644
--- a/sheep/components/s-title-block/s-title-block.vue
+++ b/sheep/components/s-title-block/s-title-block.vue
@@ -1,4 +1,4 @@
-<!-- 页面 -->
+<!-- 装修商品组件：标题栏 -->
 <template>
   <view
     class="ss-title-wrap ss-flex ss-col-center"
diff --git a/sheep/components/s-user-card/s-user-card.vue b/sheep/components/s-user-card/s-user-card.vue
index 2f007591..b3188491 100644
--- a/sheep/components/s-user-card/s-user-card.vue
+++ b/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"
diff --git a/sheep/components/s-video-block/s-video-block.vue b/sheep/components/s-video-block/s-video-block.vue
index 7a659ad8..38e5b841 100644
--- a/sheep/components/s-video-block/s-video-block.vue
+++ b/sheep/components/s-video-block/s-video-block.vue
@@ -1,4 +1,4 @@
-<!--  -->
+<!-- 装修图文组件：视频播放 -->
 <template>
   <su-video
     class="sss"
diff --git a/sheep/components/s-wallet-card/s-wallet-card.vue b/sheep/components/s-wallet-card/s-wallet-card.vue
index aa0f1ad0..ecb099b8 100644
--- a/sheep/components/s-wallet-card/s-wallet-card.vue
+++ b/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">
diff --git a/sheep/index.js b/sheep/index.js
index 26e160e6..2361ab74 100644
--- a/sheep/index.js
+++ b/sheep/index.js
@@ -46,8 +46,9 @@ function ShoproDebug() {
   // });
   // #endif
 
+  // TODO 芋艿：可以打印路由
   // 同步前端页面到后端
-  $api.app.pageSync(ROUTES);
+  // console.log(ROUTES)
 }
 
 export default sheep;
diff --git a/sheep/platform/pay.js b/sheep/platform/pay.js
index a23dcc61..e33797bb 100644
--- a/sheep/platform/pay.js
+++ b/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 芋艿：待接入
diff --git a/sheep/ui/su-navbar/su-navbar.vue b/sheep/ui/su-navbar/su-navbar.vue
index 0c8eee9b..af96f248 100644
--- a/sheep/ui/su-navbar/su-navbar.vue
+++ b/sheep/ui/su-navbar/su-navbar.vue
@@ -1,3 +1,4 @@
+<!-- 自定义导航栏 -->
 <template>
   <view class="uni-navbar" :class="{ 'uni-dark': dark }">
     <view
diff --git a/sheep/ui/su-notice-bar/su-notice-bar.vue b/sheep/ui/su-notice-bar/su-notice-bar.vue
index 448b442d..fc5075a5 100644
--- a/sheep/ui/su-notice-bar/su-notice-bar.vue
+++ b/sheep/ui/su-notice-bar/su-notice-bar.vue
@@ -1,3 +1,4 @@
+<!-- 公告栏组件 -->
 <template>
   <view
     v-if="show"
diff --git a/sheep/ui/su-tabbar-item/su-tabbar-item.vue b/sheep/ui/su-tabbar-item/su-tabbar-item.vue
index 2fc5696f..cc55ac1e 100644
--- a/sheep/ui/su-tabbar-item/su-tabbar-item.vue
+++ b/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">
diff --git a/sheep/ui/su-tabbar/su-tabbar.vue b/sheep/ui/su-tabbar/su-tabbar.vue
index 3b6d2459..92e03526 100644
--- a/sheep/ui/su-tabbar/su-tabbar.vue
+++ b/sheep/ui/su-tabbar/su-tabbar.vue
@@ -1,3 +1,4 @@
+<!-- 底部导航栏 -->
 <template>
   <view class="u-tabbar">
     <view