商品详情
- 商品卖点：{{ 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 @@
diff --git a/lvdao-miniapp/pagesA/rentPay/webView.vue b/lvdao-miniapp/pagesA/rentPay/webView.vue
index 535f98c..1240691 100644
--- a/lvdao-miniapp/pagesA/rentPay/webView.vue
+++ b/lvdao-miniapp/pagesA/rentPay/webView.vue
@@ -11,15 +11,20 @@
url:'https://test-pay.028wlkj.com/fixedPay?payId=CDWLOLE490393BE9E049D29766DB184366132F'
}
},
-
+ onBackPress() {
+ // 拦截返回事件
+ uni.redirectTo({
+ url: '/pagesA/rentPay/rentPay'
+ });
+ return true;
+ },
onLoad(options) {
if(options.urls){
this.url = options.urls
}
},
mounted() {
- // 可选：在组件挂载后进行一些验证或处理
- console.log('加载的网址:', this.webUrl);
+
}
}
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 2c62a9f..778963d 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -17,25 +17,27 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
// bases = 'http://172.16.61.125:9003/' + url;
// bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
// bases = 'http://8.130.38.56:8027/admin-server' + url;
- // bases = 'https://jy.scjysm.asia:18086/cdwlMall/admin-server' + url;
+ bases = 'https://jy.scjysm.asia:18086/cdwlMall/admin-server' + url;
- bases = 'http://192.168.2.107:9003' + url;
+ // 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 = 'http://192.168.2.107:9007' + url;
+ 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 = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
- bases = 'http://192.168.2.107:9004' + 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') || '';
var shopId = uni.getStorageSync('shopId') || '';
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
Binary files /dev/null and b/merchant-web-master/src/assets/images/fengmian.png differ
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
Binary files /dev/null and b/merchant-web-master/src/assets/images/logo2.png differ
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 @@
- 工作台
+
+
+