linwenxin hai 1 ano
pai
achega
38af03623c

+ 1 - 1
src/views/mallManagement/activity/groupbuy_add/index.vue

@@ -90,7 +90,7 @@
 
           <el-table-column align="center" label="操作">
             <template slot-scope="scope">
-              <el-popconfirm title="确定删除吗?" @onConfirm="deleteMember(scope.$index)" >
+              <el-popconfirm title="确定删除吗?" @confirm="deleteMember(scope.$index)" >
                 <el-button slot="reference" type="text">删除</el-button>
               </el-popconfirm>
             </template>

+ 2 - 2
src/views/mallManagement/activity/groupbuy_index/index_cp.vue

@@ -59,10 +59,10 @@
             <template slot-scope="scope">
               <el-button type="text" @click="addOrEdit('edit', scope.row.promotionGroupId)">编辑</el-button>
               <template>
-                <el-popconfirm v-if="scope.row.status" style="margin: 0 10px;" title="确定关闭吗?" @onConfirm="changeActivityStatus(scope.row.promotionGroupId, false)" >
+                <el-popconfirm v-if="scope.row.status" style="margin: 0 10px;" title="确定关闭吗?" @confirm="changeActivityStatus(scope.row.promotionGroupId, false)" >
                   <el-button slot="reference" type="text">关闭</el-button>
                 </el-popconfirm>
-                <el-popconfirm v-else style="margin: 0 10px;" title="确定开启吗?" @onConfirm="changeActivityStatus(scope.row.promotionGroupId, true)" >
+                <el-popconfirm v-else style="margin: 0 10px;" title="确定开启吗?" @confirm="changeActivityStatus(scope.row.promotionGroupId, true)" >
                   <el-button slot="reference" type="text">开启</el-button>
                 </el-popconfirm>
               </template>

+ 5 - 5
src/views/mallManagement/activity/seckill_index/index.vue

@@ -61,10 +61,10 @@
                 <template slot-scope="scope">
                   <el-button type="text" @click="addOrEdit('edit', scope.row.secKillId)">编辑</el-button>
                   <template>
-                    <el-popconfirm v-if="scope.row.status" style="margin-left: 10px;" title="确定关闭吗?" @onConfirm="changeActivityStatus(scope.row.secKillId, 0)" >
+                    <el-popconfirm v-if="scope.row.status" style="margin-left: 10px;" title="确定关闭吗?" @confirm="changeActivityStatus(scope.row.secKillId, 0)" >
                       <el-button slot="reference" type="text">关闭</el-button>
                     </el-popconfirm>
-                    <el-popconfirm v-else style="margin-left: 10px;" title="确定开启吗?" @onConfirm="changeActivityStatus(scope.row.secKillId, 1)" >
+                    <el-popconfirm v-else style="margin-left: 10px;" title="确定开启吗?" @confirm="changeActivityStatus(scope.row.secKillId, 1)" >
                       <el-button slot="reference" type="text">开启</el-button>
                     </el-popconfirm>
                   </template>
@@ -133,14 +133,14 @@
               
               <el-table-column align="center" label="操作" width="180">
                 <template slot-scope="scope">
-                  <el-popconfirm title="确定删除吗?" @onConfirm="deleteGoods(scope.row.secKillSpecId)" >
+                  <el-popconfirm title="确定删除吗?" @confirm="deleteGoods(scope.row.secKillSpecId)" >
                     <el-button slot="reference" type="text">删除</el-button>
                   </el-popconfirm>
                   <template>
-                    <el-popconfirm v-if="scope.row.status == 1 || scope.row.status == 2" style="margin-left: 10px;" title="确定关闭吗?" @onConfirm="changeGoodsStatus(scope.row.secKillSpecId, 0)" >
+                    <el-popconfirm v-if="scope.row.status == 1 || scope.row.status == 2" style="margin-left: 10px;" title="确定关闭吗?" @confirm="changeGoodsStatus(scope.row.secKillSpecId, 0)" >
                       <el-button slot="reference" type="text">关闭</el-button>
                     </el-popconfirm>
-                    <el-popconfirm v-if="scope.row.status == 4" style="margin-left: 10px;" title="确定开启吗?" @onConfirm="changeGoodsStatus(scope.row.secKillSpecId, 1)" >
+                    <el-popconfirm v-if="scope.row.status == 4" style="margin-left: 10px;" title="确定开启吗?" @confirm="changeGoodsStatus(scope.row.secKillSpecId, 1)" >
                       <el-button slot="reference" type="text">开启</el-button>
                     </el-popconfirm>
                   </template>

+ 1 - 1
src/views/mallManagement/goods/classify_index/index.vue

@@ -38,7 +38,7 @@
               <el-button type="primary" size="mini" icon="el-icon-plus" v-if="scope.row.level == 1" @click="addOrEditChild('add', scope.row.categoryId)"></el-button>
               <el-button type="primary" size="mini" icon="el-icon-edit" v-if="scope.row.level == 1" @click="addOrEditParent('edit', scope.row.categoryId)"></el-button>
               <el-button type="primary" size="mini" icon="el-icon-edit" v-if="scope.row.level == 2" @click="addOrEditChild('edit', scope.row.categoryId)"></el-button>
-              <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @onConfirm="handleDelete(scope.row.categoryId)" >
+              <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @confirm="handleDelete(scope.row.categoryId)" >
                 <el-button slot="reference" size="mini" icon="el-icon-delete"></el-button>
               </el-popconfirm>
 

+ 1 - 1
src/views/mallManagement/goods/explain_add/index.vue

@@ -69,7 +69,7 @@
         <el-button type="primary" @click="submitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
         <el-popconfirm
           title="确定关闭吗?"
-          @onConfirm="goBack"
+          @confirm="goBack"
           style="margin-left: 10px;"
         >
           <el-button slot="reference">关 闭</el-button>

+ 1 - 1
src/views/mallManagement/goods/explain_common/index.vue

@@ -31,7 +31,7 @@
         <el-button type="primary" @click="submitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
         <el-popconfirm
           title="确定关闭吗?"
-          @onConfirm="goBack"
+          @confirm="goBack"
           style="margin-left: 10px;"
         >
           <el-button slot="reference">关 闭</el-button>

+ 1 - 1
src/views/mallManagement/goods/explain_index/index.vue

@@ -17,7 +17,7 @@
           <el-table-column align="center" label="操作" width="140">
             <template slot-scope="scope">
               <el-button type="primary" size="mini" @click="addOrEdit('edit', scope.row.commonTemplateId)">编辑</el-button>
-              <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @onConfirm="delItem(scope.row.commonTemplateId)" >
+              <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @confirm="delItem(scope.row.commonTemplateId)" >
                 <el-button slot="reference" size="mini">删除</el-button>
               </el-popconfirm>
             </template>

+ 2 - 2
src/views/mallManagement/goods/goods_add/index.vue

@@ -278,7 +278,7 @@
             <el-table-column align="center" label="操作">
               <template slot-scope="scope">
                 <!-- <el-button type="text" @click="editExam('theory', scope.row.index)">编辑</el-button> -->
-                <el-popconfirm title="确定删除吗?" @onConfirm="deleteSpec(scope.row.index)">
+                <el-popconfirm title="确定删除吗?" @confirm="deleteSpec(scope.row.index)">
                   <el-button slot="reference" type="text">删除</el-button>
                 </el-popconfirm>
               </template>
@@ -368,7 +368,7 @@
         <el-button @click="changeStep(1)" v-show="step < 2">下一步</el-button>
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交'
         }}</el-button>
-        <el-popconfirm title="确定关闭吗?" @onConfirm="goBack" style="margin-left: 10px;">
+        <el-popconfirm title="确定关闭吗?" @confirm="goBack" style="margin-left: 10px;">
           <el-button slot="reference">关 闭</el-button>
         </el-popconfirm>
       </div>

+ 4 - 4
src/views/mallManagement/goods/goods_index/index.vue

@@ -159,20 +159,20 @@
           <el-table-column align="center" label="操作" width="280" fixed="right">
             <template slot-scope="scope">
               <!-- <template>
-                <el-popconfirm v-if="scope.row.status" style="margin-right: 10px;" title="确定冻结吗?" @onConfirm="changeMemberStatus(scope.row.goodsId, 0)" >
+                <el-popconfirm v-if="scope.row.status" style="margin-right: 10px;" title="确定冻结吗?" @confirm="changeMemberStatus(scope.row.goodsId, 0)" >
                   <el-button slot="reference" type="text">冻结</el-button>
                 </el-popconfirm>
-                <el-popconfirm v-else style="margin-right: 10px;" title="确定恢复吗?" @onConfirm="changeMemberStatus(scope.row.goodsId, 1)" >
+                <el-popconfirm v-else style="margin-right: 10px;" title="确定恢复吗?" @confirm="changeMemberStatus(scope.row.goodsId, 1)" >
                   <el-button slot="reference" type="text">恢复</el-button>
                 </el-popconfirm>
               </template> -->
 
               <el-button type="primary" size="mini" @click="addOrEdit('edit', scope.row.goodsId)">编辑</el-button>
-              <el-popconfirm style="margin-left: 10px; margin-right: 10px" title="确定克隆吗?" @onConfirm="clone(scope.row.goodsId)" >
+              <el-popconfirm style="margin-left: 10px; margin-right: 10px" title="确定克隆吗?" @confirm="clone(scope.row.goodsId)" >
                 <el-button slot="reference" type="primary" size="mini">克隆</el-button>
               </el-popconfirm>
               <el-button type="primary" size="mini" class="tag-read" @click="copy(scope.row.goodsId)" :data-clipboard-text="scope.row.goodsId">复制链接</el-button>
-              <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @onConfirm="delItem(scope.row.goodsId, scope.row.goodsSpecId)" >
+              <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @confirm="delItem(scope.row.goodsId, scope.row.goodsSpecId)" >
                 <el-button slot="reference" size="mini">删除</el-button>
               </el-popconfirm>
             </template>

+ 2 - 2
src/views/mallManagement/goods/newclassify_index/index.vue

@@ -27,10 +27,10 @@
               <template slot-scope="scope">
                 <el-button type="primary" size="mini" @click="addClassification('edit', scope.row.goodsNewsCategoryId)">编辑</el-button>
                 <el-button type="primary" size="mini" @click="setUp(scope.row)">配置</el-button>
-                <el-popconfirm style="margin-left: 10px" :title="scope.row.status?'确定关闭吗?':'确定开启吗?'" @onConfirm="closeItem(scope.row)">
+                <el-popconfirm style="margin-left: 10px" :title="scope.row.status?'确定关闭吗?':'确定开启吗?'" @confirm="closeItem(scope.row)">
                   <el-button slot="reference" size="mini">{{ scope.row.status ? "关闭" : "开启" }}</el-button>
                 </el-popconfirm>
-                <el-popconfirm style="margin-left: 10px" title="确定删除吗?" @onConfirm="deleteItem(scope.row)">
+                <el-popconfirm style="margin-left: 10px" title="确定删除吗?" @confirm="deleteItem(scope.row)">
                   <el-button slot="reference" size="mini" type="danger">删除</el-button>
                 </el-popconfirm>
               </template>

+ 1 - 1
src/views/mallManagement/goods/watermark/index.vue

@@ -15,7 +15,7 @@
           <el-table-column align="center" label="操作" width="140">
             <template slot-scope="scope">
               <el-button type="primary" size="mini" @click="addOrEdit('edit', scope.row.commonTemplateId)">编辑</el-button>
-              <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @onConfirm="delItem(scope.row.commonTemplateId)" >
+              <el-popconfirm style="margin-left: 10px;" title="确定删除吗?" @confirm="delItem(scope.row.commonTemplateId)" >
                 <el-button slot="reference" size="mini">删除</el-button>
               </el-popconfirm>
             </template>

+ 1 - 1
src/views/mallManagement/goods/watermark_add/index.vue

@@ -74,7 +74,7 @@
         <el-button type="primary" @click="submitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
         <el-popconfirm
           title="确定关闭吗?"
-          @onConfirm="goBack"
+          @confirm="goBack"
           style="margin-left: 10px;"
         >
           <el-button slot="reference">关 闭</el-button>

+ 3 - 3
src/views/mallManagement/order/order_detail/index.vue

@@ -23,17 +23,17 @@
             </div>
             <div class="order-main-opt-btn">
               <template v-if="orderDetail.orderStatus === 'NOPAY'">
-                <el-popconfirm title="确定收款吗?" @onConfirm="confirmOrder">
+                <el-popconfirm title="确定收款吗?" @confirm="confirmOrder">
                   <el-button slot="reference" size="small">确认收款</el-button>
                 </el-popconfirm>
                 <el-button size="small" @click="showDialog('price')" style="margin-left: 10px;">修改价格</el-button>
-                <el-popconfirm title="确定取消订单吗?" @onConfirm="cancelOrder" style="margin-left: 10px;">
+                <el-popconfirm title="确定取消订单吗?" @confirm="cancelOrder" style="margin-left: 10px;">
                   <el-button slot="reference" size="small" type="danger">取消订单</el-button>
                 </el-popconfirm>
               </template>
               <template v-if="orderDetail.orderStatus === 'DFH'">
                 <el-button size="small" type="primary" @click="showDialog('send')">发货</el-button>
-                <el-popconfirm title="确定取消订单吗?" @onConfirm="cancelOrder" style="margin-left: 10px;">
+                <el-popconfirm title="确定取消订单吗?" @confirm="cancelOrder" style="margin-left: 10px;">
                   <el-button slot="reference" size="small" type="danger">取消订单</el-button>
                 </el-popconfirm>
               </template>

+ 1 - 1
src/views/mallManagement/order/order_list/index.vue

@@ -229,7 +229,7 @@
             <el-col :span="3" style="height: 100%;">
               <div class="col-item">
                 <div class="operate">
-                  <el-popconfirm title="确定取消订单吗?" @onConfirm="cancelOrder(order.orderId)" v-if="order.orderStatus === 'NOPAY'">
+                  <el-popconfirm title="确定取消订单吗?" @confirm="cancelOrder(order.orderId)" v-if="order.orderStatus === 'NOPAY'">
                     <el-button slot="reference" type="text" size="small">取消订单</el-button>
                   </el-popconfirm>
                   <el-button type="text" size="small" v-if="order.orderStatus === 'DFH'" @click="showLogistics(order, 'add')">发货</el-button>

+ 1 - 1
src/views/mallManagement/order/order_refund/index.vue

@@ -202,7 +202,7 @@
                 </div>
                 <div class="operate" v-if="order.orderStatus === 'DSJSH'">
                   <div>
-                    <el-popconfirm title="确定要收货吗?" @onConfirm="receiveProd(order.orderRefundId)">
+                    <el-popconfirm title="确定要收货吗?" @confirm="receiveProd(order.orderRefundId)">
                       <el-button slot="reference" type="text" size="small">确认收货</el-button>
                     </el-popconfirm>
                   </div>

+ 3 - 3
src/views/mallManagement/order/order_refund_detail/index.vue

@@ -22,15 +22,15 @@
             </div>
             <div class="order-refund-main-opt-btn">
               <template v-if="orderDetail.orderStatus === 'DSJCL'">
-                <el-popconfirm title="确定同意吗?" @onConfirm="changeExamineStatus('OK')">
+                <el-popconfirm title="确定同意吗?" @confirm="changeExamineStatus('OK')">
                   <el-button slot="reference" size="small" type="primary">同意</el-button>
                 </el-popconfirm>
-                <el-popconfirm title="确定拒绝吗?" @onConfirm="changeExamineStatus('FAIL')" style="margin-left: 10px;">
+                <el-popconfirm title="确定拒绝吗?" @confirm="changeExamineStatus('FAIL')" style="margin-left: 10px;">
                   <el-button slot="reference" size="small" type="warning">拒绝</el-button>
                 </el-popconfirm>
               </template>
               <template v-if="orderDetail.orderStatus === 'DSJSH'">
-                <el-popconfirm title="确定要收货吗?" @onConfirm="receiveProd()">
+                <el-popconfirm title="确定要收货吗?" @confirm="receiveProd()">
                   <el-button slot="reference" size="small" type="primary">确认收货</el-button>
                 </el-popconfirm>
                 <el-button type="success" size="small" @click="queryLogistics(orderDetail.logisticsNo)" v-if="orderDetail.logisticsNo" style="margin-left: 10px;">查看物流</el-button>

+ 2 - 2
src/views/setting/account/index.vue

@@ -39,10 +39,10 @@
           </el-table-column>
           <el-table-column align="center" label="操作" min-width="160">
             <template slot-scope="scope">
-              <el-popconfirm v-if="scope.row.status" style="margin-right: 10px;" title="确定冻结吗?" @onConfirm="changeStatus(scope.row.adminUserId, 0)" >
+              <el-popconfirm v-if="scope.row.status" style="margin-right: 10px;" title="确定冻结吗?" @confirm="changeStatus(scope.row.adminUserId, 0)" >
                 <el-button slot="reference" type="text">冻结</el-button>
               </el-popconfirm>
-              <el-popconfirm v-else style="margin-right: 10px;" title="确定恢复吗?" @onConfirm="changeStatus(scope.row.adminUserId, 1)" >
+              <el-popconfirm v-else style="margin-right: 10px;" title="确定恢复吗?" @confirm="changeStatus(scope.row.adminUserId, 1)" >
                 <el-button slot="reference" type="text">恢复</el-button>
               </el-popconfirm>
               

+ 1 - 1
src/views/setting/organizationManagement/settledManagement/index.vue

@@ -229,7 +229,7 @@
         <el-button type="primary" @click="clickSubmitForm" :loading="formLoading">{{ formLoading ? '提交中 ...' : '提 交' }}</el-button>
         <el-popconfirm
           title="确定关闭吗?"
-          @onConfirm="goBack"
+          @confirm="goBack"
           style="margin-left: 10px;"
         >
           <el-button slot="reference">关 闭</el-button>

+ 1 - 1
src/views/setting/organizationManagement/tenantDetails/index.vue

@@ -192,7 +192,7 @@
         <el-button type="primary" @click="submitStep3Form" :loading="formLoading" v-if="step == 'third'">{{ formLoading ? '保存中 ...' : '保 存' }}</el-button>
         <el-popconfirm
           title="确定关闭吗?"
-          @onConfirm="goBack"
+          @confirm="goBack"
           style="margin-left: 10px;"
         >
           <el-button slot="reference">关 闭</el-button>

+ 2 - 2
src/views/setting/organizationManagement/tenantManagement/index.vue

@@ -62,10 +62,10 @@
               <el-button type="text" @click="toDetail(scope.row.adminUserId, 1)">详情</el-button>
               <el-button type="text" @click="toDetail(scope.row.adminUserId, 2)">商城配置</el-button>
               <el-button type="text" @click="toDetail(scope.row.adminUserId, 3)">企微配置</el-button>
-              <el-popconfirm v-if="scope.row.status" style="margin-left: 10px;" title="确定冻结吗?" @onConfirm="changeStatus(scope.row.adminUserId, 0)" >
+              <el-popconfirm v-if="scope.row.status" style="margin-left: 10px;" title="确定冻结吗?" @confirm="changeStatus(scope.row.adminUserId, 0)" >
                 <el-button slot="reference" type="text">冻结</el-button>
               </el-popconfirm>
-              <el-popconfirm v-else style="margin-left: 10px;" title="确定恢复吗?" @onConfirm="changeStatus(scope.row.adminUserId, 1)" >
+              <el-popconfirm v-else style="margin-left: 10px;" title="确定恢复吗?" @confirm="changeStatus(scope.row.adminUserId, 1)" >
                 <el-button slot="reference" type="text">恢复</el-button>
               </el-popconfirm>
             </template>