Commit 66ab3b4a0310aa42456a0f0ee064568ba45f2e0f

Authored by 杨鑫
2 parents 31cee0b1 97dd7eda

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

lvdao-miniapp/pagesA/addsb/addsb.vue
@@ -387,7 +387,7 @@ @@ -387,7 +387,7 @@
387 width: 100%; 387 width: 100%;
388 height: 100vh; 388 height: 100vh;
389 overflow: hidden; 389 overflow: hidden;
390 - background-image: url('@/static/icon/bg2.png'); 390 + background-image: url('https://zhgw-uat.028wlkj.com/cdwlMall/zsfwzxt/file/static/img/17183fb8b52c1ed22357d3c670d460c.png');
391 background-size: 100% 100%; 391 background-size: 100% 100%;
392 padding: 30rpx; 392 padding: 30rpx;
393 box-sizing: border-box; 393 box-sizing: border-box;
lvdao-miniapp/pagesA/application/application.vue
@@ -12,7 +12,7 @@ @@ -12,7 +12,7 @@
12 <view class="voucher-img"> 12 <view class="voucher-img">
13 <view class="voucher-list" style="width: 100%;"> 13 <view class="voucher-list" style="width: 100%;">
14 <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;"> 14 <view class="" style="background-color: #F0F0F0;border-radius: 20rpx;">
15 - <textarea name="" id="" cols="255" rows="20" placeholder="请输入" 15 + <textarea :auto-height="true" placeholder="请输入"
16 style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding:10px;min-height: 100px;" 16 style="font-size: 24rpx;background-color: #F0F0F0;border-radius: 20rpx;width: 96%;margin: 0 auto;padding:10px;min-height: 100px;"
17 v-model="rulform.schemeTitle"></textarea> 17 v-model="rulform.schemeTitle"></textarea>
18 </view> 18 </view>
lvdao-miniapp/static/icon.zip deleted
No preview for this file type
lvdao-miniapp/static/icon/bg2.png deleted

16.5 KB

lvdao-miniapp/utils/request.js
@@ -11,10 +11,10 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -11,10 +11,10 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
11 types = 'application/x-www-form-urlencoded' 11 types = 'application/x-www-form-urlencoded'
12 } else if (method == 'POST' && contentType) { 12 } else if (method == 'POST' && contentType) {
13 types = contentType 13 types = contentType
14 - } else { 14 + } else {
15 types = 'application/json'; 15 types = 'application/json';
16 } 16 }
17 - var bases = '' 17 + var bases = ''
18 if(baseUrl == 1){ 18 if(baseUrl == 1){
19 // bases = 'http://128.10.249.22:9003' + url; 19 // bases = 'http://128.10.249.22:9003' + url;
20 // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url; 20 // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;