潘浩文 / fupai1 · 提交

转到一个项目

作者 潘浩文
提交 8ab83db5e5763fe0a4b96a1d3958b5d62fdd3bc4 2 个父辈 970e61d7 a3db5889
1 个管道 的构建 通过 耗费 1 秒

合并分支 'qianduan' 到 'master' 

Qianduan



查看合并请求 !1
内嵌 并排对比
正在显示 10 个修改的文件 包含 10 行增加 和 10 行删除
... ... @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<title>福牌公众号</title>
<title>十方台公众号</title>
<script src="__TMPL__/public/assets/js/jquery-2.1.0.js"></script>
<script src="__TMPL__/public/assets/js/fontsize.js"></script>
<link href="__TMPL__/public/assets/css/detail.css" rel="stylesheet">
... ...
... ... @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<title>福牌公众号</title>
<title>十方台公众号</title>
<script src="__TMPL__/public/assets/js/jquery-2.1.0.js"></script>
<script src="__TMPL__/public/assets/js/fontsize.js"></script>
<script src="__TMPL__/public/assets/js/weui.js"></script>
... ...
... ... @@ -20,7 +20,7 @@
</div>
</div>
<div class="section">
<div class="title">福牌显示信息</div>
<div class="title">十方台显示信息</div>
<div class="avatar-box" onclick="editAvatar()">
<div class="border-box">
<image src="{:cmf_get_image_preview_url($users.avatar);}" class="avatar-img"></image>
... ...

1.2 MB | 宽: | 高:

1.2 MB | 宽: | 高:

  • 两方对比
  • 交换覆盖
  • 透明覆盖
... ... @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<title>我的福牌</title>
<title>我的十方台</title>
<script src="__TMPL__/public/assets/js/jquery-2.1.0.js"></script>
<script src="__TMPL__/public/assets/js/fontsize.js"></script>
<link href="__TMPL__/public/assets/css/cards.css" rel="stylesheet">
... ... @@ -26,7 +26,7 @@
</div>
<div class="bottom">
<div class="border-box">
<div class="name">福牌信息</div>
<div class="name">十方台信息</div>
<div class="edit" onclick="enter()">
<a href="{:url('user/User/edit',array('id'=>$list.id))}" style="text-decoration:none;out-line: none;color: #666666"><div class="name-info">信息有误，要修改</div></a>
<image src="__TMPL__/public/assets/images/bicon03@2x.png" class="arrow"></image>
... ...
... ... @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<title>我的福牌</title>
<title>我的十方台</title>
<script src="__TMPL__/public/assets/js/jquery-2.1.0.js"></script>
<script src="__TMPL__/public/assets/js/fontsize.js"></script>
<link href="__TMPL__/public/assets/css/edit.css" rel="stylesheet">
... ... @@ -11,7 +11,7 @@
</head>
<body>
<div class="section">
<div class="title">福牌显示信息</div>
<div class="title">十方台显示信息</div>
<div class="avatar-box">
<div class="border-box">
<image src="{:cmf_get_image_preview_url($list.avatar);}" class="avatar-img"></image>
... ...
... ... @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<title>福牌公众号</title>
<title>十方台公众号</title>
<script src="__TMPL__/public/assets/js/jquery-2.1.0.js"></script>
<script src="__TMPL__/public/assets/js/fontsize.js"></script>
<link href="__TMPL__/public/assets/css/personal-info.css" rel="stylesheet">
... ...
... ... @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<title>我的福牌</title>
<title>我的十方台</title>
<script src="__TMPL__/public/assets/js/jquery-2.1.0.js"></script>
<script src="__TMPL__/public/assets/js/fontsize.js"></script>
<link href="__TMPL__/public/assets/css/blessing.css" rel="stylesheet">
... ...
... ... @@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<title>福牌公众号</title>
<title>十方台公众号</title>
<script src="__TMPL__/public/assets/js/jquery-2.1.0.js"></script>
<script src="__TMPL__/public/assets/js/fontsize.js"></script>
<link href="__TMPL__/public/assets/css/index.css" rel="stylesheet">
... ...