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

taiyuan
2 parents 8b7d3697 df782149
Showing 15 changed files with 135 additions and 293 deletions
app.js
components/full_screen/filter.wxs
components/full_screen/full_screen.js
components/full_screen/full_screen.json
components/full_screen/full_screen.wxml
components/full_screen/full_screen.wxss
packageA/pages/jfbuy/jfbuy.wxml
pages/cart/cart2/cart2.js
pages/cart/cart2/cart2.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.wxss
pages/index/index/index.json
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -72,7 +72,7 @@ App({
       room_id:null,        //直播间分享的房间ID
       room_goods_id:null,  //直播间分享的商品ID
-
+	  
   },
     auth: o,
     request: a,
@@ -106,7 +106,12 @@ App({
 								app.globalData.user_id= user.user_id;
 							}							
 							wx.setStorageSync("userinfo",user);
-					  }
+					  }else{
+                        user=null;
+                        app.globalData.userInfo=null;
+                        app.globalData.user_id= 0;
+                        wx.setStorageSync("userinfo",null);
+                      }
 				})
             }
         }
@@ -246,6 +251,7 @@ App({
   //----------------获取商家开启的物流--------------------
   getwuliu: function (t, o){
+	this.globalData.wuliu=null;  
     var th = this, st = this.globalData.setting;
     this.globalData.wuliu && !o ?
       "function" == typeof t && t(this.globalData.wuliu) : a.get("/api/weshop/storeshipping/list", {
@@ -612,9 +618,7 @@ App({
         this.globalData.config2=null;                      //清除config2的缓存
         this.globalData.config=null;                       //清除config的缓存	
 		this.globalData.gr_index=0;                        //商品分组的序列
-		for(var i = 1; i < 50; i++) {
-		    clearInterval(i);
-		}
+	
     },
     clear_word:function (word) {
@@ -716,7 +720,7 @@ App({
 			});
 		},
-
+     
 });
-var format = function (text) {
-
-  if (!text) {
-    return
-  }
-  var reg = getRegExp('\\\\n', 'g')
-  return text.replace(reg, '\n')
-}
-
-module.exports = {
-  format: format
-}
-// components/userqy_pop_up/userqy_pop_up.js
-var  o = getApp().globalData.setting
-Component({
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    control: 1,
-	is_full_screen_show:0,  //全屏显示
-	sec_show:3,    //倒计时的秒数
-	full_ad:null,  //全屏广告
-	url:o.imghost,
-	full_screen:0,
-	is_full_screen_men:1,
-	hidden:0,
-  },
-  
-  pageLifetimes:{
-	hide: function() {
-        // 页面被隐藏
-		clearInterval(this.data.full_screen);
-	},
-  },
-
-  ready: function () {},
-  properties: {},
-  methods: {
-    close_full_screen(){
-    	this.setData({is_full_screen_show:0,sec_show:0});
-    },
-    //-- 跳转到满屏广告的链接 --
-    go_full_ad(){
-    	if(!this.data.full_ad) return false;
-    	if(!this.data.full_ad.ad_weapplink) return false;
-    	getApp().goto(this.data.full_ad.ad_weapplink);
-    },   
-    get_the_full_screen(){		
-		if(this.data.full_ad) {			
-			return false;		
-		}
-    	var th=this;
-    	//获取全屏的广告
-    	getApp().request.promiseGet("/api/weshop/ad/page?pid=1001&store_id=" + o.stoid,{
-    		data: { enabled: 1 }
-    	}).then(res=>{
-             //判断是不是有全屏广告 	
-    		 if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
-    			 th.setData({
-    				 is_full_screen_show:1,
-    				 full_ad:res.data.data.pageData[0],		 
-    			 })				 
-				 //--定时关闭--
-				 th.data.full_screen=setInterval(function(){
-				 	 if(!th.data.sec_show) {
-				 		  clearInterval(th.data.full_screen);
-				 		  th.close_full_screen();
-				 		  return false;
-				 	 }
-				 	 th.data.sec_show--;
-				 	 th.setData({sec_show:th.data.sec_show});		 
-				 },1000)
-							
-    		 }	
-    	})
-    }
-  },
- 
-})
 \ No newline at end of file
-{
-	"component": true,
-    "usingComponents": {}
-}
 \ No newline at end of file
-<!-- 全屏控制 -->
-<view wx:if="{{is_full_screen_show}}" class="full_screen" bindtap="go_full_ad"  style="background-image: url('{{url+full_ad.ad_code}}');">
-	 <view catchtap="close_full_screen"  class="skip_box">跳过 <text>{{sec_show}}</text></view>
-</view>
-
-
-
-.full_screen{
-	position: fixed;left: 0;top: 0;
-	z-index: 1000000000000;
-	background-color: rgba(0,0,0,0.4);
-	width: 100%;
-	height: 100%;
-	background-position: center;
-	background-size: 100% 100%;
-	background-repeat: no-repeat;
-}
-.skip_box{
-        float: right;  margin-top: 10rpx;  margin-right: 10rpx;
-        background-color: gainsboro;  width: 120rpx;
-        height: 48rpx;  font-size: 28rpx;  line-height: 48rpx;
-        text-align: center;  border-radius: 20rpx;
- }
 \ No newline at end of file
@@ -51,7 +51,7 @@
 									<text>{{item.integral}}积分 + ￥{{item.addmoney}}</text>						
 								</view>
 								<view class="pdt14 fs22 gray flex jc_sb">
-									<view>零售价：￥{{item.shop_price}}</view>
+									<view>零售价：￥{{item.market_price}}</view>
 									<view>销量：{{item.sales_sum}}</view>
 								</view>
 							</view>
@@ -501,9 +501,9 @@ Page({
             var narr = new Array(); narr.push(item);
-            //-----------拼装购物车结算的数组,如果有默认物流时要用默认物流编号-----------------
+            //-----------拼装购物车结算的数组,如果有默认物流时要用默认物流编号,计算默认的物流，不管是不是自提都算一下-----------------
             var m_wind=0,def_exp_code=getApp().globalData.userInfo.def_exp_code;
-            if(e_t==0 && def_exp_code){
+            if(def_exp_code){
                  for(var k=0;k<th.data.wu_arr.length;k++){
                       var item=th.data.wu_arr[k]; if(def_exp_code==item.code){  m_wind=k; }
                  }
@@ -146,7 +146,8 @@
 						<icon color="#f23030" size="16" type="info"></icon>
 						{{order.store_prom}}
 					</view>
-						
+					
+					<!-- 当是物流很多单的时候 -->
 					<view class="use-item flex-space-between" wx:if="{{cartlist.length>1}}">
 						<view class="flex-vertical" >
 							<view bindtap='setexptype_w' data-ind="{{pidx}}" data-t='1' data-txt='cartlist[{{pidx}}].exp_type' 
@@ -177,10 +178,10 @@
 								 class="yu_er">快递邮寄</view>
 							</view>
 						</view>
-						<!-- 当是物流很多单的时候 -->
+						
 						<!-- 点击显示物流选择,如果是默认使用的情况不成立 -->
-						<view wx:if="{{!is_default_logistics}}"  class="flex-vertical" bindtap="show_wu_arr" data-txt='cartlist[{{pidx}}].wind' data-w_sele_index="{{pidx}}" style="padding-right:6rpx;">
+						<view wx:if="{{!is_default_logistics && item.exp_type!=1}}"  class="flex-vertical" bindtap="show_wu_arr" data-txt='cartlist[{{pidx}}].wind' data-w_sele_index="{{pidx}}" style="padding-right:6rpx;">
 							<view>{{wu_arr[item.wind].name}}</view>
 							<view class="xc-right"></view>
 						</view>
@@ -399,7 +399,7 @@ Page({
               //--- 判断是等级会员，且在有效期范围内 ---
               if(user.card_field && now<end){
                 var card_name=ob.name_map.get(user.card_field);
-                if(card_name.length>6) card_name=card_name.substring(0,6);
+                //if(card_name.length>6) card_name=card_name.substring(0,6);
                 var is_near_date=0;
                 if(end-now<60*60*30*24) is_near_date=1; //如果小于30天
@@ -199,53 +199,17 @@
             </view>
           </view>
-          <!-- <view class="pt_fir se1">
-            <view class="pt_hb">
-              拼团玩法
-              <view class="ptgz_an xq flex" bindtap="show_pt_xx">查看详细
-                <view class="bg_right arrow-two"></view>
-              </view>
-            </view>
-            <view class="flex-level" style='height:198rpx; width:100%;'>
-              <view class="flex-vertical-between rel" style='width:94%;margin-left:10rpx;'>
-
-                <view class="xc-item t-c">
-                  <view class="circle yuan t-c circle-color">1</view>
-                  <view class="word">选择商品完成下单</view>
-                </view>
-                <view class="abs link {{color_type==0?'link-color-red':'link-color'}}"></view>
-
-                <view class="xc-item t-c">
-                  <view class="circle yuan t-c circle-color">2</view>
-                  <view class="word">支付开团或参团</view>
-                </view>
-                <view class="abs  link1 {{color_type_one==0?'link-color-red':'link-color'}}"></view>
-
-                <view class="xc-item t-c">
-                  <view class="circle yuan t-c circle-color">3</view>
-                  <view class="word">邀请好友参团支付</view>
-                </view>
-                <view class="abs link2  {{color_type_two==0?'link-color-red':'link-color'}}"></view>
-
-                <view class="xc-item t-c">
-                  <view class="circle yuan t-c circle-color1">4</view>
-                  <view class="word">人满发货失败退款</view>
-                </view>
-              </view>
-            </view>
-          </view> -->
         </view>
         <!-- 积分购 -->
         <view wx:if="{{prom_type==4}}">	
 			  <view class="goods-price">
 				  <!-- 价格显示 -->
-				  <view class="co-red flex ai_c jc_sb">
-				      <view class="market-price" style="overflow: hidden; height: 66rpx;display: flex;">
+				  <view class="co-red flex jc_sb ai-center">
+				      <view class="market-price" style="overflow: hidden; height: 66rpx;display: flex; align-items: flex-end;">
 					     <image class="rel_img" src="{{iurl}}/miniapp/images/integral/integral_red.png"></image>
-						 <block wx:if="{{prom_integral}}">{{prom_integral}}
-						 <text class="rel_txt">积分</text></block>						
+						 <block wx:if="{{prom_integral}}"><text style="position: relative;top:10rpx">{{prom_integral}}</text><text class="rel_txt">积分</text></block>						
 						 <text class="rel_txt" wx:if="{{prom_integral && prom_price}}">+</text>						
 					     <text class="rel_txt" wx:if="{{prom_price}}" >{{filters.toFix(prom_price,2)}}元</text> 					 
 						 <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text>						 
@@ -253,13 +217,6 @@
 					  </view>
 						<!-- 这个是分享按钮 -->
-						<!-- <view class="xc-share-frame flex  {{prom_type==1?'s_ms_bth':''}} "  bindtap="saveImageToPhotosAlbum"> -->
-						<!-- <view class="xc-share-frame flex  {{prom_type==1?'s_ms_bth':''}} "  bindtap="clickShare">
-						<image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image>
-						<view class="share-font">分享</view>
-						</view> -->
-						
-						<!-- 这个是分享按钮 -->
 						<!-- <view class="xc-share-frame {{prom_type==1?'s_ms_bth':''}} t-c"  bindtap="saveImageToPhotosAlbum"> -->
 						<view class="xc-share-frame t-c"  bindtap="clickShare">
 							<!-- <image class="share-frame" src="{{iurl}}/miniapp/images/share.png"></image> -->
@@ -2789,9 +2789,10 @@ button.custom-service::after{
 } */
 .goods-price .rel_txt{
-	position: relative; top: 32rpx; font-size: 30rpx;
+    /* position: relative; top: 32rpx;  */
+    font-size: 30rpx;
 }
-.goods-price .rel_img{width: 62rpx; height: 62rpx;position: relative; top: 12rpx;}   
+.goods-price .rel_img{width: 62rpx; height: 62rpx;position: relative; top: 8rpx;}   
 .btn-close {
  /* background-color: rgba(0,0,0,.5); */
@@ -18,7 +18,6 @@
         "mvideo": "/components/diy_video/diy_video",    
         "service": "/components/diy_service/diy_service",
 		"scan": "/components/diy_scan/diy_scan",
-		"full_screen": "/components/full_screen/full_screen",
 		"store_select": "/components/diy_store_select/diy_store_select"
     },
 	"enablePullDownRefresh": false
@@ -370,10 +370,9 @@ Page({
 			var buyed_mum2=goodsbuynum+good.goods_num;		
 			if (buyed_mum2 > limit && limit > 0) {
-			  wx.showModal({
-			    title: '提示',
-			    content: gg.goods_name+'购买数量超出商品限购'
-			  });
+			 
+			  var content=gg.goods_name+'购买数量超出商品限购,请取消订单';
+			  th.toast(content);
 			  return false;
 			}
@@ -384,24 +383,21 @@ Page({
 			        if(res.data.code==0){
 			                var r_data=res.data.data;
 			                if(!r_data.collocationPromList && good.prom_type==5){
-			                    wx.showModal({
-			                        title: '提示',
-			                        content: good.goods_name+'未找到活动'
-			                    });
+			                   
+			                    var content=good.goods_name+'未找到活动,请取消订单重新购买';
+			                    th.toast(content);
 								p_ok=0;
 			                }
 			                if(!r_data.promGoodsLists && good.prom_type==3){
-			                    wx.showModal({
-			                        title: '提示',
-			                        content: good.goods_name+'未找到活动'
-			                    });
+			                   
+			                    var  content=good.goods_name+'未找到活动,请取消订单重新购买';
+			                    th.toast(content);
 								p_ok=0;
 			                }
 			        }else{
-			            wx.showModal({
-			                title: '提示',
-			                content: good.goods_name+'未找到活动'
-			            });
+			          
+			            var content=good.goods_name+'未找到活动,请取消订单重新购买';
+			            th.toast(content);
 			            p_ok=0;
 			        }
 			    })	
@@ -411,10 +407,9 @@ Page({
 			//商品的普通购买 ，不要进行判断
 			if((good.prom_type==1 || good.prom_type==6  || good.prom_type==4) && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal){
 				   if(gg.prom_type!=good.prom_type)	{
-					   wx.showModal({
-					     title: '提示',
-					     content: gg.goods_name+'商品的活动发生了变化'
-					   });
+					  
+					   var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
+					   th.toast(content);
 					   return false;		   
 				   }
 			  }else{
@@ -453,27 +448,25 @@ Page({
 				  				  if(prom){
 				  					  var t_now=ut.gettimestamp();
 				  					  if(prom.is_end==0 && prom.start_time<t_now && prom.end_time>t_now){
-				  						  wx.showModal({
-				  						    title: '提示',
-				  						    content: gg.goods_name+'商品的活动发生了变化'
-				  						  });
+				  						  
+				  						  var  content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
+				  						  th.toast(content);
 				  						  return false;	
 				  					  }
 				  				  } 				  
 				  }
 				  else{
                           //不是赠品的时候
-				  	      if(!good.is_gift){
+				  	      if(!good.is_gift && good.prom_type!=3){
 							  var t_ok=1;
 							  await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
 								  if(res.data.code==0){
 									  var r_data=res.data.data;
 									  //-- 参加了全局的优惠活动 --
 									  if(r_data.promGoodsLists){
-										  wx.showModal({
-											  title: '提示',
-											  content: gg.goods_name+'商品的活动发生了变化'
-										  });
+										 
+										  var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
+										  th.toast(content);
 										  t_ok=0;
 									  }
 								  }
@@ -499,10 +492,9 @@ Page({
 		             }
 		              var is_h=0;
 		              if (!isok) {
-		                  wx.showModal({
-		                      title: '提示',
-		                      content: gg.goods_name + '商品的价格发生了变化'
-		                  });
+		                 
+		                  var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买';
+		                  th.toast(content);
 		                  return false;
 		              }
 		          }
@@ -514,19 +506,17 @@ Page({
 						   ob=obj;
 					   })
 					   if(ob.code==-1){
-						   wx.showModal({
-						     title: '提示',
-						     content: gg.goods_name+'门店库存不足'
-						   });
+						 
+						   var content=gg.goods_name+'门店库存不足,请取消订单';
+						   th.toast(content);
 						   return false;		
 					   }				   
 				  }else{
 					  if(good.goods_num>store_count){
-						   wx.showModal({
-							 title: '提示',
-							 content: gg.goods_name+'商品的库存不足'
-						   });
+						  
+						   var content=gg.goods_name+'商品的库存不足,请取消订单';
+						   th.toast(content);
 						   return false;		
 					  }
@@ -567,28 +557,25 @@ Page({
 			   if(prom){
 			  			  var now=ut.gettimestamp();
 			  			  if(prom.is_end==1 && prom.end_time<now){			   
-			  				wx.showModal({
-			  				  title: '提示',
-			  				  content: goodsinfo.goods_name+'商品的活动已经结束'
-			  				});
+			  				
+			  				var content=goodsinfo.goods_name+'商品的活动已经结束,请取消订单重新购买';
+			  				th.toast(content);
 			  				return false;		
 			  			  }
 			  			  buyed_mum2=promgoodsbuynum+good.goods_num;
 			  			  if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
-			  			    wx.showModal({
-			  			      title: '提示',
-			  			      content: goodsinfo.goods_name+'购买数量超出商品活动限购'
-			  			    });
+			  			   
+			  			    var content=goodsinfo.goods_name+'购买数量超出商品活动限购,请取消订单重新购买';
+			  			    th.toast(content);
 			  			    return false;
 			  			  }
 			  			  if(goodsinfo.prom_type==4){
 			  				  if (good.goods_num > prom.limitqty-prom.buy_num) {
-			  				    wx.showModal({
-			  				      title: '提示',
-			  				      content: goodsinfo.goods_name+'购买数量超出商品活动库存'
-			  				    });
+			  				   
+			  				    var content=goodsinfo.goods_name+'购买数量超出商品活动库存,请取消订单';
+			  				    th.toast(content);
 			  				    return false;
 			  				  }				  
 			  			  }else{
@@ -601,9 +588,9 @@ Page({
 			  				  });
 			  				  if (good.goods_num > redis_num) {
-			  				    wx.showModal({
-			  				       title: gg.goods_name+'超出商品活动库存',
-			  				    });
+			  				   
+			  				    var content=gg.goods_name+'超出商品活动库存,请取消订单';
+			  				    th.toast(content);
 			  				    return false;
 			  				  }	
 			  			  }
@@ -641,10 +628,9 @@ Page({
 				//判断线下取价是不是一样
 				if(newarr[good.erpwareid] && 
 				   parseFloat(newarr[good.erpwareid].WarePrice)!=parseFloat(good.goods_price)){		
-					 wx.showModal({
-					    title: '提示',
-					    content: good.goods_name + '商品的价格发生了变化'
-					 });
+					
+					 var content=good.goods_name + '商品的价格发生了变化,请取消订单重新购买';
+					 th.toast(content);
 					 return false;	
 				}
 			}	
@@ -1286,6 +1272,14 @@ Page({
 			  }
 		  }
+	},
+
+	toast(msg){
+		wx.showToast({
+			title: msg,
+			icon: 'none',
+			duration: 3000
+		})
 	}
@@ -487,10 +487,9 @@ Page({
 		var buyed_mum2=goodsbuynum+good.goods_num;		
 		if (buyed_mum2 > limit && limit > 0) {
-		  wx.showModal({
-		    title: '提示',
-		    content: gg.goods_name+'购买数量超出商品限购'
-		  });
+		
+		  var  content=gg.goods_name+'购买数量超出商品限购,请取消订单';
+		  th.toast(content);
 		  return false;
 		}
@@ -500,25 +499,23 @@ Page({
 		    await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
 		        if(res.data.code==0){
 		                var r_data=res.data.data;
-		                if(!r_data.collocationPromList && good.prom_type==5){
-		                    wx.showModal({
-		                        title: '提示',
-		                        content: good.goods_name+'未找到活动'
-		                    });
+		                if(!r_data.collocationPromList && good.prom_type==5){		                   
+		                    
+							var  content=good.goods_name+'未找到活动,请取消订单重新购买';
+							th.toast(content)
+
 							p_ok=0;
 		                }
 		                if(!r_data.promGoodsLists && good.prom_type==3){
-		                    wx.showModal({
-		                        title: '提示',
-		                        content: good.goods_name+'未找到活动'
-		                    });
+		                  
+		                    var content=good.goods_name+'未找到活动,请取消订单重新购买';
+		                    th.toast(content);
 							p_ok=0;
 		                }
 		        }else{
-		            wx.showModal({
-		                title: '提示',
-		                content: good.goods_name+'未找到活动'
-		            });
+		           
+		            var content=good.goods_name+'未找到活动,请取消订单重新购买'
+					th.toast(content);
 		            p_ok=0;
 		        }
 		    })	
@@ -528,11 +525,9 @@ Page({
 		//商品的普通购买 ，不要进行判断
 		if((good.prom_type==1 || good.prom_type==6  || good.prom_type==4 ) 
 		       && !good.is_gift && !good.is_collocation && !good.is_integral_normal && !good.is_pd_normal){
-			   if(gg.prom_type!=good.prom_type)	{
-				   wx.showModal({
-				     title: '提示',
-				     content: gg.goods_name+'商品的活动发生了变化'
-				   });
+			   if(gg.prom_type!=good.prom_type)	{				   
+				   var  content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
+				   th.toast(content);
 				   return false;		   
 			   }
@@ -572,26 +567,23 @@ Page({
 				  if(prom){
 					  var t_now=ut.gettimestamp();
 					  if(prom.is_end==0 && prom.start_time<t_now && prom.end_time>t_now){
-						  wx.showModal({
-						    title: '提示',
-						    content: gg.goods_name+'商品的活动发生了变化'
-						  });
+						 
+						  var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
+						  th.toast(content);
 						  return false;	
 					  }
 				  } 				  
 			  }
 			  else{
-			      if(!good.is_gift ){
+			      if(!good.is_gift && good.prom_type!=3 ){
                       var t_ok=1;
                       await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => {
                           if(res.data.code==0){
                               var r_data=res.data.data;
                               //-- 参加了全局的优惠活动 --
-                              if(r_data.promGoodsLists){
-                                  wx.showModal({
-                                      title: '提示',
-                                      content: gg.goods_name+'商品的活动发生了变化'
-                                  });
+                              if(r_data.promGoodsLists){                                 
+                                  var content=gg.goods_name+'商品的活动发生了变化,请取消订单重新购买';
+								  th.toast(content);
                                   t_ok=0;
                               }
                           }
@@ -617,10 +609,9 @@ Page({
                   }
                   var is_h=0;
                   if (!isok) {
-                      wx.showModal({
-                          title: '提示',
-                          content: gg.goods_name + '商品的价格发生了变化'
-                      });
+                     
+                      var content=gg.goods_name + '商品的价格发生了变化,请取消订单重新购买'
+                      th.toast(content);
                       return false;
                   }
               }
@@ -632,19 +623,17 @@ Page({
 					   ob=obj;
 				   })
 				   if(ob.code==-1){
-					   wx.showModal({
-					     title: '提示',
-					     content: gg.goods_name+'门店库存不足'
-					   });
+					   
+					   var content=gg.goods_name+'门店库存不足,请取消订单';
+					   th.toast(content);
 					   return false;		
 				   }				   
 			  }else{
 				  if(good.goods_num>store_count){
-					   wx.showModal({
-						 title: '提示',
-						 content: gg.goods_name+'商品的库存不足'
-					   });
+					  
+					   var content=gg.goods_name+'商品的库存不足,请取消订单';
+					   th.toast(content);
 					   return false;		
 				  }
@@ -685,28 +674,25 @@ Page({
 		  if(prom){
 			  var now=ut.gettimestamp();
 			  if(prom.is_end==1 && prom.end_time<now){			   
-				wx.showModal({
-				  title: '提示',
-				  content: goodsinfo.goods_name+'商品的活动已经结束'
-				});
+				
+				var content=goodsinfo.goods_name+'商品的活动已经结束,请取消订单'
+				th.toast(content);
 				return false;		
 			  }
 			  buyed_mum2=promgoodsbuynum+good.goods_num;
 			  if (buyed_mum2 > prom.buy_limit && prom.buy_limit > 0) {
-			    wx.showModal({
-			      title: '提示',
-			      content: goodsinfo.goods_name+'购买数量超出商品活动限购'
-			    });
+			    
+			    var content=goodsinfo.goods_name+'购买数量超出商品活动限购,请取消订单'
+			    th.toast(content);
 			    return false;
 			  }
 			  if(goodsinfo.prom_type==4){
 				  if (good.goods_num > prom.limitqty-prom.buy_num) {
-				    wx.showModal({
-				      title: '提示',
-				      content: goodsinfo.goods_name+'购买数量超出商品活动库存'
-				    });
+				   
+				    var content=goodsinfo.goods_name+'购买数量超出商品活动库存,请取消订单'
+				    th.toast(content);
 				    return false;
 				  }				  
 			  }else{
@@ -719,9 +705,9 @@ Page({
 				  });
 				  if (good.goods_num > redis_num) {
-				    wx.showModal({
-				       title: gg.goods_name+'超出商品活动库存',
-				    });
+				  
+				    var content=gg.goods_name+'超出商品活动库存,请取消订单';
+				    th.toast(content);
 				    return false;
 				  }	
 			  }
@@ -749,7 +735,7 @@ Page({
 			}
 		})				
 		if(!offarr && offarr.length<=0){
-			wx.showModal({ title: '获取线下取价失败',});
+			th.toast('获取线下取价失败');
 		}
 		var newarr=ut.convert_arr_key(offarr,'WareId');	
 		//-- 循环判断线下的价格 --	
@@ -758,10 +744,9 @@ Page({
 			//判断线下取价是不是一样
 			if(newarr[good.erpwareid] && 
 			   parseFloat(newarr[good.erpwareid].WarePrice)!=parseFloat(good.goods_price)){		
-				 wx.showModal({
-				    title: '提示',
-				    content: good.goods_name + '商品的价格发生了变化'
-				 });
+				
+				 var content=good.goods_name + '商品的价格发生了变化,请取消订单重新购买';
+				 th.toast(content);
 				 return false;	
 			}
 		}	
@@ -1583,6 +1568,14 @@ Page({
 		// clock += ss; 
 		return clock; 
 	},
+
+	toast(msg){
+		wx.showToast({
+			title: msg,
+			icon: 'none',
+			duration: 3000
+		})
+	}
 });
 \ No newline at end of file