wxd / MShopWeApp

Commit 610a0f3f4be7f4ac76fc2db4781dccb2cbdf53f2

Authored by 后端研发-苏明海
2 parents 8665e7b2 ba194ee2

Merge branch 'dev' into 'test' 

Dev

See merge request !507
Inline Side-by-side
Showing 20 changed files with 143 additions and 84 deletions
app.wxss
  View file @610a0f3
... ... @@ -36,6 +36,13 @@ button {
36 36 white-space: nowrap;
37 37 text-overflow: ellipsis;
38 38 }
  39 +.ellipsis-1x {
  40 + overflow: hidden;
  41 + text-overflow: ellipsis;
  42 + display: -webkit-box;
  43 + -webkit-box-orient: vertical;
  44 + -webkit-line-clamp: 1;
  45 +}
39 46 .ellipsis-2 {
40 47 overflow: hidden;
41 48 text-overflow: ellipsis;
... ...
components/diy_goodsGroup/diy_goodsGroup.wxml
  View file @610a0f3
... ... @@ -130,7 +130,7 @@
130 130  
131 131 </view>
132 132 <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
133   -
  133 + <view style="height: 10rpx;"></view>
134 134 </view>
135 135 </navigator>
136 136 </view>
... ... @@ -264,6 +264,7 @@
264 264 </block>
265 265 </view>
266 266 <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
  267 + <view style="height: 10rpx;"></view>
267 268 </view>
268 269 </view>
269 270 </view>
... ... @@ -400,6 +401,7 @@
400 401 </block>
401 402 </view>
402 403 <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view>
  404 + <view style="height: 10rpx;"></view>
403 405 </view>
404 406 </view>
405 407 </view>
... ...
components/diy_goodsGroup/diy_goodsGroup.wxss
  View file @610a0f3
... ... @@ -37,7 +37,7 @@
37 37  
38 38 .zs_center {
39 39 width: 100%;
40   - min-height: 200rpx;
  40 + /* min-height: 200rpx; */
41 41 font-size: 28rpx;
42 42 color: #333;
43 43 text-align: left;
... ... @@ -294,7 +294,6 @@
294 294  
295 295 .zs_center_2l {
296 296 width: 100%;
297   - min-height: 200rpx;
298 297 font-size: 28rpx;
299 298 color: #333;
300 299 text-align: left;
... ...
components/goods_list/goods_list.wxml
  View file @610a0f3
... ... @@ -40,9 +40,9 @@
40 40 <view class="flex xc-wc ai_and">
41 41 <view class="fs24">￥</view>
42 42 <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
43   - <view class="card_bg">
  43 + <view class="card_bg ellipsis-1">
44 44 <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
45   - <view class="card_name">{{card_name}}</view>
  45 + <text class="card_name">{{card_name}}</text>
46 46 </view>
47 47 </view>
48 48 </view>
... ... @@ -86,14 +86,16 @@
86 86 <view class="fs22">{{item.market_price}}</view>
87 87 </view>
88 88 </view>
89   - <view class="flex" style="line-height: 28rpx;">
  89 + <view class="flexr" style="">
90 90 <!-- 等级价 -->
91   - <view class="price flex ai_and">
92   - <view class="fs22">￥</view>
93   - <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
94   - <view class="card_bg">
95   - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>{{g_filter.get_card_price(item,card_list,1)}}</view>
96   - </view>
  91 + <view class="price flex ai-center">
  92 + <view class="fs22">￥</view>
  93 + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
  94 + <view class="card_bg ellipsis-1">
  95 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>
  96 + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
  97 + </view>
  98 + </view>
97 99 </view>
98 100 </block>
99 101 <block wx:else>
... ...
components/goods_list/goods_list.wxss
  View file @610a0f3
... ... @@ -3,6 +3,10 @@
3 3 margin-bottom: 40rpx;
4 4 }
5 5  
  6 +.ai-center{
  7 + align-items: center;
  8 +}
  9 +
6 10 .ib {
7 11 display: inline-block;
8 12 }
... ... @@ -37,6 +41,20 @@
37 41 align-items: center;
38 42 }
39 43  
  44 +.ellipsis-1 {
  45 + overflow: hidden;
  46 + white-space: nowrap;
  47 + text-overflow: ellipsis;
  48 +}
  49 +
  50 +/* .ellipsis-1x {
  51 + overflow: hidden;
  52 + text-overflow: ellipsis;
  53 + display: -webkit-box;
  54 + -webkit-box-orient: vertical;
  55 + -webkit-line-clamp: 1;
  56 +} */
  57 +
40 58 .xc-wc {
41 59 color: #d60021;
42 60 }
... ... @@ -167,29 +185,34 @@
167 185 }
168 186  
169 187 .card_bg {
170   - display: flex;
  188 + box-sizing: border-box;
171 189 padding: 2rpx 10rpx;
172   - height: 25rpx;
173   - align-items: center;
  190 + height: 28rpx;
174 191 border-radius: 26rpx;
175   - font-size: 19rpx;
176   - line-height: 25rpx;
177   - max-width: 110rpx;
  192 + font-size: 18rpx;
  193 + line-height: 28rpx;
  194 + max-width: 210rpx;
178 195 background: #333;
179 196 color: #fff;
180   - justify-content: center;
181 197 margin-left: 8rpx;
182 198 }
183 199  
184 200 .card_bg image {
185 201 width: 19rpx;
186 202 height: 19rpx;
187   - margin-right: 1rpx;
  203 + margin-right: 8rpx;
188 204 }
189 205  
190   -.card_bg .card_name {
  206 +/* .card_bg .card_name {
191 207 max-width: 76rpx;
192 208 width: auto;
193 209 overflow: hidden;
194 210 white-space: nowrap;
  211 +} */
  212 +
  213 +.card_name {
  214 + position: relative;
  215 + top: -4rpx;
195 216 }
  217 +
  218 +
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @610a0f3
... ... @@ -3336,10 +3336,15 @@ Page({
3336 3336 context.lineTo(520 * unit, 710 * unit)
3337 3337 context.stroke();
3338 3338 //---文字---
3339   - context.setFontSize(22 * unit)
3340 3339 context.setFillStyle("black")
3341   - context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
3342   - context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);
  3340 + context.setFontSize(22 * unit)
  3341 + // 原来start --->
  3342 + context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 776 * unit);
  3343 + context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 826 * unit);
  3344 + // <--- 原来end
  3345 + // context.fillText("优惠乐翻天，精彩就在你身边", 40 * unit, 816 * unit);
  3346 + // context.setFontSize(18 * unit)
  3347 + // context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 850 * unit);
3343 3348 //---二维吗图---
3344 3349 context.drawImage(vpath, 380 * unit, 736 * unit, 120 * unit, 120 * unit);
3345 3350 break;
... ... @@ -3353,7 +3358,7 @@ Page({
3353 3358 //画秒杀的图片
3354 3359 var miaos_path = '../../../images/share/miao_share.png';
3355 3360 context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit);
3356   -
  3361 +
3357 3362 //---文字---
3358 3363 context.setFontSize(22 * unit)
3359 3364 context.setFillStyle("black")
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @610a0f3
... ... @@ -282,7 +282,7 @@
282 282 <view wx:if="{{!card_field }}">
283 283 <view class="beauty-makeup-frame flex ai-center">
284 284 <view class="left flex ai-center">
285   - <view class="flex ai-center grade-card-frame card-frame advert-card"style="max-width:32%;width:auto" >
  285 + <view class="flex ai-center grade-card-frame card-frame advert-card">
286 286 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
287 287 <view class="fs24 white view card-name ellipsis-1">{{g_filters.get_card_price(data,card_list,1)}}</view>
288 288 </view>
... ... @@ -302,7 +302,7 @@
302 302 <view wx:elif="{{is_near_date && data[card_field]>0}}">
303 303 <view class="beauty-makeup-frame flex ai-center">
304 304 <view class="left flex ai-center">
305   - <view class="flex ai-center grade-card-frame card-frame advert-card"style="max-width:32%;width:auto" >
  305 + <view class="flex ai-center grade-card-frame card-frame advert-card">
306 306 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
307 307 <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
308 308 </view>
... ...
pages/goods/goodsInfo/goodsInfo.wxss
  View file @610a0f3
... ... @@ -2547,8 +2547,9 @@ border-radius: 55rpx;
2547 2547  
2548 2548 }
2549 2549 .grade-card-frame .card-name{
2550   - margin-left: 5rpx;
2551   - max-width: 120rpx;
  2550 + margin-left: 8rpx;
  2551 + /* max-width: 120rpx; */
  2552 + max-width: 165rpx;
2552 2553 }
2553 2554 .card-effect{
2554 2555 margin-left: 15rpx;
... ...
pages/goods/goodsList/goodsList.wxml
  View file @610a0f3
... ... @@ -67,11 +67,11 @@
67 67 <block wx:if="{{card_field}}">
68 68 <!-- 等级价>0 -->
69 69 <block wx:if="{{item[card_field]>0}}">
70   - <view class="flex ai_and">
  70 + <view class="flex ai-center">
71 71 <view class="price">￥{{item[card_field]}}</view>
72   - <view class="card_bg">
  72 + <view class="card_bg ellipsis-1">
73 73 <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
74   - <view class="card_name">{{card_name}}</view>
  74 + <text class="card_name">{{card_name}}</text>
75 75 </view>
76 76 </view>
77 77 <view class="comment flex jc_sb">
... ... @@ -94,11 +94,11 @@
94 94 <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
95 95 </view>
96 96 <view class="comment flex jc_sb">
97   - <view class="flex ai_and">
  97 + <view class="flex ai-center">
98 98 <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>
99   - <view class="card_bg">
  99 + <view class="card_bg ellipsis-1">
100 100 <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
101   - {{g_filter.get_card_price(item,card_list,1)}}
  101 + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
102 102 </view>
103 103 </view>
104 104 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
... ...
pages/goods/goodsList/goodsList.wxss
  View file @610a0f3
... ... @@ -157,7 +157,7 @@
157 157 }
158 158  
159 159 .card_bg {
160   - display: flex;
  160 + /* display: flex;
161 161 max-width: 110rpx;
162 162 height: 25rpx;
163 163 align-items: center;
... ... @@ -170,21 +170,38 @@
170 170 margin-top: 7rpx;
171 171 line-height: 25rpx;
172 172 padding: 2rpx 10rpx;
173   - width: auto;
174   -}
175   -
176   -.card_bg .card_name {
  173 + width: auto; */
  174 +
  175 +
  176 + box-sizing: border-box;
  177 + padding: 2rpx 10rpx;
  178 + height: 28rpx;
  179 + border-radius: 26rpx;
  180 + font-size: 18rpx;
  181 + line-height: 28rpx;
  182 + max-width: 220rpx;
  183 + background: #333;
  184 + color: #fff;
  185 + margin-left: 8rpx;
  186 +}
  187 +
  188 +/* .card_bg .card_name {
177 189 max-width: 76rpx;
178 190 width: auto;
179 191 overflow: hidden;
180 192 white-space: nowrap;
  193 +} */
  194 +
  195 +.card_name {
  196 + position: relative;
  197 + top: -4rpx;
181 198 }
182 199  
  200 +
183 201 .card_bg image {
184 202 width: 19rpx;
185 203 height: 19rpx;
186   - margin-right: 1rpx;
187   - vertical-align: middle;
  204 + margin-right: 8rpx;
188 205 }
189 206  
190 207 .mk_price {
... ...
pages/index/index/index.js
  View file @610a0f3
... ... @@ -229,7 +229,6 @@ Page({
229 229 });
230 230 }
231 231 },
232   -
233 232 //---读取数据内容---
234 233 async init_fir() {
235 234 var th = this;
... ... @@ -245,7 +244,8 @@ Page({
245 244 for (var i = 0; i < a.length; i++) {
246 245 var tt = {
247 246 'ad_code': o.imghost + a[i].ad_code,
248   - 'media_link': ''
  247 + 'media_link': '',
  248 + 'ad_weapplink':a[i].ad_weapplink
249 249 };
250 250 arr.push(tt);
251 251 }
... ... @@ -825,6 +825,13 @@ Page({
825 825 is_disgraceful: 1
826 826 })
827 827 })
  828 + },
  829 +
  830 + go_ad:function(e){
  831 + var url=e.currentTarget.dataset.url;
  832 + if(!url || url=='') return;
  833 + if(url[0]!='/') url='/'+url;
  834 + getApp().goto(url);
828 835 }
829 836  
830 837 });
831 838 \ No newline at end of file
... ...
pages/index/index/index.wxml
  View file @610a0f3
... ... @@ -29,10 +29,10 @@
29 29 </view>
30 30 <!--滚动广告-->
31 31 <view class="rel title-img" wx:if="{{banner}}">
32   - <swiper autoplay="true" class="swiper_box" duration="1000" interval="3000" vertical="" bindchange="bannerSwiperChange" style="height:{{max_sw_height}}rpx">
33   - <swiper-item wx:for="{{banner}}" wx:key="banner">
34   - <view url="{{item.media_link}}" class="slide-image-frame">
35   - <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>
  32 + <swiper autoplay="true" class="swiper_box" duration="1000" interval="3000" vertical="" bindchange="bannerSwiperChange" style="height:{{max_sw_height}}rpx" circular="true">
  33 + <swiper-item wx:for="{{banner}}" wx:key="banner" class="swiperItem">
  34 + <view class="slide-image-frame">
  35 + <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>
36 36 </view>
37 37 </swiper-item>
38 38 </swiper>
... ...
pages/index/index/index.wxss
  View file @610a0f3
... ... @@ -65,6 +65,11 @@
65 65 height: auto;
66 66 }
67 67  
  68 +.swiperItem {
  69 + display: flex;
  70 + align-items: center;
  71 +}
  72 +
68 73 .s_prom {
69 74 width: 100%;
70 75 height: 340rpx;
... ...
pages/justTest/justTest.wxml
  View file @610a0f3
... ... @@ -15,32 +15,5 @@
15 15  
16 16  
17 17  
18   -
19   -<view class="box">
20   - <image class="img" src="{{photoUrl}}" bindtap='onPreviewImage'></image>
21   - <view class="btn">
22   - <button bindtap="onSaveToPhone" class="btn button-hover">
23   - 保存图片到手机1
24   - </button>
25   - <!-- <button wx:else bind:tap="showModal" class="btn button-hover" >
26   - 保存图片到手机2
27   - </button> -->
28   - <!-- 我们不使用点击按钮即打开设置页面的方式，而是使用上面那种先显示提示框让用户点确定按钮后再打开设置页面 -->
29   - <!-- <button wx:else bind:opensetting="onOpenSetting" open-type="openSetting" class="btn button-hover" >
30   - 保存二维码到手机
31   - </button> -->
32   - </view>
33   -</view>
34   -
35   -<button bindtap="saveImage">savepics</button>
36   -
37   -
38   -
39   -<!-- 直播组件 - -->
40   -<!-- <subscribe room-id="1"></subscribe> -->
41   -
42   -<open-data type="userAvatarUrl"></open-data>
43   -<open-data type="userNickName"></open-data>
44   -
45   -
  18 +<button bindtap="showac"></button>
46 19  
... ...
pages/user/assistance/task_assistance.js
  View file @610a0f3
... ... @@ -63,6 +63,8 @@ Page({
63 63 zltime: "", //助力时间
64 64 djs: "", //定时器的显示
65 65 //*********************************************end
  66 +
  67 + Hei: 0,
66 68 },
67 69  
68 70 /**
... ... @@ -1071,6 +1073,19 @@ Page({
1071 1073 var aitem = this.data.aitem;
1072 1074 var task_id = aitem[ind].id;
1073 1075 getApp().goto("/pages/test/zhuli_test?taskId="+task_id);
1074   - }
  1076 + },
  1077 +
  1078 +
  1079 + imgH:function(e){
  1080 +
  1081 + var winWid = wx.getSystemInfoSync().windowWidth; //获取当前屏幕的宽度
  1082 + var imgh = e.detail.height;　　　　　　　　　　　　　　　　//图片高度
  1083 + var imgw = e.detail.width;
  1084 + var swiperH = winWid*0.827*imgh/imgw + "px"　　　　　　　　　　//等比设置swiper的高度。 即 屏幕宽度 / swiper高度 = 图片宽度 / 图片高度 ==》swiper高度 = 屏幕宽度 * 图片高度 / 图片宽度
  1085 + console.log('imgload',winWid, imgh, imgw, swiperH);
  1086 + this.setData({
  1087 + Hei:swiperH　　　　　　　　//设置高度
  1088 + })
  1089 + },
1075 1090  
1076 1091 })
... ...
pages/user/assistance/task_assistance.wxml
  View file @610a0f3
... ... @@ -16,17 +16,19 @@
16 16 </view>
17 17 </view>
18 18 <!-- 图片的轮播图 -->
19   - <view class="xc-specific-more-frame flex-center">
  19 + <view class="xc-specific-more-frame flex-center" style="height:{{Hei}};">
20 20 <view bindtap="click_pre">
21 21 <view class="bg_left xc-left bcolor"></view>
22 22 </view>
23   - <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='width:82.7%; height:100%' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
  23 + <!-- <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='width:82.7%; height:100%' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}"> -->
  24 + <swiper bindanimationfinish="changeGoodsSwip" current="{{sw_index}}" style='' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}" style='width:82.7%;height: 100%;'>
24 25 <swiper-item class="rel" wx:for="{{aitem}}" wx:for-item="aitem" wx:for-index="pidx">
25 26  
26   - <image class="xc-center-img" bindtap="libao_details" data-taskid="{{aitem.id}}" src="{{aitem.giftBagUrl!=null&&aitem.giftBagUrl!=''?iurl+aitem.giftBagUrl:swpie_img}}"></image>
  27 + <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>
27 28 <view bindtap="libao_details" data-taskid="{{aitem.id}}" class="abs select_details fs26 white">礼包详情</view>
28 29  
29 30 </swiper-item>
  31 +
30 32 </swiper>
31 33  
32 34 <view bindtap="click_next">
... ...
pages/user/assistance/task_assistance.wxss
  View file @610a0f3
... ... @@ -13,7 +13,7 @@ page {
13 13 }
14 14 .top-back {
15 15 width: 100%;
16   - height:65%;
  16 + /* height:65%; */
17 17 background-repead: no-repead;
18 18 background-size: 100% 100%;
19 19 }
... ...
pages/user/index/index.wxml
  View file @610a0f3
... ... @@ -116,7 +116,7 @@
116 116 <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=2">
117 117 <image class="xc-send" src="{{iurl}}/miniapp/images/dfahuo.png?v=1"></image>
118 118 <view class="xc-word-color four-level-word">待发货</view>
119   - <text class="order-num" hidden='{{toji.wait_receive>0?"":"true"}}'>{{toji.wait_send}}</text>
  119 + <text class="order-num" hidden='{{toji.wait_send>0?"":"true"}}'>{{toji.wait_send}}</text>
120 120 </view>
121 121  
122 122 <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=3">
... ...
utils/auth.js
  View file @610a0f3
... ... @@ -51,7 +51,8 @@ module.exports = {
51 51 data: {
52 52 js_code: e,
53 53 store_id: a.globalData.setting.stoid,
54   - nickname: a.clear_word(a.globalData.getu.nickName)
  54 + nickname: a.clear_word(a.globalData.getu.nickName),
  55 + head_pic: a.clear_word(a.globalData.getu.avatarUrl)
55 56 },
56 57 success: function (e) {
57 58 console.log("openidandkey");
... ...
utils/util.js
  View file @610a0f3
... ... @@ -232,7 +232,7 @@ function measureText(text, fontSize = 10) {
232 232  
233 233 //验证手机号
234 234 function check_mobile(phoneMobile){
235   - var myreg = /^(((13[0-9]{1})|(15[0-9]{1})|(18[0-9]{1})|(17[0-9]{1}))+\d{8})$/;
  235 + 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})$/;
236 236 var ob={code:1};
237 237 if (phoneMobile.length === 0) {
238 238 ob.title='输入的手机号为空';
... ...