diff --git a/public/appmini/old/wechat/components/popup/popup.js b/public/appmini/old/wechat/components/popup/popup.js
index 3d35fdad2..c7b1f3250 100644
--- a/public/appmini/old/wechat/components/popup/popup.js
+++ b/public/appmini/old/wechat/components/popup/popup.js
@@ -9,7 +9,8 @@ Component({
propPosition: String,
propMask: Boolean,
propAnimation: Boolean,
- propDisablescroll: Boolean
+ propDisablescroll: Boolean,
+ propOnclose: String
},
/**
@@ -23,6 +24,13 @@ Component({
* 组件的方法列表
*/
methods: {
+ onMaskTap: function onMaskTap() {
+ var onClose = this.propOnclose;
+ console.log(onClose)
+ if (onClose) {
+ onClose();
+ }
+ }
}
})
diff --git a/public/appmini/old/wechat/pages/cart/cart.js b/public/appmini/old/wechat/pages/cart/cart.js
index ef36f2bcd..64d6862f8 100755
--- a/public/appmini/old/wechat/pages/cart/cart.js
+++ b/public/appmini/old/wechat/pages/cart/cart.js
@@ -19,10 +19,11 @@ Page({
init(e) {
var user = app.get_user_cache_info(this, "init");
// 用户未绑定用户则转到登录页面
+ var msg = (user == false) ? '授权用户信息' : '绑定手机号码';
if (user == false || ((user.mobile || null) == null)) {
wx.showModal({
title: '温馨提示',
- content: '绑定手机号码',
+ content: msg,
confirmText: '确认',
cancelText: '暂不',
success: (result) => {
@@ -30,6 +31,12 @@ Page({
wx.navigateTo({
url: "/pages/login/login?event_callback=init"
});
+ } else {
+ this.setData({
+ data_list_loding_status: 2,
+ data_bottom_line_status: false,
+ data_list_loding_msg: '请先' + msg,
+ });
}
},
});
diff --git a/public/appmini/old/wechat/pages/cart/cart.wxml b/public/appmini/old/wechat/pages/cart/cart.wxml
index e30128847..a40705a2b 100755
--- a/public/appmini/old/wechat/pages/cart/cart.wxml
+++ b/public/appmini/old/wechat/pages/cart/cart.wxml
@@ -66,5 +66,5 @@
-
+
\ No newline at end of file
diff --git a/public/appmini/old/wechat/pages/user-order/user-order.json b/public/appmini/old/wechat/pages/user-order/user-order.json
index 2a4ca3ef8..7d179bfd5 100755
--- a/public/appmini/old/wechat/pages/user-order/user-order.json
+++ b/public/appmini/old/wechat/pages/user-order/user-order.json
@@ -1,6 +1,6 @@
{
"enablePullDownRefresh": true,
"usingComponents": {
- "popup": "mini-antui/es/popup/index"
+ "component-popup": "/components/popup/popup"
}
}
\ No newline at end of file
diff --git a/public/appmini/old/wechat/pages/user-order/user-order.wxml b/public/appmini/old/wechat/pages/user-order/user-order.wxml
index adf25eaa6..dcf4e73c4 100755
--- a/public/appmini/old/wechat/pages/user-order/user-order.wxml
+++ b/public/appmini/old/wechat/pages/user-order/user-order.wxml
@@ -56,7 +56,7 @@
-
+
@@ -67,4 +67,4 @@
没有支付方式
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/public/appmini/old/wechat/pages/user/user.js b/public/appmini/old/wechat/pages/user/user.js
index 73b15ad5a..c7a3e04c4 100755
--- a/public/appmini/old/wechat/pages/user/user.js
+++ b/public/appmini/old/wechat/pages/user/user.js
@@ -55,10 +55,11 @@ Page({
var user = app.get_user_cache_info(this, "init"),
self = this;
// 用户未绑定用户则转到登录页面
+ var msg = (user == false) ? '授权用户信息' : '绑定手机号码';
if (user == false || ((user.mobile || null) == null)) {
wx.showModal({
title: '温馨提示',
- content: '绑定手机号码',
+ content: msg,
confirmText: '确认',
cancelText: '暂不',
success: (result) => {
@@ -71,7 +72,6 @@ Page({
avatar: user.avatar || app.data.default_user_head_src,
nickname: user.nickname,
});
- self.get_data();
},
});
} else {