1

src/views/app/business/luckey/luckey.vue

@@ -2,19 +2,24 @@
 	<div class="luckey">
 		<Card>
 			<Row class="region-bar">
-				<span class="region-tip">当前校区：<b>{{ regionId || '未识别（请确认账号已绑定校区）' }}</b></span>
+				<span class="region-tip">当前校区：<b>{{ JSON.parse(this.getStore("user")).departmentTitle || '未识别（请确认账号已绑定校区）' }}</b></span>
-				<Button type="primary" icon="ios-refresh" @click="reloadActive" :disabled="!regionId">刷新</Button>
+				
 			</Row>
 
 			<Tabs v-model="activeTab" @on-click="onTabChange">
+				
 				<!-- 奖池 -->
 				<TabPane label="奖池/开奖" name="pool">
+					<Row align="middle" justify="space-between" class="operation">
 						<Button type="primary" icon="md-add" @click="openPool()" style="margin-bottom:12px">新建奖池</Button>
+						<Button type="primary" icon="ios-refresh" @click="reloadActive" :disabled="!regionId">刷新</Button>
+					</Row>
 					<Table border :loading="pool.loading" :columns="poolColumns" :data="pool.data"></Table>
 					<Row type="flex" justify="end" class="page">
 						<Page :current="pool.pageNumber" :total="pool.total" :page-size="pool.pageSize"
 							@on-change="p => changePage('pool', p)" size="small" show-total></Page>
 					</Row>
+					
 				</TabPane>
 				
 				<!-- 任务 -->
@@ -274,11 +279,11 @@
 		computed: {
 			poolColumns() {
 				return [
-					{ title: '期号', key: 'periodNo', minWidth: 120 },
+					{ title: '期号', key: 'periodNo', width: 160 },
 					{ title: '标题', key: 'title', minWidth: 120 },
-					{ title: '商圈', key: 'regionId', width: 100 },
+					{ title: '商圈', key: 'regionId', width: 170 , render: (h, p) => h('span', p.row.regionId == JSON.parse(this.getStore("user")).departmentId ? JSON.parse(this.getStore("user")).departmentTitle : '') },
 					{ title: '奖池金额', key: 'poolAmount', width: 100 },
-					{ title: '开奖时间', key: 'drawTime', minWidth: 160 },
+					{ title: '开奖时间', key: 'drawTime', width: 170 },
 					{ title: '参与', key: 'joinCount', width: 70 },
 					{ title: '中奖', key: 'winnerCount', width: 70 },
 					{

src/views/sys/order-manage/logisticsAddress.vue

@@ -251,8 +251,8 @@
 			},
 			returnOrder(){
 				returnOrder({
-					orderId:orderData.id,
+					orderId:this.orderData.id,
-					userId:orderData.userId
+					userId:this.orderData.userId
 				}).then((res) => {
 					this.loading = false;
 					if (res.success) {