diff --git a/admin-web-master/src/components/add/addmb.vue b/admin-web-master/src/components/add/addmb.vue index b07eb8e..fad36d3 100644 --- a/admin-web-master/src/components/add/addmb.vue +++ b/admin-web-master/src/components/add/addmb.vue @@ -205,7 +205,7 @@ import { Input } from "element-ui"; value: '', }, { - name: '押金', + name: '押金（元）', key: 'earnestMoney', type: '单行数字文本', isrequired: '是', @@ -258,7 +258,7 @@ import { Input } from "element-ui"; ] }, { - name: '租金', + name: '租金（元）', key: 'contractAmount', type: '单行数字文本', isrequired: '是', diff --git a/admin-web-master/src/components/chakan/fa.vue b/admin-web-master/src/components/chakan/fa.vue index 87eb2ee..b35c482 100644 --- a/admin-web-master/src/components/chakan/fa.vue +++ b/admin-web-master/src/components/chakan/fa.vue @@ -24,8 +24,8 @@
无
- -
{{editbgid.mainPurpose?'查看详情':'无'}}
+ +
{{editbgid.attachmentInfo?'查看详情':'无'}}
 @@ -61,7 +61,7 @@ --> diff --git a/admin-web-master/src/components/chakan/sam.vue b/admin-web-master/src/components/chakan/sam.vue index 2ec8c1b..89c56be 100644 --- a/admin-web-master/src/components/chakan/sam.vue +++ b/admin-web-master/src/components/chakan/sam.vue @@ -32,7 +32,7 @@ --> -
{{editbgid.rentalPrice?editbgid.rentalPrice+' 元':'无'}} /M²
+
{{editbgid.rentalPrice?editbgid.rentalPrice+' 元':'无'}} /m²
 diff --git a/admin-web-master/src/components/change/cl.vue b/admin-web-master/src/components/change/cl.vue index 33ba0eb..fa0cbd4 100644 --- a/admin-web-master/src/components/change/cl.vue +++ b/admin-web-master/src/components/change/cl.vue @@ -25,11 +25,12 @@ - - - + + + diff --git a/admin-web-master/src/components/newmap/index.vue b/admin-web-master/src/components/newmap/index.vue index 13e719a..6d581a7 100644 --- a/admin-web-master/src/components/newmap/index.vue +++ b/admin-web-master/src/components/newmap/index.vue @@ -96,6 +96,12 @@ }); }, initMap() { + if (this.isx) { + + } else { + this.lat = this.message.split(',')[0] + this.lng = this.message.split(',')[1] + } // 将经纬度转换为腾讯地图的LatLng对象 const centerLatLng = new qq.maps.LatLng(this.lat, this.lng); diff --git a/admin-web-master/src/components/newmap/indexall.vue b/admin-web-master/src/components/newmap/indexall.vue index d5d3539..e4a86d6 100644 --- a/admin-web-master/src/components/newmap/indexall.vue +++ b/admin-web-master/src/components/newmap/indexall.vue @@ -309,7 +309,7 @@ body { position: absolute; top: 10px; left: 10px; - z-index: 99; + z-index: 1000; background: #fff; padding: 10px; border-radius: 5px; diff --git a/admin-web-master/src/components/newmap/map.vue b/admin-web-master/src/components/newmap/map.vue index 1fc6272..4f46688 100644 --- a/admin-web-master/src/components/newmap/map.vue +++ b/admin-web-master/src/components/newmap/map.vue @@ -95,7 +95,7 @@ export default {

资源名称:${item.name}

位置:${item.detailedLocation}

-

租赁情况:${item.publishStatus=='0'?'空置中':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}

+

租赁情况:${item.publishStatus=='0'?'待发布':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}

`; //
diff --git a/admin-web-master/src/components/newmap/map2.vue b/admin-web-master/src/components/newmap/map2.vue index 76d3464..88c1836 100644 --- a/admin-web-master/src/components/newmap/map2.vue +++ b/admin-web-master/src/components/newmap/map2.vue @@ -188,7 +188,7 @@ export default {

资源名称:${item.name}

位置:${item.detailedLocation}

-

租赁情况:${item.publishStatus=='0'?'空置中':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}

+

租赁情况:${item.publishStatus=='0'?'待发布':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}

`; //
diff --git a/admin-web-master/src/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue index 5457779..bb1895b 100644 --- a/admin-web-master/src/components/resourceCommodity/index.vue +++ b/admin-web-master/src/components/resourceCommodity/index.vue @@ -169,9 +169,9 @@ - + diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue index fe962fd..fa2e839 100644 --- a/admin-web-master/src/layout/index.vue +++ b/admin-web-master/src/layout/index.vue @@ -197,17 +197,17 @@ } } return { - msg: [], - list: [], - // msg: ['招商服务系统'], - // msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'], - // list: [ - // ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], - // ['品牌策划', '活动策划', '氛围策划', '媒体推广'], - // ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], - // ['联机交易', '对账处理', '日志管理', '商户服务'], - // ['渠道售票统计分析', '销售额统计分析'], - // ], + // msg: [], + // list: [], + msg: ['招商服务系统'], + msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'], + list: [ + ['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '问卷调查','客服服务管理', '系统设置'], + ['品牌策划', '活动策划', '氛围策划', '媒体推广'], + ['订单管理', '积分管理', '消息中心', '会员管理', '评论管理', '商品管理', '库存管理', '销售统计', '优惠券管理', '商城商家管理'], + ['联机交易', '对账处理', '日志管理', '商户服务'], + ['渠道售票统计分析', '销售额统计分析'], + ], listMune: [], mumeList: [], mumeChildren1: [], @@ -296,10 +296,10 @@ this.userAvatar = getUserAvatar() }, mounted() { - this.getMemu() - this.address() - this.waibu() - // this.neibu() + // this.getMemu() + // this.address() + // this.waibu() + this.neibu() }, methods: { @@ -780,12 +780,12 @@ ['联机交易', '对账处理', '日志管理', '商户服务'], ['渠道售票统计分析', '销售额统计分析'], ] - // this.neibu() + this.neibu() - this.getMemu() - this.waibu() - this.list = this.mumeList + // this.getMemu() + // this.waibu() + // this.list = this.mumeList }, diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index be2a4a0..777ebaa 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -17,12 +17,12 @@ 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://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; + baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - baseURL = 'http://128.10.249.8:9003'; + // baseURL = 'http://128.10.249.8:9003'; } else { diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue index c0e2920..2e4ccf6 100644 --- a/admin-web-master/src/views/detect/admap.vue +++ b/admin-web-master/src/views/detect/admap.vue @@ -74,7 +74,7 @@ @@ -107,7 +107,7 @@ @@ -155,9 +155,9 @@ - + @@ -166,7 +166,7 @@ --> diff --git a/admin-web-master/src/views/detect/examine/index.vue b/admin-web-master/src/views/detect/examine/index.vue index 2201b17..547932f 100644 --- a/admin-web-master/src/views/detect/examine/index.vue +++ b/admin-web-master/src/views/detect/examine/index.vue @@ -68,7 +68,7 @@ @@ -79,7 +79,7 @@ --> @@ -114,7 +114,7 @@ @@ -125,7 +125,7 @@ --> @@ -160,7 +160,7 @@ @@ -171,7 +171,7 @@ --> diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue index 18ea714..f85f505 100644 --- a/admin-web-master/src/views/detect/information/index.vue +++ b/admin-web-master/src/views/detect/information/index.vue @@ -68,7 +68,7 @@ diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue index 3ac7e14..2a82865 100644 --- a/admin-web-master/src/views/detect/map/index.vue +++ b/admin-web-master/src/views/detect/map/index.vue @@ -70,7 +70,7 @@ - + - + - + - + - + - + - - + + diff --git a/lvdao-miniapp/pages/advertisement/advertisement.vue b/lvdao-miniapp/pages/advertisement/advertisement.vue index 201d46b..8bf51b9 100644 --- a/lvdao-miniapp/pages/advertisement/advertisement.vue +++ b/lvdao-miniapp/pages/advertisement/advertisement.vue @@ -42,7 +42,7 @@ 广告位类型：{{item.advertisingType}} - 广告尺寸：{{item.dimensions}} + 广告尺寸：{{item.dimensions || '--'}} 轮播顺序：{{item.rotationOrder}} @@ -139,7 +139,7 @@ let items = JSON.stringify(item) console.log(items) uni.navigateTo({ - url: `/pages/advertisementDetail/advertisementDetail?item=${items}` + url: `/pages/advertisementDetail/advertisementDetail?item=${encodeURIComponent(items)}` }) }, diff --git a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue index 2f8beca..686cc8a 100644 --- a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue +++ b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue @@ -57,7 +57,7 @@ {{tableData.playDuration || '--'}} - + 推送地址： {{tableData.pushAddress || '--'}} @@ -66,10 +66,11 @@ 介绍： - - - 无 - + 无 + + + + @@ -196,7 +197,7 @@ }, onLoad(option) { this.imgurl = this.$img - let data = JSON.parse(option.item) + let data = JSON.parse(decodeURIComponent(option.item)) console.log(data) this.tableData = data this.resourcesId = `gg${data.id}` diff --git a/lvdao-miniapp/pages/field/field.vue b/lvdao-miniapp/pages/field/field.vue index 4a7c2c2..54f49e9 100644 --- a/lvdao-miniapp/pages/field/field.vue +++ b/lvdao-miniapp/pages/field/field.vue @@ -96,7 +96,7 @@ 面积: {{item.actualArea}} - /m² + m² diff --git a/lvdao-miniapp/pages/home/home.scss b/lvdao-miniapp/pages/home/home.scss index 6aa3ddf..6bf44f7 100644 --- a/lvdao-miniapp/pages/home/home.scss +++ b/lvdao-miniapp/pages/home/home.scss @@ -183,6 +183,7 @@ padding: 30rpx 0; margin-top: 20rpx; flex-wrap: wrap; + justify-content: space-around; // justify-content: center; .list{ display: flex; diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue index 0e1f1db..a012c01 100644 --- a/lvdao-miniapp/pages/home/home.vue +++ b/lvdao-miniapp/pages/home/home.vue @@ -65,14 +65,22 @@ 租广告 - + + - {{item.title}} + {{item.title}} 活动时间：{{item.startTime}}至{{item.endTime}} diff --git a/lvdao-miniapp/pages/my/my.vue b/lvdao-miniapp/pages/my/my.vue index 8db2c16..94163fa 100644 --- a/lvdao-miniapp/pages/my/my.vue +++ b/lvdao-miniapp/pages/my/my.vue @@ -50,12 +50,12 @@ 我的问卷 --> - + 0 {{activityNum}} - + 我的活动 diff --git a/lvdao-miniapp/pages/participation/participation.scss b/lvdao-miniapp/pages/participation/participation.scss index 77f47c5..463b8b9 100644 --- a/lvdao-miniapp/pages/participation/participation.scss +++ b/lvdao-miniapp/pages/participation/participation.scss @@ -170,10 +170,6 @@ } } .huo-card-item{ - font-size: 20rpx; - line-height: 1.5; - white-space: nowrap; /* 防止文本换行 */ - text-overflow: ellipsis; /* 显示省略号 */ - /* 如果需要设置宽度，可以添加 width 属性 */ - overflow:hidden; - } \ No newline at end of file + font-size: 20rpx; +} + \ No newline at end of file diff --git a/lvdao-miniapp/pages/participation/participation.vue b/lvdao-miniapp/pages/participation/participation.vue index 4d6b48e..3494297 100644 --- a/lvdao-miniapp/pages/participation/participation.vue +++ b/lvdao-miniapp/pages/participation/participation.vue @@ -2,48 +2,54 @@ - + - - - + + - - + + - - - - - + + + + + - {{item.activityName}} - 活动日期：{{item.startTime}}至{{item.endTime}} + {{item.activityName}} + 活动日期：{{item.startTime}}至{{item.endTime}} 参与人数：{{item.maxParticipants}} - - - - - + + + + + - - - - + + + 活动申请 @@ -59,24 +65,37 @@ datalist: [], total: 1, - sortTypeOptions: [ - { label: '正序', value: 1 }, - { label: '倒序', value: 2 }, + sortTypeOptions: [{ + label: '正序', + value: 1 + }, + { + label: '倒序', + value: 2 + }, ], - statusOptions: [ - { label: '进行中', value: 1 }, - { label: '已结束', value: 2 }, - { label: '未开始', value: 0 }, + statusOptions: [{ + label: '进行中', + value: 1 + }, + { + label: '已结束', + value: 2 + }, + { + label: '未开始', + value: 0 + }, ], - pageIndex :{ + pageIndex: { activityName: '', // 搜索项 orderingRule: 1, // 排序方式 - activeState:null, // 活动状态 + activeState: null, // 活动状态 pageNumber: 1, pageSize: 10, - auditStatus:'3', + auditStatus: '3', }, - imgurl:'' + imgurl: '' } }, onLoad() { @@ -100,9 +119,9 @@ this.getAll() }, methods: { - getAll(val){ - this.$http.sendRequest('/cereActivityApplication/queryByPage', 'POST',this.pageIndex,1).then(res => { - this.datalist = res.data.data.content + getAll(val) { + this.$http.sendRequest('/cereActivityApplication/queryByPage', 'POST', this.pageIndex, 1).then(res => { + this.datalist = res.data.data.content }).catch(err => { console.log(err) //请求失败 @@ -115,13 +134,13 @@ }) }, search() { - - this.getAll() + + this.getAll() }, - + loading() { let that = this - if(that.status == 'nomore') return; + if (that.status == 'nomore') return; that.status = 'loading'; that.page = ++that.page; setTimeout(() => { @@ -129,22 +148,22 @@ that.status = that.list >= that.total ? 'nomore' : 'loadmore'; }, 300) }, - join(){ + join() { uni.navigateTo({ url: '/pages/mycreated/mycreated?id=1' }) }, toAdd() { - uni.navigateTo({ + uni.navigateTo({ url: '/pages/activityAdd/activityAdd' }) }, toDetail(item, path) { - + uni.navigateTo({ url: `${path}?item=${item}` }) - + }, } } @@ -152,4 +171,4 @@ + \ No newline at end of file diff --git a/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue b/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue index 2df432e..ae00b52 100644 --- a/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue +++ b/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue @@ -13,14 +13,14 @@ {{item.itemName}} - {{item.payPrice}} + {{ item.detailsVOList | jsitem}} 单价：￥{{item.itemStandard}} 费率：{{item.cheapRate}}% - + 周期：{{item1.startDate}} - {{item1.endDate}} 数量：{{item1.number}}{{item1.itemUnit}} @@ -103,6 +103,20 @@ cent:{} } }, + filters: { + + jsitem(e) { + // console.error(e) + let num = 0 + for (let n = 0; n < e.length; n++) { + // num = num + Number(e[n].payPrice) + if(e[n].isshowxz){ + num = num + Number(e[n].payPrice) + } + } + return num.toFixed(2) + } + }, onLoad(e) { this.cent = JSON.parse(e.cent) console.error(this.cent) diff --git a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue index 9380338..8d69771 100644 --- a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue +++ b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue @@ -123,6 +123,7 @@ \ No newline at end of file diff --git a/lvdao-miniapp/pagesA/rentPay/rentPay.scss b/lvdao-miniapp/pagesA/rentPay/rentPay.scss index b21dd50..7fe5a70 100644 --- a/lvdao-miniapp/pagesA/rentPay/rentPay.scss +++ b/lvdao-miniapp/pagesA/rentPay/rentPay.scss @@ -96,10 +96,9 @@ bottom: 0; width: 100%; background-color: #FFFFFF; - padding: 10rpx 20rpx; - padding-bottom: constant(safe-area-inset-bottom); - padding-bottom: env(safe-area-inset-bottom); + padding: 30rpx; z-index: 999; + box-sizing: border-box; .footer-buy{ display: flex; align-items: center; @@ -112,14 +111,7 @@ min-width: 20%; height: 70rpx; } - .buttons{ - font-size: 30rpx; - margin: 0 10rpx !important; - height: 32px !important; - border-radius: 10rpx !important; - margin-top: 20rpx !important; -} .u-size-default.data-v-3bf2dba7 { font-size: 30rpx; height: 100% !important; diff --git a/lvdao-miniapp/pagesA/rentPay/rentPay.vue b/lvdao-miniapp/pagesA/rentPay/rentPay.vue index 273e979..f46144a 100644 --- a/lvdao-miniapp/pagesA/rentPay/rentPay.vue +++ b/lvdao-miniapp/pagesA/rentPay/rentPay.vue @@ -219,10 +219,32 @@ payArr.push(item) } }) - const msg = JSON.stringify(payArr) - uni.navigateTo({ - url: `/pagesA/rentPay/goPay?msg=${msg}` + + let arr = [] + payArr.map(item => { + let obj = { + orderId: item.tenementOrder, + money: item.paymentAmount, + } + arr.push(obj) + }) + + // return + this.$http.sendRequest('/order/rentAggregatePayment', 'POST', arr, 3).then(res => { + console.log(res.data) + if (res.data.data) { + // uni.redirectTo({ + // url: `/pagesA/rentPay/webView?urls=${JSON.parse(res.data.data).data.codeUrl}` + // }) + } }) + + + + // const msg = JSON.stringify(payArr) + // uni.navigateTo({ + // url: `/pagesA/rentPay/goPay?msg=${msg}` + // }) } }, confirm(e) { diff --git a/lvdao-miniapp/pagesA/weball/web.vue b/lvdao-miniapp/pagesA/weball/web.vue new file mode 100644 index 0000000..64512d6 --- /dev/null +++ b/lvdao-miniapp/pagesA/weball/web.vue @@ -0,0 +1,27 @@ + + + + + diff --git a/lvdao-miniapp/static/icon/icon1.png b/lvdao-miniapp/static/icon/icon1.png index db64251..51cc2dd 100644 --- a/lvdao-miniapp/static/icon/icon1.png +++ b/lvdao-miniapp/static/icon/icon1.png diff --git a/lvdao-miniapp/static/icon/icon11.png b/lvdao-miniapp/static/icon/icon11.png index 515e69c..c201682 100644 --- a/lvdao-miniapp/static/icon/icon11.png +++ b/lvdao-miniapp/static/icon/icon11.png diff --git a/lvdao-miniapp/static/icon/icon12.png b/lvdao-miniapp/static/icon/icon12.png index 01758eb..3fefc22 100644 --- a/lvdao-miniapp/static/icon/icon12.png +++ b/lvdao-miniapp/static/icon/icon12.png diff --git a/lvdao-miniapp/static/icon/icon13.png b/lvdao-miniapp/static/icon/icon13.png index 00af973..6327c8c 100644 --- a/lvdao-miniapp/static/icon/icon13.png +++ b/lvdao-miniapp/static/icon/icon13.png diff --git a/lvdao-miniapp/static/icon/icon14.png b/lvdao-miniapp/static/icon/icon14.png index e1b804a..63e387e 100644 --- a/lvdao-miniapp/static/icon/icon14.png +++ b/lvdao-miniapp/static/icon/icon14.png diff --git a/lvdao-miniapp/static/icon/icon15.png b/lvdao-miniapp/static/icon/icon15.png index 98ec6b0..c1e5217 100644 --- a/lvdao-miniapp/static/icon/icon15.png +++ b/lvdao-miniapp/static/icon/icon15.png diff --git a/lvdao-miniapp/static/icon/icon16.png b/lvdao-miniapp/static/icon/icon16.png index 0318489..1215999 100644 --- a/lvdao-miniapp/static/icon/icon16.png +++ b/lvdao-miniapp/static/icon/icon16.png diff --git a/lvdao-miniapp/static/icon/icon2.png b/lvdao-miniapp/static/icon/icon2.png index c522de6..d124468 100644 --- a/lvdao-miniapp/static/icon/icon2.png +++ b/lvdao-miniapp/static/icon/icon2.png diff --git a/lvdao-miniapp/static/icon/icon4.png b/lvdao-miniapp/static/icon/icon4.png index 10dc869..8963b94 100644 --- a/lvdao-miniapp/static/icon/icon4.png +++ b/lvdao-miniapp/static/icon/icon4.png diff --git a/lvdao-miniapp/static/icon/icon6.png b/lvdao-miniapp/static/icon/icon6.png index fb8967c..d435dd6 100644 --- a/lvdao-miniapp/static/icon/icon6.png +++ b/lvdao-miniapp/static/icon/icon6.png diff --git a/lvdao-miniapp/static/icon/icon7.png b/lvdao-miniapp/static/icon/icon7.png index e5e3c62..c70b747 100644 --- a/lvdao-miniapp/static/icon/icon7.png +++ b/lvdao-miniapp/static/icon/icon7.png diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index ce32da2..4f1d764 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -21,16 +21,16 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; - bases = 'http://128.10.249.8:9003'+ url; + // bases = 'http://128.10.249.8:9003'+ url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; - // bases = c1 + 'cdwlMall/meserver/admin-server' + url; + bases = c1 + 'cdwlMall/meserver/admin-server' + url; }else if(baseUrl == 3){ // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url; // bases = 'http://128.10.249.22:9003:9007' + url; - // bases = 'http://128.10.249.23:9007' + url; + // bases = 'http://128.10.249.8:9007' + url; bases = c1 + 'cdwlMall/meserver/api' + url; }else{ @@ -39,7 +39,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; - // bases = 'http://128.10.249.23:9004' + url; + // bases = 'http://128.10.249.8:9004' + url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; bases = c1 + 'cdwlMall/business-server' + url; diff --git a/lvdao-miniapp/utils/tool.js b/lvdao-miniapp/utils/tool.js new file mode 100644 index 0000000..4544e05 --- /dev/null +++ b/lvdao-miniapp/utils/tool.js @@ -0,0 +1,25 @@ +export function toMiniPay(payId, backPath) { + return new Promise((resolve, reject) =>{ + console.error(payId, backPath) + uni.navigateToMiniProgram({ + appId: "wxf0f8b911ac324457", //支付小程序的 + path:`pages/common/travelMini?payId=${payId}`, // 打开支付小程序的指定页面 + extraData: {}, //需要传递给目标小程序的数据 + envVersion: "trial", //打开的对应小程序环境:开发 develop、体验 tria1、生产 release + success: function() { + resolve(); //成功回调 + }, + fail: function(res) { + console.log(res); + if (backPath) { + uni.reLaunch({ + ur1: `${backPath}?paystate=CANCEL PAY` + }); + } else { + console.log("取消支付就停留在当前页"); + } + reject("跳转失败"); + } + }) + }) +} \ No newline at end of file