From 997404dfb49d1e669078519190a7c3a3936793de Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Mon, 28 Apr 2025 21:17:18 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=A4=84=E7=90=86=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=20todo=20=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/commission/wallet.vue    |  2 +-
 pages/commission/withdraw.vue  |  3 +--
 pages/order/aftersale/list.vue |  2 +-
 pages/order/detail.vue         | 44 ++++++++++++++++------------------
 pages/order/list.vue           |  6 ++---
 pages/order/pickUpVerify.vue   |  5 ++--
 pages/user/wallet/score.vue    |  2 +-
 sheep/api/migration/app.js     |  6 ++---
 sheep/api/migration/index.js   |  4 ++--
 sheep/store/app.js             |  2 +-
 sheep/util/const.js            | 37 ++++++++--------------------
 sheep/util/index.js            |  1 +
 12 files changed, 47 insertions(+), 67 deletions(-)

diff --git a/pages/commission/wallet.vue b/pages/commission/wallet.vue
index 4742bea..1f9e6bd 100644
--- a/pages/commission/wallet.vue
+++ b/pages/commission/wallet.vue
@@ -64,7 +64,7 @@
         </uni-datetime-picker>
 
         <view class="total-box">
-          <!-- TODO 芋艿：这里暂时不考虑做 -->
+          <!-- TODO 芋艿：【钱包-可优化】这里暂时不考虑做 -->
           <!-- <view class="ss-m-b-10">总收入￥{{ state.pagination.income.toFixed(2) }}</view> -->
           <!-- <view>总支出￥{{ (-state.pagination.expense).toFixed(2) }}</view> -->
         </view>
diff --git a/pages/commission/withdraw.vue b/pages/commission/withdraw.vue
index a9fd9de..163fe1a 100644
--- a/pages/commission/withdraw.vue
+++ b/pages/commission/withdraw.vue
@@ -78,7 +78,7 @@
             limit="1"
             mode="grid"
             :imageStyles="{ width: '168rpx', height: '168rpx' }"
-            @success="(payload) => state.accountInfo.accountQrCodeUrl = payload.tempFilePaths[0]"
+            @success="(payload) => (state.accountInfo.accountQrCodeUrl = payload.tempFilePaths[0])"
           />
         </view>
       </view>
@@ -206,7 +206,6 @@
   // 提交提现
   const onConfirm = async () => {
     // 参数校验
-    //debugger;
     if (
       !state.accountInfo.price ||
       state.accountInfo.price > state.brokerageInfo.price ||
diff --git a/pages/order/aftersale/list.vue b/pages/order/aftersale/list.vue
index a56b3e0..b8e4285 100644
--- a/pages/order/aftersale/list.vue
+++ b/pages/order/aftersale/list.vue
@@ -85,7 +85,7 @@
     loadStatus: '',
   });
 
-  // TODO 芋艿：优化点，增加筛选
+  // TODO 芋艿：【需要】优化点，增加筛选
   const tabMaps = [
     {
       name: '全部',
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index c9bfcad..f6aad23 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -1,7 +1,6 @@
 <!-- 订单详情 -->
 <template>
   <s-layout title="订单详情" class="index-wrap" navbar="inner">
-    <!-- 订单状态 TODO -->
     <view
       class="state-box ss-flex-col ss-col-center ss-row-right"
       :style="[
@@ -12,37 +11,36 @@
       ]"
     >
       <view class="ss-flex ss-m-t-32 ss-m-b-20">
+        <!-- 待支付 -->
         <image
-          v-if="
-            state.orderInfo.status_code == 'unpaid' ||
-            state.orderInfo.status === 10 || // 待发货
-            state.orderInfo.status_code == 'nocomment'
-          "
+          v-if="state.orderInfo.status === 0"
+          class="state-img"
+          :src="sheep.$url.static('/static/img/shop/order/no_pay.png')"
+        />
+        <!-- 待发货 -->
+        <image
+          v-if="state.orderInfo.status === 10"
           class="state-img"
           :src="sheep.$url.static('/static/img/shop/order/order_loading.png')"
-        >
-        </image>
+        />
+        <!-- 已完成 -->
         <image
-          v-if="
-            state.orderInfo.status_code == 'completed' ||
-            state.orderInfo.status_code == 'refund_agree'
-          "
+          v-else-if="state.orderInfo.status === 30"
           class="state-img"
           :src="sheep.$url.static('/static/img/shop/order/order_success.png')"
-        >
-        </image>
+        />
+        <!-- 已关闭 -->
         <image
-          v-if="state.orderInfo.status_code == 'cancel' || state.orderInfo.status_code == 'closed'"
+          v-else-if="state.orderInfo.status === 40"
           class="state-img"
           :src="sheep.$url.static('/static/img/shop/order/order_close.png')"
-        >
-        </image>
+        />
+        <!-- 已发货 -->
         <image
-          v-if="state.orderInfo.status_code == 'noget'"
+          v-else-if="state.orderInfo.status === 20"
           class="state-img"
           :src="sheep.$url.static('/static/img/shop/order/order_express.png')"
-        >
-        </image>
+        />
         <view class="ss-font-30">{{ formatOrderStatus(state.orderInfo) }}</view>
       </view>
       <view class="ss-font-26 ss-m-x-20 ss-m-b-70">
@@ -331,7 +329,7 @@
   // 确认收货
   async function onConfirm(orderId, ignore = false) {
     // 需开启确认收货组件
-    // todo: 芋艿：待接入微信 https://gitee.com/sheepjs/shopro-uniapp/commit/a6bbba49b84dd418b84c5fefc8b7463df8f4901f
+    // todo: 芋艿：【微信物流】待接入微信 https://gitee.com/sheepjs/shopro-uniapp/commit/a6bbba49b84dd418b84c5fefc8b7463df8f4901f
     // 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
     // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
     let isOpenBusinessView = true;
@@ -406,7 +404,7 @@
     // 对详情数据进行适配
     let res;
     if (state.comeinType === 'wechat') {
-      // TODO 芋艿：微信场景下
+      // TODO 芋艿：【微信物流】微信场景下
       res = await OrderApi.getOrderDetail(id, {
         merchant_trade_no: state.merchantTradeNo,
       });
@@ -439,7 +437,7 @@
     if (options.id) {
       id = options.id;
     }
-    // TODO 芋艿：下面两个变量，后续接入
+    // TODO 芋艿：【微信物流】下面两个变量，后续接入
     state.comeinType = options.comein_type;
     if (state.comeinType === 'wechat') {
       state.merchantTradeNo = options.merchant_trade_no;
diff --git a/pages/order/list.vue b/pages/order/list.vue
index e3d102a..469743e 100644
--- a/pages/order/list.vue
+++ b/pages/order/list.vue
@@ -206,10 +206,10 @@
     });
   }
 
-  // 确认收货 TODO 芋艿：待测试
+  // 确认收货
   async function onConfirm(order, ignore = false) {
     // 需开启确认收货组件
-    // todo: 芋艿：需要后续接入微信收货组件 https://gitee.com/sheepjs/shopro-uniapp/commit/a6bbba49b84dd418b84c5fefc8b7463df8f4901f
+    // todo: 芋艿：【微信物流】需要后续接入微信收货组件 https://gitee.com/sheepjs/shopro-uniapp/commit/a6bbba49b84dd418b84c5fefc8b7463df8f4901f
     // 1.怎么检测是否开启了发货组件功能？如果没有开启的话就不能在这里return出去
     // 2.如果开启了走mpConfirm方法,需要在App.vue的show方法中拿到确认收货结果
     let isOpenBusinessView = true;
@@ -241,7 +241,7 @@
   }
 
   // #ifdef MP-WEIXIN
-  // 小程序确认收货组件 TODO 芋艿：后续再接入
+  // 小程序确认收货组件 TODO 芋艿：【微信物流】后续再接入
   function mpConfirm(order) {
     if (!wx.openBusinessView) {
       sheep.$helper.toast(`请升级微信版本`);
diff --git a/pages/order/pickUpVerify.vue b/pages/order/pickUpVerify.vue
index 28d6a9a..6c36578 100644
--- a/pages/order/pickUpVerify.vue
+++ b/pages/order/pickUpVerify.vue
@@ -18,12 +18,11 @@
       </view>
       <view class="num">{{ orderInfo.pickUpVerifyCode }}</view>
       <view class="rules">
-        <!-- TODO puhui999: 需要后端放回：使用 receiveTime 即可 -->
         <view class="item">
           <view class="rulesTitle flex flex-wrap align-center"> 核销时间 </view>
           <view class="info">
             每日：
-            <text class="time">2020-2-+52</text>
+            <text class="time">{{ systemStore.openingTime }} - {{ systemStore.closingTime }}</text>
           </view>
         </view>
         <view class="item">
@@ -78,7 +77,6 @@
    * 打开地图
    */
   const showMaoLocation = () => {
-    console.log(props.systemStore);
     if (!props.systemStore.latitude || !props.systemStore.longitude) {
       sheep.$helper.toast('缺少经纬度信息无法查看地图!');
       return;
@@ -91,6 +89,7 @@
       address: props.systemStore.areaName + props.systemStore.detailAddress,
     });
   };
+
   /**
    * 拨打电话
    */
diff --git a/pages/user/wallet/score.vue b/pages/user/wallet/score.vue
index 8e48b02..e480981 100644
--- a/pages/user/wallet/score.vue
+++ b/pages/user/wallet/score.vue
@@ -36,7 +36,7 @@
           </button>
         </uni-datetime-picker>
 
-        <!-- TODO 芋艿：【钱包】可优化 -->
+        <!-- TODO 芋艿：【钱包-可优化】展示一下 -->
         <!--				<view class="total-box">-->
         <!--					<view class="ss-m-b-10">总收入￥{{ state.pagination.income }}</view>-->
         <!--					<view>总支出￥{{ -state.pagination.expense }}</view>-->
diff --git a/sheep/api/migration/app.js b/sheep/api/migration/app.js
index 158414f..bea2e56 100644
--- a/sheep/api/migration/app.js
+++ b/sheep/api/migration/app.js
@@ -1,6 +1,6 @@
 import request from '@/sheep/request';
 
-// TODO 芋艿：小程序直播还不支持
+// TODO 芋艿：【直播】小程序直播还不支持
 export default {
   //小程序直播
   mplive: {
@@ -10,12 +10,12 @@ export default {
         method: 'GET',
         params: {
           ids: ids.join(','),
-        }
+        },
       }),
     getMpLink: () =>
       request({
         url: 'app/mplive/getMpLink',
-        method: 'GET'
+        method: 'GET',
       }),
   },
 };
diff --git a/sheep/api/migration/index.js b/sheep/api/migration/index.js
index 31a85ef..ac436e8 100644
--- a/sheep/api/migration/index.js
+++ b/sheep/api/migration/index.js
@@ -6,5 +6,5 @@ Object.keys(files).forEach((key) => {
     [key.replace(/(.*\/)*([^.]+).*/gi, '$2')]: files[key].default,
   };
 });
-
-export default api;
\ No newline at end of file
+// TODO @芋艿：要不要删除
+export default api;
diff --git a/sheep/store/app.js b/sheep/store/app.js
index 451450e..c7c4acb 100644
--- a/sheep/store/app.js
+++ b/sheep/store/app.js
@@ -63,7 +63,7 @@ const app = defineStore({
       // 加载装修配置
       await adaptTemplate(this.template, templateId);
 
-      // TODO 芋艿：未来支持管理后台可配；对应 https://api.shopro.sheepjs.com/shop/api/init
+      // TODO 芋艿：【初始化优化】未来支持管理后台可配；对应 https://api.shopro.sheepjs.com/shop/api/init
       if (true) {
         this.info = {
           name: '芋道商城',
diff --git a/sheep/util/const.js b/sheep/util/const.js
index 90ddce3..d58f438 100644
--- a/sheep/util/const.js
+++ b/sheep/util/const.js
@@ -63,25 +63,6 @@ export const CouponTemplateValidityTypeEnum = {
   },
 };
 
-/**
- * 营销的商品范围枚举
- */
-export const PromotionProductScopeEnum = {
-  ALL: {
-    scope: 1,
-    name: '通用劵',
-  },
-  SPU: {
-    scope: 2,
-    name: '商品劵',
-  },
-  CATEGORY: {
-    scope: 3,
-    name: '品类劵',
-  },
-};
-
-
 // 时间段的状态枚举
 export const TimeStatusEnum = {
   WAIT_START: '即将开始',
@@ -142,31 +123,33 @@ export const SharePageEnum = {
   HOME: {
     name: '首页',
     page: '/pages/index/index',
-    value: '1'
+    value: '1',
   },
   GOODS: {
     name: '普通商品页',
     page: '/pages/goods/index',
-    value: '2'
+    value: '2',
   },
   GROUPON: {
     name: '拼团商品页',
     page: '/pages/goods/groupon',
-    value: '3'
+    value: '3',
   },
   SECKILL: {
     name: '秒杀商品页',
     page: '/pages/goods/seckill',
-    value: '4'
+    value: '4',
   },
   GROUPON_DETAIL: {
     name: '参与拼团页',
     page: '/pages/activity/groupon/detail',
-    value: '5'
+    value: '5',
   },
   POINT: {
     name: '积分商品页',
     page: '/pages/goods/point',
-    value: '6'
-  }
-}
+    value: '6',
+  },
+};
+
+// TODO @芋艿：融合下；
diff --git a/sheep/util/index.js b/sheep/util/index.js
index 85d43bc..87071bb 100644
--- a/sheep/util/index.js
+++ b/sheep/util/index.js
@@ -136,3 +136,4 @@ export function jsonParse(str) {
     return str;
   }
 }
+// TODO @芋艿：融合下；