diff --git a/components/refresh-view/scroll.wxs b/components/refresh-view/scroll.wxs index 0293f53..83e1237 100644 --- a/components/refresh-view/scroll.wxs +++ b/components/refresh-view/scroll.wxs @@ -30,13 +30,8 @@ var touchMove = function(e, instance) { newmark = e.touches[0].pageY; if (newmark < startmark) { // 向上滑动 - instance.selectComponent('.circle-progress-bar').setStyle({ - 'transform': 'none' - }); - instance.selectComponent('.icon-shuaxin').setStyle({ - 'transform': 'none', - 'opacity': 0 - }); + instance.selectComponent('.circle-progress-bar').setStyle({ 'transform': 'none' }) + instance.selectComponent('.icon-shuaxin').setStyle({ 'transform': 'none', 'opacity': 0 }) } else if (newmark - startmark > maxDistance + circleProgressBarHeight) { // 达到最大滑动距离 instance.selectComponent('.circle-progress-bar').setStyle({ @@ -64,7 +59,7 @@ var touchMove = function(e, instance) { }); } } else { - return; + return } } diff --git a/pages/process/index/index.wxml b/pages/process/index/index.wxml index f2d8260..ebd0c55 100644 --- a/pages/process/index/index.wxml +++ b/pages/process/index/index.wxml @@ -16,21 +16,21 @@ - + 收货统计 - + 收货重量 {{formate.formateWeight(totalInfo.totalWeight || 0)}}吨 - 查看收货详情 + @@ -82,14 +82,14 @@ - + 千鸟代付额度 查看代付详情 - + diff --git a/pages/process/order-info/index.wxml b/pages/process/order-info/index.wxml index 7574dfe..db19e5e 100644 --- a/pages/process/order-info/index.wxml +++ b/pages/process/order-info/index.wxml @@ -87,7 +87,7 @@ 定价员 - {{form.inspectorName || ''}} + {{form.inspectorPerson || ''}} diff --git a/pages/process/order-list/index.wxml b/pages/process/order-list/index.wxml index e19bbc0..a371a76 100644 --- a/pages/process/order-list/index.wxml +++ b/pages/process/order-list/index.wxml @@ -62,6 +62,7 @@ 代付中 待结算 已完成 + 已关闭