diff --git a/manifest.json b/manifest.json index eb05f4d..0249243 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name" : "hire-wechat", - "appid" : "__UNI__5717BF9", + "appid" : "__UNI__88D8646", "description" : "", "versionName" : "2.0.37", "versionCode" : 1, diff --git a/pages.json b/pages.json index 865c4c6..eedb266 100644 --- a/pages.json +++ b/pages.json @@ -26,7 +26,9 @@ "navigationBarTitleText": "订单", "navigationStyle":"default", "navigationBarBackgroundColor": "#FF7A31", - "navigationBarTextStyle": "white" + "navigationBarTextStyle": "white", + "enablePullDownRefresh": true, + "onReachBottomDistance": 100 } }, { @@ -68,6 +70,24 @@ { "root": "pages_subpack", "pages": [ + { + "path": "hire/index", + "style": { + "navigationBarTitleText": "我的招聘", + "navigationStyle":"default", + "navigationBarBackgroundColor": "#FF7A31", + "navigationBarTextStyle": "white" + } + }, + { + "path": "job-hunt/index", + "style": { + "navigationBarTitleText": "我的求职", + "navigationStyle":"default", + "navigationBarBackgroundColor": "#FF7A31", + "navigationBarTextStyle": "white" + } + }, { "path": "version/index", "style": { diff --git a/pages/home/component/master.vue b/pages/home/component/master.vue index 0e99031..e7152ed 100644 --- a/pages/home/component/master.vue +++ b/pages/home/component/master.vue @@ -1,37 +1,5 @@ - - \ No newline at end of file diff --git a/pages/order/component/enterprise.vue b/pages/order/component/enterprise.vue index dc5fc0a..2e367b2 100644 --- a/pages/order/component/enterprise.vue +++ b/pages/order/component/enterprise.vue @@ -115,6 +115,15 @@ this.onOrder(); }, methods:{ + onReach(){ + this.pageNo = this.pageNo + 1 + this.onOrder() + }, + onRefresh(){ + this.list = [] + this.pageNo = 1 + this.onOrder() + }, onOrder(){ let that = this; let params={ @@ -135,7 +144,8 @@ }) }, tabClick(event){ - console.info(event) + this.list = [] + this.pageNo = 1 this.current = event.index this.orderStatus = this.nav[event.index].index this.onOrder() diff --git a/pages/order/component/master.vue b/pages/order/component/master.vue index a447dc8..ae4a999 100644 --- a/pages/order/component/master.vue +++ b/pages/order/component/master.vue @@ -115,6 +115,15 @@ this.onOrder() }, methods:{ + onReach(){ + this.pageNo = this.pageNo + 1 + this.onOrder() + }, + onRefresh(){ + this.list = [] + this.pageNo = 1 + this.onOrder() + }, onOrder(){ let that = this; let params={ @@ -134,6 +143,8 @@ }) }, tabClick(event){ + this.list = [] + this.pageNo = 1 this.current = event.index this.orderStatus = this.nav[event.index].index this.onOrder() diff --git a/pages/order/index.vue b/pages/order/index.vue index b657aa3..3da0fbb 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -2,9 +2,9 @@ - + - + @@ -31,6 +31,20 @@ current: 0, } }, + onReachBottom() { + if(this.current==0){ + this.$refs.enterpriseBoxRef.onReach(); + }else if(this.current==1){ + this.$refs.masterBoxRef.onReach(); + } + }, + onPullDownRefresh() { + if(this.current==0){ + this.$refs.enterpriseBoxRef.onRefresh(); + }else if(this.current==1){ + this.$refs.masterBoxRef.onRefresh(); + } + }, methods:{ sectionChange(index){ this.current=index diff --git a/pages/user/index.vue b/pages/user/index.vue index 77ad90c..82d08ce 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -71,6 +71,18 @@ + + + + + 我的招聘 + + + + + + 我的求职 + @@ -155,6 +167,16 @@ this.onUserInfoDetail() }, methods: { + onHire(){ + uni.navigateTo({ + url:"/pages_subpack/hire/index" + }) + }, + onJobHunt(){ + uni.navigateTo({ + url:"/pages_subpack/job-hunt/index" + }) + }, onEdit(){ uni.navigateTo({ url:"/pages/login/index?back=1" diff --git a/pages_subpack/feedback/index.vue b/pages_subpack/feedback/index.vue index 5329819..f9d6126 100644 --- a/pages_subpack/feedback/index.vue +++ b/pages_subpack/feedback/index.vue @@ -52,14 +52,10 @@ data(){ return{ form:{ - feedback:"以下文件体积超过 500KB，已跳过压缩以及 ES6 转 ES5 的处理", - name:"jerryxiao", - mobile:"13189698114", - proofFile: [ - { - url:"https://tennis-oss.xzaiyp.top/2025-01-02/a1e3b236-9995-47ba-804e-e82155f55e67.jpg" - } - ] + feedback:"", + name:"", + mobile:"", + proofFile: [] }, rules:{ feedback: [ @@ -104,10 +100,8 @@ submit() { this.$refs.uForm.validate().then(res => { this.onaddSuggest() - // uni.$u.toast('校验通过') }).catch(errors => { console.info(errors) - uni.$u.toast('校验失败') }) }, onaddSuggest(){ diff --git a/pages_subpack/hire/index.vue b/pages_subpack/hire/index.vue new file mode 100644 index 0000000..01aebc4 --- /dev/null +++ b/pages_subpack/hire/index.vue @@ -0,0 +1,295 @@ + + + + + diff --git a/pages_subpack/job-hunt/index.vue b/pages_subpack/job-hunt/index.vue new file mode 100644 index 0000000..0aa5cf4 --- /dev/null +++ b/pages_subpack/job-hunt/index.vue @@ -0,0 +1,158 @@ + + + + + \ No newline at end of file diff --git a/pages_subpack/payment/index.vue b/pages_subpack/payment/index.vue index e9a13af..9681e24 100644 --- a/pages_subpack/payment/index.vue +++ b/pages_subpack/payment/index.vue @@ -150,6 +150,7 @@ if(that.payRadio==1){ payOrder({orderId:that.id}).then(res=>{ + uni.requestPayment({ provider: 'wxpay', // 服务提提供商 timeStamp: res.result.timeStamp, // 时间戳 @@ -175,6 +176,7 @@ }) }else if(that.payRadio==2){ payOrder({orderId:that.id}).then(response=>{ + console.info("payOrder",response) uni.requestPayment({ provider: "wxpay", nonceStr: response.result.nonceStr, @@ -186,8 +188,13 @@ that.$u.toast("付款成功！") that.onDetail(); }, - fail(e) { - console.info(e) + fail(err) { + console.info(err) + console.log('支付失败',err); + uni.showToast({ + icon:'none', + title:"支付失败" + }) } }) }).catch(error=>{ diff --git a/static/image/59.png b/static/image/59.png index 440e0c7..38e9f13 100644 Binary files a/static/image/59.png and b/static/image/59.png differ diff --git a/static/image/hire.png b/static/image/hire.png new file mode 100644 index 0000000..4ca58e5 Binary files /dev/null and b/static/image/hire.png differ diff --git a/static/image/jobhunt.png b/static/image/jobhunt.png new file mode 100644 index 0000000..5e36b82 Binary files /dev/null and b/static/image/jobhunt.png differ diff --git a/static/image/nav1.png b/static/image/nav1.png deleted file mode 100644 index ab28077..0000000 Binary files a/static/image/nav1.png and /dev/null differ diff --git a/static/image/nav2.png b/static/image/nav2.png deleted file mode 100644 index 30a812a..0000000 Binary files a/static/image/nav2.png and /dev/null differ diff --git a/static/image/nav3.png b/static/image/nav3.png deleted file mode 100644 index f045eae..0000000 Binary files a/static/image/nav3.png and /dev/null differ diff --git a/static/image/nav4.png b/static/image/nav4.png deleted file mode 100644 index 22383c0..0000000 Binary files a/static/image/nav4.png and /dev/null differ diff --git a/static/image/nav5.png b/static/image/nav5.png deleted file mode 100644 index fd3e5a9..0000000 Binary files a/static/image/nav5.png and /dev/null differ diff --git a/static/image/nav6.png b/static/image/nav6.png deleted file mode 100644 index be548d1..0000000 Binary files a/static/image/nav6.png and /dev/null differ diff --git a/static/image/nav7.png b/static/image/nav7.png deleted file mode 100644 index cc7a1c9..0000000 Binary files a/static/image/nav7.png and /dev/null differ diff --git a/static/image/nav8.png b/static/image/nav8.png deleted file mode 100644 index b6169a8..0000000 Binary files a/static/image/nav8.png and /dev/null differ