src/components/order-card-item/index.vue

@@ -152,6 +152,9 @@
           }else if(prodName.indexOf("毛绒徽章") !== -1){
             width = 827;
             height = 827;
+          }else if(prodName.indexOf("圆形徽章") !== -1){
+            width = 850;
+            height = 850;
           }else if(prodName.indexOf("手幅") !== -1){
             width = 1252;
             height = 3614;

src/views/modules/order/order.vue

@@ -719,11 +719,17 @@
                       @click="markPromotion(order)"
                       >取消推广
                     </div>
-                    <div
+                    <!--<div
                       class="default-btn text-btn operate-btn"
                       v-else
                       @click="markPromotion(order)"
                     >标记推广
+                    </div>-->
+                    <div
+                      class="default-btn text-btn operate-btn"
+                      v-if="order.status === 1"
+                      @click="orderConfirmPay(order)"
+                    >确认支付
                     </div>
                     <!--<div
                       class="default-btn text-btn operate-btn"
@@ -1208,6 +1214,7 @@ export default {
       printChannel: "KuaiYin",
       orderCreateBatchLoading: false,
       exportDeliveryLoading:false,
+      confirmPayLoading: false,
     }
   },
   components: {
@@ -1266,6 +1273,23 @@ export default {
 
   },
   methods: {
+    orderConfirmPay(order){
+      this.$confirm('确定完成支付吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        let dataBody = {"orderNumbers": order.orderNumber, "payType":9};
+        this.$http({
+          url: this.$http.adornUrl('/order/order/pay'),
+          method: 'post',
+          data:this.$http.adornData(dataBody)
+        }).then(({ data }) => {
+          this.$message.success("下单确认成功")
+          this.getDataList(this.page)
+        })
+      });
+    },
     scanDelivery(order){
 
     },
@@ -1603,7 +1627,6 @@ export default {
           current: page == null ? this.page.currentPage : page.currentPage,
           size: page == null ? this.page.pageSize : page.pageSize,
           'orderNumber': this.dataForm.orderNumber,
-              // 'prodName': this.dataForm.prodName,
           'orderType': this.dataForm.orderType,
           'orderMold': this.dataForm.orderMold,
           'payType': this.dataForm.payType,