From ba91746cde72d6e49b161c87d784707c488f2d9a Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Sat, 14 Sep 2024 15:48:57 +0800
Subject: [PATCH] =?UTF-8?q?Feat=EF=BC=9A=E6=88=91=E7=9A=84=E8=B6=B3?=
 =?UTF-8?q?=E8=BF=B9=E9=A1=B5=E9=9D=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/user.js                  |   9 +++
 pages.json                   |   7 ++
 pages/user/History/index.vue | 147 +++++++++++++++++++++++++++++++++++
 pages/user/User/index.vue    |   7 +-
 4 files changed, 166 insertions(+), 4 deletions(-)
 create mode 100644 pages/user/History/index.vue

diff --git a/api/user.js b/api/user.js
index 62e18f0..059e450 100644
--- a/api/user.js
+++ b/api/user.js
@@ -568,3 +568,12 @@ export function getUserPointBill(param) {
 export function getUserSpreadRule(param) {
     return request.get('/userSpreadRule', param, { login: false })
 }
+
+/**
+ * 我的足迹
+ * @param {*} params 
+ * @returns 
+ */
+export function getHistory(params) {
+    return request.get('/history/list', params)
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index eae0767..72a2733 100644
--- a/pages.json
+++ b/pages.json
@@ -208,6 +208,13 @@
         "navigationBarBackgroundColor": "#FFFFFF"
       }
     },
+    {
+      "path": "pages/user/History/index",
+      "style": {
+        "navigationBarTitleText": "商品足迹",
+        "navigationBarBackgroundColor": "#FFFFFF"
+      }
+    },
     {
       "path": "pages/user/UserBill/index",
       "style": {
diff --git a/pages/user/History/index.vue b/pages/user/History/index.vue
new file mode 100644
index 0000000..11ed76c
--- /dev/null
+++ b/pages/user/History/index.vue
@@ -0,0 +1,147 @@
+<template>
+  <view>
+    <view class="v12-justify-around v12-pa-2 v12-white">
+      <view v-for="(day, i) in currentWeek" :key="i" class="v12-font-26">
+        <view style="color:#BCBCBC" class="day-wrap">{{ getDate(day) }}</view>
+        <view class="v12-dark-text day-wrap" :class="{'active': actived === i}">{{ getDay(day) }}</view>
+      </view>
+    </view>
+    <view class="v12-mt-3 v12-px-3 " v-for="(item, index) in items" :key="index">
+      <view>
+        <text class="v12-font-bold v12-font-32">{{ item.historyDate }}</text>
+        <view class="wrapper">
+          <view @click="goodsDetail(ite)" v-for="(ite, key) in item.histories" :key="key" class="v12-white v12-radius-20 v12-pa-2 history-card">
+            <view>
+              <image class="goods-img" :src="ite.image" mode="scaleToFill"></image>
+            </view>
+            <view :style="{opacity: !ite.couponName ? 0 : 1}" class="v12-align-center  v12-mt-2">
+              <view class="v12-primary-text v12-primary-border v12-radius-6 v12-font-22 v12-px-1">券</view>
+              <view class="v12-primary-text v12-primary-border v12-radius-6 v12-font-22 v12-px-1">{{ ite.couponName }}</view>
+            </view>
+            <view class="v12-justify-between v12-mt-2">
+              <view class="v12-font-bold v12-primary-text">
+                <text class="v12-font-16">￥</text>
+                <text class="v12-font-24">{{ ite.price }}</text>
+              </view>
+              <view class="">
+                <image class="logo" :src="webUrl+'/orderIcon/组 355.png'" mode="" style="margin-right:0; width: 28rpx; height:28rpx"/>
+              </view>
+            </view>
+          </view>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { getHistory } from '@/api/user'
+export default {
+  data() {
+    return {
+      currentWeek: [],
+      actived: 0,
+      webUrl: this.$VUE_APP_RESOURCES_URL,
+      items: []
+    }
+  },
+  onLoad() {
+    this.queryHistory()
+  },
+  mounted() {
+    this.currentWeek = this.getWeek()
+    this.getActived()
+  },
+  methods: {
+    getActived() {
+      const weekMap = this.currentWeek.map(e => new Date(e).getDay())
+      const today = new Date().getDay()
+      return weekMap.indexOf(today)
+    },
+    getWeek() {
+      let dates = [];
+      let now = new Date();
+      let dayOfWeek = now.getDay(); // 0-6, 0是周日
+      let numDate = now.getDate(); // 当前日
+      let numDaysToMonday = dayOfWeek ? dayOfWeek - 1 : 6;
+    
+      // 得到本周周一的日期
+      let monday = new Date(now);
+      monday.setDate(numDate - numDaysToMonday);
+    
+      // 生成本周剩余的日期
+      for (let i = 0; i < 7; i++) {
+        dates.push(new Date(monday).toISOString().slice(0, 10));
+        monday.setDate(monday.getDate() + 1);
+      }
+    
+      return dates;
+    },
+    getDay(date) {
+      return new Date(date).getDate()
+    },
+    getDate(date) {
+      const dateMap = {
+        1: '一',
+        2: '二',
+        3: '三',
+        4: '四',
+        5: '五',
+        6: '六',
+        0: '日'
+      }
+      const d = new Date(date).getDay()
+      return dateMap[d]
+    },
+    handle(day, i) {
+      this.actived = i
+      
+    },
+    goodsDetail (item) {
+      this.$yrouter.push({
+        path: '/pages/shop/GoodsCon/index',
+        query: {
+          id: item.productId
+        }
+      })
+    },
+    queryHistory() {
+      getHistory().then(res => {
+        this.items = res.data
+      })
+    }
+    
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.wrapper{
+  display: flex;
+  flex-wrap: wrap;
+  align-content: space-around !important;
+}
+.goods-img{
+  width: 168rpx;
+  height: 168rpx;
+  border-radius: 8rpx;
+  margin-right: 8rpx;
+}
+.history-card{
+  width: 178rpx;
+  margin-top: 16rpx;
+  margin-right: 16rpx;
+}
+.active{
+  background: #C52733;
+  color: #fff !important;
+}
+.day-wrap{
+  width: 40rpx;
+  height: 40rpx;
+  line-height: 40rpx;
+  text-align: center;
+  border-radius: 50%;
+}
+
+</style>
\ No newline at end of file
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index 7be31c8..b0cdab1 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -333,11 +333,10 @@ export default {
           allowEnter: true
         },
         {
-          text: '帮助中心',
-          url: '',
+          text: '商品足迹',
+          url: '/pages/user/History/index',
           icon: '/icon/icon-help.png',
-          allowEnter: true,
-          showTip: true
+          allowEnter: true
         },
         {
           text: '设置中心',