diff --git a/api/user.js b/api/user.js
index f41c93f..618b2d6 100644
--- a/api/user.js
+++ b/api/user.js
@@ -838,6 +838,6 @@ export function getWhellAction() {
* @param object data
*
*/
-export function integralGive() {
- return request.post('user/integral/give', {}, {noAuth: true})
+export function integralGive(data) {
+ return request.post('user/integral/give',data, {noAuth: true})
}
diff --git a/pages/user/index.vue b/pages/user/index.vue
index ab5adcf..39f53af 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -80,10 +80,10 @@
{{userInfo.total_visit_product || 0}}
浏览记录
-
+
{{userInfo.member_value || 0}}
累积成长值
diff --git a/pages/users/user_integral/index.vue b/pages/users/user_integral/index.vue
index eaa7756..fa28622 100644
--- a/pages/users/user_integral/index.vue
+++ b/pages/users/user_integral/index.vue
@@ -25,7 +25,7 @@
{{item.name}}
-
+
提示:您有部分积分将于{{userInfo.clear.nextClearDay}}过期,请尽快使用!
@@ -44,10 +44,10 @@
-
+
姓名
-
+
手机号
@@ -55,7 +55,7 @@
身份证
-
+
积分
@@ -124,9 +124,9 @@
},
integral_status: true,
presentExp:{
- name:'',
+ real_name:'',
phone:'',
- id_number:'',
+ card_id:'',
integral:'',
}
};
@@ -152,19 +152,22 @@
},
async payFunc(val){
let d={
- name:this.presentExp.name,
+ real_name:this.presentExp.real_name,
phone:this.presentExp.phone,
- id_number:this.presentExp.id_number,
+ card_id:this.presentExp.card_id,
integral:this.presentExp.integral,
- password:val
+ password:val.password
}
- this.closeFunc();
await integralGive(d).then((res)=>{
if(res){
+ this.closeFunc();
uni.showToast({
icon:'none',
title: res.message
});
+ setTimeout(()=>{
+ this.$router.go(0);
+ },1000)
}
}).catch((err)=>{
uni.showToast({
@@ -173,10 +176,28 @@
});
})
},
- giveaway(){
- let {name,phone,id_number,integral}=this.presentExp
- if(name&&phone&&id_number&&integral){
- this.payShow=true;
+ async giveaway(){
+ let {real_name,phone,card_id,integral}=this.presentExp
+ if(real_name&&phone&&card_id&&integral){
+
+ let d={
+ balance_vert:1,
+ real_name:this.presentExp.real_name,
+ phone:this.presentExp.phone,
+ card_id:this.presentExp.card_id,
+ integral:this.presentExp.integral,
+ }
+ this.closeFunc();
+ await integralGive(d).then((res)=>{
+ if(res.data.status=='continue'){
+ this.payShow=true;
+ }
+ }).catch((err)=>{
+ uni.showToast({
+ icon:'none',
+ title: err,
+ });
+ })
}else{
uni.showToast({
icon:'none',