no message

components/collapse-item/index.wxml

@@ -12,7 +12,7 @@
     border="{{ border && expanded }}"
     class="{{ utils.bem('collapse-item__title', { disabled, expanded }) }}"
     right-icon-class="van-cell__right-icon"
-    custom-class="van-cell"
+    custom-class="van-cell collapse"
     hover-class="van-cell--hover"
     bind:click="onClick"
   >

components/collapse-item/index.wxss

@@ -1 +1 @@
-@import '../common/index.wxss';.van-collapse-item__title .van-cell__right-icon{-webkit-transform:rotate(90deg);transform:rotate(90deg);transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;transition:-webkit-transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s),-webkit-transform var(--collapse-item-transition-duration,.3s)}.van-collapse-item__title--expanded .van-cell__right-icon{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}.van-collapse-item__title--disabled .van-cell,.van-collapse-item__title--disabled .van-cell__right-icon{color:#c8c9cc!important;color:var(--collapse-item-title-disabled-color,#c8c9cc)!important}.van-collapse-item__title--disabled .van-cell--hover{background-color:#fff!important;background-color:var(--white,#fff)!important}.van-collapse-item__wrapper{overflow:hidden}.van-collapse-item__content{color:#969799;color:var(--collapse-item-content-text-color,#969799);font-size:13px;font-size:var(--collapse-item-content-font-size,13px);line-height:1.5;line-height:var(--collapse-item-content-line-height,1.5);background-color:#fff;background-color:var(--collapse-item-content-background-color,#fff)}
+@import '../common/index.wxss';.van-collapse-item__title .van-cell__right-icon{-webkit-transform:rotate(90deg);transform:rotate(90deg);transition:-webkit-transform .3s;transition:transform .3s;transition:transform .3s,-webkit-transform .3s;transition:-webkit-transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s);transition:transform var(--collapse-item-transition-duration,.3s),-webkit-transform var(--collapse-item-transition-duration,.3s)}.van-collapse-item__title--expanded .van-cell__right-icon{-webkit-transform:rotate(-90deg);transform:rotate(-90deg)}.van-collapse-item__title--disabled .van-cell,.van-collapse-item__title--disabled .van-cell__right-icon{color:#c8c9cc!important;color:var(--collapse-item-title-disabled-color,#c8c9cc)!important}.van-collapse-item__title--disabled .van-cell--hover{background-color:#fff!important;background-color:var(--white,#fff)!important}.van-collapse-item__wrapper{overflow:hidden}.van-collapse-item__content{color:#969799;color:var(--collapse-item-content-text-color,#969799);font-size:13px;font-size:var(--collapse-item-content-font-size,13px);line-height:1.5;line-height:var(--collapse-item-content-line-height,1.5);background-color:#fff;background-color:var(--collapse-item-content-background-color,#fff)}.collapse{min-height: auto;}

pages/agent/order-detail/delivery-info/index.wxml

@@ -1,26 +1,26 @@
 <!--pages/agent/detail/delivery-info/delivery-info.wxml-->
 <wxs module="agent" src="../../../agent/index.wxs"></wxs>
 <wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
-<view class=" margin-top"/>
+<view class=" margin-top" />
 <view class="bg-white" style="padding:24rpx 30rpx" wx:if="{{orderInfo.millSupplierId}}">
-		<view class="text-df text-gray" style="border-bottom:2rpx solid #f3f3f3;padding-bottom:24rpx">送货信息</view>
-		<view class="flex flex-justify text-sg" style="margin-top:20rpx">
-			<text class="text-black">纸厂开户账号</text>
-			<view class="flex flex-center" wx:if="{{orderInfo.millSupplierId}}">
-				<text class="text-gray" style="margin-right:12rpx">{{orderInfo.millSupplierId  || ''}}</text>
-				<van-button plain type="info" size="mini" bind:click="clipboard">复制</van-button>
-			</view>
+	<view class="text-df text-gray" style="border-bottom:2rpx solid #f3f3f3;padding-bottom:24rpx">送货信息</view>
+	<view class="flex flex-justify text-sg" style="margin-top:20rpx">
+		<text class="text-black">纸厂开户账号</text>
+		<view class="flex flex-center" wx:if="{{orderInfo.millSupplierId}}">
+			<text class="text-gray" style="margin-right:12rpx">{{orderInfo.millSupplierId  || ''}}</text>
+			<van-button plain type="info" size="mini" bind:click="clipboard">复制</van-button>
 		</view>
-		<view class="flex flex-justify text-sg" style="margin-top:20rpx">
-			<text class="text-black">纸厂订单号</text>
-			<text class="text-gray">{{orderInfo.millDeliveryOrderId || ''}}</text>
-		</view>
-		<view class="flex flex-justify text-sg" style="margin-top:20rpx">
-			<text class="text-black">货到时间</text>
-			<text class="text-gray">{{orderInfo.paperMillDeliveryTime || ''}}</text>
-		</view>
-		<view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-start">
-			<text class="text-black" style="min-width:180rpx">注意事项</text>
-			<text class="text-gray">{{orderInfo.attenssion || ''}}</text>
-		</view>
-	</view>
+	</view>
+	<view class="flex flex-justify text-sg" style="margin-top:20rpx">
+		<text class="text-black">纸厂订单号</text>
+		<text class="text-gray">{{orderInfo.millDeliveryOrderId || ''}}</text>
+	</view>
+	<view class="flex flex-justify text-sg" style="margin-top:20rpx">
+		<text class="text-black">货到时间</text>
+		<text class="text-gray">{{orderInfo.paperMillDeliveryTime || ''}}</text>
+	</view>
+	<view class="flex flex-justify text-sg" style="margin-top:20rpx;align-items: flex-start">
+		<text class="text-black" style="min-width:180rpx">注意事项</text>
+		<text class="text-gray">{{orderInfo.attenssion || ''}}</text>
+	</view>
+</view>

pages/agent/order-detail/header-info/index.js

@@ -8,19 +8,5 @@ Component({
    */
   properties: {
     orderInfo: { type: Object, value: null }
-  },
-
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
   }
 })

pages/agent/order-detail/header-info/index.wxss

@@ -1,16 +1,15 @@
 /* pages/agent/detail/header-info/header-info.wxss */
-.margin-top{
-  margin-top: 16rpx;
+.bg-blue{
+  color: #FFFFFF;
+  background-color: #008AFF;
 }
 
-.margin-right{
-	margin-right: 24rpx;
+.bg-yellow{
+	background-color: var(--yellow);
+	color: white;
 }
 
-.image-load {
-	width: 50px;
-	height: 50px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
+.bg-gray{
+	background-color: var(--gray);
+	color: white;
 }

pages/agent/order-detail/index.js

@@ -52,7 +52,13 @@ Scene({
           element.finalSettlePrice = math.plus(element.finalPayMoney, element.preSettleMoney)
         }
       }
-      this.setData({ orderInfo: result.data, cancel: this.data.cancel })
+      var orderInfoStep = result.data.orderItems
+      result.data.orderItems.forEach((element1, index1) => {
+        for (let i = 0; i <element1.orderItemTimeList.length; i++) {
+          orderInfoStep[index1].orderItemTimeList[i] = element1.orderItemTimeList[i]
+        }
+      })
+      this.setData({ orderInfo: result.data, cancel: this.data.cancel, orderInfoStep })
       wx.hideLoading()
     }).catch(err => {
       wx.hideLoading()

pages/agent/order-detail/index.wxml

@@ -1,6 +1,6 @@
 <!--pages/message/detail/index.wxml-->
 <cu-custom bgColor="bg-white" isBack="{{true}}">
-  <view slot="content">订单详情</view>
+	<view slot="content">订单详情</view>
 </cu-custom>
 <!-- ------顶部信息------ -->
 <header-info orderInfo="{{orderInfo}}" />
@@ -15,19 +15,18 @@
 	</view>
 	<!-- 待预约状态下,预约信息放前面 -->
 	<view wx:if="{{orderInfo.status==50}}">
-		<reserve-info  orderInfo="{{orderInfo}}"  />
+		<reserve-info orderInfo="{{orderInfo}}" />
 		<view style="height:16rpx"> </view>
 	</view>
 	<!-- 待送货状态下送货信息放在前面 -->
-	<delivery-info  orderInfo="{{orderInfo}}" wx:if="{{orderInfo.status==51}}" />
+	<delivery-info orderInfo="{{orderInfo}}" wx:if="{{orderInfo.status==51}}" />
 </view>
 <!-- ------车辆信息------ -->
 <!-- 总共多少辆车，单独放在顶部 -->
 <view style="height:16rpx"> </view>
 <!-- 每一辆车，进度信息和结算信息 -->
 <view wx:for="{{orderInfoStep}}" wx:key="index" style="margin-top:{{index == 0 ? 0 : 16}}rpx">
-	<view class="bg-white text-df text-gray" style="border-bottom:2rpx solid #f3f3f3;padding:24rpx 30rpx">车辆信息{{index+1}}
-</view>
+	<view class="bg-white text-df text-gray" style="padding:24rpx 30rpx">车辆信息{{index+1}}</view>
 	<!-- 进度 -->
 	<item-car-info orderInfo="{{orderInfo}}" item="{{item}}" />
 	<!-- 磅单 -->
@@ -45,8 +44,8 @@
 <order-info orderInfo="{{orderInfo}}" />
 
 <submit-layout wx:if="{{orderInfo && ((cancel && orderInfo.status == 51) || orderInfo.status == 50)}}">
-  <van-button type="default" custom-style="height:88rpx;width:240rpx" bind:click="cancelOrder" 
-  wx:if="{{orderInfo.status == 50 || orderInfo.status == 51}}">取消订单</van-button>
+	<van-button type="default" custom-style="height:88rpx;width:240rpx" bind:click="cancelOrder"
+		wx:if="{{orderInfo.status == 50 || orderInfo.status == 51}}">取消订单</van-button>
 </submit-layout>
 <van-dialog id="van-dialog" />
-<notification id="qn-notification"/>
+<notification id="qn-notification" />

pages/agent/order-detail/index.wxss

@@ -1 +1,16 @@
-/* pages/message/detail/index.wxss */
+/* pages/message/detail/index.wxss */
+.margin-top{
+  margin-top: 16rpx;
+}
+
+.margin-right{
+	margin-right: 24rpx;
+}
+
+.image-load {
+	width: 50px;
+	height: 50px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}

pages/agent/order-detail/item-car-info/index.js

@@ -16,13 +16,14 @@ Component({
    * 组件的初始数据
    */
   data: {
-
+    activeNames: []
   },
-
   /**
    * 组件的方法列表
    */
   methods: {
-
+    onChange: function({detail}) {
+      this.setData({ activeNames: detail })
+    }
   }
 })

pages/agent/order-detail/item-car-info/index.json

@@ -3,6 +3,6 @@
   "usingComponents": {
     "van-collapse": "/components/collapse/index",
     "van-collapse-item": "/components/collapse-item/index",
-    "wux-steps": "/components/steps/index",
-    "wux-step": "/components/step/index"}
+    "van-steps": "/components/steps/index",
+    "van-step": "/components/step/index"}
 }

pages/agent/order-detail/item-car-info/index.wxml

@@ -1,21 +1,24 @@
-<!--pages/agent/detail/item-history-part/item-history-info.wxml-->
+<!--pages/agent/detail/item-history-part/item-history-info.wxmvan-->
 <wxs module="agent" src="../../../agent/index.wxs"></wxs>
-<wux-accordion-group>
-	<wux-accordion>
-		<view slot="header" class="flex flex-justify" style="width: 100%">
+<van-collapse value="{{ activeNames }}" bind:change="onChange" wx:if="{{orderInfo}}">
+	<van-collapse-item content-class="collapse-item" name="1">
+		<view slot="title" class="flex flex-justify" style="width: 100%">
 			<view class="flex">
 				<text class="text-sg text-black text-bold">{{item.logisticcsInfo.plateNumber}}</text>
-				<text class="text-sg text-black text-bold"
-					style="margin-left:8rpx">「{{item.paperCategoryName || orderInfo.paperCategoryName}}」</text>
+				<text class="text-sg text-black text-bold" style="margin-left:8rpx">「{{item.paperCategoryName || orderInfo.paperCategoryName}}」</text>
 			</view>
 			<view class="text-df text-gray" style="padding-right:16rpx;">进度详情</view>
 		</view>
-		<wux-steps direction="vertical">
-			<wux-step wx:for-item="timeItem" wx:for-index="oindex" wx:for="{{item.orderItemTimeList}}" wx:key="oindex"
-				title="{{timeItem.description}}" status="{{statusStep(timeItem.status)}}" content="{{timeItem.time}}" />
-		</wux-steps>
-	</wux-accordion>
-</wux-accordion-group>
+		<view style="padding-top:24rpx">
+			<van-steps direction="column" step-min-height="120">
+				<van-step wx:for-item="timeItem" wx:for-index="oindex" wx:for="{{item.orderItemTimeList}}" wx:key="oindex"
+					title="{{timeItem.description}}" status="{{statusStep(timeItem.status)}}" describe="{{timeItem.time}}">
+				</van-step>
+			</van-steps>
+		</view>
+	</van-collapse-item>
+</van-collapse>
+
 <wxs module="statusStep">
 	function statusStep(status) {
 		return status == 1 ? "process" : "wait";

pages/agent/order-detail/item-money-info/index.js

@@ -1,6 +1,5 @@
 // pages/agent/detail/money-info/money-info.js
 Component({
-
   options: {
     addGlobalClass: true,
     multipleSlots: true
@@ -11,18 +10,5 @@ Component({
   properties: {
     orderInfo: { type: Object, value: null },
     item: { type: Object, value: null }
-  },
-  /**
-   * 组件的初始数据
-   */
-  data: {
-
-  },
-
-  /**
-   * 组件的方法列表
-   */
-  methods: {
-
   }
 })

pages/agent/order-detail/item-money-info/index.wxml

@@ -1,8 +1,6 @@
 <!--pages/agent/detail/money-info/money-info.wxml-->
-
 <wxs module="agent" src="../../../agent/index.wxs"></wxs>
 <wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
-
 <!-- 预付款 -->
 <view class="bg-white" style="padding: 24rpx 30rpx;margin-top:16rpx" wx:if="{{item.activityOrderAuditPassNum!=null&&item.activityOrderAuditPassNum >= 1}}">
 	<view class="text-df text-gray" style="solid #f3f3f3;padding-bottom:24rpx">首款信息</view>

pages/agent/order-detail/order-info/index.js

@@ -10,18 +10,18 @@ Component({
   properties: {
     orderInfo: { type: Object, value: null }
   },
-
   /**
    * 组件的初始数据
    */
   data: {
-
+    activeNames: ['1']
   },
-
   /**
    * 组件的方法列表
    */
   methods: {
-
+    onChange: function({detail}) {
+      this.setData({ activeNames: detail })
+    }
   }
 })

pages/agent/order-detail/order-info/index.json

@@ -1,8 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "wux-dialog": "/components/dialog/index",
-    "wux-image": "/components/image/index",
     "van-collapse": "/components/collapse/index",
     "van-collapse-item": "/components/collapse-item/index"
   }

pages/agent/order-detail/order-info/index.wxml

@@ -3,11 +3,12 @@
 <wxs module="agent" src="../../../agent/index.wxs"></wxs>
 <wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
 
-<view class="bg-white margin-top" >
-<wux-accordion-group wx:if="{{orderInfo}}">
-	<wux-accordion>
-		<view slot="header" class="text-gray">订单信息</view>
-		<view class="flex flex-justify text-sg">
+<view class="margin-top"></view>
+<van-collapse value="{{ activeNames }}" bind:change="onChange" wx:if="{{orderInfo}}">
+	<van-collapse-item content-class="collapse-item" name="1">
+		<view slot="title" class="text-gray">订单信息</view>
+		<view style="padding:24rpx 30rpx">
+			<view class="flex flex-justify text-sg">
 			<text class="text-black">订单编号</text>
 			<text class="text-gray">{{orderInfo.orderId}}</text>
 		</view>
@@ -19,6 +20,6 @@
 			<text class="text-black" style="min-width:200rpx">订单备注</text>
 			<text class="text-gray">{{orderInfo.remark || ''}}</text>
 		</view>
-	</wux-accordion>
-</wux-accordion-group>
-</view>
+		</view>
+	</van-collapse-item>
+</van-collapse>

pages/agent/order-detail/order-info/index.wxss

@@ -5,12 +5,4 @@
 
 .margin-right{
 	margin-right: 24rpx;
-}
-
-.image-load {
-	width: 50px;
-	height: 50px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
 }

pages/agent/order-detail/pound-info/index.json

@@ -1,7 +1,6 @@
 {
   "component": true,
   "usingComponents": {
-    "wux-image": "/components/image/index",
     "sudoku-image": "/components/sudoku-image/index"
   }
 }

pages/agent/order-detail/pound-info/index.wxml

@@ -32,7 +32,6 @@
     <text class="text-black">磅单图片</text>
   </view>
   <view style="margin-top:20rpx">
-    <sudoku-image image-list="{{item.weightnoteInfo.imageUrls}}" square="{{true}}" clickable="{{true}}">
-    </sudoku-image>
+    <sudoku-image image-list="{{item.weightnoteInfo.imageUrls}}" square="{{true}}" clickable="{{true}}"></sudoku-image>
   </view>
 </view>

pages/agent/order-detail/reserve-info/index.js

@@ -14,13 +14,14 @@ Component({
    * 组件的初始数据
    */
   data: {
-
+    activeNames: ['1']
   },
-
   /**
    * 组件的方法列表
    */
   methods: {
-
+    onChange: function({detail}) {
+      this.setData({ activeNames: detail })
+    }
   }
 })

pages/agent/order-detail/reserve-info/index.json

@@ -1,13 +1,7 @@
 {
   "component": true,
   "usingComponents":  {
-    "wux-dialog": "/components/dialog/index",
-    "wux-image": "/components/image/index",
-    "sudoku-image": "/components/sudoku-image/index",
-    "wux-button": "/components/button/index",
-    "wux-divider": "/components/divider/index",
     "van-collapse": "/components/collapse/index",
-    "van-collapse-item": "/components/collapse-item/index",
-    "wux-steps": "/components/steps/index",
-    "wux-step": "/components/step/index"}
+    "van-collapse-item": "/components/collapse-item/index"
+  }
 }

pages/agent/order-detail/reserve-info/index.wxml

@@ -1,10 +1,12 @@
 <!--pages/agent/detail/reserve-info/reserve-info.wxml-->
 <wxs module="agent" src="../../../agent/index.wxs"></wxs>
 <wxs module="formate" src="../../../../pages/formate.wxs"></wxs>
-<view class="bg-white margin-top">
-<wux-accordion-group  default-current="{{['0']}}">
-		<wux-accordion>
-			<view slot="header" class="text-gray ">预约信息</view>
+
+<view style="margin-top:16rpx"></view>
+<van-collapse value="{{ activeNames }}" bind:change="onChange" wx:if="{{orderInfo}}">
+	<van-collapse-item content-class="collapse-item" name="1">
+		<view slot="title" class="text-gray">预约信息</view>
+		<view style="padding:24rpx 30rpx">
 			<view class="flex flex-justify text-sg">
 				<text class="text-black">纸品品类</text>
 				<text class="text-gray">{{orderInfo.paperCategoryName}}</text>
@@ -25,6 +27,6 @@
 				<text class="text-black">货到时间</text>
 				<text class="text-gray">{{orderInfo.deliveryTime}}</text>
 			</view>
-		</wux-accordion>
-	</wux-accordion-group>
-</view>
+		</view>
+	</van-collapse-item>
+</van-collapse>

pages/agent/order-detail/reserve-info/index.wxss

@@ -6,11 +6,3 @@
 .margin-right{
 	margin-right: 24rpx;
 }
-
-.image-load {
-	width: 50px;
-	height: 50px;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}

pages/login/index.js

@@ -128,7 +128,7 @@ Page({
             })
             return
           }
-          headerFactoryId(app.userInfo.factoryId)
+          // headerFactoryId(app.userInfo.factoryId)
           // wx.redirectTo({ url: '/pages/agent/result/index' })
           wx.redirectTo({ url: '/pages/index/index' })
         } else {