Merge branch 'dev' into 'test'

Dev

See merge request quanshu/mp-ui-pc!335

src/views/business/ticket/create.vue

@@ -415,6 +415,7 @@ export default {
       const subForm = this.$refs["form"];
       subForm.validate((valid) => {
         if (valid) {
+
           // let prizeIndex = this.awardsList.findIndex((item) => {
           //   return !item.prizeList.length;
           // });
@@ -495,7 +496,6 @@ export default {
               }
             }
           }
-
           if (this.form.type != "offline" && this.goodsList.length < 1) {
             this.$message.error("关联商品不能为空");
             return

src/views/order/deliver/index.vue

@@ -80,10 +80,10 @@
           <el-option :label="item.name" :value="item.id" v-for="(item, index) in SupplierList" :key="index" />
         </el-select>
       </el-form-item>
-      <el-form-item label="订单来源" prop="payType">
+      <el-form-item label="付款方式" prop="payType">
         <el-select
           v-model="queryParams.payType"
-          placeholder="请选择订单来源"
+          placeholder="请选择付款方式"
           style="width: 100%"
           size="small"
           filterable
@@ -239,7 +239,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="订单来源" min-width="95">
+      <el-table-column label="付款方式" min-width="95">
         <template slot-scope="{ row }">
           <div v-if="row.payType == '2'">微信</div>
           <div v-else-if="row.payType == '1' || row.payType == '10'">支付宝</div>

src/views/order/userTicket/index.vue

@@ -76,10 +76,10 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <el-form-item label="订单来源" prop="payType">
+      <el-form-item label="付款方式" prop="payType">
         <el-select
           v-model="queryParams.payType"
-          placeholder="请选择订单来源"
+          placeholder="请选择付款方式"
           style="width: 100%"
           size="small"
           filterable
@@ -167,7 +167,7 @@
           <div>{{ $numberFormat(row.payAmt) }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="订单来源" min-width="95">
+      <el-table-column label="付款方式" min-width="95">
         <template slot-scope="{ row }">
           <div v-if="row.payType == '2'">微信</div>
           <div v-else-if="row.payType == '1' || row.payType == '10'">支付宝</div>