zzp 2 years ago
parent
commit
f4eb4d69af
4 changed files with 21 additions and 5 deletions
  1. 3 1
      config/api.js
  2. 3 1
      pages/index/index.vue
  3. 1 1
      pagesMain/couponList.vue
  4. 14 2
      pagesMain/leaveRecord.vue

+ 3 - 1
config/api.js

@@ -1,7 +1,9 @@
 // const API_BASE = 'https://xinghuolanqiu.com/newApi'
 //const API_BASE = 'http://192.168.1.126:30000'
 
-const API_BASE = 'http://192.168.1.145/newApi'
+// const API_BASE = 'http://192.168.1.145/newApi'
+// const API_BASE = 'http://39.99.241.14/newApi'
+const API_BASE = 'https://starfire.jihengcc.cn/newApi'
 
 // const API_BASE = 'http://192.168.1.109/newApi'
 // const API_BASE = 'http://192.168.1.117:8089/'

+ 3 - 1
pages/index/index.vue

@@ -9,7 +9,9 @@
 			</view>
 		</u-navbar>
 		<!-- 轮播图 -->
-		<u-swiper :list="swiperList" mode="rect" height="300" effect3d border-radius="30" name="url" style="margin-bottom: 10px;"></u-swiper>
+		<template v-if="swiperList.length">
+			<u-swiper :list="swiperList" mode="rect" height="300" effect3d border-radius="30" name="url" style="margin-bottom: 10px;"></u-swiper>
+		</template>
 	<!-- 	<view class="section-title">
 			<u-image width="20px" height="10px" :src="sectionIcon"></u-image>
 			<u-section title="会员开通" font-size="32" :right="false" :show-line="false"></u-section>

+ 1 - 1
pagesMain/couponList.vue

@@ -132,7 +132,7 @@
 				venueInfo: {}
 			}
 		},
-		onLoad() {
+		onLoad() {0
 			this.getTableList(0)
 			this.getTableList(1)
 			this.getTableList(2)

+ 14 - 2
pagesMain/leaveRecord.vue

@@ -18,7 +18,7 @@
 								<text class="info-name">{{site.time}}</text>
 							</view>
 							<view class="info-phone" style="margin-bottom: 5px;">{{ site.type == 1 ? '事假' : '病假' }}</view>
-							<view class="info-phone">{{ site.agreeType == 1 ? '同意' : '不同意' }}</view>
+							<view class="info-phone">{{ computedAgreeType(site.agreeType) }}</view>
 						</view>
 					</view>
 				</u-card>
@@ -44,7 +44,19 @@
 			...mapGetters([
 				'customStyle',
 				'handleCustomStyle',
-			])
+			]),
+			computedAgreeType() {
+				return function(agreeType) {
+					switch(agreeType) {
+						case 0: 
+							return '未处理'
+						case 1:
+							return  '同意'
+						case 2:
+							return  '不同意'
+					}
+				}
+			}
 		},
 		data() {
 			return {