wxd / MShopWeApp

Commit c31c1d39fb1d47f0befe5b49e31168b544838be9

Authored by yvan.ni
2 parents 09e17df3 713bf0ea

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

Inline Side-by-side
Showing 6 changed files with 33 additions and 22 deletions
packageB/pages/luckactivity/index/index.wxml
  View file @c31c1d3
1 1 <wxs module="filter" src="../../../../utils/filter.wxs"></wxs>
2 2 <wxs module="g_filter" src="g_filter.wxs"></wxs>
3 3 <view>
4   - <swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500" wx:if="{{ad_data}}">
  4 + <swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500" wx:if="{{ad_data}}" indicator-active-color="rgba(255,255,255,.8)">
  5 + <!-- <swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500"> -->
5 6 <block wx:for="{{ad_data}}">
6 7 <swiper-item>
7 8 <!-- <navigator url="{{item.ad_weapplink}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}"> -->
8 9 <navigator url="{{item.ad_weapplink}}" style="height: 100%;" hover-class="none" open-type="reLaunch">
9   - <image src="{{item.ad_code}}" class="img" bindload="imageLoad" data-index="{{index}}" mode="aspectFit" lazy-load="true"/>
  10 + <image src="{{item.ad_code}}" class="img" bindload="imageLoad" data-index="{{index}}" mode="scaleToFill" lazy-load="true"/>
10 11 </navigator>
11 12 </swiper-item>
12 13 </block>
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.js
  View file @c31c1d3
1 1 const app = getApp();
2   -const imghost = app.globalData.setting.imghost;
  2 +let imghost = app.globalData.setting.imghost;
3 3 let self = null;
4 4  
5 5 Page({
... ... @@ -9,6 +9,7 @@ Page({
9 9 isLoading: false, // 检测是否已经发送请求,防止重复发送请求
10 10 noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
11 11 pageNum: 1, // 当前页数
  12 + imghost: imghost,
12 13  
13 14 prizes: [],
14 15 defaultConfig: {
... ... @@ -57,16 +58,18 @@ Page({
57 58 console.log('imghost+++++', imghost);
58 59 self = this;
59 60 this.data.options = options;
60   - this.setData({
61   - imghost: imghost,
62   - });
  61 + // this.setData({
  62 + // options,
  63 + // imghost,
  64 + // });
  65 + console.log('this data', this.data.imghost);
63 66 wx.setNavigationBarTitle({
64 67 title: options.title,
65 68 });
66 69 app.isLogin().then(function(data) {//进入页面前已经授权登录成功
67 70 self.setData({
68 71 userInfo: data,
69   - // imghost: app.globalData.setting.imghost,
  72 + // imghost,
70 73 });
71 74 });
72 75 },
... ... @@ -77,7 +80,6 @@ Page({
77 80  
78 81 this.setData({
79 82 userInfo: app.globalData.userInfo,
80   - // imghost: app.globalData.setting.imghost,
81 83 isLogin: true,
82 84 });
83 85  
... ... @@ -104,7 +106,7 @@ Page({
104 106  
105 107 // console.log('luckInfo', res.data.data);
106 108 let luckInfo = res.data.data;
107   - // let imghost = self.data.imghost;
  109 +
108 110 if(luckInfo && luckInfo.template_type != null && luckInfo.template_type == 1) { //获取模板
109 111 let url = `/api/weshop/marketing/marketingLuckTemplate/get/${store_id}/${luckInfo.template_id}`;
110 112 app.request.get(url, {
... ... @@ -112,9 +114,9 @@ Page({
112 114 // console.log('prizes//////', res.data.data);
113 115 self.setData({
114 116 template: res.data.data,
115   - bannerUrl: imghost + res.data.data.bannerUrl, //背景图
116   - 'blocks[0].imgs[0].src': imghost + res.data.data.wheelBaseUrl, //转盘
117   - 'buttons[0].imgs[0].src': imghost + res.data.data.wheelPointerUrl, //指针
  117 + bannerUrl: imghost + (res.data.data.bannerUrl ? res.data.data.bannerUrl:'miniapp/images/luckDraw/bg.png'), //背景图
  118 + 'blocks[0].imgs[0].src': imghost + (res.data.data.wheelBaseUrl ? res.data.data.wheelBaseUrl:'miniapp/images/luckDraw/weel.png'), //转盘
  119 + 'buttons[0].imgs[0].src': imghost + (res.data.data.wheelPointerUrl ? res.data.data.wheelPointerUrl:'miniapp/images/luckDraw/pointer.png'), //指针
118 120 });
119 121 },
120 122 });
... ... @@ -194,7 +196,7 @@ Page({
194 196 prizeLayout(award) {
195 197 let prizes = [];
196 198 let length = award.length;
197   - let thx = {fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap:false, fontColor: 'rgba(255,255,255,.8)'}]};
  199 + let thx = {fonts: [{ text: '谢谢\n参与', top: '18%', wordWrap:false, fontColor: 'rgba(255,255,255,.6)'}]};
198 200  
199 201 if(length == 1) {
200 202 [0,2,4,6].map(function(item, index) {
... ...
packageB/pages/luckactivity/luckinfo/luckinfo.wxml
  View file @c31c1d3
... ... @@ -4,7 +4,7 @@
4 4 <!-- <view class="luck-container" style="background: url({{ bannerUrl}}) no-repeat;"> -->
5 5 <!-- 中奖人员 -->
6 6 <view class="swiper-container" wx:if="{{nameList && nameList.length != 0}}">
7   - <swiper class="swiper" autoplay="true" circular="true" vertical="true" interval="1000">
  7 + <swiper class="swiper" autoplay="true" circular="true" vertical="true" interval="3000">
8 8 <swiper-item class="swiper-item" wx:for="{{nameList}}">
9 9 <view class="item">
10 10 <view class="avatar-container">
... ... @@ -50,7 +50,7 @@
50 50 <view class="list-item" wx:for="{{award}}">
51 51 <view class="img-container">
52 52 <image wx:if="{{item.luck_goods_img}}" src="{{item.luck_goods_img}}" class="img" mode="aspectFit"></image>
53   - <image wx:else src="{{imghost + tool.showDefaultImg(item.lbtype)}}" class="img" mode="aspectFit"></image>
  53 + <image src="{{imghost + tool.showDefaultImg(item.lbtype)}}" class="img" mode="aspectFit" wx:else></image>
54 54 </view>
55 55 <view class="item-r">
56 56 <view class="fs28">{{item.luck_goods_name}}</view>
... ...
pages/index/index/index.wxml
  View file @c31c1d3
... ... @@ -159,9 +159,9 @@
159 159 </view>
160 160 </navigator>
161 161 <view class="seckill-list">
162   - <swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange" next-margin="90rpx">
163   - <swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper " wx:key="saleGoods">
164   - <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">
  162 + <swiper class="s_prom" indicator-dots="{{false}}" bindchange="flashSwiperChange" next-margin="25rpx">
  163 + <swiper-item wx:for="{{saleGoods}}" wx:key="{{index}}" class="p_swiper" wx:key="saleGoods">
  164 + <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">
165 165 <view class="imgview ">
166 166 <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>
167 167  
... ... @@ -212,14 +212,14 @@
212 212 <swiper-item wx:for="{{pindGoods}}" wx:key="{{index}}" wx:for-index="pix">
213 213 <view class="teamheight" style='display:block;' wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind">
214 214 <view class="kill-item">
215   - <navigator class="flex navwidth" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{aitem.goods_id}}" hover-class="none">
  215 + <navigator class="flex navwidth" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{aitem.goods_name}}" hover-class="none">
216 216 <view class="kill-pic">
217 217 <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">
218 218 </image>
219 219 </view>
220 220  
221 221 <view class="kill-cont">
222   - <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
  222 + <navigator class="goods-name ellipsis-2" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{aitem.goods_name}}">
223 223 {{aitem.title}}
224 224  
225 225 </navigator>
... ...
pages/index/index/index.wxss
  View file @c31c1d3
... ... @@ -294,7 +294,7 @@
294 294 }
295 295  
296 296 .seckill-list view.imgview {
297   - width: 200rpx;
  297 + width: 223rpx;
298 298 height: 210rpx;
299 299 border-radius: 10rpx;
300 300 position: relative;
... ... @@ -399,6 +399,14 @@
399 399  
400 400 .p_swiper {
401 401 display: flex;
  402 + padding: 0 10rpx;
  403 + box-sizing: border-box;
  404 +}
  405 +
  406 +.nav {
  407 + padding: 0 10rpx;
  408 + box-sizing: border-box;
  409 + flex: 1;
402 410 }
403 411  
404 412 .p_swiper .un_line {
... ...
pages/user/my_service/i_service.wxml
  View file @c31c1d3
... ... @@ -99,4 +99,4 @@
99 99 <my_confirm id="my_confirm"></my_confirm>
100 100  
101 101 <!-- 批量预约图标 -->
102   -<view class="icon-container" bindtap="goto" data-url="/packageA/pages/my_service2/appment_main"><text class="iconfont icon-plyy"></text></view>
103 102 \ No newline at end of file
  103 +<view class="icon-container" bindtap="goto" data-url="/packageA/pages/my_service2/appment_main" hidden><text class="iconfont icon-plyy"></text></view>
104 104 \ No newline at end of file
... ...