diff --git a/admin-web-master/src/utils/index.js b/admin-web-master/src/utils/index.js
index 3bd489c..fa4c060 100644
--- a/admin-web-master/src/utils/index.js
+++ b/admin-web-master/src/utils/index.js
@@ -17,7 +17,7 @@ export function parseTime(time, cFormat) {
if (typeof time === 'object') {
date = time
} else {
- if ((typeof time === 'string')) {
+ if ((typeof time === 'string')) {
if ((/^[0-9]+$/.test(time))) {
// support "1548221490638"
time = parseInt(time)
diff --git a/lvdao-miniapp/pages/accepting/accepting.vue b/lvdao-miniapp/pages/accepting/accepting.vue
index 988b37b..a7fc26d 100644
--- a/lvdao-miniapp/pages/accepting/accepting.vue
+++ b/lvdao-miniapp/pages/accepting/accepting.vue
@@ -4,7 +4,7 @@
-
+
{{
@@ -25,8 +25,8 @@
}}
- 租金：￥{{moban[0].rentalPrice}}/{{moban[0].leaseTerm}}
- 面积：81/m²
+ 租金：￥{{moban[0].rentalPrice}}/{{moban[0].leaseTerm}}
+
@@ -69,7 +69,7 @@
广告图片
-
+
@@ -90,15 +90,13 @@
身份证有效期
{{record.idValidStart || record.idCardValidStart}}至 {{record.idValidEnd || record.idCardValidEnd}}
-->
-
+
身份证照片
-
-
-
-
-
-
-
+
+
+
+
@@ -129,10 +128,12 @@
return {
record:{},
shopMsg:{},
- moban:[]
+ moban:[],
+ imgurl:''
}
},
onLoad(options) {
+ this.imgurl = this.$img
const item = JSON.parse(decodeURIComponent(options.item));
console.log('Received item:', item);
this.record = item
diff --git a/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue b/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
index 95e17f1..0160e9f 100644
--- a/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
+++ b/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
@@ -9,20 +9,20 @@
-
+
-
+
-
+
-
+
@@ -40,51 +40,51 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
diff --git a/lvdao-miniapp/pages/record/record.vue b/lvdao-miniapp/pages/record/record.vue
index 9696aaf..d3d907b 100644
--- a/lvdao-miniapp/pages/record/record.vue
+++ b/lvdao-miniapp/pages/record/record.vue
@@ -2,7 +2,7 @@
-
+
@@ -18,6 +18,7 @@
+ 暂无数据
@@ -56,6 +57,22 @@
this.pageindex.applicant =uni.getStorageSync('user').phone
this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
//成功回调
+ this.recordList = res.data.data.content
+ this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
+
+ if(item.data.data.content !=undefined &&item.data.data.content.length !=0){
+ item.data.data.content.map(val=>{
+ this.recordList.push(val)
+ })
+ }
+
+
+ })
+ })
+ return
+ this.pageindex.applicant =uni.getStorageSync('user').phone
+ this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
+ //成功回调
this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
index 862dc8f..54a2bbe 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
@@ -2,23 +2,24 @@
-
+
-
+
{{item.cereBasicInformationShop&&item.cereBasicInformationShop.shopName?item.cereBasicInformationShop.shopName:item.cereBasicInformationVenue&&item.cereBasicInformationVenue.venueName?item.cereBasicInformationVenue.venueName:item.cereAdvertisingInformation&&item.cereAdvertisingInformation.advertisingName?item.cereAdvertisingInformation.advertisingName:''}}
-
+
申请时间：{{item.applicationTime}}
租赁时间 ：{{item.intendedLeaseTerm?item.intendedLeaseTerm:item.scheduleTime}}
-
+ 状态：{{item.auditStatus =='1'?'待审核':item.auditStatus =='2'?'待签约':item.auditStatus =='3'?'已驳回':item.auditStatus =='4'?'租赁中':'已终止'}}
+ 暂无数据
@@ -27,7 +28,12 @@
export default {
data() {
return {
- activesType: [{
+ activesType: [
+ // {
+ // value: 1,
+ // label: '申请中'
+ // },
+ {
value: 4,
label: '租赁中'
},
@@ -68,11 +74,11 @@
},
recordXq(item){
-
- const encodedItem = encodeURIComponent(JSON.stringify(item));
+
+ const encodedItem = encodeURIComponent(JSON.stringify(item));
uni.navigateTo({
- url: `/pagesA/myZiyuan/myZiDetails?item=${encodedItem}`,
- })
+ url: `/pagesA/myZiyuan/myZiDetails?item=${encodedItem}`,
+ })
},
contractdetail(){
// uni.navigateTo({