用户提货订单与盲票销售订单新增订单来源字段

src/views/business/goods/add.vue

@@ -27,7 +27,7 @@
             <el-radio-group v-model="addData.exchangeShow">
               <el-radio :label="0">不支持</el-radio>
               <el-radio :label="1">支持</el-radio>
-              <el-radio :label="2">只展示在首页</el-radio>
+              <el-radio :label="2">盲票商品</el-radio>
             </el-radio-group>
           </el-form-item>
         </el-col>

src/views/business/ticket/components/GoodsAdd.vue

@@ -94,7 +94,9 @@
 
         <el-table-column label="是否支持兑换" prop="exchangeShow" min-width="85">
           <template slot-scope="scope">
-            <div>{{scope.row.exchangeShow == 1 ? '支持兑换':'不支持兑换' }}</div>
+            <div v-if="scope.row.exchangeShow == 1">支持兑换</div>
+            <div v-else-if="scope.row.exchangeShow == 0">不支持兑换</div>
+            <div v-else-if="scope.row.exchangeShow == 2">盲票商品</div>
           </template>
         </el-table-column>
 

src/views/business/ticket/components/GoodsAddForm.vue

@@ -1,7 +1,7 @@
 <template>
   <div>
     <el-dialog
-      title="添加实物奖品"
+      title="添加关联商品"
       width="1000px"
       :visible.sync="dialogVisible"
       :before-close="close"
@@ -94,7 +94,9 @@
 
         <el-table-column label="是否支持兑换" prop="exchangeShow" min-width="85">
           <template slot-scope="scope">
-            <div>{{scope.row.exchangeShow == 1 ? '支持兑换':'不支持兑换' }}</div>
+            <div v-if="scope.row.exchangeShow == 1">支持兑换</div>
+            <div v-else-if="scope.row.exchangeShow == 0">不支持兑换</div>
+            <div v-else-if="scope.row.exchangeShow == 2">盲票商品</div>
           </template>
         </el-table-column>
 

src/views/order/deliver/detail.vue

@@ -13,6 +13,9 @@
         <el-col :span="8" :xs="{span: 24, offset: 0}">
           <div class="title">下单时间：{{ parseTime(info.createdTime) }}</div>
         </el-col>
+        <el-col :span="8" :offset="1" :xs="{span: 24, offset: 0}">
+          <div class="title">付款方式：{{ info.payType == 1 || info.payType == 10 ? '支付宝支付': info.payType == 2 ? '微信支付': '--' }}</div>
+        </el-col>
       </el-col>
     </el-row>
 

src/views/order/deliver/index.vue

@@ -80,6 +80,21 @@
           <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-select
+          v-model="queryParams.payType"
+          placeholder="请选择订单来源"
+          style="width: 100%"
+          size="small"
+          filterable
+          clearable
+          @change="handleQuery"
+        >
+          <el-option label="全部" value=""></el-option>
+          <el-option label="微信" value="2"></el-option>
+          <el-option label="支付宝" value="1"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -120,7 +135,6 @@
         >批量发货
         </el-button>
       </el-col>
-<!--      =====================================================================================================================================================================================-->
       <el-col :span="1.5">
         <el-button
           type="infor"
@@ -225,6 +239,13 @@
           </div>
         </template>
       </el-table-column>
+      <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>
+          <div v-else>--</div>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="80">
         <template slot-scope="{ row }">
           <div>
@@ -329,6 +350,7 @@ export default {
         status: "",
         tel: "",
         supplierId: "",
+        payType: "",
       },
       // 分页
       pageParams: {
@@ -518,6 +540,7 @@ export default {
         status: "",
         tel: "",
         supplierId: "",
+        payType: "",
       };
       this.state = "no"
       this.tradeTimeArr = [];
@@ -607,7 +630,7 @@ export default {
     handleExportDraw() {
       let data = {
         ...this.queryParams,
-        resource: this.queryParams.resource == "" ? this.queryParams.resource: Number(this.queryParams.resource)
+        resource: this.queryParams.resource == '' ? this.queryParams.resource : Number(this.queryParams.resource),
       }
       this.$confirm("是否确认导出订单?", "提示", {
         confirmButtonText: "确定",

src/views/order/userTicket/detail.vue

@@ -22,6 +22,9 @@
         <el-col :span="8" :xs="{span: 24, offset: 0}">
           <div class="title">实付金额：{{ $numberFormat(info.payAmt) }}元</div>
         </el-col>
+        <el-col :span="8" :offset="1" :xs="{span: 24, offset: 0}">
+          <div class="title">付款方式：{{ info.payType == 1 || info.payType == 10 ? '支付宝支付': info.payType == 2 ? '微信支付': '--' }}</div>
+        </el-col>
       </el-col>
     </el-row>
 

src/views/order/userTicket/index.vue

@@ -76,6 +76,21 @@
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="订单来源" prop="payType">
+        <el-select
+          v-model="queryParams.payType"
+          placeholder="请选择订单来源"
+          style="width: 100%"
+          size="small"
+          filterable
+          clearable
+          @change="handleQuery"
+        >
+          <el-option label="全部" value=""></el-option>
+          <el-option label="微信" value="2"></el-option>
+          <el-option label="支付宝" value="1"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item>
         <el-button
           type="primary"
@@ -152,6 +167,13 @@
           <div>{{ $numberFormat(row.payAmt) }}</div>
         </template>
       </el-table-column>
+      <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>
+          <div v-else>--</div>
+        </template>
+      </el-table-column>
       <el-table-column label="用户昵称/手机号" min-width="120">
         <template slot-scope="{ row }">
           <div>{{ row.nickName }}/{{ row.phone }}</div>
@@ -205,6 +227,7 @@ export default {
         phone: "",
         status: "",
         channelId: "",
+        payType: "",
       },
       // 上级渠道列表
       channelList:[],
@@ -280,6 +303,7 @@ export default {
       this.queryParams.endTime = "";
       this.queryParams.status = "";
       this.queryParams.channelId = "";
+      this.queryParams.payType = "";
       this.state = "null"
       this.getList();
     },