Commit 469735186b47a55c82d567b4d0e585ace5ded11a
1 parent
1fb893ca
注释的代码--清理
Showing
4 changed files
with
1 additions
and
85 deletions
pages/user/address_list/address_list.js
| @@ -80,15 +80,6 @@ Page({ | @@ -80,15 +80,6 @@ Page({ | ||
| 80 | /*-----选择地址返回确认------*/ | 80 | /*-----选择地址返回确认------*/ |
| 81 | selectAddress: function (e) { | 81 | selectAddress: function (e) { |
| 82 | if (null != this.data.operate) { | 82 | if (null != this.data.operate) { |
| 83 | - /*---- | ||
| 84 | - if ("select" == this.data.operate) wx.setStorageSync("cart:cart2:address_id", e.currentTarget.dataset.item.address_id); else if ("teamSelect" == this.data.operate) wx.setStorageSync("team:confirm:address_id", e.currentTarget.dataset.item.address_id); else if ("selectAddress" == this.data.operate) { | ||
| 85 | - var t = { | ||
| 86 | - address: e.currentTarget.dataset.item.province_name + e.currentTarget.dataset.item.city_name + e.currentTarget.dataset.item.district_name, | ||
| 87 | - district: e.currentTarget.dataset.item.district | ||
| 88 | - }; | ||
| 89 | - wx.setStorageSync("goodsInfo:goodsInfo:address", t); | ||
| 90 | - }---*/ | ||
| 91 | - | ||
| 92 | oo.baddr = e.currentTarget.dataset.item; | 83 | oo.baddr = e.currentTarget.dataset.item; |
| 93 | wx.navigateBack(); | 84 | wx.navigateBack(); |
| 94 | } | 85 | } |
pages/user/address_list/address_list.wxml
| 1 | -<!-- <view class="container"> | ||
| 2 | - <view class="address-box" wx:for="{{addresses}}" wx:key="{{index}}"> | ||
| 3 | - <view class="address-user"> | ||
| 4 | - <view class="user-name">{{item.consignee}}</view> | ||
| 5 | - <text class="default" wx:if="{{item.is_default}}">默认</text> | ||
| 6 | - </view> | ||
| 7 | - <view bindtap="selectAddress" class="address-info" data-item="{{item}}"> | ||
| 8 | - <view class="mobile">电话:{{item.mobile}}</view> | ||
| 9 | - <view class="address">{{item.more_address}} {{item.address}}</view> | ||
| 10 | - </view> | ||
| 11 | - <view bindtap="editAddress" class="address-edit" data-id="{{item.address_id}}"> | ||
| 12 | - <image src="{{iurl}}/miniapp/images/address_edit.png"></image> | ||
| 13 | - </view> | ||
| 14 | - </view> | ||
| 15 | - <navigator class="address-create" url="/pages/user/add_address/add_address"> | ||
| 16 | - <view class="create-btn">+新建地址</view> | ||
| 17 | - </navigator> | ||
| 18 | -</view> --> | ||
| 19 | 1 | ||
| 20 | <!-- 无收货地址提醒页面 --> | 2 | <!-- 无收货地址提醒页面 --> |
| 21 | <view class="topbcolor"></view> | 3 | <view class="topbcolor"></view> |
pages/user/assistance/task_assistance.js
| @@ -441,13 +441,7 @@ Page({ | @@ -441,13 +441,7 @@ Page({ | ||
| 441 | 441 | ||
| 442 | 442 | ||
| 443 | var user_list = su.data.data.pageData; | 443 | var user_list = su.data.data.pageData; |
| 444 | - // if (user_list == "" || user_list.length == 0 || user_list==null){ | ||
| 445 | - // th.setData({ | ||
| 446 | - // is_user_list: 1 | ||
| 447 | - // }); | ||
| 448 | - // console.log("走哪里1111"); | ||
| 449 | - // }else{} | ||
| 450 | - console.log("走哪里22222222"); | 444 | + |
| 451 | var user_lists = th.data.user_task_list.concat(user_list); | 445 | var user_lists = th.data.user_task_list.concat(user_list); |
| 452 | th.setData({ | 446 | th.setData({ |
| 453 | user_task_list: user_lists | 447 | user_task_list: user_lists |
pages/user/coupons/coupons.wxml
| 1 | <wxs module="filter" src="filter.wxs"></wxs> | 1 | <wxs module="filter" src="filter.wxs"></wxs> |
| 2 | <wxs module="time" src="../../../utils/filter.wxs"></wxs> | 2 | <wxs module="time" src="../../../utils/filter.wxs"></wxs> |
| 3 | 3 | ||
| 4 | - | ||
| 5 | -<!-- <view class="big-rim"> | ||
| 6 | - <form bindsubmit='Gettime'> | ||
| 7 | - <view class="min-rim"> | ||
| 8 | - <view class="rq">日期:</view> | ||
| 9 | - | ||
| 10 | - <picker class='pi' mode="date" value='{{datet}}' start="2019/1/1" bindchange='bindDateChenge'> | ||
| 11 | - <view class="rq-rim"> | ||
| 12 | - <view class='kssj'><text class="wz"name="datat"value='{{datet}}'bindinput='watchPassWord'>{{datet}}</text></view> --> | ||
| 13 | - <!-- 清除输入框中的内容--> | ||
| 14 | - <!-- <view hidden='{{isBind}}' class="qc-rim"> | ||
| 15 | - <button class="empty" catchtap="eliminate">x</button> | ||
| 16 | - </view> | ||
| 17 | - </view> | ||
| 18 | - </picker> | ||
| 19 | - | ||
| 20 | - <view class="zi">至 </view> | ||
| 21 | - <picker class="pi"mode="date" value='{{dates}}' start="2019/1/1" end="" bindchange='bindDateChenges'> | ||
| 22 | - <view class="rim"> | ||
| 23 | - <view class="kssj"> | ||
| 24 | - <text class='wz' name="datas" value='{{dates}}'>{{dates}}</text> | ||
| 25 | - </view> --> | ||
| 26 | - <!-- 清除输入框中的内容 --> | ||
| 27 | - <!-- <view class="end-rim" hidden="{{isBinds}}"> | ||
| 28 | - <button class="end" catchtap="eliminates">x</button> | ||
| 29 | - </view> | ||
| 30 | - </view> | ||
| 31 | - </picker> | ||
| 32 | - </view> | ||
| 33 | - <view class="xknr-rim"> | ||
| 34 | - <view class="cxnr">查询内容 </view> | ||
| 35 | - <view class='top'> --> | ||
| 36 | - <!-- 下拉框 --> | ||
| 37 | - <!-- <view class='top-selected' bindtap='bindShowMsg'> | ||
| 38 | - <input name="grade_name" class="texts" value='{{grade_name}}'>{{grade_name}}</input> | ||
| 39 | - <view class="rim-images"> | ||
| 40 | - <image class="images" src='{{iurl}}/miniapp/images/usermoney/ico-pt4.png'></image> | ||
| 41 | - </view> | ||
| 42 | - </view> --> | ||
| 43 | - <!-- 下拉需要显示的列表 --> | ||
| 44 | - <!-- <view class="select-box" wx:if="{{select}}"> | ||
| 45 | - <view wx:for="{{grades}}" wx:key="unique"> | ||
| 46 | - <view class="select_one" bindtap="mySelect" data-name="{{item}}">{{item}}</view> | ||
| 47 | - </view> | ||
| 48 | - </view> | ||
| 49 | - </view> | ||
| 50 | - </view> | ||
| 51 | - <button class="botton" form-type='submit' data-query='{{item}}'>查询明细</button> | ||
| 52 | - </form> | ||
| 53 | -</view> --> | ||
| 54 | - | ||
| 55 | <view> | 4 | <view> |
| 56 | 5 | ||
| 57 | <view class="tab-head" bindtap="clickTab"> | 6 | <view class="tab-head" bindtap="clickTab"> |