From cb982c28833f716dc8a9426238e0dca9c0301039 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?lemon=E6=A9=AA?= <17633066053@163.com>
Date: Fri, 27 Aug 2021 14:11:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A0=8D=E4=BB=B7=E6=B4=BB=E5=8A=A8=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/promotions.js                   |  13 ++-
 pages.json                          |   5 ++
 pages/promotion/bargain/detail.vue  |  19 +++-
 pages/promotion/bargain/list.vue    |  11 ++-
 pages/promotion/bargain/log.vue     | 133 ++++++++++++++++++++++++++++
 pages/promotion/point/pointList.vue |   6 +-
 pages/tabbar/user/utils/tool.vue    |   4 +
 static/mine/kanjia.png              | Bin 0 -> 2317 bytes
 8 files changed, 180 insertions(+), 11 deletions(-)
 create mode 100644 pages/promotion/bargain/log.vue
 create mode 100644 static/mine/kanjia.png

diff --git a/api/promotions.js b/api/promotions.js
index 565e859..6d59101 100644
--- a/api/promotions.js
+++ b/api/promotions.js
@@ -163,12 +163,17 @@ export function getBargainLog(params) {
   });
 }
 
+
+
 /**
- * 分页获取砍价活动-帮砍记录
+ * 分页获取已参与的砍价活动
  */
-export function helpBargain(kanJiaActivityId) {
+export function getMineBargainLog(params) {
   return http.request({
-    url: `promotion/kanjiaGoods/help/${kanJiaActivityId}`,
-    method: Method.POST,
+    url: `/promotion/kanjiaGoods/kanjiaActivity/mine/`,
+    method: Method.GET,
+    params
   });
 }
+
+
diff --git a/pages.json b/pages.json
index c0a7383..8e52682 100644
--- a/pages.json
+++ b/pages.json
@@ -503,6 +503,11 @@
 						"navigationBarTextStyle": "white"
 
 					}
+				},{
+					"path": "bargain/log",
+					"style": {
+						"navigationBarTitleText": "砍价记录"
+					}
 				},{
 					"path": "point/detail",
 					"style": {
diff --git a/pages/promotion/bargain/detail.vue b/pages/promotion/bargain/detail.vue
index 6c692fa..beef97c 100644
--- a/pages/promotion/bargain/detail.vue
+++ b/pages/promotion/bargain/detail.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="page">
-    <u-navbar back-icon-color="#fff" :background="background" :border-bottom="false" title=""></u-navbar>
+    <u-navbar :custom-back="back" back-icon-color="#fff" :background="background" :border-bottom="false" title="">
+    </u-navbar>
 
     <div class="wrapper">
       <!-- 砍价列表 -->
@@ -43,7 +44,8 @@
             立即购买
           </div>
           <!-- 我要开团 -->
-          <div class="start" v-if="activityData.memberId != $options.filters.isLogin().id"  @click="startOpenGroup">我要开团</div>
+          <div class="start" v-if="activityData.memberId != $options.filters.isLogin().id" @click="startOpenGroup">我要开团
+          </div>
         </div>
       </div>
       <!-- 帮砍列表 -->
@@ -207,6 +209,18 @@ export default {
     },
   },
   methods: {
+    // 返回上一级
+    back() {
+      // 进行路由栈判定如果当前路由栈是空的就返回拼团列表页面
+      if (getCurrentPages().length > 1) {
+        uni.navigateBack();
+      } else {
+        uni.redirectTo({
+          url: `/pages/promotion/bargain/list`,
+        });
+      }
+    },
+    
     // 跳转选择商品页面
     startOpenGroup() {
       uni.redirectTo({
@@ -232,6 +246,7 @@ export default {
       });
       this.$refs.popupGoods.buy({
         skuId: this.bargainDetail.id,
+        id: this.routerVal.id,
         num: 1,
         cartType: "KANJIA",
       });
diff --git a/pages/promotion/bargain/list.vue b/pages/promotion/bargain/list.vue
index a902ec8..1104af4 100644
--- a/pages/promotion/bargain/list.vue
+++ b/pages/promotion/bargain/list.vue
@@ -1,9 +1,11 @@
 <template>
   <div class="page">
-    <u-navbar back-icon-color="#fff" :background="background" :border-bottom="false" title=""></u-navbar>
+    <u-navbar :custom-back="back" back-icon-color="#fff" :background="background" :border-bottom="false" title="">
+    </u-navbar>
     <div class="wrapper">
       <!-- 砍价列表 -->
       <div class="box">
+        <!-- 已砍的商品 -->
         <div class="bargain" v-if="bargainList.length!=0">
           <div class="flex bargain-item" v-for="(item,index) in bargainList" :key="index">
             <div class="goods-img">
@@ -54,6 +56,12 @@ export default {
     this.init();
   },
   methods: {
+    // 返回上一级
+    back() {
+      uni.switchTab({
+        url:"/pages/tabbar/home/index"
+      });
+    },
     /**
      * 初始化砍价列表
      */
@@ -100,7 +108,6 @@ page {
 }
 .bargain-item {
   align-items: center;
-
   border-bottom: 1rpx solid #f6f6f6;
   padding: 32rpx 0;
 }
diff --git a/pages/promotion/bargain/log.vue b/pages/promotion/bargain/log.vue
new file mode 100644
index 0000000..e5f49e9
--- /dev/null
+++ b/pages/promotion/bargain/log.vue
@@ -0,0 +1,133 @@
+<template>
+  <div class="box">
+    <div v-if="bargainLog.length != 0">
+      <div v-for="(item,index) in bargainLog" class="flex" :key="index">
+        <div>
+          <u-image width='250' height="250" :src="item.thumbnail"></u-image>
+        </div>
+        <div class="goods">
+          <div class="wes-2">
+            {{item.goodsName}}
+          </div>
+          <div>
+            还剩<span class="surplusPrice">{{item.surplusPrice | unitPrice}}元</span>
+          </div>
+
+          <div @click="navigateToBargainDetail(item)" v-if="item.status == 'START'" class="buy">
+            继续免费领
+          </div>
+        </div>
+        <div class="tips-box">
+          <div class="tips" :class="[item.status]">
+            {{statusWay[item.status]}}
+          </div>
+        </div>
+      </div>
+    </div>
+    <div v-else>
+      <u-empty text="暂无砍价活动"></u-empty>
+    </div>
+  </div>
+</template>
+
+<script>
+import { getMineBargainLog } from "@/api/promotions";
+export default {
+  data() {
+    return {
+      params: {
+        pageNumber: 1,
+        pageSize: 10,
+      },
+      bargainLog: [],
+      statusWay: {
+        START: "砍价开始",
+        FAIL: "砍价失败",
+        SUCCESS: "砍价成功",
+        END: "活动结束",
+      },
+    };
+  },
+  onReachBottom() {
+    this.params.pageNumber++;
+    this.init();
+  },
+  onShow() {
+    this.params.pageNumber = 1;
+    this.bargainLog = [];
+    this.init();
+  },
+  methods: {
+    // 初始化砍价记录
+    async init() {
+      let res = await getMineBargainLog(this.params);
+      if (res.data.success) {
+        this.bargainLog.push(...res.data.result.records);
+      }
+    },
+    // 跳转到砍价详情
+    navigateToBargainDetail(val) {
+      uni.navigateTo({
+        url: `/pages/promotion/bargain/detail?id=${val.kanjiaActivityGoodsId}`,
+      });
+    },
+  },
+};
+</script>
+<style scoped>
+page {
+  background: #fff;
+}
+</style>
+<style scoped lang="scss">
+.box {
+  padding: 32rpx;
+  background: #fff;
+}
+.buy {
+  background: $light-color;
+  color: #fff;
+  display: inline;
+  padding: 10rpx 0;
+  border-radius: 100rpx;
+  width: 200rpx;
+  text-align: center;
+  font-size: 24rpx;
+  margin-top: 20rpx;
+}
+.tips-box {
+  flex: 1;
+  justify-content: center;
+  display: flex;
+  align-items: center;
+}
+.tips {
+  color: #999;
+
+  margin-top: 20rpx;
+}
+.surplusPrice {
+  font-size: 40rpx;
+  margin-left: 10rpx;
+  font-weight: bold;
+  color: $light-color;
+}
+.goods {
+  display: flex;
+  flex: 2;
+  flex-direction: column;
+  justify-content: center;
+}
+.SUCCESS {
+  color: $light-color;
+}
+.START {
+  color: $aider-light-color;
+}
+.END {
+  color: #999;
+}
+.FAIL {
+  color: $main-color;
+}
+</style>
\ No newline at end of file
diff --git a/pages/promotion/point/pointList.vue b/pages/promotion/point/pointList.vue
index 5cf49dd..f954d52 100644
--- a/pages/promotion/point/pointList.vue
+++ b/pages/promotion/point/pointList.vue
@@ -4,7 +4,8 @@
     <view class="index-head">
       <scroll-view scroll-x class="list-scroll-content" :scroll-left="currentLeft" scroll-with-animation>
         <view class="index-head-navs">
-          <view class="index-head-nav" v-for="(ele, index) in categoryIndexData" :key="index" :class="{ 'index-head-nav-active': tabIndex == index }" @click="setCat(index)">
+          <view class="index-head-nav" v-for="(ele, index) in categoryIndexData" :key="index"
+            :class="{ 'index-head-nav-active': tabIndex == index }" @click="setCat(index)">
             {{ ele.name }}
           </view>
         </view>
@@ -23,7 +24,7 @@
                 </u-image>
                 <view class="index-item-title">{{ item.goodsSku.goodsName }}</view>
                 <view class="index-item-price">
-                  {{ item.points | unitPrice }}积分
+                  {{ item.points }}积分
                   <span class="tipsMkt">¥{{ item.goodsSku.price | unitPrice }}</span>
                 </view>
               </view>
@@ -264,7 +265,6 @@ page {
 }
 
 .index-head-nav {
-  width: 100rpx;
   padding-bottom: 8rpx;
   margin: 20rpx;
   text-align: center;
diff --git a/pages/tabbar/user/utils/tool.vue b/pages/tabbar/user/utils/tool.vue
index 7f17354..1e93b1b 100644
--- a/pages/tabbar/user/utils/tool.vue
+++ b/pages/tabbar/user/utils/tool.vue
@@ -54,6 +54,10 @@
             <image src="/static/mine/distribution.png" mode=""></image>
             <view>我的分销</view>
           </view>
+          <view class="interact-item" @click="navigateTo('/pages/promotion/bargain/log')">
+            <image src="/static/mine/kanjia.png" mode=""></image>
+            <view>砍价记录</view>
+          </view>
         </view>
       </div>
     </view>
diff --git a/static/mine/kanjia.png b/static/mine/kanjia.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e4531e212fe8a7f032176593cc1459f6d90807a
GIT binary patch
literal 2317
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

literal 0
HcmV?d00001