Skip to content

S
SuperMan
Commit 501ab988 authored by zhengke's avatar zhengke
Browse files
Options

Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

parents bad79d12 82696862
Show whitespace changes
Inline Side-by-side
Showing with 29 additions and 27 deletions
index.html
View file @ 501ab988
...@@ -9,9 +9,9 @@ ...@@ -9,9 +9,9 @@
<meta http-equiv="expires" content="-1, 26 Feb 1997 08:21:57 GMT"> <meta http-equiv="expires" content="-1, 26 Feb 1997 08:21:57 GMT">
<!--<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">--> <!--<meta content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0" name="viewport">-->
<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX" ></script> <script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=ZzGBZF6L0sgFDLlDohyvYhCnWy4dwksX" ></script>
<script type="text/javascript" src="http://api.map.baidu.com/library/CurveLine/1.5/src/CurveLine.min.js"></script> <script type="text/javascript" src="static/CurveLine.min.js"></script>
<script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script> <script type="text/javascript" src="http://ditu.google.cn/maps/api/js?key=AIzaSyAZ5MIfzicStzKbIkbI3RcBBeZBjQFKsp0&language=zh-CN"></script>
<script src="http://code.jquery.com/jquery-2.1.1.min.js"></script> <script src="static/jquery.min.js"></script>
<title>四川和平国际旅行社</title> <title>四川和平国际旅行社</title>
</head> </head>
<body> <body>
......
package.json
View file @ 501ab988
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
"dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js",
"start": "npm run dev", "start": "npm run dev",
"lint": "eslint --ext .js,.vue src", "lint": "eslint --ext .js,.vue src",
"build": "node build/build.js" "build": "node --max-old-space-size=4096 build/build.js"
}, },
"dependencies": { "dependencies": {
"@riophae/vue-treeselect": "0.0.36", "@riophae/vue-treeselect": "0.0.36",
......
src/components/TravelManager/TravelList/TeamBalancePayment.vue
View file @ 501ab988
...@@ -221,7 +221,7 @@ ...@@ -221,7 +221,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应收：{{item.Money}}<br /> 应收：{{item.Money}}<br />
实收：{{item.Money}} 实收：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -265,7 +265,7 @@ ...@@ -265,7 +265,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应收：{{item.Money}}<br /> 应收：{{item.Money}}<br />
实收：{{item.Money}} 实收：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -309,7 +309,7 @@ ...@@ -309,7 +309,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应收：{{item.Money}}<br /> 应收：{{item.Money}}<br />
实收：{{item.Money}} 实收：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -353,7 +353,7 @@ ...@@ -353,7 +353,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应收：{{item.Money}}<br /> 应收：{{item.Money}}<br />
实收：{{item.Money}} 实收：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -397,7 +397,7 @@ ...@@ -397,7 +397,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应收：{{item.Money}}<br /> 应收：{{item.Money}}<br />
实收：{{item.Money}} 实收：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -441,7 +441,7 @@ ...@@ -441,7 +441,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应收：{{item.Money}}<br /> 应收：{{item.Money}}<br />
实收：{{item.Money}} 实收：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -494,7 +494,7 @@ ...@@ -494,7 +494,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -541,7 +541,7 @@ ...@@ -541,7 +541,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -588,7 +588,7 @@ ...@@ -588,7 +588,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -635,7 +635,7 @@ ...@@ -635,7 +635,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -682,7 +682,7 @@ ...@@ -682,7 +682,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -729,7 +729,7 @@ ...@@ -729,7 +729,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -776,7 +776,7 @@ ...@@ -776,7 +776,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -823,7 +823,7 @@ ...@@ -823,7 +823,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -877,7 +877,7 @@ ...@@ -877,7 +877,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
...@@ -924,7 +924,7 @@ ...@@ -924,7 +924,7 @@
</td> </td>
<td style="font-size:14px;"> <td style="font-size:14px;">
应付：{{item.Money}}<br /> 应付：{{item.Money}}<br />
实付：{{item.Money}} 实付：{{item.PayMoney}}
</td> </td>
<td>{{item.TradeDate}}</td> <td>{{item.TradeDate}}</td>
<td> <td>
......
src/components/activity/CouponList.vue
View file @ 501ab988
...@@ -85,8 +85,8 @@ ...@@ -85,8 +85,8 @@
<th>数量</th> <th>数量</th>
<th>线路名称</th> <th>线路名称</th>
<th>类型</th> <th>类型</th>
<th>面额</th>
<th>满减/折扣</th> <th>满减/折扣</th>
<th>面额</th>
<!-- <th>使用状态</th> --> <!-- <th>使用状态</th> -->
<th>叠加使用</th> <th>叠加使用</th>
<th>生效日期</th> <th>生效日期</th>
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
<td>{{item.couponCount}}</td> <td>{{item.couponCount}}</td>
<td>{{item.lineName}}</td> <td>{{item.lineName}}</td>
<td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td> <td>{{item.couponsType ===1 ? "抵用券" : "折扣券"}}</td>
<td>{{item.denomination}}</td>
<td>{{item.useCondition}}</td> <td>{{item.useCondition}}</td>
<td>{{item.denomination}}</td>
<!-- <td>{{item.useState}}</td> --> <!-- <td>{{item.useState}}</td> -->
<td>{{item.overlapUse === 1 ? "不允许" : "允许"}}</td> <td>{{item.overlapUse === 1 ? "不允许" : "允许"}}</td>
<td>{{item.effectDate}}</td> <td>{{item.effectDate}}</td>
...@@ -368,9 +368,9 @@ export default { ...@@ -368,9 +368,9 @@ export default {
}, null); }, null);
}, },
maxValue: function (val) { maxValue: function (val) {
if (this.addMsg.couponsType === 2 && val >= 1) { if (this.addMsg.couponsType === 2 && val >= 9.99) {
this.addMsg.denomination = 0.99 this.addMsg.denomination = 9.99
this.$message.error("折扣券最大折扣为0.99折") this.$message.error("折扣券最大折扣为99折")
} }
}, },
addData() { addData() {
......
src/components/activity/LuckyDraw.vue
View file @ 501ab988
...@@ -130,8 +130,9 @@ ...@@ -130,8 +130,9 @@
<tr> <tr>
<th>抽奖名称</th> <th>抽奖名称</th>
<th>公司名称</th> <th>公司名称</th>
<th>结束日期</th>
<th>抽奖次数（每人）</th> <th>抽奖次数（每人）</th>
<th>开始日期</th>
<th>结束日期</th>
<th>抽奖状态</th> <th>抽奖状态</th>
<th width="400">备注</th> <th width="400">备注</th>
<th>操作</th> <th>操作</th>
...@@ -139,8 +140,9 @@ ...@@ -139,8 +140,9 @@
<tr v-for="item in dataList"> <tr v-for="item in dataList">
<td>{{item.lotteryName}}</td> <td>{{item.lotteryName}}</td>
<td>{{item.branchName}}</td> <td>{{item.branchName}}</td>
<td>{{item.endDate}}</td>
<td>{{item.lotteryCount}}</td> <td>{{item.lotteryCount}}</td>
<td>{{item.startDate}}</td>
<td>{{item.endDate}}</td>
<td>{{item.lotteryStatus==1?'正常':'禁用'}}</td> <td>{{item.lotteryStatus==1?'正常':'禁用'}}</td>
<td>{{item.remark}}</td> <td>{{item.remark}}</td>
<td> <td>
......
src/plug/index.js
View file @ 501ab988
...@@ -115,7 +115,7 @@ export default { ...@@ -115,7 +115,7 @@ export default {
Vue.prototype.domainManager = function () { Vue.prototype.domainManager = function () {
let domainUrl = ''; let domainUrl = '';
let locationName = window.location.hostname; let locationName = window.location.hostname;
domainUrl = "http://127.0.0.1"; //214主域名 domainUrl = "http://192.168.2.214:8082"; //214主域名
if (locationName.indexOf('oytour')!==-1) { if (locationName.indexOf('oytour')!==-1) {
domainUrl = "http://webapi.viitto.com"; domainUrl = "http://webapi.viitto.com";
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment