Commit 0228ed95 authored by zhoujun's avatar zhoujun

Merge branch 'test'

parents 1c251863 93535843
Pipeline #1620 passed with stage
in 1 second
...@@ -15,3 +15,5 @@ Homestead.json ...@@ -15,3 +15,5 @@ Homestead.json
Homestead.yaml Homestead.yaml
npm-debug.log npm-debug.log
yarn-error.log yarn-error.log
/public/card
/public/cardImg
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<input type="file" id="file" accept="image/*"> @endif <input type="file" id="file" accept="image/*"> @endif
@if($userImgStatus == 0) <img src="{{ asset('postcard/images/img_sh.jpg') }}" class="img img-sh" alt=""> @endif @if($userImgStatus == 0) <img src="{{ asset('postcard/images/img_sh.jpg') }}" class="img img-sh" alt=""> @endif
@if($userImgStatus == 1) <img src="{{ $userImg }}" class="img img-sh" alt=""> @endif @if($userImgStatus == 1) <img src="{{ $userImg }}" class="img img-sh" alt=""> @endif
@if($userImgStatus == 2) <img src="{{ asset('postcard/images/sh_fail.jpg') }}" class="img img-sh" alt=""> @if($userImgStatus == 2) <img src="{{ asset('postcard/images/sh_fail.jpg?v=20210610') }}" class="img img-sh" alt="">
<input type="file" id="file" accept="image/*"> @endif <input type="file" id="file" accept="image/*"> @endif
</div> </div>
@if($userImgStatus != 1) @if($userImgStatus != 1)
...@@ -350,10 +350,10 @@ ...@@ -350,10 +350,10 @@
link: link, link: link,
imgUrl: imgurl, imgUrl: imgurl,
success: function() { success: function() {
$('.share-img').hide();
}, },
cancel: function() { cancel: function() {
$('.share-img').hide();
} }
}); });
//微信好友 //微信好友
...@@ -365,10 +365,10 @@ ...@@ -365,10 +365,10 @@
type: 'link', type: 'link',
dataUrl: '', dataUrl: '',
success: function() { success: function() {
$('.share-img').hide();
}, },
cancel: function() { cancel: function() {
$('.share-img').hide();
} }
}); });
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment