diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 83eb91e..ec66ad2 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -211,6 +211,8 @@ Component({
pageSize: th.data.goodscount,
page: th.data.currentPage,
isonsale: 1,
+ orderField: "sort",
+ orderType: 'asc',
};
if(th.data.is_recommend) r_data.is_recommend=th.data.is_recommend;
if(th.data.is_hot) r_data.is_hot=th.data.is_hot;
@@ -241,6 +243,8 @@ Component({
pageSize: th.data.goodscount,
page: th.data.currentPage,
isonsale: 1,
+ orderField: "sort",
+ orderType: 'asc',
}
}).then(res => {
th.data.loading=0;
diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js
index 6d29215..cb4fb85 100644
--- a/components/goods_list/goods_list.js
+++ b/components/goods_list/goods_list.js
@@ -21,9 +21,8 @@ Component({
properties: {
// 这⾥定义了innerText属性，属性值可以在组件使⽤时指定
},
- ready: function () {
- },
- pageLifetimes:{
+ ready: function () {},
+ pageLifetimes: {
//要处理一下，游客登录后的界面的变化,主要还该是改变会员
show: function () {
this.init();
@@ -33,55 +32,55 @@ Component({
methods: {
init: function () {
var th = this;
- if(!getApp().globalData.user_id) return false;
+ if (!getApp().globalData.user_id) return false;
getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
- isShowLoading:false,
+ isShowLoading: false,
success: function (e) {
- if(e.data.code==0 && e.data && e.data.data){
- getApp().globalData.userInfo = e.data.data;
- getApp().getConfig2(function (e) {
- var swithc_list = e.switch_list;
- var sw_arr = JSON.parse(swithc_list);
- //---如果后台有开等级卡的开关---
- if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
- th.setData({
- rank_switch: true
- });
- //---回调卡的列表---
- th.getPlusCardType(function (ob) {
- th.setData({
- card_list: ob.card_list
- });
- var ti = setInterval(function () {
- var user = getApp().globalData.userInfo;
- if (!user) return false;
- clearInterval(ti);
- if (user.card_field && user['card_expiredate']) {
- var str = user['card_expiredate'].replace(/-/g, '/');
- var end = new Date(str);
- end = Date.parse(end) / 1000;
- var now = ut.gettimestamp();
- //--- 判断是等级会员，且在有效期范围内 ---
- if (user.card_field && now < end) {
- var card_name = ob.name_map.get(user.card_field);
- if (card_name.length > 4) card_name = card_name.substring(0, 8);
- th.setData({
- card_field: user.card_field,
- card_name: card_name,
- card_list: ob.card_list
- });
- }
- }
- }, 500)
- })
- }
- })
-
- }
-
-
-
- }
+ if (e.data.code == 0 && e.data && e.data.data) {
+ getApp().globalData.userInfo = e.data.data;
+ getApp().getConfig2(function (e) {
+ var swithc_list = e.switch_list;
+ var sw_arr = JSON.parse(swithc_list);
+ //---如果后台有开等级卡的开关---
+ if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
+ th.setData({
+ rank_switch: true
+ });
+ //---回调卡的列表---
+ th.getPlusCardType(function (ob) {
+ th.setData({
+ card_list: ob.card_list
+ });
+ var ti = setInterval(function () {
+ var user = getApp().globalData.userInfo;
+ if (!user) return false;
+ clearInterval(ti);
+ if (user.card_field && user['card_expiredate']) {
+ var str = user['card_expiredate'].replace(/-/g, '/');
+ var end = new Date(str);
+ end = Date.parse(end) / 1000;
+ var now = ut.gettimestamp();
+ //--- 判断是等级会员，且在有效期范围内 ---
+ if (user.card_field && now < end) {
+ var card_name = ob.name_map.get(user.card_field);
+ if (card_name.length > 4) card_name = card_name.substring(0, 8);
+ th.setData({
+ card_field: user.card_field,
+ card_name: card_name,
+ card_list: ob.card_list
+ });
+ }
+ }
+ }, 500)
+ })
+ }
+ })
+
+ }
+
+
+
+ }
})
},
// get_list: function () {
@@ -96,51 +95,51 @@ Component({
// }
// })
// },
- get_list: function() {
- var that = this;
- if (that.data.is_no_more == 0) return false;
- var curPage = that.data.curPage;
- getApp().request.get('/api/weshop/goods/page?page', {
- isShowLoading:false,
- data: {
- is_mainshow: 1,
- isonsale: 1,
- is_recommend: 1,
- is_on_sale: 1,
- store_id: o.stoid,
- page: curPage,
- pageSize: 6,
- orderField:"sort",
- orderType:'asc',
- },
- success: function(res) {
- var data = res.data;
- var total = data.data.total;
- if (total <= curPage * 6) {
- that.setData({
- is_no_more: 0
- });
- } else {
- that.data.curPage++;
- }
- //加载完成
- if (data.data.pageData) {
- that.setData({
- load_complete: 1
- });
- }
- if (that.data.recommend != null) {
- var ra = that.data.recommend.concat(data.data.pageData);
- that.setData({
- recommend: ra
- });
- } else {
- that.setData({
- recommend: data.data.pageData
- });
- }
- }
- })
+ get_list: function () {
+ var that = this;
+ if (that.data.is_no_more == 0) return false;
+ var curPage = that.data.curPage;
+ getApp().request.get('/api/weshop/goods/page?page', {
+ isShowLoading: false,
+ data: {
+ is_mainshow: 1,
+ isonsale: 1,
+ is_recommend: 1,
+ is_on_sale: 1,
+ store_id: o.stoid,
+ page: curPage,
+ pageSize: 6,
+ orderField: "sort",
+ orderType: 'asc',
+ },
+ success: function (res) {
+ var data = res.data;
+ var total = data.data.total;
+ if (total <= curPage * 6) {
+ that.setData({
+ is_no_more: 0
+ });
+ } else {
+ that.data.curPage++;
+ }
+ //加载完成
+ if (data.data.pageData) {
+ that.setData({
+ load_complete: 1
+ });
+ }
+ if (that.data.recommend != null) {
+ var ra = that.data.recommend.concat(data.data.pageData);
+ that.setData({
+ recommend: ra
+ });
+ } else {
+ that.setData({
+ recommend: data.data.pageData
+ });
+ }
+ }
+ })
},
bind_bnerr_xc: function (e) {
var _errImg = e.target.dataset.errorimg;
@@ -156,41 +155,40 @@ Component({
getPlusCardType: function (func) {
var storid = o.stoid;
var th = this;
- getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid,
- {}).then(res => {
+ getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, {}).then(res => {
- if(res.data.code!=0 || !res.data.data){
- var ob = {
- "card_list": [],
- "name_map": ""
- };
- func(ob);
- return false;
- }
+ if (res.data.code != 0 || !res.data.data) {
+ var ob = {
+ "card_list": [],
+ "name_map": ""
+ };
+ func(ob);
+ return false;
+ }
- var plusCard = res.data.data;
- var arr = [1219, 2089, 3031];
- var new_arr = new Array();
- var card_name_map = new Map();
-
- var user = getApp().globalData.userInfo;
- if(plusCard) {
- for (var i = 0; i < plusCard.length; i++) {
- if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
- continue;
- }
- var name = "card" + plusCard[i].CorrPrice.toLowerCase();
- card_name_map.set(name, plusCard[i].CardName);
- new_arr.push(plusCard[i]);
+ var plusCard = res.data.data;
+ var arr = [1219, 2089, 3031];
+ var new_arr = new Array();
+ var card_name_map = new Map();
+ var user = getApp().globalData.userInfo;
+ if (plusCard) {
+ for (var i = 0; i < plusCard.length; i++) {
+ if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
+ continue;
}
+ var name = "card" + plusCard[i].CorrPrice.toLowerCase();
+ card_name_map.set(name, plusCard[i].CardName);
+ new_arr.push(plusCard[i]);
+
}
- var ob = {
- "card_list": new_arr,
- "name_map": card_name_map
- };
- func(ob);
- })
+ }
+ var ob = {
+ "card_list": new_arr,
+ "name_map": card_name_map
+ };
+ func(ob);
+ })
},
},
})
\ No newline at end of file
diff --git a/components/my_confirm/my_confirm.wxml b/components/my_confirm/my_confirm.wxml
index 94ba02c..b7343e3 100644
--- a/components/my_confirm/my_confirm.wxml
+++ b/components/my_confirm/my_confirm.wxml
@@ -3,12 +3,14 @@
- ⅹ
- {{title}}
-
- {{s_text}}
- {{c_text}}
-
+
+ ⅹ
+ {{title}}
+
+ {{s_text}}
+ {{c_text}}
+
+
diff --git a/components/my_confirm/my_confirm.wxss b/components/my_confirm/my_confirm.wxss
index 55f8f7a..5935b8f 100644
--- a/components/my_confirm/my_confirm.wxss
+++ b/components/my_confirm/my_confirm.wxss
@@ -32,10 +32,10 @@
font-size: 40rpx;
color: #fff;
text-align: center;
- position: fixed;
+ position: absolute;
z-index: 66666;
- right: 75rpx;
- top: 465rpx;
+ right: -20rpx;
+ top: -20rpx;
background: #c8162c;
}
.xc-qr-frame{
diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js
index d94dd7d..4fc4253 100644
--- a/packageA/pages/myGift/myGift.js
+++ b/packageA/pages/myGift/myGift.js
@@ -122,7 +122,17 @@ Page({
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
- this.scrollToLower('/api/weshop/libao/libaoFormvip/page', {
+
+ var url="";
+ var index=this.data.currentIndex;
+ if(index == 0) {
+ url = '/api/weshop/libao/libaoForm/page';
+ } else if(index == 1) {
+ url = '/api/weshop/libao/libaoFormvip/page';
+ };
+
+
+ this.scrollToLower(url, {
store_id: app.globalData.setting.stoid,
user_id: app.globalData.user_id,
});
diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml
index 171e8ef..9fb2f5b 100644
--- a/packageA/pages/myGift/myGift.wxml
+++ b/packageA/pages/myGift/myGift.wxml
@@ -33,7 +33,7 @@
零售价{{filter.toFix(item.oldprice,2)}}
- 已售{{item.salenum}}件
+ 已售{{item.salenum+item.virtualsales}}件
活动结束日期 {{filter.format_time(item.endtime)}}
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js
index 162a9db..29cdaaf 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.js
+++ b/packageA/pages/myGiftDetails/myGiftDetails.js
@@ -2,6 +2,7 @@
const app = getApp();
let self = null;
var os = app.globalData.setting;
+var ut = require("../../../utils/util.js");
Page({
@@ -72,6 +73,14 @@ Page({
if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
var da= res.data.data.pageData[0]
self.setData({ details:da, });
+
+ //活动还未开始
+ if(da.startime>ut.gettimestamp()){
+ self.setData({ is_not_start:1, });
+ }
+
+
+
console.log(da);
//礼包有俩种类型
if(da.lbtype==1){
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index 1e93278..d24e590 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -5,7 +5,8 @@
- 活动结束时间：{{filter.format_time(details.endtime,1)}}
+ 活动开始时间：{{filter.format_time(details.startime,1)}}
+ 活动结束时间：{{filter.format_time(details.endtime,1)}}
@@ -37,7 +38,7 @@
零售价{{filter.toFix(details.oldprice,2)}}
- 已售{{details.salenum}}件
+ 已售{{details.salenum+details.virtualsales}}件
@@ -86,7 +87,8 @@
满{{item.condition}}使用
- ￥{{item.money}}
+ 包邮
+ ￥{{item.money}}
@@ -122,8 +124,13 @@
- 立即兑换
- 立即购买
+
+ 活动还未开始
+
+
+ 立即兑换
+ 立即购买
+
@@ -136,8 +143,14 @@
- 立即兑换
- 立即购买
+
+ 活动还未开始
+
+
+ 立即兑换
+ 立即购买
+
+
已领取
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxss b/packageA/pages/myGiftDetails/myGiftDetails.wxss
index db13e1a..bbd4da9 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxss
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxss
@@ -78,6 +78,13 @@ page {
color: #FF6768;
}
+.btn.gray{
+ background-color: #cccccc;
+ color:#fff
+}
+
+
+
.ling_btn{ background: #c0283a; color: #fff; width: 100rpx; height: 50rpx;
display: inline-block; line-height: 50rpx; border-radius: 10rpx}
diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js
index b4f3855..56f8d2c 100644
--- a/pages/cart/cart/cart.js
+++ b/pages/cart/cart/cart.js
@@ -531,7 +531,7 @@ Page({
u_item.zh_prom_goods={};
for (let var1 in obj) {
var h_item=obj[var1];
- var gdlist= th.data.zuhe_map_good[item.prom_id];
+ var gdlist= th.data.zuhe_map_good[h_item.prom_id];
//获取活动需要的商品列表
u_item.zh_prom_goods[h_item.prom_id]=gdlist;
}
diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss
index f20149c..a977424 100644
--- a/pages/cart/cart/cart.wxss
+++ b/pages/cart/cart/cart.wxss
@@ -157,7 +157,7 @@ radio {
font-size: 28rpx;
color: #666;
background-color: rgb(255, 255, 255);
- z-index: 2;
+ z-index: 1999;
border-top: 1rpx solid rgb(236, 236, 236);
border-bottom: 1rpx solid rgb(236, 236, 236);
diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js
index f12aeef..c820137 100644
--- a/pages/cart/cart2/cart2.js
+++ b/pages/cart/cart2/cart2.js
@@ -2240,7 +2240,6 @@ Page({
if (th.data.is_all_zt == 1) addr = null;
var val_arr = t.detail.value;
-
if (th.data.is_all_zt != 1)
if (th.data.wu_arr == null || th.data.wu_arr.length <= 0) {
th.data.is_summit_ing = 0;
@@ -2426,7 +2425,7 @@ Page({
}
//把优惠的平摊结果写进去
- if (g_item.account >= 0 || g_item.account_yu != 0) {
+ if (g_item.account >= 0 || (g_item.account_yu != 0 && g_item.account!=undefined)) {
if (g_item.account >= 0) goods.account = g_item.account;
if (g_item.account_yu != 0) goods.account_yu = g_item.account_yu;
item.is_discount_amount = 1;
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index df55b2b..abcc6d5 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -1481,13 +1481,13 @@
-
+
-
+
+
+
+
diff --git a/pages/goods/goodsInfo/goodsInfo.wxss b/pages/goods/goodsInfo/goodsInfo.wxss
index 4a471a4..8a4e258 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxss
+++ b/pages/goods/goodsInfo/goodsInfo.wxss
@@ -2731,7 +2731,7 @@ button.custom-service::after{
top: 50%;
left: 50%;
transform: translate(-50%, -50%);
- width: calc(100% - 120rpx);
+ width: calc(100% - 220rpx);
z-index: 1000;
}
.mask {
@@ -2741,7 +2741,7 @@ button.custom-service::after{
width: 100%;
height: 100%;
z-index: 999;
- background-color: rgba(0,0,0,.4);
+ background-color: rgba(0,0,0,.6);
}
.poster-wrapper {
width: 100%;
@@ -2750,7 +2750,7 @@ button.custom-service::after{
.poster {
box-sizing: border-box;
width: 100%;
- height: 1055rpx;
+ height: 915rpx;
border-radius: 20rpx;
/* box-shadow: 0 8px 12px #666; */
position: relative;