Merge branch 'dev_oa_luo15' into dev

WXD-SEASON\season
2 parents 754cf01e 28377772
Showing 15 changed files with 287 additions and 36 deletions
app.json
components/diy_public/diy_public.js
components/diy_public/diy_public.wxml
components/diy_seckill/diy_seckill.js
packageA/pages/goodsInfo/goodsInfo.wxml
packageA/pages/quan_pro/quan_pro.js
packageF/pages/xcxServiceChat/xcxServiceChat.js
packageF/pages/xcxServiceChat/xcxServiceChat.json
packageF/pages/xcxServiceChat/xcxServiceChat.wxml
packageF/pages/xcxServiceChat/xcxServiceChat.wxss
pages/activity/seckill_list/seckill_list.wxml
pages/goods/goodsInfo/goodsInfo.wxml
pages/index/index/index.js
pages/index/index/index.wxml
pages/template/index.wxml
@@ -230,7 +230,8 @@
           "name": "pack6",
           "pages": [
               "pages/wuliu/wuliu",
-              "pages/free_delivery/free_delivery"
+              "pages/free_delivery/free_delivery",
+              "pages/xcxServiceChat/xcxServiceChat"
           ]
       }
 // var e = function(e) {
 //       return e && e.__esModule ? e : {
 //         default: e
-//       };
+//       }; 
 //     }(require("../../utils/LoadMore3.js")),
 //     n = new e.default(), 
 var t = getApp(),
@@ -48,7 +48,8 @@ Component({
     imgobj:{
       '1':"/miniapp/images/component/seckill.png",
       '2':"/miniapp/images/component/pingd/pingd.png",
-      '6':"/miniapp/images/component/pingd/pingd.png"
+      '6':"/miniapp/images/component/pingd/pingd.png",
+      '8':"/miniapp/images/component/presale.png",
     },
     nav1:'/packageA/pages/goodsInfo/goodsInfo?',
     nav2:'/pages/goods/goodsInfo/goodsInfo?',
@@ -99,6 +100,13 @@ Component({
         nav2:'/pages/goods/goodsInfo/goodsInfo?'
       })
     }
+    if (this.data.prom_type==8) {  //预售
+      this.setData({
+        prom_text:'已售',
+        nav1:'/packageC/pages/presell/goodsInfo/goodsInfo?',
+        nav2:'/packageC/pages/presell/goodsInfo/goodsInfo?'
+      })
+    }
     var g_id = this.data.object;
     this.init(g_id);
@@ -153,12 +161,21 @@ Component({
             +os.stoid+"&aidlist="+goodsidlist + "&user_id="+user_id;
           }
+          if (th.data.prom_type==8) { //预售
+            gUrl="/api/weshop/marketing/marketingPresellList/page?store_id="
+            +os.stoid+"&goodsidlist="+goodsidlist + "&user_id="+user_id+'&is_end=0&timetype=3&isuse=1';
+          }
-          app.request.promiseGet(gUrl, {}).then(res => {
+          app.request.promiseGet(gUrl, {}).then(res => {
+              
               //如果秒杀的数组为空的时候    
               var goodslist = res.data.data;
+              if (th.data.prom_type==8) { //预售
+                goodslist = res.data.data ?  res.data.data.pageData : []
+              }
+
               //就算是添加的活动已经过期，就要用最新的进行中活动
               if (goodslist && goodslist.length > 0) {
                 th.set_goods_list(g_id.data, goodslist);
@@ -197,6 +214,18 @@ Component({
           timetype: 2,
         }
       }
+      if (this.data.prom_type==8) { //预售
+        gUrl="/api/weshop/marketing/marketingPresellList/page?page=1&pageSize=9"
+        req={
+          store_id:os.stoid,
+          is_end:0,
+          timetype:3,
+          isuse:1,
+          page:1,
+          user_id:user_id,
+          pageSize:9
+        }
+      }
       getApp().request.promiseGet(gUrl,
         { isShowLoading: 1, data:req  }
@@ -211,6 +240,7 @@ Component({
     //就算是添加的活动已经过期，就要用最新的活动
     set_goods_list(g_id, goodslist) {
+      
       let prom_type=this.data.prom_type
       goodslist.forEach(function (vy, indy) {
           if(!vy.id) vy.id=vy.prom_id;
@@ -240,29 +270,30 @@ Component({
       	let item=all_array[i];
       	if(item.user_price) item.price=item.user_price;
 				if(item.start_time > newTime) {
-					item.status = 0;
+					item.status = 0;    //活动没开始
 				} else if(item.end_time > newTime) {
-					item.status = 1;
+					item.status = 1;   // 活动进行中
 				};
       }
-			var promisies = [];
-			for (const key in all_array) {
-			  if (Object.hasOwnProperty.call(all_array, key)) {
-          const val = all_array[key];
-          
-			    promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
-			        os.stoid + "/"+prom_type+"/" + val.id, 
-			        {}
-			      ).then(res => {
-			        if (res.data.code == 0) {
-			          if (res.data.data <= 0) all_array[key].status = 2;
-			        };
-			      });
-			  }
-			}
+      var promisies = [];
+      if (th.data.prom_type !=8) {        
+        for (const key in all_array) {
+          if (Object.hasOwnProperty.call(all_array, key)) {
+            const val = all_array[key];           
+            promisies[key] = getApp().request.promiseGet("/api/weshop/activitylist/getActLen/" +
+                os.stoid + "/"+prom_type+"/" + val.id, 
+                {}
+              ).then(res => {
+                if (res.data.code == 0) {
+                  if (res.data.data <= 0) all_array[key].status = 2;//已售完
+                };
+              });
+          }
+        }
+      }
 			Promise.all(promisies).then(() => {
@@ -271,10 +302,24 @@ Component({
         for(let i in all_array){
           let item=all_array[i];
           if(newTime > item.end_time) {
-            all_array[i].status = 3;
+            all_array[i].status = 3;  //活动结束
           }; 
           // let price=all_array[i].price.toFixed(2)
           let price=all_array[i].price + ''
+          if (th.data.prom_type==8) { //预售
+            price = all_array[i].presell_price + ''
+            if (all_array[i].status ===0) {
+              all_array[i].goods_num=all_array[i].presell_sumqty*1 + all_array[i].virtual_qty*1
+              all_array[i].buy_num=all_array[i].buy_goodnum
+            }else{
+              all_array[i].goods_num=all_array[i].presell_sumqty*1 + all_array[i].virtual_qty*1 
+              all_array[i].buy_num=all_array[i].buy_goodnum + all_array[i].virtual_qty*1
+            }
+
+
+          }
+
+
           if (price && price.indexOf('.') > -1) {
             let priceArr = price.split(".")
             all_array[i].price_n = priceArr[0]
@@ -416,6 +461,9 @@ Component({
       if (this.data.prom_type==2) { //团购
         url="/packageC/pages/group_list/group_list";
       }
+      if (this.data.prom_type==8) { //预售
+        url="/packageC/pages/presell/list/list";
+      }
       wx.navigateTo({
         url
@@ -16,7 +16,7 @@
       <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
         <block wx:for="{{goods_array}}">
           <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')   + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}">
-            <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id)}}" class="s1_gk_a1">
+            <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
               <view class="topBox">
                 <view class="imgBox">
                   <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> -->
@@ -76,7 +76,7 @@
       <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')  }}">
         <block wx:for="{{goods_array}}">
           <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')   + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')+ (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}">
-            <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id)}}" class="s1_gk_a1">
+            <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
               <view class="topBox">
                 <view class="imgBox">
                   <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> -->
@@ -130,7 +130,7 @@
       <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
         <block wx:for="{{goods_array}}">
           <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')   + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/3 - ' + (object.product_spacing*2)/3+'px)')}}">
-            <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id)}}" class="s1_gk_a1">
+            <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
               <view class="topBox">
                 <view class="imgBox">
                   <!-- <image  mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3"></image> -->
@@ -178,7 +178,7 @@
       <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')  }}">
         <block wx:for="{{goods_array}}">
           <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')  + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}">
-            <navigator style="display: flex;" url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id)}}" class="s1_gk_a1">
+            <navigator style="display: flex;" url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+prom_type+'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
               <view style="width: 33%;" class="topBox">
                 <view class="imgBox">
                   <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
@@ -231,7 +231,7 @@
         <block wx:for="{{goods_array}}">
           <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
             <view wx:if="{{aind==0}}" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')  + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'')  + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}">
-              <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=' + prom_type + '&prom_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id)}}" class="s1_gk_a1">
+              <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=' + prom_type + '&prom_id=' + aitem.id +'&pre_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
                 <view class="topBox">
                   <view class="imgBox">
                     <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
@@ -422,7 +422,7 @@
       <swiper indicator-dots style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'+(swiperHeight ? ('height:'+swiperHeight+';'):'' )}}" class="{{' new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}">
         <swiper-item wx:for="{{goods_array}}" class="flex2" style="padding: 5rpx;">
           <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad swiper_h new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'')   + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/3 - ' + (object.product_spacing*2)/3+'px)')}}">
-            <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=' + prom_type + '&prom_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id)}}" class="s1_gk_a1">
+            <navigator url="{{aitem.goods_type == 1 ? ( nav1 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type=' + prom_type + '&prom_id=' + aitem.id +'&pre_id=' + aitem.id ) : ( nav2 + 'goods_id=' + aitem.goods_id + '&title=' + aitem.goods_name + '&prom_type='+ prom_type +'&prom_id=' + aitem.id +'&pre_id=' + aitem.id )}}" class="s1_gk_a1">
               <view class="topBox">
                 <view class="imgBox">
                   <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}">
@@ -217,7 +217,28 @@ Component({
             all_array[i].price_n = price
           }
-          all_array[i].residue=all_array[i].goods_num*1 - all_array[i].buy_num*1
+          let virtual = all_array[i].virtual ? all_array[i].virtual : 0
+          if (all_array[i].status) {         
+            if (all_array[i].is_virtual_count ) {
+              // all_array[i].goods_num -= all_array[i].virtual
+              all_array[i].buy_num += virtual*1
+              all_array[i].residue = all_array[i].goods_num*1 - all_array[i].buy_num*1         
+            }else{
+              all_array[i].buy_num += virtual*1
+              all_array[i].residue=all_array[i].goods_num*1 + virtual*1 - all_array[i].buy_num*1 
+            }
+          }else{
+            if (all_array[i].is_virtual_count ) {
+              // all_array[i].goods_num -= all_array[i].virtual
+              all_array[i].buy_num = 0
+              all_array[i].residue = all_array[i].goods_num*1 - all_array[i].buy_num*1         
+            }else{
+              all_array[i].buy_num = 0
+              all_array[i].residue=all_array[i].goods_num*1 + virtual*1 - all_array[i].buy_num*1 
+            }
+          }
+
+          // all_array[i].residue=all_array[i].goods_num*1 - all_array[i].buy_num*1
           if (all_array[i].residue && all_array[i].residue > 0 && all_array[i].status !=2) {
             empty.push(all_array[i])
           }
@@ -114,7 +114,7 @@
 						<block wx:if="{{prom_type==1}}">
 						  <view class="goods-num">
 						    <block>
-						      <view class="stock">总数量：{{prom_act.goods_num+prom_act.virtual}}件</view>
+						      <view class="stock">总数量：{{prom_act.is_virtual_count ? prom_act.goods_num : (prom_act.goods_num+prom_act.virtual)}}件</view>
 						      <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
 						      <view class="stock" wx:else>限购:不限</view>
@@ -52,6 +52,8 @@ Page({
     th.setData({getcurday:ut.gettimestamp()});
     var rs=await getApp().request.promiseGet("/api/weshop/prom/coupon/get/"+th.data.id, {})
+    // console.error('分享请求数据');
+    // console.error(rs);
     if(!rs){
         th.setData({is_get:1});
         return false;
@@ -64,6 +66,17 @@ Page({
     //如果只限定链接的时候，要取消分享按钮
     if(r_data.is_share){
           wx.hideShareMenu();
+          wx.offCopyUrl()
+          //替换掉复制链接
+          wx.onCopyUrl(() => {
+            setTimeout(()=>{
+              wx.setClipboardData({
+                data: '暂不支持分享',
+                success (res) { }     
+              })
+            },500)
+            return { query: 'a=1&b=2' }
+          })
     }
     if(r_data.store_id!=os.stoid){
+// packageF/pages/xcxServiceChat/xcxServiceChat.js
+var t = getApp(),
+a = t.request,
+o = t.globalData.setting
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    url: o.imghost,
+    imgUrl:'',
+    userinfo:{},
+    window_info:{},
+    imgBoxOffw:true,
+    imgBoxOffh:true,
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad(options) {
+    let window_info = wx.getWindowInfo()
+    console.error(window_info);
+    console.log(window_info);
+    this.getad()
+    wx.setNavigationBarTitle({
+      title: '联系客服'
+    })
+    this.setData({
+        userinfo: getApp().globalData.userInfo,
+        window_info,
+    });
+
+  },
+  //获取客服广告
+  async getad(){
+        //---首页广告-------
+        await getApp().request.promiseGet("/api/weshop/ad/page?pids=1209&store_id=" + o.stoid, {
+          data: {}
+        }).then(res => {
+          if (res.data.code == 0 && res.data.data.pageData && res.data.data.pageData.length > 0) {
+            let a = res.data.data.pageData[0];
+            let imgUrl = this.data.url + a.ad_code
+            wx.getImageInfo({
+              src: imgUrl,
+              success: res=>{
+                let imgBoxOffw = true
+                let imgBoxOffh = true
+                if (res.width > this.data.window_info.screenWidth) {
+                  imgBoxOffw = false
+                }
+                if (res.height > this.data.window_info.screenWidth) {
+                  imgBoxOffh = false
+                }
+
+                this.setData({
+                  imgUrl,
+                  imgBoxOffw,
+                  imgBoxOffh
+                })
+              }
+            })
+
+          }
+        })
+  },
+  //联系客服
+  con_weixin () {
+    console.log(123456);
+    console.log(this.data.sys_switch);
+    // getApp().con_wx(this);
+    var url=this.data.sys_switch.weapp_customertype_url;
+    var id=this.data.sys_switch.weapp_customertype_appid;
+    wx.openCustomerServiceChat({
+        extInfo: {url: url},
+        corpId: id,
+        success(res) {}
+    })
+ },
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide() {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload() {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh() {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom() {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage() {
+
+  }
+})
 \ No newline at end of file
+{
+  "usingComponents": {}
+}
 \ No newline at end of file
+<!--packageF/pages/xcxServiceChat/xcxServiceChat.wxml-->
+<button open-type="contact"  session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}" class="imgBox" style="background-image: url({{imgUrl}});{{(imgBoxOffw && imgBoxOffh) ? ' object-fit: cover;' : ((!imgBoxOffw && !imgBoxOffh) ? 'background-size: 100% 100%;' : (!imgBoxOffw ? 'background-size: 100% ;' :'background-size: auto 100% ' ) ) }}">
+
+</button>
+/* packageF/pages/xcxServiceChat/xcxServiceChat.wxss */
+
+.mainBox{
+  width: 100vw;
+  height: 100vh;
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+}
+.imgBox{
+  height: 100vh;
+  width: 100vw;
+  background-position: 50%;
+  background-repeat: no-repeat;
+  background-attachment: fixed;
+  position: relative;
+  /* object-fit: contain; */
+  
+  /* object-fit: cover; */
+}
+image{
+  margin: auto;
+}
 \ No newline at end of file
@@ -46,9 +46,9 @@
             <view class="xc-strip-blank rel">
             <view class="flex-vertical rel total">
-             <view class="t-c abs xc-fill"style="width:{{type==1?(100-(item.buy_num+item.virtual) /(item.goods_num+item.virtual)*100)>3?(100-(item.buy_num+item.virtual) /(item.goods_num+item.virtual)*100):'3':'100'}}%;background:{{type==1?'#f23030':'#059de5'}};">
+             <view class="t-c abs xc-fill"style="width:{{type==1?(100-(item.buy_num+item.virtual) /((item.is_virtual_count ? item.goods_num : item.goods_num+item.virtual))*100)>3?(100-(item.buy_num+item.virtual) /((item.is_virtual_count ? item.goods_num : item.goods_num+item.virtual))*100):'3':'100'}}%;background:{{type==1?'#f23030':'#059de5'}};">
              </view>
-               <text class="fs20 white abs xc-fill-text" style="">剩余{{type==1?filters.toFix(100-(item.buy_num+item.virtual)/(item.goods_num+item.virtual)*100,0):'100'}}%</text>
+               <text class="fs20 white abs xc-fill-text" style="">剩余{{type==1?filters.toFix(100-(item.buy_num+item.virtual)/((item.is_virtual_count ? item.goods_num : item.goods_num+item.virtual))*100,0):'100'}}%</text>
             </view>
             </view>
@@ -456,7 +456,7 @@
             <view wx:if="{{prom_type==1}}">
               <view class="goods-num">
                 <block wx:if="prom_st>0">
-                  <view class="stock">总数量：{{prom_act.goods_num+prom_act.virtual}}件</view>
+                  <view class="stock">总数量：{{prom_act.is_virtual_count ? prom_act.goods_num : (prom_act.goods_num+prom_act.virtual)}}件</view>
                   <view class="stock" wx:if="{{prom_act.buy_limit>0}}">限购:{{prom_act.buy_limit}}件</view>
                   <view class="stock" wx:else>限购:不限</view>
@@ -1316,7 +1316,7 @@
                 已售：{{prom_act.buy_num+prom_act.virtual}}
               </view>
               <view class="spec-goods-stock" wx:else>已售：{{prom_act.buy_num}}</view>
-              <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view>
+              <view class="spec-goods-stock">可售：{{(prom_act.is_virtual_count && prom_act.virtual) ? (prom_act.goods_num - prom_act.buy_num - prom_act.virtual) : (prom_act.goods_num-prom_act.buy_num)}}</view>
             </view>
           </block>
           <block wx:if="{{prom_type==2}}">
@@ -208,8 +208,9 @@ Page({
 		getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/' + getApp().globalData.setting.stoid, {
 			data: {}
 		}).then(function (data) {
-			let code = data.data.code;
-			if (code == 0) {
+      let code = data.data.code;
+      let resdata = data.data.data;
+			if (code == 0 && resdata.is_index) {
 				th.setData({
 					showHongbao: true,
@@ -516,6 +516,9 @@
         <block wx:if="{{item.ename=='presale'}}">
           <presell object="{{item.content}}"></presell>
         </block>
+        <block wx:if="{{item.ename=='presaleNew'}}">
+        <diy_public object="{{item.content}}" prom_type="8"></diy_public>
+      </block>
         <!-- 团购 -->
         <block wx:if="{{item.ename=='groupbuy'}}">
           <groupbuy object="{{item.content}}"></groupbuy>
@@ -69,6 +69,9 @@
       <block wx:if="{{item.ename=='presale'}}">
         <presell object="{{item.content}}"></presell>
       </block>
+      <block wx:if="{{item.ename=='presaleNew'}}">
+        <diy_public object="{{item.content}}" prom_type="8"></diy_public>
+      </block>
 	  <!-- 团购 -->
 	  <block wx:if="{{item.ename=='groupbuy'}}">
 	       <groupbuy object="{{item.content}}"></groupbuy>