Commit b91fc160af86c78386857788c02313cc7bf558ad

Authored by zhiyangdu
1 parent 1a4ab40a

新增抽奖记录页面

package-lock.json
@@ -53,6 +53,11 @@ @@ -53,6 +53,11 @@
53 } 53 }
54 } 54 }
55 }, 55 },
  56 + "@popperjs/core": {
  57 + "version": "2.5.4",
  58 + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.5.4.tgz",
  59 + "integrity": "sha512-ZpKr+WTb8zsajqgDkvCEWgp6d5eJT6Q63Ng2neTbzBO76Lbe91vX/iVIW9dikq+Fs3yEo+ls4cxeXABD2LtcbQ=="
  60 + },
56 "@sindresorhus/is": { 61 "@sindresorhus/is": {
57 "version": "0.7.0", 62 "version": "0.7.0",
58 "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz", 63 "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.7.0.tgz",
@@ -65,14 +70,22 @@ @@ -65,14 +70,22 @@
65 "dev": true 70 "dev": true
66 }, 71 },
67 "@vant/icons": { 72 "@vant/icons": {
68 - "version": "1.2.1",  
69 - "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.2.1.tgz",  
70 - "integrity": "sha512-5ivsKQR4ySbdBW5UPoQDVqO6rdc1um3rvq/0VL+ZSA7Y3MdBQ3E4/NL0hoAY5/sZZeYfIDKEP21gpjUzdeEDQQ==" 73 + "version": "1.4.0",
  74 + "resolved": "https://registry.npmjs.org/@vant/icons/-/icons-1.4.0.tgz",
  75 + "integrity": "sha512-96k+x00FqdGAQeTWrHEJ6C+QNifPQu58W9mv8pJAQ7VQ527KV9GHQT7m2TT+PhHXejDENYhlpW/XWOB66j8r8w=="
71 }, 76 },
72 - "@vue/babel-helper-vue-jsx-merge-props": { 77 + "@vant/popperjs": {
73 "version": "1.0.0", 78 "version": "1.0.0",
74 - "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.0.0.tgz",  
75 - "integrity": "sha512-6tyf5Cqm4m6v7buITuwS+jHzPlIPxbFzEhXR5JGZpbrvOcp1hiQKckd305/3C7C36wFekNTQSxAtgeM0j0yoUw==" 79 + "resolved": "https://registry.npmjs.org/@vant/popperjs/-/popperjs-1.0.0.tgz",
  80 + "integrity": "sha512-2OAl3URmH37OOATcKuT8iuZozoZVNMc8iLLZvurWZqHlWlAojsDHm7lQ2OKlAV4jlxbiFJt0en6DY+WlxHvN9w==",
  81 + "requires": {
  82 + "@popperjs/core": "^2.5.4"
  83 + }
  84 + },
  85 + "@vue/babel-helper-vue-jsx-merge-props": {
  86 + "version": "1.2.1",
  87 + "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-1.2.1.tgz",
  88 + "integrity": "sha512-QOi5OW45e2R20VygMSNhyQHvpdUwQZqGPc748JLGCYEy+yp8fNFNdbNIGAgZmi9e+2JHPd6i6idRuqivyicIkA=="
76 }, 89 },
77 "accepts": { 90 "accepts": {
78 "version": "1.3.5", 91 "version": "1.3.5",
@@ -13274,12 +13287,13 @@ @@ -13274,12 +13287,13 @@
13274 } 13287 }
13275 }, 13288 },
13276 "vant": { 13289 "vant": {
13277 - "version": "2.5.8",  
13278 - "resolved": "https://registry.npmjs.org/vant/-/vant-2.5.8.tgz",  
13279 - "integrity": "sha512-6g1TRywIA0c6vP9A3tQpXpKUeSJmf88H1SmXPC+gbj+HHQuSEdmvJi9qAN4ezBzpUGe/ljTLg0Q+MCLGcvfbzA==", 13290 + "version": "2.11.1",
  13291 + "resolved": "https://registry.npmjs.org/vant/-/vant-2.11.1.tgz",
  13292 + "integrity": "sha512-w98McSiJLQUiud8HV0k1SokJhF9s2lmqIwVm2IH64/HBEhCLaFgRYxDe5oeRIWNSP06K3NK95NTp7aUaWs/X2w==",
13280 "requires": { 13293 "requires": {
13281 "@babel/runtime": "7.x", 13294 "@babel/runtime": "7.x",
13282 - "@vant/icons": "1.2.1", 13295 + "@vant/icons": "1.4.0",
  13296 + "@vant/popperjs": "^1.0.0",
13283 "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0", 13297 "@vue/babel-helper-vue-jsx-merge-props": "^1.0.0",
13284 "vue-lazyload": "1.2.3" 13298 "vue-lazyload": "1.2.3"
13285 }, 13299 },
@@ -13433,6 +13447,22 @@ @@ -13433,6 +13447,22 @@
13433 "resolved": "https://registry.npmjs.org/vue-bus/-/vue-bus-1.2.1.tgz", 13447 "resolved": "https://registry.npmjs.org/vue-bus/-/vue-bus-1.2.1.tgz",
13434 "integrity": "sha512-uCSJEWFWoDZz+GV/Pj/wXAC7WVBLD18V62l+2ezd4UCsZWZB27Hz3K0M9WUcbNum/yKBoN+OkOCIrU6A9xqWhw==" 13448 "integrity": "sha512-uCSJEWFWoDZz+GV/Pj/wXAC7WVBLD18V62l+2ezd4UCsZWZB27Hz3K0M9WUcbNum/yKBoN+OkOCIrU6A9xqWhw=="
13435 }, 13449 },
  13450 + "vue-carousel-3d": {
  13451 + "version": "1.0.1",
  13452 + "resolved": "https://registry.npmjs.org/vue-carousel-3d/-/vue-carousel-3d-1.0.1.tgz",
  13453 + "integrity": "sha512-Q50gIEB6plLdqYd3jLxte8RJsXNPQBcrRsgUey7nnaQ7TvtFoRu/4rpPP1FiihahE0v+IzVv8LLSSJxD+XrQVQ==",
  13454 + "requires": {
  13455 + "core-js": "^3.6.5",
  13456 + "vue": "^2.6.11"
  13457 + },
  13458 + "dependencies": {
  13459 + "core-js": {
  13460 + "version": "3.8.0",
  13461 + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.0.tgz",
  13462 + "integrity": "sha512-W2VYNB0nwQQE7tKS7HzXd7r2y/y2SVJl4ga6oH/dnaLFzM0o2lB2P3zCkWj5Wc/zyMYjtgd5Hmhk0ObkQFZOIA=="
  13463 + }
  13464 + }
  13465 + },
13436 "vue-clipboard2": { 13466 "vue-clipboard2": {
13437 "version": "0.3.1", 13467 "version": "0.3.1",
13438 "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.1.tgz", 13468 "resolved": "https://registry.npmjs.org/vue-clipboard2/-/vue-clipboard2-0.3.1.tgz",
src/pages/ExchangeRecords/ExchangeRecords.less renamed to src/pages/pointsExchangeRecords/pointsExchangeRecords.less
src/pages/ExchangeRecords/ExchangeRecords.vue renamed to src/pages/pointsExchangeRecords/pointsExchangeRecords.vue
@@ -41,102 +41,102 @@ @@ -41,102 +41,102 @@
41 </template> 41 </template>
42 42
43 <script> 43 <script>
44 - // 引入组件  
45 - import { Toast, Indicator } from 'mint-ui';  
46 - export default {  
47 - name: 'ExchangeRecords',  
48 - data () {  
49 - return {  
50 - list:[],  
51 - page:1,  
52 - titleImg:null // 标题图片  
53 - }  
54 - },  
55 - created(){  
56 - document.title="兑奖记录"  
57 - this.getmyLuckIntegralOrder(this.page)  
58 - },  
59 - mounted(){  
60 - let activeId = this.$route.query.activeId  
61 - this.getShareData(activeId)  
62 - },  
63 - methods: {  
64 - // 跳转到积分商城首页  
65 - goointsMall(){  
66 - this.$router.push({  
67 - path:'/pointsMall',  
68 - query:{  
69 - uid: this.getStore("uid") || 0,  
70 - }  
71 - })  
72 - },  
73 - // 抽奖记录  
74 - /**  
75 - * 获取活动详情页信息  
76 - * @param {string} id [活动id]  
77 - * * @param {string} uid [用户id]  
78 - */  
79 - getmyLuckIntegralOrder(page) { 44 +// 引入组件
  45 +import { Toast, Indicator } from 'mint-ui';
  46 +export default {
  47 + name: 'ExchangeRecords',
  48 + data () {
  49 + return {
  50 + list: [],
  51 + page: 1,
  52 + titleImg: null // 标题图片
  53 + }
  54 + },
  55 + created () {
  56 + document.title = "兑奖记录"
  57 + this.getmyLuckIntegralOrder(this.page)
  58 + },
  59 + mounted () {
  60 + let activeId = this.$route.query.activeId
  61 + this.getShareData(activeId)
  62 + },
  63 + methods: {
  64 + // 跳转到积分商城首页
  65 + goointsMall () {
  66 + this.$router.push({
  67 + path: '/pointsMall',
  68 + query: {
  69 + uid: this.getStore("uid") || 0,
  70 + }
  71 + })
  72 + },
  73 + // 抽奖记录
  74 + /**
  75 + * 获取活动详情页信息
  76 + * @param {string} id [活动id]
  77 + * * @param {string} uid [用户id]
  78 + */
  79 + getmyLuckIntegralOrder (page) {
80 80
81 - // 加载中提示  
82 - Indicator.open('加载中...'); 81 + // 加载中提示
  82 + Indicator.open('加载中...');
83 83
84 - // 请求接口  
85 - this.http("/Api/" + (this.getApiVersion().LuckDraw) + "/myLuckIntegralOrder", {  
86 - uid: this.getStore("uid"),  
87 - page: page  
88 - }, this.getmyLuckIntegralOrderCallback, {  
89 - method: "POST"  
90 - });  
91 - }, 84 + // 请求接口
  85 + this.http("/Api/" + (this.getApiVersion().LuckDraw) + "/myLuckIntegralOrder", {
  86 + uid: this.getStore("uid"),
  87 + page: page
  88 + }, this.getmyLuckIntegralOrderCallback, {
  89 + method: "POST"
  90 + });
  91 + },
92 92
93 - /**  
94 - * 获取抽奖记录信息回调  
95 - * @param {object} res [服务器返回数据]  
96 - * @param {object} ext [扩展参数]  
97 - */  
98 - getmyLuckIntegralOrderCallback(res, ext) {  
99 - this.loading = false;  
100 - // 加载完成  
101 - Indicator.close(); 93 + /**
  94 + * 获取抽奖记录信息回调
  95 + * @param {object} res [服务器返回数据]
  96 + * @param {object} ext [扩展参数]
  97 + */
  98 + getmyLuckIntegralOrderCallback (res, ext) {
  99 + this.loading = false;
  100 + // 加载完成
  101 + Indicator.close();
102 102
103 - // 返回处理  
104 - if (res.code == 200) { 103 + // 返回处理
  104 + if (res.code == 200) {
105 105
106 - // 解构数据  
107 - let {data: datas} = res;  
108 - /* 获取活动详情页数据 开始 */  
109 - for (let i = 1; i <= datas.list.length; i++) {  
110 - this.list.push(datas.list[i-1]);  
111 - }  
112 - // 抽奖记录标题  
113 - this.titleImg = datas.luck_title_img  
114 - /* 获取抽奖记录 结束 */  
115 - } else if (res.code == 400) {  
116 - // 获取抽奖记录失败  
117 - Toast(res.message);  
118 - } else {  
119 - // 获取抽奖记录失败  
120 - Toast("获取抽奖记录失败");  
121 - }  
122 - },  
123 - // 下拉刷新  
124 - loadMore() {  
125 - this.loading = true;  
126 - this.page++  
127 - this.getmyLuckIntegralOrder(this.page)  
128 - },  
129 - // 获取并设置分享参数  
130 - getShareData(activeId){  
131 - this.$parent.getShareData({  
132 - type: 14,  
133 - id: activeId,  
134 - url: ""  
135 - });  
136 - } 106 + // 解构数据
  107 + let { data: datas } = res;
  108 + /* 获取活动详情页数据 开始 */
  109 + for (let i = 1; i <= datas.list.length; i++) {
  110 + this.list.push(datas.list[i - 1]);
137 } 111 }
  112 + // 抽奖记录标题
  113 + this.titleImg = datas.luck_title_img
  114 + /* 获取抽奖记录 结束 */
  115 + } else if (res.code == 400) {
  116 + // 获取抽奖记录失败
  117 + Toast(res.message);
  118 + } else {
  119 + // 获取抽奖记录失败
  120 + Toast("获取抽奖记录失败");
  121 + }
  122 + },
  123 + // 下拉刷新
  124 + loadMore () {
  125 + this.loading = true;
  126 + this.page++
  127 + this.getmyLuckIntegralOrder(this.page)
  128 + },
  129 + // 获取并设置分享参数
  130 + getShareData (activeId) {
  131 + this.$parent.getShareData({
  132 + type: 14,
  133 + id: activeId,
  134 + url: ""
  135 + });
138 } 136 }
  137 + }
  138 +}
139 </script> 139 </script>
140 <style rel="stylesheet/less" lang="less"> 140 <style rel="stylesheet/less" lang="less">
141 - @import "./ExchangeRecords"; 141 +@import './pointsExchangeRecords';
142 </style> 142 </style>