From efbf89ccdca0ad9a6ff40326dc7c93cf0f29d12b Mon Sep 17 00:00:00 2001
From: iceling <iceling.qian@meidd.com>
Date: Sat, 21 Dec 2019 09:19:37 +0800
Subject: [PATCH] 首页判断是否新用户bug修复

---
 pages/index/index/index.js  | 7 +++----
 pages/user/labels/labels.js | 1 +
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pages/index/index/index.js b/pages/index/index/index.js
index 04b64db..4b68aa8 100644
--- a/pages/index/index/index.js
+++ b/pages/index/index/index.js
@@ -6,6 +6,7 @@ var e = function (e) {
   i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"), n = new e.default();
 var regeneratorRuntime = require('../../../utils/runtime.js');
 var api = require('../../../api/api.js');
+var d = getApp().globalData;
  
 Page({
   data: {
@@ -480,8 +481,6 @@ Page({
   countDown2() {
     if(!this.data.is_timer) return false;
 
-   
-
     var th = this;
     // 获取当前时间，同时得到活动结束时间数组
     var newTime = ut.gettimestamp();
@@ -618,9 +617,9 @@ Page({
   is_new: function () {
     var th = this;
     var url = "/api/weshop/marketing/newpeople/get";
-    getApp().request.promiseGet(res, {
+    getApp().request.promiseGet(url, {
       data: {
-        storeId: r.stoid,
+        storeId: o.stoid,
         userId: d.user_id
       }
     }).then(res => {
diff --git a/pages/user/labels/labels.js b/pages/user/labels/labels.js
index 994c89f..cc788b3 100644
--- a/pages/user/labels/labels.js
+++ b/pages/user/labels/labels.js
@@ -196,6 +196,7 @@ Page({
         }
       }
       var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+      remark = "标签赠送";
       if (is_modify) {
         my_confirm.open(
           "确定修改标签？",
--
libgit2 0.21.4