book-tool

app.wxss

@@ -56,28 +56,6 @@
   opacity: .5
 }
 
-.booking-tool {
-  width: calc(100% - 20px);
-  background-color: #008AFF;
-  position: fixed;
-  bottom: 150px;
-  left: 25px;
-}
-
-.roder-add {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100rpx;
-  height: 100rpx;
-  background-color: #008AFF;
-  border-radius: 50rpx;
-  position: absolute;
-  top: 24px;
-  right: 24px;
-  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
-}
-
 .scroll{
   z-index: 60;
 }

pages/home/employee/index.wxml

@@ -55,10 +55,8 @@
 	</van-cell>
 </view>
 
-<view class="booking-tool" style="bottom:200rpx" wx:if="{{ qrcode }}">
-	<button class="roder-add flex flex-center" open-type="share">
-		<text class="cuIcon-add text-white" style="font-size:32px"></text>
-	</button>
+<view style="border-radius: 50rpx;position: fixed;bottom:160rpx;right:50rpx" wx:if="{{qrcode}}">
+  <van-button round type="info" icon="plus" open-type="share" custom-style="width: 100rpx;height: 100rpx;"></van-button>
 </view>
 
 <notification id="qn-notification"/>

pages/home/factory-list/index.json

@@ -3,6 +3,7 @@
     "van-search": "/components/search/index",
     "van-tabs": "/components/tabs/index",
     "van-tab": "/components/tab/index",
+    "van-button": "/components/button/index",
     "refresh-view": "/components/refresh-view/index",
     "van-image": "/components/image/index",
     "van-divider": "/components/divider/index",

pages/home/factory-list/index.wxml

@@ -53,10 +53,8 @@
   </van-divider>
 </refresh-view>
 
-<view class="booking-tool" style="bottom:200rpx" wx:if="{{tabIndex == 0}}">
-  <button class="roder-add flex flex-center" bindtap="showDialog">
-    <text class="cuIcon-add text-white" style="font-size:32px"></text>
-  </button>
+<view style="border-radius: 50rpx;position: fixed;bottom:160rpx;right:50rpx" wx:if="{{tabIndex == 0}}">
+  <van-button round type="info" icon="plus" bind:click="showDialog" custom-style="width: 100rpx;height: 100rpx;"></van-button>
 </view>
 
 <van-dialog use-slot title="{{nowItem.id ? '修改渠道' : '创建渠道'}}" show="{{ show }}" transition="fade" show-cancel-button bind:close="onClose" bind:confirm="onConfirm">

pages/process/index/index.js

@@ -23,10 +23,10 @@ Component({
       { status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
     ],
     tabList1: [
-      { status: 1, badge: '', name: '待收货', icon: '/assets/image/icon_pricing.png' },
-      { status: 2, badge: '', name: '待定价', icon: '/assets/image/icon_checking.png' },
-      { status: 3, badge: '', name: '待付款', icon: '/assets/image/icon_payment.png' },
-      { status: 4, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
+      { status: 0, badge: '', name: '待收货', icon: '/assets/image/icon_pricing.png' },
+      { status: 1, badge: '', name: '待定价', icon: '/assets/image/icon_checking.png' },
+      { status: 4, badge: '', name: '待付款', icon: '/assets/image/icon_payment.png' },
+      { status: 5, badge: '', name: '已完成', icon: '/assets/image/icon_finish.png' }
     ],
     show: false,
     totalInfo: {
@@ -95,7 +95,6 @@ Component({
       wx.navigateTo({ url: '/pages/process/order-list/index' })
     },
     agentList: function (e) {
-      // this.showFactoryList()
       wx.navigateTo({ url: '/pages/process/agent-list/index' })
     },
     checkList: function (e) {
@@ -113,7 +112,7 @@ Component({
       }
     },
     outsideList: function(e){
-      if(e.currentTarget.dataset.status){
+      if(!util.isEmpty(e.currentTarget.dataset.status) || Number(e.currentTarget.dataset.status) == 0){
         wx.navigateTo({ url: `/pages/process/outside-list/index?status=${e.currentTarget.dataset.status}` })
       } else {
         wx.navigateTo({ url: `/pages/process/outside-list/index` })

pages/process/order-info/index.wxss

@@ -3,27 +3,6 @@
   margin-right: 24rpx;
 }
 
-.booking-tool {
-  width: calc(100% - 20px);
-  background-color: #008AFF;
-  position: fixed;
-  bottom: 150px;
-  left: 25px;
-}
-
-.roder-add {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100rpx;
-  height: 100rpx;
-  background-color: #008AFF;
-  border-radius: 50rpx;
-  position: absolute;
-  top: 24px;
-  right: 24px;
-  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
-}
 
 .info_status{
   background-image: linear-gradient(90deg, #FF4D2E 6%, #FF952F 100%);

pages/process/outside-list/index.js

@@ -29,39 +29,31 @@ Scene({
     top: 0,
     orderList: [],
     form: {
-      funcType: 0,
       pageNum: 1,
       pageSize: 10
     },
-    title: '全部',
+    title: '厂外收货订单',
     lastTime: null
   },
   //  * 生命周期函数--监听页面加载
   onLoad: function (options) {
-    if(options.status){
-      this.data.form.funcType = Number(options.status)
-      if(this.data.form.funcType == 1){
-        this.data.title = '待定价订单'
-      } else if(this.data.form.funcType == 2){
-        this.data.title = '过磅审核订单'
-      } else if(this.data.form.funcType == 3){
-        this.data.title = '待付款订单'
-      } else if(this.data.form.funcType == 4){
-        this.data.title = '已完成订单'
-        this.data.form.funcType = 6
-        this.data.form.status = 5
-        this.data.tabIndex = 7
-      } else if(this.data.form.funcType == 5){
-        this.data.title = '已关闭订单'
+    if(!util.isEmpty(options.status) || Number(options.status) == 0){
+      this.data.form.status = Number(options.status)
+      for (let index = 1; index < this.data.tabList.length; index++) {
+        if(this.data.tabList[index].status === Number(options.status)){
+          this.data.tabIndex = index
+          break
+        }
       }
+      this.setData({ 
+        height: app.globalData.fragmentHeight - 90, 
+        tabIndex: this.data.tabIndex, 
+        admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 
+      })
+    } else {
+      this.setData({ height: app.globalData.fragmentHeight - 90, admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0 })
     }
     event.on('OrderMessage', this, this.onEvent)
-    this.setData({ 
-      height: app.globalData.fragmentHeight - 90, 
-      title: this.data.title,
-      tabIndex: this.data.tabIndex,
-      admin: app.userInfo.type && app.userInfo.type.indexOf('ADMIN') >= 0
-     })
     this.fetchOrderList()
   },
   onEvent: function(message){

pages/setting/paper-list/index.wxml

@@ -30,10 +30,8 @@
   </van-divider>
 </refresh-view>
 
-<view class="booking-tool" style="bottom:200rpx" bindtap="lookItem">
-	<view class="roder-add flex flex-center">
-		<text class="cuIcon-add text-white" style="font-size:32px"></text>
-	</view>
+<view style="border-radius: 50rpx;position: fixed;bottom:160rpx;right:50rpx">
+  <van-button round type="info" icon="plus" bind:click="lookItem" custom-style="width: 100rpx;height: 100rpx;"></van-button>
 </view>
 
 <notification id="qn-notification"/>

pages/setting/paper-list/index.wxss

@@ -1,22 +1 @@
-/* pages/setting/paper-list/index.wxss */
-.booking-tool {
-  width: calc(100% - 20px);
-  background-color: #008AFF;
-  position: fixed;
-  bottom: 150px;
-  left: 25px;
-}
-
-.roder-add {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100rpx;
-  height: 100rpx;
-  background-color: #008AFF;
-  border-radius: 50rpx;
-  position: absolute;
-  top: 24px;
-  right: 24px;
-  box-shadow: 0px 3px 6px rgba(0, 0, 0, 0.16);
-}
+/* pages/setting/paper-list/index.wxss */