diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 940f3cb..fbc652f 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -16,9 +16,9 @@ let hostall = window.location.href; let baseURL = '' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { - // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; + baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - baseURL = 'http://128.10.249.26:9003'; + // baseURL = 'http://128.10.249.26:9003'; } else { console.error('---------------------') diff --git a/admin-web-master/src/views/shopRental/manage/index.vue b/admin-web-master/src/views/shopRental/manage/index.vue index 29b377c..caaa69e 100644 --- a/admin-web-master/src/views/shopRental/manage/index.vue +++ b/admin-web-master/src/views/shopRental/manage/index.vue @@ -236,6 +236,8 @@ } }, async OA(row){ + // console.error(row) + // return console.log(this.$baseURL+row.appendicesContract) const response = await axios({ method: 'get', @@ -256,6 +258,7 @@ fd.append('reviewers', '1858710592190291968'); fd.append('fileNames', '合同.docx'); fd.append('title', '这是一个流程'); + fd.append('contractNumber', row.contractNumber); console.log(fd); // return // let c1 ={ @@ -269,18 +272,18 @@ general(fd).then(res => { console.log(res); let data = JSON.parse(res.data) - if(data.code == '0'){ + if(data.code == '200'){ this.$message({ type: 'success', message: '发起成功' }) - edit({ - contractNumber: row.contractNumber, - dataStatus: '5', - }).then(res1 => { - console.error(res1) - this.resetting() - }) + // edit({ + // contractNumber: row.contractNumber, + // dataStatus: '5', + // }).then(res1 => { + // console.error(res1) + // this.resetting() + // }) } else { this.$message({ type: 'error', diff --git a/lvdao-miniapp/pages/business/businessDetail/businessDetail.vue b/lvdao-miniapp/pages/business/businessDetail/businessDetail.vue index e56f934..a6b4e58 100644 --- a/lvdao-miniapp/pages/business/businessDetail/businessDetail.vue +++ b/lvdao-miniapp/pages/business/businessDetail/businessDetail.vue @@ -20,7 +20,7 @@ {{tableData.cereBasicInformationVenue.venueName}} - {{tableData.cereBasicInformationVenue.detailedLocation}} + @@ -53,8 +53,10 @@ export default { }; }, onLoad(option){ + this.imgurl = this.$img - this.tableData = JSON.parse(option.item) + let ce = decodeURIComponent(option.item) + this.tableData = JSON.parse(ce) if (typeof this.tableData.previousEvents === 'string') { this.tableData.previousEvents = this.tableData.previousEvents.split(','); } diff --git a/lvdao-miniapp/pages/business/businessList/businessList.vue b/lvdao-miniapp/pages/business/businessList/businessList.vue index afc2c3e..56b54c8 100644 --- a/lvdao-miniapp/pages/business/businessList/businessList.vue +++ b/lvdao-miniapp/pages/business/businessList/businessList.vue @@ -105,7 +105,7 @@ toDetail(items) { let msg = JSON.stringify(items) uni.navigateTo({ - url: `/pages/business/businessDetail/businessDetail?item=${msg}` + url: `/pages/business/businessDetail/businessDetail?item=${encodeURIComponent(msg)}` }) }, diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue index 25ce28d..21a7d5e 100644 --- a/lvdao-miniapp/pages/home/home.vue +++ b/lvdao-miniapp/pages/home/home.vue @@ -589,7 +589,7 @@ toDetailTwo(item, path) { let items = JSON.stringify(item) uni.navigateTo({ - url: `${path}?item=${items}` + url: `${path}?item=${encodeURIComponent(items)}` }) }, goDetail(path) { diff --git a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue index 05604cc..7899891 100644 --- a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue +++ b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue @@ -19,14 +19,14 @@ 起止时间：{{tableData.startTime}}至{{tableData.endTime}} 联系人：{{tableData.contactPerson}} 联系电话：{{tableData.contactPhone}} - 已参与报名人数：{{tableData.registeredCount}}人 + 已参与报名人数：{{tableData.registeredCount || 0}}人 - + diff --git a/lvdao-miniapp/pages/orderList/orderList - 副本.vue b/lvdao-miniapp/pages/orderList/orderList - 副本.vue new file mode 100644 index 0000000..cfa0fa4 --- /dev/null +++ b/lvdao-miniapp/pages/orderList/orderList - 副本.vue @@ -0,0 +1,302 @@ + + + + + \ No newline at end of file diff --git a/lvdao-miniapp/pages/orderList/orderList.vue b/lvdao-miniapp/pages/orderList/orderList.vue index cfa0fa4..c6a490d 100644 --- a/lvdao-miniapp/pages/orderList/orderList.vue +++ b/lvdao-miniapp/pages/orderList/orderList.vue @@ -1,52 +1,45 @@ @@ -54,18 +47,32 @@ export default { data() { return { - show: false, - list: [], + list: [ + { + name: '全部' + }, + { + name: '待付款' + }, + { + name: '待发货', + }, + { + name: '已发货', + }, + { + name: '已完成', + }, + { + name: '已关闭', + }, + ], + current: 0, + pageindex: { - afterState: "", - dates: [], page: 1, pageSize: 10, - search: "", - searchType: "1", - state: "" }, - dataTime:'' }; }, mounted() { @@ -75,20 +82,14 @@ }, methods: { - change(e){ - console.log(e) - this.dataTime = `${e.startDate}-${e.endDate}` - this.getALL() - }, - close(){ - this.dataTime = '' - this.getALL() - }, getALL() { // this.$http.sendRequest('/order/getAll', 'POST', this.pageindex, 2).then(res => { // //成功回调 // this.list = res.data.data.list // }) + }, + change(index) { + this.current = index; } } @@ -96,207 +97,12 @@ \ No newline at end of file diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue index b21f7d9..0f5c712 100644 --- a/lvdao-miniapp/pages/workbench/workbench.vue +++ b/lvdao-miniapp/pages/workbench/workbench.vue @@ -98,6 +98,7 @@ +