Home Explore Help
Register Sign In
mengqingchuang
/
k8swebapi
0
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'master' of http://10.68.0.122:3000/mengqingchuang/k8swebapi

# Conflicts:
#	businessweb-user/css/common.css
#	businessweb-user/css/style.css
#	businessweb-user/fillin.html
#	businessweb-user/home.html
#	businessweb-user/index.html
#	businessweb-user/js/common.js
#	businessweb-user/js/jquery-2.1.4.min.js
#	businessweb-user/js/md5.js
#	businessweb-user/js/page/login.js
#	businessweb-user/js/rem.js
#	businessweb-user/js/vue.js
#	businessweb-user/push.sh
DESKTOP-3E973C2\Admin 4 years ago
parent
519a86934e cb3d903682
commit
23714d1af2
17 changed files with 1694 additions and 34 deletions
Split View Show Diff Stats
  1. BIN
      businessapi/businessweb
  2. 102 0
      businessweb-user/css/common.css
  3. 650 0
      businessweb-user/css/style.css
  4. 81 0
      businessweb-user/fillin.html
  5. 438 0
      businessweb-user/home.html
  6. 77 0
      businessweb-user/index.html
  7. 37 0
      businessweb-user/js/common.js
  8. 7 0
      businessweb-user/js/jquery-2.1.4.min.js
  9. 205 0
      businessweb-user/js/md5.js
  10. 30 0
      businessweb-user/js/page/login.js
  11. 4 0
      businessweb-user/js/rem.js
  12. 8 0
      businessweb-user/js/vue.js
  13. BIN
      businessweb/businessweb
  14. 1 0
      k8swebapi-nginx/Dockerfile
  15. 41 21
      k8swebapi-nginx/conf.d/k8swebapi-nginx.conf
  16. 1 1
      k8swebapi-nginx/nginx.conf
  17. 12 12
      k8swebapi-nginx/tcp.d/sharetransmit.jixiang.cn.conf

BIN
businessapi/businessweb
View File


+ 102 - 0
businessweb-user/css/common.css
View File 

@@ -1,3 +1,4 @@
 
+<<<<<<< HEAD
 
 *{
 
     margin: 0;
 
     padding:0;
 
@@ -97,3 +98,104 @@ button, input {
 
     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

File diff suppressed because it is too large
+ 650 - 0
businessweb-user/css/style.css


+ 81 - 0
businessweb-user/fillin.html
View File 

@@ -1,3 +1,4 @@
 
+<<<<<<< HEAD
 
 <!DOCTYPE html>
 
 <html lang="en">
 
 
@@ -76,3 +77,83 @@
 
   </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

+ 438 - 0
businessweb-user/home.html
View File 

@@ -1,3 +1,4 @@
 
+<<<<<<< HEAD
 
 <!DOCTYPE html>
 
 <html lang="en">
 
 
@@ -433,3 +434,440 @@
 
   </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

+ 77 - 0
businessweb-user/index.html
View File 

@@ -1,3 +1,4 @@
 
+<<<<<<< HEAD
 
 <!DOCTYPE html>
 
 <html lang="en">
 
 
@@ -72,3 +73,79 @@
 
   </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

+ 37 - 0
businessweb-user/js/common.js
View File 

@@ -1,3 +1,4 @@
 
+<<<<<<< HEAD
 
 var baseUrl = 'http://pay-test.278740.cn'
 
 /**
 
  * 获取请求ajax数据
 
@@ -32,4 +33,40 @@ var getAjax = function (url, type, data, callback, alert, noneShow,errorF) {
 
 
         }
 
     })
 
+=======
 
+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
 
 };

File diff suppressed because it is too large
+ 7 - 0
businessweb-user/js/jquery-2.1.4.min.js


+ 205 - 0
businessweb-user/js/md5.js
View File 

@@ -1,3 +1,4 @@
 
+<<<<<<< HEAD
 
 function md5(string) {
 
     function md5_RotateLeft(lValue, iShiftBits) {
 
         return (lValue << iShiftBits) | (lValue >>> (32 - iShiftBits));
 
@@ -200,4 +201,208 @@ function md5(string) {
 
         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
 
 }

+ 30 - 0
businessweb-user/js/page/login.js
View File 

@@ -1,3 +1,4 @@
 
+<<<<<<< HEAD
 
 (function(){
 
 	// 轮播图的切换
 
 	var curbg = 0;
 
@@ -25,4 +26,33 @@
 
 			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
 
 })()

+ 4 - 0
businessweb-user/js/rem.js
View File 

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

File diff suppressed because it is too large
+ 8 - 0
businessweb-user/js/vue.js


BIN
businessweb/businessweb
View File


+ 1 - 0
k8swebapi-nginx/Dockerfile
View File 

@@ -13,6 +13,7 @@ COPY ssl /etc/nginx/ssl/
 
 RUN rm -rf /usr/share/nginx/html
 
 RUN mkdir /usr/share/nginx/html
 
 ADD xinyue.tar.gz /usr/share/nginx/html/businessweb
 
+ADD businessweb-user.tar.gz /usr/share/nginx/html/businessweb-user
 
 #COPY html /usr/share/nginx/html/
 
 
 EXPOSE 8006

+ 41 - 21
k8swebapi-nginx/conf.d/k8swebapi-nginx.conf
View File 

@@ -79,10 +79,7 @@ server {
 
     ssl_prefer_server_ciphers on;
 
     ssl_session_timeout 5m;
 
 
-    add_header Access-Control-Allow-Origin *;
 
-    add_header Access-Control-Allow-Headers X-Requested-With;
 
-    add_header Access-Control-Allow-Methods GET,POST,OPTIONS;
 
-
 
+    
     charset utf-8;
 
 
     server_name pay-test.278740.cn;
 
@@ -113,31 +110,54 @@ server {
 
 }
 
 server {
 
     listen 80;
 
-
 
-    #ssl on;
 
-    ssl_certificate ssl/xinyueyouxi.com.pem;
 
-    ssl_certificate_key ssl/xinyueyouxi.com.key;
 
-    ssl_protocols TLSv1 TLSv1.1 TLSv1.2;
 
-    ssl_ciphers HIGH:!RC4:!MD5:!aNULL:!eNULL:!NULL:!DH:!EDH:!EXP:+MEDIUM;
 
-    ssl_prefer_server_ciphers on;
 
-    ssl_session_timeout 5m;
 
+    server_name web-test.278740.cn;
 
+    charset utf-8;
 
 
     add_header Access-Control-Allow-Origin *;
 
-    add_header Access-Control-Allow-Headers X-Requested-With;
 
+    add_header Access-Control-Allow-Headers *;
 
     add_header Access-Control-Allow-Methods GET,POST,OPTIONS;
 
+    if ($request_method = 'OPTIONS') {
 
+        return 204;
 
+    }
 
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
+    proxy_set_header Remote_addr $remote_addr;
 
+    proxy_set_header X-Real_IP $remote_addr;
 
+    proxy_set_header Host $host;
 
+    proxy_set_header X-CROS true;  # 自定义，有做跨域的时候需要加，后端会做判断
 
+    proxy_redirect off;
 
+    proxy_http_version 1.1;
 
 
-    charset utf-8;
 
-
 
-    server_name web-test.278740.cn;
 
 
     location / {
 
         root /usr/share/nginx/html/businessweb;
 
         try_files $uri $uri/ /index.html;
 
-        #index index.html;
 
+        index index.html;
 
     }
 
-    
-    location /favicon.ico {
 
-        log_not_found off;
 
-        access_log off;
 
+}
 
+
 
+server {
 
+    listen 80;
 
+    server_name user-test.278740.cn;
 
+    charset utf-8;
 
+
 
+    add_header Access-Control-Allow-Origin *;
 
+    add_header Access-Control-Allow-Headers *;
 
+    add_header Access-Control-Allow-Methods GET,POST,OPTIONS;
 
+    if ($request_method = 'OPTIONS') {
 
+        return 204;
 
+    }
 
+    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
 
+    proxy_set_header Remote_addr $remote_addr;
 
+    proxy_set_header X-Real_IP $remote_addr;
 
+    proxy_set_header Host $host;
 
+    proxy_set_header X-CROS true;  # 自定义，有做跨域的时候需要加，后端会做判断
 
+    proxy_redirect off;
 
+    proxy_http_version 1.1;
 
+
 
+
 
+    location / {
 
+        root /usr/share/nginx/html/businessweb-user;
 
+        try_files $uri $uri/ /index.html;
 
+        index index.html;
 
     }
 
 }

+ 1 - 1
k8swebapi-nginx/nginx.conf
View File 

@@ -34,4 +34,4 @@ http {
 
 
     include /etc/nginx/conf.d/*.conf;
 
 }
 
-include /etc/nginx/tcp.d/*.conf;
 
+#include /etc/nginx/tcp.d/*.conf;

+ 12 - 12
k8swebapi-nginx/tcp.d/sharetransmit.jixiang.cn.conf
View File 

@@ -1,12 +1,12 @@
 
-stream {
 
-    upstream sharetransmit-svc {
 
-       hash $remote_addr consistent;
 
-       server sharetransmit-svc:8006;
 
-    }
 
-    server {
 
-       listen 8006;
 
-       proxy_connect_timeout 60s;
 
-       proxy_timeout 300s;
 
-       proxy_pass sharetransmit-svc;
 
-    }
 
-}
 
+#stream {
 
+#    upstream sharetransmit-svc {
 
+#       hash $remote_addr consistent;
 
+#       server sharetransmit-svc:8006;
 
+#    }
 
+#    server {
 
+#       listen 8006;
 
+#       proxy_connect_timeout 60s;
 
+#       proxy_timeout 300s;
 
+#       proxy_pass sharetransmit-svc;
 
+#    }
 
+#}