diff --git a/public/appmini/old/alipay/pages/user-faovr/user-faovr.axml b/public/appmini/old/alipay/pages/user-faovr/user-faovr.axml
index 92fc94ef5791232d7d1bf31bd5f9b6f220965bf6..e5ce84416ef6acd52b1937ac8192310caf1550fa 100755
--- a/public/appmini/old/alipay/pages/user-faovr/user-faovr.axml
+++ b/public/appmini/old/alipay/pages/user-faovr/user-faovr.axml
@@ -11,7 +11,7 @@
-
+
diff --git a/public/appmini/old/wechat/app.js b/public/appmini/old/wechat/app.js
index 7bdfea8e546f39a9933c675fdea36b45f621c7f1..7a53054c8e780bb60d3f63f57da0446833add52c 100755
--- a/public/appmini/old/wechat/app.js
+++ b/public/appmini/old/wechat/app.js
@@ -167,7 +167,7 @@ App({
params = "&" + params;
}
var user = this.get_user_cache_info();
- var app_client_user_id = user == false ? "" : user.wechat_openid;
+ var app_client_user_id = user == false ? "" : user.weixin_openid;
var user_id = user == false ? 0 : user.id;
return (
this.data.request_url +
diff --git a/public/appmini/old/wechat/app.wxss b/public/appmini/old/wechat/app.wxss
index 2f98590156d1fa78aa6c3ab0990272e46e4aa260..ca2f7cdd18a9542dfe4b91ea26812dad5e48b8b8 100755
--- a/public/appmini/old/wechat/app.wxss
+++ b/public/appmini/old/wechat/app.wxss
@@ -78,7 +78,7 @@ textarea {
.nav-submit-fixed { background: #eee; height: 46px; position: fixed; bottom: 0; z-index: 10; }
-.tips { background: #ffffeb url('/images/tips.png') no-repeat 5rpx 12rpx; background-size: 35rpx 35rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 5px 5px 5px 20px; font-size: 26rpx; border-radius: 2px; display: block; }
+.tips { background: #ffffeb url('data:image/png;base64,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') no-repeat 5rpx 12rpx; background-size: 35rpx 35rpx; color: #f7b240; border: 1px solid #faebd2; line-height: 36rpx; padding: 5px 5px 5px 20px; font-size: 26rpx; border-radius: 2px; display: block; }
.data-loding image { width: 60px; height: 60px; background-size: 80% 80% !important; }
@@ -97,7 +97,7 @@ textarea {
.br-r-dashed { border-right: dashed 1px #efefef; }
/* 箭头符号 */
-.arrow-right { background-image: url('data:image/svg+xml;charset=utf-8,'); background-size: 15px 10px; background-repeat: no-repeat; background-position: center right; }
+.arrow-right { background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAA+klEQVRYR+3WsWrDMBAG4P/eotCQLlk73UGfq6O3BgLNEsg7JQQPZ7ADfos8gAeBijYTAsnpREJBXmX0f/7RCRNe/NCL81EBtYH/1YCq/gK4iMiu1PSYGlDVloi+AOyZ+bsEwgQYx/FtmqYDgFUphAmQvniOiDFuRaTxNGEGlEZkAWaIFsCHp4lsQEIMw7AIIRw9CBfgGgFgzcw/ljPhBtxoohGR7aOIIoC+799DCCciWsYYnwvwhKeWXA14w12AEuHZgFLhWYCS4WbAPDxn5m+NpukQquqZiD49V+81wgToum6TfkiYef/oRXPvPRPg3mY56xVQG6gN/AEiuagh/yEjYQAAAABJRU5ErkJggg=='); background-size: 18px 18px; background-repeat: no-repeat; background-position: center right; }
/* 常用样式 */
@@ -253,17 +253,17 @@ textarea {
font-size: 32rpx;
border-radius: 0;
}
-.bg-main.a-button-disabled {
- background-color: #fbe0e5;
- color: #f7b6c2;
+button[disabled].bg-main {
+ background-color: #fbe0e5 !important;
+ color: #f7b6c2 !important;
}
-.bg-warning.a-button-disabled {
- background-color: #ffcda6;
- color: #fdae70;
+button[disabled].bg-warning {
+ background-color: #ffcda6 !important;
+ color: #fdae70 !important;
}
-.bg-primary.a-button-disabled {
- background-color: #ffd2d7;
- color: #ffa0ab;
+button[disabled].bg-primary {
+ background-color: #ffd2d7 !important;
+ color: #ffa0ab !important;
}
.nav-back {
diff --git a/public/appmini/old/wechat/components/popup/popup.js b/public/appmini/old/wechat/components/popup/popup.js
index c7b1f325035c357e93254b5c9c61a5f72773bb81..b13a85c2c05626c507d15411f678be07b4aa5fde 100644
--- a/public/appmini/old/wechat/components/popup/popup.js
+++ b/public/appmini/old/wechat/components/popup/popup.js
@@ -9,8 +9,7 @@ Component({
propPosition: String,
propMask: Boolean,
propAnimation: Boolean,
- propDisablescroll: Boolean,
- propOnclose: String
+ propDisablescroll: Boolean
},
/**
@@ -25,12 +24,7 @@ Component({
*/
methods: {
onMaskTap: function onMaskTap() {
- var onClose = this.propOnclose;
- console.log(onClose)
-
- if (onClose) {
- onClose();
- }
+ this.triggerEvent('onclose', {}, {});
}
}
})
diff --git a/public/appmini/old/wechat/pages/answer-form/answer-form.js b/public/appmini/old/wechat/pages/answer-form/answer-form.js
index 96d06a6454a243f110d6e1af9b3b4f8f6eb4d317..bf09d06768c63c7f804f5044649b0d93fe7affed 100755
--- a/public/appmini/old/wechat/pages/answer-form/answer-form.js
+++ b/public/appmini/old/wechat/pages/answer-form/answer-form.js
@@ -51,10 +51,7 @@ Page({
if(res.data.code == 0)
{
- wx.showToast({
- type: 'success',
- content: res.data.msg
- });
+ app.showToast(res.data.msg, "success");
setTimeout(function()
{
wx.redirectTo({
@@ -64,20 +61,14 @@ Page({
} else {
this.setData({form_submit_loading: false});
- wx.showToast({
- type: 'fail',
- content: res.data.msg
- });
+ app.showToast(res.data.msg);
}
},
fail: () => {
wx.hideLoading();
this.setData({form_submit_loading: false});
- wx.showToast({
- type: 'fail',
- content: '服务器请求出错'
- });
+ app.showToast('服务器请求出错');
}
});
}
diff --git a/public/appmini/old/wechat/pages/cart/cart.wxml b/public/appmini/old/wechat/pages/cart/cart.wxml
index a40705a2b84276584fb311fc01189067be9045c3..74caee2b53b9e42ce974745614b73db2fa8d0639 100755
--- a/public/appmini/old/wechat/pages/cart/cart.wxml
+++ b/public/appmini/old/wechat/pages/cart/cart.wxml
@@ -1,5 +1,5 @@
-
+
@@ -17,7 +17,7 @@
{{item.title}}
- {{spec.type}}:{{spec.value}}
+ {{spec.type}}:{{spec.value}}
diff --git a/public/appmini/old/wechat/pages/cart/cart.wxss b/public/appmini/old/wechat/pages/cart/cart.wxss
index 12d729771b7627e18a4877c5c942ce653f2ef602..70200b2b1727c9cb5c2c333d2e5d9b9cc7466640 100755
--- a/public/appmini/old/wechat/pages/cart/cart.wxss
+++ b/public/appmini/old/wechat/pages/cart/cart.wxss
@@ -57,6 +57,7 @@
}
.number-content input {
width: 30px;
+ background: #fff;
}
.number-content .number-submit,
.number-content input
diff --git a/public/appmini/old/wechat/pages/goods-category/goods-category.js b/public/appmini/old/wechat/pages/goods-category/goods-category.js
index 2b91cfda7bbb5a060ee954af009cd83827a325ea..50940d90b8818e5c55508230a57ad7296711ce5c 100755
--- a/public/appmini/old/wechat/pages/goods-category/goods-category.js
+++ b/public/appmini/old/wechat/pages/goods-category/goods-category.js
@@ -51,10 +51,7 @@ Page({
data_bottom_line_status: true,
});
- wx.showToast({
- type: "fail",
- content: res.data.msg
- });
+ app.showToast(res.data.msg);
}
},
fail: () => {
@@ -64,10 +61,7 @@ Page({
data_bottom_line_status: true,
});
- wx.showToast({
- type: "fail",
- content: "服务器请求出错"
- });
+ app.showToast("服务器请求出错");
}
});
},
diff --git a/public/appmini/old/wechat/pages/goods-detail/goods-detail.js b/public/appmini/old/wechat/pages/goods-detail/goods-detail.js
index 42159e459207c3a8a35a1bd80711d96e1710d3b4..cb1606190afb379c4d987c9358093c00f93a1bdd 100755
--- a/public/appmini/old/wechat/pages/goods-detail/goods-detail.js
+++ b/public/appmini/old/wechat/pages/goods-detail/goods-detail.js
@@ -129,10 +129,7 @@ Page({
data_list_loding_msg: '服务器请求出错',
});
- wx.showToast({
- type: "fail",
- content: "服务器请求出错"
- });
+ app.showToast("服务器请求出错");
}
});
}
@@ -200,98 +197,76 @@ Page({
// 收藏事件
goods_favor_event(e)
{
- var user = app.get_user_info(this, 'goods_favor_event');
- if (user != false) {
- // 用户未绑定用户则转到登录页面
- if ((user.mobile || null) == null) {
- wx.navigateTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
- } else {
- wx.showLoading({content: '处理中...'});
-
- wx.request({
- url: app.get_request_url('favor', 'goods'),
- method: 'POST',
- data: {"id": this.data.goods.id},
- dataType: 'json',
- success: (res) => {
- wx.hideLoading();
- if(res.data.code == 0)
- {
- var status = (this.data.goods.is_favor == 1) ? 0 : 1;
- this.setData({
- 'goods.is_favor': status,
- goods_favor_text: (status == 1) ? '已收藏' : '收藏',
- goods_favor_icon: '/images/goods-detail-favor-icon-'+status+'.png'
- });
- wx.showToast({
- type: 'success',
- content: res.data.msg
- });
- } else {
- wx.showToast({
- type: 'fail',
- content: res.data.msg
- });
- }
- },
- fail: () => {
- wx.hideLoading();
+ var user = app.get_user_cache_info(this, 'goods_favor_event');
+ // 用户未绑定用户则转到登录页面
+ if (user == false || (user.mobile || null) == null) {
+ wx.navigateTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ wx.showLoading({content: '处理中...'});
- wx.showToast({
- type: 'fail',
- content: '服务器请求出错'
+ wx.request({
+ url: app.get_request_url('favor', 'goods'),
+ method: 'POST',
+ data: {"id": this.data.goods.id},
+ dataType: 'json',
+ success: (res) => {
+ wx.hideLoading();
+ if(res.data.code == 0)
+ {
+ var status = (this.data.goods.is_favor == 1) ? 0 : 1;
+ this.setData({
+ 'goods.is_favor': status,
+ goods_favor_text: (status == 1) ? '已收藏' : '收藏',
+ goods_favor_icon: '/images/goods-detail-favor-icon-'+status+'.png'
});
+ app.showToast(res.data.msg, "success");
+ } else {
+ app.showToast(res.data.msg);
}
- });
- }
+ },
+ fail: () => {
+ wx.hideLoading();
+
+ app.showToast('服务器请求出错');
+ }
+ });
}
},
// 加入购物车事件
goods_cart_event(e, spec) {
- var user = app.get_user_info(this, 'goods_cart_event');
- if (user != false) {
- // 用户未绑定用户则转到登录页面
- if ((user.mobile || null) == null) {
- wx.navigateTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
- } else {
- wx.showLoading({ content: '处理中...' });
- wx.request({
- url: app.get_request_url('save', 'cart'),
- method: 'POST',
- data: { "goods_id": this.data.goods.id, "stock": this.data.temp_buy_number, "spec": JSON.stringify(spec) },
- dataType: 'json',
- success: (res) => {
- wx.hideLoading();
- if (res.data.code == 0) {
- this.popup_close_event();
- wx.showToast({
- type: 'success',
- content: res.data.msg
- });
- } else {
- wx.showToast({
- type: 'fail',
- content: res.data.msg
- });
- }
- },
- fail: () => {
- wx.hideLoading();
-
- wx.showToast({
- type: 'fail',
- content: '服务器请求出错'
- });
+ var user = app.get_user_cache_info(this, 'goods_cart_event');
+ // 用户未绑定用户则转到登录页面
+ if (user == false || (user.mobile || null) == null) {
+ wx.navigateTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ wx.showLoading({ content: '处理中...' });
+ wx.request({
+ url: app.get_request_url('save', 'cart'),
+ method: 'POST',
+ data: { "goods_id": this.data.goods.id, "stock": this.data.temp_buy_number, "spec": JSON.stringify(spec) },
+ dataType: 'json',
+ success: (res) => {
+ wx.hideLoading();
+ if (res.data.code == 0) {
+ this.popup_close_event();
+ app.showToast(res.data.msg, "success");
+ } else {
+ app.showToast(res.data.msg);
}
- });
- }
+ },
+ fail: () => {
+ wx.hideLoading();
+
+ app.showToast('服务器请求出错');
+ }
+ });
}
},
@@ -411,17 +386,11 @@ Page({
this.setData({goods_specifications_choose: temp_data});
}
} else {
- wx.showToast({
- type: 'fail',
- content: res.data.msg
- });
+ app.showToast(res.data.msg);
}
},
fail: () => {
- wx.showToast({
- type: 'fail',
- content: '服务器请求出错'
- });
+ app.showToast("服务器请求出错");
}
});
},
@@ -471,17 +440,11 @@ Page({
goods_spec_base_inventory: res.data.data.inventory,
});
} else {
- wx.showToast({
- type: 'fail',
- content: res.data.msg
- });
+ app.showToast(res.data.msg);
}
},
fail: () => {
- wx.showToast({
- type: 'fail',
- content: '服务器请求出错'
- });
+ app.showToast("服务器请求出错");
}
});
},
@@ -517,87 +480,79 @@ Page({
buy_number = buy_min_number;
if(buy_min_number > 1)
{
- wx.showToast({content: '起购'+buy_min_number+inventory_unit});
+ app.showToast( '起购'+buy_min_number+inventory_unit);
}
}
if(buy_max_number > 0 && buy_number > buy_max_number)
{
buy_number = buy_max_number;
- wx.showToast({content: '限购'+buy_max_number+inventory_unit});
+ app.showToast('限购'+buy_max_number+inventory_unit);
}
if(buy_number > inventory)
{
buy_number = inventory;
- wx.showToast({content: '库存数量'+inventory+inventory_unit});
+ app.showToast('库存数量'+inventory+inventory_unit);
}
this.setData({temp_buy_number: buy_number});
},
// 确认
goods_buy_confirm_event(e) {
- var user = app.get_user_info(this, 'goods_buy_confirm_event');
- if (user != false) {
- // 用户未绑定用户则转到登录页面
- if ((user.mobile || null) == null) {
- wx.navigateTo({
- url: "/pages/login/login?event_callback=init"
- });
- return false;
- } else {
- // 属性
- var temp_data = this.data.goods_specifications_choose;
- var sku_count = temp_data.length;
- var active_count = 0;
- var spec = [];
- if(sku_count > 0)
+ var user = app.get_user_cache_info(this, 'goods_buy_confirm_event');
+ // 用户未绑定用户则转到登录页面
+ if (user == false || (user.mobile || null) == null) {
+ wx.navigateTo({
+ url: "/pages/login/login?event_callback=init"
+ });
+ return false;
+ } else {
+ // 属性
+ var temp_data = this.data.goods_specifications_choose;
+ var sku_count = temp_data.length;
+ var active_count = 0;
+ var spec = [];
+ if(sku_count > 0)
+ {
+ for(var i in temp_data)
{
- for(var i in temp_data)
+ for(var k in temp_data[i]['value'])
{
- for(var k in temp_data[i]['value'])
+ if((temp_data[i]['value'][k]['is_active'] || null) != null)
{
- if((temp_data[i]['value'][k]['is_active'] || null) != null)
- {
- active_count++;
- spec.push({"type": temp_data[i]['name'], "value": temp_data[i]['value'][k]['name']});
- }
+ active_count++;
+ spec.push({"type": temp_data[i]['name'], "value": temp_data[i]['value'][k]['name']});
}
}
- if(active_count < sku_count)
- {
- wx.showToast({
- type: 'fail',
- content: '请选择属性'
- });
- return false;
- }
}
-
- // 操作类型
- switch (this.data.buy_event_type) {
- case 'buy' :
- // 进入订单确认页面
- var data = {
- "buy_type": "goods",
- "goods_id": this.data.goods.id,
- "stock": this.data.temp_buy_number,
- "spec": JSON.stringify(spec)
- };
- wx.navigateTo({
- url: '/pages/buy/buy?data=' + JSON.stringify(data)
- });
- this.popup_close_event();
- break;
+ if(active_count < sku_count)
+ {
+ app.showToast('请选择属性');
+ return false;
+ }
+ }
+
+ // 操作类型
+ switch (this.data.buy_event_type) {
+ case 'buy' :
+ // 进入订单确认页面
+ var data = {
+ "buy_type": "goods",
+ "goods_id": this.data.goods.id,
+ "stock": this.data.temp_buy_number,
+ "spec": JSON.stringify(spec)
+ };
+ wx.navigateTo({
+ url: '/pages/buy/buy?data=' + JSON.stringify(data)
+ });
+ this.popup_close_event();
+ break;
- case 'cart' :
- this.goods_cart_event(e, spec);
- break;
+ case 'cart' :
+ this.goods_cart_event(e, spec);
+ break;
- default :
- wx.showToast({
- type: "fail",
- content: "操作事件类型有误"
- });
- }
+ default :
+ app.showToast("操作事件类型有误");
}
}
},
diff --git a/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml b/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml
index 797b9311e6bcf339ed3674eb3d4438b4e9b1c9aa..515ca174b13de1e2c09bbe27c5d8224a04586ce2 100755
--- a/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml
+++ b/public/appmini/old/wechat/pages/goods-detail/goods-detail.wxml
@@ -77,7 +77,7 @@
-
+