|
|
@@ -4,6 +4,9 @@ import {
|
|
|
import {
|
|
|
selectInfo
|
|
|
} from '../../services/index.js'
|
|
|
+import {
|
|
|
+ showToast
|
|
|
+} from '../../utils/tips.js'
|
|
|
Page({
|
|
|
|
|
|
/**
|
|
|
@@ -84,6 +87,18 @@ Page({
|
|
|
userRealName: userRealName,
|
|
|
userIdCardNumber: userIdCardNumber
|
|
|
})
|
|
|
+ wx.showModal({
|
|
|
+ title: '提示',
|
|
|
+ content: '开心系统升级,一个用户只能保留唯一的用户信息,请您选择您要保留的信息。',
|
|
|
+ showCancel: false,
|
|
|
+ confirmText: "好的",
|
|
|
+ confirmColor: '#4183E1',
|
|
|
+ success(res) {
|
|
|
+ if (res.confirm) {
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ })
|
|
|
},
|
|
|
|
|
|
onShow: function() {
|
|
|
@@ -139,7 +154,8 @@ Page({
|
|
|
wx.setStorageSync("member_id", data.data.hpMember.id);
|
|
|
wx.setStorageSync("user_token", data.data.hpUser.userToken);
|
|
|
wx.setStorageSync("phone", data.data.hpUser.phone);
|
|
|
- setTimeout(function () {
|
|
|
+ showToast("合并成功");
|
|
|
+ setTimeout(function() {
|
|
|
wx.navigateBack();
|
|
|
}, 500)
|
|
|
})
|