Commit 1d600ef464ed6ac229316cb160d0fbe9c0020e2b
1 parent
ce17aaa1
注册的优化
Showing
4 changed files
with
10 additions
and
2 deletions
packageA/pages/profile/profile.wxml
... | ... | @@ -174,7 +174,7 @@ |
174 | 174 | |
175 | 175 | <!-- 保存按钮 --> |
176 | 176 | <view class="confirm"> |
177 | - <view class="fs30 confirmtext" bindtap="save">保存</view> | |
177 | + <view class="fs30 confirmtext {{loading?'gray':''}}" bindtap="save">保存</view> | |
178 | 178 | <view class="star fs24 t-c pdt10 c9" wx:if="{{couponInfo}}">保存成功即可获得一张{{couponInfo}}</view> |
179 | 179 | <view class="star fs24 t-c pdt10 c9" wx:if="{{libao}}">保存成功即可获得一个{{libao}}</view> |
180 | 180 | </view> | ... | ... |
packageA/pages/profile/profile.wxss
pages/cart/cart2/cart2.js
... | ... | @@ -3056,6 +3056,7 @@ Page({ |
3056 | 3056 | //处理代发商品的拆分 |
3057 | 3057 | if(df_goods.length>0 && item.order_goods.length>0 ){ |
3058 | 3058 | var df_item=JSON.parse(JSON.stringify(item)); |
3059 | + | |
3059 | 3060 | item.goods_price= parseFloat(item.goods_price-df_price).toFixed(2); |
3060 | 3061 | item.total_amount= parseFloat(item.total_amount-df_price).toFixed(2); |
3061 | 3062 | |
... | ... | @@ -3065,6 +3066,8 @@ Page({ |
3065 | 3066 | df_item.total_amount=df_price; |
3066 | 3067 | df_item.shipping_price=0; //没有运费 |
3067 | 3068 | if(df_item.order_prom_list) df_item.order_prom_list={}; |
3069 | + if(df_item.coupon_price) delete(df_item.coupon_price); | |
3070 | + if(df_item.coupon_no) delete(df_item.coupon_no); | |
3068 | 3071 | |
3069 | 3072 | //看一下是用余额比较多,还是用钱比较多 |
3070 | 3073 | if(item.order_amount>item.user_money){ | ... | ... |
utils/util.js