Merge remote-tracking branch 'origin/dev_New' into dev_New

yaowanxin

2 天以前 e3847238a8ee1cf2e013a85d98b4b48fd5f4c3ec

 src/views/salesManagement/paymentShipping/index.vue

@@ -185,7 +185,7 @@
          <el-button type="primary" @click="handleSubmit">确 定</el-button>
        </div>
      </template>
    </el-dialog>
    </FormDialog>

    <!-- 付款对话框 -->
    <FormDialog v-model="paymentDialogVisible" title="订单付款" :width="'500px'" @close="paymentDialogVisible = false" @confirm="savePayment" @cancel="paymentDialogVisible = false">