diff --git a/app.json b/app.json
index 2effdc0..0bcdea1 100644
--- a/app.json
+++ b/app.json
@@ -6,7 +6,8 @@
"pages/serve/serve",
"pages/mine/mine",
"pages/register/register",
- "pages/webView/webView"
+ "pages/webView/webView",
+ "pages/noData/noData"
],
"subPackages": [
{
@@ -83,11 +84,7 @@
"iconPath": "images/icon/home.png"
},
- {
- "text": "服务",
- "pagePath": "pages/serve/serve",
- "iconPath": "images/icon/home.png"
- },
+
{
"text": "我的",
"pagePath": "pages/mine/mine",
diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js
index 8e0a8da..c5cc6d3 100644
--- a/custom-tab-bar/index.js
+++ b/custom-tab-bar/index.js
@@ -22,13 +22,13 @@ Component({
// selectedIconPath: "/images/icon/message-a.png",
// text: "消息",
// },
- {
- pagePath: "/pages/serve/serve",
- iconPath: "/images/icon/serve-a.png",
- selectedIconPath: "/images/icon/serve.png",
- bulge:false,
- text: "服务",
- },
+ // {
+ // pagePath: "/pages/serve/serve",
+ // iconPath: "/images/icon/serve-a.png",
+ // selectedIconPath: "/images/icon/serve.png",
+ // bulge:false,
+ // text: "服务",
+ // },
// {
// pagePath: "/pages/life/life",
// iconPath: "/images/icon/life.png",
diff --git a/pages/index/index.js b/pages/index/index.js
index b154bb3..03d9df6 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -6,7 +6,8 @@ import {
} from "../../api/user"
import {
getPolicyList,
- message
+ message,
+ selectMzGraduateInfo
} from "../../api/index"
Page({
/**
@@ -48,14 +49,16 @@ Page({
// url: "/subpages/bsPage/bsPage/bsPage",
// image:'../../images/icon/baoshi.png'
// },
- // {
- // name: "生活圈",
- // },
{
- name: "更多",
- url:'/pages/serve/serve',
- image:'../../images/icon/gengduo.png'
+ name: "居住评价",
+ url: "/subpages/mine/checkInEvaluate/checkInEvaluate",
+ image:'../../images/icon/nav_3.png'
},
+ // {
+ // name: "更多",
+ // url:'/pages/serve/serve',
+ // image:'../../images/icon/gengduo.png'
+ // },
],
searchValue: "",
policyList:[],//政策列表
@@ -67,7 +70,6 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
-
this.setData({
statusHeight: app.globalData.deviceInfo.statusHeight,
navigationHeight: app.globalData.deviceInfo.navigationHeight,
@@ -76,6 +78,31 @@ Page({
init(){
this.login()
},
+ selectMzGraduateInfo(obj){
+ selectMzGraduateInfo({idCard:obj.idCard}).then(res=>{
+ if (res.data.signType === 0 && res.data.contract) {
+ //线上支付去跳转签合同
+ app.globalData.userInfo.chooseRoomId = res.data.chooseRecId
+ console.log(res.data.contract, '链接》》》》');
+ res.data.contract = res.data.contract.replace('https://h5.esign.cn', 'https://hxm5112004501.h5.esign.cn')
+ wx.navigateTo({
+ url: '/pages/webView/webView?url=' + encodeURIComponent(res.data.contract),
+ })
+ } else if (res.data.signType === 1) {
+ wx.navigateTo({
+ url: '/pages/noData/noData?msg=暂无合同签订&idCard=' + obj.idCard,
+ })
+ } else {
+ wx.navigateTo({
+ url: '/pages/noData/noData?msg=暂无合同签订&idCard=' + obj.idCard,
+ })
+ }
+ }).catch(err=>{
+ wx.navigateTo({
+ url: '/pages/noData/noData?msg=暂无合同签订&idCard=' + obj.idCard,
+ })
+ })
+ },
login() {
wx.showLoading({
title:'加载中...'
@@ -201,9 +228,7 @@ Page({
}else if(e.currentTarget.dataset.url === '/subpages/OCRCard/pages/index/index'){
if(!this.data.bindPhone){
if(this.data.userInfo.idCard){
- wx.navigateTo({
- url: `/subpages/index/checkInUser/checkInUser?idCard=${this.data.userInfo.idCard}&name=${this.data.userInfo.name}&phone=${this.data.userInfo.phone}`,
- })
+ this.selectMzGraduateInfo({idCard:this.data.userInfo.idCard})
}else{
wx.navigateTo({
url: `/subpages/OCRCard/pages/index/index`,
diff --git a/pages/noData/noData.js b/pages/noData/noData.js
new file mode 100644
index 0000000..bac50cc
--- /dev/null
+++ b/pages/noData/noData.js
@@ -0,0 +1,106 @@
+// pages/noData/noData.js
+
+import {selectMzGraduateInfo } from "../../api/index"
+const app = getApp()
+Page({
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+ msg:'暂无信息',
+ idCard:''
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+ if(options){
+ this.setData({
+ msg:options.msg,
+ idCard:options.idCard,
+ statusHeight: app.globalData.deviceInfo.statusHeight,
+ navigationHeight: app.globalData.deviceInfo.navigationHeight,
+ })
+ this.selectMzGraduateInfo()
+ }
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+ back(){
+ wx.switchTab({
+ url: '/pages/index/index',
+ })
+ },
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+ this.selectMzGraduateInfo()
+ wx.stopPullDownRefresh();
+ },
+ selectMzGraduateInfo(){
+ console.log(this.data.idCard);
+ selectMzGraduateInfo({idCard:this.data.idCard}).then(res=>{
+ if (res.data.signType === 0 && res.data.contract) {
+ //线上支付去跳转签合同
+ app.globalData.userInfo.chooseRoomId = res.data.chooseRecId
+ console.log(res.data.contract, '链接》》》》');
+ res.data.contract = res.data.contract.replace('https://h5.esign.cn', 'https://hxm5112004501.h5.esign.cn')
+ wx.navigateTo({
+ url: '/pages/webView/webView?url=' + encodeURIComponent(res.data.contract),
+ })
+ }else{
+ wx.showToast({
+ title: '暂无合同签订',
+ icon:'none'
+ })
+ }
+ }).catch(err=>{
+ wx.showToast({
+ title: '暂无合同签订',
+ icon:'none'
+ })
+ })
+ },
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+})
\ No newline at end of file
diff --git a/pages/noData/noData.json b/pages/noData/noData.json
new file mode 100644
index 0000000..2e753d9
--- /dev/null
+++ b/pages/noData/noData.json
@@ -0,0 +1,8 @@
+{
+ "usingComponents": {
+ "van-empty": "@vant/weapp/empty/index"
+ },
+ "navigationBarTitleText": "入住办理",
+ "enablePullDownRefresh": true,
+ "navigationStyle": "custom"
+}
\ No newline at end of file
diff --git a/pages/noData/noData.wxml b/pages/noData/noData.wxml
new file mode 100644
index 0000000..41f6871
--- /dev/null
+++ b/pages/noData/noData.wxml
@@ -0,0 +1,10 @@
+
+
+
+ 入住办理
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/noData/noData.wxss b/pages/noData/noData.wxss
new file mode 100644
index 0000000..1c83a0e
--- /dev/null
+++ b/pages/noData/noData.wxss
@@ -0,0 +1,20 @@
+/* pages/noData/noData.wxss */
+.navigation {
+ display: flex;
+ align-items: center;
+ color: #333333;
+ font-size: 32rpx;
+ z-index: 100;
+ position: fixed;
+ left: 50%;
+ transform: translateX(-60rpx);
+}
+.back {
+ width: 30rpx;
+ height: 30rpx;
+ margin-left: 20rpx;
+ margin-top: 20rpx;
+ border-radius: 0rpx;
+ z-index: 101;
+ position: fixed;
+}
\ No newline at end of file
diff --git a/pages/serve/serve.js b/pages/serve/serve.js
index ec75fb1..e2ca39f 100644
--- a/pages/serve/serve.js
+++ b/pages/serve/serve.js
@@ -73,6 +73,51 @@ Page({
url: '/subpages/eventAdd/add/add',
})
},
+ toPage(e){
+ console.log(e);
+ if(e.currentTarget.dataset.url && e.currentTarget.dataset.url != '/subpages/OCRCard/pages/index/index' && e.currentTarget.dataset.url != '/subpages/index/checkOutConfirm/index/index'){
+ if(e.currentTarget.dataset.url === '/pages/serve/serve'){
+ wx.switchTab({
+ url: '/pages/serve/serve',
+ })
+ }
+ wx.navigateTo({
+ url: e.currentTarget.dataset.url,
+ })
+ }else if(e.currentTarget.dataset.url === '/subpages/OCRCard/pages/index/index'){
+ if(!this.data.bindPhone){
+ if(this.data.userInfo.idCard){
+ wx.navigateTo({
+ url: `/subpages/index/checkInUser/checkInUser?idCard=${this.data.userInfo.idCard}&name=${this.data.userInfo.name}&phone=${this.data.userInfo.phone}`,
+ })
+ }else{
+ wx.navigateTo({
+ url: `/subpages/OCRCard/pages/index/index`,
+ })
+ }
+ }else{
+ wx.navigateTo({
+ url: '/pages/register/register',
+ })
+ }
+ }else if(e.currentTarget.dataset.url === '/subpages/index/checkOutConfirm/index/index'){
+ if(!this.data.bindPhone){
+ if(this.data.userInfo.idCard){
+ wx.navigateTo({
+ url: `/subpages/index/checkOutConfirm/index/index`,
+ })
+ }else{
+ wx.navigateTo({
+ url: `/subpages/OCRCard/pages/index/index?type=out`,
+ })
+ }
+ }else{
+ wx.navigateTo({
+ url: '/pages/register/register',
+ })
+ }
+ }
+ },
toBsPage(){
wx.navigateTo({
url: '/subpages/bsPage/bsPage/bsPage',
diff --git a/pages/serve/serve.wxml b/pages/serve/serve.wxml
index 285dc44..03dfd70 100644
--- a/pages/serve/serve.wxml
+++ b/pages/serve/serve.wxml
@@ -9,22 +9,22 @@