1 participants
-
Status changed to merged
-
mentioned in commit 8feb1f2e9f855335a78d3c0a88973db677219b35
Showing
2 changed files
packageA/pages/checkin/checkin.js
| 1 | // packageA//pages/checkin/checkin.js | 1 | // packageA//pages/checkin/checkin.js |
| 2 | +var md5 = require("../../../utils/md5.js"); | ||
| 3 | +var ut = require("../../../utils/util.js"); | ||
| 2 | const app = getApp(); | 4 | const app = getApp(); |
| 3 | let self; | 5 | let self; |
| 4 | Page({ | 6 | Page({ |
| @@ -214,10 +216,18 @@ Page({ | @@ -214,10 +216,18 @@ Page({ | ||
| 214 | 216 | ||
| 215 | // 如果还没签到, 可以点击签到 | 217 | // 如果还没签到, 可以点击签到 |
| 216 | if(isCheckInToday==-1) { | 218 | if(isCheckInToday==-1) { |
| 219 | + | ||
| 220 | + var timeid=ut.gettimestamp(); | ||
| 221 | + var key = "rgqsqLYhw67sgaIQBF6dw9JK7CDKSS"; | ||
| 222 | + var str= app.globalData.setting.stoid+":"+app.globalData.user_id+":"+timeid+":"+key | ||
| 223 | + var sign=md5(str); | ||
| 224 | + | ||
| 217 | app.request.promisePost('/api/weshop/qdrecord/saveQd', { | 225 | app.request.promisePost('/api/weshop/qdrecord/saveQd', { |
| 218 | data: { | 226 | data: { |
| 219 | store_id: app.globalData.setting.stoid, | 227 | store_id: app.globalData.setting.stoid, |
| 220 | user_id: app.globalData.user_id, | 228 | user_id: app.globalData.user_id, |
| 229 | + timeid:timeid, | ||
| 230 | + sign:sign | ||
| 221 | } | 231 | } |
| 222 | }).then(res => { | 232 | }).then(res => { |
| 223 | // 改变签到状态,由false置为true | 233 | // 改变签到状态,由false置为true |
pages/goods/goodsList/goodsList.js
| @@ -67,11 +67,19 @@ Page({ | @@ -67,11 +67,19 @@ Page({ | ||
| 67 | 67 | ||
| 68 | if (0 != t.is_new && t.is_new != undefined) { url += "&is_new=" + t.is_new; } | 68 | if (0 != t.is_new && t.is_new != undefined) { url += "&is_new=" + t.is_new; } |
| 69 | if (0 != t.is_hot && t.is_hot != undefined) { url += "&is_hot=" + t.is_hot; } | 69 | if (0 != t.is_hot && t.is_hot != undefined) { url += "&is_hot=" + t.is_hot; } |
| 70 | + | ||
| 71 | + | ||
| 72 | + // 优惠促销列表 | ||
| 73 | + if(t.prom_goods_id) { | ||
| 74 | + url += '&prom_goods_id=' + t.prom_goods_id; | ||
| 75 | + }; | ||
| 70 | 76 | ||
| 71 | - if(getApp().globalData.userInfo){ | 77 | + |
| 78 | + if(getApp().globalData.userInfo) { | ||
| 72 | url += "&user_id=" + getApp().globalData.userInfo.user_id; | 79 | url += "&user_id=" + getApp().globalData.userInfo.user_id; |
| 73 | } | 80 | } |
| 74 | 81 | ||
| 82 | + | ||
| 75 | //优惠活动的凑单 | 83 | //优惠活动的凑单 |
| 76 | if(t.prom_type==3){ | 84 | if(t.prom_type==3){ |
| 77 | if (0 != t.prom_id && t.prom_id != undefined) { url += "&prom_id=" + t.prom_id; } | 85 | if (0 != t.prom_id && t.prom_id != undefined) { url += "&prom_id=" + t.prom_id; } |
| @@ -251,6 +259,8 @@ Page({ | @@ -251,6 +259,8 @@ Page({ | ||
| 251 | } | 259 | } |
| 252 | }, | 260 | }, |
| 253 | 261 | ||
| 262 | + | ||
| 263 | + | ||
| 254 | //--- 获取卡类列表 --- | 264 | //--- 获取卡类列表 --- |
| 255 | getPlusCardType: function (func) { | 265 | getPlusCardType: function (func) { |
| 256 | var storid = oo.stoid; | 266 | var storid = oo.stoid; |