wxd / MShopWeApp

Commit 967bea42acf1d01498f064d93aa66c16c7a535e4

Authored by 后端研发-苏明海
2 parents 7c57779e aa559957

Merge branch 'dev' into 'test' 

Dev

See merge request !517
Inline Side-by-side
Showing 21 changed files with 217 additions and 88 deletions
components/goods_list/g_filter.wxs
  View file @967bea4
... ... @@ -59,7 +59,7 @@ var g_filters = {
59 59 }
60 60  
61 61 if(type==0) return min_price;
62   - if(min_name.length>7 ) min_name=min_name.substring(0, 8);
  62 + if(min_name.length>4 ) min_name=min_name.substring(0, 8);
63 63 return min_name;
64 64 },
65 65 }
... ...
components/goods_list/goods_list.js
  View file @967bea4
... ... @@ -62,7 +62,7 @@ Component({
62 62 //--- 判断是等级会员，且在有效期范围内 ---
63 63 if (user.card_field && now < end) {
64 64 var card_name = ob.name_map.get(user.card_field);
65   - if (card_name.length > 6) card_name = card_name.substring(0, 6);
  65 + if (card_name.length > 4) card_name = card_name.substring(0, 8);
66 66 th.setData({
67 67 card_field: user.card_field,
68 68 card_name: card_name,
... ...
custom-tab-bar/index.wxml
  View file @967bea4
1 1 <!-- 如果是自定义的话 -->
2   -<view class="main_bar" style=" background: {{backgroundColor}}; font-size: 30rpx;">
  2 +<view class="main_bar" style=" background: {{backgroundColor}}; font-size: 23rpx;">
3 3 <block wx:for="{{list}}" wx:for-index="idx">
4 4 <view data-url="{{item.weappurl}}" bindtap="nav_goto" class="tabbar_item" data-act="{{active==idx?1:0}}"
5 5 style="width:{{100 / list.length}}%;color: {{active==idx?fontcolor_sele:fontcolor}};">
6 6 <view wx:if="{{item.nav_name=='购物车'}}" class="cart_num" >{{cartGoodsNum}} </view>
7   - <view class="tab_img" style="margin-top: 10rpx;">
  7 + <view class="tab_img" style="margin-top: 6rpx;">
8 8 <view class="nav_imgage" style="background-image: url({{active==idx?item.src_sele:item.src}});"></view>
9 9 </view>
10   - <view style="height:20px;line-height:15px; margin-top: 10rpx;">
  10 + <view style="height:20px;line-height:15px; margin-top: 2rpx;">
11 11 {{item.nav_name}}
12 12 </view>
13 13 </view>
... ...
custom-tab-bar/index.wxss
  View file @967bea4
... ... @@ -6,7 +6,7 @@
6 6 }
7 7 .tab_img{display: flex; justify-content: center;align-items: center}
8 8 .nav_imgage{
9   - height: 54rpx; width: 54rpx;background-position: center;background-repeat: no-repeat;background-size: auto 85%;
  9 + height: 58rpx; width: 58rpx;background-position: center;background-repeat: no-repeat;background-size: auto 92%;
10 10 }
11 11 .cart_num{
12 12 top:0;background-color: red;color: #fff;font-size: 20rpx;border-radius: 50%;width: 40rpx;line-height:40rpx;height: 40rpx;position: absolute;z-index: 100;right:30rpx;
... ...
pages/cart/cart/cart.wxss
  View file @967bea4
... ... @@ -142,7 +142,7 @@ radio {
142 142 height: 110rpx;
143 143 position: fixed;
144 144 left: 0;
145   - bottom: 130rpx;
  145 + bottom: 110rpx;
146 146 font-size: 28rpx;
147 147 color: #666;
148 148 background-color: rgb(255, 255, 255);
... ...
pages/cart/cart2/cart2.js
  View file @967bea4
... ... @@ -393,7 +393,7 @@ Page({
393 393 if (arr[j].pickup_id == pcid) {
394 394 arr[j].goods.push(item);
395 395 //-- 把等级卡会优惠多少钱装进去 --
396   - if(item.cut_price) arr[j].card_cut_price+=arr[j].cut_price;
  396 + if(item.cut_price) arr[j].card_cut_price+=item.cut_price;
397 397 find = 1;break;
398 398 }
399 399 }
... ...
pages/goods/categoryList/categoryList.wxml
  View file @967bea4
... ... @@ -457,11 +457,11 @@
457 457 <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
458 458 </view>
459 459 <view class="comment flex jc_sb">
460   - <view class="flex ai_and">
  460 + <view class="flex ai-center">
461 461 <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>
462   - <view class="card_bg">
  462 + <view class="card_bg flex ai-center">
463 463 <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
464   - {{g_filter.get_card_price(item,card_list,1)}}
  464 + <text>{{g_filter.get_card_price(item,card_list,1)}}</text>
465 465 </view>
466 466 </view>
467 467 </view>
... ...
pages/goods/categoryList/g_filter.wxs
  View file @967bea4
... ... @@ -81,7 +81,7 @@ var g_filters = {
81 81 //-- 获取最下价钱，和相应的卡的名称 --
82 82 if(type==0) return min_price.toFixed(2);
83 83  
84   - if(min_name.length>7) min_name=min_name.substring(0, 8);
  84 + if(min_name.length>4) min_name=min_name.substring(0, 8);
85 85 return min_name;
86 86 },
87 87 }
... ...
pages/goods/goodsInfo/g_filter.wxs
  View file @967bea4
... ... @@ -77,7 +77,7 @@ var g_filters = {
77 77 //min_price=min.price;
78 78 //min_name=min.name;
79 79 if(type==0) return min_price.toFixed(2);
80   - if(min_name.length>7) min_name=min_name.substring(0, 8);
  80 + if(min_name.length>4) min_name=min_name.substring(0, 8);
81 81 return min_name;
82 82 },
83 83 }
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @967bea4
... ... @@ -291,8 +291,8 @@
291 291 </view>
292 292 </view>
293 293 <view class="right flex jc-center ai-center" bindtap="go_plus">
294   - <view class="at_once_carde xc-black3 fs28">立即开卡</view>
295   - <view class="bg_right"></view>
  294 + <view class="at_once_carde xc-black3 fs28">立即开卡</view>
  295 + <view class="bg_right"></view>
296 296 </view>
297 297  
298 298 </view>
... ... @@ -480,7 +480,7 @@
480 480  
481 481 <view class="bz_view flex ai-center" wx:if="{{bconfig}}" style="line-height: 36rpx">
482 482 <image class="bzfu_img" src="{{iurl}}/miniapp/images/bzfu_w.png"></image>
483   - <view>{{bconfig.service_bz}}</view>
  483 + <view class="bz-content">{{bconfig.service_bz}}</view>
484 484 </view>
485 485  
486 486  
... ...
pages/goods/goodsInfo/goodsInfo.wxss
  View file @967bea4
... ... @@ -948,7 +948,7 @@ left:31rpx;}
948 948 .item_right text{ margin-left: 66rpx;}
949 949  
950 950 .bzfu_img{ width: 164rpx; height:34rpx; margin-right: 18rpx; margin-left: 12rpx }
951   - .bz_view{ height:100rpx; padding: 0 13rpx; color: #333; font-size: 28rpx;
  951 + .bz_view{ height:100rpx; padding: 0 34rpx 0 13rpx; color: #333; font-size: 28rpx;
952 952 border-bottom: 3rpx solid #eee; border-top: 3rpx solid #eee; }
953 953 .bz_view view{ width: 460rpx; max-height: 70rpx; overflow: hidden;}
954 954  
... ... @@ -963,6 +963,11 @@ left:31rpx;}
963 963 }
964 964 .bg_jj.down1{transform: rotate(135deg);}
965 965  
  966 +.bz-content {
  967 + flex-grow: 1;
  968 + text-align: justify;
  969 +}
  970 +
966 971 /* 顶部边框 */
967 972 .topframe{
968 973 width: 100%;
... ...
pages/goods/goodsList/g_filter.wxs
  View file @967bea4
... ... @@ -76,7 +76,7 @@ var g_filters = {
76 76 //-- 获取最下价钱，和相应的卡的名称 --
77 77 if(type==0) return min_price.toFixed(2);
78 78  
79   - if(min_name.length>7) min_name=min_name.substring(0, 8);
  79 + if(min_name.length>4) min_name=min_name.substring(0, 8);
80 80 return min_name;
81 81 },
82 82 }
... ...
pages/goods/search/search.wxss
  View file @967bea4
... ... @@ -285,6 +285,10 @@
285 285 white-space: nowrap;
286 286 } */
287 287  
  288 +.navigator-hover {
  289 + opacity: 1;
  290 +}
  291 +
288 292 .mk_price {
289 293 margin-left: 10rpx;
290 294 font-size: 25rpx;
... ...
pages/user/assistance/assistance.js
  View file @967bea4
... ... @@ -28,6 +28,11 @@ Page({
28 28 timer: "", //任务列表的定时器
29 29 s_num: "", //多少人已经领取任务
30 30 page: 1, //我的任务的当前页
  31 +
  32 + imageUrl:'',
  33 + btn_color:'',
  34 + bg_color:'',
  35 + font_color:'',
31 36 },
32 37  
33 38 /**
... ... @@ -57,6 +62,21 @@ Page({
57 62 // 助力活动
58 63 this.assistance();
59 64 },
  65 +
  66 + print() {
  67 + var user_id = getApp().globalData.user_id;
  68 + var store_id = os.stoid;
  69 +
  70 + getApp().request.promiseGet("/api/weshop/marketing/help/act/judge", {
  71 + data: {
  72 + storeId: store_id,
  73 + userId: user_id
  74 + }
  75 + }).then(res => {
  76 + console.log('res', res);
  77 + });
  78 + },
  79 +
60 80 // 助力活动
61 81 assistance() {
62 82 var th = this;
... ... @@ -74,7 +94,11 @@ Page({
74 94 help_data.remark = help_data.remark.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display：block"');
75 95 th.setData({
76 96 zl_act: help_data,
77   - help_id: help_data.id
  97 + help_id: help_data.id,
  98 + btn_color: help_data.btn_color,
  99 + bg_color: help_data.bg_color,
  100 + font_color: help_data.font_color,
  101 + imageUrl: help_data.imageUrl,
78 102 });
79 103 if (th.data.help_id != "" && th.data.help_id != null) {
80 104 //我的任务
... ...
pages/user/assistance/assistance.wxml
  View file @967bea4
1 1 <wxs module="filter" src="c_filter.wxs"></wxs>
2 2 <wxs module="filter_s" src="../../../utils/filter.wxs"></wxs>
3   -<view class="page" bindtap="close">
  3 +<view class="page" bindtap="close" style="background-color:#{{bg_color ? bg_color:'d01119'}};">
4 4 <!-- 背景图片 -->
5   - <image class="lumi" src="{{iurl+'miniapp/images/friendhelp/lumi.png'}}" lazy-load="true"></image>
6   - <view class="zindex">
  5 + <image wx:if="{{!(imageUrl)}}" class="lumi" src="{{iurl+'miniapp/images/friendhelp/lumi.png'}}" lazy-load="true"></image>
  6 +
  7 + <view class="zindex" style="color:#{{font_color ? font_color:'black'}};background-color:#{{bg_color ? bg_color:'d01119'}};">
7 8 <view class="top">
8   - <view class="flex-center">
9   - <image class="getgift" src="{{iurl+'miniapp/images/friendhelp/getgift.png'}}" lazy-load="true"></image>
10   - </view>
11   - <view class="flex-center fs32">
12   - <view class="excitation">机会总是留给最有行动力的人</view>
13   - </view>
14   - <view class="flex-center">
15   - <image class="gift" src="{{zl_act.imageUrl==''?iurl+'miniapp/images/friendhelp/gift.png':iurl+zl_act.imageUrl}}" lazy-load="true"></image>
16   - </view>
17   - <view wx:if="{{zl_act.beginDate && zl_act.endDate}}" class="flex-center fs26 time">
18   - <view>活动时间：{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}</view>
19   -
20   - </view>
21   - <view class="flex-center" bindtap="go_task">
22   - <view class="flex-center take">
  9 + <!-- 上传主图的情况 -->
  10 + <view class="bg-img" wx:if="{{imageUrl}}"></view>
  11 + <!-- 没有上传主图的情况 -->
  12 + <block wx:else>
  13 + <view class="flex-center">
  14 + <image class="getgift" src="{{iurl+'miniapp/images/friendhelp/getgift.png'}}" lazy-load="true"></image>
  15 + </view>
  16 + <view class="flex-center fs32">
  17 + <view class="excitation" style="color:{{font_color ? ('#'+font_color):'white'}};">机会总是留给最有行动力的人</view>
  18 + </view>
  19 + <view class="flex-center">
  20 + <image class="gift" src="{{zl_act.imageUrl==''?iurl+'miniapp/images/friendhelp/gift.png':iurl+zl_act.imageUrl}}" lazy-load="true"></image>
  21 + </view>
  22 + <view wx:if="{{zl_act.beginDate && zl_act.endDate}}" class="flex-center fs26 time">
  23 + <view style="color:{{font_color ? ('#'+font_color):'white'}};">活动时间：{{filter_s.format_time(zl_act.beginDate,0)}} 至 {{filter_s.format_time(zl_act.endDate,0)}}</view>
  24 + </view>
  25 + </block>
  26 +
  27 + <view class="flex-center btn-get" bindtap="go_task">
  28 + <view class="flex-center take" style="color:{{font_color?('#'+font_color):'white'}};background-color: #{{btn_color? btn_color:'FDC107'}};">
23 29 <view>立即领取</view>
24 30 </view>
25 31 </view>
26 32 </view>
  33 +
  34 +
27 35  
28 36 <!-- 任务及说明栏 -->
29   - <view>
  37 + <view class="task-container">
30 38 <!-- 标题 -->
31   - <view class="flex-vertical-between fs28 padding head">
  39 + <view class="flex-vertical-between fs28 padding head"
  40 + style="color:{{font_color ? ('#'+font_color):'white'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
32 41 <!-- task -->
33   - <view class="flex-center lhead {{switch_head==0?'rhead':''}}" bindtap="switch_head" data-index="{{0}}">
  42 + <view class="flex-center lhead"
  43 + style="background-color:{{switch_head==0?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};"
  44 + bindtap="switch_head" data-index="{{0}}">
34 45 <image class="explain" src="{{iurl+'miniapp/images/friendhelp/task.png'}}" lazy-load="true"></image>
35 46 <view>我的任务</view>
36 47 </view>
37   - <view class="flex-center lhead {{switch_head==1?'rhead':''}}" bindtap="switch_head" data-index="{{1}}">
  48 + <view class="flex-center lhead"
  49 + style="background-color:{{switch_head==1?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};"
  50 + bindtap="switch_head" data-index="{{1}}">
38 51 <image class="explain" src="{{iurl+'miniapp/images/friendhelp/explain.png'}}" lazy-load="true"></image>
39 52 <view>活动说明</view>
40 53 </view>
41 54 </view>
42 55  
43 56 <!-- 我的任务 -->
44   - <view wx:if="{{switch_head==0}}" class="white">
45   - <view class="items">
  57 + <view wx:if="{{switch_head==0}}" class="task-content">
  58 + <view class="items" style="color:{{font_color ? ('#'+font_color):'white'}};">
46 59 <view class="tesk_list">
47 60 <view class="item fs26 flex-vertical-between padding" wx:for="{{zl_user_list}}">
48 61 <view class="flex-center width">
... ... @@ -74,10 +87,10 @@
74 87  
75 88  
76 89 <view class="fs30" style="margin-top: 30rpx;">
77   - <view class="flex-center nothing" wx:if="{{is_load && zl_user_list.length==0}}">
  90 + <view class="flex-center nothing" wx:if="{{is_load && zl_user_list.length==0}}" style="color:{{font_color ? ('#'+font_color):'white'}}">
78 91 <view>暂无任务记录</view>
79 92 </view>
80   - <view class="flex-center receive" wx:if="{{is_load && s_num}}">
  93 + <view class="flex-center receive" wx:if="{{is_load && s_num}}" style="color:{{font_color ? ('#'+font_color):'white'}}">
81 94 <view class="flex-center ai-bas">
82 95 <view>该活动已被领取了{{s_num}}次</view>
83 96 </view>
... ... @@ -89,7 +102,7 @@
89 102 <!-- 活动说明 -->
90 103 <view wx:if="{{switch_head}}" class="white">
91 104 <view class="items">
92   - <view class="content fs28 padding">
  105 + <view class="content fs28 padding" style="color:{{font_color ? ('#'+font_color):'white'}}">
93 106 <block wx:if="{{zl_act.remark!=''}}">
94 107 <rich-text nodes="{{zl_act.remark}}" style="word-break:break-all;word-wrap:break-word"></rich-text>
95 108 </block>
... ...
pages/user/assistance/assistance.wxss
  View file @967bea4
1 1 page {
2   - background-color: rgb(208, 17, 25);
3   - width: 100%;
4   - height: 100%;
  2 + /* background-color: rgb(208, 17, 25); */
  3 + /* width: 100%;
  4 + height: 100%; */
  5 +
  6 +}
  7 +
  8 +.page {
  9 + height: 100vh;
  10 +}
  11 +
5 12  
  13 +.bg-img {
  14 + background: url("https://mshopimg.yolipai.net/public/upload/newpeoplegift/temp/2020/09-26/75640123e5ae953e416527134a6fc477.jpg") no-repeat center center;
  15 + background-size: 100% 100%;
6 16 }
7 17  
8 18 .lumi {
9 19 position: absolute;
10 20 z-index: 0;
11 21 width: 100%;
12   - height: 1100rpx;
  22 + height: 800rpx;
13 23 }
14 24  
15 25 .zindex {
16   - position: absolute;
17   - z-index: 1;
18   - width: 100%;
  26 + /* position: absolute; */
  27 + /* z-index: 1;
  28 + width: 100%; */
19 29 }
20 30  
21 31 .top {
22   - padding-bottom: 75rpx;
  32 + box-sizing: border-box;
  33 + height: 1000rpx;
  34 + /* padding-bottom: 75rpx; */
  35 + /* background: url("https://mshopimg.yolipai.net/public/upload/newpeoplegift/temp/2020/09-26/75640123e5ae953e416527134a6fc477.jpg") no-repeat center center;
  36 + background-size: 100% 100%; */
  37 + position: relative;
  38 +}
  39 +
  40 +.bg-img {
  41 + width: 100%;
  42 + height: 100%;
  43 +}
  44 +
  45 +.btn-get {
  46 + position: absolute;
  47 + width: 100%;
  48 + bottom: 75rpx;
23 49 }
24 50  
25 51 .getgift {
26   - width: 610rpx;
27   - height: 130rpx;
28   - padding-top: 70rpx;
  52 + width: 600rpx;
  53 + height: 100rpx;
  54 + padding-top: 60rpx;
29 55 }
30 56  
31 57 .excitation {
... ... @@ -42,7 +68,7 @@ page {
42 68 .time {
43 69 color: rgb(255, 255, 255);
44 70 margin-bottom: 55rpx;
45   - text-decoration: underline;
  71 + /* text-decoration: underline; */
46 72 margin-top: 10rpx;
47 73 }
48 74  
... ... @@ -54,8 +80,20 @@ page {
54 80 border-radius: 45rpx;
55 81 font-weight: 900;
56 82 line-height: 77rpx;
57   - box-shadow: 0rpx 7rpx 0rpx 0rpx rgb(245, 119, 6);
  83 + box-shadow: 0rpx 7rpx 0rpx 0rpx rgba(0, 0, 0, .2);
58 84 font-size: 38rpx;
  85 +
  86 + -webkit-animation: free_download 500ms linear alternate infinite;
  87 + animation: free_download 500ms linear alternate infinite;
  88 +}
  89 +
  90 +@-webkit-keyframes free_download{
  91 + 0%{-webkit-transform:scale(0.9);}
  92 + 100%{-webkit-transform:scale(1);}
  93 +}
  94 +@keyframes free_download{
  95 + 0%{transform:scale(0.9);}
  96 + 100%{transform:scale(1);}
59 97 }
60 98  
61 99 .head {
... ... @@ -69,7 +107,8 @@ page {
69 107 border-top: 4rpx solid rgb(253, 193, 7);
70 108 border-left: 4rpx solid rgb(253, 193, 7);
71 109 border-right: 4rpx solid rgb(253, 193, 7);
72   - width: 290rpx;
  110 + /* width: 290rpx; */
  111 + width: 50%;
73 112 height: 50rpx;
74 113 line-height: 50rpx;
75 114 }
... ... @@ -90,7 +129,7 @@ page {
90 129 }
91 130  
92 131 .padding {
93   - padding: 0rpx 50rpx;
  132 + /* padding: 0rpx 50rpx; */
94 133 }
95 134  
96 135 .content {
... ... @@ -138,4 +177,14 @@ page {
138 177 max-height: 335rpx;
139 178 overflow: hidden;
140 179 overflow-y:auto;
  180 +}
  181 +
  182 +
  183 +.task-container {
  184 + padding: 40rpx 40rpx 60rpx;
  185 +}
  186 +.task-content {
  187 + /* background-color: rgba(0,0,0,.3);
  188 + border-bottom-left-radius: 12rpx;
  189 + border-bottom-right-radius: 12rpx; */
141 190 }
142 191 \ No newline at end of file
... ...
pages/user/assistance/task_assistance.js
  View file @967bea4
... ... @@ -66,6 +66,12 @@ Page({
66 66  
67 67 // Hei: 0,
68 68 max_sw_height: 0,
  69 +
  70 +
  71 + imageUrl:'',
  72 + btn_color:'',
  73 + bg_color:'',
  74 + font_color:'',
69 75 },
70 76  
71 77 /**
... ... @@ -163,6 +169,11 @@ Page({
163 169 var help_data = res.data.data;
164 170 th.setData({
165 171 endDate: help_data.endDate,
  172 +
  173 + btn_color: help_data.btn_color,
  174 + bg_color: help_data.bg_color,
  175 + font_color: help_data.font_color,
  176 + imageUrl: help_data.imageUrl,
166 177 });
167 178  
168 179 //任务时间 设置全局定时器
... ...
pages/user/assistance/task_assistance.wxml
  View file @967bea4
1 1 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
2   -<view class="top-back" style="padding-bottom:80rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close">
  2 +<view class="top-back" style="background-color:#{{bg_color ? bg_color:'d01119'}};padding-bottom:80rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close">
3 3 <!-- <view class="top-back" style="padding-bottom:{{is_user_task!=null&&is_user_task.status==0?50:0}}rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close"> -->
4 4 <!-- 助力活动头部 -->
5 5 <view class="top-frame">
6 6 <view class="flex-center">
7   - <view class="top-title white fs36 t-c ellipsis-1">
  7 + <view class="top-title white fs36 t-c ellipsis-1" style="color:{{font_color ? ('#'+font_color):'white'}};">
8 8 {{aitem[sw_index].helpTaskName}}
9 9 </view>
10 10 </view>
11   - <view class="activity-data t-c fs28 white">
  11 + <view class="activity-data t-c fs28" style="color:{{font_color ? ('#'+font_color):'white'}};">
12 12 活动剩余时间:
13 13 <block wx:if="{{aitem[0].djs.day}}"><text class='tui-conutdown-box'> {{aitem[0].djs.day}}天 </text></block>
14 14 <text class='tui-conutdown-box'>{{aitem[0].djs.hou}}</text>:
... ... @@ -45,17 +45,20 @@
45 45 <text class="white fs24">{{is_user_task.zlHelpNum}}/{{is_user_task.helpNum}}</text>
46 46  
47 47 </view>
48   - <view class="task-number fs28 white t-c ">
  48 + <view class="task-number fs28 t-c" style="color:{{font_color ? ('#'+font_color):'white'}};">
49 49 今天剩余可领{{task_number}}个任务
50 50 </view>
51 51  
52   - <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center" data-taskid="{{taskid}}" bindtap="add_onlicke">
  52 + <view wx:if="{{is_user_task==null}}" class="task_clike fs40 t-c flex-center" data-taskid="{{taskid}}" bindtap="add_onlicke"
  53 + style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
53 54 就选它了
54 55 </view>
55   - <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share">
  56 + <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share"
  57 + style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
56 58 好友拆一拆
57 59 </view>
58   - <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskingid="{{is_user_task.id}}" bindtap="redeem_now">
  60 + <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskingid="{{is_user_task.id}}" bindtap="redeem_now"
  61 + style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};">
59 62 立即兑换
60 63 </view>
61 64  
... ... @@ -66,22 +69,24 @@
66 69  
67 70 </view>
68 71 <!-- 底部列表 -->
69   -<view>
  72 +<view style="background-color:#{{bg_color ? bg_color:'d01119'}}">
70 73 <!-- <view style="margin-top:{{is_user_task!=null?52:0}}rpx"> -->
71 74 <!-- 标题 -->
72 75  
73   - <view class="flex-vertical-between fs28 padding head">
74   - <view class="flex-center lhead {{switch_head==0?'rhead':''}}" bindtap="user_task_list_click" data-index="0">
  76 + <view class="flex-vertical-between fs28 padding head" style="color:#{{font_color ? font_color:'white'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
  77 + <view class="flex-center lhead" bindtap="user_task_list_click" data-index="0"
  78 + style="background-color:{{switch_head==0?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
75 79 <image class="unfinished" src="{{iurl}}miniapp/images/friendhelp/task.png" lazy-load="true"></image>
76 80 <view>我的任务</view>
77 81 </view>
78   - <view class="flex-center lhead {{switch_head==1?'rhead':''}}" bindtap="dismantle_record_click" data-index='1'>
  82 + <view class="flex-center lhead" bindtap="dismantle_record_click" data-index='1'
  83 + style="background-color:{{switch_head==1?(btn_color ? ('#'+btn_color):'#FDC107'):'transparent'}};border-color:{{btn_color ? ('#'+btn_color):'#FDC107'}};">
79 84 <image class="unfinished" style="margin-top: 5rpx;" src="{{iurl}}miniapp/images/friendhelp/edit.png" lazy-load="true"></image>
80 85 <view>帮拆记录</view>
81 86 </view>
82 87 </view>
83 88  
84   - <view class="white">
  89 + <view style="color:{{font_color ? ('#'+font_color):'white'}}">
85 90  
86 91 <view class="items" wx:if="{{is_task==0}}">
87 92 <view class="tesk_list">
... ... @@ -101,7 +106,7 @@
101 106 </view>
102 107  
103 108 <view class="fs30" wx:if="{{user_task_list==null || user_task_list==''}}">
104   - <view class="flex-center nothing white">
  109 + <view class="flex-center nothing">
105 110 <view>暂无任务记录</view>
106 111 </view>
107 112 </view>
... ... @@ -111,7 +116,7 @@
111 116 </view>
112 117  
113 118  
114   - <view class="items" wx:if="{{is_task==1}}">
  119 + <view class="items" wx:if="{{is_task==1}}" style="color:{{font_color ? ('#'+font_color):'white'}};">
115 120 <block wx:if="{{ dismantle!=null|| dismantle!=''}}">
116 121  
117 122 <view class="tesk_list">
... ... @@ -133,7 +138,7 @@
133 138 </block>
134 139  
135 140 <view class="fs30" wx:if="{{dismantle==null|| dismantle==''}}">
136   - <view class="flex-center nothing white">
  141 + <view class="flex-center nothing">
137 142 <view>暂无任务记录</view>
138 143 </view>
139 144 </view>
... ... @@ -143,16 +148,16 @@
143 148  
144 149 </view>
145 150 <!-- 加载更多 -->
146   -<view class="fs32">
  151 +<view class="fs32" style="background-color:#{{bg_color ? bg_color:'d01119'}};color:{{font_color ? ('#'+font_color):'white'}};">
147 152 <view class="flex-center" wx:if="{{is_show==1&&is_user_list==0}}">
148 153 <view class="line"></view>
149   - <view class="load white" bindtap="task_list">点击加载更多</view>
  154 + <view class="load" bindtap="task_list">点击加载更多</view>
150 155 <view class="line"></view>
151 156 </view>
152   - <view class="flex-center white bottom" wx:if="{{usercount>0}}">
  157 + <view class="flex-center bottom" wx:if="{{usercount>0}}">
153 158 <view>该任务已被领取了{{usercount}}次</view>
154 159 </view>
155   - <view class="flex-center white bottom" wx:else>
  160 + <view class="flex-center bottom" wx:else>
156 161 <view>暂无领取记录</view>
157 162 </view>
158 163 </view>
... ...
pages/user/assistance/task_assistance.wxss
  View file @967bea4
1 1 page {
2   - background: #d01119;
  2 + /* background: #d01119; */
3 3 width: 100%;
4 4 height: 100%;
5 5  
... ... @@ -13,7 +13,7 @@ page {
13 13 }
14 14 .top-back {
15 15 width: 100%;
16   - /* height:65%; */
  16 + /* height:100vh; */
17 17 background-repead: no-repead;
18 18 background-size: 100% 100%;
19 19 padding-bottom: 50rpx;
... ... @@ -55,7 +55,7 @@ page {
55 55 color: #d01119;
56 56 line-height: 65rpx;
57 57 letter-spacing: 5rpx;
58   - box-shadow: 0rpx 7rpx 0rpx 0rpx rgb(245, 119, 6);
  58 + box-shadow: 0rpx 7rpx 0rpx 0rpx rgba(0, 0, 0, .2);
59 59 }
60 60  
61 61 /* 底部列表样式 */
... ... @@ -235,8 +235,8 @@ line-height: 48rpx;
235 235  
236 236 }
237 237 .bottom{
238   - margin-bottom: 50rpx;
239   - margin-top: 20rpx;
  238 + padding-bottom: 50rpx;
  239 + padding-top: 20rpx;
240 240 }
241 241  
242 242 .rel {
... ...
pages/user/order_detail/order_detail.js
  View file @967bea4
... ... @@ -751,6 +751,7 @@ Page({
751 751 b_item.price=good.shop_price;
752 752 b_item.goods_sn=good.goods_sn;
753 753 b_item.sku=good.sku;
  754 + b_item.is_integral_normal=g_item.is_integral_normal;
754 755  
755 756 //--判断商品当前的活动情况--
756 757 switch(good.prom_type){
... ... @@ -1016,6 +1017,14 @@ Page({
1016 1017 newd['guide_id']=g_item.guide_id;
1017 1018 newd['guide_type']=g_item.guide_type;
1018 1019 }
  1020 +
  1021 + if(g_item.is_integral_normal){
  1022 + newd['is_integral_normal']=g_item.is_integral_normal;
  1023 + }
  1024 + if(g_item.is_pd_normal){
  1025 + newd['is_pd_normal']=g_item.is_pd_normal;
  1026 + }
  1027 +
1019 1028  
1020 1029 var b_cart_goods=null;
1021 1030 await getApp().request.promiseGet("/api/weshop/cart/page", {
... ...
pages/user/order_list/order_list.js
  View file @967bea4
... ... @@ -835,20 +835,21 @@ Page({
835 835 b_item.pickup_id=item.pickup_id;
836 836 b_item.price=good.shop_price;
837 837 b_item.goods_sn=good.goods_sn;
838   - b_item.sku=good.sku;
  838 + b_item.sku=good.sku;
  839 + b_item.is_integral_normal=g_item.is_integral_normal;
839 840  
840 841 //--判断商品当前的活动情况--
841 842 switch(good.prom_type){
842 843 case 1:
843 844 var flash=null;
844   - getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + good.prom_id, {
  845 + await getApp().request.promiseGet("/api/ms/flash_sale/get/" + os.stoid + "/" + good.prom_id, {
845 846 }).then(res=>{
846 847 if (res.data.code== 0) {
847 848 flash=res.data.data;
848 849 }
849 850 })
850 851 //----已经结束-----
851   - if (flash && flash.is_end == 0 && flash.end_time > timestamp && flash.start_time > timestamp ) {
  852 + if (flash && flash.is_end == 0 && flash.end_time>timestamp && flash.start_time<timestamp ) {
852 853 prom=flash;
853 854 b_item.price=prom.price; //
854 855 }
... ... @@ -1101,6 +1102,14 @@ Page({
1101 1102 newd['guide_id']=g_item.guide_id;
1102 1103 newd['guide_type']=g_item.guide_type;
1103 1104 }
  1105 +
  1106 + if(g_item.is_integral_normal){
  1107 + newd['is_integral_normal']=g_item.is_integral_normal;
  1108 + }
  1109 + if(g_item.is_pd_normal){
  1110 + newd['is_pd_normal']=g_item.is_pd_normal;
  1111 + }
  1112 +
1104 1113  
1105 1114 var b_cart_goods=null;
1106 1115 await getApp().request.promiseGet("/api/weshop/cart/page", {
... ...