小程序：登录

htmldev/wxMini/pages/login/login.js

@@ -1,5 +1,5 @@
 const { isMobile } = require('../../utils/validate')
-const { sendCode, miniPhoneLogin, modifyUserPhone } = require('../../api/common')
+const { sendCode, miniPhoneLogin } = require('../../api/common')
 const { login, sessionStorageKey } = require('../../api/request')
 const app = getApp()
 Page({
@@ -13,7 +13,7 @@ Page({
       code: ''
     },
     numCount: 60,
-    bindType: 1, // 绑定类型：1手机号登录 2手机号解绑后绑定新的手机号
+    checked: false,
     booLock: false
   },
   timer: null,
@@ -23,7 +23,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad(options) {
-
+    this.getWxCode()
   },
 
   /**
@@ -53,31 +53,16 @@ Page({
   onUnload() {
     clearInterval(this.timer)
   },
-
-  /**
-   * 页面相关事件处理函数--监听用户下拉动作
-   */
-  onPullDownRefresh() {
-
-  },
-
-  /**
-   * 页面上拉触底事件的处理函数
-   */
-  onReachBottom() {
-
-  },
-
-  /**
-   * 用户点击右上角分享
-   */
-  onShareAppMessage() {
-
+  bindTip() {
+    wx.showToast({
+      title: '请阅读并勾选协议',
+      icon: 'none'
+    })
   },
-  async getWxCode() {
-    try {
-      this.wxCode = await login()
-    } catch (e) {}
+  bindChange() {
+    this.setData({
+      checked: !(this.data.checked)
+    })
   },
   mobileEventhandle(e) {
     const val = e.detail.value.replace(/[^\d]$/, '').replace(/^0/, '').replace(/(\d{11}(.*))/, '$1')
@@ -154,13 +139,64 @@ Page({
   async bindEvent() {
     const { cellphone, code } = this.data.form
 
+    if (!this.data.checked) {
+      this.bindTip()
+      return
+    }
     this.setData({
       booLock: true
     })
 
-    if (this.data.bindType === 1) {  // 登录、注册
+    try {
+      const { status, data } = await miniPhoneLogin({
+        wxCode: this.wxCode,
+        cellphone,
+        code
+      })
+
+      if (status) {
+        try {
+          wx.setStorageSync(sessionStorageKey, data.token)
+        } catch (err) {}
+
+        await app.fetchUserData()
+
+        const pages = getCurrentPages()
+        if (pages.length > 1) {
+          const route = pages[pages.length - 2]
+          wx.navigateBack({
+            delta: 1
+          })
+          route.bindCallBack && route.bindCallBack()
+        }
+      } else {
+        wx.showToast({
+          title: '登录出错了，请重试',
+          icon: 'none'
+        })
+        this.getWxCode()
+      }
+    } catch (err) {
+      this.getWxCode()
+    }
+
+    this.setData({
+      booLock: false
+    })
+  },
+  async getPhoneNumber(e) {
+    const { errMsg, encryptedData, iv } = e.detail
+    if (errMsg === 'getPhoneNumber:ok') {
+      this.setData({
+        booLock: true
+      })
+
       try {
-        const { status, data } = await miniPhoneLogin({ wxCode: this.wxCode, cellphone, code })
+        const { status, data } = await miniLogin({
+          wxCode: this.wxCode,
+          encryptedData,
+          iv
+        })
         if (status) {
           try {
             wx.setStorageSync(sessionStorageKey, data.token)
@@ -169,13 +205,7 @@ Page({
           await app.fetchUserData()
 
           const pages = getCurrentPages()
-          if (pages.length > 2 && pages[pages.length - 2].route === 'pages/login/login') {
-            const route = pages[pages.length - 3]
-            wx.navigateBack({
-              delta: 2
-            })
-            route.bindCallBack && route.bindCallBack()
-          } else if (pages.length > 1) {
+          if (pages.length > 1) {
             const route = pages[pages.length - 2]
             wx.navigateBack({
               delta: 1
@@ -189,28 +219,18 @@ Page({
           })
           this.getWxCode()
         }
-      } catch (err) {
+      } catch (e) {
         this.getWxCode()
       }
-    } else { // 绑定新手机号
-      try {
-        const { status, msg } = await modifyUserPhone({ cellphone, code })
-        if (status) {
-          await app.fetchUserData()
-          wx.reLaunch({
-            url: '/pages/mine/mine'
-          })
-        } else {
-          wx.showToast({
-            title: msg || '绑定手机号出错了，请重试',
-            icon: 'none'
-          })
-        }
-      } catch (err) {}
-    }
 
-    this.setData({
-      booLock: false
-    })
+      this.setData({
+        booLock: false
+      })
+    }
+  },
+  async getWxCode() {
+    try {
+      this.wxCode = await login()
+    } catch (e) {}
   }
 })

htmldev/wxMini/pages/login/login.scss

@@ -107,7 +107,7 @@ input {
   margin-top: 104rpx;
 }
 
-button.login {
+.login {
   width: 504rpx;
   height: 76rpx;
   border-radius: 38rpx;
@@ -124,14 +124,29 @@ button.login {
   }
 }
 
-button.auth {
-  width: 504rpx;
-  height: 76rpx;
+.auth {
+  position: relative;
+  left: 0;
+  top: 0;
   margin-top: 48rpx;
 
-  &[type='default'] {
-    color: rgba(145, 179, 121, 1);
-    background-color: transparent;
+  .disabled {
+    position: absolute;
+    left: 0;
+    top: 0;
+    right: 0;
+    bottom: 0;
+    z-index: 1;
+  }
+
+  button {
+    width: 504rpx;
+    height: 76rpx;
+
+    &[type='default'] {
+      color: rgba(145, 179, 121, 1);
+      background-color: transparent;
+    }
   }
 
   text {

htmldev/wxMini/pages/login/login.wxml

@@ -26,9 +26,15 @@
     </button>
   </view>
   <view class="agreement-wrap">
-    <view class="checked-wrap">
-      <image src="" wx:if="{{true}}"></image>
-      <image src="" wx:if="{{false}}"></image>
+    <view
+      class="checked-wrap"
+      bind:tap="bindChange">
+      <image
+        src=""
+        wx:if="{{!checked}}"></image>
+      <image
+        src=""
+        wx:if="{{checked}}"></image>
     </view>
     <view class="text-wrap">
       <text style="color:rgba(102, 102, 102, 1);">同意</text>
@@ -40,17 +46,23 @@
   </view>
   <view class="footer">
     <button class="login"
-            hover-class="none"
             type="primary"
             disabled="{{!(form.cellphone.length === 11 && form.code.length === 6) || booLock}}"
             bind:tap="bindEvent">确定
     </button>
-
-    <button
-      class="auth"
-      type="default">
-      <text>微信登陆</text>
-      <image src=""></image>
-    </button>
+    <view class="auth">
+      <view
+        class="disabled"
+        hidden="{{checked}}"
+        bind:tap="bindTip"></view>
+      <button
+        type="default"
+        disabled="{{booLock}}"
+        open-type="getPhoneNumber"
+        bindgetphonenumber="getPhoneNumber">
+        <text>微信登陆</text>
+        <image src=""></image>
+      </button>
+    </view>
   </view>
 </view>

htmldev/wxMini/pages/order/api/index.js

@@ -1,47 +0,0 @@
-const { request } = require('../../../api/request')
-/**
- * 订单列表
- * @param obj
- * @returns {Promise}
- */
-export const getOrderList = (obj) => request({
-  url: '/api/user/order/list',
-  method: 'POST',
-  data: {
-    'page': obj.pageNum,
-    'page_size': obj.pageSize,
-    'type': obj.type // 订单状态
-  },
-  showLoading: true
-})
-/**
- * 订单删除
- * @param id
- * @returns {Promise | Promise<unknown>}
- */
-export const postOrderDelete = (id) => request({
-  url: '/api/user/order/delete',
-  method: 'POST',
-  data: {
-    id
-  },
-  showLoading: true
-})
-
-export const postOrderDiffPay = (id) => request({
-  url: '/api/user/order/delete',
-  method: 'POST',
-  data: {
-    id
-  },
-  showLoading: true
-})
-
-export const postOrderCancel = (id) => request({
-  url: '/api/user/order/delete',
-  method: 'POST',
-  data: {
-    id
-  },
-  showLoading: true
-})

htmldev/wxMini/pages/order/order.js

@@ -1,363 +0,0 @@
-const { getOrderList, postOrderDelete, postOrderDiffPay, postOrderCancel } = require('./api/index')
-
-Page({
-
-  /**
-   * 页面的初始数据
-   */
-  data: {
-    tabs: [
-      {
-        name: '全部',
-        value: '0'
-      },
-      {
-        name: '待支付',
-        value: '1'
-      },
-      {
-        name: '待出发',
-        value: '2'
-      },
-      {
-        name: '进行中',
-        value: '3'
-      },
-      {
-        name: '已结束',
-        value: '4'
-      }
-    ],
-    active: '0', // 顶部菜单栏默认选中，订单状态：(0全部1待支付2待出发3进行中4已结束)
-    current: 0, // 轮播图默认选中
-    pageSize: 20,
-    originScrollViewData: [],
-    booDeleteOrder: false,
-    booLock: false,
-    refresherThreshold: 60, // 自定义下拉刷新阈值
-    booCancelOrder: false,
-    booPayment: false,
-    itemData: {} // 当前选中的订单
-  },
-  // 下拉刷新加锁
-  freshing: false,
-  timer: null,
-
-  /**
-   * 生命周期函数--监听页面加载
-   */
-  onLoad: function (options) {
-    this.setOriginScrollViewData()
-  },
-
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide: function () {
-
-  },
-
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload: function () {
-    clearTimeout(this.timer)
-  },
-  bindCallBack() {
-    this.onRefresh({ detail: { dy: this.data.refresherThreshold } })
-  },
-  jumpOrderDetail(e) {
-    const { orderId } = e.currentTarget.dataset
-    wx.navigateTo({
-      url: '/pages/orderDetail/orderDetail?orderId=' + orderId
-    })
-  },
-  setOriginScrollViewData() {
-    const temp = []
-    for (let i = 0; i < this.data.tabs.length; i++) {
-      temp.push({
-        finished: false, // 所有数据是否加载完
-        isRefresh: false, // 是否下拉刷新
-        isFetchLock: false, // 接口调用加锁
-        pageNum: 0,
-        list: [],
-        scrollY: 0,
-        isFirst: true // 是否首次获取列表
-      })
-    }
-
-    this.setData({
-      originScrollViewData: temp
-    }, () => {
-      this.fetOrderList()
-    })
-  },
-  changeTabs(e) {
-    const value = e.currentTarget.dataset.value
-    const index = this.data.tabs.findIndex(item => item.value === value)
-    const temp = this.data.originScrollViewData[index]
-
-    this.setData({
-      active: value,
-      current: index
-    }, () => {
-      if (temp.isFirst) {
-        this.fetOrderList()
-      }
-    })
-  },
-  handleSwiper(e) {
-    const { current, source } = e.detail
-    const item = this.data.tabs[current]
-    if (source) {
-      this.setData({
-        active: item.value
-      }, () => {
-        const temp = this.data.originScrollViewData[current]
-        if (temp.isFirst) {
-          this.fetOrderList()
-        }
-      })
-    }
-  },
-  async fetOrderList() {
-    const that = this
-    const _tab = that.data.tabs.findIndex(item => item.value === that.data.active)
-    const temp = that.data.originScrollViewData[_tab]
-
-    if (Object.prototype.toString.call(temp) !== '[object Object]') {
-      return
-    }
-
-    if (temp.finished) {
-      return
-    }
-
-    if (temp.isFetchLock) {
-      return
-    }
-
-    that.setData({
-      ['originScrollViewData[' + _tab + '].isFetchLock']: true,
-      ['originScrollViewData[' + _tab + '].pageNum']: temp.pageNum + 1
-    })
-    try {
-      const { status, data, msg } = await getOrderList({
-        pageNum: that.data.originScrollViewData[_tab].pageNum,
-        pageSize: that.data.pageSize,
-        type: that.data.tabs[_tab].value
-      })
-      if (status) {
-        const { list } = data
-        if (Array.isArray(list)) {
-          const arr = list.map(item => {
-            return {
-              ...item,
-              created_at: item.created_at.replace(/(.*)(:\d{2})/, '$1')
-            }
-          })
-          const _list = temp.isRefresh
-            ? [].concat(arr)
-            : that.data.originScrollViewData[_tab].list.concat(arr)
-
-          that.setData({
-            ['originScrollViewData[' + _tab + '].list']: _list,
-            ['originScrollViewData[' + _tab + '].finished']: list.length < 10,
-            ['originScrollViewData[' + _tab + '].isRefresh']: false,
-            ['originScrollViewData[' + _tab + '].isFetchLock']: false,
-            ['originScrollViewData[' + _tab + '].isFirst']: false
-          })
-        }
-      } else {
-        wx.showToast({
-          title: msg,
-          icon: 'none'
-        })
-      }
-    } catch (e) {}
-    if (that.freshing) {
-      that.freshing = false
-    }
-  },
-  onRefresh(e) {
-    const { dy } = e.detail
-    if (dy < this.data.refresherThreshold || this.freshing) {
-      return
-    }
-    const _tab = this.data.tabs.findIndex(item => item.value === this.data.active)
-    this.freshing = true
-    // 这里设置延时的目的：页面数据不足一屏时，更好的展示下拉刷新动画
-    this.timer = setTimeout(() => {
-      clearTimeout(this.timer)
-      this.setData({
-        ['originScrollViewData[' + _tab + '].pageNum']: 0,
-        pageSize: 20,
-        ['originScrollViewData[' + _tab + '].finished']: false,
-        ['originScrollViewData[' + _tab + '].isRefresh']: true,
-        ['originScrollViewData[' + _tab + '].isFetchLock']: false
-      }, () => {
-        this.fetOrderList()
-      })
-    }, 1000)
-  },
-  showDeleteOrder(e) {
-    const { item } = e.currentTarget.dataset
-
-    this.setData({
-      booDeleteOrder: true,
-      itemData: item
-    })
-  },
-  hideDeleteOrder() {
-    this.setData({
-      booDeleteOrder: false,
-      itemData: {}
-    })
-  },
-  async confirmDeleteOrder() {
-    const { id } = this.data.itemData
-
-    this.setData({
-      booLock: true
-    })
-    try {
-      const { status, msg } = await postOrderDelete(id)
-      let _msg = ''
-      if (status) {
-        _msg = '订单删除成功'
-        // 更新全部：去除各个列表中有相同id的
-        const originScrollViewData = this.data.originScrollViewData
-        for (let i = 0; i < originScrollViewData.length; i++) {
-          const _list = originScrollViewData[i].list
-          const _delIndex = _list.findIndex(item => item.id === id)
-          if (_delIndex > -1) {
-            _list.splice(_delIndex, 1)
-            this.setData({
-              ['originScrollViewData[' + i + '].list']: _list
-            })
-          }
-        }
-
-        this.hideDeleteOrder()
-      } else {
-        _msg = msg
-      }
-      wx.showToast({
-        title: _msg,
-        icon: 'none'
-      })
-    } catch (err) {}
-    this.setData({
-      booLock: false
-    })
-  },
-  showPayment(e) {
-    const { item } = e.currentTarget.dataset
-
-    this.setData({
-      itemData: item,
-      booPayment: true
-    })
-  },
-  hidePayment() {
-    this.setData({
-      booPayment: false,
-      itemData: {}
-    })
-  },
-  async handleOrderDiffPay() {
-    const { order_number, id } = this.data.itemData
-
-    this.setData({
-      booLock: true
-    })
-
-    try {
-      const { status, data, msg } = await postOrderDiffPay(order_number)
-      if (status) {
-        const { time_stamp, nonce_str, sign_type, pay_sign } = data.pay_data
-        wx.requestPayment({
-          timeStamp: time_stamp,
-          nonceStr: nonce_str,
-          package: data.pay_data.package,
-          signType: sign_type,
-          paySign: pay_sign,
-          success(res) {
-            if (res.errMsg === 'requestPayment:ok') {
-              wx.redirectTo({
-                url: '/pages/orderDetail/orderDetail?orderId=' + id
-              })
-            } else {
-              wx.showToast({
-                title: '支付出错，请重试~',
-                icon: 'none'
-              })
-            }
-          },
-          fail(err) {
-            console.log(err)
-          }
-        })
-      } else {
-        wx.showToast({
-          title: msg,
-          icon: 'none'
-        })
-      }
-    } catch (err) {}
-    this.setData({
-      booLock: false
-    })
-  },
-  showCancelOrder(e) {
-    const { item } = e.currentTarget.dataset
-
-    this.setData({
-      itemData: item,
-      booCancelOrder: true
-    })
-  },
-  hideCancelOrder() {
-    this.setData({
-      booCancelOrder: false,
-      itemData: {}
-    })
-  },
-  async confirmCancelOrder() {
-    const { id } = this.data.itemData
-    this.setData({
-      booLock: true
-    })
-    try {
-      const { status, msg } = await postOrderCancel(id)
-      if (status) {
-        this.hideCancelOrder()
-        wx.redirectTo({
-          url: '/pages/orderCancel/orderCancel?orderId=' + id
-        })
-      } else {
-        wx.showToast({
-          title: msg,
-          icon: 'none'
-        })
-      }
-    } catch (err) {}
-    this.setData({
-      booLock: false
-    })
-  }
-})

htmldev/wxMini/pages/order/order.json

@@ -1,8 +0,0 @@
-{
-  "usingComponents": {
-    "van-loading": "@vant/weapp/loading/index",
-    "van-popup": "@vant/weapp/popup/index"
-  },
-  "navigationBarTitleText": "我的订单",
-  "backgroundColor": "#F6F6F6"
-}

htmldev/wxMini/pages/order/order.wxml

@@ -1,220 +0,0 @@
-<!-- 顶部导航 -->
-<view class="nav-wrap">
-  <scroll-view
-    class="nav"
-    scroll-x>
-    <view bindtap="changeTabs"
-          class="nav-item"
-          data-value="{{item.value}}"
-          wx:for="{{tabs}}"
-          wx:key="value">
-      <text class="{{item.value === active ? 'active' : ''}}">{{item.name}}</text>
-    </view>
-  </scroll-view>
-</view>
-
-  <!-- 内容区 -->
-<view class="main">
-  <swiper style="height:100%"
-          current="{{current}}"
-          bindchange="handleSwiper">
-    <swiper-item wx:for="{{originScrollViewData}}"
-                 wx:key="index">
-      <scroll-view scroll-y
-                   style="height:100%;"
-                   refresher-enabled="{{true}}"
-                   refresher-threshold="{{refresherThreshold}}"
-                   refresher-default-style="none"
-                   refresher-background="#FFF"
-                   refresher-triggered="{{item.isRefresh}}"
-                   bindrefresherpulling="onRefresh"
-                   bindscrolltolower="fetOrderList">
-        <!-- 下拉刷新 -->
-        <view slot="refresher" class="pulldown-wrapper">
-          <van-loading
-            wx:if="{{item.isRefresh}}"
-            size="24px"
-            type="spinner">加载中...
-          </van-loading>
-          <view wx:if="{{!item.isRefresh}}" class="van-loading">
-            <text class="van-loading__text">下拉刷新</text>
-          </view>
-        </view>
-
-        <view class="list"
-              wx:for="{{item.list}}"
-              wx:for-item="order"
-              wx:key="id"
-              data-order-id="{{order.id}}"
-              bind:tap="jumpOrderDetail">
-          <view class="top">
-            <view class="add-time">{{order.created_at}}</view>
-            <!-- 待支付、待接单、待安排车辆、待出发 -->
-            <view
-              class="status-text {{order.order_status === 1 || order.order_status === 3 || order.order_status === 4|| order.order_status === 5 ? 'active' : ''}}">
-              {{['', '待支付', '已取消', '待接单', '待安排车辆', '待出发', '行驶中', '已完成'][order.order_status]}}
-            </view>
-          </view>
-          <view class="middle">
-            <view class="start">
-              <text class="label">起</text>
-              <text class="value">{{order.start_point.address_name}}{{order.start_point.name}}</text>
-            </view>
-            <view class="end">
-              <text class="label">终</text>
-              <text class="value">{{order.end_point.address_name}}{{order.end_point.name}}</text>
-            </view>
-          </view>
-          <view
-            class="bottom"
-            wx:if="{{order.order_status === 2 || order.order_status === 7 || order.order_status === 3 || (order.order_status !== 2 && order.order_diff_price > 0 && order.order_diff_status === 0)}}">
-            <button
-              type="primary"
-              hover-class="none"
-              form-type="submit"
-              data-item="{{order}}"
-              catch:tap="showDeleteOrder"
-              wx:if="{{order.order_status === 2 || order.order_status === 7}}">删除订单
-            </button>
-            <block>
-              <button
-                type="primary"
-                hover-class="none"
-                form-type="submit"
-                data-item="{{order}}"
-                catch:tap="showCancelOrder"
-                wx:if="{{order.order_status === 3}}">取消订单
-              </button>
-              <button
-                class="diff-price"
-                type="primary"
-                hover-class="none"
-                form-type="submit"
-                data-item="{{order}}"
-                disabled="{{booLock}}"
-                catch:tap="showPayment"
-                wx:if="{{order.order_status !== 2 && order.order_diff_price > 0 && order.order_diff_status === 0}}">补价
-              </button>
-            </block>
-          </view>
-        </view>
-
-        <view class="list-bitmap" wx:if="{{item.finished && item.list.length < 1}}">
-          <image src="{{tools.imgFilter('/common/Order_page_default@2x.png')}}"></image>
-          <text>暂无订单</text>
-        </view>
-
-        <!-- 上拉加载 -->
-        <view class="pullup-wrapper" wx:if="{{!item.isRefresh}}">
-          <van-loading
-            wx:if="{{!item.finished}}"
-            size="24px"
-            type="spinner">加载中...
-          </van-loading>
-          <view wx:if="{{item.finished && item.list.length > 0}}" class="van-loading">
-            <text class="van-loading__text">没有更多了</text>
-          </view>
-        </view>
-      </scroll-view>
-    </swiper-item>
-  </swiper>
-</view>
-
-  <!-- 弹窗：删除订单二次确认 -->
-<van-popup
-  custom-class="customer-van-model"
-  show="{{ booDeleteOrder }}"
-  bind:close="hideDeleteOrder">
-  <view class="customer-van-model_body">
-    <view class="content">订单删除后将无法恢复，您也无法再对它进行投诉。</view>
-  </view>
-  <view class="customer-van-model_footer">
-    <button class="customer-van-model_cancel"
-            hover-class="none"
-            type="default"
-            bind:tap="hideDeleteOrder">取消
-    </button>
-    <button class="customer-van-model_confirm"
-            hover-class="none"
-            type="primary"
-            disabled="{{booLock}}"
-            bind:tap="confirmDeleteOrder">确定
-    </button>
-  </view>
-</van-popup>
-
-  <!-- 弹窗：取消订单二次确认 -->
-<van-popup
-  custom-class="customer-van-model"
-  show="{{ booCancelOrder }}"
-  bind:close="hideCancelOrder">
-  <view class="customer-van-model_body">
-    <view class="content cancel-order" wx:if="{{itemData.order_status === 5}}">
-      <text wx:for="{{'司机车辆已安排，订单取消将'}}" wx:for-index="index" wx:key="index">{{item}}</text>
-      <text wx:for="{{'扣除定金'}}" wx:for-index="idx" wx:key="idx" style="color:#FD6600;">{{item}}</text>
-    </view>
-    <view class="content" wx:else>确认取消订单吗？</view>
-  </view>
-  <view class="customer-van-model_footer">
-    <button class="customer-van-model_cancel"
-            hover-class="none"
-            type="default"
-            disabled="{{booLock}}"
-            bind:tap="confirmCancelOrder">仍要取消
-    </button>
-    <button class="customer-van-model_confirm"
-            hover-class="none"
-            type="primary"
-            bind:tap="hideCancelOrder">继续用车
-    </button>
-  </view>
-</van-popup>
-  <!--弹窗：补价-->
-<van-popup
-  custom-class="customer-van-popup customer-van-popup-diff-price"
-  show="{{ booPayment }}"
-  close-on-click-overlay="{{false}}"
-  round
-  position="bottom"
-  bind:close="hidePayment">
-  <view style="right:0;top:0;"
-        class="close-icon"
-        bind:tap="hidePayment">
-    <image class="image" src="{{tools.imgFilter('/common/Popup_bus_icon_close@2x.png')}}"></image>
-  </view>
-  <view class="title">补价</view>
-  <view class="customer-van-popup-diff-price-body">
-    <view class="alert">
-      <view>根据商定的实际需支付金额，调整订单总金额及增付相应定金。平台定价系统升级前，暂时需人工调整合理价格，敬请谅解~</view>
-    </view>
-    <view class="amount">
-      <view class="label">
-        <view>订单总金额</view>
-        <view>(调整后)</view>
-      </view>
-      <view class="value">{{tools.fen2Yuan(itemData.order_price)}}元</view>
-    </view>
-    <view class="diff-price">
-      <text class="label">¥</text>
-      <text class="value">{{tools.fen2Yuan(itemData.order_diff_price)}}</text>
-    </view>
-    <view class="diff-price-text">需增付定金</view>
-    <view class="wechat">
-      <view class="name">
-        <image class="logo"
-               src="{{tools.imgFilter('/createOrder/Popup_defray_logo_wechat@2x.png')}}"></image>
-        <text>微信支付</text>
-      </view>
-      <image class="checked"
-             src="{{tools.imgFilter('/createOrder/Reason_btn_check@2x.png')}}"></image>
-    </view>
-  </view>
-  <button class="customer-picker_footer"
-          style="background-color: #FD6600;"
-          hover-class="none"
-          type="primary"
-          disabled="{{booLock}}"
-          bind:tap="handleOrderDiffPay">立即支付
-  </button>
-</van-popup>
-<wxs src="../../components/wxs/index.wxs" module="tools"></wxs>

htmldev/wxMini/pages/order/order.wxss

@@ -1,194 +0,0 @@
-.nav-wrap {
-  position: fixed;
-  left: 0;
-  top: 0;
-  z-index: 10;
-  width: 100%;
-}
-
-.nav-wrap .nav {
-  width: 100%;
-  background: rgba(255, 255, 255, 1);
-  font-size: 0;
-}
-
-.nav-wrap .nav-item {
-  display: inline-block;
-  width: 150rpx;
-  text-align: center;
-
-}
-
-.nav-wrap text {
-  position: relative;
-  left: 0;
-  top: 0;
-  display: inline-block;
-  height: 94rpx;
-  line-height: 94rpx;
-  color: #999999;
-  font-size: 30rpx;
-}
-
-
-.nav-wrap text.active {
-  font-weight: 500;
-  color: #4A6A96;
-}
-
-.nav-wrap text.active:after {
-  position: absolute;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  content: '';
-  height: 4rpx;
-  border-radius: 32px;
-  background: #4A6A96;
-}
-
-
-.main {
-  position: absolute;
-  left: 0;
-  top: 102rpx;
-  right: 0;
-  bottom: 0;
-  width: 100%;
-  background: #F6F6F6;
-}
-
-.pulldown-wrapper,
-.pullup-wrapper {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 100%;
-  height: 60px;
-}
-
-.van-loading__text {
-  color: #969799;
-  font-size: 14px;
-  line-height: 20px;
-}
-
-.list {
-  width: 718rpx;
-  border-radius: 24rpx;
-  overflow: hidden;
-  padding: 0 32rpx;
-  margin: 20rpx auto 0;
-  background: rgba(255, 255, 255, 1);
-}
-
-.list .top {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-  padding: 32rpx 0;
-}
-
-.list .add-time {
-  color: #666666;
-  font-size: 28rpx;
-  line-height: 34rpx;
-}
-
-.list .status-text {
-  color: #666666;
-  font-size: 28rpx;
-  line-height: 34rpx;
-}
-
-.list .status-text.active {
-  color: #FD6600;
-}
-
-.list .middle {
-  padding-bottom: 40rpx;
-}
-
-.list .middle view {
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-}
-
-.list .middle .end {
-  margin-top: 30rpx;
-}
-
-.list .middle .label {
-  width: 32rpx;
-  height: 32rpx;
-  border-radius: 50%;
-  line-height: 32rpx;
-  color: #FFFFFF;
-  font-size: 20rpx;
-  font-weight: 500;
-  text-align: center;
-}
-
-.list .middle .start .label {
-  background: #333333;
-}
-
-.list .middle .end .label {
-  background: #FD6600;
-}
-
-.list .middle .value {
-  width: 590rpx;
-  color: #333333;
-  font-size: 28rpx;
-  font-weight: 500;
-  line-height: 34rpx;
-  white-space: nowrap;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.list .bottom {
-  position: relative;
-  left: 0;
-  top: 0;
-  display: flex;
-  justify-content: flex-end;
-  align-items: center;
-  padding: 24rpx 0;
-}
-
-.list .bottom button {
-  margin-left: 24rpx;
-}
-
-.list .bottom button:nth-of-type(1) {
-  margin-left: 0;
-}
-
-.list .bottom:before {
-  position: absolute;
-  left: 8rpx;
-  right: 8rpx;
-  top: 0;
-  content: '';
-  border-bottom: 1px solid #EEEEEE;
-}
-
-.list .bottom button[type='primary'] {
-  min-width: 119rpx;
-  height: 64rpx;
-  padding: 0 12rpx;
-  border-radius: 12rpx;
-  border: 1px solid #E9E9E9;
-  background-color: #FFFFFF;
-  color: #333333;
-  font-size: 24rpx;
-}
-
-.list .bottom button.diff-price {
-  min-width: 96rpx;
-  border-color: #FD6600;
-  color: #FD6600;
-}