diff --git a/packageA/pages/checkin/checkin.js b/packageA/pages/checkin/checkin.js
index 8ed61f6..3d5d7d5 100644
--- a/packageA/pages/checkin/checkin.js
+++ b/packageA/pages/checkin/checkin.js
@@ -1,4 +1,6 @@
 // packageA//pages/checkin/checkin.js
+var md5 = require("../../../utils/md5.js");
+var ut = require("../../../utils/util.js");
 const app = getApp();
 let self;
 Page({
@@ -214,10 +216,18 @@ Page({
 		
 		// 如果还没签到, 可以点击签到
 		if(isCheckInToday==-1) {
+
+			var timeid=ut.gettimestamp();
+            var key = "rgqsqLYhw67sgaIQBF6dw9JK7CDKSS";
+            var str= app.globalData.setting.stoid+":"+app.globalData.user_id+":"+timeid+":"+key
+			var sign=md5(str);
+
 			app.request.promisePost('/api/weshop/qdrecord/saveQd', {
 				data: {
 					store_id: app.globalData.setting.stoid,
 					user_id: app.globalData.user_id,
+                    timeid:timeid,
+					sign:sign
 				}
 			}).then(res => {
 				// 改变签到状态,由false置为true
diff --git a/pages/goods/goodsList/goodsList.js b/pages/goods/goodsList/goodsList.js
index 755822d..bbc3986 100644
--- a/pages/goods/goodsList/goodsList.js
+++ b/pages/goods/goodsList/goodsList.js
@@ -67,11 +67,19 @@ Page({
      
 	  if (0 != t.is_new && t.is_new != undefined) { url += "&is_new=" + t.is_new; }
 	  if (0 != t.is_hot && t.is_hot != undefined) { url += "&is_hot=" + t.is_hot; }
+		
+		
+		// 优惠促销列表
+		if(t.prom_goods_id) {
+			url += '&prom_goods_id=' + t.prom_goods_id;
+		};
 	  
-	  if(getApp().globalData.userInfo){
+		
+	  if(getApp().globalData.userInfo) {
 		  url += "&user_id=" + getApp().globalData.userInfo.user_id;
 	  }
 
+
 	  //优惠活动的凑单
 	  if(t.prom_type==3){
           if (0 != t.prom_id && t.prom_id != undefined) { url += "&prom_id=" + t.prom_id; }
@@ -251,6 +259,8 @@ Page({
     }
   },
   
+	
+	
   //---  获取卡类列表 ---
   getPlusCardType: function (func) {
      var storid = oo.stoid;