lsw há 8 meses atrás
pai
commit
7074b0af4e

+ 2 - 2
app/pages.json

@@ -7,7 +7,7 @@
 			"path": "pages/index/index",
 			"style": {
 				"navigationBarTitleText": "爱就业咨询服务平台",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -74,7 +74,7 @@
 			"path": "pages/serve/index",
 			"style": {
 				"navigationBarTitleText": "更多服务",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": true
 			}
 		},
 		{

+ 9 - 1
app/pages/index/index.vue

@@ -62,7 +62,7 @@ export default {
 				}
 			});
 			//初始化所有地区
-			if(!uni.getStorageSync('city_all')){
+			if (!uni.getStorageSync('city_all')) {
 				this.http.request({
 					url: '/app/common/column/city/all',
 					success: (res) => {
@@ -123,6 +123,14 @@ export default {
 		go(url) {
 			uni.navigateTo({ url: url });
 		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.getData();
+			this.initData();
+			uni.stopPullDownRefresh();
+		}, 1000);
 	}
 };
 </script>

+ 8 - 1
app/pages/serve/index.vue

@@ -184,7 +184,7 @@ export default {
 			});
 			//平台信息
 			this.http.request({
-				url: '/app/pay/getPlatform',
+				url: '/app/common/getPlatform',
 				success: (res) => {
 					this.platform = res.data.data;
 				}
@@ -247,6 +247,13 @@ export default {
 		go(url) {
 			uni.navigateTo({ url: url });
 		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		setTimeout(() => {
+			this.getData();
+			uni.stopPullDownRefresh();
+		}, 1000);
 	}
 };
 </script>

+ 2 - 2
app/pages/user/index.vue

@@ -273,10 +273,10 @@ export default {
 		};
 	},
 	onShow() {
- 		this.user = {
+/* 		this.user = {
 			token: 'eyJhbGciOiJIUzUxMiJ9.eyJsb2dpbl91c2VyX2tleSI6IjE5MTRkMDQxLTQ5ZGEtNDU1ZS1hNTBkLTM2MmY5NjJjNTVlYSJ9.POPKHhxa49-QXvE_XW0Tn_IEWipybPg6q7bgW4wO7Yziek2-TDy1jc5XZGx2lh6IkQq0dosryJ143MryVv-ysA'
 		};
-		uni.setStorageSync('user', this.user);
+		uni.setStorageSync('user', this.user); */
 
 		if (this.hasLogin()) {
 			this.getUserInfo();

+ 1 - 1
app/pages/user/money/add.vue

@@ -66,7 +66,7 @@ export default {
 		//平台服务费信息
 		getPlatform() {
 			this.http.request({
-				url: '/app/pay/getPlatform',
+				url: '/app/common/getPlatform',
 				success: (res) => {
 					this.platform = res.data.data;
 				}

+ 1 - 1
app/pages/user/money/cash_out.vue

@@ -83,7 +83,7 @@ export default {
 		//平台服务费信息
 		getPlatform() {
 			this.http.request({
-				url: '/app/pay/getPlatform',
+				url: '/app/common/getPlatform',
 				success: (res) => {
 					this.platform = res.data.data;
 				}

+ 2 - 3
app/pages/user/resume/edit.vue

@@ -28,7 +28,7 @@
 			<input type="number" placeholder="请输入手机号" v-model="item.phone" />
 		</view>
 		<view class="form_group">
-			<view class="lable re">邮箱</view>
+			<view class="lable">邮箱</view>
 			<input placeholder="请输入邮箱" v-model="item.email" />
 		</view>
 		<view class="form_group">
@@ -88,8 +88,7 @@ export default {
 				{ name: 'name', checkType: 'notnull', errorMsg: '请输入姓名' },
 				{ name: 'sex', checkType: 'notnull', errorMsg: '请上选择性别' },
 				{ name: 'birthday', checkType: 'notnull', errorMsg: '请选择出生年月' },
-				{ name: 'phone', checkType: 'phone', errorMsg: '请输入正确的手机号' },
-				{ name: 'email', checkType: 'email', errorMsg: '请输入正确的邮箱' }
+				{ name: 'phone', checkType: 'phone', errorMsg: '请输入正确的手机号' }
 			];
 			if (!this.verify.check(this.item, rule)) {
 				uni.showModal({ content: this.verify.error, showCancel: false });

+ 6 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_CommonController.java

@@ -80,6 +80,12 @@ public class Api_CommonController extends BaseController {
         return AjaxResult.error();
     }
 
+    @GetMapping("/getPlatform")
+    public AjaxResult getPlatform() {
+        Platform platform = redisCache.getCacheObject(CacheConstants.APP_PLATFORM);
+        return AjaxResult.success(platform);
+    }
+
     //图片上传
     @PostMapping("/upload")
     public AjaxResult upload(MultipartHttpServletRequest multiReq) {

+ 0 - 17
ruoyi-admin/src/main/java/com/ruoyi/web/work/api/Api_PayController.java

@@ -1,12 +1,9 @@
 package com.ruoyi.web.work.api;
 
-import com.ruoyi.common.constant.CacheConstants;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
-import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.web.work.api.config.BaseController;
 import com.ruoyi.web.work.domain.Pay;
-import com.ruoyi.web.work.domain.Platform;
 import com.ruoyi.web.work.domain.dto.PayAddDto;
 import com.ruoyi.web.work.domain.dto.PayCashOutDto;
 import com.ruoyi.web.work.service.IPayService;
@@ -29,9 +26,6 @@ public class Api_PayController extends BaseController {
     @Autowired
     private IPayService payService;
 
-    @Autowired
-    private RedisCache redisCache;
-
     @GetMapping("/list")
     public TableDataInfo list(Pay pay) {
         pay.setUserId(getUser().getId());
@@ -40,12 +34,6 @@ public class Api_PayController extends BaseController {
         return getDataTable(list);
     }
 
-    @GetMapping("/getPlatform")
-    public AjaxResult getPlatform() {
-        Platform platform = redisCache.getCacheObject(CacheConstants.APP_PLATFORM);
-        return AjaxResult.success(platform);
-    }
-
     @PostMapping("/add")
     public AjaxResult add(@Validated @RequestBody PayAddDto dto) throws ServerException {
         return payService.add(dto);
@@ -56,9 +44,4 @@ public class Api_PayController extends BaseController {
         return payService.cashOut(dto);
     }
 
-    @GetMapping(value = "/detail/{id}")
-    public AjaxResult detail(@PathVariable("id") Long id) {
-        return AjaxResult.success(payService.getById(id));
-    }
-
 }

+ 1 - 0
ruoyi-admin/src/main/java/com/ruoyi/web/work/api/config/InterceptorConfig.java

@@ -31,6 +31,7 @@ public class InterceptorConfig implements WebMvcConfigurer {
         registration.excludePathPatterns("/app/common/column/city/all"); //排除
         registration.excludePathPatterns("/app/common/column/list"); //排除
         registration.excludePathPatterns("/app/common/type/*"); //排除
+        registration.excludePathPatterns("/app/common/getPlatform"); //排除
         registration.excludePathPatterns("/app/common/agreement/*"); //排除
         registration.excludePathPatterns("/app/enterprise/list"); //排除
         registration.excludePathPatterns("/app/wxPay/notify"); //排除

+ 0 - 1
ruoyi-admin/src/main/java/com/ruoyi/web/work/domain/Resume.java

@@ -44,7 +44,6 @@ public class Resume{
     @ApiModelProperty(value = "出生年月")
     private String birthday;
 
-    @NotBlank(message = "邮箱不能为空")
     @ApiModelProperty(value = "邮箱")
     private String email;