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

后端研发-苏泰源
2 parents 59d8080a 1dbfc0aa
Showing 22 changed files with 350 additions and 169 deletions
packageA/pages/checkin/checkin.js
packageA/pages/checkin/checkin.wxml
packageA/pages/checkin/checkin.wxss
packageA/pages/checkin/g_filter.wxs
packageA/pages/prom_list/prom_list.js
packageB/pages/evaluate/evaluate.js
packageB/pages/evaluate/evaluate.wxml
packageB/pages/zuhegou/list/list.js
packageB/pages/zuhegou/preindex/index.wxml
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
packageC/pages/payForAnother/payForAnother.js
packageC/pages/presell/cart/cart.js
packageC/pages/presell/list/list.js
pages/activity/pind_list/pind_list.js
pages/activity/seckill_list/seckill_list.js
pages/cart/cart2/cart2.js
pages/cart/cart2/cart2.wxml
pages/index/index/index.js
pages/index/index/index.wxml
pages/user/coupons/coupons.wxml
@@ -2,6 +2,7 @@
 var md5 = require("../../../utils/md5.js");
 var ut = require("../../../utils/util.js");
 const app = getApp();
+const os=app.globalData.setting;
 let self;
 Page({
@@ -77,6 +78,27 @@ Page({
 			});
 			self.loadQd();
 		});
+
+		// 广告
+		getApp().request.promiseGet("/api/weshop/ad/page?pid=1205&store_id=" + os.stoid, {
+		  data: {
+		    enabled: 1
+		  }
+		}).then(res => {
+			if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){
+				var a = res.data.data.pageData;
+				var narr=[];
+				for(var i in a){
+					var tt = {
+					  'ad_code': os.imghost + a[i].ad_code,
+					  'media_link': '',
+					  'ad_weapplink':a[i].ad_weapplink
+					};
+					narr.push(tt);
+				}
+				self.setData({ad_data:narr});				
+			}					 			
+		});
 	},
@@ -362,6 +384,11 @@ Page({
 	  var d = dd.getDate() < 10 ? "0" + dd.getDate() : dd.getDate();
 	  //return y + "-" + m + "-" + d;
 	  return [m + "-" + d,dd.getDate()];
+	},
+	go_url(e){
+		let url=e.currentTarget.dataset.url;
+		if(url){
+			getApp().goto(url);
+		}
 	}
-	
 })
-<!--packageA//pages/checkin/checkin.wxml-->
+<wxs module="filters" src="../../../utils/filter.wxs"></wxs>
+<wxs module="g_filter" src="g_filter.wxs"></wxs>
 <wxs src="checkin.wxs" module="myUtil"></wxs>
 <view class="checkin-container">
 	<view class="rule-container flex">
 		<view class="rule" bindtap="showRules">规则</view>
-		<view class="points" bindtap="goto" data-url="/pages/user/integral/integral"><image class="coin" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/coins.png"></image>我的积分</view>
-	
+		<view class="points" bindtap="goto" data-url="/pages/user/integral/integral">
+			<image class="coin" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/coins.png"></image>我的积分
+		</view>
 	</view>
-	
 	<view class="list flex" wx:if="{{res}}">
 		<view class="list-item active}}">
 			<view class="circle">+{{res.cday1}}</view>
@@ -38,7 +39,7 @@
 		</view>
 	</view>
 	<view wx:else style="height: 100rpx;"></view>
-	
+
 	<view class="btn-container" wx:if="{{res}}">
 		<view class="btn" bindtap="checkInToday" wx:if="{{isLogin}}">
 			<text class="iconfont icon-rili"></text>{{!myUtil.setDate_is_act(year, res.sday3, 0,res.qddaylist) ? '立即签到':'今日已签到'}}
@@ -48,14 +49,14 @@
 		</view>
 		<view class="btn" wx:if="{{res.curbqdaynum}}" bindtap="reCheckIn"><text class="iconfont icon-buqian"></text>补签(-{{res.getBQIntegral}}分)</view>
 	</view>
-	
-	
+
+
 	<!-- <view class="current">
 		<view class="f-vc">当前连续签到：<text class="days fs34">{{res.getlxnum}}</text> 天</view>
 		<view class="f-vc">当前积分：<text class="fs34">{{integral}}</text></view>
-	</view> -->	
+	</view> -->
 	<!-- <view class="goleft iconfont icon-jianzuo" bindtap="prevMonth">a</view> -->
-	
+
 	<view class="calendar-container">
 		<view class="calendar-wrapper">
 			<view class="calendar-title">
@@ -64,35 +65,35 @@
 				<view wx:if="{{res.getkbqnum}}" class="fs24" style="color:#999;font-weight:bold">补签卡：{{res.getkbqnum}}</view>
 			</view>
 			<view class="calendar">
-			 <!-- <view class="selectDate"> -->
-			 <!-- <view class="goleft iconfont icon-jianzuo" bindtap="prevMonth">a</view> -->
-			 <!-- <view class="date-wrap">
+				<!-- <view class="selectDate"> -->
+				<!-- <view class="goleft iconfont icon-jianzuo" bindtap="prevMonth">a</view> -->
+				<!-- <view class="date-wrap">
 			  {{year}}年{{month}}月
 			 </view> -->
-			 <!-- <view class="goright iconfont icon-jianzuo" bindtap="nextMonth">b</view> -->
-			 <!-- </view> -->
-			 <view class="week">
-				 <view wx:for="{{weekArr}}" wx:for-index="index" wx:for-item="item" wx:key="key" style="height:{{param-17}}px;line-height:{{param-17}}px;flex:1;">{{item}}</view>
-			 </view>
-			 
-			 <view class="date">
-			   <block wx:for="{{dateArr}}" wx:for-index="index" wx:for-item="item" wx:key="key">
-					 <!-- <view style="{{index ==0?'margin-left:calc(100%/7 * ' + firstDay + ');':''}}width:calc(100%/7);line-height:80rpx;" class="{{index+1==day?'today':''}} {{index+1==day&&isClock?'clockOn':''}}" ><view class="day">{{item}}</view></view> -->
-			     <view style="{{index ==0?'margin-left:calc(100%/7 * 0);':''}}width:calc(100%/7);line-height:80rpx;" class="{{item.isCheckIn ? 'active':''}} {{res.curbqdaynum&&item.isBq ? 'bq':''}}" bindtap="clickDay" data-day="{{item.num}}">
-						 <view class="day">{{item.num}}</view>
-					 </view>
-			   </block>
-			 </view>
-			 
+				<!-- <view class="goright iconfont icon-jianzuo" bindtap="nextMonth">b</view> -->
+				<!-- </view> -->
+				<view class="week">
+					<view wx:for="{{weekArr}}" wx:for-index="index" wx:for-item="item" wx:key="key" style="height:{{param-17}}px;line-height:{{param-17}}px;flex:1;">{{item}}</view>
+				</view>
+
+				<view class="date">
+					<block wx:for="{{dateArr}}" wx:for-index="index" wx:for-item="item" wx:key="key">
+						<!-- <view style="{{index ==0?'margin-left:calc(100%/7 * ' + firstDay + ');':''}}width:calc(100%/7);line-height:80rpx;" class="{{index+1==day?'today':''}} {{index+1==day&&isClock?'clockOn':''}}" ><view class="day">{{item}}</view></view> -->
+						<view style="{{index ==0?'margin-left:calc(100%/7 * 0);':''}}width:calc(100%/7);line-height:80rpx;" class="{{item.isCheckIn ? 'active':''}} {{res.curbqdaynum&&item.isBq ? 'bq':''}}" bindtap="clickDay" data-day="{{item.num}}">
+							<view class="day">{{item.num}}</view>
+						</view>
+					</block>
+				</view>
+
 			</view>
 		</view>
-		
+
 	</view>
-	
+
 	<view class="jfbuy-container">
 		<view class="jfbuy flex">
-			<image class="jfbuy-img" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/liwu.png"></image>
-			<view class="right">
+			<!-- <image class="jfbuy-img" src="https://mshop-lib.yolipai.net/template/mobile/new/static/images/integral/liwu.png"></image> -->
+			<!-- <view class="right">
 				<view>
 					<view class="t1">小积分大作为</view>
 					<view class="t2">积分抵用现金，积少成多</view>
@@ -100,10 +101,33 @@
 				<view class="t-c">
 					<view class="btn-buy" bindtap="goto" data-url="/packageA/pages/jfbuy/jfbuy">去购物 Go!</view>
 				</view>
-			</view>
+			</view> -->
+			<block wx:if="{{ad_data}}">
+				<swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500" style="height:240rpx;width: 670rpx;">
+					<block wx:for="{{ad_data}}">
+
+						<navigator url="{{item.ad_weapplink}}"  wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}">
+							<swiper-item>
+								<image src="{{item.ad_code}}" style="width: 100%;height: 240rpx;" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" />
+							</swiper-item>
+						</navigator>
+
+						<view data-url="{{item.ad_weapplink}}" wx:else bindtap="go_url">
+							<swiper-item>
+								<image src="{{item.ad_code}}" style="width: 100%;height: 240rpx;" class="slide-image" mode="widthFix" lazy-load="true" />
+							</swiper-item>
+						</view>
+
+					</block>
+				</swiper>
+
+			</block>
+			<block wx:else>
+				<image class="xc-top-img" src="{{url}}/miniapp/images/seckill_top_img.jpg"></image>
+			</block>
 		</view>
 	</view>
-	
+
 	<view class="popup-container" wx:if="{{isShowRules}}">
 		<view class="popup-wrapper">
 			<view class="popup">
@@ -115,5 +139,5 @@
 			</view>
 		</view>
 	</view>
-	
-</view>
+
+</view>
 \ No newline at end of file
@@ -197,7 +197,7 @@ page,
 .jfbuy {
 	/* border: 2rpx solid black; */
 	border-radius: 16rpx;
-	padding: 40rpx 30rpx;
+	/* padding: 40rpx 30rpx; */
 	background-color: #FF980F;
 	box-shadow: 0 2rpx 16rpx #FF7A07;
 	/* position: fixed;
+var g_filters = {
+	has_char:function(url,key){
+	  if(!url)	return -1;
+	  return url.indexOf(key);		
+	},
+	beg_time:function(beg_date){
+	    var fmt1 = beg_date.substring(0, 19);
+        var reg = getRegExp("-", "g");
+        var fmt2 = fmt1.replace(reg, '/');
+        var t1 = getDate(fmt2);
+        var tnow=getDate();
+        if(t1<=tnow) return 1;
+        return 0;
+	},
+	end_time:function(end_date){
+	        var fmt1 = end_date.substring(0, 19);
+            var reg = getRegExp("-", "g");
+            var fmt2 = fmt1.replace(reg, '/');
+            var t1 = getDate(fmt2);
+            var tnow=getDate();
+            if(t1>=tnow) return 1;
+            return 0;
+	},
+	goToUrl: function(type, id, name) {
+		if (type == 1) {
+			return "/packageB/pages/zuhegou/index/index?id="+id+"&title="+name
+		} else {
+			return "/packageB/pages/zuhegou/preIndex/index?id="+id+"&title="+name
+		}
+	},
+
+}
+module.exports = {
+	has_char: g_filters.has_char,
+	beg_time: g_filters.beg_time,
+	end_time: g_filters.end_time,
+	goToUrl: g_filters.goToUrl,
+}
 \ No newline at end of file
@@ -269,6 +269,7 @@ Page({
     						if (res.data.code == 0) {
 									var r_data = res.data.data;
+									
 									th.data.is_coupon = r_data.collocationPromList.is_coupon;
@@ -26,6 +26,7 @@ Page({
 	is_act:0, //是否能购获取图片 
 	actId:0,   //活动ID
 	giftBagId:0, //礼包ID
+    ftype:0
   },
   //点击星级
@@ -98,8 +99,19 @@ Page({
   //查询美导信息
   query_bea: function() {
-    var th = this;
-    var url = "/api/weshop/order/pagePosOrder";
+     var th = this;
+     var url = "/api/weshop/order/pagePosOrder";
+
+     switch (this.data.ftype){
+     	case 3:
+     		break;
+     	case 4:
+            url = "/api/weshop/serviceCard/pagePos";
+     		break;
+     	default:
+     	 	break
+     }
+
     var number = th.data.number; //订单编号
     getApp().request.promiseGet(url, {
       data: {
@@ -175,10 +187,10 @@ Page({
     var url = th.data.url + "/api/weshop/evaluation/evaluate/insert";
     var posNo = th.data.number; //收银单号
     var proposal = th.data.proposal; //用户建议内容
-    var fromType = th.data.fromType; //评价来源
+    var fromType = th.data.ftype?th.data.ftype:1; //评价来源
     var json = {
       "evaLabList": evaLabList,
-      "fromType": 1,
+      "fromType": fromType,
       "number": posNo,
       "remark": proposal,
       "star": stars + 1,
@@ -197,9 +209,15 @@ Page({
         if (res.data.code == 0) {
           getApp().my_warnning("评价成功", 1, th);
           var namber=th.data.number;
+
+          var url="/packageB/pages/evaluate_list/evaluate_list?IsEvaluate=1";
+          if(th.data.ftype==4){
+              url="/pages/user/index/index";
+          }
+
           setTimeout(function() {
             wx.redirectTo({
-              url: "/packageB/pages/evaluate_list/evaluate_list?IsEvaluate=1"
+              url: url
             });
           }, 2000);
         } else {
@@ -218,11 +236,17 @@ Page({
       number: options.number,
       //is_evaluate: options.evaluate
     })
+
+    if(options.fromtype){
+          this.setData({ftype:parseInt(options.fromtype)}) ;
+          if(options.fromtype==4) 	th.judge_act();
+    }
     //th.query_bea();
-	//th.judge_act();
+
 	var userinfo=getApp().globalData.userInfo;
 	console.log("userinfo",userinfo)
-	
+
+
 	if(!userinfo){
 		 getApp().goto("/pages/togoin/togoin");
 	}
@@ -260,9 +284,11 @@ Page({
         var id=this.data.actId;
         var gifbagid = this.data.gifbagid;   
-        console.log(id,"订单", this.data.number),
+        console.log(id,"订单", this.data.number);
+
+        var ty=this.data.ftype?this.data.ftype:2;
         wx.redirectTo({
-          url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType=2&orderNumber="+this.data.number
+          url: "/pages/giftpack/evaluategift/evaluategift?actId="+id+ "&orderType="+ty+"&orderNumber="+this.data.number
         });
   },
@@ -271,10 +297,13 @@ Page({
   judge_act: function () {
     var th = this;
     var url = "/api/weshop/marketing/comment/act/judge";
+
+    var ty=this.data.ftype?this.data.ftype:2;
+
     getApp().request.promiseGet(url, {
       data: {
         orderNumber: th.data.number,
-        orderType: 2,
+        orderType: ty,
         storeId: a.stoid,
         userId: d.user_id
       }
@@ -17,7 +17,7 @@
   <!-- 项目 -->
   <view class="flex-center item" bindtap="show_goods" data-index="{{index}}">
     <view class="itemlf fs32 flex-level-right">购买商品：</view>
-    <view class="itemlr fs30 ellipsis-1 go_right">{{it.list[0].WareName}}</view>
+    <view class="itemlr fs30 ellipsis-1 go_right">{{it.list[0].WareName?it.list[0].WareName:it.list[0].ItemName}}</view>
   </view>
   <!-- 时间 -->
@@ -94,13 +94,14 @@
 </navigator>
 <view wx:else> 
-
+<block wx:if="{{ftype!=4}}">
   <view style="margin: auto;margin-bottom: 30rpx;" class="Submission flex-center" bindtap="evaluate_qt">
     <view>评价其他</view>
   </view>
   <view style="margin: auto;margin-bottom: 30rpx;" class="Submission flex-center" bindtap="evaluate_qt" data-status="1">
     <view>查看已评价的订单</view>
   </view>
+</block>
   <!-- 显示来个图标 -->
   <view class="show_icon" style="margin-top: 60rpx;">
@@ -133,7 +134,7 @@
 		<view class="title">商品详情</view>
 		<view style="padding: 0 20rpx;">
 			<view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{show_goods_list}}">
-				<view>{{item.WareName}}</view>
+				<view>{{item.WareName?item.WareName:item.ItemName}}</view>
 				<view>{{item.Qty}}</view>
 			</view>		
 		</view>
@@ -251,6 +251,12 @@ Page({
 		  if (hei< viewHeight) {
 		      this.setData({ max_sw_height: viewHeight });
 		   }
-		}
+    },
+    go_url(e){
+      let url=e.currentTarget.dataset.url;
+      if(url){
+        getApp().goto(url);
+      }
+    }
 });
@@ -6,7 +6,7 @@
             <text class="iconfont icon-arrow_right"></text>
         </view>
     </view>
-    <view wx:if="{{djs}}" class="countdown-container">距结束还剩
+    <view wx:if="{{djs}}" class="countdown-container">距开始还剩
         <text wx:if="{{djs.day}}">{{djs.day}}天</text>
         <text class="num-box">{{djs.hou}}</text>
         :
@@ -1605,16 +1605,19 @@ Page({
                     }).then(res => {
                         if (res.data.code == 0) {
                             var ord_prom = res.data.data;
-                            order_prom_id = ord_prom['id'];
-                            switch (ord_prom['type']) {
-                                case 0:
-                                    order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
-                                    order_prom_amount = (o_condition - order_m).toFixed(2);
-                                    break;
-                                case 1:
-                                    //order_m = o_condition - ord_prom['expression'];//满额优惠金额
-                                    order_prom_amount = ord_prom['expression'];
-                                    break;
+                            //么有使用券，或者活动没有限制使用优惠券
+                            if(quan_price<=0 || !ord_prom.is_xz_yh) {
+                                order_prom_id = ord_prom['id'];
+                                switch (ord_prom['type']) {
+                                    case 0:
+                                        order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+                                        order_prom_amount = (o_condition - order_m).toFixed(2);
+                                        break;
+                                    case 1:
+                                        //order_m = o_condition - ord_prom['expression'];//满额优惠金额
+                                        order_prom_amount = ord_prom['expression'];
+                                        break;
+                                }
                             }
                         }
                     })
@@ -1955,16 +1958,20 @@ Page({
                         var order_prom_id = 0;
                         if (th.data.order_prom[th.data.bn_pick]) {
                             var ord_prom = th.data.order_prom[th.data.bn_pick];
-                            order_prom_id = ord_prom['id'];
-                            switch (ord_prom['type']) {
-                                case 0:
-                                    order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
-                                    order_prom_amount = (o_condition - order_m).toFixed(2);
-                                    break;
-                                case 1:
-                                    order_m = o_condition - ord_prom['expression'];//满额优惠金额
-                                    order_prom_amount = ord_prom['expression'];
-                                    break;
+
+                            //么有使用券，或者活动没有限制使用优惠券
+                            if(coupon_price<=0 || !ord_prom.is_xz_yh) {
+                                order_prom_id = ord_prom['id'];
+                                switch (ord_prom['type']) {
+                                    case 0:
+                                        order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+                                        order_prom_amount = (o_condition - order_m).toFixed(2);
+                                        break;
+                                    case 1:
+                                        order_m = o_condition - ord_prom['expression'];//满额优惠金额
+                                        order_prom_amount = ord_prom['expression'];
+                                        break;
+                                }
                             }
                         }
                         //--订单优惠的显示--
@@ -1508,16 +1508,19 @@ Page({
                     }).then(res => {
                         if (res.data.code == 0) {
                             var ord_prom = res.data.data;
-                            order_prom_id = ord_prom['id'];
-                            switch (ord_prom['type']) {
-                                case 0:
-                                    order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
-                                    order_prom_amount = (o_condition - order_m).toFixed(2);
-                                    break;
-                                case 1:
-                                    //order_m = o_condition - ord_prom['expression'];//满额优惠金额
-                                    order_prom_amount = ord_prom['expression'];
-                                    break;
+                            //么有使用券，或者活动没有限制使用优惠券
+                            if(quan_price<=0 || !ord_prom.is_xz_yh) {
+                                order_prom_id = ord_prom['id'];
+                                switch (ord_prom['type']) {
+                                    case 0:
+                                        order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+                                        order_prom_amount = (o_condition - order_m).toFixed(2);
+                                        break;
+                                    case 1:
+                                        //order_m = o_condition - ord_prom['expression'];//满额优惠金额
+                                        order_prom_amount = ord_prom['expression'];
+                                        break;
+                                }
                             }
                         }
                     })
@@ -1855,16 +1858,19 @@ Page({
                         var order_prom_id = 0;
                         if (th.data.order_prom[th.data.bn_pick]) {
                             var ord_prom = th.data.order_prom[th.data.bn_pick];
-                            order_prom_id = ord_prom['id'];
-                            switch (ord_prom['type']) {
-                                case 0:
-                                    order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
-                                    order_prom_amount = (o_condition - order_m).toFixed(2);
-                                    break;
-                                case 1:
-                                    order_m = o_condition - ord_prom['expression'];//满额优惠金额
-                                    order_prom_amount = ord_prom['expression'];
-                                    break;
+                            //么有使用券，或者活动没有限制使用优惠券
+                            if(coupon_price<=0 || !ord_prom.is_xz_yh) {
+                                order_prom_id = ord_prom['id'];
+                                switch (ord_prom['type']) {
+                                    case 0:
+                                        order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+                                        order_prom_amount = (o_condition - order_m).toFixed(2);
+                                        break;
+                                    case 1:
+                                        order_m = o_condition - ord_prom['expression'];//满额优惠金额
+                                        order_prom_amount = ord_prom['expression'];
+                                        break;
+                                }
                             }
                         }
                         //--订单优惠的显示--
@@ -700,10 +700,13 @@ Page({
                         }
                     }
                     //--订单优惠的显示--
+                    var order_prom_txt1 = "order_prom_id";
+                    var order_prom_txt2 = "order_prom_amount";
                     if (order_prom_id > 0) {
-                        var order_prom_txt1 = "order_prom_id";
-                        var order_prom_txt2 = "order_prom_amount";
                         th.setData({[order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount})
+                    }else{
+                        o_condition1=ord_price;
+                        th.setData({[order_prom_txt1]: 0, [order_prom_txt2]: 0})
                     }
 					 o_condition1=parseFloat(o_condition1)-parseFloat(th.data.presell.presell_deposit);
@@ -1826,18 +1829,21 @@ Page({
                 var order_m=0;
                 if (th.data.order_prom[bn_pick]) {
                     var ord_prom = th.data.order_prom[bn_pick];
-                    order_prom_id = ord_prom['id'];
-                    switch (ord_prom['type']) {
-                        case 0:
-                            order_m = Math.round(ord_price * ord_prom['expression']) / 100;//满额打折
-                            order_prom_amount = (ord_price - order_m).toFixed(2);
-                            break;
-                        case 1:
-                            order_m = ord_price - ord_prom['expression'];//满额优惠金额
-                            order_prom_amount = ord_prom['expression'];
-                            break;
+                    //么有使用券，或者活动没有限制使用优惠券
+                    if(quan_price<=0 || !ord_prom.is_xz_yh) {
+                        order_prom_id = ord_prom['id'];
+                        switch (ord_prom['type']) {
+                            case 0:
+                                order_m = Math.round(ord_price * ord_prom['expression']) / 100;//满额打折
+                                order_prom_amount = (ord_price - order_m).toFixed(2);
+                                break;
+                            case 1:
+                                order_m = ord_price - ord_prom['expression'];//满额优惠金额
+                                order_prom_amount = ord_prom['expression'];
+                                break;
+                        }
+                        ord_price = order_m;
                     }
-                    ord_price=order_m;
                 }
                 //--订单优惠的显示--
@@ -228,9 +228,11 @@ Page({
           th.setData({ [txt]: obj});
         }
    },
-
-
-
-    
+   go_url(e){
+        let url=e.currentTarget.dataset.url;
+        if(url){
+            getApp().goto(url);
+        }
+   },
 });
@@ -266,5 +266,11 @@ Page({
       title: '秒杀活动-' + store_name,
     }
   },
+  go_url(e){
+    let url=e.currentTarget.dataset.url;
+    if(url){
+        getApp().goto(url);
+    }
+},
 });
 \ No newline at end of file
@@ -243,6 +243,12 @@ Page({
 		  if (hei< viewHeight) {
 		      this.setData({ max_sw_height: viewHeight });
 		   }
-		}
+    },
+    go_url(e){
+      let url=e.currentTarget.dataset.url;
+      if(url){
+          getApp().goto(url);
+      }
+ },
 });
@@ -625,28 +625,28 @@ Page({
                     if (arr.length > 0) {
                         for (var j = 0; j < arr.length; j++) {
                             if (arr[j].pickup_id == pcid) {
-                                //if(item.is_gift!=1){
-                                //确定配送方式
-                                if (arr[j].distr_t == 0) {
-                                    arr[j].distr_t = car_item.distr_type;
-                                }
-                                var e_t = 0
-                                switch (arr[j].distr_t) {
-                                    case 0:
-                                        e_t = 1;
-                                        if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0;
-                                        break;
-                                    case 1:
-                                        e_t = 1;
-                                        break;
-                                    case 2:
-                                        e_t = 0;
-                                        break;
+                                if(item.is_gift!=1){
+                                    //确定配送方式
+                                    if (arr[j].distr_t == 0) {
+                                        arr[j].distr_t = car_item.distr_type;
+                                    }
+                                    var e_t = 0
+                                    switch (arr[j].distr_t) {
+                                        case 0:
+                                            e_t = 1;
+                                            if (th.data.json_d.pickupway && th.data.json_d.pickupway == 1) e_t = 0;
+                                            break;
+                                        case 1:
+                                            e_t = 1;
+                                            break;
+                                        case 2:
+                                            e_t = 0;
+                                            break;
+                                    }
+                                    arr[j].exp_type = e_t;
+                                    if (e_t == 0) th.setData({is_all_zt: 0});
+                                    else if(e_t==1) th.setData({is_all_zt: 1});
                                 }
-                                arr[j].exp_type = e_t;
-                                if (e_t == 0) th.setData({is_all_zt: 0});
-                                else if(e_t==1) th.setData({is_all_zt: 1});
-                                //}
                                 //-- 把等级卡会优惠多少钱装进去 --
                                 if (car_item.cut_price1) arr[j].card_cut_price += car_item.cut_price1;
@@ -689,6 +689,7 @@ Page({
                         }
                         //如果是物流的话，全部自提的控制要弄成0
                         if (e_t == 0) th.setData({is_all_zt: 0});
+                        else  th.setData({is_all_zt: 1});
                         var narr = new Array();
                         narr.push(car_item);
@@ -920,7 +921,6 @@ Page({
                                 th.data.check_quan_price_list = t.data.data.offline_price * gg.goods_num + "";
                                 th.data.check_quan_ware_list = t.data.data.erpwareid + "";
                             }
-
                             t.data.data.prom_id = 0;
                             t.data.data.prom_type = 0;
@@ -976,6 +976,12 @@ Page({
                                 if (gg.prom_type == 5) {
                                     t.data.data.prom_id = gg.prom_id;
                                     t.data.data.prom_type = 5;
+
+                                    // console.log('xxxxxxxxxxxxxxxxxx', gg.is_coupon)
+                                    th.is_coupon = gg.is_coupon;
+                                    th.setData({
+                                        is_coupon: gg.is_coupon
+                                    });
                                     if (gg.room_id) {
                                         t.data.data.room_id = gg.room_id;
                                     }
@@ -1050,6 +1056,9 @@ Page({
                                         th.calculatePrice2();
                                         th.get_cart_quan();
                                     });
+
+                                    
+
                                 } else {
                                     //计算价格
                                     th.calculatePrice2();
@@ -1724,16 +1733,19 @@ Page({
                     }).then(res => {
                         if (res.data.code == 0) {
                             var ord_prom = res.data.data;
-                            order_prom_id = ord_prom['id'];
-                            switch (ord_prom['type']) {
-                                case 0:
-                                    order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
-                                    order_prom_amount = (o_condition - order_m).toFixed(2);
-                                    break;
-                                case 1:
-                                    //order_m = o_condition - ord_prom['expression'];//满额优惠金额
-                                    order_prom_amount = ord_prom['expression'];
-                                    break;
+                            //么有使用券，或者活动没有限制使用优惠券
+                            if(quan_price<=0 || !ord_prom.is_xz_yh) {
+                                order_prom_id = ord_prom['id'];
+                                switch (ord_prom['type']) {
+                                    case 0:
+                                        order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+                                        order_prom_amount = (o_condition - order_m).toFixed(2);
+                                        break;
+                                    case 1:
+                                        //order_m = o_condition - ord_prom['expression'];//满额优惠金额
+                                        order_prom_amount = ord_prom['expression'];
+                                        break;
+                                }
                             }
                         }
                     })
@@ -2079,16 +2091,19 @@ Page({
                         var order_prom_id = 0;
                         if (th.data.order_prom[th.data.bn_pick]) {
                             var ord_prom = th.data.order_prom[th.data.bn_pick];
-                            order_prom_id = ord_prom['id'];
-                            switch (ord_prom['type']) {
-                                case 0:
-                                    order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
-                                    order_prom_amount = (o_condition - order_m).toFixed(2);
-                                    break;
-                                case 1:
-                                    order_m = o_condition - ord_prom['expression'];//满额优惠金额
-                                    order_prom_amount = ord_prom['expression'];
-                                    break;
+                            //么有使用券，或者活动没有限制使用优惠券
+                            if(coupon_price<=0 || !ord_prom.is_xz_yh) {
+                                order_prom_id = ord_prom['id'];
+                                switch (ord_prom['type']) {
+                                    case 0:
+                                        order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
+                                        order_prom_amount = (o_condition - order_m).toFixed(2);
+                                        break;
+                                    case 1:
+                                        order_m = o_condition - ord_prom['expression'];//满额优惠金额
+                                        order_prom_amount = ord_prom['expression'];
+                                        break;
+                                }
                             }
                         }
                         //--订单优惠的显示--
@@ -3257,7 +3272,7 @@ Page({
             else {
                 using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1};
             }
-            this.setData({using_quan: using_quan, is_coupon: 2222});
+            this.setData({using_quan: using_quan, is_coupon: th.is_coupon});
             return;
         }
@@ -3323,7 +3338,7 @@ Page({
             else {
                 using_quan[th.data.selected_quan_pick] = {is_nouse_red: 1};
             }
-            this.setData({using_quan: using_quan, is_coupon: 2222});
+            this.setData({using_quan: using_quan, is_coupon: th.is_coupon});
             return;
         }
@@ -341,7 +341,6 @@
 				<view bindtap="buycard" class="card_op">立即开通</view>
 			</view>
-
 			<view class="set-mes bdr_b-14">
 				<view wx:if="{{order.store_prom}}">
@@ -83,19 +83,13 @@ Page({
     sec_show: 3,    //倒计时的秒数
     full_ad: null,  //全屏广告
     full_screen: 0, //全屏广告
+    is_ok_h5:0,  //判断要不要显示关注二维码
   },
   onLoad: async function (tt) {
-      // onLoad生命周期内判断
-      let obj = wx.getLaunchOptionsSync();
-      console.log(obj.scene,'launch_scene');
-      if (obj.scene === 1011 || obj.scene === 1012  || obj.scene === 1013 || obj.scene === 1017 ||
-          obj.scene === 1047 ||obj.scene === 1089 || obj.scene === 1038) {
-         this.setData({is_ok_h5:1})
-      }
-      var th = this;
+    var th = this;
     var first_leader = tt.first_leader;
     if (!first_leader && tt.scene) {
       var first_leader_str = decodeURIComponent(tt.scene);
@@ -459,6 +453,15 @@ Page({
       }
     }, 1500)
+      setTimeout(function () {
+          const query = wx.createSelectorQuery();
+          query.select('#off_top').boundingClientRect();
+          query.exec((res) => {
+              if(res && res[0] && res[0].height>0){
+                 th.setData({is_ok_h5:1});
+              }
+          })
+      },3600);
   },
   //当隐藏的时候就关闭计时器
@@ -16,7 +16,7 @@
   <view class="top-bar">
         <!-- 顶部关注公众号 -->
-        <view wx:if="{{is_gz_h5 && is_ok_h5}}"><official-account></official-account></view>
+        <view id="off_top" wx:if="{{is_gz_h5}}"><official-account></official-account></view>
 		<!-- 控制要不要显示顶部门店选择 -->
 		<block wx:if="{{is_topstore}}">
@@ -414,7 +414,7 @@
   <!-- 置顶层 -->	
   <view class="dis_top">
       <!-- 关注公众号的显示 -->
-      <view wx:if="{{is_gz_h5 && is_ok_h5}}"><official-account></official-account></view>
+      <view id="off_top" wx:if="{{is_gz_h5}}"><official-account ></official-account></view>
 	  <block wx:for="{{template_arr}}" >
 		   <block wx:if="{{item.content.is_top==1}}">			   
@@ -81,7 +81,8 @@
 						</view>
 					</view>
 					<view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
-						<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>
+						<!--<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}">使用说明: 包邮券,全场通用,满 {{detail.condition}}元使用{{detail.title?',不包邮地区:'+detail.title:''}}</text>-->
+						<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}"><text style="margin-right: 15rpx">使用说明:</text>购买礼包得优惠券【消费满{{time.toFix(detail.condition,2)}}元可用】</text>
 					</view>
 				</block>
@@ -107,8 +108,8 @@
 						</view>
 					</view>
 					<view class="c-info arrow-down {{detail.isShowDetails ? 'active':''}}" bindtap="clickDetails" data-index="{{idx}}">
-						<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:if="{{detail.Remark1}}">{{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}};{{detail.Remark}}</text>
-						<text class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:else>使用说明: {{filter.getNum(detail.Sum)}}元优惠券,{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}},满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":",不包邮地区:"+region_list_name}}</text>
+						<view class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:if="{{detail.Remark1!=''}}"><text style="margin-right: 15rpx">使用说明:</text>{{filter.getNum(detail.Sum)}}元优惠券，{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}}，满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":"，不包邮地区:"+region_list_name}};{{detail.Remark1}}</view>
+						<view class="{{detail.isShowDetails ? '':'ellipsis-1x'}}" wx:else><text style="margin-right: 15rpx">使用说明:</text> {{filter.getNum(detail.Sum)}}元优惠券，{{(detail.UseObjectID==null || detail.UseObjectID=='')?"全场通用":"仅限"+(detail.UseObjectName)+"使用"}}，满 {{detail.BuySum==null || detail.BuySum==''?filter.getNum(0):filter.getNum(detail.BuySum)}}元使用 {{detail.region_list_name==null || detail.region_list_name==''?"":"，不包邮地区:"+region_list_name}}</view>
 					</view>
 				</block>
 			</view>
@@ -14,7 +14,7 @@ var numFr = {
     while (s.length <= rs + 2) {
       s += '0';
     }
-    return s;
+    return f;
   },
 	showBtnText: function(index) {
 		switch(index) {
@@ -274,6 +274,10 @@ Page({
                              pageSize: 100
                          },
                          success: async function(res) {
+
+                             //判断有没有值，没有值返回
+                             if(!ut.ajax_ok(res)) return false;
+
                              var arr_data = res.data.data.pageData;
                              var gid = null,
                                  g_qy_list = null,