['我的资产-我的足迹']

.gitignore

@@ -1 +1 @@
-./unpackage
+unpackage

apis/interfaces/mine.js

@@ -54,6 +54,17 @@ const chaineb = (data) => {
   })
 }
 
+// 我的足迹
+const browsers = (page) => {
+  return request({
+    url: 'mall/goods/browsers',
+    method: 'get',
+    data: {
+      page:page
+    }
+  })
+}
+
 
 export {
   shopSubscribe,
@@ -61,5 +72,6 @@ export {
   aboutUs,
   getUserInfo,
   getUserSettingInfo,
-  chaineb
+  chaineb,
+  browsers
 }

pages.json

@@ -148,6 +148,15 @@
 				"navigationBarBackgroundColor": "#e93340",
 				"navigationBarTitleText": "收藏的企业"
 			}
+		},{
+			"path": "pages/property/historyShop/historyShop",
+			"name": "HistoryShop",
+			"style": {
+				"enablePullDownRefresh": true,
+				"navigationBarTextStyle": "white",
+				"navigationBarBackgroundColor": "#e93340",
+				"navigationBarTitleText": "我的足迹"
+			}
 		},
 		{
 			"path": "pages/goods/details",

pages/property/coupon/couponMore.vue

@@ -0,0 +1,253 @@
+<template>
+	<view class="Coupon">
+		<!-- 有优惠券列表 -->
+		<view class="coupon-content">
+			<couponTemplate v-for="(item,index) in lists" :key='index' :item="{...item}" :action="actions" />
+		</view>
+
+		<!-- 没有优惠券列表 -->
+		<no-list v-if="lists.length === 0" name='no-counpon' :txt="showTxt" />
+
+		<!-- <u-toast ref="uToast" /> -->
+		<u-toast ref="uToast" />
+
+	</view>
+</template>
+
+<script>
+	import {
+		getCouponsListById
+	} from '@/apis/interfaces/coupon'
+	import couponTemplate from '@/components/coupon-template/coupon-template-1'
+	export default {
+		data() {
+			return {
+				lists:[],
+				id:'',
+				page:1,
+				has_more:true,
+				showTxt: '没有任何优惠券哦~'
+			};
+		},
+		components: {
+			couponTemplate
+		},
+		onLoad(e) {
+			console.log(e)
+			this.id = e.id
+			this.getMyCoupon()
+		},
+		onShow() {
+			if (wx.getStorageSync('refresh')) {
+				this.lists = []
+				this.getMyCoupon()
+			}
+		},
+		onPullDownRefresh() {
+		  this.page = 1
+		  this.lists = []
+		  this.has_more = true
+		  this.getMyCoupon()
+		},
+		onReachBottom() {
+		  if (this.has_more) {
+		    this.page = this.page + 1
+		    this.getMyCoupon()
+		  } else {
+		    this.$refs.uToast.show({
+		      title: '吼吼吼~我是有底的~',
+		      type: 'primary',
+		      duration: 3000
+		    })
+		  }
+		},
+		methods: {
+			getMyCoupon() {
+				let id = this.id
+				let data={
+					page:this.page,
+					pageSize:4
+				}
+				getCouponsListById(id,data).then(res => {
+					console.log(res)
+					this.lists = this.lists.concat(res.data)
+					if (res.page.has_more) {
+					  this.has_more = true
+					} else {
+					  this.has_more = false
+					}
+					uni.stopPullDownRefresh()
+					wx.setStorageSync('refresh',false)
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'primary',
+						duration: 3000
+					})
+				})
+			},
+			// 选择顶部菜单
+			// selectNav(id) {
+			// 	console.log(typeof id)
+			// 	this.showTxt = (id === 1 ? '没有领取到任何优惠券哦~' : id === 2 ? '没有使用过任何优惠券哦~' : '没有任何过期优惠券哦~')
+			// 	if (id !== this.selectNavId) {
+			// 		this.selectNavId = id
+			// 		this.page = 1
+			// 		this.lists = []
+			// 		this.has_more = true
+			// 		this.getMyCoupon()
+			// 	}
+			// },
+			// 切换商品分类
+			selectNav(id) {
+				console.log(id)
+				this.selectNavId = id
+				this.getMyCoupon()
+				// if (this.selectCategoryId !== id) {
+				// this.goodsList = []
+				// this.has_more = true
+				// this.page = 1
+				// this.getGoodsByCompanyidCaregoryid()
+				// }
+			},
+			selectCategory(id) {
+				console.log(id)
+				this.selectCategoryId = id
+				this.getMyCoupon()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.Coupon {
+		width: 100%;
+		min-height: 100vh;
+		box-sizing: border-box;
+		background-color: #F7F7F7;
+
+		.coupon-nav {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: space-around;
+			box-sizing: border-box;
+			background-color: #fff;
+			padding: 30rpx 60rpx 0 60rpx;
+			color: #cacaca;
+
+			.nav-item {
+				padding: 20rpx 30rpx 30rpx 30rpx;
+				border-bottom: solid 4rpx #fff;
+				font-size: 36rpx;
+				font-weight: bold;
+			}
+
+			.nav-item-select {
+				border-bottom: solid 6rpx $main-color;
+				color: $main-color;
+			}
+		}
+
+		.scroll-top {
+			position: sticky;
+			top: 0;
+			z-index: 1000;
+
+			.scroll-view_H {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				white-space: nowrap;
+				width: 100%;
+				padding: 30rpx 30rpx 0 30rpx;
+				background-color: #fff;
+
+				.scroll-view-item_H {
+					margin-right: 60rpx;
+					padding: 20rpx 0 40rpx 0;
+					// height: 100rpx;
+					display: inline-block;
+					min-width: 120rpx;
+					font-size: 28rpx;
+					border-bottom: #fff;
+					background-color: #fff;
+					transition: .1s;
+					text-align: center;
+				}
+
+				.scroll-view-item_H_selected {
+					// border-bottom: solid $main-color 4rpx;
+					color: $main-color;
+					font-weight: bold;
+					// font-size: 36rpx;
+					// transition: .3s;
+					text-shadow: 6rpx 8rpx 30rpx rgba($color: $main-color, $alpha: .5);
+					position: relative;
+
+					&:after {
+						// content: '';
+						// position: absolute;
+						// bottom: 10rpx;
+						// left: 0;
+						// height: 8rpx;
+						// width: 100%;
+						// background-color: $main-color;
+					}
+				}
+			}
+
+			.scroll-view_H-1 {
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: flex-start;
+				box-sizing: border-box;
+				white-space: nowrap;
+				width: 100%;
+				padding: 0 30rpx 30rpx 30rpx;
+				background-color: #fff;
+				// position: sticky;
+				// top: 100rpx;
+				// z-index: 1000;
+
+				.scroll-view-item_H-1 {
+					display: inline-block;
+					min-width: 120rpx;
+					font-size: 24rpx;
+					border-bottom: #fff;
+					background-color: #f7f7f7;
+					margin-left: 20rpx;
+					padding: 10rpx 30rpx;
+					text-align: center;
+					border-radius: 40rpx;
+				}
+
+				.scroll-view-item_H_selected-1 {
+					// border-bottom: solid $main-color 4rpx;
+					color: #fff;
+					font-weight: bold;
+					background-image: linear-gradient(to left, $main-color, $main-color-light);
+					// font-size: 36rpx;
+					// transition: .3s;
+					// text-shadow: 6rpx 8rpx 30rpx rgba($color: $main-color, $alpha: .5);
+					position: relative;
+
+					&:after {
+						// content: '';
+						// position: absolute;
+						// bottom: 10rpx;
+						// left: 0;
+						// height: 8rpx;
+						// width: 100%;
+						// background-color: $main-color;
+					}
+				}
+			}
+
+		}
+
+	}
+</style>

pages/property/historyShop/historyShop.vue

@@ -0,0 +1,139 @@
+<template>
+  <view class="HistoryList">
+    <!-- 有足迹 -->
+    <view class="goodsList" v-if="lists.length>0">
+      <view class="date">以往足迹</view>
+      <view class="lists">
+        <view class="lists-item" v-for="(item,index) in lists" :key="index" @click="goGoods(item.goods_id)">
+          <image class="goods-img" :src="item.cover" mode="aspectFill" />
+          <view class="money"><span class="tags" v-if='item.tags'>{{item.tags[0].name}}</span><span>￥</span>{{item.price}}</view>
+        </view>
+      </view>
+    </view>
+
+    <!-- 没有任何足迹 -->
+    <no-list v-if="lists.length === 0" name='no-foot' txt="您还没有产生任何足迹哦~" />
+
+    <!-- <u-toast ref="uToast" /> -->
+    <u-toast ref="uToast" />
+  </view>
+</template>
+
+<script>
+  import {
+    browsers
+  } from '@/apis/interfaces/mine'
+  export default {
+    data() {
+      return {
+        lists: [],
+        page: 1,
+        has_more: true
+      }
+    },
+    onLoad() {
+      this.getLists()
+    },
+    onReachBottom() {
+      if (this.has_more) {
+        this.page = this.page + 1
+        this.getLists()
+      } else {
+        this.$refs.uToast.show({
+          title: '吼吼吼~我是有底的~',
+          type: 'primary',
+          duration: 3000
+        })
+      }
+    },
+    methods: {
+      getLists() {
+        browsers(this.page).then(res => {
+          this.lists = this.lists.concat(res.data)
+          if (res.page.has_more) {
+            this.has_more = true
+          } else {
+            this.has_more = false
+          }
+        }).catch(err => {
+          this.$refs.uToast.show({
+            title: err.message,
+            type: 'primary',
+            duration: 3000
+          })
+        })
+      },
+      // 跳转到商品详情
+      goGoods(id) {
+        console.log(id)
+        uni.navigateTo({
+          url: '/pages/goods/details?id=' + id
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  .HistoryList {
+    .goodsList {
+      display: flex;
+      flex-direction: column;
+      align-items: flex-start;
+      justify-content: flex-start;
+      box-sizing: border-box;
+      padding: 20rpx 10rpx 20rpx 15rpx;
+      border-bottom: solid 1rpx #f7f7f7;
+
+      .date {
+        margin-left: 10rpx;
+        font-size: $title-size * 1.12;
+        font-weight: bold;
+      }
+
+      .lists {
+        display: flex;
+        flex-direction: row;
+        align-items: center;
+        justify-content: flex-start;
+        box-sizing: border-box;
+        flex-wrap: wrap;
+        width: 100%;
+
+        .lists-item {
+          margin: 20rpx 10rpx 10rpx 10rpx;
+          width: 220rpx;
+
+          .goods-img {
+            width: 220rpx;
+            height: 220rpx;
+            border-radius: 10rpx;
+          }
+
+          .money {
+            color: #FA3534;
+            font-size: $title-size*0.9;
+            display: flex;
+            flex-direction: row;
+            align-items: center;
+            justify-content: flex-start;
+            box-sizing: border-box;
+
+            .tags {
+              background-color: #FA3534;
+              color: #fff;
+              padding: 2rpx 12rpx;
+              border-radius: 6rpx;
+              font-size: $title-size * 0.7 !important;
+              margin-right: 10rpx;
+            }
+
+            span {
+              font-size: $title-size * 0.8;
+            }
+          }
+        }
+      }
+    }
+  }
+</style>

pages/property/index.vue

@@ -91,7 +91,7 @@
 						<image class="item-cover" src="@/static/icons/user_icon_03.png" mode="aspectFill" />
 						<view class="item-title">我的优惠券</view>
 					</view>
-					<view class="item">
+					<view class="item" @click="$Router.push({name:'HistoryShop'})">
 						<image class="item-cover" src="@/static/icons/user_icon_01.png" mode="aspectFill" />
 						<view class="item-title">我的足迹</view>
 					</view>

pages/property/order/mallRefund.vue

@@ -60,7 +60,7 @@
 		    id: 'signed'
 		  },
 		  {
-		    name: '待退数权',
+		    name: '待退权证',
 		    id: 'process'
 		  },
 		  {
@@ -136,7 +136,7 @@
 			console.log(index,no)
 			uni.showModal({
 			    title: '哎呦，提醒你',
-			    content: '是否确认要取消订单啊，取消后请去我的数权中查看',
+			    content: '是否确认要取消订单啊，取消后请去我的权证中查看',
 			    success:  (res) =>{
 			        if (res.confirm) {
 			            mallShipmentsCancel(no).then(res=>{

pages/property/order/mallRefundsInfo.vue

@@ -38,7 +38,7 @@
 						<view class="name1 ellipsis-2">{{info.goods_sku.goods_name}}</view>
 						<!-- <span>￥16.80</span> -->
 					</view>
-					<view class="sku">数权个数 <span>x {{info.qty}}</span> </view>
+					<view class="sku">权证个数 <span>x {{info.qty}}</span> </view>
 				</view>
 			</view>
 			<navigator class="total" hover-class="none" :url='"/pages/goods/detail?id="+info.goods_sku.goods_id'>

pages/property/order/mallShipments.vue

@@ -139,7 +139,7 @@
 								id: 'signed'
 							},
 							{
-								name: '待退数权',
+								name: '待确认退货',
 								id: 'process'
 							},
 							{
@@ -238,7 +238,7 @@
 				console.log(index, no)
 				uni.showModal({
 					title: '哎呦，提醒你',
-					content: '是否确认要取消订单啊，取消后请去我的数权中查看',
+					content: '是否确认要取消订单啊，取消后请去我的权证中查看',
 					success: (res) => {
 						if (res.confirm) {
 							mallShipmentsCancel(no).then(res => {

pages/property/order/mallShipmentsInfo.vue

@@ -38,7 +38,7 @@
             <view class="name1 ellipsis-2">{{info.goods_sku.goods_name}}</view> 
 			<!-- <span>￥16.80</span> -->
           </view>
-          <view class="sku">数权个数 <span>x {{info.qty}}</span> </view>
+          <view class="sku">权证个数 <span>x {{info.qty}}</span> </view>
         </view>
       </view>
      <navigator class="total" hover-class="none" :url='"/pages/goods/detail?id="+info.goods_sku.goods_id'>
@@ -135,7 +135,7 @@
 		nowCancel(no){
 			uni.showModal({
 			    title: '哎呦，提醒你',
-			    content: '是否确认要取消订单啊，取消后请去我的数权中查看',
+			    content: '是否确认要取消订单啊，取消后请去我的权证中查看',
 			    success:  (res) =>{
 			        if (res.confirm) {
 			            mallShipmentsCancel(no).then(res=>{