Commit efbf89ccdca0ad9a6ff40326dc7c93cf0f29d12b

Authored by 前端研发-钱巧玲
1 parent edd38263

首页判断是否新用户bug修复

pages/index/index/index.js
@@ -6,6 +6,7 @@ var e = function (e) { @@ -6,6 +6,7 @@ var e = function (e) {
6 i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"), n = new e.default(); 6 i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"), n = new e.default();
7 var regeneratorRuntime = require('../../../utils/runtime.js'); 7 var regeneratorRuntime = require('../../../utils/runtime.js');
8 var api = require('../../../api/api.js'); 8 var api = require('../../../api/api.js');
  9 +var d = getApp().globalData;
9 10
10 Page({ 11 Page({
11 data: { 12 data: {
@@ -480,8 +481,6 @@ Page({ @@ -480,8 +481,6 @@ Page({
480 countDown2() { 481 countDown2() {
481 if(!this.data.is_timer) return false; 482 if(!this.data.is_timer) return false;
482 483
483 -  
484 -  
485 var th = this; 484 var th = this;
486 // 获取当前时间,同时得到活动结束时间数组 485 // 获取当前时间,同时得到活动结束时间数组
487 var newTime = ut.gettimestamp(); 486 var newTime = ut.gettimestamp();
@@ -618,9 +617,9 @@ Page({ @@ -618,9 +617,9 @@ Page({
618 is_new: function () { 617 is_new: function () {
619 var th = this; 618 var th = this;
620 var url = "/api/weshop/marketing/newpeople/get"; 619 var url = "/api/weshop/marketing/newpeople/get";
621 - getApp().request.promiseGet(res, { 620 + getApp().request.promiseGet(url, {
622 data: { 621 data: {
623 - storeId: r.stoid, 622 + storeId: o.stoid,
624 userId: d.user_id 623 userId: d.user_id
625 } 624 }
626 }).then(res => { 625 }).then(res => {
pages/user/labels/labels.js
@@ -196,6 +196,7 @@ Page({ @@ -196,6 +196,7 @@ Page({
196 } 196 }
197 } 197 }
198 var my_confirm = th.selectComponent("#my_confirm"); //组件的id 198 var my_confirm = th.selectComponent("#my_confirm"); //组件的id
  199 + remark = "标签赠送";
199 if (is_modify) { 200 if (is_modify) {
200 my_confirm.open( 201 my_confirm.open(
201 "确定修改标签?", 202 "确定修改标签?",