Merge branch 'dev' into 'test'

Dev See merge request !458

Merge branch 'dev' into 'test'
Dev See merge request !458
后端研发-苏明海
2 parents d9fd8cd6 0577300e
Showing 51 changed files with 1920 additions and 214 deletions
app.js
app.json
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_goodsGroup/diy_goodsGroup.wxss
components/diy_picMax/diy_picMax.wxss
packageA/images/index/tuangou-pic.jpg
packageA/images/liveStreamDetails/circle.jpg
packageA/images/liveStreamDetails/cover.jpg
packageA/images/liveStreamDetails/friend.jpg
packageA/images/liveStreamDetails/goods.jpg
packageA/images/liveStreamDetails/home.jpg
packageA/images/liveStreamDetails/playbill.jpg
packageA/images/liveStreamDetails/save.jpg
packageA/images/liveStreamDetails/share.jpg
packageA/pages/liveStream/liveStream.js
packageA/pages/liveStream/liveStream.json
packageA/pages/liveStream/liveStream.wxml
packageA/pages/liveStream/liveStream.wxss
packageA/pages/liveStreamDetails/liveStreamDetails.js
packageA/pages/liveStreamDetails/liveStreamDetails.json
@@ -11,6 +11,7 @@ App({
     //使用getCurrentPages可以获取当前加载中所有的页面对象的一个数组，数组最后一个就是当前页面。
     var custum_data=this.globalData.custum_data;
     var isIpx=this.globalData.isIpx;
+    var is_read=this.globalData.is_read;
     //var curPageArr = getCurrentPages(); //获取加载的页面
     //var curPage = curPageArr[curPageArr.length - 1]; //获取当前页面的对象
     var curPage=th;
@@ -18,7 +19,7 @@ App({
     if (pagePath.indexOf('/') != 0) {
           pagePath = '/' + pagePath;
     }
-    if(isIpx){
+    if(is_read){
          if(custum_data){
              that.set_custom_nav(custum_data,isIpx,pagePath,url,curPage);
          }else{
@@ -49,10 +50,32 @@ App({
                 that.globalData.isIpx=isIpx;
                 getApp().request.promiseGet("/api/weshop/storeFooter/get/"+stoid, {
                 }).then(res => {
+                    this.globalData.is_read=true;
                     var e = res;
                     if(e.data.code != -1){
                         that.globalData.custum_data=e.data.data;
-                        that.set_custom_nav(e.data.data,isIpx,pagePath,url,curPage);
+
+                        var itemList = that.globalData.custum_data.data;
+                        itemList = JSON.parse(itemList)
+
+                        if(!itemList[0].weappurl){
+                            that.globalData.custum_data=null;
+                            var tabBar = {
+                                'iscustom':2,
+                                'url':url,
+                                'active':pagePath,
+                                'isIpx':isIpx,
+                                cartGoodsNum:this.globalData.cartGoodsNum
+                            }
+                            curPage.setData({
+                                tabBar:tabBar,
+                                isIpx:isIpx,
+                                cartGoodsNum:this.globalData.cartGoodsNum
+                            })
+                        }else{
+                            that.set_custom_nav(e.data.data,isIpx,pagePath,url,curPage);
+                        }
+
                     }else{
                         var tabBar = {
                             'iscustom':2,
@@ -136,7 +159,10 @@ App({
       first_leader:null,  //分享会员ID
       guide_id:null,      //分享导购ID
  
-      windowWidth:0,  //整个窗体的宽度
+      windowWidth:0,        //整个窗体的宽度
+
+      room_id:null,        //直播间分享的房间ID
+      room_goods_id:null,  //直播间分享的商品ID
  
   },
     auth: o,
@@ -563,9 +589,11 @@ App({
     //清空登录时候缓存的值
     onHide:function () {
         this.globalData.is_test=0;
-        this.globalData.guide_id=null;                 //导购清空
-        this.globalData.first_leader=null;             //分享的会员清空
-        th.globalData.wuliu=null;                      //关闭要把物流清空
+        this.globalData.guide_id=null;                     //导购清空
+        this.globalData.first_leader=null;                 //分享的会员清空
+        this.globalData.wuliu=null;                        //关闭要把物流清空
+        this.globalData.room_id=null;                      //关闭要把房间号关闭
+        this.globalData.room_goods_id=null;                //关闭要把物流清空
     }
  
  
 {
   "pages": [
     "pages/index/index/index",    
+    "pages/justTest/justTest",
     "pages/goods/categoryList/categoryList",
     "pages/cart/cart/cart",
     "pages/cart/cart2/cart2",
@@ -85,16 +86,17 @@
     "pages/video/index",
     "pages/template/index",
     "pages/store/index"
-
   ],
  
   "subPackages": [{
       "root": "packageA/",
       "name":"pack1",
       "pages": [     
+        "pages/liveStream/liveStream",
          "pages/prom_list/prom_list",
          "pages/quan_list/quan_list",
-         "pages/quan_pro/quan_pro"
+         "pages/quan_pro/quan_pro",
+         "pages/liveStreamDetails/liveStreamDetails"
       ],
       "plugins": {
         "live-player-plugin": {
@@ -149,7 +149,7 @@
                         <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
                                    binderror="bind_bnerr3"></image>
                         <block wx:if="{{object.goodicon==3}}">
-                            <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.position==1}}"
+                            <image class='{{g_filter.get_class(object.column,object.position)}}'
                                    src='{{object.customicon}}'></image>
                         </block>
                         <block wx:if="{{object.goodicon==1}}">
@@ -285,7 +285,7 @@
                             <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img"
                                        binderror="bind_bnerr3"></image>
                             <block wx:if="{{object.goodicon==3}}">
-                                <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{ object.position==1}}"
+                                <image class='{{g_filter.get_class(object.column,object.position)}}'
                                        src='{{object.customicon}}'></image>
                             </block>
                             <block wx:if="{{object.goodicon==1}}">
@@ -422,7 +422,7 @@
                     </block>
  
                     <block wx:if="{{object.goodicon==3}}">
-                        <image class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.position==2}}"
+                        <image class='{{g_filter.get_class(object.column,object.position)}}'
                                src='{{object.customicon}}'></image>
                     </block>
                     <block wx:if="{{object.goodicon==1}}">
@@ -145,6 +145,7 @@
   height: 318rpx;
   margin-top: 20rpx;
   display: flex;
+  position: relative;
 }
  
 .zs_t_img_x {
@@ -236,7 +237,7 @@
   height: 56rpx;
   position: relative;
   right: 56rpx;
-  top: 234rpx;
+  top: 0rpx;
 }
  
 .zs_t1_x3 {
@@ -473,6 +474,13 @@
   left: 0rpx;
   top: 10rpx;
 }
+.zs_t1_x4{
+  width: 56rpx;
+  height: 56rpx;
+  position: absolute;
+  right: 0rpx;
+  bottom: 10rpx;
+}
  
 .zs_t2_3l {
   width: 56rpx;
@@ -562,3 +570,5 @@
   overflow: hidden;
   white-space: nowrap;
 }
+
+
 .picMax{width: 100%;position: relative;}
 .pic_item{display: block; top:0;left:0;float:left}
-.pic_item image{width: 100%; height: 100%}
-.width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:748rpx;}
+.pic_item image{width: 100%; height: 100%; vertical-align: bottom;}
+.width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:750rpx;}
 /* .height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;} */
 /* .mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;}
 .mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top:  562.5rpx}.mar_y4{margin-top: 748rpx;} */
+// pages/liveStream/liveStream.js
+
+var t = require("../../../utils/util"),
+  ut = t,
+  e = require("../../../utils/common.js"),
+  a = require("../../../utils/wxParse/wxParse.js"),
+  s = getApp(),
+  i = s.request,
+  rq = i,
+  oo = s.globalData,
+  o = s.globalData.setting,
+  os = o;
+var utils = require('../../../utils/util.js'),ut=utils;
+var regeneratorRuntime = require('../../../utils/runtime.js');
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    goodsList: [],
+    imghost: '',
+    liveList: {}
+  },
+  
+  // 点击直播列表项
+  clickItem: function (e) {
+    // id：列表项id
+    // live：直播类别 即将开始/直播中/精彩回放
+    wx.navigateTo({
+      url: '/packageA/pages/liveStreamDetails/liveStreamDetails?id=' + e.currentTarget.dataset.id + '&live=' + e.currentTarget.dataset.live
+    })
+    console.log('options-->');
+  }, 
+
+  // 点击 订阅/观看直播/观看回放 按钮，跳转直播组件
+  clickLive: function (e) {
+    console.log('当前房间号roomid：',e.currentTarget.dataset.roomid);
+    let roomId = e.currentTarget.dataset.roomid;
+    let customParams = encodeURIComponent(JSON.stringify({ path: 'pages/index/index', pid: 1 }));
+    wx.navigateTo({
+      url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${roomId}&custom_params=${customParams}`
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var live = {};
+    live.toBegin = []; // 即将开始
+    live.ing = [];     // 直播中
+    live.over = [];    // 已结束
+
+    // 请求数据
+    var that = this;
+    getApp().request.promiseGet("/api/weshop/wx/livelist/page", {}).then(res=>{
+        console.log('ressss--->',res);
+          if(res.data.code==0){
+            that.setData({
+              goodsList: res.data.data.pageData
+            })
+          }
+          // console.log(goodsList);
+        
+      var result = res.data.data.pageData;
+      var liveStatus;
+      if(res.data.code == 0) {
+        for(var i in result) {
+          console.log(i + '当前直播状态：', result[i].live_status);
+          liveStatus = result[i].live_status;
+          // 这里只显示101/102/103状态
+          if (liveStatus == '101') {
+            live.ing.push(result[i]);
+          } else if (liveStatus == '102') {
+            live.toBegin.push(result[i]);
+          } else if (liveStatus == '103') {
+            live.over.push(result[i]);
+          }
+        }
+        // console.log('live--->', live);
+        that.setData({
+          live
+        });
+      }
+    })
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})
 \ No newline at end of file
+{
+  "usingComponents": {
+      "subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
+  }
+}
 \ No newline at end of file
+<!--pages/liveStream/liveStream.wxml-->
+<wxs src="../../../utils/filter.wxs" module="filter"></wxs>
+<view>
+	<block wx:if="{{live === '{}'}}">当前暂无直播</block>
+	<!-- 即将开始 -->
+	<block wx:if="{{live.toBegin.length > 0}}">
+		<view class="title">即将开始</view>
+		<view class="list">
+			<block wx:for="{{live.toBegin}}">
+				<view class="list-item" data-id="{{item.id}}" data-live="toBegin" catchtap="clickItem">
+					<view class="list-item-left">
+						<image src="{{item.cover_img}}" class="item-pic" mode="aspectFill"></image>
+						<!-- <view class="item-desc">
+							<view>{{item.name}}</view>
+							<view>{{filter.format_time(item.start_time)}}</view>
+						</view> -->
+					</view>
+					<view class="list-item-right">
+						<view class="item-title">{{item.name}}</view>
+						<subscribe room-id="{{item.roomid}}" stopPropagation="{{true}}"></subscribe>
+					</view>
+					
+				</view>
+				
+			</block>
+		</view>
+	</block>
+	
+
+	<!-- 直播中 -->
+	<block wx:if="{{live.ing.length > 0}}">
+		<view class="title">直播中</view>
+		<view class="list">
+			<block wx:for="{{live.ing}}">
+				<view class="list-item" catchtap="clickItem" data-id="{{item.id}}" data-live="ing">
+					<view class="list-item-left">
+						<image src="{{item.cover_img}}" class="item-pic" mode="aspectFill"></image>
+					</view>
+					<view class="list-item-right">
+						<view class="item-title">{{item.name}}</view>
+						<view class="item-btn" catchtap="clickLive" data-roomid="{{item.roomid}}">观看直播</view>
+					</view>
+				</view>
+			</block>
+		</view>
+	</block>
+	
+
+	<!-- 精彩回放 -->
+	<block wx:if="{{live.over.length > 0}}">
+		<view class="title">精彩回放</view>
+		<view class="list">
+			<block wx:for="{{live.over}}">
+				<view class="list-item" bindtap="clickItem" data-id="{{item.id}}"  data-live="over">
+					<view class="list-item-left">
+						<image src="{{item.cover_img}}" class="item-pic" mode="aspectFill"></image>
+					</view>
+					<view class="list-item-right">
+						<view class="item-title">{{item.name}}</view>
+						<view class="item-btn" catchtap="clickLive" data-roomid="{{item.roomid}}">观看回放</view>
+					</view>
+				</view>
+			</block>
+		</view>
+	</block>
+</view>
 \ No newline at end of file
+/* pages/liveStream/liveStream.wxss */
+.title {
+  font-size: 30rpx;
+  padding: 50rpx 32rpx;
+}
+.list-item {
+  padding: 0 32rpx 30rpx;
+  display: flex;
+}
+.list-item-left {
+  position: relative;
+  width: 300rpx;
+  height: 300rpx;
+  flex-shrink: 0;
+}
+.list-item-right {
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+  padding-left: 32rpx;
+  /* position: relative;
+  padding-bottom: 70rpx; */
+}
+.item-pic {
+  /* width: 400rpx; */
+  width: 100%;
+  height: 100%;
+  background-color: #eee;
+}
+.item-desc {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  background: black;
+  color: #fff;
+  text-align: center;
+  padding-bottom: 23rpx;
+
+  background: -moz-linear-gradient(bottom,#7A7171, transparent);/*Mozilla*/
+  background: -webkit-gradient(bottom,0 50%,100% 50%,from(#7A7171),to(transparent));/*Old gradient for webkit*/
+  background: -webkit-linear-gradient(bottom,rgba(0,0,0,.8),transparent);/*new gradient for Webkit*/
+  background: -o-linear-gradient(bottom,#7A7171,transparent); /*Opera11*/
+}
+.item-desc view:first-child {
+  font-size: 24rpx;
+  font-weight: bold;
+}
+.item-desc view:last-child {
+  font-size: 17rpx;
+}
+.item-title {
+  font-weight: bold;
+  font-size: 30rpx;
+  text-align: justify;
+
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 4;
+  overflow: hidden;
+}
+
+.item-btn {
+  width: 172rpx;
+  height: 56rpx;
+  line-height: 56rpx;
+  background-color: #000;
+  color: #fff;
+  font-size: 28rpx;
+  text-align: center;
+}
+subscribe {
+  position: relative;
+}
+.subscribe--live-player-subscribe__btn {
+  width: 172rpx !important;
+  height: 56rpx !important;
+  line-height: 56rpx !important;
+  background-color: #000 !important;
+  font-size: 28rpx !important;
+  position: relative;
+  border-radius: 0 !important;
+  margin: 0 !important;
+}
+.subscribe--live-player-notSubscribe::before {
+  content: '订阅';
+  position: absolute;
+  left: 0;
+  width: 172rpx;
+  height: 56rpx;
+  background-color: #000;
+  color: #fff;
+}
+.subscribe--live-player-hasSubscribe {
+  background-color: #666 !important;
+}
 \ No newline at end of file
+// pages/liveStreamDetails/liveStreamDetails.js
+var t = require("../../../utils/util.js"),
+  ut = t,
+  e = require("../../../utils/common.js"),
+  a = require("../../../utils/wxParse/wxParse.js"),
+  s = getApp(),
+  i = s.request,
+  rq = i,
+  oo = s.globalData,
+  o = s.globalData.setting,
+  os = o;
+
+const app = getApp();
+
+Page({
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    details: {},
+    status: '',
+    btnText: '',
+    showActionSheet: true,
+    showPlaybill: true,
+    windowWidth: 0,
+    windowHeight: 0,
+    dpr: 0,
+    canvasScale: 1.0,
+    nickName: '',
+    avatarUrl: '',
+    coverImg: '',
+    canvasToImgPath: ''
+  },
+
+  // 点击商品
+  clickgoods: function (e) {
+    console.log('...........>', e.currentTarget.dataset.url);
+    wx.navigateTo({
+      url: '../../../' + e.currentTarget.dataset.url
+    });
+  },
+
+  // 返回首页
+  backHome: function () {
+    wx.reLaunch({
+      url: '../../../pages/index/index/index',
+    })
+  },
+
+  // 分享操作表
+  clickShare: function () {
+    this.setData({
+      showActionSheet: !this.data.showActionSheet
+    })
+  },
+
+  // actionSheet - 取消按钮
+  hiddenActionSheet: function () {
+    this.setData({
+      showActionSheet: 'false'
+    })
+  },
+
+  //生成海报
+  createPlaybill: function () {
+    // 1.提示 “正在生成海报...”
+    wx.showLoading({
+      title: '正在生成海报...'
+    });
+    // 2.生成海报，如果生成完毕,关闭提示
+    this.drawPlaybill();
+    // 3.展示生成的海报
+    this.setData({
+      showPlaybill: !this.data.showPlaybill,
+      showActionSheet: 'false'
+    });
+  },
+ 
+  // 获取设备信息
+  getSystemInfo: function() {
+    let that = this;
+    wx.getSystemInfo({
+      success: function(res) {
+        that.setData({
+          windowWidth: res.windowWidth,
+          windowHeight: res.windowHeight,
+          dpr: res.pixelRatio
+        })
+      }
+    });
+  },
+
+    //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
+    drawText: function(ctx, str, leftWidth, initHeight, titleHeight, canvasWidth, unit) {
+      var lineWidth = 0;
+      var lastSubStrIndex = 0; //每次开始截取的字符串的索引
+      var han = 0;
+      for (let i = 0; i < str.length; i++) {
+        if (han == 2) return;
+        //lineWidth += ctx.measureText(str[i]).width;
+        lineWidth += ut.measureText(str[i], 21.3 * unit);
+        if (lineWidth > canvasWidth) {
+          han++;
+  
+          if (han == 2) {
+            ctx.textAlign = 'justify';
+            ctx.fillText(str.substring(lastSubStrIndex, i) + '...', leftWidth, initHeight); //绘制截取部分
+          } else {
+            ctx.textAlign = 'justify';
+            ctx.fillText(str.substring(lastSubStrIndex, i), leftWidth, initHeight);
+          }
+          initHeight += 22; //22为字体的高度
+          lineWidth = 0;
+          lastSubStrIndex = i;
+          titleHeight += 20;
+        }
+        if (i == str.length - 1) { //绘制剩余部分
+          ctx.textAlign = 'justify';
+          ctx.fillText(str.substring(lastSubStrIndex, i + 1), leftWidth, initHeight);
+        }
+      }
+    },
+
+   // 生成海报
+  drawPlaybill: function () {
+    var that = this
+    // 适配屏get幕
+    let scale = this.data.windowWidth / 375.0
+ 
+    this.setData({ totalHeight: 667*scale})
+    // 获取Canvas
+    let ctx = wx.createCanvasContext('myCanvas')
+
+    // 放大 因为不放大的话，生成的分享图会模糊。暂时先注释
+    ctx.scale(this.data.canvasScale, this.data.canvasScale)
+    
+    // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+    // os.stoid;
+
+    var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+      os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+   + "?sceneValue=1012" + "&pageValue=packageA/pages/liveStreamDetails/liveStreamDetails"
+  //  console.log('path3---->', path3);
+
+
+    // 绘制主背景白色
+    ctx.setFillStyle('#ffffff')
+    ctx.fillRect(0, 0, this.data.windowWidth, this.data.totalHeight)
+    ctx.draw(true);
+
+    
+    const coverImag = this.data.details['cover_img'];
+    const title = this.data.details.name;
+    console.log('detail--->', this.data.details);
+
+
+    //绘制头像
+    wx.getImageInfo({
+      src: that.data.avatarUrl,
+      success: function(res) {
+        ctx.save();
+        ctx.beginPath();
+        ctx.arc(29*scale, 27*scale, 14*scale, 0, 2*Math.PI);
+        ctx.clip();
+        ctx.drawImage(res.path, 15*scale, 13*scale, 28*scale, 28*scale);
+        ctx.restore()
+        ctx.draw(true);
+      }
+    })
+
+    // 绘制昵称
+    ctx.setFontSize(12*scale);
+    ctx.setFillStyle('#ADADAD');
+    ctx.fillText(this.data.nickName, 54*scale, 32*scale);
+
+    //绘制主图
+    wx.getImageInfo({
+      src: coverImag,
+      success: function(res) {
+        ctx.drawImage(res.path, 0, 52*scale, 240*scale, 191*scale);
+        ctx.draw(true);
+      }
+    })
+
+    //绘制文字
+    ctx.setFontSize(14*scale);
+    ctx.setFillStyle('#1E1E1E');
+    // ctx.fillText(title, 10*scale, 281*scale, 97*scale);
+    this.drawText(ctx, title, 10*scale, 281*scale, 130*scale, 130*scale, scale);
+    // ctx.draw(true);
+
+    //绘制小程序码
+    wx.getImageInfo({
+      src: path3,
+      success: function(res) {
+        ctx.drawImage(res.path, 152*scale, 262*scale, 66*scale, 66*scale);
+        ctx.draw(true);
+      }
+    })
+
+    //绘制文字：常按识别
+    ctx.setFontSize(14*scale);
+    ctx.setFillStyle('#1E1E1E');
+    ctx.fillText('长按识别小程序', 135*scale, 350*scale);
+
+
+    //把画板内容绘制成图片，并回调 画板图片路径
+    ctx.draw(true, function() {
+      setTimeout(function() {
+        wx.canvasToTempFilePath({
+          x: 0,
+          y: 0,
+          destWidth: that.data.windowWidth*2,
+          destHeight: that.data.windowHeight*2,
+          fileType: 'jpg',
+          quality: 1,
+          canvasId: 'myCanvas',
+          success: function(res) {
+            wx.hideLoading();
+            that.setData({
+              canvasToImgPath: res.tempFilePath,
+            });
+            console.log(res.tempFilePath);
+          }
+        })
+      }, 3000)
+    });
+  },
+
+  
+
+  //点击观看直播
+  clickBtn: function () {
+    let roomId = this.data.details.roomid;
+    // let customPearams = encodeURIComponent(JSON.stringify({ path: 'pages/index/index', pid: 1 }));
+    wx.navigateTo({
+      url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${roomId}`
+    })
+  },
+
+ // 保存图片到手机
+  onSaveToPhone() {
+    // 获取用户的当前设置，返回值中有小程序已经向用户请求过的权限
+    this.getSetting().then((res) => {
+      // 判断用户是否授权了保存到相册的权限，如果没有发起授权
+      if (!res.authSetting['scope.writePhotosAlbum']) {
+        this.authorize().then(() => {
+          // 同意授权后保存下载文件
+          this.savedownloadFile(this.data.canvasToImgPath)
+        })
+      } else {
+        // 如果已经授权，保存下载文件
+        this.savedownloadFile(this.data.canvasToImgPath)
+      }
+    })
+  },
+
+  //打开设置，引导用户授权
+  onOpenSetting() {
+    wx.openSetting({
+      success:(res) => {
+        console.log(res.authSetting)
+      }
+    })
+  },
+
+  // 获取用户已经授予了哪些权限
+  getSetting() {
+    return new Promise((resolve, reject) => {
+      wx.getSetting({
+        success: res => {
+          console.log('getting---->', res);
+          resolve(res)
+        }
+      })
+    })
+  },
+
+  // 发起首次授权请求
+  authorize() {
+    // isFirst 用来记录是否为首次发起授权，
+    // 如果首次授权拒绝后，isFirst赋值为1
+    let isFirst = wx.getStorageSync('isFirst') || 0;
+    return new Promise((resolve, reject) => {
+      wx.authorize({
+        scope: 'scope.writePhotosAlbum',
+        // 同意授权
+        success: () => {
+          resolve()
+        },
+        // 拒绝授权,这里是用户拒绝授权后的回调
+        fail: res => { 
+          if(isFirst === 0) {
+            wx.setStorageSync('isFirst', 1);
+            wx.showToast({
+              title: '保存失败',
+              icon: 'none',
+              duration: 1000
+            })
+          } else {
+            this.showModal()
+          }
+          console.log('拒绝授权');
+          reject()
+        }
+      })
+    })
+  },
+
+  //保存下载文件
+  savedownloadFile(img) {
+    this.downLoadFile(img).then((res) => {
+      return this.saveImageToPhotosAlbum(res.tempFilePath)
+    }).then(() => {      
+    })
+  },
+
+  //单文件下载(下载文件资源到本地)，客户端直接发起一个 HTTPS GET 请求，返回文件的本地临时路径。
+  downLoadFile(img) {
+    return new Promise((resolve, reject) => {
+      wx.showLoading({
+        title: '保存中...', 
+        mask: true,
+      });
+      wx.downloadFile({
+        url: img,
+        success: (res) => {
+          console.log('downloadfile', res)
+          resolve(res)
+        }
+      })
+    })
+  },
+
+  // 保存图片到系统相册
+  saveImageToPhotosAlbum(saveUrl) {
+    var self = this;
+    return new Promise((resolve, reject) => {
+      wx.saveImageToPhotosAlbum({
+        filePath: saveUrl,
+        success: (res) => {
+          wx.showToast({
+            title: '保存成功',
+            duration: 1000,
+          });
+          self.setData({
+            showPlaybill: 'true'
+          });
+          resolve()
+        }
+      })
+    })
+  },
+
+
+  // 弹出模态框提示用户是否要去设置页授权
+  showModal() {
+    wx.showModal({
+      title: '检测到您没有打开保存到相册的权限，是否前往设置打开？',
+      success: (res) => {
+        if (res.confirm) {
+          console.log('用户点击确定')
+          this.onOpenSetting() // 打开设置页面          
+        } else if (res.cancel) {
+          console.log('用户点击取消')
+        }
+      }
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    var that = this;
+    this.getSystemInfo();
+
+    getApp().request.promiseGet("/api/weshop/wx/livelist/get",{
+      data:{ id: options.id }
+    }).then(res=>{
+        if(res.data.code==0){
+          var obj = res.data.data;
+          var goods = JSON.parse(obj.goods);
+          obj.goods = goods;
+          that.setData({
+            details: obj
+          })
+        }
+    })
+    
+    switch(options.live) {
+      case 'toBegin': {
+        this.setData({
+          btnText: '订阅'
+        })
+        break;
+      }
+      case 'ing': {
+        this.setData({
+          btnText: '进入直播间'
+        })
+        break;
+      }
+      default: {
+        this.setData({
+          btnText: '回放直播'
+        })
+        break;
+      }
+    }
+
+    this.setData({
+      nickName: app.globalData.userInfo.nickname,
+      avatarUrl: app.globalData.userInfo.head_pic
+    })
+
+    var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
+      os.stoid + "?sceneValue=1012" + "&pageValue=pages/goods/goodsInfo/goodsInfo";
+    wx.getImageInfo({
+      src: path3,
+      success: function(res) {
+        // ctx.drawImage(res.path, 152*scale, 262*scale, 66*scale, 66*scale);
+        // ctx.draw(true);
+        that.setData({
+          ewm: res.path
+        })
+      }
+    })
+  },
+
+  // 获取图片信息
+  getImageInfo(src) {
+    return new Promise((resolve, reject) => {
+      wx.getImageInfo({
+        src: src,
+        success: (res) => {
+          resolve(res);
+        }
+      })
+    });
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+    
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+    this.setData({
+      showActionSheet: 'false'
+    })
+    var self = this;
+    return {
+      title: this.data.details.name,
+      success: function(res) {
+        console.log('res---->', res);
+      },
+      complete: function(res) {
+        console.log('comple', res)
+      }
+    }
+  }
+})
+{
+  "usingComponents": {
+    "subscribe": "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
+  }
+}
 \ No newline at end of file
+<!--
+此文件为开发者工具生成，生成时间: 2020/7/4 下午3:58:01 
+使用方法：
+1. 在"packageA\pages\liveStreamDetails\liveStreamDetails.wxml"中使用`include`指令引入此模板，
+2. 在"packageA\pages\liveStreamDetails\liveStreamDetails.wxss"中使用`import`指令引入"packageA\pages\liveStreamDetails\liveStreamDetails.skeleton.wxss"
+3. 书写对应的逻辑，来控制骨架屏的显示与隐藏
+
+更多详细信息可以参考文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/skeleton.html
+-->
+<view class="sk-container"></view>
 \ No newline at end of file
+/*
+此文件为开发者工具生成，生成时间: 2020/7/4 下午3:58:01 
+使用方法：参考 "packageA\pages\liveStreamDetails\liveStreamDetails.skeleton.wxml"
+*/
+.sk-transparent {
+    color: transparent !important;
+  }
+.sk-container {
+    position: absolute;
+    overflow: hidden;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1000000;
+    background-color: transparent;
+  }
+<!--pages/liveStreamDetails/liveStreamDetails.wxml-->
+<wxs src="../../../utils/filter.wxs" module="filter"></wxs> 
+<wxs src="../../../utils/myUtils.wxs" module="myUtils"></wxs>
+<!-- <wxs src="/packageA/pages/liveStreamDetails/wxs.wxs" module="tool"></wxs> -->
+<view class="content">
+  <!-- 封面标题 -->
+  <view class="cover-container">
+    <image src="{{details.cover_img}}" class="cover-img" mode="aspectFill"></image>
+    <!-- <view class="cover-desc">
+      <view>{{details.name}}</view>
+      <view>{{filter.format_time(details.start_time)}}</view>
+    </view> -->
+  </view>
+
+  <!-- 直播详情 -->
+  <view class="desc-container">
+    <view class="desc-title">{{details.name}}</view>
+    <text class="desc-status">{{myUtils.liveStatus(details.live_status)}}</text>
+    <!-- <view class="desc-content">
+      <view>6月24日20:00锁定直播 盘点年中 「上榜」好货！</view>
+      <view>护肤、彩妆、香氛群星汇聚，更有折扣买赠与神秘新品加持~</view>
+      <view>多轮抽奖惊喜连连，不容错过！</view>
+    </view> -->
+  </view>
+    
+  <!-- 列表 -->
+  <view class="list">
+    <!-- 列表项 -->
+    <block wx:for="{{details.goods}}">
+      <view class="list-item" bindtap="clickgoods" data-url="{{item.url}}">
+      <!-- {{item}} -->
+        <image src="{{item.cover_img}}" class="item-pic"></image>
+        <view class="item-desc-container">
+          <view class="item-desc">
+            <!-- <view>WEI</view> -->
+            <view>{{item.name}}</view>
+          </view>
+          <view class="item-price">{{item.price}}</view>
+        </view>
+      </view>
+    </block>
+    
+  </view> 
+
+  <!-- 回放直播 -->
+  <view class="btn-container">
+    <subscribe wx:if="{{details.live_status === '102'}}" class="btn" room-id="{{details.roomid}}" stopPropagation="{{true}}"></subscribe>
+    <view wx:else class="btn" bindtap="clickBtn">{{btnText}}</view>
+  </view>
+  
+  <!-- 分享 -->
+  <view class="share-container">
+    <image src="/packageA/images/liveStreamDetails/share.jpg" bindtap="clickShare"></image>
+    <image src="/packageA/images/liveStreamDetails/home.jpg" bindtap="backHome"></image>
+  </view>
+
+  <!-- actionSheet -->
+  <view class="{{showActionSheet ? 'share-actionSheet':'share-actionSheet active'}}" hidden="{{showActionSheet}}">
+    <view class="share-actionSheet-title">分享</view>
+      <view class="share-actionSheet-list">
+        <view class="share-actionSheet-item" hover-class="active">
+          <button open-type="share">
+            <image src="/packageA/images/liveStreamDetails/friend.jpg" class="share-actionSheet-pic"></image>
+            <text class="share-actionSheet-desc">发送给朋友</text>
+          </button>
+        </view>
+        <view class="share-actionSheet-item" hover-class="active" bindtap="createPlaybill">
+          <image src="/packageA/images/liveStreamDetails/circle.jpg" class="share-actionSheet-pic"></image>
+          <text class="share-actionSheet-desc">生成分享海报</text>
+        </view>
+      </view>
+      <view class="share-actionSheet-cancle" bindtap="hiddenActionSheet">取消</view>
+  </view>
+
+  <!-- 生成海报 -->
+  <view class="{{showPlaybill ? 'playbill':'playbill active'}}" hidden="{{showPlaybill}}">
+    <!-- <image src="{{canvasToImgPath}}" class="playbill-pic"></image> -->
+    <canvas canvas-id="myCanvas" class="playbill-pic" style="width:{{windowWidth*dpr}};height:width:{{windowHeight*dpr}}"></canvas>
+    <view class="playbill-save" bindtap="onSaveToPhone">
+      <image src="/packageA/images/liveStreamDetails/save.jpg"></image>保存至相册
+    </view>
+  </view>
+
+  <!-- mask -->
+  <!-- 这里mask必须强制放在actionsheet和playbill的后面 -->
+  <view class="mask"  bindtap="hiddenActionSheet"></view>
+
+</view>
+/* pages/liveStreamDetails/liveStreamDetails.wxss */
+.active {
+  background-color: #ddd;
+}
+
+.content {
+  background-color: white;
+  padding-bottom: 168rpx;
+}
+.cover-container {
+  height: 646rpx;
+  position: relative;
+}
+.cover-img {
+  width: 100%;
+  height: 100%;
+}
+.cover-desc {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  text-align: center;
+  padding-top: 64rpx;
+  padding-bottom: 64rpx;
+  color: #fff;
+
+  background: -moz-linear-gradient(bottom,#7A7171, transparent);/*Mozilla*/
+  background: -webkit-gradient(bottom,0 50%,100% 50%,from(#7A7171),to(transparent));/*Old gradient for webkit*/
+  background: -webkit-linear-gradient(bottom,rgba(0,0,0,.8),transparent);/*new gradient for Webkit*/
+  background: -o-linear-gradient(bottom,#7A7171,transparent); /*Opera11*/
+}
+.cover-desc view:first-child {
+  font-size: 50rpx;
+}
+.cover-desc view:last-child {
+  font-size: 42rpx;
+}
+
+.desc-container {
+  padding: 56rpx 46rpx 41rpx;
+  color: #3E3E3E;
+}
+.desc-title {
+  font-size: 42rpx;
+  font-weight: bold;
+}
+.desc-status {
+  display: inline-block;
+  color: #5B5B5B;
+  font-size: 28rpx;
+  height: 50rpx;
+  line-height: 50rpx;
+  padding: 0 30rpx;
+  background-color: #eee;
+  margin-top: 22rpx;
+  margin-bottom: 44rpx;
+}
+.desc-content {
+  font-size: 29rpx;
+}
+.list {
+  padding: 0 36rpx;
+}
+.list-item {
+  display: flex;
+  padding-bottom: 34rpx; 
+}
+.list-item:not(:first-child) {
+  padding-top: 34rpx;
+}
+.list-item:not(:last-child) {
+  border-bottom: 2rpx solid #B5B5B5;
+}
+.item-pic {
+  width: 224rpx;
+  height: 224rpx;
+  border: 2rpx solid #E1E1E1;
+}
+.item-desc-container {
+  padding-left: 46rpx;
+  font-size: 24rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: space-between;
+}
+.item-desc view:first-child {
+  padding-top: 10rpx;
+  padding-bottom: 38rpx;
+}
+.item-price:before {
+  content: '￥';
+}
+
+.share-container {
+  /* width: 86rpx; */
+  position: fixed;
+  padding: 0 8rpx;
+  box-shadow: 0px 0px 2px 1px rgba(0,0,0,0.1);
+  right: 28rpx;
+  top: 50%;
+  background-color: #fff;
+}
+.share-container image {
+  display: block;
+  width: 60rpx;
+  height: 60rpx;
+  padding-top: 14rpx;
+  padding-bottom: 11rpx;
+}
+.share-container image:first-child {
+  border-bottom: 2rpx solid #E7E7E7;
+}
+
+
+.btn-container {
+  background-color: #fff;
+  box-sizing: border-box;
+  padding: 24rpx 128rpx;
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  box-shadow: 0px -1px 4px 1px rgba(0,0,0,0.1);
+}
+.btn {
+  color: #fff;
+  background-color: #000;
+  font-size: 36rpx;
+  line-height: 120rpx;
+  text-align: center;
+  /* width: 618rpx;
+  height: 92rpx; */
+}
+.subscribe--live-player-notSubscribe {
+  position: relative;
+}
+.subscribe--live-player-notSubscribe::before {
+  content: '订阅';
+  position: absolute;
+  left: 0;
+  width: 100%;
+  height: auto;
+  background-color: #000;
+  color: #fff;
+}
+.subscribe--live-player-subscribe__btn {
+  width: 100% !important;
+  height: auto !important;
+  font-size: 36rpx !important;
+  line-height: 120rpx !important;
+  border-radius: 0 !important;
+  background-color: #000 !important;
+}
+.subscribe--live-player-hasSubscribe {
+  background-color: #666 !important;
+}
+
+.share-actionSheet {
+  background-color: white;
+  padding-top: 45rpx;
+  position: fixed;
+  width: 100%;
+  bottom: 0;
+  z-index: 2;
+}
+.share-actionSheet-title {
+  font-size: 38rpx;
+  
+}
+.share-actionSheet-list {
+  display: flex;
+  justify-content: space-around;
+  padding-bottom: 30rpx;
+}
+.share-actionSheet-item {
+  text-align: center;
+  padding: 20rpx;
+}
+.share-actionSheet-pic {
+  display: block;
+  width: 118rpx;
+  height: 118rpx;
+  border-radius: 50%;
+  margin: 0 auto;
+}
+.share-actionSheet-desc {
+  font-size: 28rpx;
+}
+
+.share-actionSheet-title,
+.share-actionSheet-cancle {
+  text-align: center;
+}
+
+.share-actionSheet-cancle {
+  padding: 30rpx 0;
+  border-top: 2rpx solid #CBCBCB;
+}
+
+.mask {
+  display: none;
+  background-color: rgba(0,0,0,.7);
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
+}
+.playbill {
+  position: fixed;
+  left: 50%;
+  top: 50%;
+  transform: translate(-50%, -50%);
+  z-index: 9999;
+  background: none;
+}
+.share-actionSheet.active ~ .mask,
+.playbill.active ~ .mask {
+  display: block;
+}
+
+.playbill-pic {
+  width: 478rpx;
+  height: 737rpx;
+  border-width: 31rpx 20rpx 51rpx;
+  border-color: black;
+  border-style: solid;
+  margin: 0 auto 26rpx;
+}
+
+.playbill-save {
+  width: 560rpx;
+  height: 100rpx;
+  line-height: 100rpx;
+  background-color: black;
+  color: #fff;
+  font-size: 36rpx;
+  text-align: center;
+}
+.playbill-save image {
+  width: 44rpx;
+  height: 36rpx;
+  margin-right: 23rpx;
+}
+
+button::after {
+  border: none;
+}
 \ No newline at end of file
@@ -12,6 +12,7 @@ var utils = require(&#39;../../../utils/util.js&#39;),ut=utils;
 var regeneratorRuntime = require('../../../utils/runtime.js');
  
  
+
 Page({
   data: {
     gid: "",
@@ -1568,6 +1569,12 @@ Page({
 		 price=price.toFixed(2);		 		 
 		 cut_pirce=cut_pirce.toFixed(2);		 		 
 		 this.setData({dp_price: this.data.dp_price,cut_price:this.data.cut_price});
+	},
+
+	go_goods:function (e) {
+		var gid=e.currentTarget.dataset.gid;
+		var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid;
+		getApp().goto(url);
 	}
  
  
@@ -6,7 +6,7 @@
 <view class="goods_list" wx:if="{{data && data.goods_name}}">
     <view class="item flex ai-center">
        <view style="width:80rpx;height: 100%" class="flex ai-center jc-center"><icon type="success" size="18"></icon></view>
-       <view  class="r_box flex">
+       <view  class="r_box flex" bindtap="go_goods" data-gid="{{data.goods_id}}">
           <view><image class="r_box_img" src="{{data.original_img}}"></image></view>
           <view class="flex jc_sb">
               <view class="fs30" style="margin: 18rpx">
@@ -26,7 +26,7 @@
               <icon bindtap="set_sele"  wx:else data-ind="{{index}}" data-set="1"  type="success" size="18" color="#adadad"></icon>
  
         </view>
-        <view  class="r_box flex">
+        <view  class="r_box flex" bindtap="go_goods" data-gid="{{item.goods_id}}">
             <view><image class="r_box_img" src="{{iurl+item.original_img}}" binderror="bind_bnerr3" data-errorimg="collocationList[{{index}}].original_img"></image></view>
             <view class="flex jc_sb">
                 <view class="fs30" style="margin: 18rpx">
@@ -346,3 +346,8 @@ radio {
 .title .english .esh {
   margin: 0rpx 15rpx;
 }
+
+page {
+  overflow-x: hidden;
+  padding-bottom: 100rpx;
+}
@@ -1381,6 +1381,13 @@ Page({
       //是不是重新提交
       if(th.data.is_continue==1) item.is_continue=1;
  
+      //获取立即购买的商品的信息
+      var gg = to.get_b_now();
+      //--商品的房间号--
+      if(gg.room_id && gg.room_id>0){
+          item.room_ids=gg.room_id;
+      }
+
       var order_prom_list={};
       //--判断有没有优惠活动--
       if(th.data.order_prom[item.pickup_id]){
@@ -1418,7 +1425,7 @@ Page({
          item.coupon_no=th.data.using_quan[th.data.bn_pick].coupon_no;
          item.coupon_price=0;
       }
-      var gg = to.get_b_now();
+
       var goods={
         'goods_id': gg.goods_id,
         'goods_name': gg.goods_name,
@@ -1445,6 +1452,11 @@ Page({
           })
       }
  
+      //--商品的房间号--
+      if(gg.room_id && gg.room_id>0){
+          goods.room_id=gg.room_id;
+      }
+
 	  //如果不立即购买或者秒杀，如果是线下库存购买的时候
 	  if(goods.prom_type!=1 && goods.prom_type!=6 && th.data.sales_rules==2){
 		  var isok=1;
@@ -1495,8 +1507,7 @@ Page({
       var addr = th.data.user_addr;
       if (th.data.is_all_zt == 1) addr = null;
       var val_arr= t.detail.value;
-      console.log('购物车结算');
-      console.log(val_arr);
+
  
       if(th.data.is_all_zt !=1)
         if(th.data.wu_arr==null || th.data.wu_arr.length<=0 ){
@@ -1505,6 +1516,7 @@ Page({
         }
  
       var order_prom_list_cart=th.data.order_prom_list_cart;
+
       //--组装推送数据--
       for (var i = 0; i < order_prom_list_cart.length;i++){
         var t_item = order_prom_list_cart[i];
@@ -1569,8 +1581,11 @@ Page({
           }
           if(Object.keys(order_prom_list).length>0)
                item.order_prom_list=order_prom_list;
-        //-------------让商品添加到商品列表--------------------
-        for (var k = 0; k < t_item.goods.length;k++){
+
+         //房间号的ids
+         var room_ids="";
+         //-------------让商品添加到商品列表--------------------
+         for (var k = 0; k < t_item.goods.length;k++){
           var g_item = t_item.goods[k];
           var goods = {
             'goods_id': g_item.goods_id,
@@ -1644,12 +1659,20 @@ Page({
                   }
               })
           }
-		 	  
+          //如果房间号不为空的时候
+          if(g_item.room_id){
+              goods.room_id=g_item.room_id;
+              room_ids+=g_item.room_id+",";
+          }
           item.order_goods.push(goods);
         }
+
+        //如果房间号不为空的时候
+        if(room_ids!="") item.room_ids= ut.sub_last(room_ids);
         pdata.push(item);
       }
-      console.log(pdata);
+
+
     }
  
     if (pdata.length==0) return;
@@ -449,7 +449,13 @@ Page({
            })
        }
  
-       item.order_goods.push(goods);
+        //--商品的房间号--
+        if(gg.room_id && gg.room_id>0){
+            item.room_ids=gg.room_id;
+            goods.room_id=gg.room_id;
+        }
+
+        item.order_goods.push(goods);
        pdata.push(item);
  
       if (pdata.length==0) return;
@@ -28,6 +28,7 @@ Page({
     code: "", //核销码
     c_state: "0", //判断是否已经使用, 0正常  1已使用  2已过期
     is_lb: 0, //是否有礼包
+    default_color:null,
   },
   onLoad: function(options) {
  
@@ -60,6 +61,13 @@ Page({
     var that = this.data;
     var th = this;
     // var id = e.currentTarget.dataset.id;//活动id
+    //如果还没有开始的话
+    if(th.data.isStart!=1){
+       getApp().my_warnning("活动还没有开始", 0, th);
+       return false;
+    }
+
+
     var money = e.currentTarget.dataset.money;
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     my_confirm.open(
@@ -100,7 +108,7 @@ Page({
                   getApp().goto(url);
                 },
                 fail: function(n) {
-                  getApp().my_confirm("取消支付", 0, th);
+                  getApp().my_warnning("取消支付", 0, th);
                 }
               });
             } else {
@@ -124,6 +132,12 @@ Page({
   GetBuyIntegral: function(e) {
     var that = this.data;
     var th = this;
+
+    //如果还没有开始的话
+    if(th.data.isStart!=1){
+      getApp().my_warnning("活动还没有开始", 0, th);
+      return false;
+    }
     // var id = e.currentTarget.dataset.id;//活动id
     var my_confirm = th.selectComponent("#my_confirm"); //组件的id
     my_confirm.open(
@@ -177,7 +191,8 @@ Page({
         if (res.data.code == 0) {
           th.setData({
             giftImage: th.data.iurl + res.data.data.lbUrl,
-            giftTitle: res.data.data.giftTitle
+            giftTitle: res.data.data.giftTitle,
+            default_color:res.data.data.bgcolor
           })
           if (res.data.data.giftRemark == '') {
             th.setData({
@@ -245,7 +260,8 @@ Page({
         if (res.data.code == 0) {
           _this2.setData({
             giftImage: th.iurl + res.data.data.lbUrl,
-            giftTitle: res.data.data.giftTitle
+            giftTitle: res.data.data.giftTitle,
+            default_color:res.data.data.bgcolor
           })
           if (res.data.data.giftRemark == '') {
             _this2.setData({
@@ -257,6 +273,14 @@ Page({
             })
           }
  
+          var isStart=0;
+          var now=ut.gettimestamp();
+
+          var str = res.data.data.starTime.replace(/-/g,'/');
+          var start = Date.parse(new Date(str));
+          start = start / 1000;
+          if(start<now) isStart=1;
+
           _this2.setData({
             giftDate: res.data.data.endTime,
             giftPosPrice: res.data.data.giftPosPrice,
@@ -265,7 +289,8 @@ Page({
             giftPrice: res.data.data.payMoney,
             giftType: res.data.data.actType,
             actTitle: res.data.data.actTitle,
-            wareCard: res.data.data.wareCard
+            wareCard: res.data.data.wareCard,
+            isStart:isStart,
           })
         } else {
           getApp().my_warnning("系统繁忙,请稍后再试", 0, _this2);
@@ -346,5 +371,29 @@ Page({
     var nav_b = th.selectComponent("#nav_b"); //组件的id
     nav_b.close_box();
     nav_b.set_name("礼包", "/pages/giftpack/buygiftpack/giftpackbuy");
-  }
+  },
+
+  //--- 分享设置 --
+  onShareAppMessage: function (e) {
+    var curPage=this;
+    var pagePath = curPage.route; //当前页面url
+    if (pagePath.indexOf('/') != 0) {
+      pagePath = '/' + pagePath;
+    }
+
+    pagePath+="?isBuy="+this.data.isBuy;
+    if(this.data.isBuy==0){
+       pagePath+="&lbId="+this.data.getGiftID;
+    }else{
+       pagePath+="&orderSn="+this.data.orderSn;
+    }
+
+    return {
+      title: "礼包详情",
+      path:pagePath,
+    }
+  },
+
+
+
 });
 \ No newline at end of file
-<view class="box data-v-3a5b7e36">
+<view class="box data-v-3a5b7e36" style="background-color:{{default_color?default_color:'#e85f93'}}">
   <view class="box_top data-v-3a5b7e36">
     <image src="{{giftImage}}" class="data-v-3a5b7e36" lazy-load="true" binderror="bind_bnerr" data-errorimg="giftImage"></image>
   </view>
-  <view class="box_title data-v-3a5b7e36">
+  <view class="box_title data-v-3a5b7e36" >
     <view class="top_title data-v-3a5b7e36">
       <text class="data-v-3a5b7e36 ellipsis-2">{{giftTitle}}</text>
     </view>
     <view class="top_time data-v-3a5b7e36">
-      <text class="data-v-3a5b7e36">{{"兑换截至时间："+giftDate}}</text>
+      <text class="data-v-3a5b7e36" wx:if="{{isBuy==0}}">{{"兑换截至时间："+giftDate}}</text>
+      <text class="data-v-3a5b7e36" wx:else>{{"活动结束至时间："+giftDate}}</text>
     </view>
     <view class="top_price data-v-3a5b7e36">
       <block wx:if="{{giftPrice>0}}">
@@ -102,22 +103,22 @@
   <block wx:if="{{isBuy==1}}">
     <view class="foot_button data-v-3a5b7e36">
       <block wx:if="{{giftPrice>0&&giftIntegral>0}}">
-        <view class="foot_button_left data-v-3a5b7e36" data-money="{{giftPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
-          <text class="data-v-3a5b7e36">立即购买</text>
+        <view class="foot_button_left data-v-3a5b7e36 {{isStart?'':'gray'}}" data-money="{{giftPrice}}" data-id="{{lbId}}" bindtap="GetBuyPrice">
+           <text class="data-v-3a5b7e36  ">立即购买</text>
         </view>
       </block>
       <block wx:if="{{giftPrice>0 && giftIntegral>0}}">
-        <view class="foot_button_right data-v-3a5b7e36" bindtap="GetBuyIntegral" data-id="{{lbId}}">
+        <view class="foot_button_right data-v-3a5b7e36 {{isStart?'':'gray'}}" bindtap="GetBuyIntegral" data-id="{{lbId}}">
           <text class="data-v-3a5b7e36">立即兑换</text>
         </view>
       </block>
       <block wx:if="{{giftPrice>0 && giftIntegral<=0}}">
-        <view class="foot_button_buy data-v-3a5b7e36" data-money="{{giftPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
+        <view class="foot_button_buy data-v-3a5b7e36 {{isStart?'':'gray'}}" data-money="{{giftPrice}}" bindtap="GetBuyPrice" data-id="{{lbId}}">
           <text class="data-v-3a5b7e36">立即购买</text>
         </view>
       </block>
       <block wx:if="{{giftPrice<=0 && giftIntegral>0}}">
-        <view class="foot_button_intalge data-v-3a5b7e36" bindtap="GetBuyIntegral" data-id="{{lbId}}">
+        <view class="foot_button_intalge data-v-3a5b7e36 {{isStart?'':'gray'}}" bindtap="GetBuyIntegral" data-id="{{lbId}}">
           <text class="data-v-3a5b7e36">立即兑换</text>
         </view>
       </block>
@@ -197,6 +197,7 @@
   font-size: 28rpx;
   line-height: 70rpx;
   border-radius: 40rpx;
+  margin-right: 20rpx;
 }
  
 .foot_button_right.data-v-3a5b7e36 {
@@ -243,3 +244,6 @@ page.data-v-3a5b7e36 {
 .overdue.data-v-3a5b7e36{
   background-color: rgb(153,153,153);
 }
+
+.foot_button_left.data-v-3a5b7e36.gray{ background-color: #aaa; }
+.foot_button_right.data-v-3a5b7e36.gray{ background-color: #aaa;}
@@ -116,4 +116,19 @@ Page({
  
   },
  
+
+//--- 分享设置 --
+onShareAppMessage: function (e) {
+  var curPage=this;
+  var pagePath = curPage.route; //当前页面url
+  if (pagePath.indexOf('/') != 0) {
+    pagePath = '/' + pagePath;
+  }
+  return {
+    title: "专享礼包",
+    path:pagePath,
+  }
+},
+
+
 });
 \ No newline at end of file
@@ -518,5 +518,10 @@ margin: auto;
  
   }
  
+  page {
+    overflow-x: hidden;
+    padding-bottom: 40rpx;
+  }
+
 /* 风格三商品列表样式引入 */
 @import "../goodsList/goodsList.wxss";
 \ No newline at end of file
@@ -252,13 +252,14 @@ Page({
       that = ee,
       th = ee,
       gid = t.goods_id,
-      first_leader=t.first_leader;
+      first_leader=t.first_leader,
+      room_id=t.room_id;
  
     //---获取手机地址坐标--
     //--如果tg_id是空的话，分享回来--
     if (gid == undefined || gid == null || gid == "") {
       var  gid_str = decodeURIComponent(t.scene);
-      gid_str.split("_");
+      gid_str=gid_str.split("_");
       gid=gid_str[0];
       if(gid_str.length>1){
         first_leader=gid_str[1];
@@ -275,6 +276,12 @@ Page({
         })
     }
  
+    if(room_id){
+       getApp().globalData.room_id=room_id;
+       getApp().globalData.room_goods_id=gid;
+    }
+
+
     var c_guide_id=t.c_guide_id;
     if(c_guide_id){
       th.data.c_guide_id=c_guide_id;
@@ -657,6 +664,7 @@ Page({
           if (t.data.data.goods_content == null) t.data.data.goods_content = "";
  
           //-----商品详情---
+          if(!t.data.data.goods_content) t.data.data.goods_content="  ";
           a.wxParse("content", "html", t.data.data.goods_content, ee, 6);
           e.wxParseAddFullImageUrl(ee, "content");
  
@@ -978,6 +986,16 @@ Page({
         }
       }
  
+      //让商品带上房间号
+      //让商品带上房间号
+      if(th.data.sys_switch.is_skuroom_id==1){
+        if(th.data.data.goods_id==getApp().globalData.room_goods_id){
+          newd.room_id=getApp().globalData.room_id;
+        }
+      }else{
+        if(newd.goods_id==getApp().globalData.room_goods_id)  newd.room_id=getApp().globalData.room_id;
+      }
+
       //如果是积分够，is_integral_normal就要有积分购普通购买字段
       if(o.prom_type==4){
         newd.is_integral_normal=1;
@@ -2836,6 +2854,19 @@ Page({
         }
       }
  
+      //让商品带上房间号
+      if(th.data.sys_switch.is_skuroom_id==1){
+        if(th.data.data.goods_id==getApp().globalData.room_goods_id){
+          newd.room_id=getApp().globalData.room_id;
+        }
+      }else{
+         if(newd.goods_id==getApp().globalData.room_goods_id){
+             newd.room_id=getApp().globalData.room_id;
+         }
+      }
+
+
+
 	  //---如果商品不是积分购和拼团,要判断一个是否要进行等级价的判断------
  
 	  if(th.data.is_normal == 1){
@@ -3189,17 +3220,17 @@ Page({
   //--定义的保存图片方法，分享团---
   saveImageToPhotosAlbum: function() {
     //--先判断会员状态--
-    var user_info = getApp().globalData.userInfo;
-    if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
-      //getApp().my_warnning("请先登录",0,this);
-      wx.navigateTo({ url: '/pages/getphone/getphone', })
-      return false;
-    }
+    // var user_info = getApp().globalData.userInfo;
+    // if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) {
+    //   //getApp().my_warnning("请先登录",0,this);
+    //   wx.navigateTo({ url: '/pages/getphone/getphone', })
+    //   return false;
+    // }
  
     //类型  0普通商品 1秒杀商品  2商家和会员团  3阶梯团
-    var type = this.data.prom_type;
-    if (type == 6) type = 2;
-    if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3;
+    // var type = this.data.prom_type;
+    // if (type == 6) type = 2;
+    // if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3;
  
     wx.showLoading({
       title: '生成中...',
@@ -3224,6 +3255,8 @@ Page({
     var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" +
       os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
  
+    console.log('xiaochengxu----->',path3);
+
     //读取文件成功则OK--
     wx.getImageInfo({
       src: path3,
@@ -3252,155 +3285,164 @@ Page({
           //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
           context.setFillStyle("black");
           context.setFontSize(21.3 * unit)
-          th.draw_Text(context, th.data.data.goods_name,
-            38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
+          th.draw_Text(context, th.data.data.goods_name, 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
           //------产品的价格-------
-          context.setFontSize(23 * unit)
-          context.setFillStyle("red")
-          context.fillText("￥", 416 * unit, 185 * unit);
-          context.setFontSize(31 * unit)
-          var pri0 = th.data.data.shop_price;
-          if (th.data.prom_act)
-            pri0 = th.data.prom_act.price;
-
-          pri0 = parseFloat(pri0).toFixed(2);
-          context.fillText(pri0, 438 * unit, 185 * unit);
+          // context.setFontSize(23 * unit)
+          // context.setFillStyle("red")
+          // context.fillText("￥", 416 * unit, 185 * unit);
+          // context.setFontSize(31 * unit)
+          // var pri0 = th.data.data.shop_price;
+          // if (th.data.prom_act)
+          //   pri0 = th.data.prom_act.price;
+
+          // pri0 = parseFloat(pri0).toFixed(2);
+          // context.fillText(pri0, 438 * unit, 185 * unit);
           //---市场价划掉---
-          context.setFillStyle("gray")
-          context.setFontSize(22 * unit)
-          context.fillText("￥" + th.data.data.market_price, 426 * unit, 213 * unit);
-          context.setStrokeStyle('gray')
-          context.setLineWidth(1 * unit)
-          context.moveTo(426 * unit, 206 * unit)
-          context.lineTo(510 * unit, 206 * unit)
-          context.stroke();
+          // context.setFillStyle("gray")
+          // context.setFontSize(22 * unit)
+          // context.fillText("￥" + th.data.data.market_price, 426 * unit, 213 * unit);
+          // context.setStrokeStyle('gray')
+          // context.setLineWidth(1 * unit)
+          // context.moveTo(426 * unit, 206 * unit)
+          // context.lineTo(510 * unit, 206 * unit)
+          // context.stroke();
           //---中间大图---
           context.drawImage(th.data.share_goods_img, 68 * unit, 242 * unit, 410 * unit, 410 * unit);
-          //-------大图后面就不一样了-----------
-          switch (type) {
-            case 0: //普通商品的展示
-              //中间的几个字
-              var g_path = "../../../images/share/s_gou.png";
-              context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
-              context.setFillStyle("red")
-              context.setFontSize(18 * unit)
-              context.fillText("正品保证", 84 * unit, 690 * unit);
-
-              context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
-              context.setFillStyle("red")
-              context.setFontSize(18 * unit)
-              context.fillText("纯实体店", 246 * unit, 690 * unit);
-
-              context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
-              context.setFillStyle("red")
-              context.setFontSize(18 * unit)
-              context.fillText("官方验证", 420 * unit, 690 * unit);
-              //---画线---
-              context.setLineWidth(1 * unit)
-              context.moveTo(32 * unit, 710 * unit)
-              context.lineTo(520 * unit, 710 * unit)
-              context.stroke();
-              //---文字---
-              context.setFontSize(22 * unit)
-              context.setFillStyle("black")
-              context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
-              context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);
-              //---二维吗图---
-              context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
-              break;
-            case 1: //秒杀商品的展示
-              //---画线---
-              context.setLineWidth(1 * unit)
-              context.moveTo(32 * unit, 670 * unit)
-              context.lineTo(520 * unit, 670 * unit)
-              context.stroke();
+          
+          //---文字---
+          context.setFontSize(22 * unit)
+          context.setFillStyle("black")
+          context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
+          context.fillText("长按识别小程序码", 40 * unit, 826 * unit);
+          //---二维吗图---
+          context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
  
-              //画秒杀的图片
-              var miaos_path = '../../../images/share/miao_share.png';
-              context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit);
  
-              //---文字---
-              context.setFontSize(22 * unit)
-              context.setFillStyle("black")
-              context.fillText("特惠好物，限时秒杀", 40 * unit, 806 * unit);
-              context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit);
-              //---二维吗图---
-              context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
-              break;
-
-            case 2: //会员团和商家团的展示
-              //---画线---
-              context.setLineWidth(1 * unit)
-              context.moveTo(32 * unit, 670 * unit)
-              context.lineTo(520 * unit, 670 * unit)
-              context.stroke();
-              //---文字---
-              context.setFontSize(22 * unit)
-              context.font = 'normal bold';
-              context.setFillStyle("black")
-              context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
-
-              //绘制成团图片
-              var ct_img = "../../../images/share/ct_num.png";
-              context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit);
-              var ct_num = th.data.prom_act.ct_num;
-              context.setFontSize(14 * unit)
-              context.font = 'normal';
-              context.setFillStyle("red")
-              if (ct_num < 10) {
-                context.fillText(ct_num + "人拼团", 92 * unit, 760 * unit);
-              } else {
-                context.fillText(ct_num + "人拼团", 86 * unit, 760 * unit);
-              }
-              context.setFontSize(22 * unit)
-              context.fillText("已拼" + th.data.prom_act.buy_num + "份", 166 * unit, 763 * unit);
-              context.setFillStyle("gray")
-              context.fillText("快来和我一起拼团吧！", 40 * unit, 826 * unit);
-              context.setFillStyle("black")
-              context.font = 'normal bold 18px sans-serif';
-              context.setFontSize(21.3 * unit)
-              context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit);
-              //---二维吗图---
-              context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
-              break
-            case 3: //阶梯团的展示
+          //-------大图后面就不一样了-----------
+          // switch (type) {
+          //   case 0: //普通商品的展示
+              //中间的几个字
+              // var g_path = "../../../images/share/s_gou.png";
+              // context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit);
+              // context.setFillStyle("red")
+              // context.setFontSize(18 * unit)
+              // context.fillText("正品保证", 84 * unit, 690 * unit);
+
+              // context.drawImage(g_path, 218 * unit, 670 * unit, 22 * unit, 22 * unit);
+              // context.setFillStyle("red")
+              // context.setFontSize(18 * unit)
+              // context.fillText("纯实体店", 246 * unit, 690 * unit);
+
+              // context.drawImage(g_path, 388 * unit, 670 * unit, 22 * unit, 22 * unit);
+              // context.setFillStyle("red")
+              // context.setFontSize(18 * unit)
+              // context.fillText("官方验证", 420 * unit, 690 * unit);
               //---画线---
-              context.setLineWidth(1 * unit)
-              context.moveTo(32 * unit, 670 * unit)
-              context.lineTo(520 * unit, 670 * unit)
-              context.stroke();
+              // context.setLineWidth(1 * unit)
+              // context.moveTo(32 * unit, 710 * unit)
+              // context.lineTo(520 * unit, 710 * unit)
+              // context.stroke();
               //---文字---
-              context.setFontSize(22 * unit)
-              context.font = 'normal bold';
-              context.setFillStyle("black")
-              context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
-              //---绘制中间阶梯的价格---
-              var list = th.data.prom_act.ct_rylist;
-              for (var i = 0; i < list.length; i++) {
-                var item = list[i];
-                var wi = i * 90 * unit;
-                context.font = 'normal';
-                context.setFontSize(16 * unit)
-                context.setFillStyle("red")
-                context.fillText("￥", 40 * unit + wi, 756 * unit);
-                context.setFontSize(22 * unit)
-                var pri = parseFloat(item.price).toFixed(2);
-                context.fillText(pri, 56 * unit + wi, 756 * unit);
-                context.setFillStyle("gray")
-                context.fillText("满" + item.rynum + "人", 40 * unit + wi, 786 * unit);
-              }
-              //----------------下面部分----------------
-              context.setFillStyle("gray")
-              context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit);
-              context.setFillStyle("black")
-              context.font = 'normal bold 18px sans-serif';
-              context.setFontSize(22 * unit)
-              context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
-              //---二维吗图---
-              context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
-
-              break
-          }
+          //     context.setFontSize(22 * unit)
+          //     context.setFillStyle("black")
+          //     context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
+          //     context.fillText("长按识别小程序码", 40 * unit, 826 * unit);
+          //     //---二维吗图---
+          //     context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
+          //     break;
+          //   case 1: //秒杀商品的展示
+          //     //---画线---
+          //     context.setLineWidth(1 * unit)
+          //     context.moveTo(32 * unit, 670 * unit)
+          //     context.lineTo(520 * unit, 670 * unit)
+          //     context.stroke();
+
+          //     //画秒杀的图片
+          //     var miaos_path = '../../../images/share/miao_share.png';
+          //     context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit);
+
+          //     //---文字---
+          //     context.setFontSize(22 * unit)
+          //     context.setFillStyle("black")
+          //     context.fillText("特惠好物，限时秒杀", 40 * unit, 806 * unit);
+          //     context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 846 * unit);
+          //     //---二维吗图---
+          //     context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
+          //     break;
+
+          //   case 2: //会员团和商家团的展示
+          //     //---画线---
+          //     context.setLineWidth(1 * unit)
+          //     context.moveTo(32 * unit, 670 * unit)
+          //     context.lineTo(520 * unit, 670 * unit)
+          //     context.stroke();
+          //     //---文字---
+          //     context.setFontSize(22 * unit)
+          //     context.font = 'normal bold';
+          //     context.setFillStyle("black")
+          //     context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
+
+          //     //绘制成团图片
+          //     var ct_img = "../../../images/share/ct_num.png";
+          //     context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit);
+          //     var ct_num = th.data.prom_act.ct_num;
+          //     context.setFontSize(14 * unit)
+          //     context.font = 'normal';
+          //     context.setFillStyle("red")
+          //     if (ct_num < 10) {
+          //       context.fillText(ct_num + "人拼团", 92 * unit, 760 * unit);
+          //     } else {
+          //       context.fillText(ct_num + "人拼团", 86 * unit, 760 * unit);
+          //     }
+          //     context.setFontSize(22 * unit)
+          //     context.fillText("已拼" + th.data.prom_act.buy_num + "份", 166 * unit, 763 * unit);
+          //     context.setFillStyle("gray")
+          //     context.fillText("快来和我一起拼团吧！", 40 * unit, 826 * unit);
+          //     context.setFillStyle("black")
+          //     context.font = 'normal bold 18px sans-serif';
+          //     context.setFontSize(21.3 * unit)
+          //     context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit);
+          //     //---二维吗图---
+          //     context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+          //     break
+          //   case 3: //阶梯团的展示
+          //     //---画线---
+          //     context.setLineWidth(1 * unit)
+          //     context.moveTo(32 * unit, 670 * unit)
+          //     context.lineTo(520 * unit, 670 * unit)
+          //     context.stroke();
+          //     //---文字---
+          //     context.setFontSize(22 * unit)
+          //     context.font = 'normal bold';
+          //     context.setFillStyle("black")
+          //     context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit);
+          //     //---绘制中间阶梯的价格---
+          //     var list = th.data.prom_act.ct_rylist;
+          //     for (var i = 0; i < list.length; i++) {
+          //       var item = list[i];
+          //       var wi = i * 90 * unit;
+          //       context.font = 'normal';
+          //       context.setFontSize(16 * unit)
+          //       context.setFillStyle("red")
+          //       context.fillText("￥", 40 * unit + wi, 756 * unit);
+          //       context.setFontSize(22 * unit)
+          //       var pri = parseFloat(item.price).toFixed(2);
+          //       context.fillText(pri, 56 * unit + wi, 756 * unit);
+          //       context.setFillStyle("gray")
+          //       context.fillText("满" + item.rynum + "人", 40 * unit + wi, 786 * unit);
+          //     }
+          //     //----------------下面部分----------------
+          //     context.setFillStyle("gray")
+          //     context.fillText("快来和我一起拼团吧！", 40 * unit, 830 * unit);
+          //     context.setFillStyle("black")
+          //     context.font = 'normal bold 18px sans-serif';
+          //     context.setFontSize(22 * unit)
+          //     context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit);
+          //     //---二维吗图---
+          //     context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit);
+
+          //     break
+          // }
  
           //---绘制圆形要放在最后----
           context.save();
@@ -479,9 +479,9 @@
         </block>
  
  
-        <view class="bz_view one_elli" wx:if="{{bconfig}}">
+        <view class="bz_view flex ai-center" wx:if="{{bconfig}}" style="line-height: 36rpx">
           <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
-          <text>{{bconfig.service_bz}}</text>
+          <view>{{bconfig.service_bz}}</view>
         </view>
  
  
@@ -947,9 +947,10 @@ left:31rpx;}
     text-overflow: ellipsis;}
 .item_right text{ margin-left: 66rpx;}
  
-.bzfu_img{ width: 164rpx; height:34rpx; position: relative; top: 34rpx; margin-right: 18rpx; margin-left: 12rpx }
+.bzfu_img{ width: 164rpx; height:34rpx; margin-right: 18rpx; margin-left: 12rpx }
  .bz_view{ height:100rpx; padding: 0 13rpx; color: #333; font-size: 28rpx; 
-    border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; line-height: 100rpx }
+    border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; }
+    .bz_view view{ width: 460rpx; max-height: 70rpx; overflow: hidden;}   
  
 .bb_view{ display: flex;align-items: center;justify-content: space-between; padding: 0 34rpx; color: #333;
     font-size: 32rpx; height: 104rpx; line-height: 104rpx; overflow: hidden; padding-right:26rpx }
@@ -908,4 +908,9 @@
 .swiper{
   height: 250rpx;
   padding-bottom:30rpx;
+}
+
+page {
+  overflow-x: hidden;
+  padding-bottom: 120rpx;
 }
 \ No newline at end of file
+// pages/justTest/justTest.js
+// let livePlayer = requirePlugin('live-player-plugin');
+
+
+var t = require("../../utils/util.js"),
+  ut = t,
+  e = require("../../utils/common.js"),
+  a = require("../../utils/wxParse/wxParse.js"),
+  s = getApp(),
+  i = s.request,
+  rq = i,
+  oo = s.globalData,
+  o = s.globalData.setting,
+  os = o;
+var utils = require('../../utils/util.js'),ut=utils;
+var regeneratorRuntime = require('../../utils/runtime.js');
+
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    gid: "",
+    stoid: o.stoid,
+    url: o.url,
+    resourceUrl: o.resourceUrl,
+    iurl: o.imghost,
+    defaultAvatar: o.resourceUrl + "/static/images/user68.jpg",
+    data: null,
+    openSpecModal: !1,
+    openPromModal: !1,
+    supportPageScroll: !1,
+
+    //联系电话
+    mobile: '',
+    bconfig:null,
+    sales_rules:1,
+
+    t_time:null,
+	card_field:"",
+	dp_price:0,
+	cut_price:0,
+	open_ind_store:1,
+	goodsInputNum:1,
+	g_buy_num: null,
+  sele_collocation:null,
+  
+
+
+  photoUrl: "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1003256280,1176261798&fm=26&gp=0.jpg",
+    //（用来控制显示哪个按钮） false表示还没首次进行弹框授权，或者已经授权了；true表示在首次授权弹框时拒绝授权，或者在设置页面还是拒绝了授权
+    isAuthSavePhoto: false
+  },
+
+
+
+
+
+  sendRequest: function () {
+   
+   
+  
+     //调用接口判断是不是会员
+     getApp().request.promiseGet("/api/weshop/wx/livelist/page",{
+      data:{store_id: 1}
+  }).then(res=>{
+       console.log(res);
+      // if(res.data.code==0){
+      //   getApp().globalData.guide_id=res.data.data.id;
+      // }
+    })
+   
+  },
+  // nav: function () {
+  //   wx.redirectTo({
+  //     url: '/packageA/pages/liveStream/liveStream'
+  //   })
+  // },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  },
+
+
+
+
+  saveImage() {
+    wx.showLoading({
+      title: '保存中...', 
+      mask: true,
+    });
+    wx.downloadFile({
+      url:
+  'http://upload.jianshu.io/admin_banners/web_images/4435/c1d3ca63353c8bd527f0d781605516cb5b266d02.jpg?imageMogr2/auto-orient/strip|imageView2/1/w/1250/h/540',
+      success: function(res) {
+        if (res.statusCode === 200) {
+          let img = res.tempFilePath;
+          wx.saveImageToPhotosAlbum({
+            filePath: img,
+            success(res) {
+              wx.showToast({
+                title: '保存成功',
+                icon: 'success',
+                duration: 2000
+              });
+            },
+            fail(res) {
+              wx.showToast({
+                title: '保存失败',
+                icon: 'success',
+                duration: 2000
+              });
+            }
+          });
+        }
+      }
+    });
+  },
+
+
+
+  live() {}
+
+
+})
 \ No newline at end of file
+{
+  "usingComponents": {}
+}
 \ No newline at end of file
+<!--pages/justTest/justTest.wxml-->
+<text>pages/justTest/justTest.wxml</text>
+<navigator url="/packageA/pages/liveStream/liveStream">进入直播</navigator>
+<navigator url="/packageA/pages/liveStreamDetails/liveStreamDetails">进入直播详情页</navigator>
+<button bindtap="sendRequest">发送请求</button>
+
+
+
+
+<button open-type="share" class='iconfont icon-weixin'>分享</button>
+<button bindopensetting="onOpenSetting" open-type="openSetting" > 
+	保存图片到手机
+</button>
+
+
+
+
+
+<view class="box">
+    <image class="img" src="{{photoUrl}}" bindtap='onPreviewImage'></image>
+    <view class="btn">
+      <button bindtap="onSaveToPhone"  class="btn button-hover">
+        保存图片到手机1
+      </button>
+      <!-- <button wx:else bind:tap="showModal"  class="btn button-hover" >            
+        保存图片到手机2
+      </button> -->
+      <!-- 我们不使用点击按钮即打开设置页面的方式，而是使用上面那种先显示提示框让用户点确定按钮后再打开设置页面 -->
+      <!-- <button wx:else bind:opensetting="onOpenSetting" open-type="openSetting"  class="btn button-hover" >  
+        保存二维码到手机
+      </button> -->
+    </view>
+</view>
+
+<button bindtap="saveImage">savepics</button>
+
+
+
+<!-- 直播组件 - -->
+<!-- <subscribe room-id="1"></subscribe> -->
+
+<open-data type="userAvatarUrl"></open-data>
+<open-data type="userNickName"></open-data>
+
+
+
+/* pages/justTest/justTest.wxss */
+page {
+  background: #fff;
+  text-align: center;
+}
+
+.box {
+  padding: 30rpx 80rpx;
+}
+
+.img {
+  width: 430rpx;
+  height: 430rpx;
+  margin: 20rpx 0;
+}
+button {
+  width: 100%;
+  background: #ffffff;
+  border: none;
+  border-radius: 0rpx;
+  padding: 0;
+  margin: 0;
+}
+
+.btn {
+  background: green;
+  color: #ffffff;
+  border-radius: 0;
+}
 \ No newline at end of file
@@ -12,6 +12,7 @@ Page({
 	  is_no_more:0,
 	  key_word:'',   //关键字搜索
 	  cat_id:0,      //分类ID
+	  islading:0,
   },	
  
   onShow:function(){
@@ -65,6 +66,8 @@ Page({
  
   get_list:function(){
 	  if(this.data.is_no_more==1) return false;
+	  if(this.data.islading==1) return false;
+	  this.data.islading=1;
 	  var th=this,req = getApp().request;
 	  var  dd = {
 	      store_id: o.stoid,
@@ -84,6 +87,7 @@ Page({
 	  req.promiseGet("/api/weshop/pickup/list", {
 	    data: dd,
 	  }).then(res => {
+		  this.data.islading=0;
 		  wx.hideLoading();
 		  if(res.data.code==0){			  
 			  if(res.data.data.pageData.length<=0){
@@ -132,6 +136,7 @@ Page({
 	      cid: item['cat_id']
 	    })
 		this.data.page=1;
+	    this.data.is_no_more=0;
 		this.setData({ pick_list:null})
 		this.get_list();
  
@@ -139,7 +144,8 @@ Page({
  
 	  //搜索关键字
 	  sear:function(){
-		  this.data.page=1;
+			this.data.page=1;
+			this.data.is_no_more=0;
 		  this.setData({ pick_list:null})
 		  this.get_list();
 	  },
 <view class="bcolor flex jc_sb">
-	<view class="sear_inp">	
+	<view class="sear_inp flex ai-center">
 	    <view class="sear_btn" bindtap='sear'>
 	       <image src="{{url}}/miniapp/images/search.png" style="width: 30rpx; height: 30rpx;  margin-left: 10rpx;"></image>	
-		</view>
+	  	</view>
 		<input bindinput ="lose_focus" class="fs28" value=""/>
 	</view>
 	<view class="select">
@@ -42,7 +42,7 @@ position: relative;
 .bcolor{background-color: #f5f5f5; height: 126rpx;}
  
 .sear_inp{width: 490rpx; background-color:#eaeaea; height: 80rpx; border-radius:5rpx; margin: 25rpx;}
-.sear_inp input{ position: relative; top:10rpx;width: 400rpx; display: inline-block;}
+.sear_inp input{width: 400rpx;}
 .select{height: 80rpx; width: 220rpx;background-color:#eaeaea; margin:25rpx; font-size: 28rpx; line-height: 80rpx;text-align: center }
-.sear_btn{ width: 50rpx; height: 100%; display: inline-block;}
+.sear_btn{ width: 50rpx; height: 100%; display: flex; align-items: center;}
  
@@ -126,7 +126,8 @@ Page({
 			id: this.data.tasking,
 			storeId: os.stoid,
 			userId: this.data.userId,
-			zlUserId: t_user_id
+			zlUserId: t_user_id,
+			isWeappUser:1,   //是不是小程序的入口，不需要判断
 		};
 		console.log(data);
 		getApp().request.json_post("/api/weshop/marketing/help/help/task/involve/insert",
@@ -92,12 +92,33 @@
  
   </view>
   <view class="xc-after-sale rel">
+    <!-- 顶上的一栏 -->
+    <view class="xc-equity-title flex-level" bindtap="go_order"  data-url="/pages/user/order_list/order_list">
+      <view class="xc-title-frame flex-space-between">
+        <view class="flex-vertical xc-title-content">
+          <image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image>
+          <view class="three-level-word">我的订单</view>
+        </view>
+      </view>
+      <view class="three-level-word  xc-more-frame flex-vertical">
+        <view class="three-level-word xc-more">更多</view>
+        <view class="bg_right xc-more-click bcolor"></view>
+      </view>
+    </view>
+    <!-- 内容的一栏 -->
     <view class="xc-after-sale-left flex-center-around">
       <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=1">
         <image class="xc-no-money" src="{{iurl}}/miniapp/images/daifuk.png"></image>
         <view class=" xc-word-color four-level-word">待付款</view>
         <text class="order-num" hidden='{{toji.wait_pay>0?"":"true"}}'>{{toji.wait_pay}}</text>
       </view>
+
+      <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=2">
+        <image class="xc-send" src="{{iurl}}/miniapp/images/dfahuo.png?v=1"></image>
+        <view class="xc-word-color four-level-word">待发货</view>
+        <text class="order-num" hidden='{{toji.wait_receive>0?"":"true"}}'>{{toji.wait_send}}</text>
+      </view>
+
       <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=3">
         <image class="xc-await" src="{{iurl}}/miniapp/images/shouhuo1.png"></image>
         <view class="xc-word-color four-level-word">待收货</view>
@@ -115,15 +136,8 @@
         <!--<text class="order-num" hidden='{{toji.wait_return>0>0?"":"true"}}' style="right: -20rpx">{{toji.wait_return}}</text>-->
       </view>
  
-      <view class='xc-hump abs'></view>
-      <view class="flex-verticalr xc-after-sale-right">
-        <view class=" xc-order t-c" bindtap="go_order" data-url="/pages/user/order_list/order_list">
-          <image class="xc-no-money xc-my-order" src="{{iurl}}/miniapp/images/dindan.png"></image>
-          <view class="xc-word-color four-level-word" style='margin-left:20rpx;'>我的订单</view>
-        </view>
-      </view>
-
     </view>
+    <view style="clear: both"></view>
  
   </view>
  
@@ -133,9 +147,7 @@
       <view class="xc-title-frame flex-space-between">
         <view class="flex-vertical xc-title-content">
           <image class="xc-title-img" src="{{iurl}}/miniapp/images/medal.png"></image>
-          <view class="three-level-word">
-            我的权益
-          </view>
+            <view class="three-level-word">我的权益</view>
         </view>
       </view>
       <view class="three-level-word  xc-more-frame flex-vertical">
@@ -143,6 +155,7 @@
         <view class="bg_right xc-more-click bcolor"></view>
       </view>
     </view>
+
     <view class="xc-specific-more-frame flex-vertical">
  
       <view bindtap="click_pre">
@@ -178,14 +191,14 @@
  </block>
  
   <!-- 工具与服务 -->
-  <view class="xc-tool-service">
+  <view class="xc-tool-service" >
     <view class="xc-tool-service-title flex-vertical">
       <image  class="xc-tool-service-img" src="{{iurl}}/miniapp/images/gj.png"></image>
       <view class="three-level-word xc-tool-service-word">工具与服务</view>
     </view>
     <view class="xc-project-frame">
       <!-- 跳转页面 -->
-      <view class="center_v">
+      <view class="center_v" style="display: flex;flex-wrap: wrap;align-items: center;">
         <view class="item t-c" data-url="/pages/team/team_ping/team_ping" bindtap="goto">
           <image class="xc-center-img " src="{{iurl}}/miniapp/images/pindan.png"></image>
           <view class="fs26">我的拼单</view>
@@ -202,13 +202,14 @@
  
 .xc-after-sale {
   width: 100%;
-  height: 160rpx;
   border-bottom: 10px solid #f2f2f2;
 }
  
 .xc-after-sale-left {
-  width: 90%;
+  width: 96%;
   height: 100%;
+  margin-top: 40rpx;
+  margin-bottom: 25rpx;
 }
  
 .xc-no-money {
@@ -300,6 +301,11 @@
   height: 50rpx;
 }
  
+.xc-send{
+  width: 50rpx;
+  height: 50rpx;
+}
+
 .xc-more-click {
   width: 15rpx;
   height: 15rpx;
@@ -639,6 +639,11 @@ Page({
  
         a.reg_time = time;
         a.birthday = birthday
+
+        if(a.address=='null' || !a.address){
+          a.address="";
+        }
+
         e.setData({
           phone: a.mobile,
           user: a,
@@ -51,6 +51,7 @@ module.exports = {
         data: {
           js_code: e,
           store_id: a.globalData.setting.stoid,
+          nickname:a.globalData.getu.nickName,
         },
         success: function (e) {
           console.log("openidandkey");
@@ -90,6 +91,7 @@ module.exports = {
             data: {
               js_code: e,
               store_id: a.globalData.setting.stoid,
+              nickname:a.globalData.getu.nickName,
             },
             success: function (e) {
                 console.log("openidandkey");
+var myUtils = {
+  // 判断直播状态
+  liveStatus: function (statusCode) {
+    var statusText;
+    switch(statusCode) {
+      case '101': {
+        statusText = '直播中';
+        break;
+      }
+      case '102': {
+        statusText = '未开始';
+        break;
+      }
+      case '103': {
+        statusText = '已结束';
+        break;
+      }
+      case '104': {
+        statusText = '禁播';
+        break;
+      }
+      case '105': {
+        statusText = '暂停中';
+        break;
+      }
+      case '106': {
+        statusText = '异常';
+        break;
+      }
+      case '107': {
+        statusText = '已过期';
+        break;
+      }
+      default: break;
+    }
+    return statusText;
+  }
+};
+
+module.exports = {
+  liveStatus: myUtils.liveStatus
+}
 \ No newline at end of file