diff --git a/pages/activity/seckill_list/seckill_list.js b/pages/activity/seckill_list/seckill_list.js
index aa6e5e0..c875e41 100644
--- a/pages/activity/seckill_list/seckill_list.js
+++ b/pages/activity/seckill_list/seckill_list.js
@@ -177,6 +177,12 @@ Page({
           _errObj[_errImg] = "/public/images/default_goods_image_240.gif";
           this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
        }
-    }
+    },
+		
+		onShareTimeline() {
+			return {
+				title: '秒杀活动-' + getApp().globalData.config.store_name,
+			}
+		},
 
 });
diff --git a/pages/goods/goodsInfo/g_filter.wxs b/pages/goods/goodsInfo/g_filter.wxs
index c39bff3..e9033b0 100644
--- a/pages/goods/goodsInfo/g_filter.wxs
+++ b/pages/goods/goodsInfo/g_filter.wxs
@@ -80,8 +80,38 @@ var g_filters = {
 				 if(min_name.length>4)	min_name=min_name.substring(0, 8);	 
 			     return min_name;
 		},
+		
+		toFix: function (val, count,set) {
+			if(val===undefined) return 0;
+			if(val===null) return 0;
+			if(val==='') return 0;
+			val = parseFloat(val);
+			if(set==1 && val==0) return val;
+			return val.toFixed(count)
+		},
+		
+		//折扣数值处理，小数位数为1时，只显示1位；小数位数为2时，才显示2位；
+		num: function(value) {
+			if(value != 0) {
+				var val = value.toFixed(2).toString();
+				if(val.indexOf('.') != -1) {
+					var arrval = val.split('.');
+					if(arrval[1].length == 1 && arrval[1][0] == 0) {
+						val = val.slice(0,-2);
+					};
+			
+					if(arrval[1].length == 2 && arrval[1][1] == 0) {
+						val = val.slice(0,-1);
+					};
+				};
+				return val;
+			} else {
+				return value.toFixed(0);
+			};
+		}, 
 }
 module.exports = {
 	  is_has_rank:g_filters.is_has_rank,
-	  get_card_price:g_filters.get_card_price,   
+	  get_card_price:g_filters.get_card_price,
+		num:g_filters.num,
 }
\ No newline at end of file
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 6cfea50..2b62622 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -700,7 +700,25 @@ Page({
           ee.check_is_youhui(ee.data.gid);
 
           t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss');
-          var txt = (t.data.data.shop_price / t.data.data.market_price * 10).toFixed(2);
+          var txt = (t.data.data.shop_price / t.data.data.market_price * 10).toFixed(2).toString();
+
+
+					if(txt != 0) {
+						if(txt.indexOf('.') != -1) {
+							var arrtxt = txt.split('.');
+							if(arrtxt[1].length == 1 && arrtxt[1][0] == 0) {
+								txt = txt.slice(0,-2);
+							};
+
+							if(arrtxt[1].length == 2 && arrtxt[1][1] == 0) {
+								txt = txt.slice(0,-1);
+							};
+						};
+					} else {
+						txt = 0;
+					}
+					
+					
           t.data.data['disc'] = txt;
 
           if (t.data.data.original_img.indexOf(o.imghost) == -1)
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index f32a9f2..ff7f676 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -257,7 +257,8 @@
 				 					  
 				  <view class="goods-num">
 				    <view class="sales">销量：{{prom_act.buy_num}}件</view>
-				    <view class="stock">折扣：{{filters.pInt((prom_price?prom_price:0)*100/data.shop_price)}}折</view>
+				    <!-- <view class="stock">折扣：{{data.disc}}折</view> -->
+						<view class="stock">折扣：{{g_filters.num((prom_price?prom_price:0)*100/data.shop_price)}}折</view>
 				    <view class="stock">{{categories3[0].num}}人评价</view>
 				  </view>				 
 			  </view>			  			 
@@ -364,6 +365,7 @@
             <view class="goods-num" wx:if="{{prom_type!=1}}">
               <view class="sales">销量：{{data.sales_sum}}件</view>
               <view class="stock">折扣：{{data.disc}}折</view>
+							<!-- <view class="stock">折扣：{{filters.pInt((prom_price?prom_price:0)*100/data.shop_price)}}折</view> -->
               <view class="stock">{{categories3[0].num}}人评价</view>
             </view>
             <view wx:if="{{prom_type==1}}">