feat：

1. 订单管理-增加待确认状态、增加确认订单功能
2. 订单管理-增加显示支付方式
3. 商户入驻配置-增加是否允许到店支付选择

src/api/order.js

@@ -109,6 +109,15 @@ export function cancelOrder(params) {
   })
 }
 
+// 确认订单
+export function confirm2Order(params) {
+  return request({
+    url: '/order/ackOrder',
+    method: 'post',
+    params
+  })
+}
+
 // 确认收款
 export function confirmOrder(params) {
   return request({

src/views/mallManagement/order/order_list/index.vue

@@ -107,6 +107,7 @@
               <el-tabs v-model="tabCurrent" type="card" @tab-click="changeTabs" class="fl" style="margin-right: 20px">
                 <el-tab-pane label="全部" name="ALL"></el-tab-pane>
                 <el-tab-pane label="待付款" name="NOPAY"></el-tab-pane>
+                <el-tab-pane label="待确认" name="DQR"></el-tab-pane>
                 <el-tab-pane label="待发货" name="DFH"></el-tab-pane>
                 <el-tab-pane label="已发货" name="YFH"></el-tab-pane>
                 <el-tab-pane label="已完成" name="OVER"></el-tab-pane>
@@ -149,6 +150,7 @@
                 <span><b>商户</b>：{{ order.companyWechatName || '无' }}</span>
                 <span><b>网点</b>：{{ order.websitName || '无' }}</span>
                 <el-tag>{{order.saleType | saleTypeFilter}}</el-tag>
+                <el-tag>{{order.payType}}</el-tag>
                 <div class="fr">
                   <el-link type="primary" v-if="$restrict('orderNote')" :underline="false" @click="showRemark(order)">订单备注</el-link>
                   <el-link type="primary" v-if="$restrict('detail')" :underline="false" @click="queryDetail(order.orderId)">查看详情</el-link>
@@ -242,6 +244,14 @@
                   <el-col :span="2" style="height: 100%;">
                     <div class="col-item">
                       <div class="operate">
+                        <el-popconfirm title="确定确认订单吗？" @confirm="confirmOrder(order.orderId)"
+                          v-if="order.orderStatus === 'DQR' && $restrict('confirmOrder')">
+                          <el-button slot="reference" type="text" size="small">确认订单</el-button>
+                        </el-popconfirm>
+                        <el-popconfirm title="确定取消发货吗？" @confirm="cancelOrder(order.orderId)"
+                          v-if="order.orderStatus === 'DQR' && $restrict('cancelOrder')">
+                          <el-button slot="reference" type="text" size="small">取消发货</el-button>
+                        </el-popconfirm>
                         <el-popconfirm title="确定取消订单吗？" @confirm="cancelOrder(order.orderId)"
                           v-if="order.orderStatus === 'NOPAY' && $restrict('cancelOrder')">
                           <el-button slot="reference" type="text" size="small">取消订单</el-button>
@@ -260,10 +270,10 @@
                           @click="queryLogistics(order)">
                           查看物流
                         </el-button>
-							  <el-button type="text" size="small"
-							    v-if="(order.orderStatus === 'YFH' || order.orderStatus === 'OVER')" @click="showLogistics(order, 'detail')">
-							    查看发货条码
-							  </el-button>
+                        <el-button type="text" size="small"
+                          v-if="(order.orderStatus === 'YFH' || order.orderStatus === 'OVER')" @click="showLogistics(order, 'detail')">
+                          查看发货条码
+                        </el-button>
                         <!-- toWorkOrderDetail(order.orderId) -->
                         <el-button type="text" size="small" v-if="order.toWorkOrder && $restrict('workOrder_detail')"
                           @click="queryWorkOrder(order.orderId)">查看工单</el-button>
@@ -639,7 +649,7 @@
 
 <script>
 import { getToken } from '@/utils/auth'
-import { cancelOrder, getList, goodsDeliver, saveRemark, batchShipment, batchRemark, getWebsiteList, editLogistics, getRegion, editAddress, getOrderDetail, getCodeDetail, getMaterialList, listImport, saveCode, delCode } from "@/api/order";
+import { cancelOrder, confirm2Order, getList, goodsDeliver, saveRemark, batchShipment, batchRemark, getWebsiteList, editLogistics, getRegion, editAddress, getOrderDetail, getCodeDetail, getMaterialList, listImport, saveCode, delCode } from "@/api/order";
 import { getExpress, getCompanyList } from "@/api/common";
 import { downloadFiles, handleImport } from '@/utils/util'
 import { commonTemplateDownload } from '@/api/common.js'
@@ -1093,6 +1103,13 @@ export default {
         this.$successMsg('取消成功');
       })
     },
+    // 确认订单
+    confirmOrder(orderId) {
+      confirm2Order({ orderId }).then(() => {
+        this.getList();
+        this.$successMsg('确认成功');
+      })
+    },
     // 查看物流
     queryLogistics(order) {
       this.logisticsVisible = true

src/views/setting/organizationManagement/settledManagement/index.vue

@@ -6,7 +6,7 @@
       <div class="tips">说明：开通商户账号是指开通商城后台管理系统的总登录账号。</div>
 
       <el-card shadow="never" class="my-card">
-        <el-form class="my-form" ref="step1Form" :model="step1Form" :rules="step1FormRules" label-width="100px"
+        <el-form class="my-form" ref="step1Form" :model="step1Form" :rules="step1FormRules" label-width="140px"
           label-position="right">
           <el-form-item label="商户账号" prop="account">
             <el-input v-model="step1Form.account" autocomplete="off" placeholder="请输入商户账号"></el-input>
@@ -76,6 +76,10 @@
             <el-switch v-model="step1Form.moduleWb" active-color="#13ce66" inactive-color="#ff4949">
             </el-switch>
           </el-form-item>
+          <el-form-item label="是否允许到店支付" prop="storePay">
+            <el-switch v-model="step1Form.storePay" active-color="#13ce66" inactive-color="#ff4949">
+            </el-switch>
+          </el-form-item>
         </el-form>
       </el-card>
     </div>
@@ -383,6 +387,7 @@ export default {
         moduleMaterialPart: false,
         moduleYb: false,
         moduleWb: false,
+        storePay: false,
       },
       step1FormRules: {
         account: [
@@ -600,6 +605,7 @@ export default {
             moduleMaterialPart: this.step1Form.moduleMaterialPart,
             moduleYb: this.step1Form.moduleYb,
             moduleWb: this.step1Form.moduleWb,
+            storePay: this.step1Form.storePay,
             
             minLogo1: this.img1_url,
             minLogo2: this.img2_url,