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

season
2 parents 63ca9333 823ecff8
Showing 31 changed files with 247 additions and 84 deletions
app.js
components/add_purchase/add_purchase.wxml
components/add_purchase/add_purchase.wxss
components/com_top_nav/com_top_nav.js
components/com_top_nav/com_top_nav.wxml
components/diy_public/diy_public.wxml
components/diy_searchbox/diy_searchbox.wxml
components/diy_seckill/diy_seckill.wxml
components/diy_top_nav/diy_top_nav.js
components/diy_top_nav/diy_top_nav.wxml
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/quan_pro/quan_pro.js
packageA/pages/quan_pro/quan_pro.wxml
packageA/pages/quan_pro/quan_pro.wxss
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxss
packageB/pages/zuhegou/index/index.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
packageC/pages/presell/cardInfo/goodsInfo.wxml
@@ -51,7 +51,7 @@ App({
         config: null,   //门店参数
         config2: null,  //门店配置
         code: null,
-        user_id:null,//6520352
+        user_id:null,//6520491,// 6519913,//6520352
         // user_id:6520314,// qa-6519858,//
         // user_id:14148118,// qa-6519858,//
         buy_now: null,
@@ -75,6 +75,7 @@ App({
         sp_scene: null,
         navBarHeight:44,    //默认高度44
+        is_pc:0,  //是不是在pc端打开小程序
     },
     auth: o,
     request: a,
@@ -202,7 +203,16 @@ App({
                 if (modelmes && modelmes.indexOf('iPhone X') != -1) {　　//XS,XR,XS MAX均可以适配,因为indexOf()会将包含'iPhone X'的字段都查出来
                     this.globalData.isIpx = true
                 }
-                this.globalData.navBarHeight = 44 + res.statusBarHeight
+
+                /*-- 判断是不是PC端打开的 */
+                if (res && ["windows", "mac"].some((v) => v === res["platform"])) {
+                    app.globalData.is_pc=1;
+                    this.globalData.navBarHeight =0
+                }else{
+                    this.globalData.navBarHeight = 44 + res.statusBarHeight
+                }
+
+
             },
         })
         this.globalData.menuInfo = wx.getMenuButtonBoundingClientRect() || {}
@@ -1634,6 +1644,8 @@ App({
        }
        a.wxParse(content, "html", ut.format_content(ob.text), th, 6);
        e.wxParseAddFullImageUrl(th, content);
+
+    
    },
    async deal_iframe_next(ob){
 <!--components/add_purchase/add_purchase.wxml-->
-<view >
+<view class="add_purchase">
   <view  class="cover-layer"></view>
   <view class="spec-model">
     <view class="pding">
@@ -18,7 +18,7 @@
 	padding-top: 80rpx;
 }
-image {
+.add_purchase image {
 	vertical-align: top;
 }
 .rules {
@@ -19,7 +19,8 @@ Component({
     height:0,
     h1:0,
     h2:0,
-    user_id:0
+    user_id:0,
+    is_pc:0
   },
   ready: function() {
       let height= getApp().globalData.navBarHeight;
@@ -30,6 +31,9 @@ Component({
       }
       //-- 胶囊的高度 --
       this.setData({height,h1:menuInfo.top,h2:menuInfo.height,user_no});
+      if(getApp().globalData.is_pc){
+          this.setData({is_pc:1})
+      }
   },
   pageLifetimes: {
         //要处理一下，游客登录后的界面的变化,主要还该是改变会员
 <!-- 需要cover-view是大转盘才会 -->
+<block wx:if="{{!is_pc}}">
+
 <block wx:if="{{need_cover}}">
     <cover-view class="t_nav" style="height:{{height}}px;background-color:{{bcolor}};color:{{color}}">
         <cover-view class="tab" style="height:{{h1}}px;">
@@ -31,4 +33,6 @@
 <!-- 用于顶开层的高 -->
-<view style="height:{{height}}px"></view>
 \ No newline at end of file
+<view style="height:{{height}}px"></view>
+
+</block>
 \ No newline at end of file
@@ -8,7 +8,7 @@
         <view class='t_ms n_t_ms' style="font-size: 30rpx;">{{object.column_name}}</view>
       </view>
       <view class='right_k' wx:if="{{!object.column_diy_title}}">
-        更多<image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image>
+        更多<image style="vertical-align: baseline;" src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image>
       </view>
     </view>
     <!-- 大图模式 -->
@@ -5,7 +5,7 @@
 	<view class='ss' style="position: relative;{{transparent ? '' : (nav_backgroundColor ? ('background-color:' + nav_backgroundColor) : 'background-color:#fff;')}}">
 		<view bindtap='click_sear'   class="s1_gk_a1 " wx:if="{{first}}">
 		   <view class="s_ge {{object.is_bord==1 ? 'is_bord' : ''}}" style="text-align: {{object.searchbox_center}};">
-			   <image src='{{imghost}}/miniapp/images/search.png'></image>
+			   <image src='{{imghost}}/miniapp/images/search.png' style="vertical-align:baseline;"></image>
           <text wx:if="{{object.searchbox_text}}">{{object.searchbox_text}}</text>
 	           <text wx:else>请输入商品关键字</text>
 		   </view>
@@ -8,7 +8,7 @@
         <view class='t_ms n_t_ms' style="font-size: 30rpx;">{{object.column_name}}</view>
       </view>
       <view class='right_k' wx:if="{{!object.column_diy_title}}">
-        更多<image src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image>
+        更多<image style="vertical-align: baseline;" src="{{imghost}}/miniapp/images/icon-arrowdown.png" lazy-load="true"></image>
       </view>
     </view>
     <!-- 大图模式 -->
@@ -65,43 +65,51 @@ Component({
       //   img:'',
       //   url:'' 
       // },
-    ]
+    ],
+    is_pc:0
   },
   lifetimes:{
     attached:function(){
-      //满屏顶部导航参数获取-----------
-      try {
-        let systemInfo = wx.getSystemInfoSync()
-        let mentButt = wx.getMenuButtonBoundingClientRect()
-        let nav_pb = mentButt.top - systemInfo.statusBarHeight
-        let navleft_pb = systemInfo.windowWidth - mentButt.right
-        let user_no='';
-        if(getApp().globalData.userInfo){
-          user_no=getApp().globalData.userInfo.erpvipno
-        }
+       var is_pc=getApp().globalData.is_pc;
+       if(!is_pc) {
+
+        //满屏顶部导航参数获取-----------
+        try {
+          let systemInfo = wx.getSystemInfoSync()
+          let mentButt = wx.getMenuButtonBoundingClientRect()
+          let nav_pb = mentButt.top - systemInfo.statusBarHeight
+          let navleft_pb = systemInfo.windowWidth - mentButt.right
+
+          let user_no = '';
+          if (getApp().globalData.userInfo) {
+            user_no = getApp().globalData.userInfo.erpvipno
+          }
-        this.setData({
-          nav_h:mentButt.top,
-          mentButt_h:mentButt.height,
-          nav_left_w:mentButt.left,
-          navleft_pb,
-          nav_pb,
-          navleft_w:mentButt.width*0.9,
-          user_no
-        })
-      } catch (e) {
-        console.error(e);
-        wx.showToast({
-          title: '系统参数获取失败',
-          icon: 'none',
-          duration: 2000
-        })
-        // this.setData({
-        //   is_full_screen_navigation:false
-        // })
-        // Do something when catch error
-      }
+          this.setData({
+            nav_h: mentButt.top,
+            mentButt_h: mentButt.height,
+            nav_left_w: mentButt.left,
+            navleft_pb,
+            nav_pb,
+            navleft_w: mentButt.width * 0.9,
+            user_no
+          })
+        } catch (e) {
+          console.error(e);
+          wx.showToast({
+            title: '系统参数获取失败',
+            icon: 'none',
+            duration: 2000
+          })
+          // this.setData({
+          //   is_full_screen_navigation:false
+          // })
+          // Do something when catch error
+        }
+      }else{
+          this.setData({is_pc:1});
+       }
     }
   },
   /**
 <!--components/diy_top_nav/diy_top_nav.wxml-->
 <!-- 支撑作用 -->
+<block wx:if="{{!is_pc}}">
+
 <view wx:if="{{nav_type==-1}}" style="padding-bottom:{{nav_pb}}px;color: {{nav_frontColor}};">
   <view  style="height: {{nav_h}}px;width: 100%;"></view>
   <view style="width: 100%;height:{{mentButt_h}}px;line-height:{{mentButt_h}}px;text-align: center;"></view>
 </view>
+
+
 <!-- 默认没有返回按钮 -->
 <view wx:if="{{nav_type==0}}" style="padding-bottom:{{nav_pb}}px;background-color:{{nav_backgroundColor}};color: {{nav_frontColor}};">
   <view  style="height: {{nav_h}}px;width: 100%;"></view>
@@ -67,3 +71,5 @@
     <view class="nav_right">1212121</view>
   </view>
 </view>
+
+</block>
 \ No newline at end of file
@@ -15,7 +15,7 @@
 					 nav_frontColor="{{nav_frontColor}}" istop="{{(istop && searchbox_transparent && activeCategoryId==0)  ? 1 : 0 }}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{gtitle}}"></top_nav>
 		</view>
-		<view class="type-navbar" style="top:{{top_nav-4}}px">
+		<view class="type-navbar" style="top:{{top_nav?(top_nav-4):0}}px">
 			<view class="type-box" wx:for="{{categories}}" wx:key="categories">
 				<view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
 					{{item.name}}
@@ -88,13 +88,19 @@ Page({
         th.setData({is_get:1});
         return false;
     }
+
+    //-- 券已经领取完的优化 --
+    if(r_data.sum_num && r_data.sum_num<=r_data.use_sumnum){
+        th.setData({is_get:1});
+        return false;
+    }
+
     if(r_data.type!=1){
         th.setData({is_get:2});
         return false;
     }
     var now=ut.gettimestamp();
-
     if(r_data.send_start_time>now){
        th.setData({is_get:3});
        return false;
@@ -102,26 +108,26 @@ Page({
     if(r_data.send_end_time<now){
        th.setData({is_get:4});
-       return false;
     }
-    th.setData({is_get:1});
     th.setData({ q_data:r_data });
+    var url2='/api/weshop/couponList/getUserCouponListMsg?store_id='+os.stoid+'&cid='+th.data.id+'&uid='+getApp().globalData.user_id;
+    var rss=await getApp().request.promiseGet(url2, {})
+    if(rss && rss.data.code==-1){
+          if(rss.data.msg.indexOf('您下一次')>-1){
+              th.setData({is_get:5,err_txt:'您已领过该券'});
+          }else if(rss.data.msg.indexOf('您已领完该券')>-1){
+              th.setData({is_get:5,err_txt:'您已领完该券'});
+          }
+    }else if(rss && rss.data.code==0){
+        //获取会员已经领取了多少张券
+        var n1=rss.data.data.usercounted?rss.data.data.usercounted:0;
+        th.setData({'q_data.lqnum':n1})
+    }
-    // var user_id=getApp().globalData.user_id;
-    // await getApp().request.promiseGet("/api/weshop/prom/coupon/pageCouponList", {
-    //   data:{store_id:os.stoid,type:1,id:th.data.id,user_id:user_id}
-    // }).then(res => {
-    //      th.setData({is_get:1});
-    //      if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){
-    //         th.setData({q_data:res.data.data.pageData[0]});
-    //      }
-    // });
-
-
   },
   onUnload:function(){
     wx.offCopyUrl()
@@ -198,7 +204,7 @@ Page({
       success: function(res) {
         th.data.linging = 0;
         if (res.data.code == 0) {
-          item.lqnum++;
+         
           var text3="q_data";
           var obj = {};obj[text3] = item;
           th.setData(obj);
@@ -214,9 +220,24 @@ Page({
 							}
 						})
 					} else {
-						th.setData({
+
+            //设置一下优惠券领取的数量
+            var q_data=th.data.q_data;
+            q_data.use_sumnum++;
+            q_data.lqnum++;
+						
+            th.setData({
 							show_success: 1,
+              q_data
 						})
+
+            if(q_data.everyone_num>0 && q_data.everyone_num<= q_data.lqnum){
+               th.setData({is_get:5,err_txt:'您已领完该券'});
+            }else if(q_data.interval_time>0){
+              th.setData({is_get:5,err_txt:'您已领过该券'});
+            }
+
+          
 					}
         } else {
           app.confirmBox(res.data.msg);
@@ -34,7 +34,7 @@
                 </view>
             </view>
-            <block wx:if="{{ q_data}}">
+            <block wx:if="{{q_data}}">
                 <view wx:if="{{ q_data.endtype==0}}" class="lower fs30">有效期
                     <text wx:if="{{q_data.starttype==1}}"> {{filters.format_time(getcurday+3600*24*q_data.startdays)}}</text>
                     <text wx:if="{{q_data.use_start_time>0 && q_data.starttype==0}}"> {{filters.format_time(q_data.use_start_time)}}</text>至
@@ -58,7 +58,9 @@
     </view>
     <view wx:if="{{q_data}}" class="flex jc-center" style="margin-top: 40rpx">
-        <view wx:if="{{q_data.everyone_num>0 && q_data.lqnum>=q_data.everyone_num}}" class="btn flex jc-center ai-center gray" bindtap="get_quan">已领取</view>
+        <view wx:if="{{q_data.sum_num>0 && q_data.use_sumnum>=q_data.sum_num}}" class="btn flex jc-center ai-center gray" >该券已领完</view>
+        <view wx:elif="{{is_get==4}}" class="btn flex jc-center ai-center gray" >优惠券已过期</view>
+        <view wx:elif="{{is_get==5}}" class="btn flex jc-center ai-center gray" >{{err_txt}}</view>
         <view wx:else class="btn flex jc-center ai-center" bindtap="get_quan">立即领取</view>
     </view>
@@ -26,7 +26,7 @@ page{background-color: #f8f8f8;}
     border-bottom-left-radius:25rpx;
 }
-.btn.gray{background-color: #dcdcdc; color: #adb3be;}
+.btn.gray{background-color: #aaa; color: #fff;}
 .coupon_remark{padding: 30rpx 0 10rpx 0; box-sizing: border-box; overflow: hidden;}
 .q_title{
@@ -17,7 +17,7 @@
 					 nav_frontColor="{{nav_frontColor}}" istop="{{(istop && searchbox_transparent && activeCategoryId==0)  ? 1 : 0 }}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{gtitle}}"></top_nav>
 		</view>
-		<view class="type-navbar" style="top:{{top_nav-4}}px">
+		<view class="type-navbar" style="top:{{top_nav?(top_nav-4):0}}px">
 			<view class="type-box" wx:for="{{categories}}" wx:key="categories">
 				<view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
 					{{item.name}}
@@ -2967,3 +2967,9 @@ button.custom-service::after{
     max-width:370rpx; flex-shrink: 0;
 }
+.type-navbar_box{
+    position: fixed;
+    top: 0;
+    z-index: 9999;
+    width: 100%;
+}
 \ No newline at end of file
@@ -2782,7 +2782,12 @@ Page({
   },
   go_cart: function () {
-    getApp().goto("/pages/cart/cart/cart");
+      //-- 组合购选中的跳转链接 --
+      getApp().globalData.from_act_link={
+         prom_type:7,
+         prom_id:this.data.act.id
+      }
+      getApp().goto("/pages/cart/cart/cart");
   },
   //获取购物车中，相应的门店已购买的商品
@@ -495,7 +495,14 @@ Page({
       //------几人评价-------
       //n.init(th, "", "comments");
-      if(e && e.goods_bottomconent){
+      if(e && e.goods_topconent && e.goods_ad_position.indexOf('1')>-1){
+        //商品详情广告----
+        a.wxParse("goodInfo_ad2", "html", ut.format_content(e.goods_topconent), ee, 6);
+        common.wxParseAddFullImageUrl(ee, "goodInfo_ad2");
+        //-------
+      }
+
+      if(e && e.goods_bottomconent && e.goods_ad_position.indexOf('2')>-1){
         //商品详情广告----
         a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
         common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
@@ -20,7 +20,7 @@
     </view>
 	  <!-- tab选项卡 -->
-    <view class="type-navbar" style="top:{{top_nav-4}}px">
+    <view class="type-navbar" style="top:{{top_nav?(top_nav-4):0}}px">
       <view class="type-box" wx:for="{{categories}}" wx:key="categories">
         <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">{{item.name}}</view>
       </view>
@@ -681,6 +681,10 @@
               </view>
             </view>
           </view>
+          <!-- 详情广告顶部-->
+          <view class="wxParse">
+            <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
+          </view>
           <!-- 详情图片 -->
           <view class="wxParse">
             <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
@@ -689,6 +693,7 @@
           <view class="wxParse">
             <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
           </view>
+
         </view>
         <!-- 推荐商品 -->
         <view class="flex-center rel xc-linellae-frame">
@@ -768,6 +773,12 @@
             </view>
           </view>
         </view>
+
+        <!-- 详情广告顶部-->
+        <view class="wxParse">
+          <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
+        </view>
+
         <view class="wxParse">
           <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
@@ -16,7 +16,7 @@
     <top_nav id="my-nav" bindclickShare="clickShare" nav_type="{{nav_type}}" is_share="1"
              nav_frontColor="{{nav_frontColor}}" istop="{{(istop && searchbox_transparent && activeCategoryId==0)  ? 1 : 0 }}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{gtitle}}"></top_nav>
   </view>
-  <view class="type-navbar" style="top:{{top_nav-4}}px">
+  <view class="type-navbar" style="top:{{top_nav?(top_nav-4):0}}px">
     <view class="type-box" wx:for="{{categories}}" wx:key="categories">
       <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
         {{item.name}}
@@ -423,7 +423,14 @@ Page({
       });
-      if(e && e.goods_bottomconent){
+      if(e && e.goods_topconent && e.goods_ad_position.indexOf('1')>-1){
+        //商品详情广告----
+        a.wxParse("goodInfo_ad2", "html", ut.format_content(e.goods_topconent), ee, 6);
+        common.wxParseAddFullImageUrl(ee, "goodInfo_ad2");
+        //-------
+      }
+
+      if(e && e.goods_bottomconent && e.goods_ad_position.indexOf('2')>-1){
         //商品详情广告----
         a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
         common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
@@ -19,7 +19,7 @@
              nav_frontColor="{{nav_frontColor}}" istop="{{(istop && searchbox_transparent && activeCategoryId==0)  ? 1 : 0 }}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{gtitle}}"></top_nav>
   </view>
-  <view class="type-navbar" style="top:{{top_nav-4}}px">
+  <view class="type-navbar" style="top:{{top_nav?(top_nav-4):0}}px">
     <view class="type-box" wx:for="{{categories}}" wx:key="categories">
       <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">
         {{item.name}}
@@ -346,14 +346,21 @@
             </view>
           </view>
         </view>
+
+        <!-- 详情广告顶部-->
+        <view class="wxParse">
+          <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
+        </view>
+
         <!-- 详情图片 -->
         <view class="wxParse">
           <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
-        <!-- 详情广告 -->
+        <!-- 详情广告底部 -->
         <view class="wxParse">
           <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template>
         </view>
+
       </view>
       <!-- 推荐商品 -->
       <view class="flex-center rel xc-linellae-frame">
@@ -440,6 +447,13 @@
           </view>
         </view>
       </view>
+
+
+      <!-- 详情广告顶部-->
+      <view class="wxParse">
+        <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
+      </view>
+
       <view class="wxParse">
         <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
       </view>
@@ -203,6 +203,7 @@ Page({
     },
+
     GetBuyIntegral: function (e) {
         var that = this.data;
         var th = this;
@@ -344,7 +345,8 @@ Page({
             data: {
                 "storeId": a.stoid, //商家ID
                 "userId": d.user_id, //用户ID
-                "giftBagId": th.getGiftID
+                "giftBagId": th.getGiftID,
+                isnNewUserLb:1
             },
             success: function success(res) {
                 if (res.data.code == 0) {
@@ -402,6 +404,11 @@ Page({
                 } else {
                     getApp().my_warnning(res.data.msg, 0, _this2);
+
+                    setTimeout(()=>{
+                        getApp().goto('/pages/index/index/index')
+                    },2000)
+
                     return false;
                 }
             }
@@ -126,6 +126,11 @@ Page({
   },
   onShow: function () {
+    if(getApp().globalData.from_act_link){
+        this.data.from_act_link= ut.deep_cp(getApp().globalData.from_act_link);
+        getApp().globalData.from_act_link=null;
+    }
+
     //-- 看一下隐私政策要不要显示 --
     var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id
     if (privacy_pop) {
@@ -923,7 +928,7 @@ Page({
           }),
           th.doCheckAll(), wx.stopPullDownRefresh();
-        wx.hideLoading();
+          wx.hideLoading();
       }
     });
@@ -2445,7 +2450,7 @@ Page({
           if (item[c].prom_type == 7) {
               item[c].act = th.data.zuhe_map[item[c].prom_id];
               if(item[c].zh_b_num===undefined || item[c].zh_b_num===null ){
-                 var prom_goodsbuynum = 0;
+                  var prom_goodsbuynum = 0;
                   //--要获得商品，该用户买了多少件,同步应用，用于限购的计算--
                   await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", {
                     data: {
@@ -2460,7 +2465,7 @@ Page({
                     if(res.data.code==0 && res.data.data)
                     if (res.data.data.promgoodsbuynum) {
-                      promgoodsbuynum = res.data.data.promgoodsbuynum;     
+                      prom_goodsbuynum = res.data.data.promgoodsbuynum;
                     }
                   })
@@ -526,7 +526,8 @@ Page({
             data: {
                 "storeId": a.stoid, //商家ID
                 "userId": d.user_id, //用户ID
-                "giftBagId": th.getGiftID
+                "giftBagId": th.getGiftID,
+                isnNewUserLb:1
             },
             success: function success(res) {
                 if (res.data.code == 0) {
@@ -604,6 +605,11 @@ Page({
                 } else {
                     getApp().my_warnning(res.data.msg, 0, _this2);
+
+                    setTimeout(()=>{
+                        getApp().goto('/pages/index/index/index')
+                    },2000)
+
                     return false;
                 }
             }
@@ -517,8 +517,15 @@ Page({
             // goods_bottomconent:e.goods_bottomconent
           });
+          if(e && e.goods_topconent && e.goods_ad_position.indexOf('1')>-1){
+            //商品详情广告----
+            a.wxParse("goodInfo_ad2", "html", ut.format_content(e.goods_topconent), ee, 6);
+            common.wxParseAddFullImageUrl(ee, "goodInfo_ad2");
+            //-------
+          }
+
           //判断商品详情要有东西
-          if(e && e.goods_bottomconent) {
+          if(e && e.goods_bottomconent && e.goods_ad_position.indexOf('2')>-1) {
             //商品详情广告----
             a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6);
             common.wxParseAddFullImageUrl(ee, "goodInfo_ad");
@@ -22,7 +22,7 @@
                    nav_frontColor="{{nav_frontColor}}" istop="{{(istop && searchbox_transparent && activeCategoryId==0)  ? 1 : 0 }}" nav_backgroundColor="{{nav_backgroundColor}}" nav_title="{{gtitle}}"></top_nav>
     </view>
-    <view class="type-navbar" style="top:{{top_nav-4}}px" wx:if="{{activeCategoryId>0 || !istop || ( istop && !searchbox_transparent)}}" >
+    <view class="type-navbar" style="top:{{top_nav?(top_nav-4):0}}px" wx:if="{{activeCategoryId>0 || !istop || ( istop && !searchbox_transparent)}}" >
       <view class="type-box" wx:for="{{categories}}" wx:key="id">
         <view bindtap="tabClick" class="type-navbar-item {{activeCategoryId==item.id?'type-item-on':''}}" id="{{item.id}}">{{item.name}}</view>
       </view>
@@ -273,10 +273,10 @@
           <view class="goods-price">
             <!-- 价格显示 -->
             <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>
+              <view class="market-price" style="overflow: hidden; height: 66rpx;display: flex; align-items: flex-end;line-height: normal;">
+                <image class="rel_img"  style="display: block;top:12rpx" src="{{iurl}}/miniapp/images/integral/integral_red.png"></image>
                 <block wx:if="{{prom_integral}}">
-                  <text style="position: relative;top:10rpx">{{prom_integral}}</text>
+                  <text style="display: block;font-size:58rpx; line-height: 58rpx;position: relative;top:8rpx ">{{prom_integral}}</text>
                   <text class="rel_txt">积分</text>
                 </block>
                 <text class="rel_txt" wx:if="{{prom_integral && prom_price}}">+</text>
@@ -878,6 +878,12 @@
               </view>
             </view>
           </view>
+
+          <!-- 详情广告顶部-->
+          <view class="wxParse">
+            <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
+          </view>
+
           <!-- 详情图片 -->
           <view class="wxParse">
             <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
@@ -965,6 +971,12 @@
             </view>
           </view>
         </view>
+
+        <!-- 详情广告顶部-->
+        <view class="wxParse">
+          <template is="wxParse" data="{{wxParseData:goodInfo_ad2.nodes}}"></template>
+        </view>
+
         <view class="wxParse">
           <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
         </view>
@@ -1313,17 +1325,19 @@
           </view>
         </block> -->
-        <view  class="buy-btn-all cart-btn" style="width: 30%;border-radius:0rpx 55rpx 55rpx 0rpx;"  wx:if="{{can_integral}}">
+        <view  class="buy-btn-all cart-btn" style="width: 30%;border-radius:0rpx 55rpx 55rpx 0rpx;overflow: hidden; "  wx:if="{{can_integral}}">
           <!-- 立即兑换 -->
           <!-- <view wx:if="{{ prom_act.show_time_off}}" >即将开始</view> -->
           <view wx:if="{{ prom_act.show_time_off}}" style="background-color: #aaa;">即将开始</view>
+          <view wx:elif="{{ prom_act.limitqty<= prom_act.buy_num}}" style="background-color: #aaa;">已兑光</view>
           <view bindtap="go_pay_integral" wx:else>立即兑换</view>
         </view>
         <view class="buy-btn cart-btn" style="background-color: #aaa;border-radius:0rpx 55rpx 55rpx 0rpx;" wx:else>积分不足</view>
       </block>
       <block wx:else>
-        <view  class="buy-btn-all cart-btn" style="width: 58%; margin-left:1%;" wx:if="{{can_integral}}">         
+        <view  class="buy-btn-all cart-btn" style="width: 58%; margin-left:1%;overflow: hidden;" wx:if="{{can_integral}}">
           <view wx:if="{{ prom_act.show_time_off}}" style="background-color: #aaa;" >即将开始</view>
+          <view wx:elif="{{ prom_act.limitqty<= prom_act.buy_num}}" style="background-color: #aaa;" >已兑光</view>
           <view bindtap="go_pay_integral" wx:else>立即兑换</view>
         </view>
         <!-- <block wx:if="{{can_integral}}">        
@@ -3803,6 +3803,7 @@ button.custom-service::after {
 .goods-price .rel_txt {
 	/* position: relative; top: 32rpx;  */
 	font-size: 30rpx;
+	line-height: 30rpx;
 }
 .goods-price .rel_img {
@@ -44,8 +44,6 @@ Page({
     //顶部的高度
     var h1=getApp().globalData.navBarHeight>0?getApp().globalData.navBarHeight:0;
     this.setData({navBarHeight:h1})
-
-
   },
   /**
    * 生命周期函数--监听页面显示
@@ -3,7 +3,7 @@
 <!-- 背景图片 -->
 <view catchtap="close">
-    <image class="backimage" style="top:{{navBarHeight}}px"  mode="widthFix" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"/>
+	<image class="backimage" style="top:{{navBarHeight}}px"  mode="widthFix" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"/>
 	<view class="flex jc_sb pd20">
 		<navigator class="fs26 white" url="/packageA/pages/service_record/service_record">服务记录</navigator>
 		<navigator class="fs26 white" url="/packageG/pages/user/my_service/hist_service">历史预约</navigator>
@@ -718,6 +718,24 @@ module.exports = {
                 //活动要排序一下
                 k_item.act_arr.sort(comp);
+                //-- 看一下是不是组合购 -- 点击 --如果是从活动链接过来的，点亮 --,新增优化2024-1-20
+                if(th.data.from_act_link){
+                    var fd_idx=k_item.act_arr.findIndex(function (eh){
+                        return eh.prom_type==th.data.from_act_link.prom_type && eh.prom_id==th.data.from_act_link.prom_id;
+                    })
+
+                    if(fd_idx>-1) {
+                        ck_prom_type= k_item.act_arr[fd_idx];
+                        for (var idf = 0; idf < k_item.act_arr.length; idf++) {
+                            if(fd_idx==idf){
+                                k_item.act_arr[idf].sele=1;
+                            }else{
+                                k_item.act_arr[idf].sele=0;
+                            }
+                        }
+                    }
+                }
+
                 //确定一下活动,先看一下有没有选择的活动
                 ck_prom_type=k_item.act_arr.find(function (el){
                     return el.sele;