Commit 53c1431a31a5f12d9b417c094a95601c863b2326

Authored by wesley88
1 parent 6b583a85

1

admin-web-master/src/views/shopRental/manage/index.vue
... ... @@ -98,7 +98,7 @@
98 98 <template slot-scope="scope">
99 99 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
100 100 <!-- -->
101   - <div v-if='scope.row.dataStatus == 4' @click="openOAitem(scope.row)" class="tableBtn greens">OA</div>
  101 + <div v-if='scope.row.dataStatus == 4' @click="openOAitem(scope.row)" class="tableBtn greens">OA审核</div>
102 102 <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同变更')" class="tableBtn greens">合同变更</div>
103 103 <div v-if='scope.row.dataStatus == 1' @click="removeinfo(scope.row,'合同续约')" class="tableBtn greens">合同续约</div>
104 104 <div v-if='scope.row.dataStatus == 1' @click="removeinfozz(scope.row,'合同终止')" class="tableBtn greens">合同终止</div>
... ...
lvdao-miniapp/pages.json
... ... @@ -420,6 +420,13 @@
420 420 "name": "pagesA",
421 421 "pages": [
422 422 {
  423 + "path": "myZiyuan/myZiDetailsnew",
  424 + "style": {
  425 + "navigationBarBackgroundColor": "#FFFFFF",
  426 + "navigationBarTitleText": "资产详情"
  427 + }
  428 + },
  429 + {
423 430 "path": "payweb/payweb",
424 431 "style": {
425 432 "navigationBarBackgroundColor": "#FFFFFF",
... ...
lvdao-miniapp/pages/orderList/inventory.vue
... ... @@ -3,7 +3,7 @@
3 3 <view v-if="alllist.length == 0" style="text-align: center;margin-top: 50rpx;" class="tit1">暂无数据</view>
4 4 <!-- <u-tabs active-color="#26c570" :list="list" :current="current" @change="change"></u-tabs> -->
5 5 <view style="padding: 0 20rpx;">
6   - <view v-for="(item,index) in alllist" :key="index" @click="gopath('/pages/orderList/inventorydetails',item.orderId)"
  6 + <view v-for="(item,index) in alllist" :key="index" @click="gopath('/pages/orderList/inventorydetails',item.productId)"
7 7 style="background: #fff;margin-top: 40rpx;padding: 30rpx;border-radius: 18rpx;">
8 8 <view style="display: flex;">
9 9 <view>
... ... @@ -17,7 +17,7 @@
17 17 <view class="t1">积分兑换:{{item.ifCredit=='1'?'允许':item.ifCredit=='0'?'不允许':'-'}}</view>
18 18 </view>
19 19 </view>
20   - <view style="display: flex;justify-content: space-between;">
  20 +<!-- <view style="display: flex;justify-content: space-between;">
21 21 <view class="t1">库存:{{ item.stockNumber }}</view>
22 22 <view class="t1">销量:{{ item.volume }}</view>
23 23 </view>
... ... @@ -25,7 +25,7 @@
25 25 <view class="t1">上架状态:{{item.shelveState=='0'?'未上架':item.shelveState=='1'?'已上架':item.shelveState=='2'?'待审核':item.shelveState=='3'?'审核失败':'-'}}</view>
26 26 <view class="t1">登记状态:{{item.registrationStatus=='1'?'已入库':'未入库'}}</view>
27 27 </view>
28   - <view class="t1">驳回原因:{{ item.reject || '-'}}</view>
  28 + <view class="t1">驳回原因:{{ item.reject || '-'}}</view> -->
29 29 </view>
30 30 </view>
31 31 </view>
... ...
lvdao-miniapp/pages/orderList/inventorydetails.vue
1 1 <!-- 订单详情 -->
2 2 <template>
3 3 <view>
4   - <view>
5   - <view class="content" style="padding-bottom:200upx;">
6   - <view class="order-details-info-box">
7   -
8   - <view class="order-list-box">
9   - <view class="item">
10   - <view class="order-list-top">
11   - <view class="top-l" >
12   - <image
13   - src="https://jy.scjysm.asia:18086/cdwlMall/questionnaire/file/static/images/orderStoreIcon.png"
14   - class="shop-img"></image>
15   - <text class="shop-name">{{ dataList.shopName }}</text>
16   - </view>
17   -
18   - </view>
19   - <view class="order-info-box">
20   - <view class="order-info">
21   - <view class="order-info-item" v-for="proItem in dataList.products"
22   - :key="proItem.productId">
23   - <image :src="imgurl+proItem.image" class="product-img default-img"></image>
24   - <view class="info-box">
25   - <text class="product-name">{{ proItem.productName }}</text>
26   - <view class="price-sku-box">
27   - <view class="product-sku">
28   - <view class="mar-left-20" v-for="vItem in proItem.values">
29   - <text>规格:{{ vItem }}</text>
30   - </view>
31   - </view>
32   - <view class="product-num">x {{ proItem.number }}</view>
33   - </view>
34   - </view>
35   - </view>
36   - <view class="delivery-way-box">
37   - <view class="item">
38   - <text class="way">商品总价</text>
39   - <text class="way">¥{{ dataList.orderPrice }}</text>
40   - </view>
41   - <view class="item">
42   - <text class="way">快递运费</text>
43   - <text class="way">¥{{ dataList.logisticsPrice }}</text>
44   - </view>
45   - </view>
46   - </view>
47   - <!-- 待发货 待收货 已完成 -->
48   - <view class="order-total-box"
49   - v-if='dataList.state==2||dataList.state==3||dataList.state==4'>
50   - <text>实付款</text>
51   - <text class="way-color">¥{{ dataList.price }}</text>
52   - </view>
53   - <!-- 待付款 价格是橙色-->
54   - <view class="order-total-box" v-else-if="dataList.state==1">
55   - <text>需付款</text>
56   - <text class="way-color">¥{{ dataList.price }}</text>
57   - </view>
58   - <!-- 退款成功 交易关闭 -->
59   - <view class="order-total-box"
60   - v-else-if="(dataList.returnType==1 && dataList.moneyReturnList.status==4) || (dataList.returnType==2 && dataList.goodsReturn.status==6) || (dataList.state==5)">
61   - <text>需付款</text>
62   - <text>¥{{ dataList.price }}</text>
63   - </view>
64   - </view>
65   - </view>
  4 + <view class="banner-img">
  5 + <swiper :indicator-dots="true" :autoplay="false" :interval="3000" :duration="500" style="height: 30vh;" indicator-active-color="#fff">
  6 + <swiper-item v-for="(item, index) in dataList.images" :key="index">
  7 + <view style="width: 100%;height: 100%;" @click="openimg2(index)">
  8 + <u-image :showLoading="true" :src="imgurl+item.imgPath" width="100%" height="100%"></u-image>
66 9 </view>
  10 + </swiper-item>
  11 + </swiper>
  12 + </view>
  13 + <view class="banner">
  14 + <view class="banner-item info">
  15 + <view class="info-title">
  16 + {{dataList.productName}}
  17 +
67 18 </view>
68   - <view class="order-details-information padd">
69   - <view class="order-title">
70   - <text>订单信息</text>
71   - </view>
72   - <view class="info-box">
73   - <!--都有 但是:待付款 待发货 退款成功 交易关闭 只有前两个item-->
74   - <view class="item">
75   - <text>订单编号:{{ dataList.orderFormid }}</text>
76   - <text class="copy-color" :data-clipboard-text="dataList.orderFormid" @click="copy">复制</text>
77   - </view>
78   - <view class="item">
79   - <text>创建时间:{{ dataList.createTime }}</text>
80   - </view>
81   - <!-- 待收货 有付款时间和发货时间 -->
82   - <view class="item" v-if="dataList.state==3">
83   - <text>付款时间:{{ dataList.paymentTime }}</text>
84   - </view>
85   - <!-- <view class="item" v-if="dataList.state == 3 || dataList.state == 4">
86   - <text>发货时间:{{ dataList.dileveryTime }}</text>
87   - </view> -->
88   - <!-- 交易成功 有成交时间-->
89   - <!-- <view class="item" v-if="dataList.state == 4">
90   - <text>成交时间:{{ dataList.receiveTime }}</text>
91   - </view> -->
92   - </view>
  19 + <view style="font-size: 24upx;color: #6b6b6b;margin-top: 14rpx;">
  20 + {{dataList.productBrief}}
  21 +
  22 + </view>
  23 + </view>
  24 + <view class="banner-item field">
  25 + <view class="banner-item-title">商品信息</view>
  26 + <view class="banner-item-form">
  27 + <u-row gutter="10">
  28 + <u-col span="6">
  29 + <view class="form-item">
  30 + <view class="label">售价区间:</view>
  31 + <text>{{dataList.section || '0'}}</text>
  32 + </view>
  33 + </u-col>
  34 + <u-col span="6">
  35 + <view class="form-item">
  36 + <view class="label">会员价:</view>
  37 + <text>{{dataList.memberSection || '0'}}</text>
  38 + </view>
  39 + </u-col>
  40 + <u-col span="6">
  41 + <view class="form-item">
  42 + <view class="label">积分兑换:</view>
  43 + <text>{{dataList.ifCredit=='1'?'允许':dataList.ifCredit=='0'?'不允许':'无'}}</text>
  44 + </view>
  45 + </u-col>
  46 + <u-col span="6">
  47 + <view class="form-item">
  48 + <view class="label">库存:</view>
  49 + <text>{{dataList.stockNumber || '0'}}</text>
  50 + </view>
  51 + </u-col>
  52 + <u-col span="6">
  53 + <view class="form-item">
  54 + <view class="label">销量:</view>
  55 + <text>{{dataList.volume || '0'}}</text>
  56 + </view>
  57 + </u-col>
  58 + <u-col span="6">
  59 + <view class="form-item">
  60 + <view class="label">上架状态:</view>
  61 + <text>{{dataList.shelveState=='0'?'未上架':dataList.shelveState=='1'?'已上架':dataList.shelveState=='2'?'待审核':dataList.shelveState=='3'?'审核失败':'无'}}</text>
  62 + </view>
  63 + </u-col>
  64 + <u-col span="6">
  65 + <view class="form-item">
  66 + <view class="label">登记状态:</view>
  67 + <text>{{dataList.registrationStatus=='1'?'已入库':'未入库'}}</text>
  68 + </view>
  69 + </u-col>
  70 + <u-col span="6">
  71 + <view class="form-item">
  72 + <view class="label">驳回原因:</view>
  73 + <text>{{dataList.reject || '无'}}</text>
  74 + </view>
  75 + </u-col>
  76 + <u-col span="12">
  77 + <view class="form-item">
  78 + <view class="label">简介:</view>
  79 +
  80 + <text v-if="!dataList.productText">无</text>
  81 + </view>
  82 + <u-parse v-if="dataList.productText" :html="dataList.productText"></u-parse>
  83 + <!-- <view v-if="dataList.productText" v-html="dataList.productText"></view> -->
  84 + </u-col>
  85 + </u-row>
93 86 </view>
94   -
95   -
96 87 </view>
97   -
98   -
99   -
100 88 </view>
101 89 </view>
102 90 </template>
... ... @@ -128,9 +116,10 @@
128 116 this.imgurl = this.$img
129 117 console.log(options)
130 118 this.$http.sendRequest('/product/getById', 'POST', {
131   - orderId: options.id
  119 + productId: options.id
132 120 }, 2).then(res => {
133 121 this.dataList = res.data.data
  122 + console.log(this.dataList)
134 123 })
135 124 return
136 125  
... ... @@ -175,6 +164,136 @@
175 164 </script>
176 165  
177 166 <style lang="scss" scoped>
  167 + // 商铺信息
  168 + .banner {
  169 + position: absolute;
  170 + top: calc(30vh - 30rpx);
  171 + width: 100%;
  172 + // margin-top: -20rpx;
  173 + border-radius: 30rpx;
  174 + background-color: #fff;
  175 + padding: 26rpx 34rpx 100rpx;
  176 + .banner-item {
  177 + border-bottom: 2rpx solid #EBEBEB;
  178 + padding-bottom: 32rpx;
  179 + .banner-item-title {
  180 + font-size: 28rpx;
  181 + font-weight: 700;
  182 + line-height: 48rpx;
  183 + margin-top: 30rpx;
  184 + }
  185 + .banner-item-form {
  186 + .form-item {
  187 + line-height: 30rpx;
  188 + font-size: 24rpx;
  189 + display: flex;
  190 + justify-content: flex-start;
  191 + align-items: top;
  192 + padding: 14rpx 0;
  193 + }
  194 + }
  195 + &:last-child {
  196 + border-bottom: unset;
  197 + }
  198 + }
  199 + // 基础信息
  200 + .info {
  201 + .info-title {
  202 + font-weight: bold;
  203 + font-size: 32rpx;
  204 + // margin-bottom: 24rpx;
  205 + span {
  206 + display: inline-block;
  207 + padding: 0 8rpx;
  208 + }
  209 + }
  210 + .info-text {
  211 + margin-bottom: 30rpx;
  212 + }
  213 + .info-racord {
  214 + display: flex;
  215 + justify-content: space-between;
  216 + align-items: center;
  217 + .info-price {
  218 + color: #31AA6A;
  219 + span {
  220 + font-size: 40rpx;
  221 + font-weight: 700;
  222 + margin-right: 4rpx;
  223 + }
  224 + }
  225 + }
  226 + }
  227 + // 场地信息
  228 + // 位置信息
  229 + .position {
  230 + .position-info {
  231 + display: flex;
  232 + align-items: center;
  233 + flex-direction: row;
  234 + margin: 53rpx 22rpx;
  235 + background-color: #fff;
  236 + font-size: 24rpx;
  237 + padding: 20rpx 16rpx;
  238 + line-height: 30rpx;
  239 + border-radius: 14rpx;
  240 + text {
  241 + margin-left: 10rpx;
  242 + }
  243 + }
  244 + }
  245 + // 周边商铺
  246 + .other-business {
  247 + .scroll-view_H {
  248 + white-space: nowrap;
  249 + width: 100%;
  250 + }
  251 + .scroll-view-item_H {
  252 + display: inline-block;
  253 + width: 210rpx;
  254 + margin-right: 22rpx;
  255 + &:last-child {
  256 + margin-right: 0;
  257 + }
  258 + .business-card {
  259 + width: 100%;
  260 + .u-image {
  261 + overflow: hidden !important;
  262 + border-radius: 20rpx !important;
  263 + }
  264 + .business-card-title {
  265 + width: 100%;
  266 + overflow : hidden;/*必须结合的属性,当内容溢出元素框时发生的事情*/
  267 + text-overflow: ellipsis;/*可以用来多行文本的情况下,用省略号“…”隐藏超出范围的文本 。*/
  268 + // display: -webkit-box;/*必须结合的属性 ,将对象作为弹性伸缩盒子模型显示 。*/
  269 + // -webkit-line-clamp: 2;/*用来限制在一个块元素显示的文本的行数。*/
  270 + // -webkit-box-orient: vertical;/*必须结合的属性 ,设置或检索伸缩盒对象的子元素的排*/
  271 + line-height: 30rpx;
  272 + margin: 10rpx 0;
  273 + padding: 0 10rpx;
  274 + }
  275 + .business-card-item {
  276 + padding: 0 10rpx;
  277 + font-weight: 400;
  278 + font-size: 20rpx;
  279 + color: #676767;
  280 + line-height: 1.5;
  281 + span {
  282 + font-weight: 700;
  283 + font-size: 30rpx;
  284 + color: #000000;
  285 + }
  286 + }
  287 + }
  288 + }
  289 + }
  290 + }
  291 + // 图片
  292 + .banner-img {
  293 + width: 100%;
  294 + height: 30vh;
  295 + line-height: 80rpx;
  296 + }
178 297 page {
179 298 background: #f7f7f7;
180 299 }
... ...
lvdao-miniapp/pages/workbench/workbench.vue
... ... @@ -116,8 +116,8 @@
116 116 </view>
117 117 </view>
118 118 </view>
119   - <!-- <view style="height: 100rpx;"></view> -->
120 119 <!-- tabbar -->
  120 + <view style="height: 300rpx;"></view>
121 121 <tabbar :tabBarShow="1"></tabbar>
122 122 </view>
123 123 </template>
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiDetailsnew.vue 0 → 100644
  1 +<template>
  2 + <view class="page">
  3 + <view class="zhutu">
  4 + <swiper :indicator-dots="true" :autoplay="true" :interval="3000" :duration="500" style="height:100%">
  5 + <!-- 使用 v-for 指令遍历图片链接数组 -->
  6 + <swiper-item v-for="(imageUrl, index) in lunbo" :key="index">
  7 + <!-- u-image 组件用于展示图片 -->
  8 + <u-image :showLoading="true" :src="imgurl+imageUrl" width="100%" height="100%"
  9 + border="20"></u-image>
  10 + </swiper-item>
  11 + </swiper>
  12 +
  13 + <!-- <u-image width="100%" height="300rpx" :src="imgurl+record.appendicesContract" border-radius="10"></u-image> -->
  14 + <!-- <u-image width="100%" height="300rpx" :src="record.cereBasicInformationShop&&record.cereBasicInformationShop.displayMainImage?imgurl + record.cereBasicInformationShop.displayMainImage:record.cereBasicInformationVenue&&record.cereBasicInformationVenue.displayImage?imgurl + record.cereBasicInformationVenue.displayImage:record.cereAdvertisingInformation&&record.cereAdvertisingInformation.locationDiagram?imgurl + record.cereAdvertisingInformation.locationDiagram:''"></u-image> -->
  15 + </view>
  16 + <view class="msglist">
  17 +
  18 + <view class="form-item">
  19 + <view class="label">租赁状态</view>
  20 + <text>{{record.dataStatus =='1'?'租赁中':record.dataStatus =='3'?'已终止':'-'}}</text>
  21 + </view>
  22 + <view class="form-item" v-if="!record.advertisingSpaceType && false">
  23 + <view class="label">经营用途</view>
  24 + <text>{{record.businessPurpose}}</text>
  25 + </view>
  26 + <view class="form-item">
  27 + <view class="label">租赁期限</view>
  28 + <text>{{record.leaseStartDate}} 至 {{record.contractTerminationDate}}</text>
  29 + </view>
  30 + <view class="form-item">
  31 + <view class="label">租金</view>
  32 + <text>{{heData.contractAmount || '无'}}</text>
  33 + </view>
  34 + <view class="form-item">
  35 + <view class="label">付款日</view>
  36 + <text>{{heData.paymentDay || '无'}}</text>
  37 + </view>
  38 + </view>
  39 + <view class="msglist">
  40 + <u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em" v-if="mapType == '商铺'">
  41 + <view class="form-item">
  42 + <view class="label">商铺名称</view>
  43 + <text>{{record.cereBasicInformationShop.shopName}}</text>
  44 + </view>
  45 + <view class="form-item">
  46 + <view class="label">商铺类型</view>
  47 + <text>{{record.cereBasicInformationShop.shopType=='1'?'移动铺位':record.cereBasicInformationShop.shopType=='2'?'固定铺位':'无'}}</text>
  48 + </view>
  49 +
  50 + <view class="form-item">
  51 + <view class="label">实际使用面积</view>
  52 + <text>{{record.cereBasicInformationShop.actualUsableArea || '无'}}</text>
  53 + </view>
  54 + <view class="form-item">
  55 + <view class="label">产权面积</view>
  56 + <text>{{record.cereBasicInformationShop.propertyArea || '无' }}</text>
  57 + </view>
  58 + <view class="form-item">
  59 + <view class="label">所属区域</view>
  60 + <text>{{record.cereBasicInformationShop.belongingRegion}}</text>
  61 + </view>
  62 + <view class="form-item">
  63 + <view class="label">归属部门</view>
  64 + <text>{{record.cereBasicInformationShop.belongingDepartment || '无'}}</text>
  65 + </view>
  66 + <view class="form-item">
  67 + <view class="label">详细地址</view>
  68 + <text>{{record.cereBasicInformationShop.detailedLocation}}</text>
  69 + </view>
  70 + </u-read-more>
  71 + </view>
  72 +
  73 + <view class="msglist" v-if="mapType == '广告位'">
  74 + <u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em">
  75 +
  76 + <view class="form-item">
  77 + <view class="label">广告位名称</view>
  78 + <text>{{record.cereAdvertisingInformation.advertisingName}}</text>
  79 + </view>
  80 + <view class="form-item">
  81 + <view class="label">广告位类型</view>
  82 + <text>{{record.cereAdvertisingInformation.advertisingType}}</text>
  83 + </view>
  84 + <view class="form-item" v-if="record.cereAdvertisingInformation.advertisingType == '线上广告位'">
  85 + <view class="label">所属端</view>
  86 + <text>{{record.cereAdvertisingInformation.applicationTime}}</text>
  87 + </view>
  88 + <view class="form-item" v-if="record.cereAdvertisingInformation.advertisingType == '实体广告位'">
  89 + <view class="label">广告材质</view>
  90 + <text>{{record.cereAdvertisingInformation.advertisingMaterial}}</text>
  91 + </view>
  92 + <view class="form-item">
  93 + <view class="label">广告尺寸</view>
  94 + <text>{{record.cereAdvertisingInformation.dimensions}}</text>
  95 + </view>
  96 + </u-read-more>
  97 + </view>
  98 + <view class="msglist" v-if="mapType == '场地'">
  99 + <u-read-more show-height="300" color="#3f9b6a" close-text="查看更多" text-indent="0em">
  100 +
  101 + <view class="form-item">
  102 + <view class="label">场地名称</view>
  103 + <text>{{record.cereBasicInformationVenue.venueName}}</text>
  104 + </view>
  105 + <view class="form-item">
  106 + <view class="label">场地类型</view>
  107 + <text>{{record.cereBasicInformationVenue.venueType}}</text>
  108 + </view>
  109 + <view class="form-item">
  110 + <view class="label">实际使用面积</view>
  111 + <text>{{record.cereBasicInformationVenue.actualArea}}</text>
  112 + </view>
  113 + <view class="form-item">
  114 + <view class="label">所属区域</view>
  115 + <text>{{record.cereBasicInformationVenue.district}}</text>
  116 + </view>
  117 + <view class="form-item">
  118 + <view class="label">详细位置</view>
  119 + <text>{{record.cereBasicInformationVenue.detailedLocation}}</text>
  120 + </view>
  121 + </u-read-more>
  122 + </view>
  123 +
  124 + <view class="msglist" v-if="btnShow == false&&mapType == '商铺'" style="margin-bottom:80px;">
  125 +
  126 +
  127 + <view class="form-item">
  128 + <view class="label">店铺名称</view>
  129 + <text>{{myshopMsg.shopName}}</text>
  130 + </view>
  131 + <view class="form-item">
  132 + <view class="label">店铺介绍</view>
  133 + </view>
  134 + <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
  135 + <view style="padding:10px;">{{myshopMsg.shopDescription}}</view>
  136 + </view>
  137 + <view class="form-item">
  138 + <view class="label">营业时间</view>
  139 + </view>
  140 + <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
  141 + <view style="padding:10px;">{{myshopMsg.businessHours}}</view>
  142 + </view>
  143 + <view class="form-item">
  144 + <view class="label">联系电话</view>
  145 + <text>{{myshopMsg.contactNumber}}</text>
  146 + </view>
  147 + <view class="form-item">
  148 + <view class="label">位置描述</view>
  149 + </view>
  150 + <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
  151 + <view style="padding:10px;">{{myshopMsg.locationDescription}}</view>
  152 + </view>
  153 + <view class="form-item">
  154 + <view class="label">店内照片</view>
  155 + </view>
  156 + <view class="image-container">
  157 + <view style="width: 48%;" v-for="(item,index) in myshopMsg.shopPhotos" :key="index">
  158 + <u-image class="image-item" width="100%" height="180rpx" border-raduis="10"
  159 + :src="imgurl+item"></u-image>
  160 + </view>
  161 +
  162 +
  163 + </view>
  164 + </view>
  165 +
  166 + <view class="msglist" v-if="mapType == '广告位' && false" style="margin-bottom:80px;">
  167 + <view class="form-item">
  168 + <view class="label">投放内容</view>
  169 + </view>
  170 +
  171 + <u-image class="image-item" width="100%" border-raduis="10" mode="heightFix" height="300rpx"
  172 + :src="imgurl+record.coverImage"></u-image>
  173 +
  174 +
  175 + </view>
  176 + <view style="margin-bottom: 80px;" v-if="btnShow && mapType == '商铺' && record.dataStatus =='1'"><u-button @click="xiuMsg(1)" shape="circle"
  177 + :custom-style="hoverStyle" hover-class="none" :plain="true">添加我的店铺信息</u-button></view>
  178 + <view class="page-footer" v-if="record.dataStatus =='1' ">
  179 + <u-button style="background-color: #DFE0E4; flex: 1; margin: 0 10px;"
  180 + @click="getQuit('/pagesA/myZiyuan/myZiyuanQuit')">申请退租</u-button>
  181 + <u-button type="success" style="flex: 1; margin: 0 10px;" @click="xuShow = true">申请续租</u-button>
  182 + <u-button type="success" style="flex: 1; margin: 0 10px;" @click="xiuMsg(2)"
  183 + v-if="btnShow == false&&mapType == '商铺'">修改资料</u-button>
  184 + </view>
  185 + <u-modal v-model="xuShow" :content="contentxu" @confirm="xufirm" :show-cancel-button="true"></u-modal>
  186 + <u-toast ref="uToast" />
  187 + </view>
  188 +
  189 +</template>
  190 +
  191 +<script>
  192 + export default {
  193 + data() {
  194 + return {
  195 + imgurl: '',
  196 + record: {},
  197 + btnShow: false,
  198 + hoverStyle: {
  199 +
  200 + color: '#3f9b6a'
  201 + },
  202 + mapType: '商铺',
  203 + content: '',
  204 + xuShow: false,
  205 + contentxu: '您确定是否需要续租',
  206 + pageindex: {
  207 + pageNumber: 0,
  208 + pageSize: 10,
  209 + contractId: ''
  210 + },
  211 + myshopMsg: {},
  212 + heData: {},
  213 + xuForm: {
  214 + reasonForApplication: '',
  215 + applicationTime: '',
  216 + contractId: 0,
  217 + contractType: 1,
  218 + createTime: '',
  219 + createUser: '',
  220 + },
  221 + lunbo: []
  222 + }
  223 + },
  224 + onLoad(options) {
  225 + this.imgurl = this.$img
  226 + const item = JSON.parse(decodeURIComponent(options.item));
  227 + console.log(item)
  228 + this.heData = item || {}
  229 + this.pageindex.contractId = this.heData.id
  230 + if (this.mapType == '商铺') {
  231 + this.$http.sendRequest('/cereAssetShopInformation/queryByPage', 'POST', this.pageindex, 1).then(res => {
  232 + if (res.data.data.content.length == 0) {
  233 + this.btnShow = true
  234 + } else {
  235 + this.btnShow = false
  236 + this.myshopMsg = res.data.data.content[0]
  237 + this.myshopMsg.shopPhotos = this.myshopMsg.shopPhotos.split(',')
  238 + console.log(this.myshopMsg.shopPhotos)
  239 + this.myshopMsg.shopPhotos.map(item => {
  240 + item = this.imgurl + item
  241 + })
  242 +
  243 + }
  244 + })
  245 + }
  246 +
  247 + this.record = item
  248 + let imgsList = item.cereBasicInformationShop && item.cereBasicInformationShop.displayMainImage ? item
  249 + .cereBasicInformationShop.displayMainImage : item.cereBasicInformationVenue && item
  250 + .cereBasicInformationVenue.displayImage ? item.cereBasicInformationVenue.displayImage : item
  251 + .cereAdvertisingInformation && item.cereAdvertisingInformation.locationDiagram ? item
  252 + .cereAdvertisingInformation.locationDiagram : ''
  253 + this.lunbo = imgsList.split(',')
  254 + console.log(this.lunbo)
  255 + let pageHe = {
  256 + pageNumber: 0,
  257 + pageSize: 10,
  258 + shopNumber: '',
  259 + dataStatus: 1
  260 + }
  261 + if (item.cereBasicInformationShop && item.cereBasicInformationShop.shopName) {
  262 + this.mapType = '商铺'
  263 + pageHe.shopNumber = `sp${item.cereBasicInformationShop.id}`
  264 + } else if (item.cereBasicInformationVenue && item.cereBasicInformationVenue.venueName) {
  265 + this.mapType = '场地'
  266 + pageHe.shopNumber = `cd${item.cereBasicInformationVenue.id}`
  267 + } else if (item.cereAdvertisingInformation && item.cereAdvertisingInformation.advertisingName) {
  268 + this.mapType = '广告位'
  269 + pageHe.shopNumber = `gg${item.cereAdvertisingInformation.id}`
  270 + }
  271 +
  272 +
  273 + },
  274 + onShow() {
  275 +
  276 + },
  277 + methods: {
  278 + getQuit(urls) {
  279 + uni.navigateTo({
  280 + url: urls + `?ids=${this.heData.id}`
  281 + })
  282 + },
  283 + xufirm() {
  284 +
  285 + this.xuForm.createUser = uni.getStorageSync('user').phone
  286 + this.xuForm.createTime = this.getCurrentTime()
  287 + this.xuForm.contractId = Number(this.heData.id)
  288 + this.$http.sendRequest('/changeContractInformation/add', 'POST', this.xuForm, 1).then(res => {
  289 +
  290 + this.$refs.uToast.show({
  291 + title: '续租申请已提交,请耐心等待',
  292 + icon: 'success',
  293 + url: '/pages/my/my'
  294 + })
  295 +
  296 + // uni.switchTab({
  297 + // url: '/pages/my/my'
  298 + // })
  299 + // uni.showToast({
  300 + // title: '续租申请已提交,请耐心等待',
  301 + // icon: 'success',
  302 + // })
  303 +
  304 + })
  305 + },
  306 + xiuMsg(val) {
  307 + if (val == 1) {
  308 + uni.navigateTo({
  309 + url: `/pagesA/myZiyuan/addMyshop?ids=${this.heData.id}&phone=${uni.getStorageSync('user').phone}`
  310 + })
  311 + } else {
  312 + let lists = JSON.stringify(this.myshopMsg)
  313 + uni.navigateTo({
  314 + url: `/pagesA/myZiyuan/addMyshop?ids=${this.heData.id}&msg=${lists}&phone=${uni.getStorageSync('user').phone}`
  315 + })
  316 + }
  317 + },
  318 + getCurrentTime() {
  319 + const now = new Date();
  320 + const year = now.getFullYear();
  321 + const month = ('0' + (now.getMonth() + 1)).slice(-2);
  322 + const day = ('0' + now.getDate()).slice(-2);
  323 + const hours = ('0' + now.getHours()).slice(-2);
  324 + const minutes = ('0' + now.getMinutes()).slice(-2);
  325 + const seconds = ('0' + now.getSeconds()).slice(-2);
  326 +
  327 + return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
  328 + },
  329 + }
  330 + }
  331 +</script>
  332 +
  333 +<style scoped lang="scss">
  334 + .page {
  335 + position: absolute;
  336 + left: 0;
  337 + top: 0;
  338 + width: 100%;
  339 +
  340 + padding: 0 24rpx;
  341 +
  342 + }
  343 +
  344 + .zhutu {
  345 + margin: 15px 0;
  346 + background-color: #fff;
  347 + width: 100%;
  348 + height: 20vh;
  349 + }
  350 +
  351 + /* 记录列表 */
  352 + .record-list {
  353 + margin-top: 20rpx;
  354 +
  355 + .good-item {
  356 + width: 100%;
  357 + display: flex;
  358 + background-color: #fff;
  359 + padding: 16rpx;
  360 + border-radius: 14rpx;
  361 + margin-bottom: 26rpx;
  362 +
  363 + .img {
  364 + width: 200rpx;
  365 + height: 200rpx;
  366 + }
  367 +
  368 + .info {
  369 + width: calc(100% - 220rpx);
  370 + margin-left: 20rpx;
  371 +
  372 + .title {
  373 + width: 100%;
  374 + font-size: 28rpx;
  375 + line-height: 44rpx;
  376 + font-weight: 700;
  377 + white-space: nowrap;
  378 + overflow: hidden;
  379 + text-overflow: ellipsis;
  380 + margin-bottom: 20rpx;
  381 + }
  382 +
  383 + .info-item {
  384 + display: flex;
  385 + line-height: 30rpx;
  386 + font-size: 26rpx;
  387 + color: #717981;
  388 +
  389 + text {
  390 + white-space: nowrap;
  391 + overflow: hidden;
  392 + text-overflow: ellipsis;
  393 + margin-left: 10rpx;
  394 +
  395 + span {
  396 + font-size: 30rpx;
  397 + color: #000;
  398 + font-weight: 700;
  399 + }
  400 + }
  401 +
  402 + .u-tag {
  403 + margin: 0 6rpx;
  404 + border: unset;
  405 + }
  406 + }
  407 + }
  408 + }
  409 + }
  410 +
  411 + .msglist {
  412 + padding: 0 30rpx;
  413 + background-color: #Fff;
  414 + border-radius: 14rpx;
  415 + margin-bottom: 20rpx;
  416 +
  417 + .form-item {
  418 + display: flex;
  419 + flex-direction: row;
  420 + align-items: center;
  421 + justify-content: space-between;
  422 + line-height: 70rpx;
  423 + border-bottom: #eee solid 1rpx;
  424 + padding: 10rpx 0;
  425 +
  426 + &[label-top] {
  427 + flex-direction: column;
  428 + justify-content: flex-start;
  429 + align-items: flex-start;
  430 + }
  431 +
  432 + text {
  433 + font-size: 24rpx;
  434 + color: #3D3D3D;
  435 + }
  436 +
  437 + .img {
  438 + padding-bottom: 18rpx;
  439 + }
  440 +
  441 + .deom-box {
  442 + width: 100%;
  443 + display: flex !important;
  444 + margin: 0 -20rpx;
  445 + background-color: #FFFFFF;
  446 + border-radius: 9px;
  447 + // margin-top: 9px;
  448 + width: 100%;
  449 +
  450 + // .u-upload {
  451 + // .u-add-wrap {
  452 + // width: 304rpx !important;
  453 + // height: 182rpx !important;
  454 + // }
  455 + // }
  456 + // .u-upload {
  457 + // height: 88px;
  458 + // width: 155px;
  459 + // background: url(/static/images/uploadID1.png);
  460 + // background-size:134rpx 188rpx;
  461 + // background-repeat:no-repeat;
  462 + // }
  463 + .img-deom {
  464 + flex: 1;
  465 + display: flex;
  466 + flex-direction: column;
  467 + align-items: center;
  468 + padding: 20rpx;
  469 +
  470 + text {
  471 + margin-top: 18rpx;
  472 + }
  473 + }
  474 + }
  475 + }
  476 +
  477 + :last-child {
  478 + border-bottom: unset;
  479 + }
  480 + }
  481 +
  482 + .footbtn {
  483 + position: fixed;
  484 + bottom: 0;
  485 + left: 0;
  486 + z-index: 10;
  487 + height: 180rpx;
  488 + width: 100%;
  489 + border-radius: 26rpx 26rpx 0 0;
  490 + background-color: #fff;
  491 +
  492 + .info-total {
  493 + display: flex;
  494 + flex-direction: row;
  495 + align-items: center;
  496 + justify-content: space-between;
  497 + margin: 24rpx 50rpx;
  498 + font-weight: 700;
  499 + font-size: 24rpx;
  500 +
  501 + span {
  502 + color: #0FBB59;
  503 + font-size: 32rpx
  504 + }
  505 + }
  506 +
  507 + .footer-btn {
  508 + display: flex;
  509 +
  510 + .u-btn {
  511 + width: 40%;
  512 + }
  513 + }
  514 + }
  515 +
  516 + .page-footer {
  517 + position: fixed;
  518 + left: 0;
  519 + bottom: 0;
  520 + display: flex;
  521 + align-items: center;
  522 + width: 100%;
  523 + background-color: #FFFFFF;
  524 + z-index: 20;
  525 + padding: 15px 0;
  526 +
  527 + .footer-buy {
  528 + display: flex;
  529 + align-items: center;
  530 + justify-content: space-between;
  531 + width: 100%;
  532 + height: 100%;
  533 +
  534 + .cart-add {
  535 + display: flex;
  536 + align-items: center;
  537 + justify-content: center;
  538 + width: 100%;
  539 + height: 100rpx;
  540 + background-color: #3f9b6a;
  541 +
  542 + text {
  543 + font-size: 28rpx;
  544 + color: #FFFFFF;
  545 + }
  546 + }
  547 + }
  548 + }
  549 +
  550 + .image-container {
  551 + padding: 10rpx 0;
  552 + display: flex;
  553 + flex-wrap: wrap;
  554 + /* 启用换行 */
  555 + justify-content: space-between;
  556 + /* 图片之间均匀分布 */
  557 + }
  558 +
  559 + .image-item {
  560 + box-sizing: border-box;
  561 + margin-bottom: 10rpx;
  562 + /* 图片之间的垂直间距 */
  563 + }
  564 +</style>
0 565 \ No newline at end of file
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiyuan - 副本.vue 0 → 100644
  1 +<template>
  2 + <view class="page">
  3 + <view class="screen-list">
  4 + <view class="list">
  5 + <u-input type="select" @click="typeShow = true" :placeholder="pageindex.auditStatus == '1'?'申请中':pageindex.auditStatus == '4'?'租赁中':pageindex.auditStatus == '7'?'已终止':'状态筛选'" />
  6 + </view>
  7 + </view>
  8 + <!-- 记录列表 -->
  9 + <view class="record-list">
  10 + <view class="record-list-box" v-for="(item,index) in recordList" :key="index" @click="item.auditStatus =='4' || item.auditStatus =='7'?recordXq(item):''">
  11 + <view class="list">
  12 + <view class="title" style="padding-bottom: 20rpx;">
  13 + <view class="left">{{item.cereBasicInformationShop&&item.cereBasicInformationShop.shopName?item.cereBasicInformationShop.shopName:item.cereBasicInformationVenue&&item.cereBasicInformationVenue.venueName?item.cereBasicInformationVenue.venueName:item.cereAdvertisingInformation&&item.cereAdvertisingInformation.advertisingName?item.cereAdvertisingInformation.advertisingName:''}}</view>
  14 + <view class="right" v-if="item.auditStatus =='4' || item.auditStatus =='7'"><u-icon name="arrow-right"></u-icon></view>
  15 + </view>
  16 + <view class="info-item">申请时间:{{item.applicationTime}}</view>
  17 + <view class="info-item">租赁时间 :{{item.intendedLeaseTerm?item.intendedLeaseTerm:item.scheduleTime}}</view>
  18 + <view class="info-item" v-if="item.auditStatus =='1'">状态:<span style="color: #0FBB59;">{{item.auditStatus =='1'?'待审核':item.auditStatus =='2'?'待签约':item.auditStatus =='3'?'已驳回':item.auditStatus =='4'?'租赁中':'已终止'}}</span></view>
  19 + </view>
  20 + </view>
  21 + </view>
  22 + <view v-if="recordList.length == 0" style="text-align: center;margin-top: 60rpx;color:#808080;">暂无数据</view>
  23 + <u-select v-model="typeShow" :list="activesType" @confirm="typeChange"></u-select>
  24 + </view>
  25 +</template>
  26 +
  27 +<script>
  28 + export default {
  29 + data() {
  30 + return {
  31 + activesType: [
  32 + // {
  33 + // value: 1,
  34 + // label: '申请中'
  35 + // },
  36 + {
  37 + value: 4,
  38 + label: '租赁中'
  39 + },
  40 + {
  41 + value: 7,
  42 + label: '已终止'
  43 + },
  44 + ],
  45 + typeShow:false,
  46 + recordList:[],
  47 + pageindex: {
  48 + auditStatus:4,
  49 + pageNumber: 0,
  50 + pageSize: 10
  51 + },
  52 + }
  53 + },
  54 + mounted(){
  55 + this.getALL()
  56 + },
  57 + methods: {
  58 + getALL(){
  59 + this.pageindex.applicant =uni.getStorageSync('user').phone
  60 + this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
  61 + //成功回调
  62 + this.recordList = res.data.data.records
  63 + this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
  64 +
  65 + if(item.data.data.records !=undefined &&item.data.data.records.length !=0){
  66 + item.data.data.records.map(val=>{
  67 + this.recordList.push(val)
  68 + })
  69 + }
  70 +
  71 +
  72 + })
  73 + })
  74 +
  75 + },
  76 + recordXq(item){
  77 +
  78 + const encodedItem = encodeURIComponent(JSON.stringify(item));
  79 + uni.navigateTo({
  80 + url: `/pagesA/myZiyuan/myZiDetails?item=${encodedItem}`,
  81 + })
  82 + },
  83 + contractdetail(){
  84 + // uni.navigateTo({
  85 +
  86 + // })
  87 + },
  88 + typeChange(e) {
  89 +
  90 + this.pageindex.start = e[0].labels
  91 + this.pageindex.auditStatus = e[0].value
  92 + this.getALL()
  93 + },
  94 + }
  95 + }
  96 +</script>
  97 +
  98 +<style scoped lang="scss">
  99 + @import 'myZiyuan.scss';
  100 +</style>
... ...
lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
... ... @@ -2,20 +2,28 @@
2 2 <view class="page">
3 3 <view class="screen-list">
4 4 <view class="list">
5   - <u-input type="select" @click="typeShow = true" :placeholder="pageindex.auditStatus == '1'?'申请中':pageindex.auditStatus == '4'?'租赁中':pageindex.auditStatus == '7'?'已终止':'状态筛选'" />
  5 + <u-input type="select" @click="typeShow = true"
  6 + :placeholder="pageindex.dataStatus == '1'?'申请中':pageindex.dataStatus == '3'?'已终止':'状态筛选'" />
6 7 </view>
7 8 </view>
8 9 <!-- 记录列表 -->
9 10 <view class="record-list">
10   - <view class="record-list-box" v-for="(item,index) in recordList" :key="index" @click="item.auditStatus =='4' || item.auditStatus =='7'?recordXq(item):''">
  11 + <view class="record-list-box" v-for="(item,index) in recordList" :key="index"
  12 + @click="item.dataStatus =='1' || item.dataStatus =='3'?recordXq(item):''">
11 13 <view class="list">
12 14 <view class="title" style="padding-bottom: 20rpx;">
13   - <view class="left">{{item.cereBasicInformationShop&&item.cereBasicInformationShop.shopName?item.cereBasicInformationShop.shopName:item.cereBasicInformationVenue&&item.cereBasicInformationVenue.venueName?item.cereBasicInformationVenue.venueName:item.cereAdvertisingInformation&&item.cereAdvertisingInformation.advertisingName?item.cereAdvertisingInformation.advertisingName:''}}</view>
14   - <view class="right" v-if="item.auditStatus =='4' || item.auditStatus =='7'"><u-icon name="arrow-right"></u-icon></view>
  15 + <view class="left">
  16 + <!-- {{item.contractName}} -->
  17 + {{item.cereBasicInformationShop&&item.cereBasicInformationShop.shopName?item.cereBasicInformationShop.shopName:item.cereBasicInformationVenue&&item.cereBasicInformationVenue.venueName?item.cereBasicInformationVenue.venueName:item.cereAdvertisingInformation&&item.cereAdvertisingInformation.advertisingName?item.cereAdvertisingInformation.advertisingName:''}}
  18 + </view>
  19 + <view class="right" v-if="item.dataStatus =='1' || item.dataStatus =='3'"><u-icon
  20 + name="arrow-right"></u-icon></view>
  21 + </view>
  22 + <!-- <view class="info-item">申请时间:{{item.applicationTime}}</view> -->
  23 + <view class="info-item">租赁时间 :{{item.leaseStartDate}} 至 {{item.contractTerminationDate}}</view>
  24 + <view class="info-item" v-if="item.dataStatus =='1'">状态:<span
  25 + style="color: #0FBB59;">{{item.dataStatus =='1'?'租赁中':item.dataStatus =='3'?'已终止':'-'}}</span>
15 26 </view>
16   - <view class="info-item">申请时间:{{item.applicationTime}}</view>
17   - <view class="info-item">租赁时间 :{{item.intendedLeaseTerm?item.intendedLeaseTerm:item.scheduleTime}}</view>
18   - <view class="info-item" v-if="item.auditStatus =='1'">状态:<span style="color: #0FBB59;">{{item.auditStatus =='1'?'待审核':item.auditStatus =='2'?'待签约':item.auditStatus =='3'?'已驳回':item.auditStatus =='4'?'租赁中':'已终止'}}</span></view>
19 27 </view>
20 28 </view>
21 29 </view>
... ... @@ -28,67 +36,85 @@
28 36 export default {
29 37 data() {
30 38 return {
31   - activesType: [
32   - // {
33   - // value: 1,
34   - // label: '申请中'
35   - // },
36   - {
37   - value: 4,
38   - label: '租赁中'
39   - },
40   - {
41   - value: 7,
42   - label: '已终止'
43   - },
  39 + activesType: [
  40 + // {
  41 + // value: 1,
  42 + // label: '申请中'
  43 + // },
  44 + {
  45 + value: '1',
  46 + label: '租赁中'
  47 + },
  48 + {
  49 + value: '3',
  50 + label: '已终止'
  51 + },
44 52 ],
45   - typeShow:false,
46   - recordList:[],
  53 + typeShow: false,
  54 + recordList: [],
47 55 pageindex: {
48   - auditStatus:4,
  56 + dataStatus: '1',
49 57 pageNumber: 0,
50 58 pageSize: 10
51 59 },
  60 + total: 0
52 61 }
53 62 },
54   - mounted(){
  63 + mounted() {
55 64 this.getALL()
56 65 },
  66 + onReachBottom(e) {
  67 + console.error(e)
  68 + if (this.recordList.length < this.total) {
  69 + this.pageindex.pageNumber++
  70 + this.gain()
  71 + }
  72 + },
57 73 methods: {
58   - getALL(){
59   - this.pageindex.applicant =uni.getStorageSync('user').phone
60   - this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
  74 + getALL() {
  75 + this.pageindex.applicant = uni.getStorageSync('user').phone
  76 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
  77 + pageSize: 1,
  78 + pageNumber: 0,
  79 + phone: uni.getStorageSync('user').phone
  80 + }, 1).then(res => {
  81 + if (res.data.data.content.length > 0) {
  82 + let c1 = res.data.data.content[0]
  83 + console.error({
  84 + ...c1
  85 + })
  86 + if (c1.checkState == '2') {
  87 + this.pageindex.relatedMerchants = c1.id
  88 + this.gain()
  89 + }
  90 + }
  91 + })
  92 + },
  93 + gain() {
  94 + this.$http.sendRequest('/cereContractInformation/getPage', 'POST', this.pageindex, 1).then(res1 => {
61 95 //成功回调
62   - this.recordList = res.data.data.records
63   - this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
64   -
65   - if(item.data.data.records !=undefined &&item.data.data.records.length !=0){
66   - item.data.data.records.map(val=>{
67   - this.recordList.push(val)
68   - })
69   - }
70   -
71   -
72   - })
  96 + console.error(res1)
  97 + this.recordList = [...this.recordList,...res1.data.data.content]
  98 + this.total = res1.data.data.totalElements
73 99 })
74   -
75 100 },
76   - recordXq(item){
77   -
  101 + recordXq(item) {
  102 +
78 103 const encodedItem = encodeURIComponent(JSON.stringify(item));
79 104 uni.navigateTo({
80   - url: `/pagesA/myZiyuan/myZiDetails?item=${encodedItem}`,
  105 + url: `/pagesA/myZiyuan/myZiDetailsnew?item=${encodedItem}`,
81 106 })
82 107 },
83   - contractdetail(){
  108 + contractdetail() {
84 109 // uni.navigateTo({
85   -
  110 +
86 111 // })
87 112 },
88 113 typeChange(e) {
89   -
  114 + this.pageindex.pageNumber = 0
90 115 this.pageindex.start = e[0].labels
91   - this.pageindex.auditStatus = e[0].value
  116 + this.pageindex.dataStatus = e[0].value
  117 + this.recordList = []
92 118 this.getALL()
93 119 },
94 120 }
... ... @@ -97,4 +123,4 @@
97 123  
98 124 <style scoped lang="scss">
99 125 @import 'myZiyuan.scss';
100   -</style>
  126 +</style>
101 127 \ No newline at end of file
... ...
lvdao-miniapp/utils/request.js
... ... @@ -21,7 +21,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
21 21 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
22 22 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
23 23  
24   - // bases = 'http://128.10.249.46:9003'+ url;
  24 + // bases = 'http://128.10.249.23:9003'+ url;
25 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26  
27 27 bases = c1 + 'cdwlMall/meserver/admin-server' + url;
... ...