浏览代码

no message

DESKTOP-3E973C2\Admin 4 年之前
父节点
当前提交
6f6975ecb0
共有 51 个文件被更改,包括 0 次插入3953 次删除
  1. 0 0
      .gitignore
  2. 0 10
      businessweb-user/Dockerfile
  3. 0 201
      businessweb-user/css/common.css
  4. 0 172
      businessweb-user/css/popup.css
  5. 0 1298
      businessweb-user/css/style.css
  6. 0 159
      businessweb-user/fillin.html
  7. 0 873
      businessweb-user/home.html
  8. 二进制
      businessweb-user/images/back_left.png
  9. 二进制
      businessweb-user/images/choose.png
  10. 二进制
      businessweb-user/images/choose_toght.png
  11. 二进制
      businessweb-user/images/default_head.png
  12. 二进制
      businessweb-user/images/er.jpg
  13. 二进制
      businessweb-user/images/error.png
  14. 二进制
      businessweb-user/images/favicon.ico
  15. 二进制
      businessweb-user/images/gift_gray.png
  16. 二进制
      businessweb-user/images/gift_light.png
  17. 二进制
      businessweb-user/images/green_logo.png
  18. 二进制
      businessweb-user/images/home_gray.png
  19. 二进制
      businessweb-user/images/home_light.png
  20. 二进制
      businessweb-user/images/ic_huangguan_yellow.png
  21. 二进制
      businessweb-user/images/in_wow.png
  22. 二进制
      businessweb-user/images/index_icon1.png
  23. 二进制
      businessweb-user/images/index_icon2.png
  24. 二进制
      businessweb-user/images/index_icon3.png
  25. 二进制
      businessweb-user/images/index_icon4.png
  26. 二进制
      businessweb-user/images/index_icon5.png
  27. 二进制
      businessweb-user/images/index_icon6.png
  28. 二进制
      businessweb-user/images/ios-opacity_01.png
  29. 二进制
      businessweb-user/images/login_ico_pwd.png
  30. 二进制
      businessweb-user/images/loginname.png
  31. 二进制
      businessweb-user/images/official_gray.png
  32. 二进制
      businessweb-user/images/official_light.png
  33. 二进制
      businessweb-user/images/player_recharge_wow.png
  34. 二进制
      businessweb-user/images/query.png
  35. 二进制
      businessweb-user/images/san.jpg
  36. 二进制
      businessweb-user/images/weixin.png
  37. 二进制
      businessweb-user/images/xinjian.png
  38. 二进制
      businessweb-user/images/xinjiankai.png
  39. 二进制
      businessweb-user/images/xinyue_login.png
  40. 二进制
      businessweb-user/images/xinyue_start.png
  41. 二进制
      businessweb-user/images/yi.jpg
  42. 0 151
      businessweb-user/index.html
  43. 0 72
      businessweb-user/js/common.js
  44. 0 11
      businessweb-user/js/jquery-2.1.4.min.js
  45. 0 1
      businessweb-user/js/jweixin-1.3.2.js
  46. 0 408
      businessweb-user/js/md5.js
  47. 0 58
      businessweb-user/js/page/login.js
  48. 0 511
      businessweb-user/js/popup.js
  49. 0 6
      businessweb-user/js/rem.js
  50. 0 14
      businessweb-user/js/vue.js
  51. 0 8
      businessweb-user/push.sh

+ 0 - 0
.gitignore


+ 0 - 10
businessweb-user/Dockerfile

@@ -1,10 +0,0 @@
-FROM nginx:1.15.6
-RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime
-RUN echo 'Asia/Shanghai' > /etc/timezone
-
-COPY css /etc/nginx/css/
-COPY images /etc/nginx/images/
-COPY js /etc/nginx/js/
-COPY fillin.html /etc/nginx/fillin.html
-COPY index.html /etc/nginx/index.html
-COPY home.html /etc/nginx/home.html

+ 0 - 201
businessweb-user/css/common.css

@@ -1,201 +0,0 @@
-<<<<<<< HEAD
-*{
-    margin: 0;
-    padding:0;
-}
-div.hide{
-    display: none
-}
-button, input {
-    outline: none;
-    border: none;
-    background-color: #fff;
-}
-#opacity {
-    position: fixed;
-    display: none;
-    width: 100%;
-    height: 100%;
-    background: rgba(0, 0, 0, .8);
-    z-index: 666;
-    top: 0;
-    left: 0;
-    z-index: 1000;
-}
-#opacity .ios img{
-    width: 100%;
-    display: block;
-}
-.mask {
-    border: 0;
-    margin: 0;
-    padding: 0;
-    position: fixed;
-    left: 0;
-    top: 0;
-    min-height: 100%;
-    min-width: 100%;
-    height: auto;
-    width: auto;
-    opacity: 0.5;
-    z-index: 1;
-    /* styles required for IE to work */
-    background-color: #000;
-    filter: alpha(opacity=0);
-}
-.agreetit {
-    z-index: 2;
-    position: fixed;
-    display: flex;
-    flex-direction: column;
-    top: 16%;
-    left: 50%;
-    width: 80%;
-    height: 12rem;
-    margin-left: -40%;
-    border-radius: 0.1rem;
-    background-color: white;
-    font-size: 0.5rem;
-}
-.agreetit .title {
-    width: 100%;
-    padding: 0.4rem 0;
-    text-align: center;
-    color: #333;
-}
-.agreetit .agreetit-main {
-    flex: 1;
-    width: 100%;
-    padding: 0 0.2rem;
-    overflow-y: auto;
-    font-size: 0.3rem;
-    box-sizing: border-box;
-}
-.agreetit .agreetit-main p {
-    font-size: 0.42rem;
-    line-height: 0.7rem;
-    white-space: pre-line;
-}
-.agreetit .agreetit-main h1,
-.agreetit .agreetit-main h2,
-.agreetit .agreetit-main h3 {
-    font-size: 0.3rem;
-}
-.agreetit .bottom {
-    display: flex;
-    height: 1.2rem;
-    line-height: 1.2rem;
-    // border-top: 1px solid #ddd;
-}
-.agreetit .bottom .cancle {
-    text-align: center;
-    flex: 1;
-    color: #666;
-    border-right: 1px solid #ddd;
-}
-.agreetit .bottom .sure {
-    text-align: center;
-    flex: 1;
-    color: #15a61d;
-}
-=======
-*{
-    margin: 0;
-    padding:0;
-}
-div.hide{
-    display: none
-}
-button, input {
-    outline: none;
-    border: none;
-    background-color: #fff;
-}
-#opacity {
-    position: fixed;
-    display: none;
-    width: 100%;
-    height: 100%;
-    background: rgba(0, 0, 0, .8);
-    z-index: 666;
-    top: 0;
-    left: 0;
-    z-index: 1000;
-}
-#opacity .ios img{
-    width: 100%;
-    display: block;
-}
-.mask {
-    border: 0;
-    margin: 0;
-    padding: 0;
-    position: fixed;
-    left: 0;
-    top: 0;
-    min-height: 100%;
-    min-width: 100%;
-    height: auto;
-    width: auto;
-    opacity: 0.5;
-    z-index: 1;
-    /* styles required for IE to work */
-    background-color: #000;
-    filter: alpha(opacity=0);
-}
-.agreetit {
-    z-index: 2;
-    position: fixed;
-    display: flex;
-    flex-direction: column;
-    top: 16%;
-    left: 50%;
-    width: 80%;
-    height: 12rem;
-    margin-left: -40%;
-    border-radius: 0.1rem;
-    background-color: white;
-    font-size: 0.5rem;
-}
-.agreetit .title {
-    width: 100%;
-    padding: 0.4rem 0;
-    text-align: center;
-    color: #333;
-}
-.agreetit .agreetit-main {
-    flex: 1;
-    width: 100%;
-    padding: 0 0.2rem;
-    overflow-y: auto;
-    font-size: 0.3rem;
-    box-sizing: border-box;
-}
-.agreetit .agreetit-main p {
-    font-size: 0.42rem;
-    line-height: 0.7rem;
-    white-space: pre-line;
-}
-.agreetit .agreetit-main h1,
-.agreetit .agreetit-main h2,
-.agreetit .agreetit-main h3 {
-    font-size: 0.3rem;
-}
-.agreetit .bottom {
-    display: flex;
-    height: 1.2rem;
-    line-height: 1.2rem;
-    // border-top: 1px solid #ddd;
-}
-.agreetit .bottom .cancle {
-    text-align: center;
-    flex: 1;
-    color: #666;
-    border-right: 1px solid #ddd;
-}
-.agreetit .bottom .sure {
-    text-align: center;
-    flex: 1;
-    color: #15a61d;
-}
->>>>>>> cb3d90368273b7ba0ce18e05382d00be6933949f

+ 0 - 172
businessweb-user/css/popup.css

@@ -1,172 +0,0 @@
-.ui-mask {
-    position: fixed;
-    top: 0px;
-    left: 0px;
-    bottom: 0px;
-    right: 0px;
-    z-index: 10;
-    background: rgba(0, 0, 0, 0.298039);
-}
-.ui-dialog {
-	background-color: #fff;
-	z-index: 11;
-	width: 85%;
-	position: absolute;
-	top: 50%;
-	left: 50%;
-	border-radius: 5px;
-	text-align: center;
-	font-size: 0.4rem;
-	-webkit-transform: translate3D(-50%, -50%, 0);
-	   -moz-transform: translate3D(-50%, -50%, 0);
-	    -ms-transform: translate3D(-50%, -50%, 0);
-	     -o-transform: translate3D(-50%, -50%, 0);
-	        transform: translate3D(-50%, -50%, 0);
-}
-.ui-dialog>.ui-title {
-	padding: 10px 0;
-	border-bottom: 1px solid #e5e5e5;
-}
-.ui-dialog>.ui-content {
-	padding: 15px 3px;
-}
-.ui-dialog>.ui-btns {
-	border-top: 1px solid #e5e5e5;
-	font-size: 14px;
-	display: flex;
-}
-.ui-dialog>.ui-btns>a {
-	flex: 1;
-	line-height: 42px;
-	text-align: center;
-	color: #09f;
-	text-decoration: none;
-	-webkit-tap-highlight-color: transparent;
-	border-right: 1px solid #e5e5e5;
-}
-.ui-dialog>.ui-btns>a:last-child {
-	border-right: none;
-}
-.ui-toast {
-	width: auto;
-	min-width: 35%;
-	max-width: 60%;
-}
-.ui-toast>.ui-content {
-	background-color: rgba(0, 0, 0, 0.7);
-	color: #fff;
-	padding: 20px 10px;
-	border-radius: 5px;
-}
-.ui-loading>.ui-content {
-    box-sizing: border-box;
-    padding: 0;
-    height: 60px;
-    position: absolute;
-    width: 100%;
-    border-radius: 5px 5px 0 0;
-    background-color: rgba(0, 0, 0, 0.7);
-	color: #fff;
-}
-.ui-loading {
-	width: 30%;
-	height: 86px;
-}
-.ui-line-spin {
-	position: absolute;
-	left: 50%;
-	top: 50%;
-	transform: translate3d(-50%, -50%, 0);
-}
-.ui-line-spin>div {
-	position: absolute;
-	width: 3px;
-	height: 10px;
-	background-color: #fff;
-	border-radius: 1px;
-    -webkit-animation-fill-mode: both;
-	animation-fill-mode: both;
-	margin: 2px;
-	transform-origin: 50% 0%;
-}
-@keyframes line-spin {
-	0% {
-		background-color: #fff;
-	}
-	50% {
-		background-color: rgb(0, 0, 0);
-	}
-	100% {
-		background-color: #fff;
-	}
-}
-.ui-line-spin>div:nth-of-type(1) {
-	animation: line-spin 1.2s 0.12s ease-in-out infinite;
-}
-.ui-line-spin>div:nth-of-type(2) {
-	animation: line-spin 1.2s 0.24s ease-in-out infinite;
-}
-.ui-line-spin>div:nth-of-type(3) {
-	animation: line-spin 1.2s 0.36s ease-in-out infinite;
-}
-.ui-line-spin>div:nth-of-type(4) {
-	animation: line-spin 1.2s 0.48s ease-in-out infinite;
-}
-.ui-line-spin>div:nth-of-type(5) {
-	animation: line-spin 1.2s 0.60s ease-in-out infinite;
-}
-.ui-line-spin>div:nth-of-type(6) {
-	animation: line-spin 1.2s 0.72s ease-in-out infinite;
-}
-.ui-line-spin>div:nth-of-type(7) {
-	animation: line-spin 1.2s 0.84s ease-in-out infinite;
-}
-.ui-line-spin>div:nth-of-type(8) {
-	animation: line-spin 1.2s 0.96s ease-in-out infinite;
-}
-.ui-loading>.ui-text {
-	position: absolute;
-	width: 100%;
-	top: 60px;
-	padding-bottom: 10px;
-	background-color: rgba(0,0,0,0.7);
-	font-size: 14px;
-	color: #fff;
-	border-radius: 0 0 5px 5px;
-}
-.ui-progress {
-	background-color: rgba(0, 0, 0, 0.7);
-	width: auto;
-	max-width: 65%;
-}
-.ui-progress>.ui-content {
-	width: 100%;
-	padding: 6px 20px 15px 20px;
-	box-sizing: border-box;
-}
-.ui-progress>.ui-content>.ui-outer {
-	height: 5px;
-	background-color: rgba(255, 255, 255, 0.5);
-	border-radius: 3px;
-}
-.ui-progress>.ui-content>.ui-outer>.ui-inner {
-	width: 0%;
-	height: 100%;
-	background-color: rgba(255, 255, 255, 0.8);
-	border-radius: inherit;
-}
-.ui-progress>.ui-text {
-	font-size: 14px;
-	line-height: 16px;
-	padding: 10px 20px;
-	color: #fff;
-}
-.fade {
-	opacity: 0;
-	transition: opacity 0.25s linear;
-	-webkit-transition: opacity 0.25s linear;
-	-moz-transition: opacity 0.25s linear;
-}
-.fade.in {
-	opacity: 1;
-}

文件差异内容过多而无法显示
+ 0 - 1298
businessweb-user/css/style.css


+ 0 - 159
businessweb-user/fillin.html

@@ -1,159 +0,0 @@
-<<<<<<< HEAD
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <title>心悦分销平台</title>
-  <link rel="shortcut icon" href="favicon.ico" />
-  <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0"/>
-  <link rel="stylesheet" type="text/css" href="css/common.css">
-  <link rel="stylesheet" type="text/css" href="css/popup.css">
-  <link rel="stylesheet" type="text/css" href="css/style.css">
-</head>
-<body>
-	<div id="fillin">
-    <!-- 头部 -->
-    <header class="mint-header">
-      <span></span>填写资料
-    </header>
-
-    <div class='fi-top'>
-      <div class='bd-t'></div>
-      <div class='item'>
-        <div class='item-label'>微信号</div>
-        <input placeholder='在微信底部【我】中查看' name="wechat_id"  class='item-input' />
-        <div class='bd-b'></div>
-      </div>
-      <div class='item'>
-        <div class='item-label'>图片验证码</div>
-        <input placeholder='请输入图片中验证码' type='number'  class='item-input' />
-        <div class='item-other' @click="changeCode">
-          <img src='http://mpa.xinyuepage.com/captcha?token=AtB38KMI03rYjwCkJ7uWBc6O9LyWZe7lMDa4CpkMcXG5UZRy4MHaJidHI5kGqVlc&amp;a=487'></img>
-        </div>
-        <div class='bd-b'></div>
-      </div>
-      <div class='item'>
-        <div class='item-label'>手机号</div>
-        <input placeholder='请输入手机号' type='number' name="phone" v-model="params.phone" class='item-input' />
-        <button class='item-other-phone' @click="getCode">{{getcode}}</button>
-        <div class='bd-b'></div>
-      </div>
-      <div class='item'>
-        <div class='item-label'>短信验证码</div>
-          <input placeholder='请输入短信验证码' type='number' name="phoneSmsCaptcha" v-model="params.phoneSmsCaptcha" class='item-input' />
-        <div class='bd-b'></div>
-      </div>
-      <div class='item'>
-        <div class='item-label'>服务地区</div>
-        <!-- <input hidden='true' name='region' value='吉林' /> -->
-        <input class='item-pick' disabled='true' v-model='params.areaInfo' />
-        <button class='item-other-phone' @click="getLocation">获取位置</button>
-        <div class='bd-b'></div>
-      </div>
-    </div>
-
-    <div class='fi-submit'>
-      <button @click="submitForm">提交</button>
-    </div>
-
-    <div class='fi-bottom'>
-      <span class='title'>获取不到短信验证码怎么办?</span>
-      <div class='des'>1.请在倒计时结束后再次点击“获取验证码”按钮进行重试;</div>
-      <div class='des'>2.如果重试3次以上依然没有收到,可能您的手机里安装了短信拦截类软件,请关闭该类软件后再重试;</div>
-    </div>
-  </div>
-	<div style="display: block; width:1px; height:1px; overflow: hidden;">
-		<a target="cyxyv" href="https://v.yunaq.com/certificate?domain=mpa.xinyueyouxi.com&from=label&code=90020"><img src="https://aqyzmedia.yunaq.com/labels/label_sm_90020.png"></a>
-	</div>
-  <script src="js/jquery-2.1.4.min.js"></script>
-  <script src="js/jweixin-1.3.2.js"></script>
-  <script src="js/vue.js"></script>
-  <script src="js/popup.js"></script>
-  <script src="js/rem.js"></script>
-  <script type="text/javascript">
-    document.write('<script type="text/javascript" charset="UTF-8" src="js/common.js?v='+new Date().getTime()+'"><\/script>');
-    document.write('<script type="text/javascript" charset="UTF-8" src="js/page/fillin.js?v='+new Date().getTime()+'"><\/script>');
-  </script>
-</body>
-</html>
-=======
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <title>心悦分销平台</title>
-  <link rel="shortcut icon" href="favicon.ico" />
-  <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0"/>
-  <link rel="stylesheet" type="text/css" href="css/common.css">
-  <link rel="stylesheet" type="text/css" href="css/popup.css">
-  <link rel="stylesheet" type="text/css" href="css/style.css">
-</head>
-<body>
-	<div id="fillin">
-    <!-- 头部 -->
-    <header class="mint-header">
-      <span></span>填写资料
-    </header>
-
-    <div class='fi-top'>
-      <div class='bd-t'></div>
-      <div class='item'>
-        <div class='item-label'>微信号</div>
-        <input placeholder='在微信底部【我】中查看' name="wechat_id"  class='item-input' />
-        <div class='bd-b'></div>
-      </div>
-      <div class='item'>
-        <div class='item-label'>图片验证码</div>
-        <input placeholder='请输入图片中验证码' type='number'  class='item-input' />
-        <div class='item-other' @click="changeCode">
-          <img src='http://mpa.xinyuepage.com/captcha?token=AtB38KMI03rYjwCkJ7uWBc6O9LyWZe7lMDa4CpkMcXG5UZRy4MHaJidHI5kGqVlc&amp;a=487'></img>
-        </div>
-        <div class='bd-b'></div>
-      </div>
-      <div class='item'>
-        <div class='item-label'>手机号</div>
-        <input placeholder='请输入手机号' type='number' name="phone" v-model="params.phone" class='item-input' />
-        <button class='item-other-phone' @click="getCode">{{getcode}}</button>
-        <div class='bd-b'></div>
-      </div>
-      <div class='item'>
-        <div class='item-label'>短信验证码</div>
-          <input placeholder='请输入短信验证码' type='number' name="phoneSmsCaptcha" v-model="params.phoneSmsCaptcha" class='item-input' />
-        <div class='bd-b'></div>
-      </div>
-      <div class='item'>
-        <div class='item-label'>服务地区</div>
-        <!-- <input hidden='true' name='region' value='吉林' /> -->
-        <input class='item-pick' disabled='true' v-model='params.areaInfo' />
-        <button class='item-other-phone' @click="getLocation">获取位置</button>
-        <div class='bd-b'></div>
-      </div>
-    </div>
-
-    <div class='fi-submit'>
-      <button @click="submitForm">提交</button>
-    </div>
-
-    <div class='fi-bottom'>
-      <span class='title'>获取不到短信验证码怎么办?</span>
-      <div class='des'>1.请在倒计时结束后再次点击“获取验证码”按钮进行重试;</div>
-      <div class='des'>2.如果重试3次以上依然没有收到,可能您的手机里安装了短信拦截类软件,请关闭该类软件后再重试;</div>
-    </div>
-  </div>
-	<div style="display: block; width:1px; height:1px; overflow: hidden;">
-		<a target="cyxyv" href="https://v.yunaq.com/certificate?domain=mpa.xinyueyouxi.com&from=label&code=90020"><img src="https://aqyzmedia.yunaq.com/labels/label_sm_90020.png"></a>
-	</div>
-  <script src="js/jquery-2.1.4.min.js"></script>
-  <script src="js/jweixin-1.3.2.js"></script>
-  <script src="js/vue.js"></script>
-  <script src="js/popup.js"></script>
-  <script src="js/rem.js"></script>
-  <script type="text/javascript">
-    document.write('<script type="text/javascript" charset="UTF-8" src="js/common.js?v='+new Date().getTime()+'"><\/script>');
-    document.write('<script type="text/javascript" charset="UTF-8" src="js/page/fillin.js?v='+new Date().getTime()+'"><\/script>');
-  </script>
-</body>
-</html>
->>>>>>> cb3d90368273b7ba0ce18e05382d00be6933949f

+ 0 - 873
businessweb-user/home.html

@@ -1,873 +0,0 @@
-<<<<<<< HEAD
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <title>心悦分销平台</title>
-  <link rel="shortcut icon" href="favicon.ico" />
-  <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0"/>
-  <link rel="stylesheet" type="text/css" href="css/common.css">
-  <link rel="stylesheet" type="text/css" href="css/popup.css">
-  <link rel="stylesheet" type="text/css" href="css/style.css">
-</head>
-<body>
-	<div id="home">
-        <div
-            class="alertbg"
-            v-show="
-                realNameShow ||
-                    cardActiveShow ||
-                    diamondActiveShow ||
-                    incardShow ||
-                    inDiamondShow ||
-                    reviewShow
-            "
-            @click="closeAlert"
-        ></div>
-
-        <div class="userinfo" :class="isBig ? 'userinfobig' : ''">
-            <div class="userinfo-top">
-                <div class="headimg" bindtap="toInfo">
-                    <!-- <router-link to="/info"> -->
-                        <img
-                            src="infoData.avatar || headbg"
-                            title="头像"
-                            alt="头像"
-                            @click="gotoInfo"
-                        />
-                    <!-- </router-link> -->
-                </div>
-            </div>
-            <div class="info-name">
-                1
-            </div>
-            <ul class="info-bottom">
-                <li class="bottom-list">分销商ID 12345</li>
-                <li class="bottom-list">元宝 1</li>
-                <!-- <li class='bottom-list'>抽奖卡 {{infoData.lottery}}</li> -->
-                <!-- <li class='bottom-list'>
-          领取上月赠卡
-          <img src='../assets/img/help.png' />
-        </li> -->
-            </ul>
-        </div>
-
-        <div class="cardinfo">
-            <div class="table mg-t-b3" :class="isBig ? 'mg-t-b4' : ''">
-                <div class="tr bg-w">
-                    <div class="th c-snow w-b20">aa</div>
-                    <div class="th">上月进货</div>
-                    <div class="th">本月进货</div>
-                    <div class="th ">当前库存</div>
-                </div>
-                <div class="tr">
-                    <div class="td w-b20">房卡</div>
-                    <div class="td c-red">{{ infoData.preMonth.roomcard }}</div>
-                    <div class="td c-blue">
-                        {{ infoData.theMonth.roomcard }}
-                    </div>
-                    <div class="td c-red">{{ infoData.repertory }}</div>
-                </div>
-                <div class="tr">
-                    <div class="td w-b20">钻石</div>
-                    <div class="td c-red">{{ infoData.preMonth.diamonds }}</div>
-                    <div class="td c-blue">
-                        {{ infoData.theMonth.diamonds }}
-                    </div>
-                    <div class="td c-red">{{ infoData.diamonds }}</div>
-                </div>
-            </div>
-            <div class="cardrecord pr" :class="isBig ? 'mg-t-b2' : ''">
-                <div class="des">
-                    {{ info.awardInfo1Prefix }}
-                    <span class="red">{{ infoData.monthBuyCount }}</span
-                    >{{ info.awardInfo1Suffix }}
-                    <span
-                        class="red underline"
-                        v-if="infoData.award"
-                        @click="receiveAward"
-                        >领取上月赠卡</span
-                    >
-                </div>
-                <div class="des">
-                    {{ info.awardInfo2Prefix }}
-                    <span class="red">{{ infoData.nextTargetBuyCount }}</span
-                    >{{ info.awardInfo2 }}
-                    <span class="red">{{ infoData.nextAward }}</span
-                    >{{ info.awardInfo2Suffix }}
-                </div>
-            </div>
-            <!-- <div class='bd-b'></div> -->
-        </div>
-
-        <div class="domain">
-            <div class="domain-itembox">
-                <div class="domain-item" @click="clickPurchase('card')">
-                    <img
-                        src="../assets/img/index_icon1.png"
-                        :class="isBig ? 'big' : ''"
-                    />
-                    <span>房卡进货</span>
-                </div>
-                <div class="domain-item" @click="showIncard('card')">
-                    <img
-                        src="../assets/img/index_icon2.png"
-                        :class="isBig ? 'big' : ''"
-                    />
-                    <span>玩家充卡</span>
-                </div>
-                <router-link :to="searchUrl" tag="div" class="domain-item">
-                    <img
-                        src="../assets/img/index_icon3.png"
-                        :class="isBig ? 'big' : ''"
-                        title="用卡查询"
-                        alt="用卡查询icon"
-                    />
-                    <span>用卡查询</span>
-                </router-link>
-            </div>
-
-            <div class="domain-itembox">
-                <div class="domain-item" @click="clickPurchase('diamonds')">
-                    <img
-                        src="../assets/img/index_icon4.png"
-                        :class="isBig ? 'big' : ''"
-                    />
-                    <span>钻石进货</span>
-                </div>
-                <div class="domain-item" @click="showIncard('diamonds')">
-                    <img
-                        src="../assets/img/index_icon5.png"
-                        :class="isBig ? 'big' : ''"
-                    />
-                    <span>玩家充钻</span>
-                </div>
-                <router-link
-                    :to="searchUrl_diamonds"
-                    tag="div"
-                    class="domain-item"
-                >
-                    <img
-                        src="../assets/img/index_icon6.png"
-                        :class="isBig ? 'big' : ''"
-                        title="钻石查询"
-                        alt="钻石查询icon"
-                    />
-                    <span>钻石查询</span>
-                </router-link>
-            </div>
-        </div>
-
-        <!-- 活动广告 -->
-        <div class="lottery-link" v-if="info.displayAdvertising">
-            <img :src="infoData.app_mg" alt="lottery" title="lottery" />
-        </div>
-
-        <!--  实名认证  -->
-        <transition enter-active-class="fadeIn" leave-active-class="fadeOut">
-            <div class="realname hide" v-show="realNameShow">
-                <div class="index-title">
-                    实名认证
-                    <div class="bd-b"></div>
-                </div>
-                <div class="index-inputs">
-                    <div class="index-inputs-item">
-                        <div class="inputs-label">姓 名</div>
-                        <input
-                            placeholder="请输入真实姓名"
-                            name="name"
-                            class="inputs-input"
-                            type="text"
-                            v-model="realName.name"
-                        />
-                        <div class="bd-b"></div>
-                    </div>
-                    <div class="index-inputs-item">
-                        <div class="inputs-label">身份证</div>
-                        <input
-                            placeholder="请输入身份证号码"
-                            type="text"
-                            name="idcard"
-                            class="inputs-input"
-                            v-model="realName.idcard"
-                        />
-                        <div class="bd-b"></div>
-                    </div>
-                </div>
-                <div class="index-bottom">
-                    <button @click="closeAlert">取消</button>
-                    <button class="sure" @click="submitName">确定</button>
-                </div>
-            </div>
-        </transition>
-
-        <!-- 进卡活动 -->
-        <transition
-            enter-active-class="slideInUp"
-            leave-active-class="slideOutDown"
-        >
-            <!--  进卡活动  -->
-            <div class="incard" v-show="cardActiveShow">
-                <div class="title">
-                    进卡活动
-                    <div class="bd-b"></div>
-                </div>
-                <div class="rules">
-                    <div class="rules-label">本月累计进卡</div>
-                    <ul class="rules-des">
-                        <li
-                            v-for="(item, index) in awardActive.notice"
-                            :key="index"
-                        >
-                            {{ item }}
-                        </li>
-                    </ul>
-                </div>
-                <span class="rules-tip">{{ awardActive.tip }}</span>
-                <div class="now-advantage">{{ awardActive.tip2 }}</div>
-
-                <div class="price">
-                    <div class="price-item">
-                        <div class="left">套餐</div>
-                        <div class="right">
-                            {{ comboPropCount }}张, {{ needMoney }}元
-                        </div>
-                        <div class="bd-b"></div>
-                    </div>
-                    <div class="price-item">
-                        <div class="left">数量(套)</div>
-                        <div class="right">
-                            <span class="control" @click="reduceCard">-</span>
-                            <span class="num">{{ goodsNum }}</span>
-                            <span class="control" @click="addCard">+</span>
-                        </div>
-                        <div class="bd-b"></div>
-                    </div>
-                    <div class="price-item">
-                        <div class="left">总价(元)</div>
-                        <div class="right">{{ totalMoney }}</div>
-                        <div class="bd-b"></div>
-                    </div>
-                </div>
-
-                <div class="index-bottom">
-                    <button @click="closeAlert">取消</button>
-                    <button class="sure" @click="buyCard('card')">进卡</button>
-                </div>
-            </div>
-        </transition>
-
-        <!-- 钻石进货 -->
-        <transition
-            enter-active-class="slideInUp"
-            leave-active-class="slideOutDown"
-        >
-            <!--  钻石进货  -->
-            <div class="incard" v-show="diamondActiveShow">
-                <div class="title">
-                    钻石进货
-                    <div class="bd-b"></div>
-                </div>
-
-                <div class="price">
-                    <div class="price-item">
-                        <div class="left">套餐</div>
-                        <div class="right">
-                            {{ comboPropCount }}个, {{ needMoney }}元
-                        </div>
-                        <div class="bd-b"></div>
-                    </div>
-                    <div class="price-item">
-                        <div class="left">数量(套)</div>
-                        <div class="right">
-                            <span class="control" @click="reduceCard">-</span>
-                            <span class="num">{{ goodsNum }}</span>
-                            <span class="control" @click="addCard">+</span>
-                        </div>
-                        <div class="bd-b"></div>
-                    </div>
-                    <div class="price-item">
-                        <div class="left">总价(元)</div>
-                        <div class="right">{{ totalMoney }}</div>
-                        <div class="bd-b"></div>
-                    </div>
-                </div>
-
-                <div class="index-bottom">
-                    <button @click="closeAlert">取消</button>
-                    <button class="sure" @click="buyCard('diamonds')">
-                        进卡
-                    </button>
-                </div>
-            </div>
-        </transition>
-
-        <!--  玩家充卡  -->
-        <transition
-            enter-active-class="slideInUp"
-            leave-active-class="slideOutDown"
-        >
-            <div class="player-incard" v-if="incardShow || inDiamondShow">
-                <div class="index-title">
-                    {{ incardShow ? "玩家充卡" : "玩家充钻" }}
-                </div>
-                <div class="index-inputs">
-                    <div class="index-inputs-item">
-                        <div class="inputs-label">游戏ID</div>
-                        <input
-                            id="playId"
-                            placeholder="在此输入玩家ID"
-                            class="inputs-input"
-                            name="game_user_id"
-                            type="number"
-                            v-model="incard.game_user_id"
-                            @focus="inputFocus"
-                            @blur="inputBlur"
-                        />
-                        <div class="bd-b"></div>
-                    </div>
-                    <div class="index-inputs-item">
-                        <div class="inputs-label">数 量</div>
-                        <input
-                            id="number"
-                            placeholder="在此输入充卡数量"
-                            class="inputs-input"
-                            name="number"
-                            type="number"
-                            v-model="incard.add_number"
-                            @focus="inputFocus"
-                            @blur="inputBlur"
-                        />
-                        <div class="bd-b"></div>
-                    </div>
-                </div>
-                <div class="index-bottom">
-                    <button
-                        @click="
-                            incardShow = false;
-                            inDiamondShow = false;
-                        "
-                    >
-                        取消
-                    </button>
-                    <button class="sure" @click="showReview">充值</button>
-                </div>
-            </div>
-        </transition>
-
-        <!--  确认信息  -->
-        <transition
-            enter-active-class="slideInUp"
-            leave-active-class="slideOutDown"
-        >
-            <div class="player-incard" v-show="reviewShow">
-                <div class="index-title">
-                    请核对以下信息
-                </div>
-
-                <div class="playerInfo">
-                    <div class="left">
-                        <div class="playerInfo-item">
-                            <div class="label">游戏ID</div>
-                            <div class="content">{{ incard.game_user_id }}</div>
-                            <div class="bd-b"></div>
-                        </div>
-                        <div class="playerInfo-item">
-                            <div class="label">昵 称</div>
-                            <div class="content">{{ incard.name }}</div>
-                            <div class="bd-b"></div>
-                        </div>
-                    </div>
-                    <div class="right">
-                        <img
-                            :src="incard.avatar || headbg"
-                            alt="头像"
-                            title="头像"
-                        />
-                    </div>
-                    <div class="playerInfo-item">
-                        <div class="label">数 量</div>
-                        <div class="content">{{ incard.add_number }}</div>
-                        <div class="bd-b"></div>
-                    </div>
-                </div>
-
-                <div class="index-bottom">
-                    <button @click="reviewShow = false">取消</button>
-                    <button class="sure" @click="palyerInCard">确定</button>
-                </div>
-            </div>
-        </transition>
-
-    <!-- 公告弹窗 -->
-    <div class="mask hide" v-show="publicIsShow"></div>
-        <transition enter-active-class="fadeIn " leave-active-class="fadeOut">
-            <div class="agreetit hide" style="height: 8rem; top: 25%;" v-show="publicIsShow">
-                <div class="title">{{publicData.title || '公告'}}</div>
-                <div class="agreetit-main">
-          <p v-html="publicData.content || '暂无公告'"></p>
-                </div>
-                <div class="bottom">
-                    <div class="cancle" @click="closePublic">关闭</div>
-                    <div class="sure" @click="gotoPublic">查看</div>
-                </div>
-            </div>
-        </transition>
-        <div id="opacity">
-            <div class="ios">
-                <img src="../assets/img/ios-opacity_01.png" alt="">
-            </div>
-        </div>
-    </div>
-	<div style="display: block; width:1px; height:1px; overflow: hidden;">
-		<a target="cyxyv" href="https://v.yunaq.com/certificate?domain=mpa.xinyueyouxi.com&from=label&code=90020"><img src="https://aqyzmedia.yunaq.com/labels/label_sm_90020.png"></a>
-	</div>
-  <script src="js/jquery-2.1.4.min.js"></script>
-  <script src="js/jweixin-1.3.2.js"></script>
-  <script src="js/vue.js"></script>
-  <script src="js/popup.js"></script>
-  <script src="js/rem.js"></script>
-  <script type="text/javascript">
-    document.write('<script type="text/javascript" charset="UTF-8" src="js/common.js?v='+new Date().getTime()+'"><\/script>');
-    document.write('<script type="text/javascript" charset="UTF-8" src="js/page/fillin.js?v='+new Date().getTime()+'"><\/script>');
-  </script>
-</body>
-</html>
-=======
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <title>心悦分销平台</title>
-  <link rel="shortcut icon" href="favicon.ico" />
-  <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0"/>
-  <link rel="stylesheet" type="text/css" href="css/common.css">
-  <link rel="stylesheet" type="text/css" href="css/popup.css">
-  <link rel="stylesheet" type="text/css" href="css/style.css">
-</head>
-<body>
-	<div id="home">
-        <div
-            class="alertbg"
-            v-show="
-                realNameShow ||
-                    cardActiveShow ||
-                    diamondActiveShow ||
-                    incardShow ||
-                    inDiamondShow ||
-                    reviewShow
-            "
-            @click="closeAlert"
-        ></div>
-
-        <div class="userinfo" :class="isBig ? 'userinfobig' : ''">
-            <div class="userinfo-top">
-                <div class="headimg" bindtap="toInfo">
-                    <!-- <router-link to="/info"> -->
-                        <img
-                            src="infoData.avatar || headbg"
-                            title="头像"
-                            alt="头像"
-                            @click="gotoInfo"
-                        />
-                    <!-- </router-link> -->
-                </div>
-            </div>
-            <div class="info-name">
-                1
-            </div>
-            <ul class="info-bottom">
-                <li class="bottom-list">分销商ID 12345</li>
-                <li class="bottom-list">元宝 1</li>
-                <!-- <li class='bottom-list'>抽奖卡 {{infoData.lottery}}</li> -->
-                <!-- <li class='bottom-list'>
-          领取上月赠卡
-          <img src='../assets/img/help.png' />
-        </li> -->
-            </ul>
-        </div>
-
-        <div class="cardinfo">
-            <div class="table mg-t-b3" :class="isBig ? 'mg-t-b4' : ''">
-                <div class="tr bg-w">
-                    <div class="th c-snow w-b20">aa</div>
-                    <div class="th">上月进货</div>
-                    <div class="th">本月进货</div>
-                    <div class="th ">当前库存</div>
-                </div>
-                <div class="tr">
-                    <div class="td w-b20">房卡</div>
-                    <div class="td c-red">{{ infoData.preMonth.roomcard }}</div>
-                    <div class="td c-blue">
-                        {{ infoData.theMonth.roomcard }}
-                    </div>
-                    <div class="td c-red">{{ infoData.repertory }}</div>
-                </div>
-                <div class="tr">
-                    <div class="td w-b20">钻石</div>
-                    <div class="td c-red">{{ infoData.preMonth.diamonds }}</div>
-                    <div class="td c-blue">
-                        {{ infoData.theMonth.diamonds }}
-                    </div>
-                    <div class="td c-red">{{ infoData.diamonds }}</div>
-                </div>
-            </div>
-            <div class="cardrecord pr" :class="isBig ? 'mg-t-b2' : ''">
-                <div class="des">
-                    {{ info.awardInfo1Prefix }}
-                    <span class="red">{{ infoData.monthBuyCount }}</span
-                    >{{ info.awardInfo1Suffix }}
-                    <span
-                        class="red underline"
-                        v-if="infoData.award"
-                        @click="receiveAward"
-                        >领取上月赠卡</span
-                    >
-                </div>
-                <div class="des">
-                    {{ info.awardInfo2Prefix }}
-                    <span class="red">{{ infoData.nextTargetBuyCount }}</span
-                    >{{ info.awardInfo2 }}
-                    <span class="red">{{ infoData.nextAward }}</span
-                    >{{ info.awardInfo2Suffix }}
-                </div>
-            </div>
-            <!-- <div class='bd-b'></div> -->
-        </div>
-
-        <div class="domain">
-            <div class="domain-itembox">
-                <div class="domain-item" @click="clickPurchase('card')">
-                    <img
-                        src="../assets/img/index_icon1.png"
-                        :class="isBig ? 'big' : ''"
-                    />
-                    <span>房卡进货</span>
-                </div>
-                <div class="domain-item" @click="showIncard('card')">
-                    <img
-                        src="../assets/img/index_icon2.png"
-                        :class="isBig ? 'big' : ''"
-                    />
-                    <span>玩家充卡</span>
-                </div>
-                <router-link :to="searchUrl" tag="div" class="domain-item">
-                    <img
-                        src="../assets/img/index_icon3.png"
-                        :class="isBig ? 'big' : ''"
-                        title="用卡查询"
-                        alt="用卡查询icon"
-                    />
-                    <span>用卡查询</span>
-                </router-link>
-            </div>
-
-            <div class="domain-itembox">
-                <div class="domain-item" @click="clickPurchase('diamonds')">
-                    <img
-                        src="../assets/img/index_icon4.png"
-                        :class="isBig ? 'big' : ''"
-                    />
-                    <span>钻石进货</span>
-                </div>
-                <div class="domain-item" @click="showIncard('diamonds')">
-                    <img
-                        src="../assets/img/index_icon5.png"
-                        :class="isBig ? 'big' : ''"
-                    />
-                    <span>玩家充钻</span>
-                </div>
-                <router-link
-                    :to="searchUrl_diamonds"
-                    tag="div"
-                    class="domain-item"
-                >
-                    <img
-                        src="../assets/img/index_icon6.png"
-                        :class="isBig ? 'big' : ''"
-                        title="钻石查询"
-                        alt="钻石查询icon"
-                    />
-                    <span>钻石查询</span>
-                </router-link>
-            </div>
-        </div>
-
-        <!-- 活动广告 -->
-        <div class="lottery-link" v-if="info.displayAdvertising">
-            <img :src="infoData.app_mg" alt="lottery" title="lottery" />
-        </div>
-
-        <!--  实名认证  -->
-        <transition enter-active-class="fadeIn" leave-active-class="fadeOut">
-            <div class="realname hide" v-show="realNameShow">
-                <div class="index-title">
-                    实名认证
-                    <div class="bd-b"></div>
-                </div>
-                <div class="index-inputs">
-                    <div class="index-inputs-item">
-                        <div class="inputs-label">姓 名</div>
-                        <input
-                            placeholder="请输入真实姓名"
-                            name="name"
-                            class="inputs-input"
-                            type="text"
-                            v-model="realName.name"
-                        />
-                        <div class="bd-b"></div>
-                    </div>
-                    <div class="index-inputs-item">
-                        <div class="inputs-label">身份证</div>
-                        <input
-                            placeholder="请输入身份证号码"
-                            type="text"
-                            name="idcard"
-                            class="inputs-input"
-                            v-model="realName.idcard"
-                        />
-                        <div class="bd-b"></div>
-                    </div>
-                </div>
-                <div class="index-bottom">
-                    <button @click="closeAlert">取消</button>
-                    <button class="sure" @click="submitName">确定</button>
-                </div>
-            </div>
-        </transition>
-
-        <!-- 进卡活动 -->
-        <transition
-            enter-active-class="slideInUp"
-            leave-active-class="slideOutDown"
-        >
-            <!--  进卡活动  -->
-            <div class="incard" v-show="cardActiveShow">
-                <div class="title">
-                    进卡活动
-                    <div class="bd-b"></div>
-                </div>
-                <div class="rules">
-                    <div class="rules-label">本月累计进卡</div>
-                    <ul class="rules-des">
-                        <li
-                            v-for="(item, index) in awardActive.notice"
-                            :key="index"
-                        >
-                            {{ item }}
-                        </li>
-                    </ul>
-                </div>
-                <span class="rules-tip">{{ awardActive.tip }}</span>
-                <div class="now-advantage">{{ awardActive.tip2 }}</div>
-
-                <div class="price">
-                    <div class="price-item">
-                        <div class="left">套餐</div>
-                        <div class="right">
-                            {{ comboPropCount }}张, {{ needMoney }}元
-                        </div>
-                        <div class="bd-b"></div>
-                    </div>
-                    <div class="price-item">
-                        <div class="left">数量(套)</div>
-                        <div class="right">
-                            <span class="control" @click="reduceCard">-</span>
-                            <span class="num">{{ goodsNum }}</span>
-                            <span class="control" @click="addCard">+</span>
-                        </div>
-                        <div class="bd-b"></div>
-                    </div>
-                    <div class="price-item">
-                        <div class="left">总价(元)</div>
-                        <div class="right">{{ totalMoney }}</div>
-                        <div class="bd-b"></div>
-                    </div>
-                </div>
-
-                <div class="index-bottom">
-                    <button @click="closeAlert">取消</button>
-                    <button class="sure" @click="buyCard('card')">进卡</button>
-                </div>
-            </div>
-        </transition>
-
-        <!-- 钻石进货 -->
-        <transition
-            enter-active-class="slideInUp"
-            leave-active-class="slideOutDown"
-        >
-            <!--  钻石进货  -->
-            <div class="incard" v-show="diamondActiveShow">
-                <div class="title">
-                    钻石进货
-                    <div class="bd-b"></div>
-                </div>
-
-                <div class="price">
-                    <div class="price-item">
-                        <div class="left">套餐</div>
-                        <div class="right">
-                            {{ comboPropCount }}个, {{ needMoney }}元
-                        </div>
-                        <div class="bd-b"></div>
-                    </div>
-                    <div class="price-item">
-                        <div class="left">数量(套)</div>
-                        <div class="right">
-                            <span class="control" @click="reduceCard">-</span>
-                            <span class="num">{{ goodsNum }}</span>
-                            <span class="control" @click="addCard">+</span>
-                        </div>
-                        <div class="bd-b"></div>
-                    </div>
-                    <div class="price-item">
-                        <div class="left">总价(元)</div>
-                        <div class="right">{{ totalMoney }}</div>
-                        <div class="bd-b"></div>
-                    </div>
-                </div>
-
-                <div class="index-bottom">
-                    <button @click="closeAlert">取消</button>
-                    <button class="sure" @click="buyCard('diamonds')">
-                        进卡
-                    </button>
-                </div>
-            </div>
-        </transition>
-
-        <!--  玩家充卡  -->
-        <transition
-            enter-active-class="slideInUp"
-            leave-active-class="slideOutDown"
-        >
-            <div class="player-incard" v-if="incardShow || inDiamondShow">
-                <div class="index-title">
-                    {{ incardShow ? "玩家充卡" : "玩家充钻" }}
-                </div>
-                <div class="index-inputs">
-                    <div class="index-inputs-item">
-                        <div class="inputs-label">游戏ID</div>
-                        <input
-                            id="playId"
-                            placeholder="在此输入玩家ID"
-                            class="inputs-input"
-                            name="game_user_id"
-                            type="number"
-                            v-model="incard.game_user_id"
-                            @focus="inputFocus"
-                            @blur="inputBlur"
-                        />
-                        <div class="bd-b"></div>
-                    </div>
-                    <div class="index-inputs-item">
-                        <div class="inputs-label">数 量</div>
-                        <input
-                            id="number"
-                            placeholder="在此输入充卡数量"
-                            class="inputs-input"
-                            name="number"
-                            type="number"
-                            v-model="incard.add_number"
-                            @focus="inputFocus"
-                            @blur="inputBlur"
-                        />
-                        <div class="bd-b"></div>
-                    </div>
-                </div>
-                <div class="index-bottom">
-                    <button
-                        @click="
-                            incardShow = false;
-                            inDiamondShow = false;
-                        "
-                    >
-                        取消
-                    </button>
-                    <button class="sure" @click="showReview">充值</button>
-                </div>
-            </div>
-        </transition>
-
-        <!--  确认信息  -->
-        <transition
-            enter-active-class="slideInUp"
-            leave-active-class="slideOutDown"
-        >
-            <div class="player-incard" v-show="reviewShow">
-                <div class="index-title">
-                    请核对以下信息
-                </div>
-
-                <div class="playerInfo">
-                    <div class="left">
-                        <div class="playerInfo-item">
-                            <div class="label">游戏ID</div>
-                            <div class="content">{{ incard.game_user_id }}</div>
-                            <div class="bd-b"></div>
-                        </div>
-                        <div class="playerInfo-item">
-                            <div class="label">昵 称</div>
-                            <div class="content">{{ incard.name }}</div>
-                            <div class="bd-b"></div>
-                        </div>
-                    </div>
-                    <div class="right">
-                        <img
-                            :src="incard.avatar || headbg"
-                            alt="头像"
-                            title="头像"
-                        />
-                    </div>
-                    <div class="playerInfo-item">
-                        <div class="label">数 量</div>
-                        <div class="content">{{ incard.add_number }}</div>
-                        <div class="bd-b"></div>
-                    </div>
-                </div>
-
-                <div class="index-bottom">
-                    <button @click="reviewShow = false">取消</button>
-                    <button class="sure" @click="palyerInCard">确定</button>
-                </div>
-            </div>
-        </transition>
-
-    <!-- 公告弹窗 -->
-    <div class="mask hide" v-show="publicIsShow"></div>
-        <transition enter-active-class="fadeIn " leave-active-class="fadeOut">
-            <div class="agreetit hide" style="height: 8rem; top: 25%;" v-show="publicIsShow">
-                <div class="title">{{publicData.title || '公告'}}</div>
-                <div class="agreetit-main">
-          <p v-html="publicData.content || '暂无公告'"></p>
-                </div>
-                <div class="bottom">
-                    <div class="cancle" @click="closePublic">关闭</div>
-                    <div class="sure" @click="gotoPublic">查看</div>
-                </div>
-            </div>
-        </transition>
-        <div id="opacity">
-            <div class="ios">
-                <img src="../assets/img/ios-opacity_01.png" alt="">
-            </div>
-        </div>
-    </div>
-	<div style="display: block; width:1px; height:1px; overflow: hidden;">
-		<a target="cyxyv" href="https://v.yunaq.com/certificate?domain=mpa.xinyueyouxi.com&from=label&code=90020"><img src="https://aqyzmedia.yunaq.com/labels/label_sm_90020.png"></a>
-	</div>
-  <script src="js/jquery-2.1.4.min.js"></script>
-  <script src="js/jweixin-1.3.2.js"></script>
-  <script src="js/vue.js"></script>
-  <script src="js/popup.js"></script>
-  <script src="js/rem.js"></script>
-  <script type="text/javascript">
-    document.write('<script type="text/javascript" charset="UTF-8" src="js/common.js?v='+new Date().getTime()+'"><\/script>');
-    document.write('<script type="text/javascript" charset="UTF-8" src="js/page/fillin.js?v='+new Date().getTime()+'"><\/script>');
-  </script>
-</body>
-</html>
->>>>>>> cb3d90368273b7ba0ce18e05382d00be6933949f

二进制
businessweb-user/images/back_left.png


二进制
businessweb-user/images/choose.png


二进制
businessweb-user/images/choose_toght.png


二进制
businessweb-user/images/default_head.png


二进制
businessweb-user/images/er.jpg


二进制
businessweb-user/images/error.png


二进制
businessweb-user/images/favicon.ico


二进制
businessweb-user/images/gift_gray.png


二进制
businessweb-user/images/gift_light.png


二进制
businessweb-user/images/green_logo.png


二进制
businessweb-user/images/home_gray.png


二进制
businessweb-user/images/home_light.png


二进制
businessweb-user/images/ic_huangguan_yellow.png


二进制
businessweb-user/images/in_wow.png


二进制
businessweb-user/images/index_icon1.png


二进制
businessweb-user/images/index_icon2.png


二进制
businessweb-user/images/index_icon3.png


二进制
businessweb-user/images/index_icon4.png


二进制
businessweb-user/images/index_icon5.png


二进制
businessweb-user/images/index_icon6.png


二进制
businessweb-user/images/ios-opacity_01.png


二进制
businessweb-user/images/login_ico_pwd.png


二进制
businessweb-user/images/loginname.png


二进制
businessweb-user/images/official_gray.png


二进制
businessweb-user/images/official_light.png


二进制
businessweb-user/images/player_recharge_wow.png


二进制
businessweb-user/images/query.png


二进制
businessweb-user/images/san.jpg


二进制
businessweb-user/images/weixin.png


二进制
businessweb-user/images/xinjian.png


二进制
businessweb-user/images/xinjiankai.png


二进制
businessweb-user/images/xinyue_login.png


二进制
businessweb-user/images/xinyue_start.png


二进制
businessweb-user/images/yi.jpg


+ 0 - 151
businessweb-user/index.html

@@ -1,151 +0,0 @@
-<<<<<<< HEAD
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <title>心悦分销平台</title>
-  <link rel="shortcut icon" href="favicon.ico" />
-  <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0"/>
-  <link rel="stylesheet" type="text/css" href="css/common.css">
-  <link rel="stylesheet" type="text/css" href="css/popup.css">
-  <link rel="stylesheet" type="text/css" href="css/style.css">
-</head>
-<body>
-	<div id="login">
-    <div id="bg">
-      <img src='images/yi.jpg' class='bg show'/>
-      <img src='images/er.jpg' class='bg'/>
-      <img src='images/san.jpg' class='bg'/>
-    </div>
-    <div class="main">
-      <div class="introduce">心悦游戏分销商介绍?</div>
-      <div class='loginbtn' @click="login" id="login-but">
-        <img src='images/weixin.png' />
-        微信登录
-      </div>
-      <div class='loginbtn hide' id="card">
-        付款直接开通(老司机-房卡)
-      </div>
-      <div class='loginbtn hide' style="background-color: #a66515;" id="diamond">
-        付款直接开通(老司机-钻石)
-      </div>
-
-      <div class='knowdetails hide'>
-        注册了解详情
-      </div> 
-      <div class="agreement hide" >
-        <div class="cb">
-          <img src="images/choose_toght.png" alt="勾" class="icon-right" />
-          <img src="images/choose.png" alt="勾" class="icon-right"/>
-          <input type="checkbox" autocomplete="off" id="checkbox" class="ag-checkbox"/>
-        </div>
-        <label for="checkbox" class="cb-label" style="color: #fff; font-size: .38rem;">我已阅读并同意</label>
-        <span @click="showAgreement">《分销商合作协议》</span>
-      </div>
-
-      <transition enter-active-class="fadeIn" leave-active-class="fadeOut">
-        <div class='agreetit hide'>
-          <div class='title'>温馨提示</div>
-          <div class='agreetit-main'>
-            <iframe src='http://mpa.xinyuepage.com/agreement' width="100%" height="98.3%" frameborder="0"></iframe>
-          </div>
-          <div class='bottom'>
-            <div class='cancle' @click="cancleAgree">取消</div>
-            <div class='sure' @click="sureAgree">确定</div>
-          </div>
-        </div>
-      </transition>
-    </div>
-  </div>
-	<div style="display: block; width:1px; height:1px; overflow: hidden;">
-		<a target="cyxyv" href="https://v.yunaq.com/certificate?domain=mpa.xinyueyouxi.com&from=label&code=90020"><img src="https://aqyzmedia.yunaq.com/labels/label_sm_90020.png"></a>
-	</div>
-  <script src="js/jquery-2.1.4.min.js"></script>
-  <script src="js/jweixin-1.3.2.js"></script>
-  <script src="js/vue.js"></script>
-  <script src="js/popup.js"></script>
-  <script src="js/rem.js"></script>
-  <script type="text/javascript">
-    document.write('<script type="text/javascript" charset="UTF-8" src="js/common.js?v='+new Date().getTime()+'"><\/script>');
-    document.write('<script type="text/javascript" charset="UTF-8" src="js/page/login.js?v='+new Date().getTime()+'"><\/script>');
-    // document.write('<link rel="stylesheet" type="text/css" href="js/page/login.js?v='+Math.random()+'"/>');
-  </script>
-</body>
-</html>
-=======
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <meta charset="utf-8">
-  <title>心悦分销平台</title>
-  <link rel="shortcut icon" href="favicon.ico" />
-  <meta name="viewport" content="maximum-scale=1.0,minimum-scale=1.0,user-scalable=0,width=device-width,initial-scale=1.0"/>
-  <link rel="stylesheet" type="text/css" href="css/common.css">
-  <link rel="stylesheet" type="text/css" href="css/popup.css">
-  <link rel="stylesheet" type="text/css" href="css/style.css">
-</head>
-<body>
-	<div id="login">
-    <div id="bg">
-      <img src='images/yi.jpg' class='bg show'/>
-      <img src='images/er.jpg' class='bg'/>
-      <img src='images/san.jpg' class='bg'/>
-    </div>
-    <div class="main">
-      <div class="introduce">心悦游戏分销商介绍?</div>
-      <div class='loginbtn' @click="login" id="login-but">
-        <img src='images/weixin.png' />
-        微信登录
-      </div>
-      <div class='loginbtn hide' id="card">
-        付款直接开通(老司机-房卡)
-      </div>
-      <div class='loginbtn hide' style="background-color: #a66515;" id="diamond">
-        付款直接开通(老司机-钻石)
-      </div>
-
-      <div class='knowdetails hide'>
-        注册了解详情
-      </div> 
-      <div class="agreement hide" >
-        <div class="cb">
-          <img src="images/choose_toght.png" alt="勾" class="icon-right" />
-          <img src="images/choose.png" alt="勾" class="icon-right"/>
-          <input type="checkbox" autocomplete="off" id="checkbox" class="ag-checkbox"/>
-        </div>
-        <label for="checkbox" class="cb-label" style="color: #fff; font-size: .38rem;">我已阅读并同意</label>
-        <span @click="showAgreement">《分销商合作协议》</span>
-      </div>
-
-      <transition enter-active-class="fadeIn" leave-active-class="fadeOut">
-        <div class='agreetit hide'>
-          <div class='title'>温馨提示</div>
-          <div class='agreetit-main'>
-            <iframe src='http://mpa.xinyuepage.com/agreement' width="100%" height="98.3%" frameborder="0"></iframe>
-          </div>
-          <div class='bottom'>
-            <div class='cancle' @click="cancleAgree">取消</div>
-            <div class='sure' @click="sureAgree">确定</div>
-          </div>
-        </div>
-      </transition>
-    </div>
-  </div>
-	<div style="display: block; width:1px; height:1px; overflow: hidden;">
-		<a target="cyxyv" href="https://v.yunaq.com/certificate?domain=mpa.xinyueyouxi.com&from=label&code=90020"><img src="https://aqyzmedia.yunaq.com/labels/label_sm_90020.png"></a>
-	</div>
-  <script src="js/jquery-2.1.4.min.js"></script>
-  <script src="js/jweixin-1.3.2.js"></script>
-  <script src="js/vue.js"></script>
-  <script src="js/popup.js"></script>
-  <script src="js/rem.js"></script>
-  <script type="text/javascript">
-    document.write('<script type="text/javascript" charset="UTF-8" src="js/common.js?v='+new Date().getTime()+'"><\/script>');
-    document.write('<script type="text/javascript" charset="UTF-8" src="js/page/login.js?v='+new Date().getTime()+'"><\/script>');
-    // document.write('<link rel="stylesheet" type="text/css" href="js/page/login.js?v='+Math.random()+'"/>');
-  </script>
-</body>
-</html>
->>>>>>> cb3d90368273b7ba0ce18e05382d00be6933949f

+ 0 - 72
businessweb-user/js/common.js

@@ -1,72 +0,0 @@
-<<<<<<< HEAD
-var baseUrl = 'http://pay-test.278740.cn'
-/**
- * 获取请求ajax数据
- * @param url   请求地址
- * @param type  请求类型
- * @param data  需要发送的数据
- * @param callback  成功回调方法
- * @param alert 成功后是否提示成功信息
- */
-var getAjax = function (url, type, data, callback, alert, noneShow,errorF) {
-    // !noneShow ? showLoading() : null;
-    $.ajax({
-        url: url,
-        type: type,
-        dataType: 'JSON',
-        data: data,
-        success: function (result) {
-            if (result.state == 0) {
-                typeof callback == 'function' ? callback(result) : null;
-                if (alert) Popup.toast(result.msg || " ");
-                // !noneShow ? hideLoading() : null;
-            } else {
-                Popup.toast(result.msg || " ");
-                // !noneShow ? hideLoading() : null;
-                typeof errorF == 'function'?errorF():null;
-            }
-        },
-        error: function (err) {
-            Popup.toast(err || " ");
-            // !noneShow ? hideLoading() : null;
-            typeof errorF == 'function'?errorF():null;
-
-        }
-    })
-=======
-var baseUrl = 'http://pay-test.278740.cn'
-/**
- * 获取请求ajax数据
- * @param url   请求地址
- * @param type  请求类型
- * @param data  需要发送的数据
- * @param callback  成功回调方法
- * @param alert 成功后是否提示成功信息
- */
-var getAjax = function (url, type, data, callback, alert, noneShow,errorF) {
-    // !noneShow ? showLoading() : null;
-    $.ajax({
-        url: url,
-        type: type,
-        dataType: 'JSON',
-        data: data,
-        success: function (result) {
-            if (result.state == 0) {
-                typeof callback == 'function' ? callback(result) : null;
-                if (alert) Popup.toast(result.msg || " ");
-                // !noneShow ? hideLoading() : null;
-            } else {
-                Popup.toast(result.msg || " ");
-                // !noneShow ? hideLoading() : null;
-                typeof errorF == 'function'?errorF():null;
-            }
-        },
-        error: function (err) {
-            Popup.toast(err || " ");
-            // !noneShow ? hideLoading() : null;
-            typeof errorF == 'function'?errorF():null;
-
-        }
-    })
->>>>>>> cb3d90368273b7ba0ce18e05382d00be6933949f
-};

文件差异内容过多而无法显示
+ 0 - 11
businessweb-user/js/jquery-2.1.4.min.js


文件差异内容过多而无法显示
+ 0 - 1
businessweb-user/js/jweixin-1.3.2.js


+ 0 - 408
businessweb-user/js/md5.js

@@ -1,408 +0,0 @@
-<<<<<<< HEAD
-function md5(string) {
-    function md5_RotateLeft(lValue, iShiftBits) {
-        return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));
-    }
-    function md5_AddUnsigned(lX, lY) {
-        var lX4, lY4, lX8, lY8, lResult;
-        lX8 = (lX & 0x80000000);
-        lY8 = (lY & 0x80000000);
-        lX4 = (lX & 0x40000000);
-        lY4 = (lY & 0x40000000);
-        lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF);
-        if (lX4 & lY4) {
-            return (lResult ^ 0x80000000 ^ lX8 ^ lY8);
-        }
-        if (lX4 | lY4) {
-            if (lResult & 0x40000000) {
-                return (lResult ^ 0xC0000000 ^ lX8 ^ lY8);
-            } else {
-                return (lResult ^ 0x40000000 ^ lX8 ^ lY8);
-            }
-        } else {
-            return (lResult ^ lX8 ^ lY8);
-        }
-    }
-    function md5_F(x, y, z) {
-        return (x & y) | ((~x) & z);
-    }
-    function md5_G(x, y, z) {
-        return (x & z) | (y & (~z));
-    }
-    function md5_H(x, y, z) {
-        return (x ^ y ^ z);
-    }
-    function md5_I(x, y, z) {
-        return (y ^ (x | (~z)));
-    }
-    function md5_FF(a, b, c, d, x, s, ac) {
-        a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_F(b, c, d), x), ac));
-        return md5_AddUnsigned(md5_RotateLeft(a, s), b);
-    };
-    function md5_GG(a, b, c, d, x, s, ac) {
-        a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_G(b, c, d), x), ac));
-        return md5_AddUnsigned(md5_RotateLeft(a, s), b);
-    };
-    function md5_HH(a, b, c, d, x, s, ac) {
-        a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_H(b, c, d), x), ac));
-        return md5_AddUnsigned(md5_RotateLeft(a, s), b);
-    };
-    function md5_II(a, b, c, d, x, s, ac) {
-        a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_I(b, c, d), x), ac));
-        return md5_AddUnsigned(md5_RotateLeft(a, s), b);
-    };
-    function md5_ConvertToWordArray(string) {
-        var lWordCount;
-        var lMessageLength = string.length;
-        var lNumberOfWords_temp1 = lMessageLength + 8;
-        var lNumberOfWords_temp2 = (lNumberOfWords_temp1 - (lNumberOfWords_temp1 % 64)) / 64;
-        var lNumberOfWords = (lNumberOfWords_temp2 + 1) * 16;
-        var lWordArray = Array(lNumberOfWords - 1);
-        var lBytePosition = 0;
-        var lByteCount = 0;
-        while (lByteCount < lMessageLength) {
-            lWordCount = (lByteCount - (lByteCount % 4)) / 4;
-            lBytePosition = (lByteCount % 4) * 8;
-            lWordArray[lWordCount] = (lWordArray[lWordCount] | (string.charCodeAt(lByteCount) << lBytePosition));
-            lByteCount++;
-        }
-        lWordCount = (lByteCount - (lByteCount % 4)) / 4;
-        lBytePosition = (lByteCount % 4) * 8;
-        lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80 << lBytePosition);
-        lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
-        lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;
-        return lWordArray;
-    };
-    function md5_WordToHex(lValue) {
-        var WordToHexValue = "",
-        WordToHexValue_temp = "",
-        lByte, lCount;
-        for (lCount = 0; lCount <= 3; lCount++) {
-            lByte = (lValue >>> (lCount * 8)) & 255;
-            WordToHexValue_temp = "0" + lByte.toString(16);
-            WordToHexValue = WordToHexValue + WordToHexValue_temp.substr(WordToHexValue_temp.length - 2, 2);
-        }
-        return WordToHexValue;
-    };
-    function md5_Utf8Encode(string) {
-        string = string.replace(/\r\n/g, "\n");
-        var utftext = "";
-        for (var n = 0; n < string.length; n++) {
-            var c = string.charCodeAt(n);
-            if (c < 128) {
-                utftext += String.fromCharCode(c);
-            } else if ((c > 127) && (c < 2048)) {
-                utftext += String.fromCharCode((c >> 6) | 192);
-                utftext += String.fromCharCode((c & 63) | 128);
-            } else {
-                utftext += String.fromCharCode((c >> 12) | 224);
-                utftext += String.fromCharCode(((c >> 6) & 63) | 128);
-                utftext += String.fromCharCode((c & 63) | 128);
-            }
-        }
-        return utftext;
-    };
-    var x = Array();
-    var k, AA, BB, CC, DD, a, b, c, d;
-    var S11 = 7,
-    S12 = 12,
-    S13 = 17,
-    S14 = 22;
-    var S21 = 5,
-    S22 = 9,
-    S23 = 14,
-    S24 = 20;
-    var S31 = 4,
-    S32 = 11,
-    S33 = 16,
-    S34 = 23;
-    var S41 = 6,
-    S42 = 10,
-    S43 = 15,
-    S44 = 21;
-    string = md5_Utf8Encode(string);
-    x = md5_ConvertToWordArray(string);
-    a = 0x67452301;
-    b = 0xEFCDAB89;
-    c = 0x98BADCFE;
-    d = 0x10325476;
-    for (k = 0; k < x.length; k += 16) {
-        AA = a;
-        BB = b;
-        CC = c;
-        DD = d;
-        a = md5_FF(a, b, c, d, x[k + 0], S11, 0xD76AA478);
-        d = md5_FF(d, a, b, c, x[k + 1], S12, 0xE8C7B756);
-        c = md5_FF(c, d, a, b, x[k + 2], S13, 0x242070DB);
-        b = md5_FF(b, c, d, a, x[k + 3], S14, 0xC1BDCEEE);
-        a = md5_FF(a, b, c, d, x[k + 4], S11, 0xF57C0FAF);
-        d = md5_FF(d, a, b, c, x[k + 5], S12, 0x4787C62A);
-        c = md5_FF(c, d, a, b, x[k + 6], S13, 0xA8304613);
-        b = md5_FF(b, c, d, a, x[k + 7], S14, 0xFD469501);
-        a = md5_FF(a, b, c, d, x[k + 8], S11, 0x698098D8);
-        d = md5_FF(d, a, b, c, x[k + 9], S12, 0x8B44F7AF);
-        c = md5_FF(c, d, a, b, x[k + 10], S13, 0xFFFF5BB1);
-        b = md5_FF(b, c, d, a, x[k + 11], S14, 0x895CD7BE);
-        a = md5_FF(a, b, c, d, x[k + 12], S11, 0x6B901122);
-        d = md5_FF(d, a, b, c, x[k + 13], S12, 0xFD987193);
-        c = md5_FF(c, d, a, b, x[k + 14], S13, 0xA679438E);
-        b = md5_FF(b, c, d, a, x[k + 15], S14, 0x49B40821);
-        a = md5_GG(a, b, c, d, x[k + 1], S21, 0xF61E2562);
-        d = md5_GG(d, a, b, c, x[k + 6], S22, 0xC040B340);
-        c = md5_GG(c, d, a, b, x[k + 11], S23, 0x265E5A51);
-        b = md5_GG(b, c, d, a, x[k + 0], S24, 0xE9B6C7AA);
-        a = md5_GG(a, b, c, d, x[k + 5], S21, 0xD62F105D);
-        d = md5_GG(d, a, b, c, x[k + 10], S22, 0x2441453);
-        c = md5_GG(c, d, a, b, x[k + 15], S23, 0xD8A1E681);
-        b = md5_GG(b, c, d, a, x[k + 4], S24, 0xE7D3FBC8);
-        a = md5_GG(a, b, c, d, x[k + 9], S21, 0x21E1CDE6);
-        d = md5_GG(d, a, b, c, x[k + 14], S22, 0xC33707D6);
-        c = md5_GG(c, d, a, b, x[k + 3], S23, 0xF4D50D87);
-        b = md5_GG(b, c, d, a, x[k + 8], S24, 0x455A14ED);
-        a = md5_GG(a, b, c, d, x[k + 13], S21, 0xA9E3E905);
-        d = md5_GG(d, a, b, c, x[k + 2], S22, 0xFCEFA3F8);
-        c = md5_GG(c, d, a, b, x[k + 7], S23, 0x676F02D9);
-        b = md5_GG(b, c, d, a, x[k + 12], S24, 0x8D2A4C8A);
-        a = md5_HH(a, b, c, d, x[k + 5], S31, 0xFFFA3942);
-        d = md5_HH(d, a, b, c, x[k + 8], S32, 0x8771F681);
-        c = md5_HH(c, d, a, b, x[k + 11], S33, 0x6D9D6122);
-        b = md5_HH(b, c, d, a, x[k + 14], S34, 0xFDE5380C);
-        a = md5_HH(a, b, c, d, x[k + 1], S31, 0xA4BEEA44);
-        d = md5_HH(d, a, b, c, x[k + 4], S32, 0x4BDECFA9);
-        c = md5_HH(c, d, a, b, x[k + 7], S33, 0xF6BB4B60);
-        b = md5_HH(b, c, d, a, x[k + 10], S34, 0xBEBFBC70);
-        a = md5_HH(a, b, c, d, x[k + 13], S31, 0x289B7EC6);
-        d = md5_HH(d, a, b, c, x[k + 0], S32, 0xEAA127FA);
-        c = md5_HH(c, d, a, b, x[k + 3], S33, 0xD4EF3085);
-        b = md5_HH(b, c, d, a, x[k + 6], S34, 0x4881D05);
-        a = md5_HH(a, b, c, d, x[k + 9], S31, 0xD9D4D039);
-        d = md5_HH(d, a, b, c, x[k + 12], S32, 0xE6DB99E5);
-        c = md5_HH(c, d, a, b, x[k + 15], S33, 0x1FA27CF8);
-        b = md5_HH(b, c, d, a, x[k + 2], S34, 0xC4AC5665);
-        a = md5_II(a, b, c, d, x[k + 0], S41, 0xF4292244);
-        d = md5_II(d, a, b, c, x[k + 7], S42, 0x432AFF97);
-        c = md5_II(c, d, a, b, x[k + 14], S43, 0xAB9423A7);
-        b = md5_II(b, c, d, a, x[k + 5], S44, 0xFC93A039);
-        a = md5_II(a, b, c, d, x[k + 12], S41, 0x655B59C3);
-        d = md5_II(d, a, b, c, x[k + 3], S42, 0x8F0CCC92);
-        c = md5_II(c, d, a, b, x[k + 10], S43, 0xFFEFF47D);
-        b = md5_II(b, c, d, a, x[k + 1], S44, 0x85845DD1);
-        a = md5_II(a, b, c, d, x[k + 8], S41, 0x6FA87E4F);
-        d = md5_II(d, a, b, c, x[k + 15], S42, 0xFE2CE6E0);
-        c = md5_II(c, d, a, b, x[k + 6], S43, 0xA3014314);
-        b = md5_II(b, c, d, a, x[k + 13], S44, 0x4E0811A1);
-        a = md5_II(a, b, c, d, x[k + 4], S41, 0xF7537E82);
-        d = md5_II(d, a, b, c, x[k + 11], S42, 0xBD3AF235);
-        c = md5_II(c, d, a, b, x[k + 2], S43, 0x2AD7D2BB);
-        b = md5_II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
-        a = md5_AddUnsigned(a, AA);
-        b = md5_AddUnsigned(b, BB);
-        c = md5_AddUnsigned(c, CC);
-        d = md5_AddUnsigned(d, DD);
-    }
-    return (md5_WordToHex(a) + md5_WordToHex(b) + md5_WordToHex(c) + md5_WordToHex(d)).toLowerCase();
-=======
-function md5(string) {
-    function md5_RotateLeft(lValue, iShiftBits) {
-        return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));
-    }
-    function md5_AddUnsigned(lX, lY) {
-        var lX4, lY4, lX8, lY8, lResult;
-        lX8 = (lX & 0x80000000);
-        lY8 = (lY & 0x80000000);
-        lX4 = (lX & 0x40000000);
-        lY4 = (lY & 0x40000000);
-        lResult = (lX & 0x3FFFFFFF) + (lY & 0x3FFFFFFF);
-        if (lX4 & lY4) {
-            return (lResult ^ 0x80000000 ^ lX8 ^ lY8);
-        }
-        if (lX4 | lY4) {
-            if (lResult & 0x40000000) {
-                return (lResult ^ 0xC0000000 ^ lX8 ^ lY8);
-            } else {
-                return (lResult ^ 0x40000000 ^ lX8 ^ lY8);
-            }
-        } else {
-            return (lResult ^ lX8 ^ lY8);
-        }
-    }
-    function md5_F(x, y, z) {
-        return (x & y) | ((~x) & z);
-    }
-    function md5_G(x, y, z) {
-        return (x & z) | (y & (~z));
-    }
-    function md5_H(x, y, z) {
-        return (x ^ y ^ z);
-    }
-    function md5_I(x, y, z) {
-        return (y ^ (x | (~z)));
-    }
-    function md5_FF(a, b, c, d, x, s, ac) {
-        a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_F(b, c, d), x), ac));
-        return md5_AddUnsigned(md5_RotateLeft(a, s), b);
-    };
-    function md5_GG(a, b, c, d, x, s, ac) {
-        a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_G(b, c, d), x), ac));
-        return md5_AddUnsigned(md5_RotateLeft(a, s), b);
-    };
-    function md5_HH(a, b, c, d, x, s, ac) {
-        a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_H(b, c, d), x), ac));
-        return md5_AddUnsigned(md5_RotateLeft(a, s), b);
-    };
-    function md5_II(a, b, c, d, x, s, ac) {
-        a = md5_AddUnsigned(a, md5_AddUnsigned(md5_AddUnsigned(md5_I(b, c, d), x), ac));
-        return md5_AddUnsigned(md5_RotateLeft(a, s), b);
-    };
-    function md5_ConvertToWordArray(string) {
-        var lWordCount;
-        var lMessageLength = string.length;
-        var lNumberOfWords_temp1 = lMessageLength + 8;
-        var lNumberOfWords_temp2 = (lNumberOfWords_temp1 - (lNumberOfWords_temp1 % 64)) / 64;
-        var lNumberOfWords = (lNumberOfWords_temp2 + 1) * 16;
-        var lWordArray = Array(lNumberOfWords - 1);
-        var lBytePosition = 0;
-        var lByteCount = 0;
-        while (lByteCount < lMessageLength) {
-            lWordCount = (lByteCount - (lByteCount % 4)) / 4;
-            lBytePosition = (lByteCount % 4) * 8;
-            lWordArray[lWordCount] = (lWordArray[lWordCount] | (string.charCodeAt(lByteCount) << lBytePosition));
-            lByteCount++;
-        }
-        lWordCount = (lByteCount - (lByteCount % 4)) / 4;
-        lBytePosition = (lByteCount % 4) * 8;
-        lWordArray[lWordCount] = lWordArray[lWordCount] | (0x80 << lBytePosition);
-        lWordArray[lNumberOfWords - 2] = lMessageLength << 3;
-        lWordArray[lNumberOfWords - 1] = lMessageLength >>> 29;
-        return lWordArray;
-    };
-    function md5_WordToHex(lValue) {
-        var WordToHexValue = "",
-        WordToHexValue_temp = "",
-        lByte, lCount;
-        for (lCount = 0; lCount <= 3; lCount++) {
-            lByte = (lValue >>> (lCount * 8)) & 255;
-            WordToHexValue_temp = "0" + lByte.toString(16);
-            WordToHexValue = WordToHexValue + WordToHexValue_temp.substr(WordToHexValue_temp.length - 2, 2);
-        }
-        return WordToHexValue;
-    };
-    function md5_Utf8Encode(string) {
-        string = string.replace(/\r\n/g, "\n");
-        var utftext = "";
-        for (var n = 0; n < string.length; n++) {
-            var c = string.charCodeAt(n);
-            if (c < 128) {
-                utftext += String.fromCharCode(c);
-            } else if ((c > 127) && (c < 2048)) {
-                utftext += String.fromCharCode((c >> 6) | 192);
-                utftext += String.fromCharCode((c & 63) | 128);
-            } else {
-                utftext += String.fromCharCode((c >> 12) | 224);
-                utftext += String.fromCharCode(((c >> 6) & 63) | 128);
-                utftext += String.fromCharCode((c & 63) | 128);
-            }
-        }
-        return utftext;
-    };
-    var x = Array();
-    var k, AA, BB, CC, DD, a, b, c, d;
-    var S11 = 7,
-    S12 = 12,
-    S13 = 17,
-    S14 = 22;
-    var S21 = 5,
-    S22 = 9,
-    S23 = 14,
-    S24 = 20;
-    var S31 = 4,
-    S32 = 11,
-    S33 = 16,
-    S34 = 23;
-    var S41 = 6,
-    S42 = 10,
-    S43 = 15,
-    S44 = 21;
-    string = md5_Utf8Encode(string);
-    x = md5_ConvertToWordArray(string);
-    a = 0x67452301;
-    b = 0xEFCDAB89;
-    c = 0x98BADCFE;
-    d = 0x10325476;
-    for (k = 0; k < x.length; k += 16) {
-        AA = a;
-        BB = b;
-        CC = c;
-        DD = d;
-        a = md5_FF(a, b, c, d, x[k + 0], S11, 0xD76AA478);
-        d = md5_FF(d, a, b, c, x[k + 1], S12, 0xE8C7B756);
-        c = md5_FF(c, d, a, b, x[k + 2], S13, 0x242070DB);
-        b = md5_FF(b, c, d, a, x[k + 3], S14, 0xC1BDCEEE);
-        a = md5_FF(a, b, c, d, x[k + 4], S11, 0xF57C0FAF);
-        d = md5_FF(d, a, b, c, x[k + 5], S12, 0x4787C62A);
-        c = md5_FF(c, d, a, b, x[k + 6], S13, 0xA8304613);
-        b = md5_FF(b, c, d, a, x[k + 7], S14, 0xFD469501);
-        a = md5_FF(a, b, c, d, x[k + 8], S11, 0x698098D8);
-        d = md5_FF(d, a, b, c, x[k + 9], S12, 0x8B44F7AF);
-        c = md5_FF(c, d, a, b, x[k + 10], S13, 0xFFFF5BB1);
-        b = md5_FF(b, c, d, a, x[k + 11], S14, 0x895CD7BE);
-        a = md5_FF(a, b, c, d, x[k + 12], S11, 0x6B901122);
-        d = md5_FF(d, a, b, c, x[k + 13], S12, 0xFD987193);
-        c = md5_FF(c, d, a, b, x[k + 14], S13, 0xA679438E);
-        b = md5_FF(b, c, d, a, x[k + 15], S14, 0x49B40821);
-        a = md5_GG(a, b, c, d, x[k + 1], S21, 0xF61E2562);
-        d = md5_GG(d, a, b, c, x[k + 6], S22, 0xC040B340);
-        c = md5_GG(c, d, a, b, x[k + 11], S23, 0x265E5A51);
-        b = md5_GG(b, c, d, a, x[k + 0], S24, 0xE9B6C7AA);
-        a = md5_GG(a, b, c, d, x[k + 5], S21, 0xD62F105D);
-        d = md5_GG(d, a, b, c, x[k + 10], S22, 0x2441453);
-        c = md5_GG(c, d, a, b, x[k + 15], S23, 0xD8A1E681);
-        b = md5_GG(b, c, d, a, x[k + 4], S24, 0xE7D3FBC8);
-        a = md5_GG(a, b, c, d, x[k + 9], S21, 0x21E1CDE6);
-        d = md5_GG(d, a, b, c, x[k + 14], S22, 0xC33707D6);
-        c = md5_GG(c, d, a, b, x[k + 3], S23, 0xF4D50D87);
-        b = md5_GG(b, c, d, a, x[k + 8], S24, 0x455A14ED);
-        a = md5_GG(a, b, c, d, x[k + 13], S21, 0xA9E3E905);
-        d = md5_GG(d, a, b, c, x[k + 2], S22, 0xFCEFA3F8);
-        c = md5_GG(c, d, a, b, x[k + 7], S23, 0x676F02D9);
-        b = md5_GG(b, c, d, a, x[k + 12], S24, 0x8D2A4C8A);
-        a = md5_HH(a, b, c, d, x[k + 5], S31, 0xFFFA3942);
-        d = md5_HH(d, a, b, c, x[k + 8], S32, 0x8771F681);
-        c = md5_HH(c, d, a, b, x[k + 11], S33, 0x6D9D6122);
-        b = md5_HH(b, c, d, a, x[k + 14], S34, 0xFDE5380C);
-        a = md5_HH(a, b, c, d, x[k + 1], S31, 0xA4BEEA44);
-        d = md5_HH(d, a, b, c, x[k + 4], S32, 0x4BDECFA9);
-        c = md5_HH(c, d, a, b, x[k + 7], S33, 0xF6BB4B60);
-        b = md5_HH(b, c, d, a, x[k + 10], S34, 0xBEBFBC70);
-        a = md5_HH(a, b, c, d, x[k + 13], S31, 0x289B7EC6);
-        d = md5_HH(d, a, b, c, x[k + 0], S32, 0xEAA127FA);
-        c = md5_HH(c, d, a, b, x[k + 3], S33, 0xD4EF3085);
-        b = md5_HH(b, c, d, a, x[k + 6], S34, 0x4881D05);
-        a = md5_HH(a, b, c, d, x[k + 9], S31, 0xD9D4D039);
-        d = md5_HH(d, a, b, c, x[k + 12], S32, 0xE6DB99E5);
-        c = md5_HH(c, d, a, b, x[k + 15], S33, 0x1FA27CF8);
-        b = md5_HH(b, c, d, a, x[k + 2], S34, 0xC4AC5665);
-        a = md5_II(a, b, c, d, x[k + 0], S41, 0xF4292244);
-        d = md5_II(d, a, b, c, x[k + 7], S42, 0x432AFF97);
-        c = md5_II(c, d, a, b, x[k + 14], S43, 0xAB9423A7);
-        b = md5_II(b, c, d, a, x[k + 5], S44, 0xFC93A039);
-        a = md5_II(a, b, c, d, x[k + 12], S41, 0x655B59C3);
-        d = md5_II(d, a, b, c, x[k + 3], S42, 0x8F0CCC92);
-        c = md5_II(c, d, a, b, x[k + 10], S43, 0xFFEFF47D);
-        b = md5_II(b, c, d, a, x[k + 1], S44, 0x85845DD1);
-        a = md5_II(a, b, c, d, x[k + 8], S41, 0x6FA87E4F);
-        d = md5_II(d, a, b, c, x[k + 15], S42, 0xFE2CE6E0);
-        c = md5_II(c, d, a, b, x[k + 6], S43, 0xA3014314);
-        b = md5_II(b, c, d, a, x[k + 13], S44, 0x4E0811A1);
-        a = md5_II(a, b, c, d, x[k + 4], S41, 0xF7537E82);
-        d = md5_II(d, a, b, c, x[k + 11], S42, 0xBD3AF235);
-        c = md5_II(c, d, a, b, x[k + 2], S43, 0x2AD7D2BB);
-        b = md5_II(b, c, d, a, x[k + 9], S44, 0xEB86D391);
-        a = md5_AddUnsigned(a, AA);
-        b = md5_AddUnsigned(b, BB);
-        c = md5_AddUnsigned(c, CC);
-        d = md5_AddUnsigned(d, DD);
-    }
-    return (md5_WordToHex(a) + md5_WordToHex(b) + md5_WordToHex(c) + md5_WordToHex(d)).toLowerCase();
->>>>>>> cb3d90368273b7ba0ce18e05382d00be6933949f
-}

+ 0 - 58
businessweb-user/js/page/login.js

@@ -1,58 +0,0 @@
-<<<<<<< HEAD
-(function(){
-	// 轮播图的切换
-	var curbg = 0;
-	setInterval(
-	    function() {
-	        if (curbg == 2) {
-	            curbg = -1;
-	        }
-	        curbg++; 
-	        $('#bg .bg').removeClass('show');
-	        $('#bg').find('img').eq(curbg).addClass('show');
-	    },3000
-	);
-	$('#login-but').on('click',function(){
-		login()
-	})
-	var login = function(){
-		Popup.showLoading("loading...");
-		getAjax('/api/buy/token4','post',{},function(res){
-			if (res.err === 0) {
-				
-			} else {
-				Popup.toast(res.msg);
-			}
-			Popup.close();
-		})
-	}
-=======
-(function(){
-	// 轮播图的切换
-	var curbg = 0;
-	setInterval(
-	    function() {
-	        if (curbg == 2) {
-	            curbg = -1;
-	        }
-	        curbg++; 
-	        $('#bg .bg').removeClass('show');
-	        $('#bg').find('img').eq(curbg).addClass('show');
-	    },3000
-	);
-	$('#login-but').on('click',function(){
-		login()
-	})
-	var login = function(){
-		Popup.showLoading("loading...");
-		getAjax('/api/buy/token4','post',{},function(res){
-			if (res.err === 0) {
-				
-			} else {
-				Popup.toast(res.msg);
-			}
-			Popup.close();
-		})
-	}
->>>>>>> cb3d90368273b7ba0ce18e05382d00be6933949f
-})()

+ 0 - 511
businessweb-user/js/popup.js

@@ -1,511 +0,0 @@
-window.Popup = (function(d) {
-	var _instance = null,
-		_progressInstance = null,
-		doc = d.body,
-		docWidth = doc.clientWidth,
-		docHeight = doc.clientHeight;
-
-	function Dialog() {
-		this.title = '标题';
-		this.content = '内容';
-		this.btns = [
-			{name : '确定', ac : function() {}},
-			{name : '取消', ac : function() {}}
-		];
-		this.type = 'alert';
-		this.hasTitle = true;
-		this.timeout = 500;
-		this.dialogWrapper = null;
-		this.mask = null;
-		this.fadeTime = 250;
-		this.fadeInTime = 0;
-		this.hasDialog = false;
-		// loading
-		this.loadingText = '正在加载';
-		this.hasLoadingText = false;
-		this.spinNumber = 8;			// 菊花瓣数
-		this.loadingRadius = 18;		// 菊花半径
-		this.startAngle = 90;			// 正上方菊花角度
-		this.spinMargin = 2;
-	}
-
-	Dialog.prototype = {
-		/**
-		 * 创建mask
-		 * 
-		 * @return {[type]} [description]
-		 */
-		_createMask : function() {
-			var _this = this;
-			if (!this.mask) {
-				this.mask = document.createElement('div');
-				this.mask.className = 'ui-mask fade';
-				doc.appendChild(this.mask);
-				// 在创建了mask之后250ms,给其设置透明度为1,达到动画效果
-				setTimeout(function() {
-					_this.mask.className = 'ui-mask fade in';
-				}, this.fadeInTime);
-				
-			}
-		},
-
-		/**
-		 * 移除mask
-		 * 
-		 * @return {[type]} [description]
-		 */
-		_removeMask : function() {
-			var _this = this;
-			if (this.mask) {
-				// 移除dom之前,给其设置className,达到动画过渡效果
-				this.mask.className = 'ui-mask fade';
-				setTimeout(function() {
-					_this.mask.remove();
-					_this.mask = null;
-				}, this.fadeTime);
-			}
-		},
-
-		/**
-		 * 创建弹窗的容器
-		 * 
-		 * @return {[type]} [description]
-		 */
-		_createWrapper : function() {
-			if (!this.dialogWrapper) {
-				this.dialogWrapper = document.createElement('div');
-			}
-		},
-
-		/**
-		 * 移除弹窗的容器
-		 * 
-		 * @return {[type]} [description]
-		 */
-		_removeWrapper : function() {
-			var _this = this;
-			if (this.dialogWrapper) {
-				if (this.type === 'toast') {
-					this.dialogWrapper.className = 'ui-dialog ui-toast fade';
-				} else if(this.type === 'loading') {
-					this.dialogWrapper.className = 'ui-dialog ui-loading fade';
-				} else if(this.type === 'progress') {
-					this.dialogWrapper.className = 'ui-dialog ui-progress fade';
-				} else {
-					this.dialogWrapper.className = 'ui-dialog fade';
-				}
-				setTimeout(function() {
-					_this.dialogWrapper.remove();
-					_this.dialogWrapper = null;
-					_this.hasDialog = false;
-				}, this.fadeTime);
-			}
-		},
-
-		/**
-		 * 如果存在标题,则创建标题容器
-		 * 
-		 * @return {[type]} [description]
-		 */
-		_createTitle : function() {
-			var title = document.createElement('div');
-			title.className = 'ui-title';
-			title.textContent = this.title;
-			return title;
-		},
-
-		/**
-		 * 创建内容区域
-		 * 
-		 * @return {[type]} [description]
-		 */
-		_createContent : function() {
-			var content = document.createElement('div');
-			content.className = 'ui-content';
-			content.textContent = this.content;
-			return content;
-		},
-
-		/**
-		 * 创建按钮组
-		 * 
-		 * @return {[type]} [description]
-		 */
-		_createBtns : function() {
-			var buttons = document.createElement('div'), _this = this;
-			buttons.className = 'ui-btns';
-			this.btns && this.btns.forEach(function(btn, index) {
-				var link = document.createElement('a');
-				link.href = 'javascript:void(0)';
-				link.textContent = btn.name;
-				buttons.appendChild(link);
-				link.addEventListener('click', function() {
-					_this.close();
-					btn.ac && btn.ac();
-				});
-			});
-			return buttons;
-		},
-
-		/**
-		 * 创建loading文字
-		 * 
-		 * @return {[type]} [description]
-		 */
-		_createLoadingText : function() {
-			var text = document.createElement('div');
-			text.className = 'ui-text';
-			text.textContent = this.loadingText;
-			return text;
-		},
-
-		/**
-		 * 创建loading菊花
-		 * 
-		 * @return {[type]} [description]
-		 */
-		_createLoadingContent : function() {
-			var content = document.createElement('div'),
-				lineSpin = document.createElement('div'),
-				deltaAngle = 360 / this.spinNumber;
-			content.className = 'ui-content';
-			if (!this.hasLoadingText) {
-				content.style.height = '86px';
-				content.style.borderRadius = '5px';
-			}
-			lineSpin.className = 'ui-line-spin';
-			lineSpin.style.width = (this.loadingRadius * 2 + this.spinMargin * 2) + 'px';
-			lineSpin.style.height = (this.loadingRadius * 2 + this.spinMargin * 2) + 'px';
-			for (var i = 0; i < this.spinNumber; i++) {
-				var div = document.createElement('div');
-				var angle = this.startAngle + i * (-deltaAngle),
-					rotateAngle = i * deltaAngle,
-					p = Math.PI * 2 * (angle / 360);
-				div.style.top = this.loadingRadius * (1 - Math.sin(p)) + 'px';
-				div.style.left = this.loadingRadius * (1 + Math.cos(p)) + 'px';
-				div.style.transform = 'rotate('+rotateAngle+'deg)';
-				div.style.WebkitTransform = 'rotate('+rotateAngle+'deg)';
-				div.style.MozTransform = 'rotate('+rotateAngle+'deg)';
-				div.style.msTransform = 'rotate('+rotateAngle+'deg)';
-				div.style.OTransform = 'rotate('+rotateAngle+'deg)';
-				lineSpin.appendChild(div);
-			}
-			content.appendChild(lineSpin);
-			return content;
-		},
-
-		/**
-		 * 渲染弹窗
-		 * 
-		 * @return {[type]} [description]
-		 */
-		_renderDialog : function() {
-			this._createWrapper();
-			switch (this.type) {
-				case 'confirm':
-					this.dialogWrapper.className = 'ui-dialog fade';
-					var title, content, btns, _this = this;
-					content = this._createContent();
-					btns = this._createBtns();
-					if (this.hasTitle) {
-						title = this._createTitle();
-						this.dialogWrapper.appendChild(title);
-					}
-					
-					this.dialogWrapper.appendChild(content);
-					this.dialogWrapper.appendChild(btns);
-					doc.appendChild(this.dialogWrapper);
-					setTimeout(function() {
-						_this.dialogWrapper.className = 'ui-dialog fade in';
-					}, this.fadeInTime);
-					break;
-				case 'toast': 
-					this.dialogWrapper.className = 'ui-dialog ui-toast fade';
-					var content = this._createContent(), _this = this;
-					this.dialogWrapper.appendChild(content);
-					doc.appendChild(this.dialogWrapper);
-					setTimeout(function() {
-						_this.dialogWrapper.className = 'ui-dialog ui-toast fade in';
-					}, this.fadeInTime);
-					setTimeout(function() {
-						_this.close();
-					}, this.timeout);
-					break;
-				case 'loading':
-					this.dialogWrapper.className = 'ui-dialog ui-loading fade';
-					var text, content, _this = this;
-					content = this._createLoadingContent();
-					if (this.hasLoadingText) {
-						text = this._createLoadingText();
-						this.dialogWrapper.appendChild(text);
-					}
-					this.dialogWrapper.appendChild(content);
-					doc.appendChild(this.dialogWrapper);
-					setTimeout(function() {
-						_this.dialogWrapper.className = 'ui-dialog ui-loading fade in';
-					}, this.fadeInTime);
-					break;
-				default:
-					break;
-			}
-		},
-
-		/**
-		 * confirm/alert 弹窗,返回供外部使用
-		 * 
-		 * @return {[type]} [description]
-		 */
-		confirm : function() {
-			var args = arguments && arguments[0],
-				length = args && args.length;
-			if (length === 3) {
-				// 有标题
-				this.title = args[0];
-				this.content = args[1];
-				this.btns = args[2];
-				this.hasTitle = true;
-			} else if(length === 2) {
-				this.content = args[0];
-				this.btns = args[1];
-				this.hasTitle = false;
-			} else {
-				// alert
-				this.hasTitle = false;
-				this.content = args[0];
-				this.btns = [{name : '确定'}]
-			}
-			this.type = 'confirm';
-			this._create();
-		},
-
-		/**
-		 * toast弹窗,返回供外部使用
-		 * 
-		 * @return {[type]} [description]
-		 */
-		toast : function() {
-			var args = arguments && arguments[0],
-				length = args && args.length;
-			if (length === 2) {
-				this.content = args[0];
-				this.timeout = args[1];
-			} else if(length === 1) {
-				this.content = args[0];
-			}
-			this.type = 'toast';
-			if (!this.hasDialog) {
-				this._create();
-			}
-			this.hasDialog = true;
-		},
-
-		/**
-		 * loading弹窗,返回供外部使用
-		 * 
-		 * @return {[type]} [description]
-		 */
-		showLoading : function() {
-			var args = arguments && arguments[0],
-				length = args && args.length;
-
-			// 带有参数
-			if (length === 1) {
-				this.loadingText = args[0];
-				this.hasLoadingText = true;
-			}
-
-			this.type = 'loading';
-			this._create();
-		},
-
-		/**
-		 * 创建弹窗 
-		 * 
-		 * @return {[type]} [description]
-		 */
-		_create : function() {
-			this._createMask();
-			this._renderDialog();
-		},
-
-		/**
-		 * 关闭弹窗
-		 * 
-		 * @return {[type]} [description]
-		 */
-		close : function() {
-			this._removeMask();
-			this._removeWrapper();
-			_instance = null;
-			_progressInstance = null;
-		}
-	};
-
-	function Progress() {
-		Dialog.call(this);
-		this.percent = 0;
-		this.text = '正在更新程序';
-		this.innerBar = null;
-	}
-
-	/**
-	 * 继承
-	 * @param  {[type]} subClass   [description]
-	 * @param  {[type]} superClass [description]
-	 * @return {[type]}            [description]
-	 */
-	function inherit(subClass, superClass) {  
-	    function F() {}  
-	    F.prototype = superClass.prototype;  
-	    subClass.prototype = new F();  
-	    subClass.prototype.constructor = subClass;  
-	}  
-
-	/**
-	 * 继承条用
-	 */
-	inherit(Progress, Dialog);
-
-	/**
-	 * 创建进度条文字
-	 * @return {[type]} [description]
-	 */
-	Progress.prototype._createProgressText = function() {
-		var text = document.createElement('div');
-		text.className = 'ui-text';
-		text.textContent = this.text;
-		return text;
-	}
-
-	/**
-	 * 创建进度条
-	 * @return {[type]} [description]
-	 */
-	Progress.prototype._createProgressContent = function() {
-		var	content = document.createElement('div'), 
-			outer = document.createElement('div'),
-			inner = document.createElement('div');
-		content.className = 'ui-content';
-		outer.className = 'ui-outer';
-		inner.className = 'ui-inner';
-		outer.appendChild(inner);
-		content.appendChild(outer)
-
-		this.innerBar = inner;
-
-		return content;
-	}
-
-	/**
-	 * 进度条初始化
-	 * @return {[type]} [description]
-	 */
-	Progress.prototype.init = function() {
-		var text, content, bar, _this = this;
-		// 创建mask
-		this._createMask();
-		// 创建warpper
-		this._createWrapper();
-		
-		this.dialogWrapper.className = 'ui-dialog ui-progress fade';
-		
-		// 1. 创建文字
-		text = this._createProgressText();
-		// 2. 创建内容
-		content = this._createProgressContent();
-		// 3. 将文字和content加入到warpper中
-		this.dialogWrapper.appendChild(text);
-		this.dialogWrapper.appendChild(content);
-		// 4. 将warpper加入到body中
-		doc.appendChild(this.dialogWrapper);
-
-		setTimeout(function() {
-			_this.dialogWrapper.className = 'ui-dialog ui-progress fade in';
-		}, this.fadeInTime);
-	}
-
-	/**
-	 * 创建进度条
-	 * @return {[type]} [description]
-	 */
-	Progress.prototype.create = function() {
-		var args = arguments && arguments[0],
-			length = args && args.length;
-
-		if (length === 1) {
-			this.text = args[0];
-		}
-
-		this.type = 'progress';
-		this.init();
-		return this;
-	}
-
-	/**
-	 * 更新进度条进度
-	 * @return {[type]} [description]
-	 */
-	Progress.prototype.update = function(percent) {
-		if (this.percent === 100) {
-			this.close();
-		}
-		this.percent = percent;
-		this.innerBar.style.width = percent + '%';
-	}
-
-	/**
-	 * 关闭进度条
-	 * @return {[type]} [description]
-	 */
-	Progress.prototype.closeBar = function() {
-		this.percent = 0;
-		this.close();
-	}
-
-	/**
-	 * 获取dialog实例
-	 * @return {[type]} [description]
-	 */
-	function _getInstance() {
-		if (!_instance) {
-			_instance = new Dialog();
-		} 
-		return _instance;
-	}
-
-	/**
-	 * 获取进度条实例
-	 * @return {[type]} [description]
-	 */
-	function _getProgressInstance() {
-		if (!_progressInstance) {
-			_progressInstance = new Progress();
-		}
-		return _progressInstance;
-	}
-
-	/**
-	 * return 调用
-	 */
-	return {
-		alert : function() {
-			return _getInstance().confirm(arguments);
-		},
-		confirm : function() {
-			return _getInstance().confirm(arguments);
-		},
-		toast : function() {
-			return _getInstance().toast(arguments);
-		},
-		showLoading : function() {
-			return _getInstance().showLoading(arguments);
-		},
-		progress : function() {
-			return _getProgressInstance().create(arguments);
-		},
-		close : function() {
-			return _getInstance().close();
-		}
-	}
-
-})(document);

+ 0 - 6
businessweb-user/js/rem.js

@@ -1,6 +0,0 @@
-<<<<<<< HEAD
-var deviceWidth = document.documentElement.clientWidth;
-=======
-var deviceWidth = document.documentElement.clientWidth;
->>>>>>> cb3d90368273b7ba0ce18e05382d00be6933949f
-document.documentElement.style.fontSize = deviceWidth / 10.8 + 'px';

文件差异内容过多而无法显示
+ 0 - 14
businessweb-user/js/vue.js


+ 0 - 8
businessweb-user/push.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-release=$1
-
-[ ! -n "$release" ] && exit 1
-
-docker build -t registry-vpc.cn-beijing.aliyuncs.com/xinyue/businessweb-user:${release} .
-docker push registry-vpc.cn-beijing.aliyuncs.com/xinyue/businessweb-user:${release}