fixbug

juvenile
App.vue
common/http.api.js
manifest.json
pages/common/filters-hy/filters-hy.vue
pages/student/home/job-detail/job-detail.vue
pages/student/home/work-home/work-home.vue
pages/student/my/choose-my-job/choose-my-job.vue
static/img/common/123.png
store/index.js
--- a/App.vue
查看文件 @0de0f49
+++ b/App.vue
查看文件 @0de0f49
@@ -29,12 +29,16 @@ export default {
   },
   onLaunch(e) {
+	  if(e.path&&e.path=='pages/student/home/job-detail/job-detail'&&e.query&&e.query.id){
+		 this.$u.vuex("vuex_alipay",true)
+	  }
     let colorObj = this.themeList[this.vuex_appId].value;
     let styles = "";
     for (let i in colorObj) {
       styles += colorObj[i].name + ":" + colorObj[i].value + ";";
     }
+    
     this.$u.vuex("vuex_theme", styles);
     this.$u.vuex("vuex_baseImgUrl", this.themeList[this.vuex_appId].imagePath);
     // console.log('vuex_theme----', this.vuex_theme)
--- a/common/http.api.js
查看文件 @0de0f49
+++ b/common/http.api.js
查看文件 @0de0f49
@@ -53,14 +53,14 @@ let detailByStudentUrl = '/internship/v1/questionnaire/detailByStudent/';
 let graduationStatisticsRosterUrl = '/internship/v1/graduationStatisticsRoster/save';
 let questionnaireTemplateUrl = '/internship/v1/graduationStatisticsRoster/graduationSurvey/';
 let myUserStaticsUrl = '/hro/recruit/v1/yxly/user/counts';
-let positionCollectUrl = '/hro/recruit/v1/user/collects/:id/op/delete';
+let positionCollectUrl = '/hro/recruit/v1/yxly/user/collects';
 let positionRecordUrl = '/hro/recruit/v1/yxly/user/delivery-records';
 let resumeUpdateUrl = '/hro/recruit/v1/yxly/user/resumes/update';
 let resumeDetailUrl = '/hro/recruit/v1/yxly/user/resumes/detail';
 let isJobCollectedUrl = '/hro/recruit/v1/yxly/user/collects/check/'
 let jobRecommendUrl = '/hro/recruit/v1/yxly/user/positions/recommend';
 let jobReccommendListUrl = '/hro/recruit/v1/yxly/user/candidates/recommends';
-let applyJobUrl = '/hro/recruit/v1/yxly/user/delivery';
+let applyJobUrl = '/hro/recruit/v1/yxly/zfb/user-delivery';
 let getAuthUrl = '/user/v1/getAuthUrl';
 let isJobAppliedUrl = '/hro/recruit/v1/yxly/user/delivery/check/';
 let signstartUrl = '/internship/v1/treaty/sign/start';
@@ -1244,6 +1244,7 @@ const install = (Vue, vm) => {
   //C端  投递职位
   let applyJobUrlApi = (params = {}) => vm.$u.post(applyJobUrl, params).then(res => {
     if (res.code >= 300) {
+		return res
       uni.$u.toast(res.message);
     } else {
       return res
@@ -1322,7 +1323,7 @@ const install = (Vue, vm) => {
   });
   //C端  取消收藏
-  let cancelJobCollectUrlApi = (params = {}) => vm.$u.put(`/hro/recruit/v1/user/collects/${params.id}/op/delete`, params).then(res => {
+  let cancelJobCollectUrlApi = (params = {}) => vm.$u.put(`/hro/recruit/v1/yxly/user/collects/${params.id}/op/delete`, params).then(res => {
     if (res.code >= 300) {
       uni.$u.toast(res.message);
     } else {
@@ -1995,9 +1996,23 @@ const install = (Vue, vm) => {
     }
   });
+  const getJobUserAuth = (params) => vm.$u.post(`/hro/recruit/v1/yxly/zfb/resume-agreement-sign`,params).then(res=>{
+    if (res.code >= 300) {
+      uni.showToast({
+        title: res.msg,
+        icon: 'none',
+        duration: 1500
+      });
+    } else {
+      return res
+    }
+  })
+
+
   // 将各个定义的接口名称，统一放进对象挂载到vm.$u.api(因为vm就是this，也即this.$u.api)下
   vm.$u.api = {
+    getJobUserAuth,
     getLoginApi,
     settingGetApi,
     getSmsCodeApi,
--- a/manifest.json
查看文件 @0de0f49
+++ b/manifest.json
查看文件 @0de0f49
@@ -101,9 +101,7 @@
         }
     },
     "quickapp" : {},
-    "mp-weixin" : {
-        
-    },
+    "mp-weixin" : {},
     "mp-alipay" : {
         "usingComponents" : true,
         "component2" : true,
@@ -111,7 +109,7 @@
         "uniStatistics" : {
             "enable" : true
         },
-		"allowsBounceVertical": "NO"
+        "allowsBounceVertical" : "NO"
     },
     "mp-qq" : {
         "optimization" : {
@@ -152,5 +150,8 @@
                 }
             }
         }
+    },
+    "uniStatistics" : {
+        "version" : "2"
     }
 }
--- a/pages/common/filters-hy/filters-hy.vue
查看文件 @0de0f49
+++ b/pages/common/filters-hy/filters-hy.vue
查看文件 @0de0f49
 <template>
 	<view class="page" :style="vuex_theme">
 		<scroll-view
-			style="position: absolute; left: 0; top: 0; width:33%; height: calc(100% - 200rpx); border-right: 1px solid rgba(0,0,0,0.05);"
-			scroll-y="true">
+			style=" width:33%; height: calc(100vh - 200rpx); border-right: 1px solid rgba(0,0,0,0.05);"
+			:scroll-y="true">
 			<view class="list-title" v-for="(item,index) in firstCategorys" :key="index"
 				@click="firstCategorySel(item,index)">
 				<view :class="firstCategoryName == item.name?'item itemSel':'item'">
@@ -11,8 +11,8 @@
 			</view>
 		</scroll-view>
 		<scroll-view
-			style="position: absolute; left: 33%; top: 0; width:33%; height: calc(100% - 200rpx); border-right: 1px solid rgba(0,0,0,0.05);"
-			scroll-y="true">
+			style=" width:34%; height: calc(100vh - 200rpx); border-right: 1px solid rgba(0,0,0,0.05);"
+			:scroll-y="true">
 			<view v-if="isAll=='1'" class="list-title" @click="secondCategorySel({name:'全部',sub_categories:[]},-1)">
 				<view :class="secondCategoryName == '全部'?'item itemSel':'item'">
 					全部
@@ -25,8 +25,8 @@
 				</view>
 			</view>
 		</scroll-view>
-		<scroll-view style="position: absolute; left: 66%; top: 0; width:33%; height: calc(100% - 200rpx);"
-			scroll-y="true">
+		<scroll-view style=" width:32%; height: calc(100vh - 200rpx);"
+			:scroll-y="true">
 			<view v-if="isAll=='1'" class="list-title" @click="expectjobSel({name:'全部',sub_categories:[]},-1)">
 				<view :class="expectJobName == '全部'?'item itemSel':'item'">
 					全部
@@ -121,10 +121,9 @@
 			loadData() {
 				this.$u.api.poscategorylistApi().then(res => {
 					if (res) {
-						this.firstCategorys = res
 						if (this.firstCategoryName == '') {
-							this.firstCategoryName = this.firstCategorys[0].name
-							this.secondCategorys = this.firstCategorys[0].sub_categories
+							this.firstCategoryName =res[0].name
+							this.secondCategorys = res[0].sub_categories
 							// this.secondCategoryName = this.secondCategorys[0].name
 							// this.secondCategoryName = '全部'
 							// this.expectJobs = this.secondCategorys[0].sub_categories
@@ -150,6 +149,7 @@
 								}
 							}
 						}
+						this.firstCategorys = res
 					}
 				})
 			},
@@ -210,6 +210,7 @@
 		position: relative;
 		width: 100%;
 		height: 100%;
+		display: flex;
 		.list-title {
 			margin-top: 72rpx;
--- a/pages/student/home/job-detail/job-detail.vue
查看文件 @0de0f49
+++ b/pages/student/home/job-detail/job-detail.vue
查看文件 @0de0f49
@@ -320,8 +320,8 @@
         </view>
         <view
           style="width: 100%; height: 100rpx; background-color: #ffffff"
-        ></view
-      ></view>
+        ></view>
+      </view>
     </u-popup>
     <u-popup
       v-model="showResume"
@@ -468,6 +468,23 @@
         @callBack="sucesslogin"
       ></yxly-login>
     </u-popup>
+    <u-popup v-model="isClose" mode="center" border-radius="18">
+      <view class="callBackAlipay">
+        <view class="" style="padding-top: 40rpx">
+          <image
+            mode="widthFix"
+            style="width: 120rpx; height: 120rpx"
+            src="/static/img/common/123.png"
+          >
+          </image>
+        </view>
+        <view class="" style="margin-top: 30rpx"> 您已成功投递该岗位 </view>
+        <view class="" style="margin-top: 20rpx">
+          <c-button type="confirm" @click="alipayBack" text="返回支付宝就业">
+          </c-button>
+        </view>
+      </view>
+    </u-popup>
   </view>
 </template>
@@ -484,6 +501,7 @@ export default {
     return {
       analysisArea,
       formateSalary,
+      isClose: true,
       yxlyLoginShow: false,
       statusBarHeight: 44,
       menuHeight: 32,
@@ -542,7 +560,6 @@ export default {
   },
   onLoad(e) {
-    console.log(e);
     this.id = e.id;
     this.candidate_id = e.candidate_id ? e.candidate_id : "";
     this.statusAbandon = e.from_type && e.from_type == 3 ? true : false;
@@ -575,6 +592,16 @@ export default {
         this.getStatusDetail();
       }
     },
+    alipayBack() {
+		my.exitMiniProgram({
+			success:()=>{
+				console.log('成功');
+			},
+			fail:()=>{
+				
+			}
+		})
+    },
     timeFormat(value, format = "yyyy-mm-dd") {
       return this.$u.timeFormat(value, format);
@@ -831,11 +858,69 @@ export default {
     showApplyPop() {
       if (this.vuex_token != "") {
-        if (this.resumeDetailObj && this.resumeDetailObj.id) {
-          this.showResume = true;
-        } else {
-          this.showNoResume = true;
-        }
+        // if (this.resumeDetailObj && this.resumeDetailObj.id) {
+        //   this.showResume = true;
+        // } else {
+        //   this.showNoResume = true;
+        // }
+
+        const params = {
+          position_id: this.id,
+        };
+        this.$u.api.getJobUserAuth(params).then((res) => {
+          console.log(res);
+          my.getAuthCode({
+            scopes: "yingpin",
+            success: (authRes) => {
+              my.ap.openCreditEvaluation({
+                signStr: res.sign_str,
+                // 调用成功的回调函数
+                success: ({ resultStatus }) => {
+                  // 调用成功/失败，半屏关闭时的回调函数。如果调用方需要半屏关闭后进行一些操作，可以在这个回调函数里处理。
+                  // 比如页面状态的刷新、页面的跳转等
+                  if (resultStatus === "9003") {
+                    // 用户取消操作
+                  } else if (resultStatus === "9000") {
+                    this.$u.api
+                      .applyJobUrlApi({
+                        position_id: this.id,
+                        auth_code: authRes.authCode,
+                        ...res,
+                      })
+                      .then((jobRes) => {
+                        console.log(jobRes, "jobRes");
+                        if (jobRes && jobRes.code > 300) {
+                          uni.showToast({
+                            title: jobRes.message,
+                            icon: "none",
+                            duration: 1500,
+                          });
+                        } else {
+                          this.jobStatus = "new";
+                          if (this.vuex_alipay) {
+                            this.isClose = true;
+                          } else {
+                            uni.showToast({
+                              title: "投递成功！",
+                              icon: "none",
+                              duration: 1500,
+                            });
+                          }
+                        }
+                      });
+
+                    // 用户授权成功
+                  } else if (resultStatus === "4000") {
+                    // 用户授权失败
+                  }
+                },
+                fail: (res) => {
+                  console.log(res, "slafasjlfjdsajk");
+                },
+              });
+            },
+          });
+        });
       } else {
         this.goLogin();
       }
@@ -1147,6 +1232,7 @@ export default {
       .tenant_info {
         flex: 1;
         padding: 0px 16rpx;
+
         .sxyq {
           font-size: 28rpx;
           font-family: PingFangSC-Medium, PingFang SC;
@@ -1589,4 +1675,12 @@ export default {
     }
   }
 }
-</style>
+
+.callBackAlipay {
+  display: flex;
+  flex-direction: column;
+  height: 360rpx;
+  align-items: center;
+  width: 600rpx;
+}
+</style>
--- a/pages/student/home/work-home/work-home.vue
查看文件 @0de0f49
+++ b/pages/student/home/work-home/work-home.vue
查看文件 @0de0f49
@@ -246,7 +246,6 @@
                   background:
                     'linear-gradient(to right,var(--primary-color100), #fff)',
                   bottom: '10px',
-                  left: '-10px',
                   zIndex: '0',
                 }"
                 :active-item-style="{
@@ -309,7 +308,6 @@
               background:
                 'linear-gradient(to right,var(--primary-color100), #fff)',
               bottom: '10px',
-              left: '50px',
               zIndex: '0',
             }"
             :active-item-style="{
--- a/pages/student/my/choose-my-job/choose-my-job.vue
查看文件 @0de0f49
+++ b/pages/student/my/choose-my-job/choose-my-job.vue
查看文件 @0de0f49
@@ -62,7 +62,7 @@
 				form: {
 					expect_job: "",
 					salary: "",
-					expect_workplace: "",
+					expect_workplace: {},
 				},
 				fromType: "",
 				selectMode: "",
--- a/static/img/common/123.png 0 → 100644
查看文件 @0de0f49
+++ b/static/img/common/123.png 0 → 100644
查看文件 @0de0f49
--- a/store/index.js
查看文件 @0de0f49
+++ b/store/index.js
查看文件 @0de0f49
-import Vue from 'vue'
-import Vuex from 'vuex'
-import user from './modules/user'
-import internship from './modules/internship'
-Vue.use(Vuex)
+import Vue from "vue";
+import Vuex from "vuex";
+import user from "./modules/user";
+import internship from "./modules/internship";
+Vue.use(Vuex);
 const appNameData = {
-  '2021004125649367': '智用工',
-  'wx2a515776284cae17': '新华实习',
-}
+  2021004125649367: "智用工",
+  wx2a515776284cae17: "新华实习",
+};
 let lifeData = {};
-let appId = '2021004125649367';
+let appId = "2021004125649367";
 // 新华网
 // let appId = 'wx2a515776284cae17';
 try {
   // 尝试获取本地是否存在lifeData变量，第一次启动APP时是不存在的
-  lifeData = uni.getStorageSync('lifeData');
-} catch (e) {
-
-}
+  lifeData = uni.getStorageSync("lifeData");
+} catch (e) {}
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
 let saveStateKeys = [
-  'vuex_user',
-  'vuex_tenant',
-  'vuex_token',
-  'workai_vuex_token',
-  'vuex_phone',
-  'vuex_weixinUserInfo',
-  'vuex_role',
-  'vuex_userid',
-  'vuex_refresh_token',
-  'vuex_baseImgUrl',
-  'vuex_theme',
-  'vuex_expect_job'
+  "vuex_user",
+  "vuex_tenant",
+  "vuex_token",
+  "workai_vuex_token",
+  "vuex_phone",
+  "vuex_weixinUserInfo",
+  "vuex_role",
+  "vuex_userid",
+  "vuex_refresh_token",
+  "vuex_baseImgUrl",
+  "vuex_theme",
+  "vuex_expect_job",
 ];
 // 保存变量到本地存储中
@@ -42,37 +40,35 @@ const saveLifeData = function (key, value) {
   // 判断变量名是否在需要存储的数组中
   if (saveStateKeys.indexOf(key) != -1) {
     // 获取本地存储的lifeData对象，将变量添加到对象中
-    let tmp = uni.getStorageSync('lifeData');
+    let tmp = uni.getStorageSync("lifeData");
     // 第一次打开APP，不存在lifeData变量，故放一个{}空对象
     tmp = tmp ? tmp : {};
     tmp[key] = value;
     // 执行这一步后，所有需要存储的变量，都挂载在本地的lifeData对象中
-    uni.setStorageSync('lifeData', tmp);
+    uni.setStorageSync("lifeData", tmp);
   }
-}
-
-
+};
-const handleTabBars = function(type) {
+const handleTabBars = function (type) {
   const tabBars = [
     {
-       "pagePath": "/pages/student/tabBar/home/home",
-       "iconPath": "/static/img/common/home.png",
-       "selectedIconPath": `https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/wx84b71301436652ce/homeHL.png`,
-       "text": "首页"
-     },
-     // {
-     //   "pagePath": "/pages/student/tabBar/internship/internship",
-     //   "iconPath": "/static/img/common/internship.png",
-     //   "selectedIconPath": `https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/${appId}/internshipHL.png`,
-     //   "text": "实习"
-     // },
-     // {
-     //   "pagePath": "/pages/student/tabBar/promote/promote",
-     //   "iconPath": "/static/img/common/promote.png",
-     //   "selectedIconPath": `https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/${appId}/promoteHL.png`,
-     //   "text": "提升"
-     // },
+      pagePath: "/pages/student/tabBar/home/home",
+      iconPath: "/static/img/common/home.png",
+      selectedIconPath: `https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/wx84b71301436652ce/homeHL.png`,
+      text: "首页",
+    },
+    // {
+    //   "pagePath": "/pages/student/tabBar/internship/internship",
+    //   "iconPath": "/static/img/common/internship.png",
+    //   "selectedIconPath": `https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/${appId}/internshipHL.png`,
+    //   "text": "实习"
+    // },
+    // {
+    //   "pagePath": "/pages/student/tabBar/promote/promote",
+    //   "iconPath": "/static/img/common/promote.png",
+    //   "selectedIconPath": `https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/${appId}/promoteHL.png`,
+    //   "text": "提升"
+    // },
     //  {
     //    "pagePath": "/pages/student/tabBar/message/message",
     //    "iconPath": "/static/img/common/message.png",
@@ -81,13 +77,13 @@ const handleTabBars = function(type) {
     //    'isDot': true,
     //    'count': 0,
     //  },
-     {
-       "pagePath": "/pages/student/tabBar/my/my",
-       "iconPath": "/static/img/common/my.png",
-       "selectedIconPath": `https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/wx84b71301436652ce/myHL.png`,
-       "text": "我的"
-     }
- ]
+    {
+      pagePath: "/pages/student/tabBar/my/my",
+      iconPath: "/static/img/common/my.png",
+      selectedIconPath: `https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/wx84b71301436652ce/myHL.png`,
+      text: "我的",
+    },
+  ];
   // if (appId == 'wx2a515776284cae17') {
   //   tabBars.splice(2, 1)
   // }
@@ -100,9 +96,8 @@ const handleTabBars = function(type) {
   // if (type == 'student') {
   //   return tabBars
   // }
-  return tabBars
-  
-}
+  return tabBars;
+};
 const store = new Vuex.Store({
   modules: {
@@ -112,46 +107,57 @@ const store = new Vuex.Store({
   state: {
     vuex_appId: appId,
     vuex_appName: appNameData[appId],
+    vuex_alipay: false,
     // 如果上面从本地获取的lifeData对象下有对应的属性，就赋值给state中对应的变量
     // 加上vuex_前缀，是防止变量名冲突，也让人一目了然
     vuex_user: lifeData.vuex_user ? lifeData.vuex_user : {},
     vuex_tenant: lifeData.vuex_tenant ? lifeData.vuex_tenant : {},
-    vuex_weixinUserInfo: lifeData.vuex_weixinUserInfo ? lifeData.vuex_weixinUserInfo : {},
-    vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '',
-    workai_vuex_token: lifeData.workai_vuex_token ? lifeData.workai_vuex_token : '',
-    vuex_phone: lifeData.vuex_phone ? lifeData.vuex_phone : '',
-    vuex_role: lifeData.vuex_role ? lifeData.vuex_role : '',
-    vuex_userid: lifeData.vuex_userid ? lifeData.vuex_userid : '',
-    vuex_refresh_token: lifeData.vuex_refresh_token ? lifeData.vuex_refresh_token : '',
+    vuex_weixinUserInfo: lifeData.vuex_weixinUserInfo
+      ? lifeData.vuex_weixinUserInfo
+      : {},
+    vuex_token: lifeData.vuex_token ? lifeData.vuex_token : "",
+    workai_vuex_token: lifeData.workai_vuex_token
+      ? lifeData.workai_vuex_token
+      : "",
+    vuex_phone: lifeData.vuex_phone ? lifeData.vuex_phone : "",
+    vuex_role: lifeData.vuex_role ? lifeData.vuex_role : "",
+    vuex_userid: lifeData.vuex_userid ? lifeData.vuex_userid : "",
+    vuex_refresh_token: lifeData.vuex_refresh_token
+      ? lifeData.vuex_refresh_token
+      : "",
     // 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式
-    vuex_version: '1.0.0',
+    vuex_version: "1.0.0",
     vuex_noAuth: true,
-    vuex_demo: '绛紫',
+    vuex_demo: "绛紫",
     vuex_baseImgUrl: "",
     vuex_ossUrl: "https://yxly.oss-cn-beijing.aliyuncs.com",
     vuex_ossUrlPubilc: "https://yxlypublic.oss-cn-beijing.aliyuncs.com",
     // vuex_ossUrl: "https://oss.workai.com.cn",
     vuex_OssInit: {},
     vuex_area: {},
-    vuex_theme: '',
+    vuex_theme: "",
     // vuex_theme: this.theme,
     // 自定义tabbar数据
-    vuex_tabbar: handleTabBars('worker'),
-    vuex_tabbar_inter: handleTabBars('student'),
-    vuex_expect_job: lifeData.vuex_expect_job ? lifeData.vuex_expect_job : '全部职位',
+    vuex_tabbar: handleTabBars("worker"),
+    vuex_tabbar_inter: handleTabBars("student"),
+    vuex_expect_job: lifeData.vuex_expect_job
+      ? lifeData.vuex_expect_job
+      : "全部职位",
   },
   getters: {
-    doneTenantType: state => {
-      return state.vuex_tenant && state.vuex_tenant.type ? String(state.vuex_tenant.type) : '';
-    }
+    doneTenantType: (state) => {
+      return state.vuex_tenant && state.vuex_tenant.type
+        ? String(state.vuex_tenant.type)
+        : "";
+    },
   },
   mutations: {
     $uStore(state, payload) {
       // 判断是否多层级调用，state中为对象存在的情况，诸如user.info.score = 1
-      let nameArr = payload.name.split('.');
-      let saveKey = '';
+      let nameArr = payload.name.split(".");
+      let saveKey = "";
       let len = nameArr.length;
       if (len >= 2) {
         let obj = state[nameArr[0]];
@@ -166,14 +172,14 @@ const store = new Vuex.Store({
         saveKey = payload.name;
       }
       // 保存变量到本地，见顶部函数定义
-      saveLifeData(saveKey, state[saveKey])
+      saveLifeData(saveKey, state[saveKey]);
     },
     setWenxinUserInfo(state, result) {
       state.vuex_weixinUserInfo = result.userInfo;
-      uni.$u.vuex('vuex_weixinUserInfo', result.userInfo);
+      uni.$u.vuex("vuex_weixinUserInfo", result.userInfo);
     },
-  }
-})
+  },
+});
-export default store
+export default store;