wxd / MShopWeApp

Commit 3a9e717443fb3fa1f12d2647270ae61a2f5bb47f

Authored by season
2 parents 382f0a1b c0417b7a

Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp

Inline Side-by-side
Showing 7 changed files with 90 additions and 18 deletions
... ... @@ -51,7 +51,7 @@ App({
51 51 config: null, //门店参数
52 52 config2: null, //门店配置
53 53 code: null,
54   - user_id:null,//15240065,//6520352,//6520390,//6520352
  54 + user_id:null,//6520390,//6520352
55 55 // user_id:6520314,// qa-6519858,//
56 56 // user_id:14148118,// qa-6519858,//
57 57 buy_now: null,
... ... @@ -124,6 +124,7 @@ App({
124 124 getApp().globalData.guide_id = res.data.data.id;
125 125 }
126 126 })
  127 + app.promiseGet("/api/weshop/users/getAndUpdateUser/" +user.store_id + "/" + user.user_id, {})
127 128  
128 129 }
129 130 wx.setStorageSync("userinfo", user);
... ... @@ -140,6 +141,8 @@ App({
140 141 if(res.data.code==0){
141 142 app.globalData.userInfo = res.data.data;
142 143 wx.setStorageSync("userinfo",app.globalData.userInfo);
  144 + //刷一下导购
  145 + app.promiseGet("/api/weshop/users/getAndUpdateUser/" +app.globalData.setting.stoid + "/" + app.globalData.user_id, {})
143 146 }
144 147 })
145 148 }
... ...
packageA/pages/checkin/checkin.js
  View file @3a9e717
... ... @@ -236,13 +236,29 @@ Page({
236 236  
237 237 // 点击签到
238 238 checkInToday() {
239   - const self = this;
240 239  
  240 + var ck = this.data.day;
  241 + if (parseInt(ck) < 10) ck = "0" + ck;
  242 + if(this.data.res && this.data.res.qddaylist){
  243 + var isCheckInToday = this.data.res.qddaylist.indexOf(ck);
  244 + //已经签到
  245 + if (isCheckInToday >-1) {
  246 + return false;
  247 + }
  248 + }
  249 +
  250 +
  251 + if(this.data.td_cked) return false;
  252 + if(this.data.cking) return false;
  253 + this.setData({cking:1});
  254 +
  255 + const self = this;
241 256 getApp().request.get("/api/weshop/users/getServerTime", {
242 257 success: function (res) {
243 258 if (res.data.code == 0) {
244 259 var getnowtime = res.data.data;
245 260 if (!getnowtime) {
  261 + self.setData({cking:0});
246 262 getApp().showWarning("获取服务时间失败");
247 263 return;
248 264 } else {
... ... @@ -254,24 +270,32 @@ Page({
254 270  
255 271 // 如果还没签到, 可以点击签到
256 272 if (isCheckInToday == -1) {
  273 +
257 274 getnowtime = getnowtime.replace(/-/g, "/")
258 275 var timeid = Date.parse(getnowtime)/1000;
259 276 var key = "rgqsqLYhw67sgaIQBF6dw9JK7CDKSS";
260 277 var str = app.globalData.setting.stoid + ":" + app.globalData.user_id + ":" + timeid + ":" + key
261 278 var sign = md5(str);
262 279  
  280 + var qdbh='qd'+ut.format(null,'yyyyMMddhhmmssS')+(Math.floor(Math.random()*9999)+1000)+app.globalData.user_id;
  281 +
263 282 app.request.promisePost('/api/weshop/qdrecord/saveQd', {
264 283 data: {
265 284 store_id: app.globalData.setting.stoid,
266 285 user_id: app.globalData.user_id,
267 286 timeid: timeid,
268   - sign: sign
  287 + sign: sign,
  288 + qdbh:qdbh
269 289 }
270 290 }).then(res2 => {
271 291 // 改变签到状态,由false置为true
272 292 // let newDateArr = self.data.dateArr;
273   - // newDateArr[self.data.day-1].isCheckIn = true;
  293 + // newDateArr[self.data.day-1].isCheckIn = true;
  294 + self.setData({cking:0});
  295 +
274 296 if (res2.data.code == 0) {
  297 +
  298 + self.data.td_cked=1;
275 299 for (var i in self.data.dateArr) {
276 300 self.data.dateArr[i].isCheckIn = false;
277 301 self.data.dateArr[i].isBq = false;
... ... @@ -295,12 +319,16 @@ Page({
295 319 }
296 320  
297 321  
298   -
299 322 })
300 323 }
  324 + else{
  325 + self.data.td_cked=1;
  326 + self.setData({cking:0});
  327 + }
301 328 }
302 329  
303 330 } else {
  331 + self.setData({cking:0});
304 332 getApp().showWarning(res.data.msg);
305 333 }
306 334 }
... ... @@ -311,18 +339,24 @@ Page({
311 339  
312 340 // 补签
313 341 reCheckIn() {
  342 +
  343 +
  344 + if(this.data.cking) return false;
  345 + this.setDate({cking:1});
  346 +
314 347 var self = this;
315 348 // var i = 0;
316 349 console.log('补签~');
317 350 if (this.data.flag) {
318 351 this.data.flag = false;
  352 +
319 353 app.request.promisePost('/api/weshop/qdrecord/saveBQd', {
320 354 data: {
321 355 store_id: app.globalData.setting.stoid,
322 356 user_id: app.globalData.user_id,
323 357 daynum: self.data.res.getBQIntegral1,
324 358 bqnum: self.data.res.getbqnum2,
325   - bqintegral: self.data.res.getBQIntegral,
  359 + bqintegral: self.data.res.getBQIntegral
326 360 }
327 361 }).then(res => {
328 362 // 改变签到状态,由false置为true
... ... @@ -335,6 +369,7 @@ Page({
335 369 var date = new Date(item);
336 370 list.push(date.getDate());
337 371 }--*/
  372 + self.setDate({cking:0});
338 373 if (res.data.code == 0) {
339 374 for (var i in self.data.dateArr) {
340 375 self.data.dateArr[i].isCheckIn = false;
... ... @@ -427,6 +462,26 @@ Page({
427 462  
428 463 back_to() {
429 464 wx.navigateBack();
  465 + },
  466 +
  467 + setDate_is_act(){
  468 + let year=this.data.year;
  469 + let sday3=res.sday3;
  470 + let qddaylist=res.qddaylist;
  471 +
  472 +
  473 + var date = getDate(year + '-' + startDate);
  474 + date.setDate(date.getDate() + num);
  475 + date = getDate(date).getDate();
  476 + if(date<10) date="0"+date;
  477 + if(!qdlist) return false;
  478 + if(qdlist.indexOf(date)!=-1){
  479 + return true
  480 + }
  481 + return false;
  482 +
  483 +
  484 +
430 485 }
431 486  
432 487 })
... ...
packageA/pages/checkin/checkin.wxml
  View file @3a9e717
... ... @@ -44,13 +44,13 @@
44 44 <view wx:else style="height: 100rpx;"></view>
45 45  
46 46 <view class="btn-container" wx:if="{{res}}">
47   - <view class="btn" bindtap="checkInToday" wx:if="{{isLogin}}">
  47 + <view class="btn {{cking?'gray':''}}" bindtap="checkInToday" wx:if="{{isLogin}}">
48 48 <text class="iconfont icon-rili"></text>{{!myUtil.setDate_is_act(year, res.sday3, 0,res.qddaylist) ? '立即签到':'今日已签到'}}
49 49 </view>
50 50 <view class="btn" bindtap="isLogin" wx:else>
51 51 <text class="iconfont icon-rili"></text>签到请登录
52 52 </view>
53   - <view class="btn" wx:if="{{res.curbqdaynum}}" bindtap="reCheckIn"><text class="iconfont icon-buqian"></text>补签(-{{res.getBQIntegral}}分)</view>
  53 + <view class="btn {{cking?'gray':''}}" wx:if="{{res.curbqdaynum}}" bindtap="reCheckIn"><text class="iconfont icon-buqian"></text>补签(-{{res.getBQIntegral}}分)</view>
54 54 </view>
55 55  
56 56  
... ...
packageA/pages/checkin/checkin.wxss
  View file @3a9e717
... ... @@ -94,6 +94,11 @@ page,
94 94 font-weight: bold;
95 95 }
96 96  
  97 +.btn.gray{
  98 + background-color: gainsboro;
  99 +}
  100 +
  101 +
97 102 .list {
98 103 margin: 80rpx 20rpx 60rpx;
99 104 color: rgba(255,255,255,.3);
... ...
pages/user/plus/plus.js
  View file @3a9e717
... ... @@ -242,18 +242,19 @@ Page({
242 242  
243 243 getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + app_d.user_id, {
244 244 success: function (e) {
245   - var userInfo = e.data.data;
246   - if (userInfo['card_field'] && !getApp().globalData.is_card_back) {
247   - var u_url = "/packageE/pages/user/cardinfo/cardinfo";
248   - wx.reLaunch({
249   - url: u_url
250   - })
251   -
252   - }
  245 + var userInfo = e.data.data;
  246 + if (userInfo && userInfo['card_field'] && !getApp().globalData.is_card_back) {
  247 + var u_url = "/packageE/pages/user/cardinfo/cardinfo";
  248 + wx.reLaunch({
  249 + url: u_url
  250 + })
  251 + }else{
  252 + th.getPlusCardType();
  253 + }
253 254 },
254 255 });
255 256  
256   - this.getPlusCardType();
  257 +
257 258 },
258 259  
259 260 /**
... ...
pages/user/userinfo/userinfo.js
  View file @3a9e717
... ... @@ -148,6 +148,12 @@ Page({
148 148 isstcsp: 1
149 149 })
150 150 } else {
  151 +
  152 + if(this.data.user.isVerification) {
  153 + getApp().my_warnning("已设置消费需启用密码，无法取消", 0, th);
  154 + return false;
  155 + }
  156 +
151 157 th.setData({
152 158 isstcsp: 0
153 159 })
... ...
utils/util.js
  View file @3a9e717
... ... @@ -608,9 +608,10 @@ module.exports = {
608 608 };
609 609 return void 0 !== r && 0 == r ? [ n, o, a ].map(s).join("-") + " " + [ u, i ].map(s).join(":") : [ n, o, a ].map(s).join("-") + " " + [ u, i, f ].map(s).join(":");
610 610 },
  611 +
611 612 format: function(e, r) {
612 613 var t = new Date();
613   - t.setTime(1e3 * e);
  614 + if(e) t.setTime(1e3 * e);
614 615 var n = {
615 616 "M+": t.getMonth() + 1,
616 617 "d+": t.getDate(),
... ... @@ -624,6 +625,7 @@ module.exports = {
624 625 for (var o in n) new RegExp("(" + o + ")").test(r) && (r = r.replace(RegExp.$1, 1 == RegExp.$1.length ? n[o] : ("00" + n[o]).substr(("" + n[o]).length)));
625 626 return r;
626 627 },
  628 +
627 629 formar_no_full(e,char){
628 630 var t= new Date(1e3 * e);
629 631 var c="-";
... ...