first commit

衣莎项目/源码/YiShaXiYi/view/logistics/orderList/.pydio

@@ -0,0 +1 @@
+3348f776-19b9-470f-8ba9-dd6de065c944

衣莎项目/源码/YiShaXiYi/view/logistics/orderList/orderList.js

@@ -0,0 +1,681 @@
+// view/logistics/orderList/orderList.js
+const app = getApp();
+const regeneratorRuntime = app.loadAsync()
+const model = app.loadModel("index")
+const http = app.loadHttp()
+Page({
+
+  /**
+   * 页面的初始数据
+   */
+  data: {
+    showViewInfo: false,  // 是否展示详情的弹窗
+    showViewInfoData: [],
+    system: app.globalData.system, //设备相关信息
+    pageTitle: "线上订单", //头部标题
+    isBack: true,//显示返回
+    backColor: "fff",//返回颜色，这是图片
+    titleColor: { //头部背景和文字颜色
+      bColor: "#1dbf53",
+      tColor: "#ffffff"
+    },
+    tabs: ["普通订单", "商城订单", "衣柜订单", "返洗订单"],
+    current: '1',// 1普通订单 2商城订单 3衣柜订单
+    date: '2019-08',
+    isPopup: false,//弹窗窗口
+    area: [],//区信息
+    areaId: {},//选中的区信息
+    residen: [],//小区信息
+    residenId: {},//选中的小区信息
+    popupType: "",//弹出框类型
+    state: [
+      {
+        name: "待接单",
+        status: 1
+      },
+      {
+        name: "已接单",
+        status: 3
+      },
+      {
+        name: "待送回",
+        status: 7
+      },
+      {
+        name: "已送达",
+        status: 10
+      },
+      {
+        name: "已完成",
+        status: 8
+      }
+    ],
+    shopState: [
+      {
+        name: "待接单",
+        status: 2
+      },
+      {
+        name: "已接单",
+        status: 3
+      },
+      {
+        name: "待送达",
+        status: 4
+      },
+      {
+        name: "已送达",
+        status: 5
+      },
+      {
+        name: "已完成",
+        status: 6
+      }
+    ],
+    stateId: {},//选中的状态信息
+    orderList: [],//订单信息
+    page: 1,//当前页
+    isPage: false,//如果没列表数据变成true
+    remarks: "",//备注
+    orderId: {//当前转单的订单id 和formid
+      id: '',
+      formId: ''
+    },
+    isTips: false,//备注显示关闭
+    orderInfo: {},//选中的订单信息，暂时只有打开弹窗使用
+    isTips4: false,//选择数量弹窗
+    isShowSupplement: false, //是否显示补款弹窗
+    inputMoney: '',      // 补款的价格
+    inputReason: '',      // 补款的原因
+    SmallSupplementId: '' // 需要补款的id
+  },
+
+  // 小马哥 补款按钮 被点击
+  SmallSupplement(e) {
+    this.setData({ 
+      isShowSupplement: true,
+      SmallSupplementId: e.detail.target.dataset.id
+    })
+    console.log(this.data.SmallSupplementId)
+  },
+  inputReasonChange(e){
+    this.setData({ inputReason: e.detail.value })
+  },
+  inputMoneyChange(e) {
+    this.setData({ inputMoney: e.detail.value })
+  },
+  //弹窗 确定 按钮被点击
+  async submitSmallSupplement() {
+    if(this.data.inputMoney.length == 0 || this.data.inputReason.length == 0) {
+      wx.showToast({
+        title: '金额和原因不能为空',
+        icon: 'none',
+        duration: 1000
+      })
+    } else {
+      let data = {
+        extra_money: this.data.inputMoney,
+        order_id: this.data.SmallSupplementId,
+        extra_reason: this.data.inputReason
+      }
+      let status = await http.http.request2({ url: http.api.addExtraRecord, method: "POST", data: data });
+      
+      if(status.data.status == 1) {
+        wx.showToast({
+          title: status.data.msg,
+          icon: 'success',
+          duration: 2000
+        });
+        // 清空输入框
+        this.setData({ 
+          inputReason: '',
+          inputMoney: ''
+        });
+      }else{
+        wx.showToast({
+          title: status.data.msg,
+          icon: 'none',
+          duration: 2000
+        })
+      }
+    }
+  },
+  onClear(e) {
+    this.setData({
+      error: true,
+      value: '',
+    })
+  },
+
+  // 关闭补款弹窗
+  ClosePopup() {
+    this.setData({ isShowSupplement: false })
+  },
+  // tab选中事件
+  handleChange(e) {
+    let index = e.currentTarget.dataset.index
+    this.setData({
+      current: index,
+      orderList: [],
+      areaId: {},
+      residenId: {},
+      stateId: {},
+      page: 1,
+      isPage: false
+    });
+    this.logicsOrderList()
+  },
+  // 打开日历
+  DateChange(e) {
+    this.setData({
+      date: e.detail.value,
+      orderList: [],
+      page: 1,
+      isPage: false
+    })
+    this.logicsOrderList()
+  },
+  // 获取当前系统时间
+  getTime() {
+    var timestamp = Date.parse(new Date());
+    var date = new Date(timestamp);
+    //获取年份  
+    var Y = date.getFullYear();
+    //获取月份  
+    var M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1);
+    this.setData({
+      date: `${Y}-${M}`
+    })
+  },
+  // 打开弹出框
+  openPopup(e) {
+    let type = e.currentTarget.dataset.type
+    if (type == 0) {
+      wx.showToast({
+        title: '暂不支持其他市',
+        icon: 'none',
+        duration: 800
+      })
+      return
+    }
+    if (type == 2 && this.data.residen.length <= 0) {
+      wx.showToast({
+        title: '当前区没有小区',
+        icon: 'none',
+        duration: 800
+      })
+      return
+    }
+    this.setData({
+      isPopup: !this.data.isPopup,
+      popupType: type
+    })
+  },
+  // 关闭弹出框
+  closePopup() {
+    this.setData({
+      isPopup: false
+    })
+  },
+  async ViewInfo(e) {
+    let data = {
+      id: e.currentTarget.dataset.id
+    };
+    console.log("data: ", data)
+
+    let res = await http.http.request1({ url: `${http.api.getClothDetail}`, method: "GET", data: data });
+
+    console.log("res: ", res.data.data)
+    this.setData({
+      showViewInfoData: res.data.data
+    })
+    this.setData({ showViewInfo: true})
+  },
+  // 关闭详情的弹窗
+  CloseViewInfo() {
+    this.setData({
+      showViewInfo: false
+    })
+  },
+  // 获取区和小区接口
+  async getArea(area_id = "") {
+    let data = {}
+    if (area_id != "") {
+      data.area_id = area_id
+    }
+    let res = await http.http.request1({ url: `${http.api.getArea}`, method: "POST", data: data })
+    if (area_id != "") {
+      this.setData({
+        residen: res.data.data
+      })
+      return
+    }
+    this.setData({
+      area: res.data.data
+    })
+  },
+  // 弹出框里列表的选择
+  changePopup(e) {
+    let type = e.currentTarget.dataset.type
+    let item = e.currentTarget.dataset.item
+    if (type == 1) {
+      this.setData({
+        areaId: item,
+        residenId: {}
+      })
+      this.getArea(item.id)
+    } else if (type == 2) {
+      this.setData({
+        residenId: item
+      })
+    } else if (type == 3) {
+      this.setData({
+        stateId: item
+      })
+    }
+    this.setData({
+      orderList: [],
+      page: 1,
+      isPage: false
+    });
+    this.closePopup()
+    this.logicsOrderList()
+  },
+  // 返回订单列表
+  async logicsOrderList() {
+    wx.showLoading({
+      title: '加载中',
+    })
+    let time = this.data.date
+    let current = this.data.current
+    let areaId = this.data.areaId
+    let residenId = this.data.residenId//小区
+    let stateId = this.data.stateId
+    let orderList = this.data.orderList
+    let data = {
+      type: current,
+      cityName: "合肥市",
+      countryName: areaId.name,
+      villageName: residenId.name,
+      create_time: time,
+      status: stateId.status,
+      page: this.data.page,
+      limit: 5
+    }
+    let res = await http.http.request2({ url: `${http.api.logicsOrderList}`, method: "POST", data: data })
+    if (res.data.data.data.length < 5) {
+      this.setData({
+        isPage: true
+      })
+    }
+    this.setData({
+      orderList: [...orderList, ...res.data.data.data]
+    })
+    wx.hideLoading()
+  },
+  // 显示备注
+  openTips(e) {
+    let id = e.detail.target.dataset.id
+    let formId = e.detail.formId
+    let orderId = {
+      id: id,
+      formId: formId
+    }
+    this.setData({
+      isTips: true,
+      orderId: orderId
+    })
+  },
+  // 关闭备注
+  closeTips() {
+    this.setData({
+      isTips: false,
+      remarks: ''
+    })
+  },
+  // 备注
+  remarksInput(e) {
+    let val = e.detail.value
+    this.setData({
+      remarks: val
+    })
+  },
+  // 清空状态,如当前page，列表数据等
+  empty() {
+    this.setData({
+      orderList: [],
+      areaId: {},
+      residenId: {},
+      stateId: {},
+      page: 1,
+      isPage: false
+    });
+  },
+  // 确认接单 
+  receipt(e) {
+    let that = this
+    let id = e.detail.target.dataset.id
+    let formId = e.detail.formId
+    let current = this.data.current;//当前的订单类型
+    wx.showModal({
+      title: '确认接单',
+      content: '接单后将无法取消订单',
+      confirmText: '接单',
+      cancelText: '取消',
+      success(res) {
+        if (res.confirm) {
+          that.empty()
+          if (current != 2) {
+            http.http.request2({ url: `${http.api.confirmOrder}`, method: "POST", data: { order_id: id, form_id: formId } })
+              .then(res => {
+                if (res.data.status == 1) {
+                  that.logicsOrderList()
+                }
+              })
+          } else {
+            http.http.request2({ url: `${http.api.confirmExpressOrder}`, method: "POST", data: { order_id: id, status: 2, form_id: formId } })
+              .then(res => {
+                if (res.data.status == 1) {
+                  that.logicsOrderList()
+                }
+              })
+          }
+        }
+      }
+    })
+  },
+  // 转单
+  changeOrder() {
+    let that = this
+    let id = this.data.orderId.id
+    let formId = this.data.orderId.formId
+    let current = this.data.current;//当前的订单类型
+    let data = {
+      order_id: id,
+      form_id: formId,
+      reason: that.data.remarks
+    }
+    wx.showModal({
+      title: '确认转单',
+      content: '转单后将分配给其他物流人员',
+      confirmText: '转单',
+      cancelText: '取消',
+      success(res) {
+        if (res.confirm) {
+          that.empty()
+          if (current != 2) {
+            http.http.request2({ url: `${http.api.LogisticsLogicChange}`, method: "POST", data: data })
+              .then(res => {
+                if (res.data.status == 1) {
+                  that.closeTips()
+                  that.logicsOrderList()
+                }
+              })
+          } else {
+            http.http.request2({ url: `${http.api.changeExpressOrder}`, method: "POST", data: data })
+              .then(res => {
+                if (res.data.status == 1) {
+                  that.closeTips()
+                  that.logicsOrderList()
+                }
+              })
+          }
+        }
+      }
+    })
+  },
+  // 普通洗衣订单取走物件确定衣物数量弹窗
+  open4(e) {
+    this.setData({
+      orderInfo: e,
+      isTips4: true
+    })
+  },
+  // 确定衣物数量
+  determineNum(e) {
+    if(e.detail['isTips']){
+      this.setData({
+        isTips4: false
+      })
+      return
+    }
+    this.setData({
+      'orderInfo.detail.target.dataset.num': e.detail.num
+    })
+    this.clothingCollection(this.data.orderInfo)
+  },
+  // 普通洗衣订单到客户哪取走物件
+  clothingCollection(e) {
+    let that = this;
+    let id = e.detail.target.dataset.id;
+    let aid = e.detail.target.dataset.aid;
+    let num = e.detail.target.dataset.num;
+    let current = this.data.current;//当前的订单类型
+    let formId = e.detail.formId
+    let data = {
+      order_id: id,
+      form_id: formId,
+      clothen_num: num
+    }
+    if (current == 4) {
+      data.aid = aid
+    }
+    if (num <= 0) {
+      wx.showToast({
+        title: '请确认衣服数量是否正确!!!',
+        icon: 'none',
+        duration: 2000
+      })
+      return
+    }
+    wx.showModal({
+      title: '确定取走衣物',
+      content: '点击确定取走衣物',
+      confirmText: '确定',
+      cancelText: '取消',
+      success(res) {
+        if (res.confirm) {
+          that.empty()
+          if (current != 2) {
+            http.http.request2({ url: `${http.api.pickOrder}`, method: "POST", data: data })
+              .then(res => {
+                if (res.data.status == 1) {
+                  that.closePopup()
+                  that.logicsOrderList()
+                  // 关闭数量弹窗
+                  that.setData({
+                    isTips4: false
+                  })
+                }
+              })
+          }
+        }
+      }
+    })
+  },
+  // 开柜取衣
+  takeClothes(e) {
+    let that = this
+    let id = e.detail.target.dataset.id
+    let aid = e.detail.target.dataset.aid
+    let formId = e.detail.formId
+    let data = {
+      order_id: id,
+      form_id: formId,
+      lat: "",
+      lng: ""
+    }
+    if (!!aid) {
+      data.aid = aid
+    }
+    wx.showModal({
+      title: '打开衣柜',
+      content: '点击确定打开衣柜',
+      confirmText: '确定',
+      cancelText: '取消',
+      success(res) {
+        if (res.confirm) {
+          wx.getLocation({
+            type: 'gcj02',
+            success(res) {
+              wx.showLoading({
+                title: '开柜中',
+              })
+              data.lat = res.latitude
+              data.lng = res.longitude
+              that.empty()
+              http.http.request2({ url: `${http.api.logisticsOpenCupboard}`, method: "POST", data: data })
+                .then(res => {
+                  if (res.data.status == 1) {
+                    wx.hideLoading()
+                    that.logicsOrderList()
+                  }
+                })
+            }
+          })
+        }
+      }
+    })
+  },
+  // 洗衣订单确认收衣 物流去工厂端收衣
+  factCloColl(e) {
+    let that = this
+    let id = e.currentTarget.dataset.id
+    let aid = e.currentTarget.dataset.aid
+    let current = this.data.current;//当前的订单类型
+    let data = {
+      order_id: id
+    }
+    if (current == 4) {
+      data.aid = aid
+    }
+    wx.showModal({
+      title: '衣物送回',
+      content: '点击确定取走衣物',
+      confirmText: '确定',
+      cancelText: '取消',
+      success(res) {
+        if (res.confirm) {
+          that.empty()
+          if (current != 2) {
+            http.http.request2({ url: `${http.api.logicGetClothes}`, method: "POST", data: data })
+              .then(res => {
+                if (res.data.status == 1) {
+                  that.closePopup()
+                  that.logicsOrderList()
+                }
+              })
+          }
+        }
+      }
+    })
+  },
+  // 确认送达 普通洗衣和商城订单
+  service(e) {
+    let that = this
+    let id = e.currentTarget.dataset.id
+    let aid = e.currentTarget.dataset.aid
+    let current = this.data.current;//当前的订单类型
+    let data = {
+      order_id: id
+    }
+    if (current == 4) {
+      data.aid = aid
+    }
+    wx.showModal({
+      title: '确认送达',
+      content: '确认已送达',
+      confirmText: '确定',
+      cancelText: '取消',
+      success(res) {
+        if (res.confirm) {
+          that.empty()
+          if (current != 2) {
+            http.http.request2({ url: `${http.api.served}`, method: "POST", data: data })
+              .then(res => {
+                if (res.data.status == 1) {
+                  that.closePopup()
+                  that.logicsOrderList()
+                }
+              })
+          } else {
+            http.http.request2({ url: `${http.api.confirmExpressOrder}`, method: "POST", data: { order_id: id, status: 4 } })
+              .then(res => {
+                if (res.data.status == 1) {
+                  that.closePopup()
+                  that.logicsOrderList()
+                }
+              })
+          }
+        }
+      }
+    })
+  },
+  /**
+   * 生命周期函数--监听页面加载
+   */
+  onLoad: function (options) {
+    if (!!options.stateId) {
+      this.setData({
+        stateId: JSON.parse(options.stateId)
+      })
+    }
+    this.getTime()
+    this.getArea()
+    this.logicsOrderList()
+  },
+
+  /**
+   * 生命周期函数--监听页面初次渲染完成
+   */
+  onReady: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面显示
+   */
+  onShow: function () {
+  },
+
+  /**
+   * 生命周期函数--监听页面隐藏
+   */
+  onHide: function () {
+
+  },
+
+  /**
+   * 生命周期函数--监听页面卸载
+   */
+  onUnload: function () {
+
+  },
+
+  /**
+   * 页面相关事件处理函数--监听用户下拉动作
+   */
+  onPullDownRefresh: function () {
+
+  },
+
+  /**
+   * 页面上拉触底事件的处理函数
+   */
+  onReachBottom: function () {
+    if (this.data.isPage) {
+      return
+    }
+    this.setData({
+      page: ++this.data.page
+    })
+    this.logicsOrderList()
+  },
+
+  /**
+   * 用户点击右上角分享
+   */
+  onShareAppMessage: function () {
+
+  }
+})

衣莎项目/源码/YiShaXiYi/view/logistics/orderList/orderList.json

@@ -0,0 +1,11 @@
+{
+  "usingComponents": {
+    "wux-popup": "../../../extend/wux/dist/popup/index",
+    "wux-calendar": "../../../extend/wux/dist/calendar/index",
+    "quantityClothes": "../../../component/quantityClothes/quantityClothes",
+    "wux-popup": "../../extend/wux/dist/popup/index",
+    "wux-input": "../../extend/wux/dist/input/index",
+    "wux-radio-group": "../../extend/wux/dist/radio-group/index",
+    "wux-radio": "../../extend/wux/dist/radio/index"
+  }
+}

衣莎项目/源码/YiShaXiYi/view/logistics/orderList/orderList.wxml

@@ -0,0 +1,178 @@
+<!-- 头部导航 -->
+<nav-bar isBack="{{isBack}}" backColor="{{backColor}}" pageTitle="{{pageTitle}}" system="{{system}}" titleColor="{{titleColor}}"></nav-bar>
+<!-- 日历 -->
+<wux-calendar id="wux-calendar" />
+
+<wux-popup closable visible="{{ isShowSupplement }}" bind:close="ClosePopup">
+  <wux-input label="金额：" value="{{ inputMoney }}" bind:change="inputMoneyChange" placeholder="输入补款金额" />
+  <view class="line"></view>
+  <wux-input label="原因：" value="{{ inputReason }}" bind:change="inputReasonChange"  placeholder="输入补款原因" />
+  <view slot="footer" class="popup__button" bindtap="submitSmallSupplement">确定</view>
+</wux-popup>
+
+<view class="orderList" style="top:{{system.statusHeight+system.titleHeight+'px'}}" bind:tap="closePopup">
+    <view class="orderTab">
+        <view class="tabs">
+            <view wx:for="{{tabs}}" wx:key="{{index}}" bind:tap="handleChange" data-index="{{index+1}}" class="tab {{current == index+1?'tabActiv':''}}">
+                {{item}}
+            </view>
+        </view>
+    </view>
+    <view class="cond dis-flex">
+        <view class="flex1 flex-con3" data-type="0" catchtap="openPopup">
+            合肥市
+            <image class="Inverted_icon" src="/static/img/icon/Inverted_icon.png" />
+        </view>
+        <view class="flex1 flex-con3" data-type="1" catchtap="openPopup">
+            {{ !!areaId.name ? areaId.name : '选择区' }}
+            <image class="Inverted_icon" src="/static/img/icon/Inverted_icon.png" />
+        </view>
+        <!-- 只有衣柜订单有小区 -->
+        <view wx:if="{{ current == 3 }}" class="flex1 flex-con3" data-type="2" catchtap="openPopup">
+            {{!!residenId.name ? residenId.name : '选择小区'}}
+            <image class="Inverted_icon" src="/static/img/icon/Inverted_icon.png" />
+        </view>
+        <view class="flex1 flex-con3" data-type="3" catchtap="openPopup">
+            {{!!stateId.name ? stateId.name : '订单状态'}}
+            <image class="Inverted_icon" src="/static/img/icon/Inverted_icon.png" />
+        </view>
+    </view>
+</view>
+<!-- 列表 -->
+<view class="order_list">
+    <!-- 日历选择 -->
+    <picker mode="date" value="{{date}}" start="2015-09-01" end="2020-09-01" fields="month" bindchange="DateChange">
+        <view class="calendar flex-con2 pd30">
+            <view class="flex-con2">
+                <image class="time_icon mr15" src="/static/img/icon/rl.png" />
+                <span class="mr15">{{date}}</span>
+                <image class="Inverted_icon" src="/static/img/icon/Inverted_icon_0.png" />
+            </view>
+        </view>
+    </picker>
+    <view>
+        <view class="order_row mt20" wx:for="{{orderList}}" wx:key>
+            <view class="order_title">
+                <view class="order_number">
+                  <view class="order_icon">
+                    <image src="/static/img/icon/order-3_03.png" />
+                  </view>
+                  <view class="order_num">订单号：{{item.shop_order_no}}</view>
+                </view>
+                <view class="order_state">{{item.china_status}}</view>
+            </view>
+            <view class="order_info">
+                <!-- <view wx:if="{{current != 2}}" class="info_p">
+                    预计收入：<span class="text-style-2">{{item.money}}</span>
+                </view> -->
+                <view class="info_p mt10">
+                    下单件数：{{item.total_count != 0?item.total_count+'件':'待确认'}}
+                    <view class="view_info" data-id="{{item.id}}" bind:tap="ViewInfo">查看详情</view>
+                </view>
+                <view class="info_p mt10">下单时间：{{item.create_time}}</view>
+                <view class="info_p mt10">预约时间：{{item.accept_time}}</view>
+                <view class="info_p mt10">客户姓名：{{item.username}}</view>
+                <view class="info_p mt10">客户电话：{{item.telnum}}</view>
+                <view class="info_p mt10">客户地址：{{item.user_address}}</view>
+            </view>
+            <view class="order_sub flex-con2">
+                <form report-submit bindsubmit="receipt">
+                    <button class="openInfo ml20" wx:if="{{ item.status == 1 || item.express_status == 2 }}" data-id="{{item.id}}" form-type="submit">
+                        确认接单
+                    </button>
+                </form>
+                <form report-submit bindsubmit="SmallSupplement">
+                    <button class="cancel ml20" data-id="{{item.id}}" form-type="submit">
+                        补款
+                    </button>
+                </form>
+                <form report-submit bindsubmit="openTips">
+                    <button wx:if="{{ item.status == 1 || item.express_status == 2 }}" class="cancel ml20" data-id="{{item.id}}" form-type="submit">
+                        转让订单
+                    </button>
+                </form>
+                <!-- 普通洗衣订单去用户哪取衣 -->
+                <form report-submit bindsubmit="open4">
+                    <button wx:if="{{ (current == 1 || current == 4) && item.status == 3 && item.shop_id == 1}}" class="openInfo ml20" data-aid="{{item.aid}}" data-id="{{item.id}}" form-type="submit">
+                    取走物件
+                    </button>
+                </form>
+                <!-- 衣柜洗衣订单去用户哪取衣 -->
+                <form report-submit bindsubmit="takeClothes">
+                    <button wx:if="{{ (current == 3 || current == 4) && item.status == 3 && item.shop_id == 2 }}" class="openInfo ml20" data-aid="{{item.aid}}" data-id="{{item.id}}" form-type="submit">
+                    开柜取衣
+                    </button>
+                </form>
+                <!-- 洗衣工厂洗好后,物流人员到工厂拿到衣物点击 -->
+                <view wx:if="{{ item.status == 7 && current != 2 }}" class="openInfo ml20" data-aid="{{item.aid}}" data-id="{{item.id}}" catchtap="factCloColl">
+                    取衣送回
+                </view>
+                <!-- 普通洗衣订单和商城订单 -->
+                <view wx:if="{{ (item.status == 12 || item.express_status == 4) && current != 3 }}" data-aid="{{item.aid}}" data-id="{{item.id}}" class="openInfo ml20" catchtap="service">
+                    确定送达
+                </view>
+                <!-- 衣柜订单到达用户家时开柜把洗好衣物放入 -->
+                <form report-submit bindsubmit="takeClothes">
+                    <button wx:if="{{ item.shop_id == 2 && item.status == 12 && (current == 3 || current == 4) }}" class="openInfo ml20" data-id="{{item.id}}" form-type="submit">
+                        开柜送达
+                    </button>
+                </form>
+            </view>
+        </view>
+    </view>
+</view>
+<!-- 弹出层 -->
+<wux-popup position="top" visible="{{isPopup}}" bind:tap="closePopup">
+    <scroll-view scroll-y class="popup" style="margin-top:{{system.statusHeight+system.titleHeight+94+'px'}}">
+        <view wx:if="{{popupType == 1}}" wx:for="{{area}}" wx:key class="popuo_row {{areaId.id==item.id?'popuo_row_active':''}}" data-type="1" data-item="{{item}}" catchtap="changePopup">
+            {{item.name}}
+        </view>
+        <view wx:if="{{popupType == 2}}" wx:for="{{residen}}" wx:key class="popuo_row {{residenId.id==item.id?'popuo_row_active':''}}" data-type="2" data-item="{{item}}" catchtap="changePopup">
+            {{item.name}}
+        </view>
+        <view wx:if="{{popupType == 3 && current != 2}}" wx:for="{{state}}" wx:key class="popuo_row {{stateId.status==item.status?'popuo_row_active':''}}" data-type="3" data-item="{{item}}" catchtap="changePopup">
+            {{item.name}}
+        </view>
+        <view wx:if="{{popupType == 3 && current == 2}}" wx:for="{{shopState}}" wx:key class="popuo_row {{stateId.status==item.status?'popuo_row_active':''}}" data-type="3" data-item="{{item}}" catchtap="changePopup">
+            {{item.name}}
+        </view>
+    </scroll-view>
+</wux-popup>
+
+<wux-popup closable visible="{{ showViewInfo }}" title="衣物信息" bind:tap="CloseViewInfo">
+  <scroll-view scroll-y="true" style="height: 370rpx;" scroll-top="0">
+    <view class="nolist" wx:if="{{ showViewInfoData.length == 0 }}">
+        没有衣物信息
+    </view>
+    <block wx:else>
+        <view class="info-item" wx:key="{{this}}" wx:for="{{showViewInfoData}}">
+      <text>{{item.mall_product_name}}</text>
+      <text>x{{item.count}}</text>
+    </view>
+    </block>
+    
+  </scroll-view>
+  <view slot="footer" class="popup__button">确定</view>
+</wux-popup>
+
+<!-- 弹出层填写备注 -->
+<view wx:if="{{isTips}}" class="tips flex-con3">
+    <view>
+        <view class="tips_cen">
+            <view class="tips_cen_tit">转让订单</view>
+            <view class="flex-con3 mt30">
+                <view class="tips_cen_text">
+                    <textarea maxlength="50" placeholder="添加备注：如洗护要求、衣物特殊污渍等" bindinput="remarksInput" value="{{remarks}}"></textarea>
+                    <span class="tips_text_span">{{remarks.length}}/50个字</span>
+                </view>
+            </view>
+            <view class="tips_cen_sub" catchtap="changeOrder">完成</view>
+        </view>
+        <view class="tips_img" catchtap="closeTips">
+            <image src="/static/img/icon/colse_tips.png" />
+        </view>
+    </view>
+</view>
+<quantityClothes isTips='{{isTips4}}' bind:chCount="determineNum"></quantityClothes>
+<!-- toasta提示 -->
+<i-toast id="toast" />

衣莎项目/源码/YiShaXiYi/view/logistics/orderList/orderList.wxss

@@ -0,0 +1,259 @@
+/* view/logistics/orderList/orderList.wxss */
+page{
+    background-color:#f6f6f6;
+}
+.popup__button {
+    display: block;
+    flex: 1;
+    color: #33cd5f;
+    position: relative;
+}
+.view_info {
+  display: inline-block;
+  margin-left: 20px;
+  color: #ff4737;
+  text-decoration: underline;
+}
+.info-item {
+  display: flex;
+  align-items: center;
+  height: 60px;
+  width: 100%;
+  justify-content: space-between;
+  border-bottom: 1px solid #f6f6f6;
+}
+.orderList{
+    position: fixed;
+    width: 100%;
+    z-index: 1001;
+    background-color: #f6f6f6;
+}
+.orderTab{
+    height: 50px;
+	background-color: #1dbf53;
+}
+.tabs{
+    width: 100%;
+    display: flex;
+}
+.tab{
+    line-height: 50px;
+    text-align: center;
+    flex: 2;
+    font-size: 28rpx;
+    color: #beffd4;
+    position: relative;
+}
+.tabActiv{
+    font-size: 32rpx;
+    color: #ffffff;
+}
+.tabActiv::before{
+    position: absolute;
+    content: "";
+    bottom: 10rpx;
+    left: 50%;
+    margin-left: -15rpx;
+	width: 30rpx;
+	height: 6rpx;
+    background-color: #beffd4;
+	border-radius: 3rpx;
+}
+/*  */
+.cond{
+    height: 44px;
+    background-color: #ffffff;
+}
+.Inverted_icon{
+    width: 13rpx;
+    height: 8rpx;
+    margin-left: 14rpx;
+}
+/* 弹出层 */
+.popup{
+    background-color: #ffffff;
+    max-height: 600rpx;
+}
+.popuo_row{
+    line-height: 90rpx;
+    font-family: PingFang-SC-Medium;
+	font-size: 28rpx;
+    color: #666666;
+    padding-left: 68rpx;
+    text-align: left;
+}
+.popuo_row_active{
+    color: #1dbf53;
+}
+/* 日历选择 */
+.calendar{
+    margin-top: 5px;
+    height: 20px;
+}
+.time_icon{
+    width: 30rpx;
+	height: 30rpx;
+}
+/* 列表 */
+.order_list{
+    margin-top: 99px;
+}
+.order_row{
+    width: 100%;
+	background-color: #ffffff;
+}
+.order_row:last-child{
+    margin-bottom: 20rpx;
+}
+.order_title{
+    width: 100%;
+    height: 88rpx;
+    padding: 0 35rpx 0 70rpx;
+    border-bottom: 2rpx solid #f2f2f2;
+    display: flex;
+    justify-content: space-between;
+}
+.order_number {
+    display: flex;
+    align-items: center;
+}
+.order_num{
+  line-height: 88rpx;
+  display: inline-block;
+  font-size: 26rpx;
+  letter-spacing: 0px;
+  color: #999999;
+}
+.order_state{
+  line-height: 88rpx;
+  display: inline-block;
+	font-size: 28rpx;
+	letter-spacing: 0px;
+  color: #ff4737;
+  text-align: right;
+}
+.order_icon{
+    margin-right: 5rpx;
+    width: 23rpx;
+	height: 26rpx;
+}
+.order_icon image{
+    width: 23rpx;
+	height: 26rpx;
+}
+.order_info{
+    width: 100%;
+    padding: 30rpx 35rpx 30rpx 70rpx;
+}
+.info_p{
+	font-size: 26rpx;
+	letter-spacing: 0px;
+	color: #333333;
+}
+.order_sub{
+    width: 100%;
+    height: 106rpx;
+    padding-right: 35rpx;
+    border-top: 2rpx solid #f2f2f2;
+    display: -webkit-flex;
+    display: flex;
+    -webkit-flex-direction: row-reverse;
+    flex-direction: row-reverse;
+}
+.order_sub view,.order_sub button{
+    padding: 16rpx 30rpx;
+    border-radius: 150rpx;
+    font-size: 24rpx;
+}
+.order_sub button{
+    /* margin: 0; */
+    line-height: normal;
+}
+.order_sub button::after{
+    width: 0;
+    height: 0;
+}
+.cancel{
+    text-align: center;
+    border: solid 1px #ebebeb;
+    color: #333333;
+}
+.openInfo{
+    border: solid 1px #1dbf45;
+    color: #1dbf45;
+}
+.text-style-2{
+	color: #fd933f;
+}
+
+/* 弹出层 */
+.tips{
+    position: fixed;
+    top: 0;
+    left: 0;
+    right: 0;
+    height: 100%;
+    width: 100%;
+    background-color: rgba(0, 0, 0, 0.5);
+    z-index: 9999;
+}
+.tips_cen{
+    width: 600rpx;
+	height: 489rpx;
+	background-color: #ffffff;
+    border-radius: 10rpx;
+    padding-top: 58rpx;
+}
+.tips_cen_tit{
+    font-family: PingFang-SC-Bold;
+	font-size: 36rpx;
+    color: #000000;
+    font-weight: 600;
+    text-align: center;
+}
+.tips_cen_text{
+    width: 520rpx;
+	height: 200rpx;
+	background-color: #f5f5f5;
+    border-radius: 5rpx;
+    position: relative;
+    padding: 34rpx 25rpx;
+}
+.tips_cen_text textarea{
+    height: 100%;
+    width: 100%;
+}
+.tips_text_span{
+    position: absolute;
+    right: 16rpx;
+    bottom: 13rpx;
+    font-family: PingFang-SC-Medium;
+	font-size: 20rpx;
+	color: #999999;
+}
+.tips_cen_sub{
+    margin: 45rpx auto 0;
+    width: 550rpx;
+    height: 80rpx;
+    line-height: 80rpx;
+    text-align: center;
+	background-color: #36d96c;
+    border-radius: 40rpx;
+    font-family: PingFang-SC-Medium;
+	font-size: 32rpx;
+	color: #ffffff;
+}
+.tips_img{
+    margin-top: 50rpx;
+    text-align: center;
+}
+.tips_img image{
+    width: 69rpx;
+	height: 69rpx;
+}
+.line {
+    height: 20px;
+}
+.nolist {
+    margin-top: 30px;
+}