diff --git a/packageE/pages/user/labels/labels.js b/packageE/pages/user/labels/labels.js
index f2c92d5..af9a316 100644
--- a/packageE/pages/user/labels/labels.js
+++ b/packageE/pages/user/labels/labels.js
@@ -120,7 +120,7 @@ Page({
}
if(options.is_reg){
- this.data.is_reg=1;
+ this.setData({is_reg:1})
}
th.query_nolabels();
@@ -312,12 +312,12 @@ Page({
},
failStatus: function (t) {
wx.hideLoading();
- th.setData({loading: 0});
+ th.setData({loading: 0,is_check:0});
return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
},
fail: function (t) {
wx.hideLoading();
- th.setData({loading: 0});
+ th.setData({loading: 0,is_check:0});
return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
}
});
@@ -416,5 +416,54 @@ Page({
*/
onShow: function() {
+ },
+
+ //会员点击了跳过,就要注册
+ goto_user(e){
+ var th=this;
+ if(this.data.is_check) return false;
+ wx.showLoading({
+ title: "处理中.",
+ mask: true
+ })
+
+ this.setData({ is_check: 1 })
+
+ app.request.get("/api/weshop/users/thirdLogin", {
+ data: getApp().globalData.zc_dd,
+ success: function (e) {
+ wx.hideLoading();
+ if (e.data.code == 0) {
+ app.globalData.user_id = e.data.data.user_id;
+ } else {
+ return app.showWarning("授权登入失败!" + e.data.msg);
+ }
+ getApp().globalData.login_back = 1;
+ wx.setStorageSync("userinfo", e.data.data);
+ wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = s.getFullUrl(app.globalData.userInfo.head_pic);
+
+ //-- 注册的跳转 --
+ getApp().go_to_page(th.data.is_reg,function (){
+ // wx.navigateBack({ delta: 1 })
+ wx.reLaunch({
+ url: '/pages/user/index/index',
+ })
+ })
+
+ },
+ failStatus: function (t) {
+ wx.hideLoading();
+ th.setData({loading: 0,is_check:0});
+ return app.my_warnning("授权登入失败,请稍后再试!", 0, that);
+ },
+ fail: function (t) {
+ wx.hideLoading();
+ th.setData({loading: 0,is_check:0});
+ return i.clearAuth(), i.alertLoginErrorAndGoHome(), !1;
+ }
+ });
+
+
}
+
})
\ No newline at end of file
diff --git a/packageE/pages/user/labels/labels.wxml b/packageE/pages/user/labels/labels.wxml
index 123a319..8513599 100644
--- a/packageE/pages/user/labels/labels.wxml
+++ b/packageE/pages/user/labels/labels.wxml
@@ -4,9 +4,20 @@
兴趣标签
-
- 关闭
-
+
+
+
+
+ 跳过
+
+
+
+
+ 关闭
+
+
+
+
diff --git a/packageE/pages/user/monthgiftbag/monthgiftbag.wxml b/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
index 720fe7c..2fe4634 100644
--- a/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
+++ b/packageE/pages/user/monthgiftbag/monthgiftbag.wxml
@@ -66,6 +66,10 @@
{{item.payIntegral+"积分"}}
+
+
+
+
+
+
{{"购买时间:"+item.pay_time}}
diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxml b/pages/giftpack/mygiftpack/mygiftpack.wxml
index c4095d3..5405cf3 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.wxml
+++ b/pages/giftpack/mygiftpack/mygiftpack.wxml
@@ -63,6 +63,9 @@
{{item.payIntegral+"积分"}}
+
+
+
+
{{"零售价:¥"+item.giftPosPrice}}