Merge branch 'dev' into dev_fy924

# Conflicts:
#	src/components/orderComponents/orderList.vue

src/components/orderComponents/orderList.vue

@@ -355,6 +355,10 @@
         <el-button type="primary" class="submit-btn" @click.stop="commitCancelReason(orderId)">确定</el-button>
       </div>
     </el-dialog>
+    <!-- 加小费弹出层 -->
+    <el-dialog width="580px" center title="取消原因" destroy-on-close :visible.sync="addTipStatus">
+
+    </el-dialog>
   </div>
 </template>
 
@@ -382,9 +386,11 @@ export default {
   name: "OrderList",
   data() {
     return {
-      reasonIndex: null,
-      chooseReason: "",
-      cancelReason: "",
+      addTipTimer: null, // 加小费刷新支付计时器
+      addTipStatus: true, // 加小费弹出层
+      reasonIndex: null, // 取消原因索引
+      chooseReason: '', // 选择取消原因
+      cancelReason: '', // 输入取消原因
       cancelList: [
         { id: 1, name: "无骑手接单" },
         { id: 2, name: "骑手接单后不取货" },
@@ -396,16 +402,16 @@ export default {
         { id: 8, name: "其他原因" },
       ],
       timeList: [1, 1.5, 2, 2.5, 3, 3.5, 4, 5, 6, 7, 8, 9, 10, 11, 12],
-      timeValue: 1,
-      cancelStatus: false,
-      settingTimeStatus: false,
+      timeValue: 1, // 定时发单，默认1小时
+      cancelStatus: false, // 取消订单弹出层
+      settingTimeStatus: false, // 定时发单弹出层
       needTrack: false,
       orderDetailStutus: 0,
       isLoading: false,
       dialogTableVisible: false,
-      ignoreStatus: false,
-      remark: "",
-      orderId: "",
+      ignoreStatus: false, // 忽略订单弹出层
+      remark: '',
+      orderId: '',
       item: {},
       radio: "",
       needTrack: false,
@@ -447,6 +453,9 @@ export default {
     ...mapState(["userInfo"]),
   },
   methods: {
+    addTip(orderId) {
+
+    },
     changeReason(item) {
       this.reasonIndex = item.id;
       this.chooseReason = item.name;

src/components/orderComponents/sendOrderPopup.vue

@@ -84,7 +84,7 @@
             <span>支付方式</span>
           </div>
           <div class="pay-list">
-            <div class="pay-item" @click.stop="createOrder(item)" :class=" this.payId == item.id ? 'pay-active' : '' " v-for="(item, index) in payList"
+            <div class="pay-item" @click.stop="createOrder(item)" :class="payId == item.id ? 'pay-active' : '' " v-for="(item, index) in payList"
               :key="index">
               <img :src="item.icon" class="pay-icon" />
               <span>{{ item.name }}</span>