Merge branch 'dev' into 'test'

Dev See merge request !687

Merge branch 'dev' into 'test'
Dev See merge request !687
后端研发-苏明海
2 parents a620c3ee 76cd6efc
Showing 12 changed files with 295 additions and 160 deletions
components/diy_notice/diy_notice.wxml
components/diy_pingd_buy/diy_pingd_buy.wxml
packageA/pages/parseHtml/parseHtml.js
packageA/pages/profile/profile.wxss
packageB/pages/luckactivity/index/index.wxml
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
pages/goods/goodsInfo/goodsInfo.js
pages/team/team_success/team_success.js
pages/team/team_success/team_success.wxml
pages/team/team_success/team_success.wxss
pages/user/userinfo/userinfo.wxss
@@ -3,7 +3,7 @@
   <block wx:if="{{g_filter.has_char(object.wxapp_url,'plugin')>=0}}">
     <navigator url="{{object.wxapp_url}}" class="s1_gk_a1 pd_top10" style="background-color: {{object.notice_bgcolor}}">
         <view class="big_border">
-            <image class="image_c" src="/public/static/images/model/notice.png"></image>
+            <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image>
             <view class="marquee">
                 <view class="content">
                     <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
@@ -18,7 +18,7 @@
 	<block wx:else>
     <view data-url="{{object.wxapp_url}}" class="s1_gk_a1 pd_top10" bindtap="go_url" style="background-color: {{object.notice_bgcolor}}">
         <view class="big_border">
-            <image class="image_c" src="/public/static/images/model/notice.png"></image>
+            <image class="image_c" src="{{imghost}}/miniapp/images/notice.png"></image>
             <view class="marquee">
                 <view class="content">
                     <text style="color: {{object.notice_color}}">{{object.noticetxt}}</text> <text style="display: inline-block; width: 590rpx;line-height:30rpx;"></text>
@@ -94,7 +94,7 @@
                 <view class='sp_jgx_p'>￥{{aitem.market_price}}</view>
               </view>
               <view class="o1_sj_p" wx:if="{{aitem.end_time>newTime}}">
-                <image class="time_img" src="/public/static/images/model/time.png"></image>
+                <image class="time_img" src="{{iurl}}/miniapp/images/time.png"></image>
                 <block wx:if="{{aitem.djs.day>0 }}">{{aitem.djs.day}}天</block>{{aitem.djs.hou}}时{{aitem.djs.min}}分{{aitem.djs.sec}}秒
               </view>
  
 var WxParse = require('../../../utils/wxParse/wxParse.js');
  
-const app =  getApp();
+const app = getApp();
 let self = null;
 let content_privacy = `<div>
             <p class="tac font16"><b>隐私政策</b><br /><br /></p>
@@ -235,117 +235,126 @@ let content_use = `&lt;div&gt;
  
 Page({
  
-  /**
-   * 页面的初始数据
-   */
-  data: {
-		list: null,
-		isLoading: false, // 检测是否已经发送请求,防止重复发送请求
-		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
-		pageNum: 1, // 当前页数
-  },
+    /**
+     * 页面的初始数据
+     */
+    data: {
+        list: null,
+        isLoading: false, // 检测是否已经发送请求,防止重复发送请求
+        noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
+        pageNum: 1, // 当前页数
+    },
  
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-		self = this;
-		let title = '';
-		let content = '';
-		if(options.t == 0) {
-			title = '用户使用协议';
-			content = content_use;
-		} else if(options.t == 1) {
-			title = '隐私政策';
-			content = content_privacy;
-		};
-		wx.setNavigationBarTitle({
-			title: title,
-		});		
+    /**
+     * 生命周期函数--监听页面加载
+     */
+    onLoad: function (options) {
+        self = this;
+        //-- 获取一下基础参数 --
+        getApp().getConfig2(function (res) {
+           if(res.reg_rule){ content_use=res.reg_rule; }
+           if(res.reg_privacy){  content_privacy=res.reg_privacy; }
  
-		WxParse.wxParse('content', 'html', content, self);
-		
-  },
+            let title = '';
+            let content = '';
+            if (options.t == 0) {
+                title = '用户使用协议';
+                content = content_use;
+            } else if (options.t == 1) {
+                title = '隐私政策';
+                content = content_privacy;
+            }
+            ;
+            wx.setNavigationBarTitle({
+                title: title,
+            });
  
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
+            WxParse.wxParse('content', 'html', content, self);
  
-  },
+        }, 1)
  
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
+    },
  
-  },
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady: function () {
  
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
+    },
  
-  },
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow: function () {
  
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
+    },
  
-  },
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide: function () {
  
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh: function () {
+    },
  
-  },
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload: function () {
  
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom: function () {
+    },
  
-  },
+    /**
+     * 页面相关事件处理函数--监听用户下拉动作
+     */
+    onPullDownRefresh: function () {
  
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage: function () {
+    },
+
+    /**
+     * 页面上拉触底事件的处理函数
+     */
+    onReachBottom: function () {
+
+    },
+
+    /**
+     * 用户点击右上角分享
+     */
+    onShareAppMessage: function () {
+
+    },
+
+    /**
+     * get请求数据
+     */
+    get(url, data) {
+        app.request.get(url + '/' + data.store_id, {
+            success: function (res) {
+                if (res.data.code == 0) {
+                    console.log('success~~~~~~~~~~~', res);
+                    self.setData({
+                        content: res.data.data.distriRule,
+                    });
+                    /**
+                     * WxParse.wxParse(bindName , type, data, target,imagePadding)
+                     * 1.bindName绑定的数据名(必填)
+                     * 2.type可以为html或者md(必填)
+                     * 3.data为传入的具体数据(必填)
+                     * 4.target为Page对象,一般为this(必填)
+                     * 5.imagePadding为当图片自适应是左右的单一padding(默认为0,可选)
+                     */
+                    WxParse.wxParse('content', 'html', self.data.content, self);
+                } else {
+                    wx.showToast({
+                        title: "网络繁忙，请重试",
+                        icon: 'none',
+                        duration: 2000
+                    })
+                }
+            },
+            fail: function () {
+            },
+        });
+    },
  
-  },
-	
-	/**
-	 * get请求数据
-	 */
-	get(url, data) {
-		app.request.get(url + '/' + data.store_id, {
-		  success: function(res) {
-			  if(res.data.code == 0){
-					console.log('success~~~~~~~~~~~',res);
-					self.setData({
-						content: res.data.data.distriRule,
-					});
-					/**
-					* WxParse.wxParse(bindName , type, data, target,imagePadding)
-					* 1.bindName绑定的数据名(必填)
-					* 2.type可以为html或者md(必填)
-					* 3.data为传入的具体数据(必填)
-					* 4.target为Page对象,一般为this(必填)
-					* 5.imagePadding为当图片自适应是左右的单一padding(默认为0,可选)
-					*/
-					WxParse.wxParse('content', 'html', self.data.content, self);
-				}else{
-					wx.showToast({
-					  title: "网络繁忙，请重试",
-					  icon: 'none',
-					  duration: 2000
-					})
-				}
-		  },
-			fail: function() {},
-		});
-	},
-		
 })
 \ No newline at end of file
@@ -411,7 +411,6 @@ input {
   background: white;
   width: 100%;
   border-radius: 20rpx 20rpx 0 0;
-  height: 72%;
 }
  
 .popup-top {
@@ -452,7 +451,8 @@ input {
  
 .store-list {
   width: 95%;
-  height: 72%;
+  min-height: 300rpx;
+  max-height: 610rpx;
   overflow-y: scroll;
   margin: auto;
 }
@@ -506,7 +506,7 @@ input {
 .store-bottom {
   width: 85%;
   margin: auto;
-  height: 70rpx;
+  height: 90rpx;
 }
  
 .determine {
@@ -20,7 +20,7 @@
 		<block wx:for="{{list.pageData}}">
 			<view class="tab-item" bindtap="goto" data-id="{{item.id}}" data-title="{{item.act_name}}">
 				<view class="img-container">
-					<image wx:if="{{item.imageurl}}" src="{{item.imageurl}}" class="img"></image>
+					<image wx:if="{{item.imageurl}}" src="{{imghost + item.imageurl}}" class="img"></image>
 					<text class="iconfont icon-zhuanpan" wx:else></text>
 				</view>
 				<view class="desc-container">
@@ -109,6 +109,7 @@ Page({
  
 						// console.log('luckInfo', res.data.data);
 						let luckInfo = res.data.data;
+						
  
 						if(luckInfo && luckInfo.template_type != null && luckInfo.template_type == 1) { //获取模板
 							let url = `/api/weshop/marketing/marketingLuckTemplate/get/${store_id}/${luckInfo.template_id}`;
@@ -131,6 +132,15 @@ Page({
 							};
  
 						};
+						
+						
+						if(self.data.luckInfo.msgInfo) {
+							wx.showToast({
+								title: self.data.luckInfo.msgInfo,
+								icon: 'none',
+							});
+							// return;
+						};
  
 					}, 
 				});
@@ -475,14 +485,15 @@ Page({
 			return;
 		};
  
-		if(this.data.luckInfo.msgInfo) {
+		if(self.data.luckInfo.msgInfo) {
 			wx.showToast({
-				title: this.data.luckInfo.msgInfo,
+				title: self.data.luckInfo.msgInfo,
 				icon: 'none',
 			});
 			return;
 		};
  
+		
 		if(this.data.luckInfo.user_LuckNumDay > 0 || this.data.luckInfo.vip_act_num == 0) {
 			// console.log('start choujiang');
 			// let start = false;
@@ -619,26 +630,16 @@ Page({
 			currentLbtype: lbtype,
 		});
  
-		let num = this.data.num;
-		let timer = setInterval(function() {
-			if(num == 0) {
-				clearInterval();
-			} else {
-				self.setData({
-					num: --num, 
-				});
-			}
-		}, 1000);
+	
  
  
 		if(no_luck_urltype == 1) {
 			if(this.data.luckInfo.no_luck_weappurl) {
-				// console.log('dfjsoafjoasfjds======>',this.data.luckInfo.no_luck_weappurl);
 				let num = this.data.num;
 				let url = this.data.luckInfo.no_luck_weappurl;
 				self.timer = setInterval(function() {
 					if(num == 0) {
-						clearInterval();
+						clearInterval(self.timer);
 						app.goto(url);
 					} else {
 						self.setData({
@@ -165,7 +165,7 @@
 				<view class="bold c-tb fs40">{{luckInfo.no_luck_name}}</view>
 				<view class="pdt10">{{luckInfo.no_luck_remark}}</view>
 				<view class="img-container2"><image src="{{imghost + (luckInfo.no_luck_img ? luckInfo.no_luck_img:'miniapp/images/luckDraw/gift.png')}}" class="img" mode="aspectFit"></image></view>
-				<view class="pdt40 fs26 c9">{{num}}s后自动跳转...</view>
+				<view class="pdt40 fs26 c9" wx:if="{{luckInfo.no_luck_urltype == 1 && luckInfo.no_luck_weappurl}}">{{num}}s后自动跳转...</view>
 			</block>
 			<block wx:else>
 				<view class="bold c-tb fs40">恭喜你获得</view>
@@ -2025,10 +2025,11 @@ Page({
     }
     var title= th.data.data.goods_name;
     var img=th.data.data.original_img;
-    if(th.data.prom_type==6 || th.data.prom_type==1){
-
+    if(th.data.prom_type==6 || th.data.prom_type==1 || th.data.prom_type==4){
       title=th.data.prom_act.share_title;
       if(!title)  title=th.data.prom_act.title;
+      if(th.data.prom_type==4) title=th.data.prom_act.name;
+
       if(th.data.prom_act.share_imgurl)
           img=th.data.iurl+th.data.prom_act.share_imgurl;
     }
@@ -4070,9 +4071,10 @@ Page({
 		  }
  
 		  var share_title=th.data.data.goods_name;
-		  if(th.data.prom_type==1 || th.data.prom_type==6){
+		  if(th.data.prom_type==1 || th.data.prom_type==6 || th.data.prom_type==4){
              share_title=th.data.prom_act.share_title;
              if(!share_title) share_title=th.data.prom_act.title;
+             if(th.data.prom_type==4) share_title=th.data.prom_act.name;
           }
  
           //---产品名称---
@@ -4105,7 +4107,7 @@ Page({
 		  }else{
 			  context.setFillStyle("black");
 			  context.setFontSize(21.3 * unit)
-			  th.draw_Text(context, th.data.data.goods_name,
+			  th.draw_Text(context, share_title,
 			      38 * unit, 170 * unit, 20 * unit, 300*unit, unit);
 			  //------ 产品的价格 -----			 
 			  var pri0 = th.data.prom_act.addmoney;
@@ -4396,28 +4398,31 @@ Page({
                 destWidth: 1.2 * 750 * 750 / that.data.screenWidth,
                 destHeight: 1.2 * 1217 * 750 / that.data.screenWidth,
                 canvasId: 'share',
-                success: function(res) {
-                  that.setData({
-                    shareImgPath: res.tempFilePath,
-                    canvasHidden: true
-                  })
-                  if (!res.tempFilePath) {
-                    wx.showModal({
-                      title: '提示',
-                      content: '图片绘制中，请稍后重试',
-                      showCancel: false
-                    })
-                    return false;
+                  success: function (res) {
+
+                      that.setData({
+                          shareImgPath: res.tempFilePath,
+                          canvasHidden: true
+                      })
+
+                      if (!res.tempFilePath) {
+                          wx.showModal({
+                              title: '提示',
+                              content: '图片绘制中，请稍后重试',
+                              showCancel: false
+                          })
+                          return false;
+                      }
+
+                      // wx.previewImage({
+                      //   //将图片预览出来
+                      //   urls: [that.data.shareImgPath]
+                      // });
+                      that.setData({
+                          showPoster: true,
+                      });
+                      wx.hideLoading();
                   }
-                  // wx.previewImage({
-                  //   //将图片预览出来
-                  //   urls: [that.data.shareImgPath]
-                  // });
-									that.setData({
-										showPoster: true,
-									});
-                  wx.hideLoading();
-                }
               })
             }, 500)
  
@@ -4544,7 +4549,7 @@ Page({
  
     var img_url=ee.data.data.original_img;
     if((this.data.prom_type==1 || this.data.prom_type==6) && this.data.prom_act.share_imgurl){
-      img_url=this.data.iurl+this.data.prom_act.share_imgurl;
+        img_url=this.data.iurl+this.data.prom_act.share_imgurl;
     }
  
     //获取商品是分享图信息
@@ -394,6 +394,12 @@ Page({
             canvasHidden: true,
         })
  
+        if(this.data.share_hidden) {
+          this.setData({
+              share_hidden: false,
+          });
+        };
+
         var app = getApp();
         var unit = that.data.screenWidth / 750 * 1.35;
         var scene=th.data.teamgroup.id;
@@ -415,16 +421,17 @@ Page({
                     var vpath = res.path;
                     var context = wx.createCanvasContext('share');
  
-                    console.log("saveImageToPhotosAlbum");
-                    console.log(vpath);
  
                     //先画背景
                     var pg_path = "../../../images/share/share_bg.png";					
 					//-- 如果有自定义海报的时候，判断背景的图片 --
 					if(th.data.share_b_img){
 						pg_path=th.data.share_b_img;
-					}	
-					
+					}
+
+					var share_title=th.data.teamlist.share_title;
+					if(!share_title)
+                        share_title=th.data.teamlist.title;
                     context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
  
 					//-- 是自定义海报的情况下 --
@@ -468,7 +475,11 @@ Page({
                     //---产品名称---
                     context.setFontSize(21.3 * unit);
                     context.setFillStyle("black");
-                    th.draw_Text(context, th.data.goods.goods_name,
+
+
+
+
+                    th.draw_Text(context,share_title,
                         38 * unit, 180 * unit, 200 * unit, 279 * unit, unit);
                     //------产品的价格-------
                     context.setFontSize(24 * unit)
@@ -501,9 +512,9 @@ Page({
                     else{
                         g_ct= th.data.max_num -th.data.ordertx.length;
                         if(g_ct>0){
-                            wz="还差"+g_ct+"人享受最低价，";
+                            wz="还差"+g_ct+"人享最低优惠，";
                         }else{
-                            wz="已享受最低价，";
+                            wz="已享受最优惠，";
                         }
                     }
  
@@ -649,6 +660,7 @@ Page({
                                 destHeight: 1217 * 750 / that.data.screenWidth,
                                 canvasId: 'share',
                                 success: function (res) {
+
                                     that.setData({
                                         shareImgPath: res.tempFilePath, canvasHidden: false,
                                     })
@@ -660,10 +672,16 @@ Page({
                                         })
                                         return false;
                                     }
-                                    wx.previewImage({
-                                        //将图片预览出来
-                                        urls: [that.data.shareImgPath]
+
+                                    // wx.previewImage({
+                                    //     //将图片预览出来
+                                    //     urls: [that.data.shareImgPath]
+                                    // });
+
+                                    that.setData({
+                                        showPoster: true,
                                     });
+
                                     wx.hideLoading();
                                 }
                             })
@@ -807,9 +825,14 @@ Page({
         }
         // console.log('url+++++>>>>>', url, th.data.teamlist.title);
  
+        var share_title=th.data.teamlist.title;
+        if(th.data.teamlist.share_title){
+            share_title=th.data.teamlist.share_title;
+        }
+
         return {
             path:url,
-            title: th.data.teamlist.title,
+            title: share_title,
             imageUrl: img,
         }
     },
@@ -832,6 +855,13 @@ Page({
 			});
 		},
  
+
+    closePoster() {
+        this.setData({
+            showPoster: false,
+        });
+    },
+
  
 })
  
@@ -322,3 +322,24 @@
  
 <!-- 分享控件，底部弹出 -->
 <share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum"  wx:if="{{share_hidden}}"></share>
+
+
+<view wx:if="{{showPoster}}">
+  <view class="mask" catchtap="closePoster"></view>
+  <view class="poster-container">
+    <view class="poster-wrapper">
+      <view class="poster">
+        <!-- <view class="poster" bindtap="previewImage"> -->
+        <image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image>
+        <view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view>
+      </view>
+      <!-- <view class="btn-container">
+       <button class="btn-share" open-type="share" bindtap="">微信好友分享</button>
+       <button class="btn-share" bindtap="savePic">保存到相册</button>
+      </view> -->
+    </view>
+  </view>
+</view>
+
+
+
@@ -892,5 +892,74 @@ height:40rpx;
 }
 .xc-shuoming{
   padding-left:10rpx;
+}
+
+
+.poster-container {
+    box-sizing: border-box;
+    position: fixed;
+    top: 50%;
+    left: 50%;
+    transform: translate(-50%, -50%);
+    width: calc(100% - 120rpx);
+    z-index: 1000;
+}
+.mask {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    z-index: 999;
+    background-color: rgba(0,0,0,.4);
+}
+.poster-wrapper {
+    width: 100%;
+}
+
+.poster {
+    box-sizing: border-box;
+    width: 100%;
+    height: 1055rpx;
+    border-radius: 20rpx;
+    /* box-shadow: 0 8px 12px #666; */
+    position: relative;
+    z-index: 999;
+    overflow: hidden;
+}
+.poster-img {
+    display: block;
+    width: 100%;
+    height: 100%;
+}
+.btn-container {
+    display: flex;
+    justify-content: space-around;
+}
+.btn-share {
+    display: block;
+    background-color: #FE6867;
+    color: white;
+    border-radius: 8rpx;
+    line-height: 80rpx;
+    margin-top: 28rpx;
+    padding: 0 60rpx;
+}
+
+
+.btn-close {
+    /* background-color: rgba(0,0,0,.5); */
+    color: #ccc;
+    width: 50rpx;
+    height: 50rpx;
+    line-height: 50rpx;
+    text-align: center;
+    border-radius: 50%;
+    position: absolute;
+    right: 20rpx;
+    top: 20rpx;
+}
  
+.icon-close {
+    font-size: 48rpx;
 }
 \ No newline at end of file
@@ -408,7 +408,6 @@ input {
   background: white;
   width: 100%;
   border-radius: 20rpx 20rpx 0 0;
-  height: 72%;
 }
  
 .popup-top {
@@ -449,7 +448,8 @@ input {
  
 .store-list {
   width: 95%;
-  height: 72%;
+  min-height: 300rpx;
+  max-height: 610rpx;
   overflow-y: scroll;
   margin: auto;
 }
@@ -503,7 +503,7 @@ input {
 .store-bottom {
   width: 85%;
   margin: auto;
-  height: 70rpx;
+  height: 90rpx;
 }
  
 .determine {