Merge branch 'dev' into 'test'

Dev See merge request !507

Merge branch 'dev' into 'test'
Dev See merge request !507
后端研发-苏明海
2 parents 8665e7b2 ba194ee2
Showing 20 changed files with 143 additions and 84 deletions
app.wxss
components/diy_goodsGroup/diy_goodsGroup.wxml
components/diy_goodsGroup/diy_goodsGroup.wxss
components/goods_list/goods_list.wxml
components/goods_list/goods_list.wxss
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsInfo/goodsInfo.wxss
pages/goods/goodsList/goodsList.wxml
pages/goods/goodsList/goodsList.wxss
pages/index/index/index.js
pages/index/index/index.wxml
pages/index/index/index.wxss
pages/justTest/justTest.wxml
pages/user/assistance/task_assistance.js
pages/user/assistance/task_assistance.wxml
pages/user/assistance/task_assistance.wxss
pages/user/index/index.wxml
utils/auth.js
utils/util.js
@@ -36,6 +36,13 @@ button {
     white-space: nowrap;
     text-overflow: ellipsis;
 }
+.ellipsis-1x {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+}
 .ellipsis-2 {
     overflow: hidden;
     text-overflow: ellipsis;
@@ -130,7 +130,7 @@
                         </view>
                         <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
-
+                        <view style="height: 10rpx;"></view>  
                     </view>
                 </navigator>
              </view>
@@ -264,6 +264,7 @@
                             </block>
                         </view>
                         <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+						<view style="height: 10rpx;"></view>
                     </view>
                 </view>
             </view>
@@ -400,6 +401,7 @@
                                 </block>
                             </view>
                             <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
+							<view style="height: 10rpx;"></view>  
                         </view>
                     </view>
                 </view>
@@ -37,7 +37,7 @@
 .zs_center {
   width: 100%;
-  min-height: 200rpx;
+  /* min-height: 200rpx; */
   font-size: 28rpx;
   color: #333;
   text-align: left;
@@ -294,7 +294,6 @@
 .zs_center_2l {
   width: 100%;
-  min-height: 200rpx;
   font-size: 28rpx;
   color: #333;
   text-align: left;
@@ -40,9 +40,9 @@
                     <view class="flex xc-wc ai_and">
                       <view class="fs24">￥</view>
                       <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
-                      <view class="card_bg">
+                      <view class="card_bg ellipsis-1">
                         <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                        <view class="card_name">{{card_name}}</view>
+                        <text class="card_name">{{card_name}}</text>
                       </view>
                     </view>
                   </view>
@@ -86,14 +86,16 @@
                       <view class="fs22">{{item.market_price}}</view>
                     </view>
                   </view>
-                  <view class="flex" style="line-height: 28rpx;">
+                  <view class="flexr" style="">
                     <!-- 等级价 -->
-                    <view class="price flex ai_and">
-                      <view class="fs22">￥</view>
-                      <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-                      <view class="card_bg">
-                        <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>{{g_filter.get_card_price(item,card_list,1)}}</view>
-                    </view>
+										<view class="price flex ai-center">
+										  <view class="fs22">￥</view>
+										  <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+										  <view class="card_bg ellipsis-1">
+										    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>
+												<text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+											</view>
+										</view>
                   </view>
                 </block>
                 <block wx:else>
@@ -3,6 +3,10 @@
   margin-bottom: 40rpx;
 }
+.ai-center{
+  align-items: center;
+}
+
 .ib {
   display: inline-block;
 }
@@ -37,6 +41,20 @@
   align-items: center;
 }
+.ellipsis-1 {
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+}
+
+/* .ellipsis-1x {
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 1;
+} */
+
 .xc-wc {
   color: #d60021;
 }
@@ -167,29 +185,34 @@
 }
 .card_bg {
-  display: flex;
+	box-sizing: border-box;
   padding: 2rpx 10rpx;
-  height: 25rpx;
-  align-items: center;
+  height: 28rpx;
   border-radius: 26rpx;
-  font-size: 19rpx;
-  line-height: 25rpx;
-  max-width: 110rpx;
+  font-size: 18rpx;
+  line-height: 28rpx;
+	max-width: 210rpx;
   background: #333;
   color: #fff;
-  justify-content: center;
   margin-left: 8rpx;
 }
 .card_bg image {
   width: 19rpx;
   height: 19rpx;
-  margin-right: 1rpx;
+  margin-right: 8rpx;
 }
-.card_bg .card_name {
+/* .card_bg .card_name {
   max-width: 76rpx;
   width: auto;
   overflow: hidden;
   white-space: nowrap;
+} */
+
+.card_name {
+	position: relative;
+	top: -4rpx;
 }
+
+
@@ -3336,10 +3336,15 @@ Page({
               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.setFontSize(22 * unit)
+							// 原来start --->
+							context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
+							context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);
+							// <--- 原来end
+       //        context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 816 * unit);
+							// context.setFontSize(18 * unit)
+       //        context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 850 * unit);
               //---二维吗图---
               context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
               break;
@@ -3353,7 +3358,7 @@ Page({
               //画秒杀的图片
               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")
@@ -282,7 +282,7 @@
             <view wx:if="{{!card_field }}">
 			   <view class="beauty-makeup-frame flex ai-center">
 				   <view class="left flex ai-center">
-					   <view class="flex ai-center  grade-card-frame card-frame advert-card"style="max-width:32%;width:auto" >
+					   <view class="flex ai-center  grade-card-frame card-frame advert-card">
 							<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
 							<view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view>
 					   </view>
@@ -302,7 +302,7 @@
 			<view wx:elif="{{is_near_date && data[card_field]>0}}">
 				    <view class="beauty-makeup-frame flex ai-center">
 				 				   <view class="left flex ai-center">
-				 					   <view class="flex ai-center  grade-card-frame card-frame advert-card"style="max-width:32%;width:auto" >
+				 					   <view class="flex ai-center  grade-card-frame card-frame advert-card">
 				 							<image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
 				 							<view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
 				 					   </view>
@@ -2547,8 +2547,9 @@ border-radius: 55rpx;
 }
 .grade-card-frame .card-name{
-	margin-left: 5rpx;
-  max-width: 120rpx;
+	margin-left: 8rpx;
+  /* max-width: 120rpx; */
+	max-width: 165rpx;
 }
 .card-effect{
   margin-left: 15rpx;
@@ -67,11 +67,11 @@
             <block wx:if="{{card_field}}">
               <!-- 等级价>0 -->
               <block wx:if="{{item[card_field]>0}}">
-                <view class="flex ai_and">
+                <view class="flex ai-center">
                   <view class="price">￥{{item[card_field]}}</view>
-                  <view class="card_bg">
+                  <view class="card_bg ellipsis-1">
                     <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                    <view class="card_name">{{card_name}}</view>
+                    <text class="card_name">{{card_name}}</text>
                   </view>
                 </view>
                 <view class="comment flex jc_sb">
@@ -94,11 +94,11 @@
                   <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
                 </view>
                 <view class="comment flex jc_sb">
-                  <view class="flex ai_and">
+                  <view class="flex ai-center">
                     <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>
-                    <view class="card_bg">
+                    <view class="card_bg ellipsis-1">
                       <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
-                      {{g_filter.get_card_price(item,card_list,1)}}
+                      <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
                     </view>
                   </view>
                   <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
@@ -157,7 +157,7 @@
 }
 .card_bg {
-  display: flex;
+  /* display: flex;
   max-width: 110rpx;
   height: 25rpx;
   align-items: center;
@@ -170,21 +170,38 @@
   margin-top: 7rpx;
   line-height: 25rpx;
   padding: 2rpx 10rpx;
-  width: auto;
-}
-
-.card_bg .card_name {
+  width: auto; */
+	
+	
+	box-sizing: border-box;
+	padding: 2rpx 10rpx;
+	height: 28rpx;
+	border-radius: 26rpx;
+	font-size: 18rpx;
+	line-height: 28rpx;
+	max-width: 220rpx;
+	background: #333;
+	color: #fff;
+	margin-left: 8rpx;
+}
+
+/* .card_bg .card_name {
   max-width: 76rpx;
   width: auto;
   overflow: hidden;
   white-space: nowrap;
+} */
+
+.card_name {
+	position: relative;
+	top: -4rpx;
 }
+
 .card_bg image {
   width: 19rpx;
   height: 19rpx;
-  margin-right: 1rpx;
-  vertical-align: middle;
+  margin-right: 8rpx;
 }
 .mk_price {
@@ -229,7 +229,6 @@ Page({
       });
     }
   },
-
   //---读取数据内容---
   async init_fir() {
     var th = this;
@@ -245,7 +244,8 @@ Page({
       for (var i = 0; i < a.length; i++) {
         var tt = {
           'ad_code': o.imghost + a[i].ad_code,
-          'media_link': ''
+          'media_link': '',
+		  'ad_weapplink':a[i].ad_weapplink
         };
         arr.push(tt);
       }
@@ -825,6 +825,13 @@ Page({
 			  is_disgraceful: 1
 			})
 	  })
+  },
+  
+  go_ad:function(e){
+	  var url=e.currentTarget.dataset.url;
+	  if(!url || url=='') return; 
+	  if(url[0]!='/') url='/'+url;
+	  getApp().goto(url);
   }
 });
 \ No newline at end of file
@@ -29,10 +29,10 @@
   </view>
   <!--滚动广告-->
   <view class="rel title-img" wx:if="{{banner}}">
-    <swiper autoplay="true" class="swiper_box" duration="1000" interval="3000" vertical="" bindchange="bannerSwiperChange" style="height:{{max_sw_height}}rpx">
-      <swiper-item wx:for="{{banner}}" wx:key="banner">
-        <view url="{{item.media_link}}" class="slide-image-frame">
-          <image class="slide-image" mode="widthFix" src="{{item.ad_code}}" bindload="imageLoad" data-index="{{index}}" lazy-load="true" binderror="bind_bnerr" data-errorimg="banner[{{index}}].ad_code"></image>
+    <swiper autoplay="true" class="swiper_box" duration="1000" interval="3000" vertical="" bindchange="bannerSwiperChange" style="height:{{max_sw_height}}rpx" circular="true">
+      <swiper-item wx:for="{{banner}}" wx:key="banner" class="swiperItem">
+        <view class="slide-image-frame">
+          <image bindtap='go_ad' data-url="{{item.ad_weapplink}}" class="slide-image" mode="widthFix" src="{{item.ad_code}}" bindload="imageLoad" data-index="{{index}}" lazy-load="true" binderror="bind_bnerr" data-errorimg="banner[{{index}}].ad_code"></image>
         </view>
       </swiper-item>
     </swiper>
@@ -65,6 +65,11 @@
   height: auto;
 }
+.swiperItem {
+  display: flex;
+  align-items: center;
+}
+
 .s_prom {
   width: 100%;
   height: 340rpx;
@@ -15,32 +15,5 @@
-
-<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>
-
-
+<button bindtap="showac"></button>
@@ -63,6 +63,8 @@ Page({
     zltime: "", //助力时间
     djs: "", //定时器的显示
     //*********************************************end
+		
+		Hei: 0, 
   },
   /**
@@ -1071,6 +1073,19 @@ Page({
     var aitem = this.data.aitem;
     var task_id = aitem[ind].id;
     getApp().goto("/pages/test/zhuli_test?taskId="+task_id);
-  }
+  },
+	
+	
+	imgH:function(e){
+		
+	    var winWid = wx.getSystemInfoSync().windowWidth;      //获取当前屏幕的宽度
+	    var imgh = e.detail.height;　　　　　　　　　　　　　　　　//图片高度
+	    var imgw = e.detail.width;
+	    var swiperH = winWid*0.827*imgh/imgw + "px"　　　　　　　　　　//等比设置swiper的高度。  即 屏幕宽度 / swiper高度 = 图片宽度 / 图片高度    ==》swiper高度 = 屏幕宽度 * 图片高度 / 图片宽度
+	    console.log('imgload',winWid, imgh, imgw, swiperH);
+			this.setData({
+	      Hei:swiperH　　　　　　　　//设置高度
+	    })
+	},
 })
@@ -16,17 +16,19 @@
     </view>
   </view>
   <!-- 图片的轮播图 -->
-  <view class="xc-specific-more-frame flex-center">
+  <view class="xc-specific-more-frame flex-center" style="height:{{Hei}};">
     <view bindtap="click_pre">
       <view class="bg_left xc-left bcolor"></view>
     </view>
-    <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='width:82.7%; height:100%' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
+		<!-- <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='width:82.7%; height:100%' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}"> -->
+    <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}" style='width:82.7%;height: 100%;'>
       <swiper-item class="rel" wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx">
-        <image class="xc-center-img" bindtap="libao_details" data-taskid="{{aitem.id}}"  src="{{aitem.giftBagUrl!=null&&aitem.giftBagUrl!=''?iurl+aitem.giftBagUrl:swpie_img}}"></image>
+        <image class="xc-center-img" bindtap="libao_details" data-taskid="{{aitem.id}}"  src="{{aitem.giftBagUrl!=null&&aitem.giftBagUrl!=''?iurl+aitem.giftBagUrl:swpie_img}}" mode="widthFix" bindload='imgH' style="width: 100%;display: block;"></image>
         <view bindtap="libao_details" data-taskid="{{aitem.id}}" class="abs select_details fs26 white">礼包详情</view>
       </swiper-item>
+
     </swiper>
     <view bindtap="click_next">
@@ -13,7 +13,7 @@ page {
 }
 .top-back {
   width: 100%;
-  height:65%;
+  /* height:65%; */
   background-repead: no-repead;
   background-size: 100% 100%;
 }
@@ -116,7 +116,7 @@
       <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>
+        <text class="order-num" hidden='{{toji.wait_send>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">
@@ -51,7 +51,8 @@ module.exports = {
         data: {
           js_code: e,
           store_id: a.globalData.setting.stoid,
-          nickname: a.clear_word(a.globalData.getu.nickName)
+          nickname: a.clear_word(a.globalData.getu.nickName),
+          head_pic: a.clear_word(a.globalData.getu.avatarUrl)          
         },
         success: function (e) {
           console.log("openidandkey");
@@ -232,7 +232,7 @@ function measureText(text, fontSize = 10) {
 //验证手机号
 function check_mobile(phoneMobile){
-  var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/;
+  var myreg = /^(((11[0-9]{1})|(12[0-9]{1})|(13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(16[0-9]{1})|(19[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/;
   var ob={code:1};
   if (phoneMobile.length === 0) {
       ob.title='输入的手机号为空';