Commit 35d365f1 by 胡畅

Merge branch 'develop' of http://gitlab.icaremgt.com/tanxinyu/h5_activity into develop

parents e57b0cb5 67ac864b
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -5,16 +5,16 @@
<meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
<meta name="format-detection" content="telephone=no">
<title>宝贝,因“喂”爱你</title>
<link rel="stylesheet" href="css/activity.css">
<link rel="stylesheet" href="css/toast.css">
<script type="text/javascript" src="js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="js/toast.js"></script>
<script type="text/javascript" src="js/exif.js"></script>
<script type="text/javascript" src="js/html2Json.js"></script>
<script type="text/javascript" src="js/pageJson/signupJson.js"></script>
<script type="text/javascript" src="js/modalJson/shareModal.js"></script>
<script type="text/javascript" src="js/removeAttr.js"></script>
<script type="text/javascript" src="js/autoFontsize.min.js"></script>
<link rel="stylesheet" href="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/activity.css">
<link rel="stylesheet" href="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/toast.css">
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/toast.js"></script>
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/exif.js"></script>
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/html2Json.js"></script>
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/pageJson/signupJson.js"></script>
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/modalJson/shareModal.js"></script>
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/removeAttr.js"></script>
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/autoFontsize.min.js"></script>
<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
<script type="text/javascript">
wx.config({
......
......@@ -5,14 +5,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no">
<meta name="format-detection" content="telephone=no">
<title>宝贝,因“喂”爱你</title>
<link rel="stylesheet" href="css/activity.css">
<link rel="stylesheet" href="css/toast.css">
<script type="text/javascript" src="js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="js/html2Json.js"></script>
<script type="text/javascript" src="js/pageJson/userJson.js"></script>
<script type="text/javascript" src="js/modalJson/shareModal.js"></script>
<script type="text/javascript" src="js/modalJson/voteModal.js"></script>
<script type="text/javascript" src="js/autoFontsize.min.js"></script>
<link rel="stylesheet" href="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/activity.css">
<link rel="stylesheet" href="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/css/toast.css">
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotosjs/js/jquery-3.4.1.min.js"></script>
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/html2Json.js"></script>
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/pageJson/userJson.js"></script>
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/modalJson/shareModal.js"></script>
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/modalJson/voteModal.js"></script>
<script type="text/javascript" src="http://gitlab.icaremgt.com/tanxinyu/h5_activity/raw/master/showPhotos/js/autoFontsize.min.js"></script>
<script type="text/javascript" src="http://res.wx.qq.com/open/js/jweixin-1.4.0.js"></script>
<script type="text/javascript">
wx.config({
......
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