lhl há 10 meses atrás
pai
commit
760ebdd2a5
2 ficheiros alterados com 44 adições e 13 exclusões
  1. 1 1
      src/pages/marketing/serve/create.vue
  2. 43 12
      src/pages/order/three/index.vue

+ 1 - 1
src/pages/marketing/serve/create.vue

@@ -211,7 +211,7 @@
 					let row = res.data.info.storeInfo
 					this.formData = {
 						id: row.id,
-						product_id: row.id,
+						product_id: row.product_id,
 						card_name: row.card_name,
 						card_price: row.card_price,
 						explain: row.explain,

+ 43 - 12
src/pages/order/three/index.vue

@@ -5,12 +5,18 @@
 			<div class="new_card_pd">
 				<Form ref="pagination" inline :model="pagination" :label-width="labelWidth"
 					:label-position="labelPosition" @submit.native.prevent>
-					<!-- <FormItem label="支付状态:">
-						<Select v-model="pagination.paid" class="input-add">
+					<FormItem label="充值状态:">
+						<Select v-model="pagination.status" class="input-add">
 							<Option v-for="(item, index) in num" :value="item.value" :key="index">{{ item.name }}
 							</Option>
 						</Select>
-					</FormItem> -->
+					</FormItem>
+					<FormItem label="充值类型:">
+						<Select v-model="pagination.type" class="input-add">
+							<Option v-for="(item, index) in typeList" :value="item.value" :key="index">{{ item.name }}
+							</Option>
+						</Select>
+					</FormItem>
 					<!-- <FormItem label="员工ID:" label-for="title">
 						<div class='flex-search'>
 							<Input v-model="pagination.work_member_id" icon="ios-search" @on-click='openmid'
@@ -47,7 +53,7 @@
 					<span class="tabBox_pice">{{showName(row.work_member_id)}}</span>
 				</template>
 				<template slot-scope="{ row }" slot="goods_name">
-					<div class="tabBox_serve" >
+					<div class="tabBox_serve">
 						{{row.goods_name}}
 					</div>
 				</template>
@@ -188,8 +194,7 @@
 				ygList: [],
 				chooseId: 0,
 				openErp: false,
-				thead: [
-					{
+				thead: [{
 						title: "id",
 						align: "center",
 						key: "id",
@@ -235,6 +240,11 @@
 						key: "create_time",
 						minWidth: 130,
 					},
+					{
+						title: "备注",
+						key: "mark",
+						minWidth: 130,
+					},
 					{
 						title: "操作",
 						slot: "action",
@@ -245,22 +255,44 @@
 				],
 				tbody: [],
 				num: [{
-						name: '待支付',
+						name: '待下单',
 						value: 0
 					},
 					{
-						name: '已支付',
+						name: '未充值',
 						value: 1
+					},
+					{
+						name: '已充值',
+						value: 2
+					},
+					{
+						name: '充值取消',
+						value: -1
 					}
 				],
+				typeList: [{
+						name: '话费充值',
+						value: 0
+					},
+					{
+						name: '电费充值',
+						value: 2
+					},
+					{
+						name: '水费充值',
+						value: 3
+					},
+				],
 				loading: false,
 				total: 0,
 				pagination: {
+					type: 0,
 					page: 1,
 					limit: 15,
 					order_id: "",
 					time: "",
-					status: 0,
+					status: 1,
 					uid: '',
 					work_member_id: ''
 				},
@@ -351,8 +383,7 @@
 				// }).then(res => {
 				// 	this.ygList = res.data.list
 				// })
-				this.ygList = [
-					{
+				this.ygList = [{
 						name: '待下单',
 						id: 0
 					},
@@ -369,7 +400,7 @@
 						id: -1
 					}
 				]
-				
+
 			},
 			showTime(time) {
 				var date = new Date(time * 1000);