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

yvan.ni
2 parents 6cc46161 3459ab84
Showing 6 changed files with 266 additions and 115 deletions
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.wxss
pages/togoin/togoin.js
pages/togoin/togoin.wxml
pages/togoin/togoin.wxss
@@ -4191,6 +4191,92 @@ Page({
       }
     })
   },
+	
+	
+	drawPoster(context, unit, img, vpath) {
+			// 1.灰色背景
+			context.setFillStyle('#f2f1f6');
+			context.rect(0,0,554*unit,899*unit);
+			context.fill();
+			// 2.商城名称
+			let shopName = this.data.sto_sele_name_1;
+			// let shopNameLen = context.measureText(shopName);
+			// let x_shopNameLen = (554 - shopNameLen.width)/2*unit;
+			// console.log('11111111111111',shopNameLen,x_shopNameLen);
+			context.setTextAlign('center');
+			context.setFontSize(26*unit);
+			context.setFillStyle('black');
+			context.fillText(shopName, 277*unit, 60*unit);
+			// // 3.推荐来源
+			let fromText = `来自${getApp().globalData.userInfo.nickname}的推荐`;
+			// let fromTextLen = context.measureText(fromText);
+			// let x_fromText = (375 - fromTextLen.width)/2;
+			// console.log('222222',fromTextLen,x_fromText);
+			context.setTextAlign('center');
+			context.setFontSize(22*unit);
+			context.setFillStyle('#96959a');
+			context.fillText(fromText, 277*unit, 105*unit);
+			// 4.海报背景
+			// context.beginPath();
+			// context.setStrokeStyle('#f2f1f6');
+			context.setFillStyle('white');
+			context.fillRect(37*unit, 157*unit, 480*unit, 673*unit);
+			// context.stroke();
+			// context.fill();
+			// 5.商品图片
+			// 图片的x坐标
+			let bg_x = 37*unit
+			// 图片的y坐标
+			let bg_y = 157*unit
+			// 图片宽度
+			let bg_w = 480*unit
+			// 图片高度
+			let bg_h = 474*unit
+			// 图片圆角
+			let bg_r = 4
+			// 绘制海报背景图片圆角
+			context.save()
+			context.beginPath()
+			context.arc(bg_x + bg_r, bg_y + bg_r, bg_r, Math.PI, Math.PI*1.5)
+			context.arc(bg_x + bg_w - bg_r, bg_y + bg_r, bg_r, Math.PI * 1.5, Math.PI * 2)
+			context.arc(bg_x + bg_w, bg_y + bg_h, bg_r, 0, Math.PI * 0.5)
+			context.arc(bg_x, bg_y + bg_h, 0, Math.PI * 0.5, Math.PI)
+			context.clip()
+			context.drawImage(img, bg_x, bg_y, bg_w, bg_h);
+			context.restore()
+			// 6.强烈推荐
+			// context.beginPath();
+			let tj_path = "../../../images/share/q_tj.png";
+			context.beginPath()
+			context.drawImage(tj_path, 54*unit, 648*unit, 85*unit, 30*unit);
+			context.setFontSize(16*unit)
+			context.setLineJoin('round'); //交点设置成圆角
+			context.setFillStyle("white")
+			context.setTextAlign('left');
+			context.fillText('强烈推荐', 64*unit, 672*unit);
+			// 7.商品价格
+			context.setFontSize(32*unit);
+			context.setFillStyle('#DE1117');
+			context.fillText('￥59.00', 54*unit, 730*unit);
+			// 8.商品标题
+			context.setFontSize(20*unit);
+			context.setFillStyle('#898989');
+			this.draw_Text(context, this.data.data.goods_name,
+			  54*unit, 770*unit, 240*unit, 240*unit, unit);
+			// 9.小程序码
+			context.drawImage(vpath, 375*unit, 660*unit, 120*unit, 120*unit);
+			context.setFontSize(16*unit);
+			context.setFillStyle('#777');
+			context.fillText('长按识别二维码', 378*unit, 810*unit);
+			// 10.竖线
+			context.beginPath();
+			context.setFillStyle('#eee');
+			context.rect(354*unit, 670*unit, 1*unit, 130*unit);
+			context.fill();
+			
+		},
+	
+	
   //--定义的保存图片方法，分享团---
   saveImageToPhotosAlbum: function () {
@@ -4241,67 +4327,90 @@ Page({
       os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo";
     console.log(path3);
+		
-    //读取文件成功则OK--
+    // 读取文件成功则OK--
     wx.getImageInfo({
       src: path3,
       success: function (res) {
-        //回调写法
+        // 回调写法
         th.get_head_temp(th.get_goods_temp, function () {
           var vpath = res.path;
           var context = wx.createCanvasContext('share');
-          //先画背景
+          // 先画背景
           var pg_path = "../../../images/share/share_bg.png";
           // context.fillStyle="#FFFFFF";
           // context.fillRect(0,0,554 * unit, 899 * unit);
+					
+					// if(type == 0) {
+					// 	this.drawPoster(context);
+					// 	return false;
+					// };
+					
           //-- 如果有自定义海报的时候，判断背景的图片 --
           if (th.data.share_b_img) {
             pg_path = th.data.share_b_img;
           }
-          context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
+          // context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
+					
+					
+					if(type == 0) { // 如果是普通商品，绘制新海报
+						th.drawPoster(context, unit, th.data.share_goods_img, vpath);
+					} else {
+						context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit);
+					};
+					
+					// th.drawPoster(context, unit, th.data.share_goods_img, vpath);
+					
           //-- 是自定义海报的情况下 --
-          if (th.data.poster && parseInt(th.data.poster.style) == 2) {
-            //在线上分享人的情况下
-            if (parseInt(th.data.poster.show_headpic)) {
-              //获取坐标
-              var x = parseFloat(th.data.poster.head_x) * 2;
-              var y = parseFloat(th.data.poster.head_y) * 2;
-              var x1 = (x + 90) * unit;
-              var y1 = (y + 50) * unit;
-              //--昵称---
-              context.setFontSize(24 * unit)
-              context.setFillStyle("black")
-              context.fillText(app.globalData.userInfo.nickname, x1, y1);
-              var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit;
-              //强烈推荐 改许程
-              var tj_path = "../../../images/share/q_tj.png";
-              context.drawImage(tj_path, x1 + width, y1 - 22 * unit, 85 * unit, 30 * unit);
-              context.setFontSize(16 * unit)
-              context.setLineJoin('round'); //交点设置成圆角
-              context.setFillStyle("white")
-              context.fillText('强烈推荐', x1 + width + 8 * unit, y1 - 1 * unit);
-
-              //context.setFillStyle("black")
-              //context.setFontSize(24 * unit)
-              //context.fillText(getApp().globalData.config.store_name, 40 * unit, 130 * unit);
-            }
-          } else {
-            //--昵称---
-            context.setFontSize(24 * unit)
-            context.setFillStyle("black")
-            context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
-            var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
-            //强烈推荐 改许程
-            var tj_path = "../../../images/share/q_tj.png";
-            context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit);
-            context.setFontSize(16 * unit);
-            context.setLineJoin('round'); //交点设置成圆角
-            context.setFillStyle("white");
-            context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit);
-          }
+					if(type != 0) {
+						
+						if (th.data.poster && parseInt(th.data.poster.style) == 2) {
+						  //在线上分享人的情况下
+						  if (parseInt(th.data.poster.show_headpic)) {
+						    //获取坐标
+						    var x = parseFloat(th.data.poster.head_x) * 2;
+						    var y = parseFloat(th.data.poster.head_y) * 2;
+						    var x1 = (x + 90) * unit;
+						    var y1 = (y + 50) * unit;
+						    //--昵称---
+						    context.setFontSize(24 * unit)
+						    context.setFillStyle("black")
+						    context.fillText(app.globalData.userInfo.nickname, x1, y1);
+						    var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit;
+						    //强烈推荐 改许程
+						    var tj_path = "../../../images/share/q_tj.png";
+						    context.drawImage(tj_path, x1 + width, y1 - 22 * unit, 85 * unit, 30 * unit);
+						    context.setFontSize(16 * unit);
+						    context.setLineJoin('round'); //交点设置成圆角
+						    context.setFillStyle("white");
+						    context.fillText('强烈推荐', x1 + width + 8 * unit, y1 - 1 * unit);
+						
+						    //context.setFillStyle("black")
+						    //context.setFontSize(24 * unit)
+						    //context.fillText(getApp().globalData.config.store_name, 40 * unit, 130 * unit);
+						  }
+						} else {
+						  //--昵称---
+						  context.setFontSize(24 * unit);
+						  context.setFillStyle("black");
+						  context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit);
+						  var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit;
+						  //强烈推荐 改许程
+						  var tj_path = "../../../images/share/q_tj.png";
+						  context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit);
+						  context.setFontSize(16 * unit);
+						  context.setLineJoin('round'); //交点设置成圆角
+						  context.setFillStyle("white");
+						  context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit);
+						}
+						
+					};
+					
+          
           var share_title = th.data.data.goods_name;
           if (th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) {
@@ -4312,7 +4421,7 @@ Page({
           //---产品名称---
           //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度
-          if (type != 4) {
+          if (type != 4 && type != 0) {
             context.setFillStyle("black");
             context.setFontSize(21.3 * unit)
             th.draw_Text(context, share_title,
@@ -4345,7 +4454,7 @@ Page({
             context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
             context.stroke();
-          } else {
+          } else if(type == 4 && type != 0) {
             context.setFillStyle("black");
             context.setFontSize(21.3 * unit)
             th.draw_Text(context, share_title,
@@ -4365,10 +4474,15 @@ Page({
           }
           //---中间大图---
-          context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
+					if(type != 0) {
+						context.drawImage(th.data.share_goods_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit);
+					};
+					
+					
+          
           //-------大图后面就不一样了-----------
           switch (type) {
-            case 0: //普通商品的展示
+            case 0: break;//普通商品的展示
             case 4:
               //中间的几个字
               if (th.data.poster && parseInt(th.data.poster.style) == 2) {
@@ -4435,7 +4549,6 @@ Page({
                 context.fillText("长按识别二维码", 40 * unit, 806 * unit);
                 context.fillText("立即开始兑换", 40 * unit, 846 * unit);
-
               }
               //---二维吗图---            
@@ -4447,7 +4560,7 @@ Page({
               } else {
                 //---二维吗图---
                 context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit);
-              }
+              };
               break;
             case 1: //秒杀商品的展示
@@ -4490,7 +4603,6 @@ Page({
               context.lineTo(520 * unit, 670 * unit)
               context.stroke();
               //---文字---
-
               context.setFillStyle("black")
               context.setFontSize(24 * unit)
               context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
@@ -4536,7 +4648,6 @@ Page({
               context.lineTo(520 * unit, 670 * unit)
               context.stroke();
               //---文字---
-
               context.setFillStyle("black")
               context.setFontSize(24 * unit)
               context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit);
@@ -4587,45 +4698,50 @@ Page({
           //--- 如果是自定义海报的时候 ---
-          if (th.data.poster && parseInt(th.data.poster.style) == 2) {
-
-            //如果显示会员信息的话
-            if (parseInt(th.data.poster.show_headpic)) {
-              //获取坐标
-              var x = parseFloat(th.data.poster.head_x) * 2;
-              var y = parseFloat(th.data.poster.head_y) * 2;
-              //---绘制圆形要放在最后----
-              context.save();
-              context.beginPath();
-              var h_x = x * unit;
-              var h_y = y * unit;
-              var h_r = 40 * unit;
-              var cx = h_x + h_r;
-              var cy = h_y + h_r;
-              context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
-              context.closePath();
-              context.fill();
-              context.clip();
-              context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
-              context.restore();
-            }
-
-          } else {
-            //---绘制圆形要放在最后----
-            context.save();
-            context.beginPath();
-            var h_x = 60 * unit;
-            var h_y = 24 * unit;
-            var h_r = 40 * unit;
-            var cx = h_x + h_r;
-            var cy = h_y + h_r;
-            context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
-            context.closePath();
-            context.fill();
-            context.clip();
-            context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
-            context.restore();
-          }
+					if(type != 0) {
+						
+						if (th.data.poster && parseInt(th.data.poster.style) == 2) {
+						
+						  //如果显示会员信息的话
+						  if (parseInt(th.data.poster.show_headpic)) {
+						    //获取坐标
+						    var x = parseFloat(th.data.poster.head_x) * 2;
+						    var y = parseFloat(th.data.poster.head_y) * 2;
+						    //---绘制圆形要放在最后----
+						    context.save();
+						    context.beginPath();
+						    var h_x = x * unit;
+						    var h_y = y * unit;
+						    var h_r = 40 * unit;
+						    var cx = h_x + h_r;
+						    var cy = h_y + h_r;
+						    context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
+						    context.closePath();
+						    context.fill();
+						    context.clip();
+						    context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
+						    context.restore();
+						  }
+						
+						} else {
+						  //---绘制圆形要放在最后----
+						  context.save();
+						  context.beginPath();
+						  var h_x = 60 * unit;
+						  var h_y = 24 * unit;
+						  var h_r = 40 * unit;
+						  var cx = h_x + h_r;
+						  var cy = h_y + h_r;
+						  context.arc(cx, cy, h_r, 0, Math.PI * 2, false);
+						  context.closePath();
+						  context.fill();
+						  context.clip();
+						  context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2);
+						  context.restore();
+						}
+						
+					};
+          
           //把画板内容绘制成图片，并回调 画板图片路径
@@ -289,8 +289,7 @@
                 </view>
               </view>
               <view class="fs32 xc-black3 ai_and carde_frame">
-                <text class="fs26">￥</text>
-                {{g_filters.get_card_price(data,card_list,0)}}
+                <text class="fs26">￥</text>{{g_filters.get_card_price(data,card_list,0)}}
               </view>
             </view>
             <!-- 等级卡的显示,购买, 等级卡近30天要显示续费 -->
@@ -308,10 +307,7 @@
                     <view class="card-effect">
                       <view class="fs24 xc-black3">
                         成为{{g_filters.get_card_price(data,card_list,1)}}立
-                        <text class="co-red">
-                          省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}
-                        </text>
-                        元
+                        <text class="co-red">省{{filters.toFix(data.shop_price-g_filters.get_card_price(data,card_list,0),2)}}</text>元
                       </view>
                       <view class="fs22 xc-ash">开通会员 尽享更多优惠</view>
                     </view>
@@ -355,8 +351,8 @@
               </view>
             </view>
             <view class="goods-num" wx:if="{{prom_type!=1}}">
-              <view class="sales">销量：{{sele_g.sales_sum}}件</view>
-              <view class="stock">折扣：{{sele_g.disc}}折</view>
+              <view class="sales">销量：{{data.sales_sum}}件</view>
+              <view class="stock">折扣：{{data.disc}}折</view>
               <view class="stock">{{categories3[0].num}}人评价</view>
             </view>
             <view wx:if="{{prom_type==1}}">
@@ -420,10 +416,7 @@
                 <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
                 <view class="fs30" style="color:black;">选择门店</view>
               </view>
-              <view class="red_bb fs26">
-                更多门店
-                <text class="bg_jj"></text>
-              </view>
+              <view class="red_bb fs26">更多门店<text class="bg_jj"></text></view>
             </view>
             <view wx:if="{{def_pick_store && def_pick_store.pickup_name}}">
               <view class="flex-space-between address ai_end pdv10">
@@ -1113,10 +1106,7 @@
             <image class="stores-img" src="{{iurl}}/miniapp/images/stores.png"></image>
             <view class="fs30" style="color:black;">选择门店</view>
           </view>
-          <view class="red-co fs28" bindtap="choice_store">
-            更多门店
-            <text class="right-arrow"></text>
-          </view>
+          <view class="red-co fs28" bindtap="choice_store">更多门店<text class="right-arrow"></text></view>
         </view>
         <view wx:if="{{only_pk && !only_pk.length}}">(库存不足)</view>
         <block wx:else>
@@ -1384,10 +1374,7 @@
             <icon bindtap="close_popup" class="modal-closes" color="black" size="22" type="cancel"></icon>
           </view>
           <view class="felx choose_more" bindtap="more_store">
-            <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">
-              {{choice_sort_store==0?'更多门店':'返回'}}
-            </text>
-            <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
+            <text class="fs26 red-co" wx:if="{{is_show_sto_cat}}">{{choice_sort_store==0?'更多门店':'返回'}}</text> <view class="bg_rights" wx:if="{{is_show_sto_cat}}"></view>
           </view>
         </view>
       </view>
@@ -2690,7 +2690,7 @@ border-radius: 55rpx;
 }
 .carde_frame{
   height: 50rpx;
-  line-height: 18rpx
+  /* line-height: 18rpx */
 }
 button.custom-service { line-height: normal; border: 0;}
@@ -64,6 +64,14 @@ Page({
   //-- 会员授权 --
   bindGetUserInfo: function(ee) {
+		
+		if(!this.data.isAgree) {
+			wx.showToast({
+				title: '请您先阅读和勾选指定的内容',
+				icon: 'none',
+			});
+			return false;
+		}
     var that = this;
 	//-- 点击授权 --
 	that.getUserProfile(function(res){
@@ -286,7 +294,30 @@ Page({
   close_pop_back:function(){
 	  this.close_pop();
 	  wx.navigateBack({ delta: 1})
-  }
+  },
+	
+	
+	// 是否同意协议
+	isAgree(e) {
+		let isAgree = null;
+		if(e.detail.value[0]) {
+			isAgree = true;
+		} else {
+			isAgree = false;
+		}; 
+		// this.data.isAgree = isAgree;
+		this.setData({
+			isAgree,
+		});
+	},
+	
+	
+	//通过路径跳转到其他页面
+	goto: function(e) {
+		console.log('xxxx', e);
+	  var url = e.currentTarget.dataset.url;
+	  getApp().goto(url);
+	},
@@ -2,7 +2,7 @@
   <!-- 登录图 -->
   <view >
-    <view class="logins flex-center2 ali-c flex" style="position: relative;top: 120rpx;">
+    <view class="logins flex-center2 ali-c flex" style="padding-top: 120rpx;">
 	  <image mode="widthFix"  bindtap="go_index" class="login_img_back" src="{{imghots}}/miniapp/images/loginbg.jpg"></image>
       <view class="middle_view">
          <image bindtap="go_index" class="login_img" src="{{store_logo}}" binderror="bind_bnerr" lazy-load="true" data-errorimg="store_logo"></image>
@@ -14,6 +14,13 @@
   <!-- 登录按钮 -->
   <view>
     <view class="phones">
+			
+		<view bindtap="" class="user-name flex-vertical fs24 jc-center">
+			<checkbox-group bindchange="isAgree">
+				<checkbox value="true"/>
+			</checkbox-group>
+		  <view class="user-name-txt">我已阅读同意 <text class="gray" bindtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=0">《用户使用协议》</text>与<text class="gray" bindtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=1">《隐私政策》</text></view>
+		</view>	
 	 <!-- 授权获取基础信息 -->
 	 <block wx:if="{{canIUseGetUserProfile}}">  
@@ -4,7 +4,7 @@ page{
 }
 .logins {
   width: 100%;
-  padding-bottom: 130rpx;
+  /* padding-bottom: 130rpx; */
   background-position: center;
   background-repeat: no-repeat;
   background-size: cover
@@ -26,7 +26,7 @@ page{
   border-radius: 48rpx;
   color: rgb(255,255,255);
   font-size: 32rpx;
-  margin-top:150rpx;
+  margin-top: 40rpx;
 }
 .we_chat{
   width: 55rpx;
@@ -65,3 +65,13 @@ button{
 .middle_view{
     position: absolute; left: 0; width: 100%; text-align: center;
 }
+
+/*checkbox 选项框大小  */
+checkbox .wx-checkbox-input {
+  width: 30rpx;
+  height: 30rpx;
+}
+
+.gray {
+	color: #767f8e;
+}