diff --git a/api/user.js b/api/user.js
index f6ddd45..c39a2bb 100644
--- a/api/user.js
+++ b/api/user.js
@@ -792,4 +792,44 @@ export function queryBankCard(data) {
*/
export function queryCNAPS(data) {
return request.post('intention/interbank', data, {noAuth: true})
-}
\ No newline at end of file
+}
+/**
+ * 获取弹窗广告
+ * @param object data
+ *
+ */
+export function getHomePop() {
+ return request.get('home_pop', {}, {noAuth: true})
+}
+/**
+ * 获取幸运抽奖次数
+ * @param object data
+ *
+ */
+export function getWhellNumber() {
+ return request.get('wheel/info', {}, {noAuth: true})
+}
+/**
+ * 获取幸运抽奖配置
+ * @param object data
+ *
+ */
+export function getWhellConfig() {
+ return request.get('wheel/config', {}, {noAuth: true})
+}
+/**
+ * 获取幸运抽奖中奖记录
+ * @param object data
+ *
+ */
+export function getWhellList() {
+ return request.get('wheel/lst', {}, {noAuth: true})
+}
+/**
+ * 幸运抽奖开始抽奖
+ * @param object data
+ *
+ */
+export function getWhellAction() {
+ return request.get('wheel/create', {}, {noAuth: true})
+}
diff --git a/libs/uniApi.js b/libs/uniApi.js
index b8e9cbe..3e4f7bd 100644
--- a/libs/uniApi.js
+++ b/libs/uniApi.js
@@ -219,12 +219,9 @@ export function throttle(fn, delay) {
var delay = delay || 200;
return function(...args) {
lastArgs = args;
- console.log('没进来');
if(!timer){
- console.log('进来了');
timer = setTimeout(()=>{
timer = null;
- console.log('节----');
fn.apply(this, lastArgs);
}, delay);
}
diff --git a/package-lock.json b/package-lock.json
index cc2620f..2e11c3d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2,5 +2,33 @@
"name": "DS",
"lockfileVersion": 3,
"requires": true,
- "packages": {}
+ "packages": {
+ "": {
+ "dependencies": {
+ "@lucky-canvas/uni": "^0.0.13",
+ "uni-luck-draw": "^1.3.9"
+ }
+ },
+ "node_modules/@lucky-canvas/uni": {
+ "version": "0.0.13",
+ "resolved": "https://registry.npmjs.org/@lucky-canvas/uni/-/uni-0.0.13.tgz",
+ "integrity": "sha512-rtudKkWgGY+Uj+1xvZJqbQ/NMGGvge/os0cypj12EO6RK8ZX0NKVR97SxEsFG7mn96cDn96tCg12MwmYQHkB9g==",
+ "dependencies": {
+ "lucky-canvas": "~1.7.19"
+ }
+ },
+ "node_modules/lucky-canvas": {
+ "version": "1.7.27",
+ "resolved": "https://registry.npmjs.org/lucky-canvas/-/lucky-canvas-1.7.27.tgz",
+ "integrity": "sha512-Ftz6qD+863bI7xijBmZg3dw3cNEc7odPr70EZQcGA14y3TgTAzH65HPosOCd6kKUlMwhntBaHMx3onoj9MtJRQ=="
+ },
+ "node_modules/uni-luck-draw": {
+ "version": "1.3.9",
+ "resolved": "https://registry.npmjs.org/uni-luck-draw/-/uni-luck-draw-1.3.9.tgz",
+ "integrity": "sha512-n0uUHeHL91lUpeoTYE1b6dWyYCdFfN64wGd0v/x8qyacUVbKGGP+QzdcxniVBmFM8Ycgixvxro0cMY6Hag/mQg==",
+ "dependencies": {
+ "lucky-canvas": "^1.5.3"
+ }
+ }
+ }
}
diff --git a/package.json b/package.json
index 0967ef4..f39a9a5 100644
--- a/package.json
+++ b/package.json
@@ -1 +1,6 @@
-{}
+{
+ "dependencies": {
+ "@lucky-canvas/uni": "^0.0.13",
+ "uni-luck-draw": "^1.3.9"
+ }
+}
diff --git a/pages.json b/pages.json
index 742346a..763c747 100644
--- a/pages.json
+++ b/pages.json
@@ -240,6 +240,12 @@
"navigationBarTitleText": "签到记录"
}
},
+ {
+ "path": "user_luckyDraw/index",
+ "style": {
+ "navigationBarTitleText": "幸运抽奖"
+ }
+ },
{
"path": "user_money/index",
"style": {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f1bc3c6..9cfb623 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -245,6 +245,12 @@
+
@@ -257,7 +263,7 @@
var statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
let app = getApp();
-import { getUserInfo } from '@/api/user.js';
+import { getUserInfo,getHomePop } from '@/api/user.js';
import { getDiy, getPageDiy, getIndexData, getAppVersion } from '@/api/api.js';
import { getNavigation } from '@/api/public.js';
import { getStorage } from '@/libs/uniApi.js';
@@ -356,6 +362,7 @@ export default {
data() {
return {
domain: HTTP_REQUEST_URL,
+ isADPopup:true,
couponTypeMsg:{
10: '通用券',
11: '品类券',
@@ -434,7 +441,8 @@ export default {
overflow: false,
diyId: 0,
preview: false,
- isSupport: true
+ isSupport: true,
+ popList:[],
};
},
/**
@@ -479,6 +487,7 @@ export default {
}
});
})
+ that.getPopConfig();
that.pageLoad(options);
},
created(options) {
@@ -530,6 +539,19 @@ export default {
// #endif
},
methods: {
+ toNav(url){
+ this.isADPopup=false;
+ uni.navigateTo({
+ url
+ })
+ },
+ getPopConfig(){
+ getHomePop().then((res)=>{
+ if(res){
+ this.popList=res.data.list;
+ }
+ })
+ },
goCopyright(url){
this.$util.JumpPath(url);
},
diff --git a/pages/users/user_integral/index.vue b/pages/users/user_integral/index.vue
index cdb6235..d264d49 100644
--- a/pages/users/user_integral/index.vue
+++ b/pages/users/user_integral/index.vue
@@ -68,6 +68,13 @@
赚积分
+
+
+
+
+ 轮盘抽奖可获得积分奖励
+ 去抽奖
+
diff --git a/pages/users/user_luckyDraw/index.vue b/pages/users/user_luckyDraw/index.vue
new file mode 100644
index 0000000..575934d
--- /dev/null
+++ b/pages/users/user_luckyDraw/index.vue
@@ -0,0 +1,386 @@
+
+
+
+
+ 活动规则
+
+
+
+
+
+
+ 恭喜你获得 {{wheel}} 次抽奖机会
+
+
+
+
+
+ - 抽奖纪录 -
+
+
+
+ {{item.create_time}}
+ {{item.title}}
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/images/font-bg.png b/static/images/font-bg.png
new file mode 100644
index 0000000..b479439
Binary files /dev/null and b/static/images/font-bg.png differ
diff --git a/static/images/right-btn.png b/static/images/right-btn.png
new file mode 100644
index 0000000..11a504b
Binary files /dev/null and b/static/images/right-btn.png differ