-
+
+
-
{
this.loading = true
diff --git a/admin-web-master/src/views/renovation/brand/index.vue b/admin-web-master/src/views/renovation/brand/index.vue
index 05b8ec2..2ce8f3a 100644
--- a/admin-web-master/src/views/renovation/brand/index.vue
+++ b/admin-web-master/src/views/renovation/brand/index.vue
@@ -35,7 +35,7 @@
label="Logo"
>
-
关闭
- 审核
+ 审核
@@ -18,12 +18,12 @@
查看
diff --git a/admin-web-master/src/views/order/pending/index.vue b/admin-web-master/src/views/order/pending/index.vue
index 2f57b59..8f8fd4f 100644
--- a/admin-web-master/src/views/order/pending/index.vue
+++ b/admin-web-master/src/views/order/pending/index.vue
@@ -92,7 +92,7 @@
- 查看
diff --git a/admin-web-master/src/views/renovation/brand/form.vue b/admin-web-master/src/views/renovation/brand/form.vue
index 07208db..93538d1 100644
--- a/admin-web-master/src/views/renovation/brand/form.vue
+++ b/admin-web-master/src/views/renovation/brand/form.vue
@@ -23,7 +23,8 @@
商品详情
- 商品卖点：{{ productItem.productBrief }}
商品图片：
-
+
![]()
@@ -220,7 +220,7 @@ export default {
this.details()
},
handlePictureCardPreview (item) {
- this.dialogImageUrl = item.imgPath;
+ this.dialogImageUrl = this.$baseURL+item.imgPath;
this.dialogVisible = true;
},
diff --git a/admin-web-master/src/views/renovation/commoditySystem/index.vue b/admin-web-master/src/views/renovation/commoditySystem/index.vue
index 11b1e74..fc12260 100644
--- a/admin-web-master/src/views/renovation/commoditySystem/index.vue
+++ b/admin-web-master/src/views/renovation/commoditySystem/index.vue
@@ -73,7 +73,7 @@
/>
- ![]()
+ ![]()
{{scope.row.contractType}}
diff --git a/ceres-uniapp-master/components/canvasShow/basics/banner.vue b/ceres-uniapp-master/components/canvasShow/basics/banner.vue
index 69b3d0d..f98612a 100644
--- a/ceres-uniapp-master/components/canvasShow/basics/banner.vue
+++ b/ceres-uniapp-master/components/canvasShow/basics/banner.vue
@@ -1,8 +1,8 @@
-
- ![]()
+
+ ![]()
@@ -41,7 +41,7 @@
pageSize: 10,
}
NET.request2(API.cereCarouselImage, pagesize, 'POST').then(res => {
- console.log('11111111111111',res)
+
this.bannerList = res.data.content
})
diff --git a/ceres-uniapp-master/components/canvasShow/canvasShowPage.vue b/ceres-uniapp-master/components/canvasShow/canvasShowPage.vue
index 09c425e..5eaa415 100644
--- a/ceres-uniapp-master/components/canvasShow/canvasShowPage.vue
+++ b/ceres-uniapp-master/components/canvasShow/canvasShowPage.vue
@@ -120,8 +120,8 @@
+
\ No newline at end of file
diff --git a/lvdao-miniapp/pagesA/rentPay/rentPayDetails.scss b/lvdao-miniapp/pagesA/rentPay/rentPayDetails.scss
index 55a26bf..cb8c8f4 100644
--- a/lvdao-miniapp/pagesA/rentPay/rentPayDetails.scss
+++ b/lvdao-miniapp/pagesA/rentPay/rentPayDetails.scss
@@ -65,4 +65,12 @@
border-bottom: unset;
}
}
+}
+.nonemsg{
+ color: #0FBB59;
+ font-size: 18px;
+ width: 100%;
+ margin-top: 10%;
+ text-align: center;
+
}
\ No newline at end of file
diff --git a/lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue b/lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue
index e9c2a71..c73001e 100644
--- a/lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue
+++ b/lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue
@@ -5,26 +5,29 @@
{{pageIndex.time}}年
-
- 7月
-
-
+
- 支付订单编号
- {{value.tenementOrderParent==''?value.tenementOrder:value.tenementOrderParent}}
+
- 支付成功
- 07.11 15:21
+ {{value.payState==1?'支付成功':''}}
+ {{formatDateTime(value.paymentTime)}}
+
+ 暂无数据
+
@@ -33,29 +36,143 @@
data() {
return {
show: false,
- dataList: [
- {
- children: [{}, {}]
- }
-
- ],
+ dataList: [],
+ allPay:0,
pageIndex:{
time:''
- }
+ },
+ merchants:''
}
},
- onShow() {
+ onShow(){
this.pageIndex.time = this.getCurrentYear()
},
+ onLoad(options) {
+ if(options.msg && options.merchants){
+ this.allPay = 0
+ let receivedMsg = JSON.parse(options.msg)
+ this.merchants = options.merchants
+ this.getAll(receivedMsg.list)
+ }
+ },
methods: {
+ getAll(receivedMsg){
+ let totalPay= 0
+ const redList = []
+ // 用于存储 tenementOrderParent 相同的项
+ const groupedItems = {};
+ // 遍历 receivedMsg.list 数组
+ receivedMsg.forEach(item => {
+ if(item.payState ==1){
+ totalPay += item.paymentAmount
+ if (item.tenementOrderParent === '') {
+ // 如果 tenementOrderParent 为空，添加 dingPay 字段并添加到 redList
+ let newItem = { ...item,ziList:[], dingPay: item.paymentAmount };
+ newItem.ziList.push(item)
+ redList.push(newItem);
+ } else {
+ // 如果 tenementOrderParent 不为空，将相同 tenementOrderParent 的项分组
+ if (!groupedItems[item.tenementOrderParent]) {
+ groupedItems[item.tenementOrderParent] = {
+ ziList: [],
+ dingPay: 0
+ };
+ }
+ groupedItems[item.tenementOrderParent].ziList.push(item);
+ groupedItems[item.tenementOrderParent].dingPay += item.paymentAmount;
+ groupedItems[item.tenementOrderParent].paymentTime = item.paymentTime;
+ groupedItems[item.tenementOrderParent].payDay = item.payDay;
+ groupedItems[item.tenementOrderParent].payState = item.payState;
+ }
+ }
+
+ });
+ // 将分组后的对象添加到 redList
+ for (const key in groupedItems) {
+ redList.push({
+ tenementOrderParent: key,
+ ...groupedItems[key]
+ });
+ }
+
+ // receivedMsg.list.map(item=>{
+ // let obj ={
+ // ...item,
+ // dingPay:0,
+ // ziList:[]
+ // }
+ // if (item.payState == 1) {
+ // obj.ziList.push(item)
+ // if(item.tenementOrderParent ){
+
+ // }
+ // obj.dingPay +=item.paymentAmount
+ // this.orderPay+=item.paymentAmount
+ // this.allPay+=item.paymentAmount
+ // redList.push(obj)
+ // }
+
+ // })
+ this.allPay = totalPay;
+ this.dataList = redList
+
+ },
getCurrentYear() {
const year = new Date().getFullYear();
return `${year}`;
},
confirm(e){
-
this.pageIndex.time = e.year
- }
+
+ const { firstDay, lastDay } = this.getYearFirstAndLastDay(e.year)
+ this.$http.sendRequest('/cerePropertyOrder/queryByName', 'POST', {
+ relatedMerchants:this.merchants,
+ paymentTimeStart:firstDay,
+ paymentTimeEnd:lastDay
+ }, 1).then(res => {
+ if (res.data.data.length > 0) {
+
+ this.getAll(res.data.data[0].cerePropertyOrderList)
+ }else{
+ this.dataList=[]
+ this.allPay = 0
+ }
+ })
+ },
+ getYearFirstAndLastDay(year) {
+ console.log(year)
+ const firstDay = new Date(year, 0, 1);
+ const lastDay = new Date(year, 11, 31);
+ console.log(firstDay.toISOString().split('T'))
+ return {
+ firstDay: firstDay.toISOString().split('T')[0],
+ lastDay: lastDay.toISOString().split('T')[0]
+ }
+ },
+ formatDateTime(dateTimeStr) {
+ // 创建 Date 对象
+ const date = new Date(dateTimeStr);
+ // 获取月份，由于 getMonth() 返回值从 0 开始，所以要加 1，并确保为两位数字
+ const month = String(date.getMonth() + 1).padStart(2, '0');
+ // 获取日期，并确保为两位数字
+ const day = String(date.getDate()).padStart(2, '0');
+ // 获取小时，并确保为两位数字
+ const hours = String(date.getHours()).padStart(2, '0');
+ // 获取分钟，并确保为两位数字
+ const minutes = String(date.getMinutes()).padStart(2, '0');
+
+ // 按照所需格式拼接并返回结果
+ return `${month}.${day} ${hours}:${minutes}`;
+ },
+ formatDate(dateStr) {
+ // 使用 split 方法将日期字符串按 - 分割成数组
+ const [year, month, day] = dateStr.split('-');
+ // 将 month 和 day 转换为数字，去除可能存在的前导零
+ const formattedMonth = parseInt(month, 10);
+ const formattedDay = parseInt(day, 10);
+ // 按照目标格式拼接字符串
+ return `${formattedMonth}月${formattedDay}号`;
+ },
}
}
diff --git a/lvdao-miniapp/pagesA/rentPay/webView.vue b/lvdao-miniapp/pagesA/rentPay/webView.vue
index 6c04275..1240691 100644
--- a/lvdao-miniapp/pagesA/rentPay/webView.vue
+++ b/lvdao-miniapp/pagesA/rentPay/webView.vue
@@ -1,27 +1,30 @@
-
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 82c4582..778963d 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -21,18 +21,22 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
// bases = 'http://10.0.0.51:9003' + url;
// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
- // bases = 'https://jy.scjysm.asia:18086/admin-server' + url;
+
+ }else if(baseUrl == 3){
+ bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
+ // bases = 'http://192.168.2.107:9007' + url;
+ // bases = 'http://10.0.0.51:9007' + url;
+
}else{
// bases = 'http://172.16.61.125:9004/' + url;
// bases = 'http://172.16.61.48/business-server' + url;
// bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
-
+
// bases = 'http://10.0.0.51:9004' + url;
// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
- // bases = 'https://jy.scjysm.asia:18086/merchant-business' + url;
}
var token = uni.getStorageSync('token') || '';
diff --git a/merchant-web-master/src/api/commodityLease.js b/merchant-web-master/src/api/commodityLease.js
new file mode 100644
index 0000000..4c41322
--- /dev/null
+++ b/merchant-web-master/src/api/commodityLease.js
@@ -0,0 +1,13 @@
+import request from '@/utils/request'
+// 上传合同
+
+export function miniioupload(data) {
+ return request({
+ url: '/miniio/upload',
+ method: 'post',
+ data,
+ headers: {
+ 'Content-Type': 'multipart/form-data'
+ }
+ })
+}
diff --git a/merchant-web-master/src/assets/images/cover.svg b/merchant-web-master/src/assets/images/cover.svg
new file mode 100644
index 0000000..7c89a09
--- /dev/null
+++ b/merchant-web-master/src/assets/images/cover.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/merchant-web-master/src/assets/images/fengmian.png b/merchant-web-master/src/assets/images/fengmian.png
new file mode 100644
index 0000000..4259516
--- /dev/null
+++ b/merchant-web-master/src/assets/images/fengmian.png
diff --git a/merchant-web-master/src/assets/images/logo2.png b/merchant-web-master/src/assets/images/logo2.png
new file mode 100644
index 0000000..f506d11
--- /dev/null
+++ b/merchant-web-master/src/assets/images/logo2.png
diff --git a/merchant-web-master/src/components/BaseImage/index.vue b/merchant-web-master/src/components/BaseImage/index.vue
new file mode 100644
index 0000000..b29de64
--- /dev/null
+++ b/merchant-web-master/src/components/BaseImage/index.vue
@@ -0,0 +1,179 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/merchant-web-master/src/components/ImageUpload/index.vue b/merchant-web-master/src/components/ImageUpload/index.vue
new file mode 100644
index 0000000..212afb3
--- /dev/null
+++ b/merchant-web-master/src/components/ImageUpload/index.vue
@@ -0,0 +1,439 @@
+
+
+
+
+
+
+
+
+
+
+ 
+
+
+
+ 
+
+
+
+
+
+
+
+
+
diff --git a/merchant-web-master/src/layout/index.vue b/merchant-web-master/src/layout/index.vue
index 80986d1..d4b58a5 100644
--- a/merchant-web-master/src/layout/index.vue
+++ b/merchant-web-master/src/layout/index.vue
@@ -2,14 +2,15 @@
+ 请上传小于{{ options.limitSize }}M，格式为{{
+ options.accept
+ }}格式的图片，最多可上传{{ options.limit }}张
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 点击上传图片
+
+
+
- 
+ 
-
+
-
- 
-
@@ -204,7 +206,11 @@
- 工作台
+
+
+