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

yvan.ni
2 parents 09e17df3 713bf0ea
Showing 6 changed files with 33 additions and 22 deletions
packageB/pages/luckactivity/index/index.wxml
packageB/pages/luckactivity/luckinfo/luckinfo.js
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
pages/index/index/index.wxml
pages/index/index/index.wxss
pages/user/my_service/i_service.wxml
 <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
 <wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view>
-	<swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500" wx:if="{{ad_data}}">
+	<swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500" wx:if="{{ad_data}}" indicator-active-color="rgba(255,255,255,.8)">
+	<!-- <swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500"> -->
 		<block wx:for="{{ad_data}}">
 			<swiper-item>
 				<!-- <navigator url="{{item.ad_weapplink}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}"> -->
 				<navigator url="{{item.ad_weapplink}}" style="height: 100%;" hover-class="none" open-type="reLaunch">
-					<image src="{{item.ad_code}}" class="img" bindload="imageLoad" data-index="{{index}}" mode="aspectFit" lazy-load="true"/>
+					<image src="{{item.ad_code}}" class="img" bindload="imageLoad" data-index="{{index}}" mode="scaleToFill" lazy-load="true"/>
 				</navigator>
 			</swiper-item>
 		</block>
 const app = getApp();
-const imghost = app.globalData.setting.imghost;
+let imghost = app.globalData.setting.imghost;
 let self = null;
 Page({
@@ -9,6 +9,7 @@ Page({
 		isLoading: false, // 检测是否已经发送请求,防止重复发送请求
 		noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
 		pageNum: 1, // 当前页数
+		imghost: imghost,
     prizes: [],
 		defaultConfig: {
@@ -57,16 +58,18 @@ Page({
 		console.log('imghost+++++', imghost);
 		self = this;
 		this.data.options = options;
-		this.setData({
-			imghost: imghost,
-		});
+		// this.setData({
+		// 	options,
+		// 	imghost,
+		// });
+		console.log('this data', this.data.imghost);
 		wx.setNavigationBarTitle({
 			title: options.title,
 		});
 		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
 			self.setData({
 				userInfo: data,
-				// imghost: app.globalData.setting.imghost,
+				// imghost,
 			});
 		});
 	},
@@ -77,7 +80,6 @@ Page({
 				this.setData({
 					userInfo: app.globalData.userInfo,
-					// imghost: app.globalData.setting.imghost,
 					isLogin: true,
 				});
@@ -104,7 +106,7 @@ Page({
 						// console.log('luckInfo', res.data.data);
 						let luckInfo = res.data.data;
-						// let imghost = self.data.imghost;
+
 						if(luckInfo && luckInfo.template_type != null && luckInfo.template_type == 1) { //获取模板
 							let url = `/api/weshop/marketing/marketingLuckTemplate/get/${store_id}/${luckInfo.template_id}`;
 							app.request.get(url, {
@@ -112,9 +114,9 @@ Page({
 									// console.log('prizes//////', res.data.data);
 									self.setData({
 										template: res.data.data,
-										bannerUrl: imghost + res.data.data.bannerUrl, //背景图
-										'blocks[0].imgs[0].src': imghost + res.data.data.wheelBaseUrl, //转盘
-										'buttons[0].imgs[0].src': imghost + res.data.data.wheelPointerUrl, //指针
+										bannerUrl: imghost + (res.data.data.bannerUrl ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png'), //背景图
+										'blocks[0].imgs[0].src': imghost + (res.data.data.wheelBaseUrl ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png'), //转盘
+										'buttons[0].imgs[0].src': imghost + (res.data.data.wheelPointerUrl ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png'), //指针
 									});
 								},
 							});
@@ -194,7 +196,7 @@ Page({
 	prizeLayout(award) {
 		let prizes = [];
 		let length = award.length;
-		let thx = {fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap:false, fontColor: 'rgba(255,255,255,.8)'}]};
+		let thx = {fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap:false, fontColor: 'rgba(255,255,255,.6)'}]};
 		if(length == 1) {
 			[0,2,4,6].map(function(item, index) {
@@ -4,7 +4,7 @@
 <!-- <view class="luck-container" style="background: url({{ bannerUrl}}) no-repeat;"> -->
 	<!-- 中奖人员 -->
 	<view class="swiper-container" wx:if="{{nameList && nameList.length != 0}}">
-		<swiper class="swiper" autoplay="true" circular="true" vertical="true" interval="1000">
+		<swiper class="swiper" autoplay="true" circular="true" vertical="true" interval="3000">
 			<swiper-item class="swiper-item" wx:for="{{nameList}}">
 				<view class="item">
 					<view class="avatar-container">
@@ -50,7 +50,7 @@
 			<view class="list-item" wx:for="{{award}}">
 				<view class="img-container">
 					<image wx:if="{{item.luck_goods_img}}" src="{{item.luck_goods_img}}" class="img" mode="aspectFit"></image>
-					<image wx:else src="{{imghost + tool.showDefaultImg(item.lbtype)}}" class="img" mode="aspectFit"></image>
+					<image src="{{imghost + tool.showDefaultImg(item.lbtype)}}" class="img" mode="aspectFit" wx:else></image>
 				</view>
 				<view class="item-r">
 					<view class="fs28">{{item.luck_goods_name}}</view>
@@ -159,9 +159,9 @@
 			</view>
 		</navigator>
 		<view class="seckill-list">
-			<swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange" next-margin="90rpx">
-				<swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper " wx:key="saleGoods">
-					<navigator class="mgl20" hover-class="none" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind">
+			<swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange" next-margin="25rpx">
+				<swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods">
+					<navigator class="nav" hover-class="none" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}&title={{aitem.goods_name}}" wx:for="{{item}}" wx:key="item" wx:for-item="aitem" wx:for-index="aind">
 						<view class="imgview ">
 							<image src="{{url+aitem.original_img}}" mode="aspectFill" lazy-load="true" data-errorimg="saleGoods[{{index}}][{{aind}}].original_img" binderror="bind_bnerr3" data-img="{{aitem.original_img}}"></image>
@@ -212,14 +212,14 @@
         <swiper-item wx:for="{{pindGoods}}" wx:key="{{index}}" wx:for-index="pix">
           <view class="teamheight" style='display:block;' wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
             <view class="kill-item">
-              <navigator class="flex navwidth" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" hover-class="none">
+              <navigator class="flex navwidth" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{aitem.goods_name}}" hover-class="none">
                 <view class="kill-pic">
                   <image class="wh100" src="{{url+aitem.original_img}}" data-val="{{aitem.original_img}}" data-errorimg="pindGoods[{{pix}}][{{aind}}].original_img" binderror="bind_bnerr2" lazy-load="true">
                   </image>
                 </view>
                 <view class="kill-cont">
-                  <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
+                  <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{aitem.goods_name}}">
                     {{aitem.title}}
                   </navigator>
@@ -294,7 +294,7 @@
 }
 .seckill-list view.imgview {
-	width: 200rpx;
+	width: 223rpx;
 	height: 210rpx;
 	border-radius: 10rpx;
 	position: relative;
@@ -399,6 +399,14 @@
 .p_swiper {
 	display: flex;
+	padding: 0 10rpx;
+	box-sizing: border-box;
+}
+
+.nav {
+	padding: 0 10rpx;
+	box-sizing: border-box;
+	flex: 1;
 }
 .p_swiper .un_line {
@@ -99,4 +99,4 @@
 <my_confirm id="my_confirm"></my_confirm>
 <!-- 批量预约图标 -->
-<view class="icon-container" bindtap="goto" data-url="/packageA/pages/my_service2/appment_main"><text class="iconfont icon-plyy"></text></view>
 \ No newline at end of file
+<view class="icon-container" bindtap="goto" data-url="/packageA/pages/my_service2/appment_main"  hidden><text class="iconfont icon-plyy"></text></view>
 \ No newline at end of file